summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
commitf6fbd3173fd322ee1382ec3ac93c0d9daa03f9f3 (patch)
treeeeec54a98deecb420e00351f2499cf5ed3815abd
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit bb2d8bb585f9c91b8ce3a9e0317b6987f5e95ef4 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:46 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit f58dcf55d8fca8240c459f74b8e819a5a3dda6d4 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:31 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 8ab96261731432608bbcf733775a4fc84afa75e5 Author: Noel Power <noel.power@novell.com> Date: Mon Feb 7 12:02:12 2011 +0000 fix for bnc#655763 cherry picked from 7c85cd305fcfaa4d714d5d83a7a1f22000a57a8f reviewed in bug https://bugzilla.novell.com/show_bug.cgi?id=655763#c6 Signed-off-by: Cedric Bosdonnat <cbosdonnat@novell.com> sw/source/core/unocore/unotext.cxx | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 5632452090c2cf97e1700abb41684ceab4d04839 Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Nov 11 13:31:33 2010 +0000 Resolves: #i25247#, #i25561#, #i48064#, #i92341# CTL/Other Default Font Signed-off-by: Cédric Bosdonnat <cedricbosdo@openoffice.org> sw/source/filter/ww8/ww8par2.cxx | 19 ++++--------------- sw/source/filter/ww8/ww8par6.cxx | 12 ++++++------ sw/source/filter/ww8/ww8scan.cxx | 17 +++++++++++------ sw/source/filter/ww8/ww8scan.hxx | 8 +++++--- 4 files changed, 26 insertions(+), 30 deletions(-) commit b36353099d6c2518fcbe0c86e1254249b7114650 Author: Petr Mladek <pmladek@suse.cz> Date: Wed Feb 2 17:06:01 2011 +0100 RTF export crasher (bnc#656503) Signed off by Cedric sw/source/filter/ww8/wrtw8nds.cxx | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b61d4e3e3d519672f908f87ad1987b02cf14c40e Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Thu Nov 18 12:37:58 2010 +0100 Fixed an infinite loop while exporting some files in doc/docx/rtf sw/source/filter/ww8/wrtww8.hxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 60fc5e3665587389888e83c8970f1f216a72efbc Author: Andras Timar <timar@fsf.hu> Date: Tue Jan 25 21:14:53 2011 +0100 translations need more space on word count dialog sw/source/ui/dialog/wordcountdialog.src | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8b28483538dc426475d651687b5505cf94149d22 Author: Noel Power <noel.power@novell.com> Date: Mon Jan 10 15:23:27 2011 +0000 bnc#660816 improve formfield checkbox binary export ( and import ) sw/source/core/crsr/bookmrk.cxx | 8 ++++++++ sw/source/filter/ww8/wrtww8.cxx | 37 +++++++++++++++++++++---------------- sw/source/filter/ww8/ww8par3.cxx | 2 ++ 3 files changed, 31 insertions(+), 16 deletions(-) commit 866e4b44f7d5ea75ba31ad78b6c8b58067627788 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit 0bc34a89434f97f5c25fae9d3529c292aba8e9e6 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 6d54edb9fa96fd915a90b06886781827acd2fcde Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 8d9cf3fdfda0bf4b2ae2464edc0397b0e296f015 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit bc6fea9e91ce63236322a1725a725f7fb98aab47 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:58 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit a6d2bb18dd88894c92080214ff7a5c6178ad92cc Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:10 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: writer_libreoffice-3.3.1.1
-rw-r--r--starmath/inc/action.hxx4
-rw-r--r--starmath/inc/applicat.hxx10
-rw-r--r--starmath/inc/config.hxx6
-rw-r--r--starmath/inc/dialog.hxx268
-rw-r--r--starmath/inc/document.hxx102
-rw-r--r--starmath/inc/edit.hxx66
-rw-r--r--starmath/inc/format.hxx150
-rw-r--r--starmath/inc/node.hxx198
-rw-r--r--starmath/inc/parse.hxx250
-rw-r--r--starmath/inc/pch/precompiled_starmath.cxx2
-rw-r--r--starmath/inc/pch/precompiled_starmath.hxx2
-rw-r--r--starmath/inc/rect.hxx120
-rw-r--r--starmath/inc/smdll.hxx2
-rw-r--r--starmath/inc/smmod.hxx12
-rw-r--r--starmath/inc/starmath.hrc1298
-rw-r--r--starmath/inc/symbol.hxx18
-rw-r--r--starmath/inc/toolbox.hxx16
-rw-r--r--starmath/inc/types.hxx4
-rw-r--r--starmath/inc/unomodel.hxx6
-rw-r--r--starmath/inc/utility.hxx116
-rw-r--r--starmath/inc/view.hxx62
-rw-r--r--starmath/sdi/smath.sdi1106
-rw-r--r--starmath/sdi/smitems.sdi156
-rw-r--r--starmath/sdi/smslots.sdi2
-rw-r--r--starmath/source/accessibility.cxx40
-rw-r--r--starmath/source/accessibility.hxx102
-rw-r--r--starmath/source/action.cxx2
-rw-r--r--starmath/source/cfgitem.cxx62
-rw-r--r--starmath/source/cfgitem.hxx2
-rw-r--r--starmath/source/commands.src354
-rw-r--r--starmath/source/config.cxx18
-rw-r--r--starmath/source/detreg.cxx10
-rw-r--r--starmath/source/dialog.cxx196
-rw-r--r--starmath/source/dialog.hrc10
-rw-r--r--starmath/source/document.cxx36
-rw-r--r--starmath/source/edit.cxx30
-rw-r--r--starmath/source/eqnolefilehdr.cxx4
-rw-r--r--starmath/source/eqnolefilehdr.hxx2
-rw-r--r--starmath/source/format.cxx80
-rw-r--r--starmath/source/math_pch.cxx10
-rw-r--r--starmath/source/mathmlexport.cxx2
-rw-r--r--starmath/source/mathmlexport.hxx6
-rw-r--r--starmath/source/mathmlimport.cxx2
-rw-r--r--starmath/source/mathmlimport.hxx16
-rw-r--r--starmath/source/mathtype.cxx28
-rw-r--r--starmath/source/mathtype.hxx10
-rw-r--r--starmath/source/menu_tmpl.src2
-rw-r--r--starmath/source/node.cxx254
-rw-r--r--starmath/source/parse.cxx430
-rw-r--r--starmath/source/rect.cxx116
-rw-r--r--starmath/source/register.cxx10
-rw-r--r--starmath/source/smdetect.cxx2
-rw-r--r--starmath/source/smdetect.hxx2
-rw-r--r--starmath/source/smdll.cxx2
-rw-r--r--starmath/source/smmod.cxx24
-rw-r--r--starmath/source/smres.src8
-rw-r--r--starmath/source/symbol.cxx20
-rw-r--r--starmath/source/symbol.src2
-rw-r--r--starmath/source/toolbox.cxx10
-rw-r--r--starmath/source/toolbox.hrc2
-rw-r--r--starmath/source/typemap.cxx2
-rw-r--r--starmath/source/types.cxx2
-rw-r--r--starmath/source/unodoc.cxx2
-rw-r--r--starmath/source/unomodel.cxx120
-rw-r--r--starmath/source/utility.cxx32
-rw-r--r--starmath/source/view.cxx84
-rw-r--r--starmath/util/hidother.src170
-rwxr-xr-xstarmath/workben/smath-dump-watch.sh8
-rw-r--r--sw/inc/AnnotationWin.hxx20
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx2
-rw-r--r--sw/inc/IDocumentChartDataProviderAccess.hxx2
-rw-r--r--sw/inc/IDocumentContentOperations.hxx4
-rw-r--r--sw/inc/IDocumentDeviceAccess.hxx6
-rw-r--r--sw/inc/IDocumentDrawModelAccess.hxx2
-rw-r--r--sw/inc/IDocumentExternalData.hxx6
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx4
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx2
-rw-r--r--sw/inc/IDocumentLineNumberAccess.hxx2
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx24
-rw-r--r--sw/inc/IDocumentListItems.hxx2
-rw-r--r--sw/inc/IDocumentListsAccess.hxx2
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx34
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx2
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx2
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx2
-rw-r--r--sw/inc/IDocumentState.hxx36
-rw-r--r--sw/inc/IDocumentStatistics.hxx6
-rw-r--r--sw/inc/IDocumentStylePoolAccess.hxx2
-rw-r--r--sw/inc/IDocumentTimerAccess.hxx10
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx8
-rw-r--r--sw/inc/IGrammarContact.hxx8
-rw-r--r--sw/inc/IInterface.hxx34
-rw-r--r--sw/inc/IMark.hxx2
-rw-r--r--sw/inc/PostItMgr.hxx76
-rw-r--r--sw/inc/RefreshListenerContainer.hxx2
-rw-r--r--sw/inc/SidebarWin.hxx82
-rw-r--r--sw/inc/SwAppletImpl.hxx6
-rw-r--r--sw/inc/SwCapObjType.hxx2
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx8
-rw-r--r--sw/inc/SwNodeNum.hxx2
-rw-r--r--sw/inc/SwNumberTree.hxx2
-rw-r--r--sw/inc/SwNumberTreeTypes.hxx2
-rw-r--r--sw/inc/SwRewriter.hxx2
-rw-r--r--sw/inc/SwSmartTagMgr.hxx8
-rw-r--r--sw/inc/SwStyleNameMapper.hxx30
-rw-r--r--sw/inc/SwUndoField.hxx2
-rw-r--r--sw/inc/SwUndoFmt.hxx2
-rw-r--r--sw/inc/SwUndoPageDesc.hxx8
-rw-r--r--sw/inc/SwUndoTOXChange.hxx2
-rw-r--r--sw/inc/SwXMLSectionList.hxx16
-rw-r--r--sw/inc/TextCursorHelper.hxx10
-rw-r--r--sw/inc/accessibilityoptions.hxx2
-rw-r--r--sw/inc/accmap.hxx4
-rw-r--r--sw/inc/acmplwrd.hxx4
-rw-r--r--sw/inc/anchoreddrawobject.hxx2
-rw-r--r--sw/inc/anchoredobject.hxx2
-rw-r--r--sw/inc/authfld.hxx96
-rw-r--r--sw/inc/authratr.hxx10
-rw-r--r--sw/inc/bparr.hxx36
-rw-r--r--sw/inc/breakit.hxx12
-rw-r--r--sw/inc/calbck.hxx58
-rw-r--r--sw/inc/calc.hxx128
-rw-r--r--sw/inc/ccoll.hxx18
-rw-r--r--sw/inc/cellatr.hxx30
-rw-r--r--sw/inc/cellfml.hxx24
-rw-r--r--sw/inc/charatr.hxx20
-rw-r--r--sw/inc/charfmt.hxx2
-rw-r--r--sw/inc/chcmprse.hxx4
-rw-r--r--sw/inc/checkit.hxx2
-rw-r--r--sw/inc/chpfld.hxx22
-rw-r--r--sw/inc/chrdlg.hrc4
-rw-r--r--sw/inc/cmdid.h1360
-rw-r--r--sw/inc/colwd.hxx20
-rw-r--r--sw/inc/comcore.hrc86
-rw-r--r--sw/inc/crsrsh.hxx2
-rw-r--r--sw/inc/crsskip.hxx6
-rw-r--r--sw/inc/crstate.hxx60
-rw-r--r--sw/inc/cshtyp.hxx16
-rw-r--r--sw/inc/dbfld.hxx146
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx98
-rw-r--r--sw/inc/dbui.hrc40
-rw-r--r--sw/inc/dcontact.hxx12
-rw-r--r--sw/inc/ddefld.hxx32
-rw-r--r--sw/inc/dialog.hrc24
-rw-r--r--sw/inc/dlelstnr.hxx12
-rw-r--r--sw/inc/dobjfac.hxx2
-rw-r--r--sw/inc/doc.hxx276
-rw-r--r--sw/inc/docary.hxx6
-rw-r--r--sw/inc/docfac.hxx4
-rw-r--r--sw/inc/dochdl.hrc8
-rw-r--r--sw/inc/docsh.hxx90
-rw-r--r--sw/inc/docstat.hxx20
-rw-r--r--sw/inc/docstyle.hxx122
-rw-r--r--sw/inc/docufld.hxx346
-rw-r--r--sw/inc/dpage.hxx8
-rw-r--r--sw/inc/drawdoc.hxx6
-rw-r--r--sw/inc/edglbldc.hxx6
-rw-r--r--sw/inc/edimp.hxx8
-rw-r--r--sw/inc/editsh.hxx122
-rw-r--r--sw/inc/envelp.hrc6
-rw-r--r--sw/inc/errhdl.hxx8
-rw-r--r--sw/inc/error.h14
-rw-r--r--sw/inc/expfld.hxx220
-rw-r--r--sw/inc/extinput.hxx8
-rw-r--r--sw/inc/fchrfmt.hxx12
-rw-r--r--sw/inc/fesh.hxx152
-rw-r--r--sw/inc/fldbas.hxx218
-rw-r--r--sw/inc/flddat.hxx42
-rw-r--r--sw/inc/flddropdown.hxx2
-rw-r--r--sw/inc/fldinit.hxx2
-rw-r--r--sw/inc/fldui.hrc368
-rw-r--r--sw/inc/fldupde.hxx2
-rw-r--r--sw/inc/flyenum.hxx16
-rw-r--r--sw/inc/flypos.hxx8
-rw-r--r--sw/inc/fmtanchr.hxx14
-rw-r--r--sw/inc/fmtautofmt.hxx8
-rw-r--r--sw/inc/fmtclbl.hxx2
-rw-r--r--sw/inc/fmtclds.hxx58
-rw-r--r--sw/inc/fmtcnct.hxx8
-rw-r--r--sw/inc/fmtcntnt.hxx6
-rw-r--r--sw/inc/fmtcol.hxx60
-rw-r--r--sw/inc/fmtcolfunc.hxx2
-rw-r--r--sw/inc/fmteiro.hxx2
-rw-r--r--sw/inc/fmtflcnt.hxx12
-rw-r--r--sw/inc/fmtfld.hxx26
-rw-r--r--sw/inc/fmtfollowtextflow.hxx2
-rw-r--r--sw/inc/fmtfordr.hxx6
-rw-r--r--sw/inc/fmtfsize.hxx28
-rw-r--r--sw/inc/fmtftn.hxx16
-rw-r--r--sw/inc/fmtftntx.hxx54
-rw-r--r--sw/inc/fmthdft.hxx14
-rw-r--r--sw/inc/fmtinfmt.hxx46
-rw-r--r--sw/inc/fmtline.hxx16
-rw-r--r--sw/inc/fmtlsplt.hxx2
-rw-r--r--sw/inc/fmtmeta.hxx2
-rw-r--r--sw/inc/fmtornt.hxx14
-rw-r--r--sw/inc/fmtpdsc.hxx22
-rw-r--r--sw/inc/fmtrfmrk.hxx10
-rw-r--r--sw/inc/fmtrowsplt.hxx2
-rw-r--r--sw/inc/fmtruby.hxx44
-rw-r--r--sw/inc/fmtsrnd.hxx32
-rw-r--r--sw/inc/fmtsrndenum.hxx2
-rw-r--r--sw/inc/fmtui.hrc54
-rw-r--r--sw/inc/fmturl.hxx32
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx2
-rw-r--r--sw/inc/format.hxx62
-rw-r--r--sw/inc/frmatr.hxx14
-rw-r--r--sw/inc/frmfmt.hxx10
-rw-r--r--sw/inc/ftnidx.hxx8
-rw-r--r--sw/inc/ftninfo.hxx24
-rw-r--r--sw/inc/globals.hrc184
-rw-r--r--sw/inc/globdoc.hxx4
-rw-r--r--sw/inc/grfatr.hxx72
-rw-r--r--sw/inc/helpid.h1160
-rw-r--r--sw/inc/hfspacingitem.hxx2
-rw-r--r--sw/inc/hhcwrp.hxx18
-rw-r--r--sw/inc/hintids.hxx136
-rw-r--r--sw/inc/hints.hxx4
-rw-r--r--sw/inc/htmltbl.hxx104
-rw-r--r--sw/inc/index.hrc20
-rw-r--r--sw/inc/index.hxx16
-rw-r--r--sw/inc/inetfld.hxx26
-rw-r--r--sw/inc/init.hxx6
-rw-r--r--sw/inc/io.hxx2
-rw-r--r--sw/inc/iodetect.hxx6
-rw-r--r--sw/inc/istyleaccess.hxx2
-rw-r--r--sw/inc/itabenum.hxx2
-rw-r--r--sw/inc/lineinfo.hxx62
-rw-r--r--sw/inc/linkenum.hxx2
-rw-r--r--sw/inc/list.hxx2
-rw-r--r--sw/inc/listfunc.hxx2
-rw-r--r--sw/inc/mdiexp.hxx6
-rw-r--r--sw/inc/modcfg.hxx226
-rw-r--r--sw/inc/modeltoviewhelper.hxx2
-rw-r--r--sw/inc/ndarr.hxx56
-rw-r--r--sw/inc/ndgrf.hxx58
-rw-r--r--sw/inc/ndhints.hxx2
-rw-r--r--sw/inc/ndindex.hxx8
-rw-r--r--sw/inc/ndnotxt.hxx24
-rw-r--r--sw/inc/ndole.hxx26
-rw-r--r--sw/inc/ndtxt.hxx16
-rw-r--r--sw/inc/ndtyp.hxx18
-rw-r--r--sw/inc/newhdl.hxx24
-rw-r--r--sw/inc/node.hxx32
-rw-r--r--sw/inc/numrule.hxx58
-rw-r--r--sw/inc/pagedesc.hxx102
-rw-r--r--sw/inc/pageiter.hxx2
-rw-r--r--sw/inc/pam.hxx48
-rw-r--r--sw/inc/paratr.hxx68
-rw-r--r--sw/inc/pausethreadstarting.hxx2
-rw-r--r--sw/inc/pch/precompiled_sw.cxx2
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/poolfmt.hrc350
-rw-r--r--sw/inc/poolfmt.hxx390
-rw-r--r--sw/inc/printdata.hxx32
-rw-r--r--sw/inc/pvprtdat.hxx38
-rw-r--r--sw/inc/rcid.hrc180
-rw-r--r--sw/inc/redline.hxx44
-rw-r--r--sw/inc/redlnaut.hxx2
-rw-r--r--sw/inc/reffld.hxx26
-rw-r--r--sw/inc/ring.hxx12
-rw-r--r--sw/inc/rolbck.hxx2
-rw-r--r--sw/inc/rubylist.hxx14
-rw-r--r--sw/inc/section.hxx30
-rw-r--r--sw/inc/shellid.hxx68
-rw-r--r--sw/inc/shellio.hxx52
-rw-r--r--sw/inc/shellres.hxx44
-rw-r--r--sw/inc/sortopt.hxx28
-rw-r--r--sw/inc/splargs.hxx24
-rw-r--r--sw/inc/statstr.hrc26
-rw-r--r--sw/inc/stringhash.hxx10
-rw-r--r--sw/inc/swabstdlg.hxx132
-rw-r--r--sw/inc/swacorr.hxx14
-rw-r--r--sw/inc/swatrset.hxx32
-rw-r--r--sw/inc/swbaslnk.hxx10
-rw-r--r--sw/inc/swcalwrp.hxx2
-rw-r--r--sw/inc/swcli.hxx6
-rw-r--r--sw/inc/swcrsr.hxx18
-rw-r--r--sw/inc/swdbdata.hxx6
-rw-r--r--sw/inc/swdbtoolsclient.hxx10
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swdll.hxx8
-rw-r--r--sw/inc/swerror.h46
-rw-r--r--sw/inc/swevent.hxx12
-rw-r--r--sw/inc/swfltopt.hxx2
-rw-r--r--sw/inc/swgstr.hxx68
-rw-r--r--sw/inc/swhints.hxx6
-rw-r--r--sw/inc/swmodule.hxx118
-rw-r--r--sw/inc/swprtopt.hxx14
-rw-r--r--sw/inc/swrect.hxx12
-rw-r--r--sw/inc/swregion.hxx6
-rw-r--r--sw/inc/swserv.hxx2
-rw-r--r--sw/inc/swstyle.h4
-rw-r--r--sw/inc/swtable.hxx60
-rw-r--r--sw/inc/swtblfmt.hxx8
-rw-r--r--sw/inc/swtypes.hxx94
-rw-r--r--sw/inc/swundo.hxx18
-rw-r--r--sw/inc/swunodef.hxx10
-rw-r--r--sw/inc/swunohelper.hxx6
-rw-r--r--sw/inc/swurl.hxx6
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx24
-rw-r--r--sw/inc/tblafmt.hxx112
-rw-r--r--sw/inc/tblenum.hxx22
-rw-r--r--sw/inc/tblsel.hxx44
-rw-r--r--sw/inc/tgrditem.hxx18
-rw-r--r--sw/inc/tox.hxx236
-rw-r--r--sw/inc/toxe.hxx4
-rw-r--r--sw/inc/toxinit.hxx2
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/txatbase.hxx22
-rw-r--r--sw/inc/txatritr.hxx12
-rw-r--r--sw/inc/txtatr.hxx4
-rw-r--r--sw/inc/txtflcnt.hxx6
-rw-r--r--sw/inc/txtfld.hxx2
-rw-r--r--sw/inc/txtftn.hxx2
-rw-r--r--sw/inc/txtinet.hxx2
-rw-r--r--sw/inc/txtrfmrk.hxx2
-rw-r--r--sw/inc/txttxmrk.hxx2
-rw-r--r--sw/inc/undobj.hxx136
-rw-r--r--sw/inc/unoatxt.hxx74
-rw-r--r--sw/inc/unobaseclass.hxx4
-rw-r--r--sw/inc/unobookmark.hxx2
-rw-r--r--sw/inc/unochart.hxx8
-rw-r--r--sw/inc/unocoll.hxx156
-rw-r--r--sw/inc/unocore.hrc2
-rw-r--r--sw/inc/unocrsr.hxx14
-rw-r--r--sw/inc/unocrsrhelper.hxx20
-rw-r--r--sw/inc/unodraw.hxx38
-rw-r--r--sw/inc/unoevent.hxx12
-rw-r--r--sw/inc/unoevtlstnr.hxx14
-rw-r--r--sw/inc/unofield.hxx54
-rw-r--r--sw/inc/unoflatpara.hxx4
-rw-r--r--sw/inc/unofootnote.hxx2
-rw-r--r--sw/inc/unoframe.hxx34
-rw-r--r--sw/inc/unoidx.hxx2
-rw-r--r--sw/inc/unomailmerge.hxx2
-rw-r--r--sw/inc/unomap.hxx226
-rw-r--r--sw/inc/unomid.h82
-rw-r--r--sw/inc/unomod.hxx62
-rw-r--r--sw/inc/unoparaframeenum.hxx2
-rw-r--r--sw/inc/unoparagraph.hxx2
-rw-r--r--sw/inc/unoport.hxx18
-rw-r--r--sw/inc/unoprnms.hxx1232
-rw-r--r--sw/inc/unoredline.hxx18
-rw-r--r--sw/inc/unoredlines.hxx10
-rw-r--r--sw/inc/unorefmark.hxx2
-rw-r--r--sw/inc/unosection.hxx2
-rw-r--r--sw/inc/unosett.hxx88
-rw-r--r--sw/inc/unosrch.hxx52
-rw-r--r--sw/inc/unostyle.hxx78
-rw-r--r--sw/inc/unotbl.hxx96
-rw-r--r--sw/inc/unotext.hxx6
-rw-r--r--sw/inc/unotextbodyhf.hxx2
-rw-r--r--sw/inc/unotextcursor.hxx2
-rw-r--r--sw/inc/unotextrange.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx100
-rw-r--r--sw/inc/usrfld.hxx58
-rw-r--r--sw/inc/viewopt.hxx222
-rw-r--r--sw/inc/viewsh.hxx80
-rw-r--r--sw/inc/viscrs.hxx36
-rw-r--r--sw/inc/wdocsh.hxx8
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java2
-rw-r--r--sw/qa/complex/checkColor/CheckChangeColor.java2
-rw-r--r--sw/qa/complex/indeterminateState/CheckIndeterminateState.java2
-rw-r--r--sw/qa/complex/writer/CheckBookmarks.java2
-rw-r--r--sw/qa/complex/writer/CheckFlies.java2
-rw-r--r--sw/qa/complex/writer/CheckIndexedPropertyValues.java2
-rw-r--r--sw/qa/complex/writer/CheckNamedPropertyValues.java2
-rw-r--r--sw/qa/complex/writer/TextPortionEnumerationTest.java2
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx350
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx24
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx68
-rw-r--r--sw/qa/core/export.map2
-rw-r--r--sw/sdi/_annotsh.sdi10
-rw-r--r--sw/sdi/_basesh.sdi4
-rw-r--r--sw/sdi/_beziers.sdi2
-rw-r--r--sw/sdi/_docsh.sdi2
-rw-r--r--sw/sdi/_drwbase.sdi2
-rw-r--r--sw/sdi/_formsh.sdi2
-rw-r--r--sw/sdi/_frmsh.sdi2
-rw-r--r--sw/sdi/_grfsh.sdi48
-rw-r--r--sw/sdi/_listsh.sdi2
-rw-r--r--sw/sdi/_mediash.sdi4
-rw-r--r--sw/sdi/_olesh.sdi2
-rw-r--r--sw/sdi/_tabsh.sdi6
-rw-r--r--sw/sdi/_textsh.sdi22
-rw-r--r--sw/sdi/_viewsh.sdi30
-rw-r--r--sw/sdi/annotsh.sdi74
-rw-r--r--sw/sdi/basesh.sdi2
-rw-r--r--sw/sdi/beziersh.sdi2
-rw-r--r--sw/sdi/docsh.sdi2
-rw-r--r--sw/sdi/drawsh.sdi20
-rw-r--r--sw/sdi/drwbassh.sdi2
-rw-r--r--sw/sdi/drwtxtsh.sdi8
-rw-r--r--sw/sdi/formsh.sdi2
-rw-r--r--sw/sdi/frmsh.sdi2
-rw-r--r--sw/sdi/grfsh.sdi2
-rw-r--r--sw/sdi/listsh.sdi2
-rw-r--r--sw/sdi/mediash.sdi2
-rw-r--r--sw/sdi/olesh.sdi2
-rw-r--r--sw/sdi/swinterf.c4
-rw-r--r--sw/sdi/switems.sdi2
-rw-r--r--sw/sdi/swslots.hrc2
-rw-r--r--sw/sdi/swslots.sdi2
-rw-r--r--sw/sdi/tabsh.sdi2
-rw-r--r--sw/sdi/textsh.sdi2
-rw-r--r--sw/sdi/viewsh.sdi10
-rw-r--r--sw/sdi/wbasesh.sdi2
-rw-r--r--sw/sdi/wbeziers.sdi2
-rw-r--r--sw/sdi/wdocsh.sdi2
-rw-r--r--sw/sdi/wdrwbase.sdi2
-rw-r--r--sw/sdi/wformsh.sdi2
-rw-r--r--sw/sdi/wfrmsh.sdi2
-rw-r--r--sw/sdi/wgrfsh.sdi2
-rw-r--r--sw/sdi/wlistsh.sdi2
-rw-r--r--sw/sdi/wolesh.sdi2
-rw-r--r--sw/sdi/wrtapp.sdi6
-rw-r--r--sw/sdi/wtabsh.sdi2
-rw-r--r--sw/sdi/wtextsh.sdi2
-rw-r--r--sw/sdi/wviewsh.sdi10
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx2
-rw-r--r--sw/source/core/access/acccell.hxx14
-rw-r--r--sw/source/core/access/acccontext.cxx4
-rw-r--r--sw/source/core/access/acccontext.hxx68
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accdoc.hxx22
-rw-r--r--sw/source/core/access/accembedded.cxx2
-rw-r--r--sw/source/core/access/accembedded.hxx6
-rw-r--r--sw/source/core/access/accfootnote.cxx4
-rw-r--r--sw/source/core/access/accfootnote.hxx6
-rw-r--r--sw/source/core/access/accframebase.cxx2
-rw-r--r--sw/source/core/access/accframebase.hxx6
-rw-r--r--sw/source/core/access/accgraphic.cxx2
-rw-r--r--sw/source/core/access/accgraphic.hxx8
-rw-r--r--sw/source/core/access/accheaderfooter.cxx2
-rw-r--r--sw/source/core/access/accheaderfooter.hxx10
-rw-r--r--sw/source/core/access/acchyperlink.cxx22
-rw-r--r--sw/source/core/access/acchyperlink.hxx4
-rw-r--r--sw/source/core/access/acchypertextdata.cxx2
-rw-r--r--sw/source/core/access/acchypertextdata.hxx4
-rw-r--r--sw/source/core/access/accmap.cxx22
-rw-r--r--sw/source/core/access/accnotextframe.cxx2
-rw-r--r--sw/source/core/access/accnotextframe.hxx6
-rw-r--r--sw/source/core/access/accpage.cxx2
-rw-r--r--sw/source/core/access/accpage.hxx8
-rw-r--r--sw/source/core/access/accpara.hxx18
-rw-r--r--sw/source/core/access/accportions.cxx2
-rw-r--r--sw/source/core/access/accportions.hxx2
-rw-r--r--sw/source/core/access/accpreview.cxx2
-rw-r--r--sw/source/core/access/accpreview.hxx12
-rw-r--r--sw/source/core/access/accselectionhelper.cxx2
-rw-r--r--sw/source/core/access/accselectionhelper.hxx2
-rw-r--r--sw/source/core/access/acctable.cxx14
-rw-r--r--sw/source/core/access/acctable.hxx10
-rw-r--r--sw/source/core/access/acctextframe.cxx2
-rw-r--r--sw/source/core/access/acctextframe.hxx6
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx2
-rw-r--r--sw/source/core/attr/calbck.cxx108
-rw-r--r--sw/source/core/attr/cellatr.cxx24
-rw-r--r--sw/source/core/attr/fmtfollowtextflow.cxx2
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx2
-rw-r--r--sw/source/core/attr/format.cxx52
-rw-r--r--sw/source/core/attr/hints.cxx8
-rw-r--r--sw/source/core/attr/swatrset.cxx12
-rw-r--r--sw/source/core/bastyp/SwSmartTagMgr.cxx8
-rw-r--r--sw/source/core/bastyp/bparr.cxx30
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx380
-rw-r--r--sw/source/core/bastyp/checkit.cxx2
-rw-r--r--sw/source/core/bastyp/index.cxx48
-rw-r--r--sw/source/core/bastyp/init.cxx284
-rw-r--r--sw/source/core/bastyp/ring.cxx6
-rw-r--r--sw/source/core/bastyp/swcache.cxx116
-rw-r--r--sw/source/core/bastyp/swrect.cxx54
-rw-r--r--sw/source/core/bastyp/swregion.cxx42
-rw-r--r--sw/source/core/bastyp/swtypes.cxx28
-rw-r--r--sw/source/core/bastyp/tabcol.cxx12
-rw-r--r--sw/source/core/crsr/BlockCursor.cxx2
-rw-r--r--sw/source/core/crsr/BlockCursor.hxx4
-rw-r--r--sw/source/core/crsr/IBlockCursor.hxx8
-rw-r--r--sw/source/core/crsr/bookmrk.cxx12
-rw-r--r--sw/source/core/crsr/callnk.cxx8
-rw-r--r--sw/source/core/crsr/callnk.hxx4
-rw-r--r--sw/source/core/crsr/crbm.cxx8
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx2
-rw-r--r--sw/source/core/crsr/crsrsh.cxx160
-rw-r--r--sw/source/core/crsr/crstrvl.cxx82
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx2
-rw-r--r--sw/source/core/crsr/findattr.cxx96
-rw-r--r--sw/source/core/crsr/findcoll.cxx2
-rw-r--r--sw/source/core/crsr/findfmt.cxx8
-rw-r--r--sw/source/core/crsr/findtxt.cxx16
-rw-r--r--sw/source/core/crsr/pam.cxx6
-rw-r--r--sw/source/core/crsr/paminit.cxx66
-rw-r--r--sw/source/core/crsr/swcrsr.cxx74
-rw-r--r--sw/source/core/crsr/trvlcol.cxx4
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx12
-rw-r--r--sw/source/core/crsr/trvlreg.cxx12
-rw-r--r--sw/source/core/crsr/trvltbl.cxx40
-rw-r--r--sw/source/core/crsr/unocrsr.cxx8
-rw-r--r--sw/source/core/crsr/viscrs.cxx38
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx50
-rw-r--r--sw/source/core/doc/acmplwrd.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx28
-rw-r--r--sw/source/core/doc/doc.cxx194
-rw-r--r--sw/source/core/doc/docbasic.cxx10
-rw-r--r--sw/source/core/doc/docbm.cxx58
-rw-r--r--sw/source/core/doc/docchart.cxx4
-rw-r--r--sw/source/core/doc/doccomp.cxx34
-rw-r--r--sw/source/core/doc/doccorr.cxx10
-rw-r--r--sw/source/core/doc/docdde.cxx54
-rw-r--r--sw/source/core/doc/docdesc.cxx52
-rw-r--r--sw/source/core/doc/docdraw.cxx36
-rw-r--r--sw/source/core/doc/docedt.cxx80
-rw-r--r--sw/source/core/doc/docfld.cxx116
-rw-r--r--sw/source/core/doc/docfly.cxx34
-rw-r--r--sw/source/core/doc/docfmt.cxx70
-rw-r--r--sw/source/core/doc/docftn.cxx8
-rw-r--r--sw/source/core/doc/docglbl.cxx44
-rw-r--r--sw/source/core/doc/docglos.cxx4
-rw-r--r--sw/source/core/doc/doclay.cxx136
-rw-r--r--sw/source/core/doc/docnew.cxx40
-rw-r--r--sw/source/core/doc/docnum.cxx66
-rw-r--r--sw/source/core/doc/docredln.cxx98
-rw-r--r--sw/source/core/doc/docruby.cxx48
-rw-r--r--sw/source/core/doc/docsort.cxx62
-rw-r--r--sw/source/core/doc/docstat.cxx16
-rw-r--r--sw/source/core/doc/doctxm.cxx114
-rw-r--r--sw/source/core/doc/docxforms.cxx6
-rw-r--r--sw/source/core/doc/extinput.cxx2
-rw-r--r--sw/source/core/doc/fmtcol.cxx20
-rw-r--r--sw/source/core/doc/ftnidx.cxx22
-rw-r--r--sw/source/core/doc/gctable.cxx10
-rw-r--r--sw/source/core/doc/htmltbl.cxx54
-rw-r--r--sw/source/core/doc/lineinfo.cxx2
-rw-r--r--sw/source/core/doc/list.cxx2
-rw-r--r--sw/source/core/doc/notxtfrm.cxx96
-rw-r--r--sw/source/core/doc/number.cxx16
-rw-r--r--sw/source/core/doc/poolfmt.cxx290
-rw-r--r--sw/source/core/doc/sortopt.cxx4
-rw-r--r--sw/source/core/doc/swserv.cxx4
-rw-r--r--sw/source/core/doc/swstylemanager.cxx2
-rw-r--r--sw/source/core/doc/swstylemanager.hxx4
-rw-r--r--sw/source/core/doc/tblafmt.cxx94
-rw-r--r--sw/source/core/doc/tblcpy.cxx46
-rw-r--r--sw/source/core/doc/tblrwcl.cxx198
-rw-r--r--sw/source/core/doc/visiturl.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx2
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx2
-rw-r--r--sw/source/core/docnode/ndcopy.cxx46
-rw-r--r--sw/source/core/docnode/ndindex.cxx12
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx4
-rw-r--r--sw/source/core/docnode/ndnum.cxx80
-rw-r--r--sw/source/core/docnode/ndsect.cxx26
-rw-r--r--sw/source/core/docnode/ndtbl.cxx140
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx138
-rw-r--r--sw/source/core/docnode/node.cxx176
-rw-r--r--sw/source/core/docnode/node2lay.cxx8
-rw-r--r--sw/source/core/docnode/nodes.cxx534
-rw-r--r--sw/source/core/docnode/observablethread.cxx2
-rw-r--r--sw/source/core/docnode/pausethreadstarting.cxx2
-rw-r--r--sw/source/core/docnode/retrievedinputstreamdata.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstream.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstreamconsumer.cxx2
-rw-r--r--sw/source/core/docnode/section.cxx46
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx40
-rw-r--r--sw/source/core/docnode/swthreadjoiner.cxx2
-rw-r--r--sw/source/core/docnode/swthreadmanager.cxx2
-rw-r--r--sw/source/core/docnode/threadlistener.cxx2
-rw-r--r--sw/source/core/docnode/threadmanager.cxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx82
-rw-r--r--sw/source/core/draw/dflyobj.cxx64
-rw-r--r--sw/source/core/draw/dobjfac.cxx2
-rw-r--r--sw/source/core/draw/dpage.cxx18
-rw-r--r--sw/source/core/draw/drawdoc.cxx2
-rw-r--r--sw/source/core/draw/dview.cxx58
-rw-r--r--sw/source/core/edit/acorrect.cxx26
-rw-r--r--sw/source/core/edit/autofmt.cxx254
-rw-r--r--sw/source/core/edit/edatmisc.cxx14
-rw-r--r--sw/source/core/edit/edattr.cxx22
-rw-r--r--sw/source/core/edit/eddel.cxx26
-rw-r--r--sw/source/core/edit/edfcol.cxx12
-rw-r--r--sw/source/core/edit/edfld.cxx54
-rw-r--r--sw/source/core/edit/edfldexp.cxx4
-rw-r--r--sw/source/core/edit/edfmt.cxx4
-rw-r--r--sw/source/core/edit/edglbldc.cxx10
-rw-r--r--sw/source/core/edit/edglss.cxx26
-rw-r--r--sw/source/core/edit/editsh.cxx90
-rw-r--r--sw/source/core/edit/edlingu.cxx176
-rw-r--r--sw/source/core/edit/ednumber.cxx42
-rw-r--r--sw/source/core/edit/edredln.cxx2
-rw-r--r--sw/source/core/edit/edsect.cxx14
-rw-r--r--sw/source/core/edit/edtab.cxx12
-rw-r--r--sw/source/core/edit/edtox.cxx42
-rw-r--r--sw/source/core/edit/edundo.cxx20
-rw-r--r--sw/source/core/edit/edws.cxx26
-rw-r--r--sw/source/core/except/dbgloop.cxx12
-rw-r--r--sw/source/core/except/errhdl.cxx24
-rw-r--r--sw/source/core/fields/authfld.cxx34
-rw-r--r--sw/source/core/fields/cellfml.cxx102
-rw-r--r--sw/source/core/fields/chpfld.cxx24
-rw-r--r--sw/source/core/fields/dbfld.cxx20
-rw-r--r--sw/source/core/fields/ddefld.cxx16
-rw-r--r--sw/source/core/fields/ddetbl.cxx6
-rw-r--r--sw/source/core/fields/docufld.cxx114
-rw-r--r--sw/source/core/fields/expfld.cxx54
-rw-r--r--sw/source/core/fields/fldbas.cxx94
-rw-r--r--sw/source/core/fields/flddat.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx2
-rw-r--r--sw/source/core/fields/fldlst.cxx8
-rw-r--r--sw/source/core/fields/macrofld.cxx4
-rw-r--r--sw/source/core/fields/postithelper.cxx8
-rw-r--r--sw/source/core/fields/reffld.cxx46
-rw-r--r--sw/source/core/fields/scrptfld.cxx2
-rw-r--r--sw/source/core/fields/tblcalc.cxx14
-rw-r--r--sw/source/core/fields/textapi.cxx24
-rw-r--r--sw/source/core/fields/usrfld.cxx20
-rw-r--r--sw/source/core/frmedt/fecopy.cxx52
-rw-r--r--sw/source/core/frmedt/fedesc.cxx26
-rw-r--r--sw/source/core/frmedt/fefly1.cxx206
-rw-r--r--sw/source/core/frmedt/feflyole.cxx4
-rw-r--r--sw/source/core/frmedt/feshview.cxx286
-rw-r--r--sw/source/core/frmedt/fetab.cxx206
-rw-r--r--sw/source/core/frmedt/fews.cxx122
-rw-r--r--sw/source/core/frmedt/tblsel.cxx114
-rw-r--r--sw/source/core/graphic/grfatr.cxx10
-rw-r--r--sw/source/core/graphic/ndgrf.cxx16
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx16
-rw-r--r--sw/source/core/inc/MarkManager.hxx16
-rw-r--r--sw/source/core/inc/SwGrammarMarkUp.hxx8
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx10
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx34
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx16
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx2
-rw-r--r--sw/source/core/inc/acorrect.hxx14
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/blink.hxx16
-rw-r--r--sw/source/core/inc/bodyfrm.hxx6
-rw-r--r--sw/source/core/inc/bookmrk.hxx4
-rw-r--r--sw/source/core/inc/cntfrm.hxx32
-rw-r--r--sw/source/core/inc/colfrm.hxx4
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx2
-rw-r--r--sw/source/core/inc/dbg_lay.hxx54
-rw-r--r--sw/source/core/inc/dbgloop.hxx10
-rw-r--r--sw/source/core/inc/dflyobj.hxx40
-rw-r--r--sw/source/core/inc/docfld.hxx36
-rw-r--r--sw/source/core/inc/docsort.hxx76
-rw-r--r--sw/source/core/inc/doctxm.hxx30
-rw-r--r--sw/source/core/inc/drawdev.hxx14
-rw-r--r--sw/source/core/inc/drawfont.hxx12
-rw-r--r--sw/source/core/inc/dview.hxx12
-rw-r--r--sw/source/core/inc/environmentofanchoredobject.hxx2
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx2
-rw-r--r--sw/source/core/inc/flowfrm.hxx52
-rw-r--r--sw/source/core/inc/flyfrm.hxx52
-rw-r--r--sw/source/core/inc/flyfrms.hxx10
-rw-r--r--sw/source/core/inc/fntcache.hxx14
-rw-r--r--sw/source/core/inc/frame.hxx230
-rw-r--r--sw/source/core/inc/frminf.hxx10
-rw-r--r--sw/source/core/inc/frmtool.hxx72
-rw-r--r--sw/source/core/inc/ftnboss.hxx20
-rw-r--r--sw/source/core/inc/ftnfrm.hxx34
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/ifinishedthreadlistener.hxx2
-rw-r--r--sw/source/core/inc/ithreadlistenerowner.hxx2
-rw-r--r--sw/source/core/inc/layact.hxx104
-rw-r--r--sw/source/core/inc/laycache.hxx2
-rw-r--r--sw/source/core/inc/layfrm.hxx12
-rw-r--r--sw/source/core/inc/layouter.hxx2
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx14
-rw-r--r--sw/source/core/inc/node2lay.hxx8
-rw-r--r--sw/source/core/inc/noteurl.hxx12
-rw-r--r--sw/source/core/inc/notxtfrm.hxx6
-rw-r--r--sw/source/core/inc/objectformatter.hxx2
-rw-r--r--sw/source/core/inc/observablethread.hxx2
-rw-r--r--sw/source/core/inc/pagefrm.hxx78
-rw-r--r--sw/source/core/inc/pamtyp.hxx10
-rw-r--r--sw/source/core/inc/ptqueue.hxx2
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx2
-rw-r--r--sw/source/core/inc/retrieveinputstream.hxx2
-rw-r--r--sw/source/core/inc/retrieveinputstreamconsumer.hxx2
-rw-r--r--sw/source/core/inc/rootfrm.hxx92
-rw-r--r--sw/source/core/inc/rowfrm.hxx4
-rw-r--r--sw/source/core/inc/scriptinfo.hxx6
-rw-r--r--sw/source/core/inc/sectfrm.hxx20
-rw-r--r--sw/source/core/inc/setmapvirtdev.hxx2
-rw-r--r--sw/source/core/inc/sortedobjs.hxx2
-rw-r--r--sw/source/core/inc/sortedobjsimpl.hxx2
-rw-r--r--sw/source/core/inc/swblocks.hxx102
-rw-r--r--sw/source/core/inc/swcache.hxx64
-rw-r--r--sw/source/core/inc/swfntcch.hxx4
-rw-r--r--sw/source/core/inc/swfont.hxx82
-rw-r--r--sw/source/core/inc/swselectionlist.hxx6
-rw-r--r--sw/source/core/inc/swthreadjoiner.hxx2
-rw-r--r--sw/source/core/inc/swthreadmanager.hxx2
-rw-r--r--sw/source/core/inc/tabfrm.hxx36
-rw-r--r--sw/source/core/inc/tblrwcl.hxx12
-rw-r--r--sw/source/core/inc/textapi.hxx30
-rw-r--r--sw/source/core/inc/threadlistener.hxx2
-rw-r--r--sw/source/core/inc/threadmanager.hxx2
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx44
-rw-r--r--sw/source/core/inc/txtfrm.hxx86
-rw-r--r--sw/source/core/inc/txttypes.hxx92
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx2
-rw-r--r--sw/source/core/inc/unofldmid.h20
-rw-r--r--sw/source/core/inc/unometa.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx58
-rw-r--r--sw/source/core/inc/visiturl.hxx6
-rw-r--r--sw/source/core/inc/wrong.hxx4
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/anchoredobject.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx136
-rw-r--r--sw/source/core/layout/calcmove.cxx120
-rw-r--r--sw/source/core/layout/colfrm.cxx34
-rw-r--r--sw/source/core/layout/dbg_lay.cxx228
-rw-r--r--sw/source/core/layout/findfrm.cxx144
-rw-r--r--sw/source/core/layout/flowfrm.cxx250
-rw-r--r--sw/source/core/layout/fly.cxx188
-rw-r--r--sw/source/core/layout/flycnt.cxx92
-rw-r--r--sw/source/core/layout/flyincnt.cxx72
-rw-r--r--sw/source/core/layout/flylay.cxx96
-rw-r--r--sw/source/core/layout/flypos.cxx4
-rw-r--r--sw/source/core/layout/frmtool.cxx298
-rw-r--r--sw/source/core/layout/ftnfrm.cxx346
-rw-r--r--sw/source/core/layout/hffrm.cxx34
-rw-r--r--sw/source/core/layout/layact.cxx172
-rw-r--r--sw/source/core/layout/laycache.cxx12
-rw-r--r--sw/source/core/layout/layhelp.hxx42
-rw-r--r--sw/source/core/layout/layouter.cxx14
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx46
-rw-r--r--sw/source/core/layout/objectformatter.cxx2
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.cxx2
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx2
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx2
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx2
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.cxx2
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.hxx2
-rw-r--r--sw/source/core/layout/pagechg.cxx294
-rw-r--r--sw/source/core/layout/pagedesc.cxx70
-rw-r--r--sw/source/core/layout/paintfrm.cxx300
-rw-r--r--sw/source/core/layout/sectfrm.cxx198
-rw-r--r--sw/source/core/layout/softpagebreak.cxx6
-rw-r--r--sw/source/core/layout/sortedobjs.cxx2
-rw-r--r--sw/source/core/layout/sortedobjsimpl.cxx2
-rw-r--r--sw/source/core/layout/ssfrm.cxx34
-rw-r--r--sw/source/core/layout/swselectionlist.cxx4
-rw-r--r--sw/source/core/layout/tabfrm.cxx232
-rw-r--r--sw/source/core/layout/trvlfrm.cxx308
-rw-r--r--sw/source/core/layout/unusedf.cxx2
-rw-r--r--sw/source/core/layout/virtoutp.cxx10
-rw-r--r--sw/source/core/layout/virtoutp.hxx24
-rw-r--r--sw/source/core/layout/wsfrm.cxx328
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/environmentofanchoredobject.cxx2
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx16
-rw-r--r--sw/source/core/para/paratr.cxx24
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx182
-rw-r--r--sw/source/core/sw3io/swacorr.cxx12
-rw-r--r--sw/source/core/swg/SwXMLBlockExport.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx2
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx6
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx12
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx12
-rw-r--r--sw/source/core/swg/swblocks.cxx16
-rw-r--r--sw/source/core/table/swnewtable.cxx6
-rw-r--r--sw/source/core/table/swtable.cxx158
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx6
-rw-r--r--sw/source/core/text/SwGrammarMarkUp.cxx4
-rw-r--r--sw/source/core/text/atrhndl.hxx2
-rw-r--r--sw/source/core/text/atrstck.cxx12
-rw-r--r--sw/source/core/text/blink.cxx8
-rw-r--r--sw/source/core/text/frmcrsr.cxx54
-rw-r--r--sw/source/core/text/frmform.cxx102
-rw-r--r--sw/source/core/text/frminf.cxx30
-rw-r--r--sw/source/core/text/frmpaint.cxx28
-rw-r--r--sw/source/core/text/guess.cxx8
-rw-r--r--sw/source/core/text/guess.hxx14
-rw-r--r--sw/source/core/text/inftxt.cxx122
-rw-r--r--sw/source/core/text/inftxt.hxx136
-rw-r--r--sw/source/core/text/itradj.cxx2
-rw-r--r--sw/source/core/text/itratr.cxx46
-rw-r--r--sw/source/core/text/itratr.hxx10
-rw-r--r--sw/source/core/text/itrcrsr.cxx52
-rw-r--r--sw/source/core/text/itrform2.cxx86
-rw-r--r--sw/source/core/text/itrform2.hxx22
-rw-r--r--sw/source/core/text/itrpaint.cxx30
-rw-r--r--sw/source/core/text/itrpaint.hxx2
-rw-r--r--sw/source/core/text/itrtxt.cxx18
-rw-r--r--sw/source/core/text/itrtxt.hxx24
-rw-r--r--sw/source/core/text/noteurl.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx14
-rw-r--r--sw/source/core/text/porexp.cxx20
-rw-r--r--sw/source/core/text/porexp.hxx14
-rw-r--r--sw/source/core/text/porfld.cxx50
-rw-r--r--sw/source/core/text/porfld.hxx36
-rw-r--r--sw/source/core/text/porfly.cxx40
-rw-r--r--sw/source/core/text/porfly.hxx10
-rw-r--r--sw/source/core/text/porftn.hxx16
-rw-r--r--sw/source/core/text/porglue.cxx34
-rw-r--r--sw/source/core/text/porglue.hxx18
-rw-r--r--sw/source/core/text/porhyph.hxx8
-rw-r--r--sw/source/core/text/porlay.cxx52
-rw-r--r--sw/source/core/text/porlay.hxx76
-rw-r--r--sw/source/core/text/porlin.cxx36
-rw-r--r--sw/source/core/text/porlin.hxx76
-rw-r--r--sw/source/core/text/pormulti.cxx42
-rw-r--r--sw/source/core/text/pormulti.hxx34
-rw-r--r--sw/source/core/text/porref.cxx6
-rw-r--r--sw/source/core/text/porref.hxx6
-rw-r--r--sw/source/core/text/porrst.cxx22
-rw-r--r--sw/source/core/text/porrst.hxx14
-rw-r--r--sw/source/core/text/portab.hxx4
-rw-r--r--sw/source/core/text/portox.cxx6
-rw-r--r--sw/source/core/text/portox.hxx6
-rw-r--r--sw/source/core/text/portxt.cxx2
-rw-r--r--sw/source/core/text/portxt.hxx8
-rw-r--r--sw/source/core/text/possiz.hxx10
-rw-r--r--sw/source/core/text/redlnitr.cxx30
-rw-r--r--sw/source/core/text/redlnitr.hxx8
-rw-r--r--sw/source/core/text/txtcache.cxx60
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/txtcfg.hxx4
-rw-r--r--sw/source/core/text/txtdrop.cxx14
-rw-r--r--sw/source/core/text/txtfld.cxx10
-rw-r--r--sw/source/core/text/txtfly.cxx82
-rw-r--r--sw/source/core/text/txtfly.hxx14
-rw-r--r--sw/source/core/text/txtfrm.cxx90
-rw-r--r--sw/source/core/text/txtftn.cxx92
-rw-r--r--sw/source/core/text/txthyph.cxx28
-rw-r--r--sw/source/core/text/txtinit.cxx16
-rw-r--r--sw/source/core/text/txtio.cxx6
-rw-r--r--sw/source/core/text/txtpaint.cxx4
-rw-r--r--sw/source/core/text/txtpaint.hxx26
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/text/widorp.cxx38
-rw-r--r--sw/source/core/text/widorp.hxx14
-rw-r--r--sw/source/core/text/wrong.cxx10
-rw-r--r--sw/source/core/tox/tox.cxx4
-rw-r--r--sw/source/core/tox/toxhlp.cxx12
-rw-r--r--sw/source/core/tox/txmsrt.cxx26
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx6
-rw-r--r--sw/source/core/txtnode/atrfld.cxx12
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx8
-rw-r--r--sw/source/core/txtnode/atrftn.cxx24
-rw-r--r--sw/source/core/txtnode/atrref.cxx4
-rw-r--r--sw/source/core/txtnode/atrtox.cxx2
-rw-r--r--sw/source/core/txtnode/chrfmt.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx12
-rw-r--r--sw/source/core/txtnode/fntcache.cxx62
-rw-r--r--sw/source/core/txtnode/fntcap.cxx38
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx6
-rw-r--r--sw/source/core/txtnode/ndhints.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx128
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx14
-rw-r--r--sw/source/core/txtnode/swfont.cxx40
-rw-r--r--sw/source/core/txtnode/thints.cxx66
-rw-r--r--sw/source/core/txtnode/txatbase.cxx2
-rw-r--r--sw/source/core/txtnode/txatritr.cxx4
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx16
-rw-r--r--sw/source/core/txtnode/txtedt.cxx32
-rw-r--r--sw/source/core/undo/SwRewriter.cxx2
-rw-r--r--sw/source/core/undo/SwUndoField.cxx2
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx2
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx2
-rw-r--r--sw/source/core/undo/SwUndoTOXChange.cxx4
-rw-r--r--sw/source/core/undo/docundo.cxx46
-rw-r--r--sw/source/core/undo/rolbck.cxx30
-rw-r--r--sw/source/core/undo/unattr.cxx16
-rw-r--r--sw/source/core/undo/unbkmk.cxx6
-rw-r--r--sw/source/core/undo/undel.cxx28
-rw-r--r--sw/source/core/undo/undo.hrc130
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/core/undo/undobj.cxx46
-rw-r--r--sw/source/core/undo/undobj1.cxx26
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx2
-rw-r--r--sw/source/core/undo/undraw.cxx10
-rw-r--r--sw/source/core/undo/unfmco.cxx6
-rw-r--r--sw/source/core/undo/unins.cxx18
-rw-r--r--sw/source/core/undo/unmove.cxx18
-rw-r--r--sw/source/core/undo/unnum.cxx24
-rw-r--r--sw/source/core/undo/unoutl.cxx4
-rw-r--r--sw/source/core/undo/unovwr.cxx18
-rw-r--r--sw/source/core/undo/unredln.cxx16
-rw-r--r--sw/source/core/undo/unsect.cxx4
-rw-r--r--sw/source/core/undo/unsort.cxx10
-rw-r--r--sw/source/core/undo/unspnd.cxx2
-rw-r--r--sw/source/core/undo/untbl.cxx52
-rw-r--r--sw/source/core/undo/untblk.cxx16
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx2
-rw-r--r--sw/source/core/unocore/TextCursorHelper.cxx2
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx2
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx2
-rw-r--r--sw/source/core/unocore/swunohelper.cxx6
-rw-r--r--sw/source/core/unocore/unobkm.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx24
-rw-r--r--sw/source/core/unocore/unocoll.cxx22
-rw-r--r--sw/source/core/unocore/unocore.src2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx26
-rw-r--r--sw/source/core/unocore/unodraw.cxx70
-rw-r--r--sw/source/core/unocore/unoevent.cxx72
-rw-r--r--sw/source/core/unocore/unoevtlstnr.cxx8
-rw-r--r--sw/source/core/unocore/unofield.cxx270
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx70
-rw-r--r--sw/source/core/unocore/unoftn.cxx2
-rw-r--r--sw/source/core/unocore/unoidx.cxx8
-rw-r--r--sw/source/core/unocore/unomap.cxx1204
-rw-r--r--sw/source/core/unocore/unoobj.cxx16
-rw-r--r--sw/source/core/unocore/unoobj2.cxx14
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx6
-rw-r--r--sw/source/core/unocore/unoport.cxx8
-rw-r--r--sw/source/core/unocore/unoportenum.cxx22
-rw-r--r--sw/source/core/unocore/unoprnms.cxx1220
-rw-r--r--sw/source/core/unocore/unoredline.cxx28
-rw-r--r--sw/source/core/unocore/unoredlines.cxx4
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx2
-rw-r--r--sw/source/core/unocore/unosett.cxx114
-rw-r--r--sw/source/core/unocore/unosrch.cxx66
-rw-r--r--sw/source/core/unocore/unostyle.cxx44
-rw-r--r--sw/source/core/unocore/unotbl.cxx192
-rw-r--r--sw/source/core/unocore/unotext.cxx43
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx50
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx2
-rw-r--r--sw/source/core/view/printdata.cxx72
-rw-r--r--sw/source/core/view/vdraw.cxx12
-rw-r--r--sw/source/core/view/viewimp.cxx4
-rw-r--r--sw/source/core/view/viewpg.cxx14
-rw-r--r--sw/source/core/view/viewsh.cxx22
-rw-r--r--sw/source/core/view/vnew.cxx4
-rw-r--r--sw/source/core/view/vprint.cxx30
-rw-r--r--sw/source/filter/ascii/ascatr.cxx12
-rw-r--r--sw/source/filter/ascii/parasc.cxx26
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx30
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx4
-rw-r--r--sw/source/filter/basflt/docfact.cxx26
-rw-r--r--sw/source/filter/basflt/fltini.cxx22
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx22
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx388
-rw-r--r--sw/source/filter/html/css1kywd.cxx2
-rw-r--r--sw/source/filter/html/css1kywd.hxx2
-rw-r--r--sw/source/filter/html/htmlatr.cxx344
-rw-r--r--sw/source/filter/html/htmlbas.cxx22
-rw-r--r--sw/source/filter/html/htmlcss1.cxx114
-rw-r--r--sw/source/filter/html/htmlctxt.cxx18
-rw-r--r--sw/source/filter/html/htmldraw.cxx104
-rw-r--r--sw/source/filter/html/htmlfld.cxx184
-rw-r--r--sw/source/filter/html/htmlfld.hxx2
-rw-r--r--sw/source/filter/html/htmlfldw.cxx122
-rw-r--r--sw/source/filter/html/htmlfly.cxx84
-rw-r--r--sw/source/filter/html/htmlfly.hxx64
-rw-r--r--sw/source/filter/html/htmlflyt.cxx522
-rw-r--r--sw/source/filter/html/htmlform.cxx94
-rw-r--r--sw/source/filter/html/htmlform.hxx10
-rw-r--r--sw/source/filter/html/htmlforw.cxx4
-rw-r--r--sw/source/filter/html/htmlftn.cxx20
-rw-r--r--sw/source/filter/html/htmlgrin.cxx26
-rw-r--r--sw/source/filter/html/htmlnum.cxx38
-rw-r--r--sw/source/filter/html/htmlnum.hxx16
-rw-r--r--sw/source/filter/html/htmlplug.cxx28
-rw-r--r--sw/source/filter/html/htmlsect.cxx18
-rw-r--r--sw/source/filter/html/htmltab.cxx306
-rw-r--r--sw/source/filter/html/htmltabw.cxx44
-rw-r--r--sw/source/filter/html/htmlvsh.hxx2
-rw-r--r--sw/source/filter/html/parcss1.cxx24
-rw-r--r--sw/source/filter/html/parcss1.hxx56
-rw-r--r--sw/source/filter/html/svxcss1.cxx250
-rw-r--r--sw/source/filter/html/svxcss1.hxx68
-rw-r--r--sw/source/filter/html/swcss1.hxx14
-rw-r--r--sw/source/filter/html/swhtml.cxx130
-rw-r--r--sw/source/filter/html/swhtml.hxx258
-rw-r--r--sw/source/filter/html/wrthtml.cxx48
-rw-r--r--sw/source/filter/html/wrthtml.hxx280
-rw-r--r--sw/source/filter/inc/fltbase.hxx18
-rw-r--r--sw/source/filter/inc/fltglbls.hxx48
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx114
-rw-r--r--sw/source/filter/inc/msfilter.hxx70
-rw-r--r--sw/source/filter/inc/rtf.hxx22
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx6
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx86
-rw-r--r--sw/source/filter/inc/wwstyles.hxx18
-rw-r--r--sw/source/filter/rtf/rtffld.cxx158
-rw-r--r--sw/source/filter/rtf/rtffly.cxx136
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx74
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx28
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx18
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx64
-rw-r--r--sw/source/filter/writer/writer.cxx14
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx2
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx26
-rw-r--r--sw/source/filter/ww1/fltshell.cxx154
-rw-r--r--sw/source/filter/ww1/w1class.cxx58
-rw-r--r--sw/source/filter/ww1/w1class.hxx152
-rw-r--r--sw/source/filter/ww1/w1filter.cxx124
-rw-r--r--sw/source/filter/ww1/w1par.cxx16
-rw-r--r--sw/source/filter/ww1/w1par.hxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx100
-rw-r--r--sw/source/filter/ww1/w1struct.hxx260
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx50
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx22
-rw-r--r--sw/source/filter/ww8/WW8FibData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx4
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx48
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx42
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx288
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx70
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx18
-rw-r--r--sw/source/filter/ww8/docxexport.cxx38
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx2
-rw-r--r--sw/source/filter/ww8/dump/dump8.cxx4
-rw-r--r--sw/source/filter/ww8/dump/dump8a.cxx896
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.cxx12
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.hxx4
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.cxx20
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.hxx2
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.cxx26
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.hxx6
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.cxx700
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.hxx872
-rw-r--r--sw/source/filter/ww8/dump/ww8struc.hxx662
-rw-r--r--sw/source/filter/ww8/fields.cxx2
-rw-r--r--sw/source/filter/ww8/fields.hxx10
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx2
-rw-r--r--sw/source/filter/ww8/needed_cast.hxx4
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx10
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx36
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx2
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx2
-rw-r--r--sw/source/filter/ww8/staticassert.hxx2
-rw-r--r--sw/source/filter/ww8/styles.cxx8
-rw-r--r--sw/source/filter/ww8/tracer.cxx2
-rw-r--r--sw/source/filter/ww8/tracer.hxx4
-rw-r--r--sw/source/filter/ww8/types.hxx6
-rw-r--r--sw/source/filter/ww8/typessw.hxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx6
-rw-r--r--sw/source/filter/ww8/writerwordglue.hxx4
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx11
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx239
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx6
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx12
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx8
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx2
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx34
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx45
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx36
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx145
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx210
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx2
-rw-r--r--sw/source/filter/xml/ForbiddenCharactersEnum.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx36
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx42
-rw-r--r--sw/source/filter/xml/swxml.cxx10
-rw-r--r--sw/source/filter/xml/wrtxml.cxx62
-rw-r--r--sw/source/filter/xml/wrtxml.hxx10
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx18
-rw-r--r--sw/source/filter/xml/xmlbrshe.hxx10
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx12
-rw-r--r--sw/source/filter/xml/xmlexp.cxx22
-rw-r--r--sw/source/filter/xml/xmlexp.hxx28
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx36
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx14
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx20
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx50
-rw-r--r--sw/source/filter/xml/xmlimp.hxx80
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx16
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx4
-rw-r--r--sw/source/filter/xml/xmlitem.cxx2
-rw-r--r--sw/source/filter/xml/xmlitem.hxx10
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemm.cxx12
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx16
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx34
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx10
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx16
-rw-r--r--sw/source/filter/xml/xmlscript.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx22
-rw-r--r--sw/source/filter/xml/xmltbli.cxx64
-rw-r--r--sw/source/filter/xml/xmltbli.hxx36
-rw-r--r--sw/source/filter/xml/xmltext.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.cxx12
-rw-r--r--sw/source/filter/xml/xmltexti.hxx22
-rw-r--r--sw/source/ui/app/app.src22
-rw-r--r--sw/source/ui/app/appenv.cxx20
-rw-r--r--sw/source/ui/app/apphdl.cxx18
-rw-r--r--sw/source/ui/app/applab.cxx32
-rw-r--r--sw/source/ui/app/appopt.cxx40
-rw-r--r--sw/source/ui/app/docsh.cxx62
-rw-r--r--sw/source/ui/app/docsh2.cxx98
-rw-r--r--sw/source/ui/app/docshdrw.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx20
-rw-r--r--sw/source/ui/app/docst.cxx52
-rw-r--r--sw/source/ui/app/docstyle.cxx214
-rw-r--r--sw/source/ui/app/error.src14
-rw-r--r--sw/source/ui/app/mainwn.cxx4
-rw-r--r--sw/source/ui/app/mn.src4
-rw-r--r--sw/source/ui/app/swdll.cxx2
-rw-r--r--sw/source/ui/app/swmodul1.cxx20
-rw-r--r--sw/source/ui/app/swmodule.cxx16
-rw-r--r--sw/source/ui/app/swwait.cxx2
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx8
-rw-r--r--sw/source/ui/cctrl/popbox.cxx2
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx12
-rw-r--r--sw/source/ui/chrdlg/break.hrc20
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx60
-rw-r--r--sw/source/ui/chrdlg/ccoll.hrc20
-rw-r--r--sw/source/ui/chrdlg/ccoll.src2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx36
-rw-r--r--sw/source/ui/chrdlg/chardlg.hrc8
-rw-r--r--sw/source/ui/chrdlg/chardlg.src2
-rw-r--r--sw/source/ui/chrdlg/chrdlg.src2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx114
-rw-r--r--sw/source/ui/chrdlg/drpcps.hrc4
-rw-r--r--sw/source/ui/chrdlg/drpcps.src2
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx24
-rw-r--r--sw/source/ui/chrdlg/numpara.hrc8
-rw-r--r--sw/source/ui/chrdlg/numpara.src2
-rw-r--r--sw/source/ui/chrdlg/paradlg.hrc2
-rw-r--r--sw/source/ui/chrdlg/paradlg.src2
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx14
-rw-r--r--sw/source/ui/chrdlg/swbreak.src2
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx38
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/barcfg.cxx10
-rw-r--r--sw/source/ui/config/caption.cxx6
-rw-r--r--sw/source/ui/config/cfgitems.cxx144
-rw-r--r--sw/source/ui/config/config.hrc40
-rw-r--r--sw/source/ui/config/dbconfig.cxx2
-rw-r--r--sw/source/ui/config/fontcfg.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.hrc2
-rw-r--r--sw/source/ui/config/mailconfigpage.src4
-rw-r--r--sw/source/ui/config/modcfg.cxx110
-rw-r--r--sw/source/ui/config/optcomp.cxx94
-rw-r--r--sw/source/ui/config/optcomp.hrc40
-rw-r--r--sw/source/ui/config/optcomp.src2
-rw-r--r--sw/source/ui/config/optdlg.hrc80
-rw-r--r--sw/source/ui/config/optdlg.src12
-rw-r--r--sw/source/ui/config/optload.cxx100
-rw-r--r--sw/source/ui/config/optload.hrc88
-rw-r--r--sw/source/ui/config/optload.src2
-rw-r--r--sw/source/ui/config/optpage.cxx262
-rw-r--r--sw/source/ui/config/prtopt.cxx32
-rw-r--r--sw/source/ui/config/redlopt.hrc2
-rw-r--r--sw/source/ui/config/redlopt.src2
-rw-r--r--sw/source/ui/config/uinums.cxx52
-rw-r--r--sw/source/ui/config/usrpref.cxx62
-rw-r--r--sw/source/ui/config/viewopt.cxx90
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hrc2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.src2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hrc6
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src6
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hrc6
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src6
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx28
-rw-r--r--sw/source/ui/dbui/dbinsdlg.hrc48
-rw-r--r--sw/source/ui/dbui/dbinsdlg.src4
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx58
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hrc2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx8
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.src2
-rw-r--r--sw/source/ui/dbui/dbtree.cxx18
-rw-r--r--sw/source/ui/dbui/dbui.cxx50
-rw-r--r--sw/source/ui/dbui/dbui.src6
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx180
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.hrc2
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src2
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.hrc2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hrc10
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx70
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src18
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hrc2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.src2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hrc2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx42
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.src32
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hrc8
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx28
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.src2
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmmergepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx10
-rw-r--r--sw/source/ui/dbui/mmmergepage.src2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hrc4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx6
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.src2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx12
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.src2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hrc2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx8
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src2
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx4
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx8
-rw-r--r--sw/source/ui/dialog/abstract.cxx2
-rw-r--r--sw/source/ui/dialog/abstract.hrc16
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx40
-rw-r--r--sw/source/ui/dialog/ascfldlg.hrc16
-rw-r--r--sw/source/ui/dialog/ascfldlg.src2
-rw-r--r--sw/source/ui/dialog/dialog.src2
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx40
-rw-r--r--sw/source/ui/dialog/docstdlg.hrc32
-rw-r--r--sw/source/ui/dialog/docstdlg.src2
-rw-r--r--sw/source/ui/dialog/macassgn.cxx16
-rw-r--r--sw/source/ui/dialog/regionsw.cxx4
-rw-r--r--sw/source/ui/dialog/regionsw.hrc16
-rw-r--r--sw/source/ui/dialog/regionsw.src2
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx2
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx76
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx184
-rw-r--r--sw/source/ui/dialog/swuiexp.cxx2
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx6
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx172
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/dialog/wordcountdialog.hrc2
-rw-r--r--sw/source/ui/dialog/wordcountdialog.src6
-rw-r--r--sw/source/ui/dochdl/dochdl.src2
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx34
-rw-r--r--sw/source/ui/dochdl/selglos.cxx2
-rw-r--r--sw/source/ui/dochdl/selglos.hrc10
-rw-r--r--sw/source/ui/dochdl/selglos.src2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx122
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx68
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx14
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx12
-rw-r--r--sw/source/ui/docvw/edtdd.cxx20
-rw-r--r--sw/source/ui/docvw/edtwin.cxx33
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx16
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx24
-rw-r--r--sw/source/ui/docvw/romenu.cxx32
-rw-r--r--sw/source/ui/docvw/romenu.hxx14
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx46
-rw-r--r--sw/source/ui/envelp/envelp.src2
-rw-r--r--sw/source/ui/envelp/envfmt.cxx44
-rw-r--r--sw/source/ui/envelp/envfmt.hrc46
-rw-r--r--sw/source/ui/envelp/envfmt.hxx16
-rw-r--r--sw/source/ui/envelp/envfmt.src2
-rw-r--r--sw/source/ui/envelp/envimg.cxx30
-rw-r--r--sw/source/ui/envelp/envlop.hrc6
-rw-r--r--sw/source/ui/envelp/envlop.src2
-rw-r--r--sw/source/ui/envelp/envlop1.cxx14
-rw-r--r--sw/source/ui/envelp/envprt.cxx2
-rw-r--r--sw/source/ui/envelp/envprt.hrc2
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/envprt.src2
-rw-r--r--sw/source/ui/envelp/label.hrc92
-rw-r--r--sw/source/ui/envelp/label.src4
-rw-r--r--sw/source/ui/envelp/label1.cxx134
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx24
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx58
-rw-r--r--sw/source/ui/envelp/labfmt.hrc8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx62
-rw-r--r--sw/source/ui/envelp/labfmt.src4
-rw-r--r--sw/source/ui/envelp/labimg.cxx362
-rw-r--r--sw/source/ui/envelp/labimp.hxx26
-rw-r--r--sw/source/ui/envelp/labprt.cxx22
-rw-r--r--sw/source/ui/envelp/labprt.hrc4
-rw-r--r--sw/source/ui/envelp/labprt.hxx6
-rw-r--r--sw/source/ui/envelp/labprt.src2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx50
-rw-r--r--sw/source/ui/envelp/mailmrge.hrc56
-rw-r--r--sw/source/ui/envelp/mailmrge.src10
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx178
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.hrc4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx4
-rw-r--r--sw/source/ui/fldui/changedb.cxx22
-rw-r--r--sw/source/ui/fldui/changedb.hrc20
-rw-r--r--sw/source/ui/fldui/changedb.src4
-rw-r--r--sw/source/ui/fldui/flddb.cxx26
-rw-r--r--sw/source/ui/fldui/flddb.hxx48
-rw-r--r--sw/source/ui/fldui/flddb.src2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx26
-rw-r--r--sw/source/ui/fldui/flddinf.hxx34
-rw-r--r--sw/source/ui/fldui/flddinf.src2
-rw-r--r--sw/source/ui/fldui/flddok.cxx42
-rw-r--r--sw/source/ui/fldui/flddok.hxx50
-rw-r--r--sw/source/ui/fldui/flddok.src2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx42
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx48
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx46
-rw-r--r--sw/source/ui/fldui/fldfunc.src2
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx244
-rw-r--r--sw/source/ui/fldui/fldpage.cxx14
-rw-r--r--sw/source/ui/fldui/fldpage.hxx20
-rw-r--r--sw/source/ui/fldui/fldref.cxx56
-rw-r--r--sw/source/ui/fldui/fldref.hxx30
-rw-r--r--sw/source/ui/fldui/fldref.src2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx14
-rw-r--r--sw/source/ui/fldui/fldtdlg.hrc176
-rw-r--r--sw/source/ui/fldui/fldtdlg.src2
-rw-r--r--sw/source/ui/fldui/fldui.src2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx130
-rw-r--r--sw/source/ui/fldui/fldvar.hxx70
-rw-r--r--sw/source/ui/fldui/fldvar.src2
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx16
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx16
-rw-r--r--sw/source/ui/fldui/inpdlg.hrc16
-rw-r--r--sw/source/ui/fldui/inpdlg.src2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx20
-rw-r--r--sw/source/ui/fldui/javaedit.hrc30
-rw-r--r--sw/source/ui/fldui/javaedit.src2
-rw-r--r--sw/source/ui/fldui/xfldui.cxx4
-rw-r--r--sw/source/ui/fmtui/fmtui.src30
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx78
-rw-r--r--sw/source/ui/fmtui/tmpdlg.src42
-rw-r--r--sw/source/ui/frmdlg/colex.cxx4
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx12
-rw-r--r--sw/source/ui/frmdlg/column.cxx76
-rw-r--r--sw/source/ui/frmdlg/column.hrc68
-rw-r--r--sw/source/ui/frmdlg/column.src12
-rw-r--r--sw/source/ui/frmdlg/cption.cxx36
-rw-r--r--sw/source/ui/frmdlg/cption.hrc14
-rw-r--r--sw/source/ui/frmdlg/cption.src2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx30
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx52
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx172
-rw-r--r--sw/source/ui/frmdlg/frmpage.hrc100
-rw-r--r--sw/source/ui/frmdlg/frmpage.src2
-rw-r--r--sw/source/ui/frmdlg/frmui.src2
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/pattern.hrc28
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx38
-rw-r--r--sw/source/ui/frmdlg/wrap.hrc50
-rw-r--r--sw/source/ui/frmdlg/wrap.src2
-rw-r--r--sw/source/ui/globdoc/globdoc.cxx6
-rw-r--r--sw/source/ui/globdoc/globdoc.src2
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx6
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx8
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx10
-rw-r--r--sw/source/ui/inc/abstract.hxx22
-rw-r--r--sw/source/ui/inc/actctrl.hxx20
-rw-r--r--sw/source/ui/inc/addrdlg.hxx2
-rw-r--r--sw/source/ui/inc/annotsh.hxx36
-rw-r--r--sw/source/ui/inc/app.hrc84
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx32
-rw-r--r--sw/source/ui/inc/autoedit.hxx2
-rw-r--r--sw/source/ui/inc/barcfg.hxx2
-rw-r--r--sw/source/ui/inc/basesh.hxx38
-rw-r--r--sw/source/ui/inc/beziersh.hxx6
-rw-r--r--sw/source/ui/inc/bmpwin.hxx4
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx28
-rw-r--r--sw/source/ui/inc/break.hxx26
-rw-r--r--sw/source/ui/inc/caption.hxx60
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx22
-rw-r--r--sw/source/ui/inc/cfgid.h8
-rw-r--r--sw/source/ui/inc/cfgitems.hxx64
-rw-r--r--sw/source/ui/inc/changedb.hxx36
-rw-r--r--sw/source/ui/inc/chartins.hxx2
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx24
-rw-r--r--sw/source/ui/inc/cnttab.hxx10
-rw-r--r--sw/source/ui/inc/colex.hxx6
-rw-r--r--sw/source/ui/inc/colmgr.hxx56
-rw-r--r--sw/source/ui/inc/column.hxx138
-rw-r--r--sw/source/ui/inc/conarc.hxx12
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx12
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx6
-rw-r--r--sw/source/ui/inc/conrect.hxx8
-rw-r--r--sw/source/ui/inc/content.hxx110
-rw-r--r--sw/source/ui/inc/conttree.hxx244
-rw-r--r--sw/source/ui/inc/convert.hxx36
-rw-r--r--sw/source/ui/inc/cption.hxx36
-rw-r--r--sw/source/ui/inc/dbconfig.hxx6
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx68
-rw-r--r--sw/source/ui/inc/dbtree.hxx26
-rw-r--r--sw/source/ui/inc/dbui.hxx24
-rw-r--r--sw/source/ui/inc/dialmgr.hxx12
-rw-r--r--sw/source/ui/inc/docfnote.hxx2
-rw-r--r--sw/source/ui/inc/docstdlg.hxx6
-rw-r--r--sw/source/ui/inc/drawbase.hxx16
-rw-r--r--sw/source/ui/inc/drawsh.hxx16
-rw-r--r--sw/source/ui/inc/drformsh.hxx8
-rw-r--r--sw/source/ui/inc/drpcps.hxx38
-rw-r--r--sw/source/ui/inc/drwbassh.hxx20
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx52
-rw-r--r--sw/source/ui/inc/dselect.hxx6
-rw-r--r--sw/source/ui/inc/edtwin.hxx226
-rw-r--r--sw/source/ui/inc/envimg.hxx14
-rw-r--r--sw/source/ui/inc/envlop.hxx32
-rw-r--r--sw/source/ui/inc/fldedt.hxx14
-rw-r--r--sw/source/ui/inc/fldmgr.hxx76
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx18
-rw-r--r--sw/source/ui/inc/fldwrap.hxx6
-rw-r--r--sw/source/ui/inc/fontcfg.hxx6
-rw-r--r--sw/source/ui/inc/formatclipboard.hxx2
-rw-r--r--sw/source/ui/inc/formedt.hxx50
-rw-r--r--sw/source/ui/inc/frmdlg.hxx16
-rw-r--r--sw/source/ui/inc/frmmgr.hxx92
-rw-r--r--sw/source/ui/inc/frmpage.hxx186
-rw-r--r--sw/source/ui/inc/frmsh.hxx16
-rw-r--r--sw/source/ui/inc/frmui.hrc74
-rw-r--r--sw/source/ui/inc/globals.h2
-rw-r--r--sw/source/ui/inc/globdoc.hrc10
-rw-r--r--sw/source/ui/inc/glosbib.hxx36
-rw-r--r--sw/source/ui/inc/glosdoc.hxx44
-rw-r--r--sw/source/ui/inc/gloshdl.hxx60
-rw-r--r--sw/source/ui/inc/gloslst.hxx42
-rw-r--r--sw/source/ui/inc/glossary.hxx92
-rw-r--r--sw/source/ui/inc/glshell.hxx44
-rw-r--r--sw/source/ui/inc/grfsh.hxx8
-rw-r--r--sw/source/ui/inc/hidfunc.h650
-rw-r--r--sw/source/ui/inc/hyp.hxx32
-rw-r--r--sw/source/ui/inc/idxmrk.hxx10
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx24
-rw-r--r--sw/source/ui/inc/initui.hxx22
-rw-r--r--sw/source/ui/inc/inpdlg.hxx26
-rw-r--r--sw/source/ui/inc/inputwin.hxx70
-rw-r--r--sw/source/ui/inc/insfnote.hxx40
-rw-r--r--sw/source/ui/inc/insrule.hxx20
-rw-r--r--sw/source/ui/inc/instable.hxx34
-rw-r--r--sw/source/ui/inc/javaedit.hxx20
-rw-r--r--sw/source/ui/inc/label.hxx42
-rw-r--r--sw/source/ui/inc/labelcfg.hxx8
-rw-r--r--sw/source/ui/inc/labimg.hxx126
-rw-r--r--sw/source/ui/inc/langhelper.hxx16
-rw-r--r--sw/source/ui/inc/linenum.hxx50
-rw-r--r--sw/source/ui/inc/listsh.hxx6
-rw-r--r--sw/source/ui/inc/macassgn.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx10
-rw-r--r--sw/source/ui/inc/maildispatcher.hxx72
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx2
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx16
-rw-r--r--sw/source/ui/inc/mailmrge.hxx66
-rw-r--r--sw/source/ui/inc/mediash.hxx6
-rw-r--r--sw/source/ui/inc/mergetbl.hxx14
-rw-r--r--sw/source/ui/inc/misc.hrc106
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx14
-rw-r--r--sw/source/ui/inc/multmrk.hxx22
-rw-r--r--sw/source/ui/inc/navicfg.hxx42
-rw-r--r--sw/source/ui/inc/navicont.hxx24
-rw-r--r--sw/source/ui/inc/navipi.hxx100
-rw-r--r--sw/source/ui/inc/num.hxx78
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx14
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx30
-rw-r--r--sw/source/ui/inc/numpara.hxx42
-rw-r--r--sw/source/ui/inc/numprevw.hxx26
-rw-r--r--sw/source/ui/inc/olesh.hxx2
-rw-r--r--sw/source/ui/inc/olmenu.hxx18
-rw-r--r--sw/source/ui/inc/optcomp.hxx46
-rw-r--r--sw/source/ui/inc/optload.hxx118
-rw-r--r--sw/source/ui/inc/optpage.hxx252
-rw-r--r--sw/source/ui/inc/outline.hxx80
-rw-r--r--sw/source/ui/inc/pardlg.hxx6
-rw-r--r--sw/source/ui/inc/pattern.hxx2
-rw-r--r--sw/source/ui/inc/pgfnote.hxx42
-rw-r--r--sw/source/ui/inc/pggrid.hxx10
-rw-r--r--sw/source/ui/inc/popbox.hxx12
-rw-r--r--sw/source/ui/inc/popup.hrc36
-rw-r--r--sw/source/ui/inc/prcntfld.hxx12
-rw-r--r--sw/source/ui/inc/prtopt.hxx4
-rw-r--r--sw/source/ui/inc/pview.hxx16
-rw-r--r--sw/source/ui/inc/redlndlg.hxx134
-rw-r--r--sw/source/ui/inc/regionsw.hxx100
-rw-r--r--sw/source/ui/inc/ribbar.hrc72
-rw-r--r--sw/source/ui/inc/rowht.hxx14
-rw-r--r--sw/source/ui/inc/scroll.hxx30
-rw-r--r--sw/source/ui/inc/selglos.hxx20
-rw-r--r--sw/source/ui/inc/sharedconnection.hxx2
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx8
-rw-r--r--sw/source/ui/inc/shells.hrc34
-rw-r--r--sw/source/ui/inc/split.hxx16
-rw-r--r--sw/source/ui/inc/splittbl.hxx18
-rw-r--r--sw/source/ui/inc/srcedtw.hxx94
-rw-r--r--sw/source/ui/inc/srcview.hxx36
-rw-r--r--sw/source/ui/inc/srtdlg.hxx60
-rw-r--r--sw/source/ui/inc/stmenu.hxx6
-rw-r--r--sw/source/ui/inc/swcont.hxx50
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx68
-rw-r--r--sw/source/ui/inc/swlbox.hxx52
-rw-r--r--sw/source/ui/inc/swmn_tmpl.hrc22
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx10
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx18
-rw-r--r--sw/source/ui/inc/swtablerep.hxx76
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx32
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx394
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx198
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx4
-rw-r--r--sw/source/ui/inc/swvset.hxx4
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx10
-rw-r--r--sw/source/ui/inc/syncbtn.hxx8
-rw-r--r--sw/source/ui/inc/table.hrc32
-rw-r--r--sw/source/ui/inc/tabledlg.hxx6
-rw-r--r--sw/source/ui/inc/tablemgr.hxx22
-rw-r--r--sw/source/ui/inc/tabsh.hxx14
-rw-r--r--sw/source/ui/inc/tautofmt.hxx56
-rw-r--r--sw/source/ui/inc/tblctrl.hxx6
-rw-r--r--sw/source/ui/inc/tblnumfm.hxx2
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx2
-rw-r--r--sw/source/ui/inc/textcontrolcombo.hxx22
-rw-r--r--sw/source/ui/inc/textsh.hxx54
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx12
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toolbox_tmpl.hrc2
-rw-r--r--sw/source/ui/inc/toxmgr.hxx218
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx18
-rw-r--r--sw/source/ui/inc/uinums.hxx26
-rw-r--r--sw/source/ui/inc/uitool.hxx14
-rw-r--r--sw/source/ui/inc/uivwimp.hxx34
-rw-r--r--sw/source/ui/inc/unodispatch.hxx8
-rw-r--r--sw/source/ui/inc/unotools.hxx48
-rw-r--r--sw/source/ui/inc/unotxvw.hxx20
-rw-r--r--sw/source/ui/inc/usrpref.hxx54
-rw-r--r--sw/source/ui/inc/utlui.hrc88
-rw-r--r--sw/source/ui/inc/view.hxx368
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx2
-rw-r--r--sw/source/ui/inc/web.hrc56
-rw-r--r--sw/source/ui/inc/wformsh.hxx2
-rw-r--r--sw/source/ui/inc/wfrmsh.hxx2
-rw-r--r--sw/source/ui/inc/wgrfsh.hxx2
-rw-r--r--sw/source/ui/inc/wlistsh.hxx2
-rw-r--r--sw/source/ui/inc/wolesh.hxx2
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/ui/inc/workctrl.hxx76
-rw-r--r--sw/source/ui/inc/wrap.hxx72
-rw-r--r--sw/source/ui/inc/wrtsh.hxx376
-rw-r--r--sw/source/ui/inc/wtabsh.hxx2
-rw-r--r--sw/source/ui/inc/wtextsh.hxx2
-rw-r--r--sw/source/ui/inc/wview.hxx4
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx8
-rw-r--r--sw/source/ui/index/cnttab.cxx498
-rw-r--r--sw/source/ui/index/cnttab.hrc236
-rw-r--r--sw/source/ui/index/cnttab.src88
-rw-r--r--sw/source/ui/index/idxmrk.cxx14
-rw-r--r--sw/source/ui/index/idxmrk.hrc102
-rw-r--r--sw/source/ui/index/idxmrk.src166
-rw-r--r--sw/source/ui/index/multmrk.cxx10
-rw-r--r--sw/source/ui/index/multmrk.hrc12
-rw-r--r--sw/source/ui/index/multmrk.src2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx192
-rw-r--r--sw/source/ui/index/toxmgr.cxx14
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx8
-rw-r--r--sw/source/ui/lingu/hyp.cxx8
-rw-r--r--sw/source/ui/lingu/olmenu.cxx34
-rw-r--r--sw/source/ui/lingu/olmenu.hrc2
-rw-r--r--sw/source/ui/lingu/olmenu.src14
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx16
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.hxx14
-rw-r--r--sw/source/ui/misc/autocorr.src2
-rw-r--r--sw/source/ui/misc/bookmark.cxx20
-rw-r--r--sw/source/ui/misc/bookmark.hrc10
-rw-r--r--sw/source/ui/misc/bookmark.src2
-rw-r--r--sw/source/ui/misc/docfnote.cxx18
-rw-r--r--sw/source/ui/misc/docfnote.hrc40
-rw-r--r--sw/source/ui/misc/docfnote.src2
-rw-r--r--sw/source/ui/misc/glosbib.cxx30
-rw-r--r--sw/source/ui/misc/glosbib.hrc14
-rw-r--r--sw/source/ui/misc/glosbib.src2
-rw-r--r--sw/source/ui/misc/glosdoc.cxx42
-rw-r--r--sw/source/ui/misc/glossary.cxx76
-rw-r--r--sw/source/ui/misc/glossary.hrc68
-rw-r--r--sw/source/ui/misc/glossary.src2
-rw-r--r--sw/source/ui/misc/glshell.cxx4
-rw-r--r--sw/source/ui/misc/impfnote.hxx48
-rw-r--r--sw/source/ui/misc/insfnote.cxx24
-rw-r--r--sw/source/ui/misc/insfnote.hrc24
-rw-r--r--sw/source/ui/misc/insfnote.src2
-rw-r--r--sw/source/ui/misc/insrule.cxx4
-rw-r--r--sw/source/ui/misc/insrule.hrc10
-rw-r--r--sw/source/ui/misc/insrule.src2
-rw-r--r--sw/source/ui/misc/linenum.cxx70
-rw-r--r--sw/source/ui/misc/linenum.hrc16
-rw-r--r--sw/source/ui/misc/linenum.src2
-rw-r--r--sw/source/ui/misc/num.cxx24
-rw-r--r--sw/source/ui/misc/num.hrc16
-rw-r--r--sw/source/ui/misc/num.src4
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx8
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.src20
-rw-r--r--sw/source/ui/misc/outline.cxx134
-rw-r--r--sw/source/ui/misc/outline.hrc22
-rw-r--r--sw/source/ui/misc/outline.src4
-rw-r--r--sw/source/ui/misc/pgfnote.cxx46
-rw-r--r--sw/source/ui/misc/pgfnote.hrc32
-rw-r--r--sw/source/ui/misc/pgfnote.src2
-rw-r--r--sw/source/ui/misc/pggrid.cxx28
-rw-r--r--sw/source/ui/misc/pggrid.hrc2
-rw-r--r--sw/source/ui/misc/pggrid.src2
-rw-r--r--sw/source/ui/misc/redlndlg.cxx84
-rw-r--r--sw/source/ui/misc/redlndlg.hrc22
-rw-r--r--sw/source/ui/misc/redlndlg.src2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx64
-rw-r--r--sw/source/ui/misc/srtdlg.hrc10
-rw-r--r--sw/source/ui/misc/srtdlg.src2
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx8
-rw-r--r--sw/source/ui/misc/titlepage.src6
-rw-r--r--sw/source/ui/ribbar/conarc.cxx10
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx4
-rw-r--r--sw/source/ui/ribbar/conform.cxx2
-rw-r--r--sw/source/ui/ribbar/conpoly.cxx2
-rw-r--r--sw/source/ui/ribbar/conrect.cxx2
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx12
-rw-r--r--sw/source/ui/ribbar/dselect.cxx4
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx32
-rw-r--r--sw/source/ui/ribbar/inputwin.hrc70
-rw-r--r--sw/source/ui/ribbar/inputwin.src2
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx8
-rw-r--r--sw/source/ui/ribbar/tblctrl.hrc4
-rw-r--r--sw/source/ui/ribbar/tblctrl.src2
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx12
-rw-r--r--sw/source/ui/ribbar/tbxanchr.src2
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx6
-rw-r--r--sw/source/ui/ribbar/workctrl.hrc30
-rw-r--r--sw/source/ui/ribbar/workctrl.src2
-rw-r--r--sw/source/ui/shells/annotsh.cxx18
-rw-r--r--sw/source/ui/shells/basesh.cxx64
-rw-r--r--sw/source/ui/shells/beziersh.cxx10
-rw-r--r--sw/source/ui/shells/drawdlg.cxx14
-rw-r--r--sw/source/ui/shells/drawsh.cxx22
-rw-r--r--sw/source/ui/shells/drformsh.cxx4
-rw-r--r--sw/source/ui/shells/drwbassh.cxx22
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx56
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx26
-rw-r--r--sw/source/ui/shells/frmsh.cxx38
-rw-r--r--sw/source/ui/shells/grfsh.cxx30
-rw-r--r--sw/source/ui/shells/grfshex.cxx18
-rw-r--r--sw/source/ui/shells/langhelper.cxx62
-rw-r--r--sw/source/ui/shells/listsh.cxx4
-rw-r--r--sw/source/ui/shells/mediash.cxx18
-rw-r--r--sw/source/ui/shells/olesh.cxx2
-rw-r--r--sw/source/ui/shells/shells.src2
-rw-r--r--sw/source/ui/shells/slotadd.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx80
-rw-r--r--sw/source/ui/shells/textfld.cxx32
-rw-r--r--sw/source/ui/shells/textglos.cxx2
-rw-r--r--sw/source/ui/shells/textidx.cxx12
-rw-r--r--sw/source/ui/shells/textsh.cxx12
-rw-r--r--sw/source/ui/shells/textsh1.cxx14
-rw-r--r--sw/source/ui/shells/textsh2.cxx28
-rw-r--r--sw/source/ui/shells/txtattr.cxx42
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx28
-rw-r--r--sw/source/ui/shells/txtnum.cxx2
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx2
-rw-r--r--sw/source/ui/smartmenu/stmenu.hrc2
-rw-r--r--sw/source/ui/smartmenu/stmenu.src2
-rw-r--r--sw/source/ui/table/chartins.cxx4
-rw-r--r--sw/source/ui/table/chartins.hrc10
-rw-r--r--sw/source/ui/table/chartins.src2
-rw-r--r--sw/source/ui/table/colwd.cxx16
-rw-r--r--sw/source/ui/table/colwd.hrc16
-rw-r--r--sw/source/ui/table/colwd.src2
-rw-r--r--sw/source/ui/table/convert.cxx22
-rw-r--r--sw/source/ui/table/convert.hrc34
-rw-r--r--sw/source/ui/table/convert.src2
-rw-r--r--sw/source/ui/table/instable.cxx30
-rw-r--r--sw/source/ui/table/instable.hrc32
-rw-r--r--sw/source/ui/table/instable.src2
-rw-r--r--sw/source/ui/table/mergetbl.cxx14
-rw-r--r--sw/source/ui/table/mergetbl.hrc6
-rw-r--r--sw/source/ui/table/mergetbl.src2
-rw-r--r--sw/source/ui/table/rowht.cxx2
-rw-r--r--sw/source/ui/table/rowht.hrc12
-rw-r--r--sw/source/ui/table/rowht.src2
-rw-r--r--sw/source/ui/table/splittbl.cxx18
-rw-r--r--sw/source/ui/table/splittbl.hrc10
-rw-r--r--sw/source/ui/table/splittbl.src2
-rw-r--r--sw/source/ui/table/swtablerep.cxx4
-rw-r--r--sw/source/ui/table/table.src2
-rw-r--r--sw/source/ui/table/tabledlg.cxx152
-rw-r--r--sw/source/ui/table/tabledlg.hrc124
-rw-r--r--sw/source/ui/table/tabledlg.src14
-rw-r--r--sw/source/ui/table/tablemgr.cxx20
-rw-r--r--sw/source/ui/table/tablepg.hxx198
-rw-r--r--sw/source/ui/table/tautofmt.cxx172
-rw-r--r--sw/source/ui/table/tautofmt.hrc64
-rw-r--r--sw/source/ui/table/tautofmt.src2
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx8
-rw-r--r--sw/source/ui/uiview/pview.cxx54
-rw-r--r--sw/source/ui/uiview/pview.hrc28
-rw-r--r--sw/source/ui/uiview/pview.src2
-rw-r--r--sw/source/ui/uiview/scroll.cxx10
-rw-r--r--sw/source/ui/uiview/srcview.cxx34
-rw-r--r--sw/source/ui/uiview/swcli.cxx10
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx6
-rw-r--r--sw/source/ui/uiview/view.cxx126
-rw-r--r--sw/source/ui/uiview/view.hrc36
-rw-r--r--sw/source/ui/uiview/view.src2
-rw-r--r--sw/source/ui/uiview/view0.cxx6
-rw-r--r--sw/source/ui/uiview/view1.cxx6
-rw-r--r--sw/source/ui/uiview/view2.cxx118
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx2
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx2
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx4
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx34
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx2
-rw-r--r--sw/source/ui/uiview/viewling.cxx82
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx20
-rw-r--r--sw/source/ui/uiview/viewport.cxx86
-rw-r--r--sw/source/ui/uiview/viewprt.cxx34
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx60
-rw-r--r--sw/source/ui/uiview/viewstat.cxx12
-rw-r--r--sw/source/ui/uiview/viewtab.cxx72
-rw-r--r--sw/source/ui/uno/RefreshListenerContainer.cxx2
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx80
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx10
-rw-r--r--sw/source/ui/uno/SwXFilterOptions.cxx2
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.cxx40
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.hxx6
-rw-r--r--sw/source/ui/uno/detreg.cxx12
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx20
-rw-r--r--sw/source/ui/uno/swdet2.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.hxx6
-rw-r--r--sw/source/ui/uno/unoatxt.cxx14
-rw-r--r--sw/source/ui/uno/unodefaults.cxx2
-rw-r--r--sw/source/ui/uno/unodefaults.hxx2
-rw-r--r--sw/source/ui/uno/unodispatch.cxx10
-rw-r--r--sw/source/ui/uno/unodoc.cxx2
-rw-r--r--sw/source/ui/uno/unofreg.cxx32
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx38
-rw-r--r--sw/source/ui/uno/unomod.cxx142
-rw-r--r--sw/source/ui/uno/unomodule.cxx2
-rw-r--r--sw/source/ui/uno/unomodule.hxx26
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx46
-rw-r--r--sw/source/ui/uno/unotxvw.cxx50
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx148
-rw-r--r--sw/source/ui/utlui/attrdesc.hrc138
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx6
-rw-r--r--sw/source/ui/utlui/condedit.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx164
-rw-r--r--sw/source/ui/utlui/glbltree.cxx106
-rw-r--r--sw/source/ui/utlui/gloslst.cxx32
-rw-r--r--sw/source/ui/utlui/gloslst.hrc2
-rw-r--r--sw/source/ui/utlui/gloslst.src2
-rw-r--r--sw/source/ui/utlui/initui.cxx38
-rw-r--r--sw/source/ui/utlui/initui.hrc48
-rw-r--r--sw/source/ui/utlui/initui.src2
-rw-r--r--sw/source/ui/utlui/navicfg.cxx22
-rw-r--r--sw/source/ui/utlui/navipi.cxx48
-rw-r--r--sw/source/ui/utlui/navipi.hrc50
-rw-r--r--sw/source/ui/utlui/navipi.src28
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx38
-rw-r--r--sw/source/ui/utlui/poolfmt.src2
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx14
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx2
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx2
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx36
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx6
-rw-r--r--sw/source/ui/utlui/uiitems.cxx10
-rw-r--r--sw/source/ui/utlui/uitool.cxx46
-rw-r--r--sw/source/ui/utlui/unotools.cxx20
-rw-r--r--sw/source/ui/utlui/unotools.hrc6
-rw-r--r--sw/source/ui/utlui/unotools.src8
-rw-r--r--sw/source/ui/utlui/utlui.src6
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx2
-rw-r--r--sw/source/ui/vba/service.cxx12
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx6
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx2
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx6
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx6
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx12
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx10
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx6
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx6
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx4
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx26
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx6
-rw-r--r--sw/source/ui/vba/vbaborders.hxx8
-rw-r--r--sw/source/ui/vba/vbadialog.cxx8
-rw-r--r--sw/source/ui/vba/vbadialog.hxx2
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx54
-rw-r--r--sw/source/ui/vba/vbadocument.hxx2
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx140
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx4
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx14
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx4
-rw-r--r--sw/source/ui/vba/vbafind.cxx12
-rw-r--r--sw/source/ui/vba/vbafind.hxx2
-rw-r--r--sw/source/ui/vba/vbafont.cxx26
-rw-r--r--sw/source/ui/vba/vbafont.hxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx22
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx2
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.hxx2
-rw-r--r--sw/source/ui/vba/vbainformationhelper.cxx4
-rw-r--r--sw/source/ui/vba/vbainformationhelper.hxx2
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx10
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx4
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx16
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx10
-rw-r--r--sw/source/ui/vba/vbapalette.cxx4
-rw-r--r--sw/source/ui/vba/vbapalette.hxx2
-rw-r--r--sw/source/ui/vba/vbapane.cxx8
-rw-r--r--sw/source/ui/vba/vbapane.hxx4
-rw-r--r--sw/source/ui/vba/vbapanes.cxx8
-rw-r--r--sw/source/ui/vba/vbapanes.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx20
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx18
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx4
-rw-r--r--sw/source/ui/vba/vbarange.hxx4
-rw-r--r--sw/source/ui/vba/vbarangehelper.cxx8
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx2
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx6
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx2
-rw-r--r--sw/source/ui/vba/vbasection.cxx6
-rw-r--r--sw/source/ui/vba/vbasection.hxx2
-rw-r--r--sw/source/ui/vba/vbasections.cxx14
-rw-r--r--sw/source/ui/vba/vbasections.hxx6
-rw-r--r--sw/source/ui/vba/vbaselection.hxx4
-rw-r--r--sw/source/ui/vba/vbastyle.cxx8
-rw-r--r--sw/source/ui/vba/vbastyle.hxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx16
-rw-r--r--sw/source/ui/vba/vbastyles.hxx6
-rw-r--r--sw/source/ui/vba/vbasystem.hxx4
-rw-r--r--sw/source/ui/vba/vbatable.cxx20
-rw-r--r--sw/source/ui/vba/vbatable.hxx2
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbatables.hxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx4
-rw-r--r--sw/source/ui/vba/vbavariable.cxx6
-rw-r--r--sw/source/ui/vba/vbavariable.hxx4
-rw-r--r--sw/source/ui/vba/vbavariables.cxx6
-rw-r--r--sw/source/ui/vba/vbavariables.hxx6
-rw-r--r--sw/source/ui/vba/vbaview.cxx34
-rw-r--r--sw/source/ui/vba/vbaview.hxx4
-rw-r--r--sw/source/ui/vba/vbawindow.hxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx8
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx2
-rw-r--r--sw/source/ui/vba/wordvbahelper.hxx6
-rw-r--r--sw/source/ui/web/wdocsh.cxx6
-rw-r--r--sw/source/ui/web/web.src2
-rw-r--r--sw/source/ui/web/wformsh.cxx2
-rw-r--r--sw/source/ui/web/wfrmsh.cxx2
-rw-r--r--sw/source/ui/web/wgrfsh.cxx2
-rw-r--r--sw/source/ui/web/wlistsh.cxx2
-rw-r--r--sw/source/ui/web/wolesh.cxx2
-rw-r--r--sw/source/ui/web/wtabsh.cxx2
-rw-r--r--sw/source/ui/web/wtextsh.cxx2
-rw-r--r--sw/source/ui/web/wview.cxx8
-rw-r--r--sw/source/ui/wrtsh/delete.cxx10
-rw-r--r--sw/source/ui/wrtsh/move.cxx32
-rw-r--r--sw/source/ui/wrtsh/select.cxx48
-rw-r--r--sw/source/ui/wrtsh/wrtsh.hrc2
-rw-r--r--sw/source/ui/wrtsh/wrtsh.src2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx74
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx24
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx12
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx6
-rw-r--r--sw/uiconfig/sglobal/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/sglobal/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/sglobal/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/sglobal/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/sweb/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/sweb/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/sweb/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/sweb/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swform/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swform/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swform/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swform/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swreport/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swreport/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swreport/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swreport/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swriter/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swriter/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swriter/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swriter/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swxform/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swxform/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swxform/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swxform/toolbar/symbolshapes.xml6
-rw-r--r--sw/util/hidother.hrc4
-rw-r--r--sw/util/hidother.src326
-rw-r--r--sw/xml/writer.xml60
1952 files changed, 39576 insertions, 39543 deletions
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 2463edc983f0..5583cf93602a 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ class SmDocShell;
class SmFormatAction: public SfxUndoAction
{
- SmDocShell *pDoc;
+ SmDocShell *pDoc;
SmFormat aOldFormat;
SmFormat aNewFormat;
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 1b896164099f..e23290682c6c 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -2,7 +2,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
@@ -34,8 +34,8 @@ class SvxErrorHandler;
#include <sfx2/app.hxx>
-#define SMDLL 1
-#define APPLICATIONNAME "smath3"
+#define SMDLL 1
+#define APPLICATIONNAME "smath3"
#ifdef WIN
@@ -75,10 +75,10 @@ class SmApplicat: public SfxApplication
protected:
SvxErrorHandler *pSvxErrorHandler;
- virtual void OpenClients();
+ virtual void OpenClients();
// initialization / deinitialization
- virtual void Init();
+ virtual void Init();
virtual void Exit();
public:
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
index 9d87ba0abd2b..2c225ea818bb 100644
--- a/starmath/inc/config.hxx
+++ b/starmath/inc/config.hxx
@@ -2,7 +2,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
@@ -42,14 +42,14 @@ class SfxItemSet;
class SmConfig : public SmMathConfig, public SfxBroadcaster
{
- SmFontPickList vFontPickList[7];
+ SmFontPickList vFontPickList[7];
public:
SmConfig();
virtual ~SmConfig();
SmFontPickList & GetFontPickList(USHORT nIdent) { return vFontPickList[nIdent]; }
-
+
void ItemSetToConfig(const SfxItemSet &rSet);
void ConfigToItemSet(SfxItemSet &rSet) const;
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index fcad9688f940..b758df5e2adf 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -2,7 +2,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
@@ -50,32 +50,32 @@
#include "symbol.hxx"
class SubsetMap;
-#define CATEGORY_NONE 0xFFFF
+#define CATEGORY_NONE 0xFFFF
/**************************************************************************/
-void SetFontStyle(const XubString &rStyleName, Font &rFont);
+void SetFontStyle(const XubString &rStyleName, Font &rFont);
/**************************************************************************/
class SmPrintOptionsTabPage : public SfxTabPage
{
FixedLine aFixedLine1;
- CheckBox aTitle;
- CheckBox aText;
- CheckBox aFrame;
+ CheckBox aTitle;
+ CheckBox aText;
+ CheckBox aFrame;
FixedLine aFixedLine2;
- RadioButton aSizeNormal;
- RadioButton aSizeScaled;
- RadioButton aSizeZoomed;
- MetricField aZoom;
+ RadioButton aSizeNormal;
+ RadioButton aSizeScaled;
+ RadioButton aSizeZoomed;
+ MetricField aZoom;
FixedLine aFixedLine3;
- CheckBox aNoRightSpaces;
+ CheckBox aNoRightSpaces;
DECL_LINK(SizeButtonClickHdl, Button *);
- virtual BOOL FillItemSet(SfxItemSet& rSet);
- virtual void Reset(const SfxItemSet& rSet);
+ virtual BOOL FillItemSet(SfxItemSet& rSet);
+ virtual void Reset(const SfxItemSet& rSet);
public:
static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet);
@@ -87,7 +87,7 @@ public:
class SmShowFont : public Control
{
- virtual void Paint(const Rectangle&);
+ virtual void Paint(const Rectangle&);
public:
SmShowFont(Window *pParent, const ResId& rResId) :
@@ -100,16 +100,16 @@ public:
class SmFontDialog : public ModalDialog
{
- FixedText aFixedText1;
- ComboBox aFontBox;
- CheckBox aBoldCheckBox;
- CheckBox aItalicCheckBox;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- SmShowFont aShowFont;
+ FixedText aFixedText1;
+ ComboBox aFontBox;
+ CheckBox aBoldCheckBox;
+ CheckBox aItalicCheckBox;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ SmShowFont aShowFont;
FixedText aFixedText2;
- Font Face;
+ Font Face;
DECL_LINK(FontSelectHdl, ComboBox *);
DECL_LINK(FontModifyHdl, ComboBox *);
@@ -122,30 +122,30 @@ class SmFontDialog : public ModalDialog
public:
SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes = TRUE);
- const Font& GetFont() const { return Face; }
- void SetFont(const Font &rFont);
+ const Font& GetFont() const { return Face; }
+ void SetFont(const Font &rFont);
};
/**************************************************************************/
class SmFontSizeDialog : public ModalDialog
{
- FixedText aFixedText1;
- MetricField aBaseSize;
- FixedText aFixedText4;
- MetricField aTextSize;
- FixedText aFixedText5;
- MetricField aIndexSize;
- FixedText aFixedText6;
- MetricField aFunctionSize;
- FixedText aFixedText7;
- MetricField aOperatorSize;
- FixedText aFixedText8;
- MetricField aBorderSize;
+ FixedText aFixedText1;
+ MetricField aBaseSize;
+ FixedText aFixedText4;
+ MetricField aTextSize;
+ FixedText aFixedText5;
+ MetricField aIndexSize;
+ FixedText aFixedText6;
+ MetricField aFunctionSize;
+ FixedText aFixedText7;
+ MetricField aOperatorSize;
+ FixedText aFixedText8;
+ MetricField aBorderSize;
FixedLine aFixedLine1;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- PushButton aDefaultButton;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ PushButton aDefaultButton;
DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -160,26 +160,26 @@ public:
class SmFontTypeDialog : public ModalDialog
{
- FixedText aFixedText1;
- SmFontPickListBox aVariableFont;
- FixedText aFixedText2;
- SmFontPickListBox aFunctionFont;
- FixedText aFixedText3;
- SmFontPickListBox aNumberFont;
- FixedText aFixedText4;
- SmFontPickListBox aTextFont;
- FixedText aFixedText5;
- SmFontPickListBox aSerifFont;
- FixedText aFixedText6;
- SmFontPickListBox aSansFont;
- FixedText aFixedText7;
- SmFontPickListBox aFixedFont;
+ FixedText aFixedText1;
+ SmFontPickListBox aVariableFont;
+ FixedText aFixedText2;
+ SmFontPickListBox aFunctionFont;
+ FixedText aFixedText3;
+ SmFontPickListBox aNumberFont;
+ FixedText aFixedText4;
+ SmFontPickListBox aTextFont;
+ FixedText aFixedText5;
+ SmFontPickListBox aSerifFont;
+ FixedText aFixedText6;
+ SmFontPickListBox aSansFont;
+ FixedText aFixedText7;
+ SmFontPickListBox aFixedFont;
FixedLine aFixedLine1;
FixedLine aFixedLine2;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ MenuButton aMenuButton;
+ PushButton aDefaultButton;
OutputDevice *pFontListDev;
@@ -195,12 +195,12 @@ public:
/**************************************************************************/
-#define NOCATEGORIES 10
+#define NOCATEGORIES 10
class SmCategoryDesc : public Resource
{
XubString Name;
- XubString *Strings[4];
+ XubString *Strings[4];
Bitmap *Graphics[4]; /* regular bitmaps */
Bitmap *GraphicsH[4]; /* high contrast bitmaps */
USHORT Minimum[4];
@@ -212,12 +212,12 @@ public:
SmCategoryDesc(const ResId &rResId, USHORT nCategoryIdx);
~SmCategoryDesc();
- const XubString & GetName() const { return Name; }
- const XubString * GetString(USHORT Index) const { return Strings[Index]; }
- USHORT GetMinimum(USHORT Index) { return Minimum[Index]; }
- USHORT GetMaximum(USHORT Index) { return Maximum[Index]; }
- USHORT GetValue(USHORT Index) const { return Value[Index]; }
- void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;}
+ const XubString & GetName() const { return Name; }
+ const XubString * GetString(USHORT Index) const { return Strings[Index]; }
+ USHORT GetMinimum(USHORT Index) { return Minimum[Index]; }
+ USHORT GetMaximum(USHORT Index) { return Maximum[Index]; }
+ USHORT GetValue(USHORT Index) const { return Value[Index]; }
+ void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;}
void SetHighContrast( BOOL bVal ) { bIsHighContrast = bVal; }
const Bitmap * GetGraphic(USHORT Index) const
@@ -229,25 +229,25 @@ public:
class SmDistanceDialog : public ModalDialog
{
- FixedText aFixedText1;
- MetricField aMetricField1;
- FixedText aFixedText2;
- MetricField aMetricField2;
- FixedText aFixedText3;
- MetricField aMetricField3;
- CheckBox aCheckBox1;
- FixedText aFixedText4;
- MetricField aMetricField4;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
- FixedBitmap aBitmap;
+ FixedText aFixedText1;
+ MetricField aMetricField1;
+ FixedText aFixedText2;
+ MetricField aMetricField2;
+ FixedText aFixedText3;
+ MetricField aMetricField3;
+ CheckBox aCheckBox1;
+ FixedText aFixedText4;
+ MetricField aMetricField4;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ MenuButton aMenuButton;
+ PushButton aDefaultButton;
+ FixedBitmap aBitmap;
FixedLine aFixedLine;
SmCategoryDesc *Categories[NOCATEGORIES];
- USHORT nActiveCategory;
- BOOL bScaleAllBrackets;
+ USHORT nActiveCategory;
+ BOOL bScaleAllBrackets;
DECL_LINK(GetFocusHdl, Control *);
DECL_LINK(MenuSelectHdl, Menu *);
@@ -255,8 +255,8 @@ class SmDistanceDialog : public ModalDialog
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
- void SetHelpId(MetricField &rField, ULONG nHelpId);
- void SetCategory(USHORT Category);
+ void SetHelpId(MetricField &rField, ULONG nHelpId);
+ void SetCategory(USHORT Category);
void ApplyImages();
@@ -281,9 +281,9 @@ class SmAlignDialog : public ModalDialog
RadioButton aCenter;
RadioButton aRight;
FixedLine aFixedLine1;
- OKButton aOKButton1;
+ OKButton aOKButton1;
CancelButton aCancelButton1;
- PushButton aDefaultButton;
+ PushButton aDefaultButton;
DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -299,17 +299,17 @@ public:
class SmShowSymbolSet : public Control
{
SymbolPtrVec_t aSymbolSet;
- ScrollBar aVScrollBar;
- Size aOutputSize;
- Link aSelectHdlLink;
- Link aDblClickHdlLink;
- USHORT nLen;
- USHORT nRows, nColumns;
- USHORT nSelectSymbol;
-
- virtual void Paint(const Rectangle&);
- virtual void MouseButtonDown(const MouseEvent& rMEvt);
- virtual void KeyInput(const KeyEvent& rKEvt);
+ ScrollBar aVScrollBar;
+ Size aOutputSize;
+ Link aSelectHdlLink;
+ Link aDblClickHdlLink;
+ USHORT nLen;
+ USHORT nRows, nColumns;
+ USHORT nSelectSymbol;
+
+ virtual void Paint(const Rectangle&);
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual void KeyInput(const KeyEvent& rKEvt);
DECL_LINK( ScrollHdl, ScrollBar* );
@@ -318,8 +318,8 @@ public:
void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet);
- void SelectSymbol(USHORT nSymbol);
- USHORT GetSelectSymbol() const { return nSelectSymbol; }
+ void SelectSymbol(USHORT nSymbol);
+ USHORT GetSelectSymbol() const { return nSelectSymbol; }
void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; }
@@ -331,15 +331,15 @@ class SmShowSymbol : public Control
{
Link aDblClickHdlLink;
- virtual void Paint(const Rectangle&);
- virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual void Paint(const Rectangle&);
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
public:
SmShowSymbol(Window *pParent, const ResId& rResId) :
Control(pParent, rResId) {}
- void SetSymbol(const SmSym *pSymbol);
- void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
+ void SetSymbol(const SmSym *pSymbol);
+ void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
};
////////////////////////////////////////////////////////////////////////////////
@@ -348,18 +348,18 @@ class SmSymDefineDialog;
class SmSymbolDialog : public ModalDialog
{
- FixedText aSymbolSetText;
- ListBox aSymbolSets;
+ FixedText aSymbolSetText;
+ ListBox aSymbolSets;
SmShowSymbolSet aSymbolSetDisplay;
- FixedText aSymbolName;
- SmShowSymbol aSymbolDisplay;
- PushButton aGetBtn;
- PushButton aCloseBtn;
- PushButton aEditBtn;
+ FixedText aSymbolName;
+ SmShowSymbol aSymbolDisplay;
+ PushButton aGetBtn;
+ PushButton aCloseBtn;
+ PushButton aEditBtn;
SmViewShell &rViewSh;
SmSymbolManager &rSymbolMgr;
-
+
String aSymbolSetName;
SymbolPtrVec_t aSymbolSet;
@@ -372,7 +372,7 @@ class SmSymbolDialog : public ModalDialog
DECL_LINK(EditClickHdl, Button *);
DECL_LINK(GetClickHdl, Button *);
- void FillSymbolSets(BOOL bDeleteText = TRUE);
+ void FillSymbolSets(BOOL bDeleteText = TRUE);
void SetSymbolSetManager(SmSymbolManager &rMgr);
const SmSym *GetSymbol() const;
void InitColor_Impl();
@@ -384,7 +384,7 @@ public:
SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, BOOL bFreeRes = TRUE);
virtual ~SmSymbolDialog();
- BOOL SelectSymbolSet(const XubString &rSymbolSetName);
+ BOOL SelectSymbolSet(const XubString &rSymbolSetName);
void SelectSymbol(USHORT nSymbolPos);
USHORT GetSelectedSymbol() const { return aSymbolSetDisplay.GetSelectSymbol(); }
};
@@ -393,7 +393,7 @@ public:
class SmShowChar : public Control
{
- virtual void Paint(const Rectangle&);
+ virtual void Paint(const Rectangle&);
public:
SmShowChar(Window *pParent, const ResId& rResId)
@@ -401,8 +401,8 @@ public:
{
}
- void SetChar(xub_Unicode aChar);
- void SetFont(const Font &rFont);
+ void SetChar(xub_Unicode aChar);
+ void SetFont(const Font &rFont);
};
////////////////////////////////////////////////////////////////////////////////
@@ -441,7 +441,7 @@ class SmSymDefineDialog : public ModalDialog
SmSymbolManager aSymbolMgrCopy,
&rSymbolMgr;
- const SmSym *pOrigSymbol;
+ const SmSym *pOrigSymbol;
const SubsetMap *pSubsetMap;
FontList *pFontList;
@@ -457,22 +457,22 @@ class SmSymDefineDialog : public ModalDialog
DECL_LINK(ChangeClickHdl, Button *);
DECL_LINK(DeleteClickHdl, Button *);
- void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
- void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
- void FillFonts(BOOL bDeleteText = TRUE);
- void FillStyles(BOOL bDeleteText = TRUE);
+ void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
+ void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
+ void FillFonts(BOOL bDeleteText = TRUE);
+ void FillStyles(BOOL bDeleteText = TRUE);
void SetSymbolSetManager(const SmSymbolManager &rMgr);
- void SetFont(const XubString &rFontName, const XubString &rStyleName);
- void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
- void UpdateButtons();
+ void SetFont(const XubString &rFontName, const XubString &rStyleName);
+ void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
+ void UpdateButtons();
- BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
+ BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
BOOL bDeleteText);
- BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
+ BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
BOOL bDeleteText);
- BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont);
- BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont);
+ BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont);
+ BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont);
SmSym * GetSymbol(const ComboBox &rComboBox);
const SmSym * GetSymbol(const ComboBox &rComboBox) const
@@ -491,31 +491,31 @@ public:
using OutputDevice::SetFont;
// Dialog
- virtual short Execute();
+ virtual short Execute();
BOOL SelectOldSymbolSet(const XubString &rSymbolSetName)
{
return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, FALSE);
}
-
+
BOOL SelectOldSymbol(const XubString &rSymbolName)
{
return SelectSymbol(aOldSymbols, rSymbolName, FALSE);
}
-
+
BOOL SelectSymbolSet(const XubString &rSymbolSetName)
{
return SelectSymbolSet(aSymbolSets, rSymbolSetName, FALSE);
}
-
+
BOOL SelectSymbol(const XubString &rSymbolName)
{
return SelectSymbol(aSymbols, rSymbolName, FALSE);
}
-
+
BOOL SelectFont(const XubString &rFontName) { return SelectFont(rFontName, TRUE); }
- BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); };
- void SelectChar(xub_Unicode cChar);
+ BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); };
+ void SelectChar(xub_Unicode cChar);
};
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6f73e2244009..6cf38965deba 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
#ifndef DOCUMENT_HXX
#define DOCUMENT_HXX
-#define SMDLL 1
+#define SMDLL 1
#include <sot/storage.hxx>
#include <sot/sotref.hxx>
@@ -50,20 +50,20 @@ class SfxPrinter;
class Printer;
class SmCursor;
-#define HINT_DATACHANGED 1004
+#define HINT_DATACHANGED 1004
-#define SM30BIDENT ((ULONG)0x534D3033L)
-#define SM30IDENT ((ULONG)0x30334d53L)
+#define SM30BIDENT ((ULONG)0x534D3033L)
+#define SM30IDENT ((ULONG)0x30334d53L)
#define SM304AIDENT ((ULONG)0x34303330L)
#define SM30VERSION ((ULONG)0x00010000L)
-#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
+#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
//der neue Border im Format.
-#define FRMIDENT ((ULONG)0x03031963L)
-#define FRMVERSION ((ULONG)0x00010001L)
+#define FRMIDENT ((ULONG)0x03031963L)
+#define FRMVERSION ((ULONG)0x00010001L)
-#define STAROFFICE_XML "StarOffice XML (Math)"
-#define MATHML_XML "MathML XML (Math)"
+#define STAROFFICE_XML "StarOffice XML (Math)"
+#define MATHML_XML "MathML XML (Math)"
/* Zugriff auf den Drucker sollte ausschliesslich ueber diese Klasse erfolgen
* ==========================================================================
@@ -111,22 +111,22 @@ class SmDocShell : public SfxObjectShell, public SfxListener
friend class SmModel;
friend class SmCursor;
- String aText;
- SmFormat aFormat;
- SmParser aInterpreter;
+ String aText;
+ SmFormat aFormat;
+ SmParser aInterpreter;
String aAccText;
- SmNode *pTree;
+ SmNode *pTree;
SfxMenuBarManager *pMenuMgr;
- SfxItemPool *pEditEngineItemPool;
- EditEngine *pEditEngine;
- SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
- Printer *pTmpPrinter; //ebenfalls
- long nLeftBorder,
+ SfxItemPool *pEditEngineItemPool;
+ EditEngine *pEditEngine;
+ SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
+ Printer *pTmpPrinter; //ebenfalls
+ long nLeftBorder,
nRightBorder,
nTopBorder,
nBottomBorder;
- USHORT nModifyCount;
- BOOL bIsFormulaArranged;
+ USHORT nModifyCount;
+ BOOL bIsFormulaArranged;
SmCursor *pCursor;
@@ -136,11 +136,11 @@ class SmDocShell : public SfxObjectShell, public SfxListener
BOOL WriteAsMathType3( SfxMedium& );
- virtual void Draw(OutputDevice *pDevice,
+ virtual void Draw(OutputDevice *pDevice,
const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT);
- virtual void FillClass(SvGlobalName* pClassName,
+ virtual void FillClass(SvGlobalName* pClassName,
sal_uInt32* pFormat,
String* pAppName,
String* pFullTypeName,
@@ -148,13 +148,13 @@ class SmDocShell : public SfxObjectShell, public SfxListener
sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const;
- virtual BOOL SetData( const String& rData );
- virtual ULONG GetMiscStatus() const;
- virtual void OnDocumentPrinterChanged( Printer * );
+ virtual BOOL SetData( const String& rData );
+ virtual ULONG GetMiscStatus() const;
+ virtual void OnDocumentPrinterChanged( Printer * );
virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual BOOL Load( SfxMedium& rMedium );
- void ImplSave( SvStorageStreamRef xStrm );
- virtual BOOL Save();
+ void ImplSave( SvStorageStreamRef xStrm );
+ virtual BOOL Save();
virtual BOOL SaveAs( SfxMedium& rMedium );
virtual BOOL ConvertTo( SfxMedium &rMedium );
virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
@@ -162,10 +162,10 @@ class SmDocShell : public SfxObjectShell, public SfxListener
Printer *GetPrt();
OutputDevice* GetRefDev();
- BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
- void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
+ BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
+ void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
- virtual BOOL ConvertFrom(SfxMedium &rMedium);
+ virtual BOOL ConvertFrom(SfxMedium &rMedium);
/** Called whenever the formula is changed
* Deletes the current cursor
@@ -179,10 +179,10 @@ public:
SFX_DECL_OBJECTFACTORY();
SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
- virtual ~SmDocShell();
+ virtual ~SmDocShell();
- void LoadSymbols();
- void SaveSymbols();
+ void LoadSymbols();
+ void SaveSymbols();
void ArrangeFormula();
@@ -190,9 +190,9 @@ public:
//und fuer die Kommunikation mit dem SFX!
//Alle internen Verwendungen des Printers sollten ausschlieslich uber
//den SmPrinterAccess funktionieren.
- BOOL HasPrinter() { return 0 != pPrinter; }
- SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
- void SetPrinter( SfxPrinter * );
+ BOOL HasPrinter() { return 0 != pPrinter; }
+ SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
+ void SetPrinter( SfxPrinter * );
const String GetComment() const;
@@ -200,32 +200,32 @@ public:
sal_Bool ReplaceBadChars();
void UpdateText();
- void SetText(const String& rBuffer);
- String& GetText() { return (aText); }
- void SetFormat(SmFormat& rFormat);
+ void SetText(const String& rBuffer);
+ String& GetText() { return (aText); }
+ void SetFormat(SmFormat& rFormat);
const SmFormat& GetFormat() { return (aFormat); }
- void Parse();
- SmParser & GetParser() { return aInterpreter; }
- const SmNode * GetFormulaTree() const { return pTree; }
- void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
+ void Parse();
+ SmParser & GetParser() { return aInterpreter; }
+ const SmNode * GetFormulaTree() const { return pTree; }
+ void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
String GetAccessibleText();
- EditEngine & GetEditEngine();
- SfxItemPool & GetEditEngineItemPool();
+ EditEngine & GetEditEngine();
+ SfxItemPool & GetEditEngineItemPool();
- void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
- Size GetSize();
+ void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
+ Size GetSize();
void Repaint();
- virtual SfxUndoManager *GetUndoManager ();
+ virtual SfxUndoManager *GetUndoManager ();
virtual SfxItemPool& GetPool() const;
- void Execute( SfxRequest& rReq );
- void GetState(SfxItemSet &);
+ void Execute( SfxRequest& rReq );
+ void GetState(SfxItemSet &);
virtual void SetVisArea (const Rectangle & rVisArea);
virtual void SetModified(BOOL bModified);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index cfb5ddffda8b..7249cc3a44e9 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -2,7 +2,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
@@ -61,13 +61,13 @@ class SmEditWindow : public Window, public DropTargetHelper
SmEditAccessible * pAccessible;
SmCmdBoxWindow &rCmdBox;
- EditView *pEditView;
- ScrollBar *pHScrollBar,
+ EditView *pEditView;
+ ScrollBar *pHScrollBar,
*pVScrollBar;
ScrollBarBox *pScrollBox;
- Timer aModifyTimer,
+ Timer aModifyTimer,
aCursorMoveTimer;
- ESelection aOldSelection;
+ ESelection aOldSelection;
virtual void KeyInput(const KeyEvent& rKEvt);
virtual void Command(const CommandEvent& rCEvt);
@@ -88,12 +88,12 @@ class SmEditWindow : public Window, public DropTargetHelper
DECL_LINK(EditStatusHdl ,EditStatus *);
DECL_LINK(ScrollHdl, ScrollBar *);
- void CreateEditView();
+ void CreateEditView();
- Rectangle AdjustScrollBars();
- void SetScrollBarRanges();
- void InitScrollBars();
- void InvalidateSlots();
+ Rectangle AdjustScrollBars();
+ void SetScrollBarRanges();
+ void InitScrollBars();
+ void InvalidateSlots();
public:
SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin );
@@ -106,30 +106,30 @@ public:
SfxItemPool * GetEditEngineItemPool();
// Window
- virtual void SetText(const XubString &rText);
+ virtual void SetText(const XubString &rText);
virtual String GetText() const;
- virtual void GetFocus();
- virtual void LoseFocus();
-
- ESelection GetSelection() const;
- void SetSelection(const ESelection &rSel);
-
- BOOL IsEmpty() const;
- BOOL IsSelected() const;
- BOOL IsAllSelected() const;
- void Cut();
- void Copy();
- void Paste();
- void Delete();
- void SelectAll();
- void InsertText(const String &rText);
- void InsertCommand(USHORT nCommand);
- void MarkError(const Point &rPos);
- void SelNextMark();
- void SelPrevMark();
- BOOL HasMark(const String &rText) const;
-
- void Flush();
+ virtual void GetFocus();
+ virtual void LoseFocus();
+
+ ESelection GetSelection() const;
+ void SetSelection(const ESelection &rSel);
+
+ BOOL IsEmpty() const;
+ BOOL IsSelected() const;
+ BOOL IsAllSelected() const;
+ void Cut();
+ void Copy();
+ void Paste();
+ void Delete();
+ void SelectAll();
+ void InsertText(const String &rText);
+ void InsertCommand(USHORT nCommand);
+ void MarkError(const Point &rPos);
+ void SelNextMark();
+ void SelPrevMark();
+ BOOL HasMark(const String &rText) const;
+
+ void Flush();
void DeleteEditView( SmViewShell &rView );
void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index f4cddc3bbdc9..6823ba82dc87 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -2,7 +2,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
@@ -35,91 +35,91 @@
#include <types.hxx>
-#define SM_FMT_VERSION_51 ((BYTE) 0x01)
-#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
+#define SM_FMT_VERSION_51 ((BYTE) 0x01)
+#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
-#define FNTNAME_TIMES "Times New Roman"
-#define FNTNAME_HELV "Helvetica"
-#define FNTNAME_COUR "Courier"
+#define FNTNAME_TIMES "Times New Roman"
+#define FNTNAME_HELV "Helvetica"
+#define FNTNAME_COUR "Courier"
#define FNTNAME_MATH FONTNAME_MATH
// symbolic names used as array indices
-#define SIZ_BEGIN 0
-#define SIZ_TEXT 0
-#define SIZ_INDEX 1
-#define SIZ_FUNCTION 2
-#define SIZ_OPERATOR 3
-#define SIZ_LIMITS 4
-#define SIZ_END 4
+#define SIZ_BEGIN 0
+#define SIZ_TEXT 0
+#define SIZ_INDEX 1
+#define SIZ_FUNCTION 2
+#define SIZ_OPERATOR 3
+#define SIZ_LIMITS 4
+#define SIZ_END 4
// symbolic names used as array indices
-#define FNT_BEGIN 0
-#define FNT_VARIABLE 0
-#define FNT_FUNCTION 1
-#define FNT_NUMBER 2
-#define FNT_TEXT 3
-#define FNT_SERIF 4
-#define FNT_SANS 5
-#define FNT_FIXED 6
-#define FNT_MATH 7
-#define FNT_END 7
+#define FNT_BEGIN 0
+#define FNT_VARIABLE 0
+#define FNT_FUNCTION 1
+#define FNT_NUMBER 2
+#define FNT_TEXT 3
+#define FNT_SERIF 4
+#define FNT_SANS 5
+#define FNT_FIXED 6
+#define FNT_MATH 7
+#define FNT_END 7
// symbolic names used as array indices
-#define DIS_BEGIN 0
-#define DIS_HORIZONTAL 0
-#define DIS_VERTICAL 1
-#define DIS_ROOT 2
-#define DIS_SUPERSCRIPT 3
-#define DIS_SUBSCRIPT 4
-#define DIS_NUMERATOR 5
-#define DIS_DENOMINATOR 6
-#define DIS_FRACTION 7
-#define DIS_STROKEWIDTH 8
-#define DIS_UPPERLIMIT 9
-#define DIS_LOWERLIMIT 10
-#define DIS_BRACKETSIZE 11
-#define DIS_BRACKETSPACE 12
-#define DIS_MATRIXROW 13
-#define DIS_MATRIXCOL 14
-#define DIS_ORNAMENTSIZE 15
-#define DIS_ORNAMENTSPACE 16
-#define DIS_OPERATORSIZE 17
-#define DIS_OPERATORSPACE 18
-#define DIS_LEFTSPACE 19
-#define DIS_RIGHTSPACE 20
-#define DIS_TOPSPACE 21
-#define DIS_BOTTOMSPACE 22
-#define DIS_NORMALBRACKETSIZE 23
-#define DIS_END 23
+#define DIS_BEGIN 0
+#define DIS_HORIZONTAL 0
+#define DIS_VERTICAL 1
+#define DIS_ROOT 2
+#define DIS_SUPERSCRIPT 3
+#define DIS_SUBSCRIPT 4
+#define DIS_NUMERATOR 5
+#define DIS_DENOMINATOR 6
+#define DIS_FRACTION 7
+#define DIS_STROKEWIDTH 8
+#define DIS_UPPERLIMIT 9
+#define DIS_LOWERLIMIT 10
+#define DIS_BRACKETSIZE 11
+#define DIS_BRACKETSPACE 12
+#define DIS_MATRIXROW 13
+#define DIS_MATRIXCOL 14
+#define DIS_ORNAMENTSIZE 15
+#define DIS_ORNAMENTSPACE 16
+#define DIS_OPERATORSIZE 17
+#define DIS_OPERATORSPACE 18
+#define DIS_LEFTSPACE 19
+#define DIS_RIGHTSPACE 20
+#define DIS_TOPSPACE 21
+#define DIS_BOTTOMSPACE 22
+#define DIS_NORMALBRACKETSIZE 23
+#define DIS_END 23
// to be broadcastet on format changes:
-#define HINT_FORMATCHANGED 10003
+#define HINT_FORMATCHANGED 10003
-enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
+enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
String GetDefaultFontName( LanguageType nLang, USHORT nIdent );
class SmFormat : public SfxBroadcaster
{
- SmFace vFont[FNT_END + 1];
+ SmFace vFont[FNT_END + 1];
BOOL bDefaultFont[FNT_END + 1];
- Size aBaseSize;
- long nVersion;
- USHORT vSize[SIZ_END + 1];
- USHORT vDist[DIS_END + 1];
- SmHorAlign eHorAlign;
+ Size aBaseSize;
+ long nVersion;
+ USHORT vSize[SIZ_END + 1];
+ USHORT vDist[DIS_END + 1];
+ SmHorAlign eHorAlign;
INT16 nGreekCharStyle;
- BOOL bIsTextmode,
+ BOOL bIsTextmode,
bScaleNormalBrackets;
public:
SmFormat();
SmFormat(const SmFormat &rFormat) : SfxBroadcaster() { *this = rFormat; }
- const Size & GetBaseSize() const { return aBaseSize; }
- void SetBaseSize(const Size &rSize) { aBaseSize = rSize; }
+ const Size & GetBaseSize() const { return aBaseSize; }
+ void SetBaseSize(const Size &rSize) { aBaseSize = rSize; }
const SmFace & GetFont(USHORT nIdent) const { return vFont[nIdent]; }
void SetFont(USHORT nIdent, const SmFace &rFont, BOOL bDefault = FALSE);
@@ -128,30 +128,30 @@ public:
void SetDefaultFont(USHORT nIdent, BOOL bVal) { bDefaultFont[nIdent] = bVal; }
BOOL IsDefaultFont(USHORT nIdent) const { return bDefaultFont[nIdent]; }
- USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; }
- void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;}
-
- USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; }
- void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; }
+ USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; }
+ void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;}
- SmHorAlign GetHorAlign() const { return eHorAlign; }
- void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; }
+ USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; }
+ void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; }
- BOOL IsTextmode() const { return bIsTextmode; }
- void SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
+ SmHorAlign GetHorAlign() const { return eHorAlign; }
+ void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; }
+ BOOL IsTextmode() const { return bIsTextmode; }
+ void SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
+
INT16 GetGreekCharStyle() const { return nGreekCharStyle; }
void SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
- BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; }
- void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
+ BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; }
+ void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
- long GetVersion() const { return nVersion; }
+ long GetVersion() const { return nVersion; }
//! at time (5.1) use only the lower byte!!!
- void SetVersion(long nVer) { nVersion = nVer; }
+ void SetVersion(long nVer) { nVersion = nVer; }
- SmFormat & operator = (const SmFormat &rFormat);
+ SmFormat & operator = (const SmFormat &rFormat);
BOOL operator == (const SmFormat &rFormat) const;
inline BOOL operator != (const SmFormat &rFormat) const;
@@ -162,7 +162,7 @@ public:
}
};
-
+
inline BOOL SmFormat::operator != (const SmFormat &rFormat) const
{
return !(*this == rFormat);
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index a8589c682dd4..153db2d38c05 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -60,27 +60,27 @@
#include "format.hxx"
-#define ATTR_BOLD 0x0001
-#define ATTR_ITALIC 0x0002
+#define ATTR_BOLD 0x0001
+#define ATTR_ITALIC 0x0002
-#define FNTSIZ_ABSOLUT 1
-#define FNTSIZ_PLUS 2
-#define FNTSIZ_MINUS 3
+#define FNTSIZ_ABSOLUT 1
+#define FNTSIZ_PLUS 2
+#define FNTSIZ_MINUS 3
#define FNTSIZ_MULTIPLY 4
-#define FNTSIZ_DIVIDE 5
+#define FNTSIZ_DIVIDE 5
// flags to interdict respective status changes
-#define FLG_FONT 0x0001
-#define FLG_SIZE 0x0002
-#define FLG_BOLD 0x0004
-#define FLG_ITALIC 0x0008
-#define FLG_COLOR 0x0010
-#define FLG_VISIBLE 0x0020
-#define FLG_HORALIGN 0x0040
+#define FLG_FONT 0x0001
+#define FLG_SIZE 0x0002
+#define FLG_BOLD 0x0004
+#define FLG_ITALIC 0x0008
+#define FLG_COLOR 0x0010
+#define FLG_VISIBLE 0x0020
+#define FLG_HORALIGN 0x0040
-extern SmFormat *pActiveFormat;
+extern SmFormat *pActiveFormat;
class SmVisitor;
class SmDocShell;
@@ -93,14 +93,14 @@ typedef std::vector< SmStructureNode * > SmStructureNodeArray;
////////////////////////////////////////////////////////////////////////////////
-enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT };
+enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT };
enum SmNodeType
{
- NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN,
- NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER,
- NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT,
- NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
+ NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN,
+ NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER,
+ NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT,
+ NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
NLINE, NEXPRESSION, NPOLYLINE, NROOT, NROOTSYMBOL,
NRECTANGLE, NVERTICAL_BRACE
};
@@ -111,15 +111,15 @@ enum SmNodeType
class SmNode : public SmRect
{
- SmFace aFace;
+ SmFace aFace;
- SmToken aNodeToken;
- SmNodeType eType;
- SmScaleMode eScaleMode;
- RectHorAlign eRectHorAlign;
- USHORT nFlags,
+ SmToken aNodeToken;
+ SmNodeType eType;
+ SmScaleMode eScaleMode;
+ RectHorAlign eRectHorAlign;
+ USHORT nFlags,
nAttributes;
- BOOL bIsPhantom,
+ BOOL bIsPhantom,
bIsDebug;
BOOL bIsSelected;
@@ -131,7 +131,7 @@ protected:
sal_Int32 nAccIndex;
public:
- virtual ~SmNode();
+ virtual ~SmNode();
virtual BOOL IsVisible() const;
@@ -142,14 +142,14 @@ public:
return ((SmNode *) this)->GetSubNode(nIndex);
}
- virtual SmNode * GetLeftMost();
+ virtual SmNode * GetLeftMost();
const SmNode * GetLeftMost() const
{
return ((SmNode *) this)->GetLeftMost();
}
- USHORT & Flags() { return nFlags; }
- USHORT & Attributes() { return nAttributes; }
+ USHORT & Flags() { return nFlags; }
+ USHORT & Attributes() { return nAttributes; }
BOOL IsDebug() const { return bIsDebug; }
BOOL IsPhantom() const { return bIsPhantom; }
@@ -160,7 +160,7 @@ public:
void ClearAttribut(USHORT nAttrib);
const SmFace & GetFont() const { return aFace; };
- SmFace & GetFont() { return aFace; };
+ SmFace & GetFont() { return aFace; };
void SetFont(const SmFace &rFace);
void SetFontSize(const Fraction &rRelSize, USHORT nType);
@@ -177,7 +177,7 @@ public:
RectHorAlign GetRectHorAlign() const { return eRectHorAlign; }
const SmRect & GetRect() const { return *this; }
- SmRect & GetRect() { return *this; }
+ SmRect & GetRect() { return *this; }
virtual void Move(const Point &rPosition);
void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); }
@@ -192,20 +192,20 @@ public:
sal_Int32 GetAccessibleIndex() const { return nAccIndex; }
const SmNode * FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const;
- USHORT GetRow() const { return (USHORT)aNodeToken.nRow; }
- USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; }
+ USHORT GetRow() const { return (USHORT)aNodeToken.nRow; }
+ USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; }
- SmScaleMode GetScaleMode() const { return eScaleMode; }
- void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; }
+ SmScaleMode GetScaleMode() const { return eScaleMode; }
+ void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; }
virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
- SmNodeType GetType() const { return eType; }
- const SmToken & GetToken() const { return aNodeToken; }
+ SmNodeType GetType() const { return eType; }
+ const SmToken & GetToken() const { return aNodeToken; }
- const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
- const SmNode * FindRectClosestTo(const Point &rPoint) const;
+ const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
+ const SmNode * FindRectClosestTo(const Point &rPoint) const;
/** Accept a visitor
* Calls the method for this class on the visitor
@@ -252,8 +252,8 @@ protected:
/** Sets parent on children of this node */
void ClaimPaternity(){
SmNode* pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetParent((SmStructureNode*)this); //Cast is valid if we have children
}
@@ -334,20 +334,20 @@ class SmStructureNode : public SmNode
protected:
SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmNode(eNodeType, rNodeToken)
+ : SmNode(eNodeType, rNodeToken)
{}
public:
SmStructureNode( const SmStructureNode &rNode );
virtual ~SmStructureNode();
- virtual BOOL IsVisible() const;
+ virtual BOOL IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
+ virtual USHORT GetNumSubNodes() const;
void SetNumSubNodes(USHORT nSize) { aSubNodes.resize(nSize); }
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(USHORT nIndex);
void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
void SetSubNodes(const SmNodeArray &rNodeArray);
@@ -381,15 +381,15 @@ class SmVisibleNode : public SmNode
{
protected:
SmVisibleNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmNode(eNodeType, rNodeToken)
+ : SmNode(eNodeType, rNodeToken)
{}
public:
- virtual BOOL IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
+ virtual BOOL IsVisible() const;
+ virtual USHORT GetNumSubNodes() const;
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(USHORT nIndex);
};
@@ -400,7 +400,7 @@ class SmGraphicNode : public SmVisibleNode
{
protected:
SmGraphicNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmVisibleNode(eNodeType, rNodeToken)
+ : SmVisibleNode(eNodeType, rNodeToken)
{}
public:
@@ -421,7 +421,7 @@ class SmRectangleNode : public SmGraphicNode
public:
SmRectangleNode(const SmToken &rNodeToken)
- : SmGraphicNode(NRECTANGLE, rNodeToken)
+ : SmGraphicNode(NRECTANGLE, rNodeToken)
{}
virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
@@ -446,14 +446,14 @@ public:
*/
class SmPolyLineNode : public SmGraphicNode
{
- Polygon aPoly;
- Size aToSize;
- long nWidth;
+ Polygon aPoly;
+ Size aToSize;
+ long nWidth;
public:
SmPolyLineNode(const SmToken &rNodeToken);
- long GetWidth() const { return nWidth; }
+ long GetWidth() const { return nWidth; }
Size GetToSize() const { return aToSize; }
Polygon &GetPolygon() { return aPoly; }
@@ -495,9 +495,9 @@ protected:
public:
SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP );
- USHORT GetFontDesc() const { return nFontDesc; }
- void SetText(const XubString &rText) { aText = rText; }
- const XubString & GetText() const { return aText; }
+ USHORT GetFontDesc() const { return nFontDesc; }
+ void SetText(const XubString &rText) { aText = rText; }
+ const XubString & GetText() const { return aText; }
/** Change the text of this node, including the underlying token */
void ChangeText(const XubString &rText) {
aText = rText;
@@ -580,7 +580,7 @@ class SmGlyphSpecialNode : public SmSpecialNode
{
public:
SmGlyphSpecialNode(const SmToken &rNodeToken)
- : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
+ : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -598,7 +598,7 @@ class SmMathSymbolNode : public SmSpecialNode
{
protected:
SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
+ : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
@@ -659,7 +659,7 @@ class SmPlaceNode : public SmMathSymbolNode
{
public:
SmPlaceNode(const SmToken &rNodeToken)
- : SmMathSymbolNode(NPLACE, rNodeToken)
+ : SmMathSymbolNode(NPLACE, rNodeToken)
{
}
SmPlaceNode() : SmMathSymbolNode(NPLACE, SmToken(TPLACE, MS_PLACE, "<?>")) {};
@@ -681,7 +681,7 @@ class SmErrorNode : public SmMathSymbolNode
{
public:
SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken)
- : SmMathSymbolNode(NERROR, rNodeToken)
+ : SmMathSymbolNode(NERROR, rNodeToken)
{
SetText((xub_Unicode) MS_ERROR);
}
@@ -705,7 +705,7 @@ class SmTableNode : public SmStructureNode
{
public:
SmTableNode(const SmToken &rNodeToken)
- : SmStructureNode(NTABLE, rNodeToken)
+ : SmStructureNode(NTABLE, rNodeToken)
{}
using SmNode::GetLeftMost;
@@ -729,14 +729,14 @@ class SmLineNode : public SmStructureNode
protected:
SmLineNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmStructureNode(eNodeType, rNodeToken)
+ : SmStructureNode(eNodeType, rNodeToken)
{
bUseExtraSpaces = TRUE;
}
public:
SmLineNode(const SmToken &rNodeToken)
- : SmStructureNode(NLINE, rNodeToken)
+ : SmStructureNode(NLINE, rNodeToken)
{
bUseExtraSpaces = TRUE;
}
@@ -762,7 +762,7 @@ class SmExpressionNode : public SmLineNode
{
public:
SmExpressionNode(const SmToken &rNodeToken)
- : SmLineNode(NEXPRESSION, rNodeToken)
+ : SmLineNode(NEXPRESSION, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -781,7 +781,7 @@ class SmUnHorNode : public SmStructureNode
{
public:
SmUnHorNode(const SmToken &rNodeToken)
- : SmStructureNode(NUNHOR, rNodeToken)
+ : SmStructureNode(NUNHOR, rNodeToken)
{
SetNumSubNodes(2);
}
@@ -813,7 +813,7 @@ protected:
public:
SmRootNode(const SmToken &rNodeToken)
- : SmStructureNode(NROOT, rNodeToken)
+ : SmStructureNode(NROOT, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -841,7 +841,7 @@ class SmBinHorNode : public SmStructureNode
{
public:
SmBinHorNode(const SmToken &rNodeToken)
- : SmStructureNode(NBINHOR, rNodeToken)
+ : SmStructureNode(NBINHOR, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -869,7 +869,7 @@ class SmBinVerNode : public SmStructureNode
{
public:
SmBinVerNode(const SmToken &rNodeToken)
- : SmStructureNode(NBINVER, rNodeToken)
+ : SmStructureNode(NBINVER, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -897,16 +897,16 @@ public:
*/
class SmBinDiagonalNode : public SmStructureNode
{
- BOOL bAscending;
+ BOOL bAscending;
- void GetOperPosSize(Point &rPos, Size &rSize,
+ void GetOperPosSize(Point &rPos, Size &rSize,
const Point &rDiagPoint, double fAngleDeg) const;
public:
SmBinDiagonalNode(const SmToken &rNodeToken);
- BOOL IsAscending() const { return bAscending; }
- void SetAscending(BOOL bVal) { bAscending = bVal; }
+ BOOL IsAscending() const { return bAscending; }
+ void SetAscending(BOOL bVal) { bAscending = bVal; }
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
void Accept(SmVisitor* pVisitor);
@@ -922,19 +922,19 @@ public:
* See graphic for positions at char:
*
* \code
- * CSUP
+ * CSUP
*
* LSUP H H RSUP
- * H H
- * HHHH
- * H H
+ * H H
+ * HHHH
+ * H H
* LSUB H H RSUB
*
- * CSUB
+ * CSUB
* \endcode
*/
enum SmSubSup
-{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP
+{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP
};
/** numbers of entries in the above enum (that is: the number of possible
@@ -962,14 +962,14 @@ class SmSubSupNode : public SmStructureNode
public:
SmSubSupNode(const SmToken &rNodeToken)
- : SmStructureNode(NSUBSUP, rNodeToken)
+ : SmStructureNode(NSUBSUP, rNodeToken)
{
SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES);
bUseLimits = FALSE;
}
/** Get body (Not NULL) */
- SmNode * GetBody() { return GetSubNode(0); }
+ SmNode * GetBody() { return GetSubNode(0); }
/** Get body (Not NULL) */
const SmNode * GetBody() const
{
@@ -1016,7 +1016,7 @@ class SmBraceNode : public SmStructureNode
{
public:
SmBraceNode(const SmToken &rNodeToken)
- : SmStructureNode(NBRACE, rNodeToken)
+ : SmStructureNode(NBRACE, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -1045,8 +1045,8 @@ class SmBracebodyNode : public SmStructureNode
public:
inline SmBracebodyNode(const SmToken &rNodeToken);
- virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
- long GetBodyHeight() const { return nBodyHeight; }
+ virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ long GetBodyHeight() const { return nBodyHeight; }
void Accept(SmVisitor* pVisitor);
};
@@ -1077,7 +1077,7 @@ class SmVerticalBraceNode : public SmStructureNode
public:
inline SmVerticalBraceNode(const SmToken &rNodeToken);
- virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
void Accept(SmVisitor* pVisitor);
};
@@ -1108,12 +1108,12 @@ class SmOperNode : public SmStructureNode
{
public:
SmOperNode(const SmToken &rNodeToken)
- : SmStructureNode(NOPER, rNodeToken)
+ : SmStructureNode(NOPER, rNodeToken)
{
SetNumSubNodes(2);
}
- SmNode * GetSymbol();
+ SmNode * GetSymbol();
const SmNode * GetSymbol() const
{
return ((SmOperNode *) this)->GetSymbol();
@@ -1134,7 +1134,7 @@ class SmAlignNode : public SmStructureNode
{
public:
SmAlignNode(const SmToken &rNodeToken)
- : SmStructureNode(NALIGN, rNodeToken)
+ : SmStructureNode(NALIGN, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -1158,7 +1158,7 @@ class SmAttributNode : public SmStructureNode
{
public:
SmAttributNode(const SmToken &rNodeToken)
- : SmStructureNode(NATTRIBUT, rNodeToken)
+ : SmStructureNode(NATTRIBUT, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -1175,12 +1175,12 @@ public:
*/
class SmFontNode : public SmStructureNode
{
- USHORT nSizeType;
- Fraction aFontSize;
+ USHORT nSizeType;
+ Fraction aFontSize;
public:
SmFontNode(const SmToken &rNodeToken)
- : SmStructureNode(NFONT, rNodeToken)
+ : SmStructureNode(NFONT, rNodeToken)
{
nSizeType = FNTSIZ_MULTIPLY;
aFontSize = Fraction(1L);
@@ -1206,12 +1206,12 @@ public:
*/
class SmMatrixNode : public SmStructureNode
{
- USHORT nNumRows,
+ USHORT nNumRows,
nNumCols;
public:
SmMatrixNode(const SmToken &rNodeToken)
- : SmStructureNode(NMATRIX, rNodeToken)
+ : SmStructureNode(NMATRIX, rNodeToken)
{
nNumRows = nNumCols = 0;
}
@@ -1237,17 +1237,17 @@ public:
*/
class SmBlankNode : public SmGraphicNode
{
- USHORT nNum;
+ USHORT nNum;
public:
SmBlankNode(const SmToken &rNodeToken)
- : SmGraphicNode(NBLANK, rNodeToken)
+ : SmGraphicNode(NBLANK, rNodeToken)
{
nNum = 0;
}
void IncreaseBy(const SmToken &rToken);
- void Clear() { nNum = 0; }
+ void Clear() { nNum = 0; }
USHORT GetBlankNum() const { return nNum; }
void SetBlankNum(USHORT nNumber) { nNum = nNumber; }
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 5018340b5a01..f549abf4c285 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -41,87 +41,87 @@ class SmDocShell;
// TokenGroups
-#define TGOPER 0x00000001
-#define TGRELATION 0x00000002
-#define TGSUM 0x00000004
-#define TGPRODUCT 0x00000008
-#define TGUNOPER 0x00000010
-#define TGPOWER 0x00000020
-#define TGATTRIBUT 0x00000040
-#define TGALIGN 0x00000080
-#define TGFUNCTION 0x00000100
-#define TGBLANK 0x00000200
-#define TGLBRACES 0x00000400
-#define TGRBRACES 0x00000800
-#define TGCOLOR 0x00001000
-#define TGFONT 0x00002000
-#define TGSTANDALONE 0x00004000
-#define TGDISCARDED 0x00008000
-#define TGLIMIT 0x00010000
-#define TGFONTATTR 0x00020000
+#define TGOPER 0x00000001
+#define TGRELATION 0x00000002
+#define TGSUM 0x00000004
+#define TGPRODUCT 0x00000008
+#define TGUNOPER 0x00000010
+#define TGPOWER 0x00000020
+#define TGATTRIBUT 0x00000040
+#define TGALIGN 0x00000080
+#define TGFUNCTION 0x00000100
+#define TGBLANK 0x00000200
+#define TGLBRACES 0x00000400
+#define TGRBRACES 0x00000800
+#define TGCOLOR 0x00001000
+#define TGFONT 0x00002000
+#define TGSTANDALONE 0x00004000
+#define TGDISCARDED 0x00008000
+#define TGLIMIT 0x00010000
+#define TGFONTATTR 0x00020000
enum SmTokenType
{
- TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT,
- TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY,
- TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH,
- TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP,
- TCSUB, TCSUP, TLSUB, TLSUP, TGT,
- TLT, TAND, TOR, TINTERSECT, TUNION,
- TNEWLINE, TBINOM, TFROM, TTO, TINT,
- TSUM, TOPER, TABS, TSQRT, TFACT,
- TNROOT, TOVER, TTIMES, TGE, TLE,
- TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT,
- TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR,
- TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT,
- TDDDOT, TGRAVE, THAT, TTILDE, TVEC,
- TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC,
- TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE,
- TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT,
- TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE,
- TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE,
- TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR,
- TSIN, TCOS, TTAN, TCOT, TFUNC,
- TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE,
- TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ,
- TEQUIV, TDEF, TPROP, TSIM, TSIMEQ,
- TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN,
- TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS,
- TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
- TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
- TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
- TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
- TSINH, TCOSH, TTANH, TCOTH, TASIN,
- TACOS, TATAN, TLN, TLOG, TUOPER,
- TBOPER, TBLACK, TWHITE, TRED, TGREEN,
- TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,
- TSANS, TSERIF, TPOINT, TASINH, TACOSH,
- TATANH, TACOTH, TACOT, TEXP, TCDOT,
- TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
- TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI,
- TBACKEPSILON, TALEPH, TIM, TRE, TWP,
- TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF,
- TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE,
- TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR,
- TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES,
- TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR,
- TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH,
- TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
- TUNKNOWN, TDEBUG
+ TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT,
+ TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY,
+ TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH,
+ TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP,
+ TCSUB, TCSUP, TLSUB, TLSUP, TGT,
+ TLT, TAND, TOR, TINTERSECT, TUNION,
+ TNEWLINE, TBINOM, TFROM, TTO, TINT,
+ TSUM, TOPER, TABS, TSQRT, TFACT,
+ TNROOT, TOVER, TTIMES, TGE, TLE,
+ TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT,
+ TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR,
+ TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT,
+ TDDDOT, TGRAVE, THAT, TTILDE, TVEC,
+ TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC,
+ TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE,
+ TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT,
+ TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE,
+ TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE,
+ TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR,
+ TSIN, TCOS, TTAN, TCOT, TFUNC,
+ TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE,
+ TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ,
+ TEQUIV, TDEF, TPROP, TSIM, TSIMEQ,
+ TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN,
+ TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS,
+ TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
+ TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
+ TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
+ TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
+ TSINH, TCOSH, TTANH, TCOTH, TASIN,
+ TACOS, TATAN, TLN, TLOG, TUOPER,
+ TBOPER, TBLACK, TWHITE, TRED, TGREEN,
+ TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,
+ TSANS, TSERIF, TPOINT, TASINH, TACOSH,
+ TATANH, TACOTH, TACOT, TEXP, TCDOT,
+ TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
+ TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI,
+ TBACKEPSILON, TALEPH, TIM, TRE, TWP,
+ TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF,
+ TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE,
+ TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR,
+ TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES,
+ TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR,
+ TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH,
+ TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
+ TUNKNOWN, TDEBUG
};
struct SmToken
{
// token text
- String aText;
+ String aText;
// token info
SmTokenType eType;
- sal_Unicode cMathChar;
+ sal_Unicode cMathChar;
// parse-help info
- ULONG nGroup;
- USHORT nLevel;
+ ULONG nGroup;
+ USHORT nLevel;
// token position
USHORT nRow;
xub_StrLen nCol;
@@ -137,16 +137,16 @@ struct SmToken
enum SmParseError
{
- PE_NONE, PE_UNEXPECTED_END_OF_INPUT,
- PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN,
- PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED,
- PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED,
- PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED,
- PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED,
- PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED,
- PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH,
- PE_RIGHT_EXPECTED, PE_FONT_EXPECTED,
- PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN,
+ PE_NONE, PE_UNEXPECTED_END_OF_INPUT,
+ PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN,
+ PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED,
+ PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED,
+ PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED,
+ PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED,
+ PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED,
+ PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH,
+ PE_RIGHT_EXPECTED, PE_FONT_EXPECTED,
+ PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN,
PE_DOUBLE_SUBSUPSCRIPT
};
@@ -154,8 +154,8 @@ enum SmParseError
struct SmErrorDesc
{
SmParseError Type;
- SmNode *pNode;
- String Text;
+ SmNode *pNode;
+ String Text;
};
DECLARE_STACK(SmNodeStack, SmNode *)
@@ -175,11 +175,11 @@ enum SmConvert
struct SmTokenTableEntry
{
- const sal_Char* pIdent;
- SmTokenType eType;
- sal_Unicode cMathChar;
- ULONG nGroup;
- USHORT nLevel;
+ const sal_Char* pIdent;
+ SmTokenType eType;
+ sal_Unicode cMathChar;
+ ULONG nGroup;
+ USHORT nLevel;
};
class SmParser
@@ -204,57 +204,57 @@ class SmParser
protected:
#if OSL_DEBUG_LEVEL
- BOOL IsDelimiter( const String &rTxt, xub_StrLen nPos );
+ BOOL IsDelimiter( const String &rTxt, xub_StrLen nPos );
#endif
- void NextToken();
- xub_StrLen GetTokenIndex() const { return nTokenIndex; }
- void Insert(const String &rText, USHORT nPos);
+ void NextToken();
+ xub_StrLen GetTokenIndex() const { return nTokenIndex; }
+ void Insert(const String &rText, USHORT nPos);
void Replace( USHORT nPos, USHORT nLen, const String &rText );
- inline BOOL TokenInGroup(ULONG nGroup);
+ inline BOOL TokenInGroup(ULONG nGroup);
// grammar
- void Table();
- void Line();
- void Expression();
- void Relation();
- void Sum();
- void Product();
- void SubSup(ULONG nActiveGroup);
- void OpSubSup();
- void Power();
- void Blank();
- void Term();
- void Escape();
- void Operator();
- void Oper();
- void UnOper();
- void Align();
- void FontAttribut();
- void Attribut();
- void Font();
- void FontSize();
- void Color();
- void Brace();
- void Bracebody(BOOL bIsLeftRight);
- void Function();
- void Binom();
- void Stack();
- void Matrix();
- void Special();
- void GlyphSpecial();
+ void Table();
+ void Line();
+ void Expression();
+ void Relation();
+ void Sum();
+ void Product();
+ void SubSup(ULONG nActiveGroup);
+ void OpSubSup();
+ void Power();
+ void Blank();
+ void Term();
+ void Escape();
+ void Operator();
+ void Oper();
+ void UnOper();
+ void Align();
+ void FontAttribut();
+ void Attribut();
+ void Font();
+ void FontSize();
+ void Color();
+ void Brace();
+ void Bracebody(BOOL bIsLeftRight);
+ void Function();
+ void Binom();
+ void Stack();
+ void Matrix();
+ void Special();
+ void GlyphSpecial();
// end of grammar
LanguageType GetLanguage() const { return nLang; }
void SetLanguage( LanguageType nNewLang ) { nLang = nNewLang; }
- void Error(SmParseError Error);
+ void Error(SmParseError Error);
public:
SmParser();
/** Parse rBuffer to formula tree */
- SmNode *Parse(const String &rBuffer);
+ SmNode *Parse(const String &rBuffer);
/** Parse rBuffer to formula subtree that constitutes an expression */
SmNode *ParseExpression(const String &rBuffer);
@@ -268,11 +268,11 @@ public:
BOOL IsExportSymbolNames() const { return bExportSymNames; }
void SetExportSymbolNames(BOOL bVal) { bExportSymNames = bVal; }
- USHORT AddError(SmParseError Type, SmNode *pNode);
+ USHORT AddError(SmParseError Type, SmNode *pNode);
- const SmErrorDesc * NextError();
- const SmErrorDesc * PrevError();
- const SmErrorDesc * GetError(USHORT i = 0xFFFF);
+ const SmErrorDesc * NextError();
+ const SmErrorDesc * PrevError();
+ const SmErrorDesc * GetError(USHORT i = 0xFFFF);
static const SmTokenTableEntry* GetTokenTableEntry( const String &rName );
};
diff --git a/starmath/inc/pch/precompiled_starmath.cxx b/starmath/inc/pch/precompiled_starmath.cxx
index c25af02d9f18..1af681bd3ea4 100644
--- a/starmath/inc/pch/precompiled_starmath.cxx
+++ b/starmath/inc/pch/precompiled_starmath.cxx
@@ -2,7 +2,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
diff --git a/starmath/inc/pch/precompiled_starmath.hxx b/starmath/inc/pch/precompiled_starmath.hxx
index 7d2363e50a94..d258e8125c6e 100644
--- a/starmath/inc/pch/precompiled_starmath.hxx
+++ b/starmath/inc/pch/precompiled_starmath.hxx
@@ -2,7 +2,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
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index fdd12dd86669..16a61eae888f 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -2,7 +2,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
@@ -60,41 +60,41 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist)
//
// possible flags for the 'Draw' function below (just for debugging)
-#define SM_RECT_CORE 0x0001
-#define SM_RECT_ITALIC 0x0002
-#define SM_RECT_LINES 0x0004
-#define SM_RECT_MID 0x0008
+#define SM_RECT_CORE 0x0001
+#define SM_RECT_ITALIC 0x0002
+#define SM_RECT_LINES 0x0004
+#define SM_RECT_MID 0x0008
// possible positions and alignments for the 'AlignTo' function
enum RectPos
// (RP_LEFT : align the current object to the left of the argument, ...)
-{ RP_LEFT, RP_RIGHT,
+{ RP_LEFT, RP_RIGHT,
RP_TOP, RP_BOTTOM,
RP_ATTRIBUT
};
enum RectHorAlign
-{ RHA_LEFT, RHA_CENTER, RHA_RIGHT
+{ RHA_LEFT, RHA_CENTER, RHA_RIGHT
};
enum RectVerAlign
-{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY,
+{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY,
RVA_ATTRIBUT_HI, RVA_ATTRIBUT_MID, RVA_ATTRIBUT_LO
};
// different methods of copying baselines and mid's in 'ExtendBy' function
enum RectCopyMBL
-{ RCP_THIS, // keep baseline of current object even if it has none
- RCP_ARG, // as above but for the argument
- RCP_NONE, // result will have no baseline
- RCP_XOR // if current object has a baseline keep it else copy
- // the arguments baseline (even if it has none)
+{ RCP_THIS, // keep baseline of current object even if it has none
+ RCP_ARG, // as above but for the argument
+ RCP_NONE, // result will have no baseline
+ RCP_XOR // if current object has a baseline keep it else copy
+ // the arguments baseline (even if it has none)
};
class SmRect
{
- Point aTopLeft;
- Size aSize;
- long nBaseline,
+ Point aTopLeft;
+ Size aSize;
+ long nBaseline,
nAlignT,
nAlignM,
nAlignB,
@@ -105,7 +105,7 @@ class SmRect
nLoAttrFence,
nHiAttrFence;
USHORT nBorderWidth;
- BOOL bHasBaseline,
+ BOOL bHasBaseline,
bHasAlignInfo;
protected:
@@ -114,8 +114,8 @@ protected:
void Init(const OutputDevice &rDev, const SmFormat *pFormat,
const XubString &rText, USHORT nBorderWidth);
- void ClearBaseline() { bHasBaseline = FALSE; };
- inline void CopyMBL(const SmRect& rRect);
+ void ClearBaseline() { bHasBaseline = FALSE; };
+ inline void CopyMBL(const SmRect& rRect);
void CopyAlignInfo(const SmRect& rRect);
SmRect & Union(const SmRect &rRect);
@@ -132,64 +132,64 @@ public:
void SetItalicSpaces(long nLeftSpace, long nRightSpace);
- void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; }
- void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; }
+ void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; }
+ void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; }
void SetLeft(long nLeft);
void SetRight(long nRight);
void SetBottom(long nBottom);
void SetTop(long nTop);
- const Point & GetTopLeft() const { return aTopLeft; }
+ const Point & GetTopLeft() const { return aTopLeft; }
- long GetTop() const { return GetTopLeft().Y(); }
- long GetLeft() const { return GetTopLeft().X(); }
- long GetBottom() const { return GetTop() + GetHeight() - 1; }
- long GetRight() const { return GetLeft() + GetWidth() - 1; }
- long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; }
- long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; }
- long GetWidth() const { return GetSize().Width(); }
- long GetHeight() const { return GetSize().Height(); }
+ long GetTop() const { return GetTopLeft().Y(); }
+ long GetLeft() const { return GetTopLeft().X(); }
+ long GetBottom() const { return GetTop() + GetHeight() - 1; }
+ long GetRight() const { return GetLeft() + GetWidth() - 1; }
+ long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; }
+ long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; }
+ long GetWidth() const { return GetSize().Width(); }
+ long GetHeight() const { return GetSize().Height(); }
long GetItalicLeftSpace() const { return nItalicLeftSpace; }
long GetItalicRightSpace() const { return nItalicRightSpace; }
- void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; }
- void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; }
- long GetHiAttrFence() const { return nHiAttrFence; }
- long GetLoAttrFence() const { return nLoAttrFence; }
+ void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; }
+ void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; }
+ long GetHiAttrFence() const { return nHiAttrFence; }
+ long GetLoAttrFence() const { return nLoAttrFence; }
- long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); }
- long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; }
- long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); }
- long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); }
+ long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); }
+ long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; }
+ long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); }
+ long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); }
- BOOL HasBaseline() const { return bHasBaseline; }
- inline long GetBaseline() const;
- long GetBaselineOffset() const { return GetBaseline() - GetTop(); }
+ BOOL HasBaseline() const { return bHasBaseline; }
+ inline long GetBaseline() const;
+ long GetBaselineOffset() const { return GetBaseline() - GetTop(); }
void SetAlignTop(long nVal) { nAlignT = nVal; }
- long GetAlignT() const { return nAlignT; }
- long GetAlignM() const { return nAlignM; }
- long GetAlignB() const { return nAlignB; }
+ long GetAlignT() const { return nAlignT; }
+ long GetAlignM() const { return nAlignM; }
+ long GetAlignB() const { return nAlignB; }
void SetAlignT(long nVal) { nAlignT = nVal; }
- const Point GetCenter() const
- { return Point(GetCenterX(), GetCenterY()); }
+ const Point GetCenter() const
+ { return Point(GetCenterX(), GetCenterY()); }
- const Size & GetSize() const { return aSize; }
+ const Size & GetSize() const { return aSize; }
- const Size GetItalicSize() const
- { return Size(GetItalicWidth(), GetHeight()); }
+ const Size GetItalicSize() const
+ { return Size(GetItalicWidth(), GetHeight()); }
void Move (const Point &rPosition);
void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); }
BOOL IsEmpty() const
{
- return GetWidth() == 0 || GetHeight() == 0;
+ return GetWidth() == 0 || GetHeight() == 0;
}
BOOL HasAlignInfo() const { return bHasAlignInfo; }
@@ -203,17 +203,17 @@ public:
SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
BOOL bKeepVerAlignParams);
- long OrientedDist(const Point &rPoint) const;
- BOOL IsInsideRect(const Point &rPoint) const;
- BOOL IsInsideItalicRect(const Point &rPoint) const;
+ long OrientedDist(const Point &rPoint) const;
+ BOOL IsInsideRect(const Point &rPoint) const;
+ BOOL IsInsideItalicRect(const Point &rPoint) const;
- inline SmRect & operator = (const SmRect &rRect);
+ inline SmRect & operator = (const SmRect &rRect);
- inline Rectangle AsRectangle() const;
- SmRect AsGlyphRect() const;
+ inline Rectangle AsRectangle() const;
+ SmRect AsGlyphRect() const;
#ifdef SM_RECT_DEBUG
- void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const;
+ void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const;
#endif
};
@@ -230,9 +230,9 @@ inline void SmRect::SetItalicSpaces(long nLeftSpace, long nRightSpace)
inline void SmRect::CopyMBL(const SmRect &rRect)
// copy AlignM baseline and value of 'rRect'
{
- nBaseline = rRect.nBaseline;
+ nBaseline = rRect.nBaseline;
bHasBaseline = rRect.bHasBaseline;
- nAlignM = rRect.nAlignM;
+ nAlignM = rRect.nAlignM;
}
@@ -245,7 +245,7 @@ inline long SmRect::GetBaseline() const
inline SmRect & SmRect::operator = (const SmRect &rRect)
{
- new (this) SmRect(rRect); // placement new
+ new (this) SmRect(rRect); // placement new
return *this;
}
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index cc5560764914..25194d47cb63 100644
--- a/starmath/inc/smdll.hxx
+++ b/starmath/inc/smdll.hxx
@@ -2,7 +2,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
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index f6e1eb205fe1..242b5757d0be 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -2,7 +2,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
@@ -91,8 +91,8 @@ public:
class SmLocalizedSymbolData : public Resource
{
- ResStringArray aUiSymbolNamesAry;
- ResStringArray aExportSymbolNamesAry;
+ ResStringArray aUiSymbolNamesAry;
+ ResStringArray aExportSymbolNamesAry;
ResStringArray aUiSymbolSetNamesAry;
ResStringArray aExportSymbolSetNamesAry;
SmNamesArray *p50NamesAry;
@@ -167,9 +167,9 @@ public:
}
//virtuelle Methoden fuer den Optionendialog
- virtual SfxItemSet* CreateItemSet( USHORT nId );
- virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
- virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet );
+ virtual SfxItemSet* CreateItemSet( USHORT nId );
+ virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+ virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet );
};
#define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) )
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 9be6defc3964..ed670d8d1fba 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -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
@@ -31,110 +31,110 @@
#include <sfx2/sfxsids.hrc>
#include <editeng/memberids.hrc>
-#define SID_NEXTERR (SID_SMA_START + 1)
-#define SID_PREVERR (SID_SMA_START + 2)
-#define SID_NEXTMARK (SID_SMA_START + 3)
-#define SID_PREVMARK (SID_SMA_START + 4)
+#define SID_NEXTERR (SID_SMA_START + 1)
+#define SID_PREVERR (SID_SMA_START + 2)
+#define SID_NEXTMARK (SID_SMA_START + 3)
+#define SID_PREVMARK (SID_SMA_START + 4)
#define SID_SYMBOLS_CATALOGUE (SID_SMA_START + 5)
-#define SID_PREFERENCES (SID_SMA_START + 6)
-#define SID_VIEW050 (SID_SMA_START + 7)
-#define SID_VIEW100 (SID_SMA_START + 8)
-#define SID_VIEW200 (SID_SMA_START + 9)
+#define SID_PREFERENCES (SID_SMA_START + 6)
+#define SID_VIEW050 (SID_SMA_START + 7)
+#define SID_VIEW100 (SID_SMA_START + 8)
+#define SID_VIEW200 (SID_SMA_START + 9)
#define SID_ZOOMIN (SID_SMA_START + 10)
-#define SID_ZOOMOUT (SID_SMA_START + 11)
+#define SID_ZOOMOUT (SID_SMA_START + 11)
#define SID_DRAW (SID_SMA_START + 12)
#define SID_ADJUST (SID_SMA_START + 13)
-#define SID_TOOLBOX (SID_SMA_START + 14)
-#define SID_FORMULACURSOR (SID_SMA_START + 15)
+#define SID_TOOLBOX (SID_SMA_START + 14)
+#define SID_FORMULACURSOR (SID_SMA_START + 15)
#define SID_FONT (SID_SMA_START + 50)
-#define SID_FONTSIZE (SID_SMA_START + 51)
-#define SID_DISTANCE (SID_SMA_START + 52)
+#define SID_FONTSIZE (SID_SMA_START + 51)
+#define SID_DISTANCE (SID_SMA_START + 52)
#define SID_ALIGN (SID_SMA_START + 53)
-#define SID_AUTO_REDRAW (SID_SMA_START + 55)
-#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
-#define SID_TEXTMODE (SID_SMA_START + 57)
-#define SID_INSERT_FORMULA (SID_SMA_START + 58)
+#define SID_AUTO_REDRAW (SID_SMA_START + 55)
+#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
+#define SID_TEXTMODE (SID_SMA_START + 57)
+#define SID_INSERT_FORMULA (SID_SMA_START + 58)
#define SID_TEXT (SID_SMA_START + 100)
#define SID_GAPHIC_SM (SID_SMA_START + 101)
-#define SID_FITINWINDOW (SID_SMA_START + 103)
+#define SID_FITINWINDOW (SID_SMA_START + 103)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
-#define SID_INSERTSYMBOL (SID_SMA_START + 104)
+#define SID_INSERTSYMBOL (SID_SMA_START + 104)
/** Command for inserting a math construction specified in commands.src */
-#define SID_INSERTCOMMAND (SID_SMA_START + 105)
-
-#define SID_LOADSYMBOLS (SID_SMA_START + 107)
-#define SID_SAVESYMBOLS (SID_SMA_START + 108)
-#define SID_ZOOMSTATUS (SID_SMA_START + 109)
-#define SID_MODIFYSTATUS (SID_SMA_START + 110)
-#define SID_TEXTSTATUS (SID_SMA_START + 111)
-
-#define SID_PRINTTITLE (SID_SMA_START + 112)
-#define SID_PRINTTEXT (SID_SMA_START + 113)
-#define SID_PRINTFRAME (SID_SMA_START + 114)
-#define SID_PRINTSIZE (SID_SMA_START + 115)
-#define SID_PRINTZOOM (SID_SMA_START + 116)
-
-#define SID_COPYOBJECT (SID_SMA_START + 117)
-#define SID_PASTEOBJECT (SID_SMA_START + 118)
-#define SID_AUTOREDRAW (SID_SMA_START + 119)
-
-#define SID_GETEDITTEXT (SID_SMA_START + 121)
-#define SID_CMDBOXWINDOW (SID_SMA_START + 122)
-#define SID_TOOLBOXWINDOW (SID_SMA_START + 123)
-#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
+#define SID_INSERTCOMMAND (SID_SMA_START + 105)
+
+#define SID_LOADSYMBOLS (SID_SMA_START + 107)
+#define SID_SAVESYMBOLS (SID_SMA_START + 108)
+#define SID_ZOOMSTATUS (SID_SMA_START + 109)
+#define SID_MODIFYSTATUS (SID_SMA_START + 110)
+#define SID_TEXTSTATUS (SID_SMA_START + 111)
+
+#define SID_PRINTTITLE (SID_SMA_START + 112)
+#define SID_PRINTTEXT (SID_SMA_START + 113)
+#define SID_PRINTFRAME (SID_SMA_START + 114)
+#define SID_PRINTSIZE (SID_SMA_START + 115)
+#define SID_PRINTZOOM (SID_SMA_START + 116)
+
+#define SID_COPYOBJECT (SID_SMA_START + 117)
+#define SID_PASTEOBJECT (SID_SMA_START + 118)
+#define SID_AUTOREDRAW (SID_SMA_START + 119)
+
+#define SID_GETEDITTEXT (SID_SMA_START + 121)
+#define SID_CMDBOXWINDOW (SID_SMA_START + 122)
+#define SID_TOOLBOXWINDOW (SID_SMA_START + 123)
+#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
#define SID_DUMMY (SID_SMA_START + 254)
//#define GID_FORMEL (RID_GROUPS_OFFSET + 1)
//#define GID_ERROR (RID_GROUPS_OFFSET + 2)
-//#define RID_OPTIONSDIALOG (RID_APP_START + 1)
-#define RID_FONTDIALOG (RID_APP_START + 2)
-#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
-#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
-#define RID_DISTANCEDIALOG (RID_APP_START + 5)
-#define RID_ALIGNDIALOG (RID_APP_START + 6)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
-#define RID_SYMBOLDIALOG (RID_APP_START + 8)
-#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
-#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
-#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
-
-#define RID_MATH_TOOLBOX (RID_APP_START + 50)
+//#define RID_OPTIONSDIALOG (RID_APP_START + 1)
+#define RID_FONTDIALOG (RID_APP_START + 2)
+#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
+#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
+#define RID_DISTANCEDIALOG (RID_APP_START + 5)
+#define RID_ALIGNDIALOG (RID_APP_START + 6)
+#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
+#define RID_SYMBOLDIALOG (RID_APP_START + 8)
+#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
+#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
+#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
+
+#define RID_MATH_TOOLBOX (RID_APP_START + 50)
// wegen #58705# entfernt
-//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
+//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
-#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
-#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
-#define RID_READSYMBOLERROR (RID_APP_START + 203)
-#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
-#define RID_OBJECTNAME (RID_APP_START + 501)
+#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
+#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
+#define RID_READSYMBOLERROR (RID_APP_START + 203)
+#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
+#define RID_OBJECTNAME (RID_APP_START + 501)
// free
-#define RID_UNDOEDITNAME (RID_APP_START + 503)
-#define RID_UNDOFORMATNAME (RID_APP_START + 504)
-#define RID_APPICO (RID_APP_START + 601)
-#define RID_TMPICO (RID_APP_START + 603)
-#define RID_COMMANDMENU (RID_APP_START + 701)
-#define RID_VIEWMENU (RID_APP_START + 702)
-#define RID_DISTANCEMENU (RID_APP_START + 703)
-#define RID_FONTMENU (RID_APP_START + 704)
-#define RID_STARTUPWINDOW (RID_APP_START + 800)
-#define RID_TOOLBOXWINDOW (RID_APP_START + 801)
-#define RID_CMDBOXWINDOW (RID_APP_START + 802)
-#define RID_FONTREGULAR (RID_APP_START + 804)
-#define RID_FONTITALIC (RID_APP_START + 805)
-#define RID_FONTBOLD (RID_APP_START + 806)
-//#define RID_PRINTOPTION (RID_APP_START + 807)
-#define RID_DOCUMENTSTR (RID_APP_START + 808)
-#define RID_SYMBOLFILESSTR (RID_APP_START + 809)
-#define RID_ALLFILESSTR (RID_APP_START + 810)
-#define RID_CREATORSTR (RID_APP_START + 811)
-#define RID_FILESMFTYP (RID_APP_START + 812)
-#define RID_FILESYMTYP (RID_APP_START + 813)
-#define RID_SMMENU (RID_APP_START + 814)
-#define RID_SMACCEL (RID_APP_START + 815)
-#define RID_STATUSBAR (RID_APP_START + 816)
-#define RID_APPNAMESTR (RID_APP_START + 817)
+#define RID_UNDOEDITNAME (RID_APP_START + 503)
+#define RID_UNDOFORMATNAME (RID_APP_START + 504)
+#define RID_APPICO (RID_APP_START + 601)
+#define RID_TMPICO (RID_APP_START + 603)
+#define RID_COMMANDMENU (RID_APP_START + 701)
+#define RID_VIEWMENU (RID_APP_START + 702)
+#define RID_DISTANCEMENU (RID_APP_START + 703)
+#define RID_FONTMENU (RID_APP_START + 704)
+#define RID_STARTUPWINDOW (RID_APP_START + 800)
+#define RID_TOOLBOXWINDOW (RID_APP_START + 801)
+#define RID_CMDBOXWINDOW (RID_APP_START + 802)
+#define RID_FONTREGULAR (RID_APP_START + 804)
+#define RID_FONTITALIC (RID_APP_START + 805)
+#define RID_FONTBOLD (RID_APP_START + 806)
+//#define RID_PRINTOPTION (RID_APP_START + 807)
+#define RID_DOCUMENTSTR (RID_APP_START + 808)
+#define RID_SYMBOLFILESSTR (RID_APP_START + 809)
+#define RID_ALLFILESSTR (RID_APP_START + 810)
+#define RID_CREATORSTR (RID_APP_START + 811)
+#define RID_FILESMFTYP (RID_APP_START + 812)
+#define RID_FILESYMTYP (RID_APP_START + 813)
+#define RID_SMMENU (RID_APP_START + 814)
+#define RID_SMACCEL (RID_APP_START + 815)
+#define RID_STATUSBAR (RID_APP_START + 816)
+#define RID_APPNAMESTR (RID_APP_START + 817)
#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821)
#define RID_SMPLUGINMENU (RID_APP_START + 822)
@@ -142,24 +142,24 @@
#define STR_STATSTR_WRITING (RID_APP_START + 824)
#define STR_CMDBOXWINDOW (RID_APP_START + 825)
-#define RID_ERR_IDENT (RID_APP_START + 920)
-#define RID_ERR_UNKOWN (RID_APP_START + 921)
-#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
-#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
-#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
-#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
-#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
-#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
-#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
-#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
-#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
-#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
-#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
-#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
-#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
-#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
-#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
-#define RID_ERR_OVERFLOW (RID_APP_START + 937)
+#define RID_ERR_IDENT (RID_APP_START + 920)
+#define RID_ERR_UNKOWN (RID_APP_START + 921)
+#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
+#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
+#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
+#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
+#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
+#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
+#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
+#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
+#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
+#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
+#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
+#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
+#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
+#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
+#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
+#define RID_ERR_OVERFLOW (RID_APP_START + 937)
// toolbox image lists for 'Selection' window
//!! RID_ILH_XYZ = RID_IL_XYZ + 1 !!
@@ -184,266 +184,266 @@
#define RID_IL_MISC (RID_APP_START + 968)
#define RID_ILH_MISC (RID_APP_START + 969)
-#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
-#define RID_RELATIONS_CAT (RID_APP_START + 1102)
-#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103)
-#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
-#define RID_OPERATORS_CAT (RID_APP_START + 1105)
-#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
-#define RID_BRACKETS_CAT (RID_APP_START + 1107)
-#define RID_FORMAT_CAT (RID_APP_START + 1108)
-#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109)
-#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110)
-#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
-#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112)
-#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113)
-#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114)
-#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115)
-#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
-#define RID_MISC_CAT (RID_APP_START + 1117)
-#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
+#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
+#define RID_RELATIONS_CAT (RID_APP_START + 1102)
+#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103)
+#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
+#define RID_OPERATORS_CAT (RID_APP_START + 1105)
+#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
+#define RID_BRACKETS_CAT (RID_APP_START + 1107)
+#define RID_FORMAT_CAT (RID_APP_START + 1108)
+#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109)
+#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110)
+#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
+#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112)
+#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113)
+#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114)
+#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115)
+#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
+#define RID_MISC_CAT (RID_APP_START + 1117)
+#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
// new resource ID's
-#define RID_PLUSX (RID_APP_START + 1201)
-#define RID_MINUSX (RID_APP_START + 1202)
-#define RID_PLUSMINUSX (RID_APP_START + 1203)
-#define RID_MINUSPLUSX (RID_APP_START + 1204)
-#define RID_XPLUSY (RID_APP_START + 1205)
-#define RID_XCDOTY (RID_APP_START + 1206)
-#define RID_XTIMESY (RID_APP_START + 1207)
-#define RID_XSYMTIMESY (RID_APP_START + 1208)
-#define RID_XMINUSY (RID_APP_START + 1209)
-#define RID_XOVERY (RID_APP_START + 1210)
-#define RID_XDIVY (RID_APP_START + 1211)
-#define RID_XSYMDIVIDEY (RID_APP_START + 1212)
-#define RID_NEGX (RID_APP_START + 1213)
-#define RID_XANDY (RID_APP_START + 1214)
-#define RID_XORY (RID_APP_START + 1215)
-#define RID_XODIVIDEY (RID_APP_START + 1216)
-#define RID_XODOTY (RID_APP_START + 1217)
-#define RID_XOMINUSY (RID_APP_START + 1218)
-#define RID_XOPLUSY (RID_APP_START + 1219)
-#define RID_XOTIMESY (RID_APP_START + 1220)
-#define RID_XCIRCY (RID_APP_START + 1221)
-#define RID_XWIDESLASHY (RID_APP_START + 1222)
-#define RID_XWIDEBSLASHY (RID_APP_START + 1223)
-
-#define RID_XEQY (RID_APP_START + 1301)
-#define RID_XNEQY (RID_APP_START + 1302)
-#define RID_XEQUIVY (RID_APP_START + 1303)
-#define RID_XORTHOY (RID_APP_START + 1304)
-#define RID_XLTY (RID_APP_START + 1305)
-#define RID_XGTY (RID_APP_START + 1306)
-#define RID_XAPPROXY (RID_APP_START + 1307)
-#define RID_XPARALLELY (RID_APP_START + 1308)
-#define RID_XLESLANTY (RID_APP_START + 1309)
-#define RID_XGESLANTY (RID_APP_START + 1310)
-#define RID_XSIMEQY (RID_APP_START + 1311)
-#define RID_XPROPY (RID_APP_START + 1312)
-#define RID_XLEY (RID_APP_START + 1313)
-#define RID_XGEY (RID_APP_START + 1314)
-#define RID_XSIMY (RID_APP_START + 1315)
-#define RID_XTOWARDY (RID_APP_START + 1316)
-#define RID_XLLY (RID_APP_START + 1317)
-#define RID_XGGY (RID_APP_START + 1318)
-#define RID_XDEFY (RID_APP_START + 1319)
-#define RID_XTRANSLY (RID_APP_START + 1320)
-#define RID_XTRANSRY (RID_APP_START + 1321)
-#define RID_XDIVIDESY (RID_APP_START + 1322)
-#define RID_XNDIVIDESY (RID_APP_START + 1323)
-#define RID_DLARROW (RID_APP_START + 1324)
-#define RID_DLRARROW (RID_APP_START + 1325)
-#define RID_DRARROW (RID_APP_START + 1326)
-
-#define RID_XINY (RID_APP_START + 1401)
-#define RID_XNOTINY (RID_APP_START + 1402)
-#define RID_XOWNSY (RID_APP_START + 1403)
-#define RID_XINTERSECTIONY (RID_APP_START + 1405)
-#define RID_XUNIONY (RID_APP_START + 1406)
-#define RID_XSETMINUSY (RID_APP_START + 1407)
-#define RID_XSLASHY (RID_APP_START + 1408)
-#define RID_XSUBSETY (RID_APP_START + 1409)
-#define RID_XSUBSETEQY (RID_APP_START + 1410)
-#define RID_XSUPSETY (RID_APP_START + 1411)
-#define RID_XSUPSETEQY (RID_APP_START + 1412)
-#define RID_XNSUBSETY (RID_APP_START + 1413)
-#define RID_XNSUBSETEQY (RID_APP_START + 1414)
-#define RID_XNSUPSETY (RID_APP_START + 1415)
-#define RID_XNSUPSETEQY (RID_APP_START + 1416)
-#define RID_SETN (RID_APP_START + 1417)
-#define RID_SETZ (RID_APP_START + 1418)
-#define RID_SETQ (RID_APP_START + 1419)
-#define RID_SETR (RID_APP_START + 1420)
-#define RID_SETC (RID_APP_START + 1421)
-
-#define RID_ABSX (RID_APP_START + 1501)
-#define RID_FACTX (RID_APP_START + 1502)
-#define RID_SQRTX (RID_APP_START + 1503)
-#define RID_NROOTXY (RID_APP_START + 1504)
-#define RID_EX (RID_APP_START + 1505)
-#define RID_LNX (RID_APP_START + 1506)
-#define RID_EXPX (RID_APP_START + 1507)
-#define RID_LOGX (RID_APP_START + 1508)
-#define RID_SINX (RID_APP_START + 1509)
-#define RID_COSX (RID_APP_START + 1510)
-#define RID_TANX (RID_APP_START + 1511)
-#define RID_COTX (RID_APP_START + 1512)
-#define RID_SINHX (RID_APP_START + 1513)
-#define RID_COSHX (RID_APP_START + 1514)
-#define RID_TANHX (RID_APP_START + 1515)
-#define RID_COTHX (RID_APP_START + 1516)
-#define RID_ARCSINX (RID_APP_START + 1517)
-#define RID_ARCCOSX (RID_APP_START + 1518)
-#define RID_ARCTANX (RID_APP_START + 1519)
-#define RID_ARCCOTX (RID_APP_START + 1520)
-#define RID_ARSINHX (RID_APP_START + 1521)
-#define RID_ARCOSHX (RID_APP_START + 1522)
-#define RID_ARTANHX (RID_APP_START + 1523)
-#define RID_ARCOTHX (RID_APP_START + 1524)
-
-#define RID_LIMX (RID_APP_START + 1601)
-#define RID_SUMX (RID_APP_START + 1602)
-#define RID_PRODX (RID_APP_START + 1603)
-#define RID_COPRODX (RID_APP_START + 1604)
-#define RID_INTX (RID_APP_START + 1605)
-#define RID_IINTX (RID_APP_START + 1606)
-#define RID_IIINTX (RID_APP_START + 1607)
-#define RID_LINTX (RID_APP_START + 1609)
-#define RID_LLINTX (RID_APP_START + 1610)
-#define RID_LLLINTX (RID_APP_START + 1611)
-#define RID_FROMXTOY (RID_APP_START + 1613)
-#define RID_FROMX (RID_APP_START + 1614)
-#define RID_TOX (RID_APP_START + 1615)
-#define RID_LIMINFX (RID_APP_START + 1616)
-#define RID_LIMSUPX (RID_APP_START + 1617)
-
-#define RID_ACUTEX (RID_APP_START + 1701)
-#define RID_GRAVEX (RID_APP_START + 1702)
-#define RID_CHECKX (RID_APP_START + 1703)
-#define RID_BREVEX (RID_APP_START + 1704)
-#define RID_BARX (RID_APP_START + 1705)
-#define RID_VECX (RID_APP_START + 1706)
-#define RID_HATX (RID_APP_START + 1707)
-#define RID_TILDEX (RID_APP_START + 1708)
-#define RID_CIRCLEX (RID_APP_START + 1709)
-#define RID_DOTX (RID_APP_START + 1710)
-#define RID_DDOTX (RID_APP_START + 1711)
-#define RID_DDDOTX (RID_APP_START + 1712)
-#define RID_OVERLINEX (RID_APP_START + 1713)
-#define RID_UNDERLINEX (RID_APP_START + 1714)
-#define RID_OVERSTRIKEX (RID_APP_START + 1715)
-#define RID_PHANTOMX (RID_APP_START + 1716)
-#define RID_BOLDX (RID_APP_START + 1717)
-#define RID_ITALX (RID_APP_START + 1718)
-#define RID_SIZEXY (RID_APP_START + 1719)
-#define RID_FONTXY (RID_APP_START + 1720)
-#define RID_COLORX (RID_APP_START + 1721)
-#define RID_WIDEHATX (RID_APP_START + 1722)
-#define RID_WIDETILDEX (RID_APP_START + 1723)
-#define RID_WIDEVECX (RID_APP_START + 1724)
-
-#define RID_LRPARENTX (RID_APP_START + 1801)
-#define RID_LRBRACKETX (RID_APP_START + 1802)
-#define RID_LRANGLEX (RID_APP_START + 1803)
-#define RID_LRBRACEX (RID_APP_START + 1804)
-#define RID_LRLINEX (RID_APP_START + 1805)
-#define RID_LRDLINEX (RID_APP_START + 1806)
-#define RID_LRGROUPX (RID_APP_START + 1808)
-#define RID_SLRPARENTX (RID_APP_START + 1809)
-#define RID_SLRBRACKETX (RID_APP_START + 1810)
-#define RID_SLRANGLEX (RID_APP_START + 1811)
-#define RID_SLRBRACEX (RID_APP_START + 1812)
-#define RID_SLRLINEX (RID_APP_START + 1813)
-#define RID_SLRDLINEX (RID_APP_START + 1814)
-#define RID_LRCEILX (RID_APP_START + 1817)
-#define RID_LRFLOORX (RID_APP_START + 1818)
-#define RID_SLRCEILX (RID_APP_START + 1819)
-#define RID_SLRFLOORX (RID_APP_START + 1820)
-#define RID_LMRANGLEXY (RID_APP_START + 1821)
-#define RID_SLMRANGLEXY (RID_APP_START + 1822)
-#define RID_LRDBRACKETX (RID_APP_START + 1823)
-#define RID_SLRDBRACKETX (RID_APP_START + 1824)
-#define RID_XOVERBRACEY (RID_APP_START + 1825)
-#define RID_XUNDERBRACEY (RID_APP_START + 1826)
-
-#define RID_NEWLINE (RID_APP_START + 1901)
-#define RID_SBLANK (RID_APP_START + 1902)
-#define RID_BLANK (RID_APP_START + 1903)
-#define RID_RSUBX (RID_APP_START + 1904)
-#define RID_BINOMXY (RID_APP_START + 1905)
-#define RID_STACK (RID_APP_START + 1906)
-#define RID_MATRIX (RID_APP_START + 1907)
-#define RID_RSUPX (RID_APP_START + 1908)
-#define RID_ALIGNLX (RID_APP_START + 1909)
-#define RID_ALIGNCX (RID_APP_START + 1910)
-#define RID_ALIGNRX (RID_APP_START + 1911)
-#define RID_LSUBX (RID_APP_START + 1912)
-#define RID_LSUPX (RID_APP_START + 1916)
-#define RID_CSUBX (RID_APP_START + 1917)
-#define RID_CSUPX (RID_APP_START + 1918)
-#define RID_NOSPACE (RID_APP_START + 1919)
-
-#define RID_ALEPH (RID_APP_START + 2001)
-#define RID_EMPTYSET (RID_APP_START + 2002)
-#define RID_RE (RID_APP_START + 2003)
-#define RID_IM (RID_APP_START + 2004)
-#define RID_INFINITY (RID_APP_START + 2005)
-#define RID_PARTIAL (RID_APP_START + 2006)
-#define RID_WP (RID_APP_START + 2007)
-#define RID_DOTSAXIS (RID_APP_START + 2008)
-#define RID_DOTSUP (RID_APP_START + 2009)
-#define RID_DOTSDOWN (RID_APP_START + 2010)
-#define RID_DOTSLOW (RID_APP_START + 2011)
-#define RID_DOTSVERT (RID_APP_START + 2012)
-#define RID_NABLA (RID_APP_START + 2013)
-#define RID_HBAR (RID_APP_START + 2014)
-#define RID_LAMBDABAR (RID_APP_START + 2015)
-#define RID_LEFTARROW (RID_APP_START + 2016)
-#define RID_RIGHTARROW (RID_APP_START + 2017)
-#define RID_UPARROW (RID_APP_START + 2018)
-#define RID_DOWNARROW (RID_APP_START + 2019)
-#define RID_EXISTS (RID_APP_START + 1608)
-#define RID_FORALL (RID_APP_START + 1612)
+#define RID_PLUSX (RID_APP_START + 1201)
+#define RID_MINUSX (RID_APP_START + 1202)
+#define RID_PLUSMINUSX (RID_APP_START + 1203)
+#define RID_MINUSPLUSX (RID_APP_START + 1204)
+#define RID_XPLUSY (RID_APP_START + 1205)
+#define RID_XCDOTY (RID_APP_START + 1206)
+#define RID_XTIMESY (RID_APP_START + 1207)
+#define RID_XSYMTIMESY (RID_APP_START + 1208)
+#define RID_XMINUSY (RID_APP_START + 1209)
+#define RID_XOVERY (RID_APP_START + 1210)
+#define RID_XDIVY (RID_APP_START + 1211)
+#define RID_XSYMDIVIDEY (RID_APP_START + 1212)
+#define RID_NEGX (RID_APP_START + 1213)
+#define RID_XANDY (RID_APP_START + 1214)
+#define RID_XORY (RID_APP_START + 1215)
+#define RID_XODIVIDEY (RID_APP_START + 1216)
+#define RID_XODOTY (RID_APP_START + 1217)
+#define RID_XOMINUSY (RID_APP_START + 1218)
+#define RID_XOPLUSY (RID_APP_START + 1219)
+#define RID_XOTIMESY (RID_APP_START + 1220)
+#define RID_XCIRCY (RID_APP_START + 1221)
+#define RID_XWIDESLASHY (RID_APP_START + 1222)
+#define RID_XWIDEBSLASHY (RID_APP_START + 1223)
+
+#define RID_XEQY (RID_APP_START + 1301)
+#define RID_XNEQY (RID_APP_START + 1302)
+#define RID_XEQUIVY (RID_APP_START + 1303)
+#define RID_XORTHOY (RID_APP_START + 1304)
+#define RID_XLTY (RID_APP_START + 1305)
+#define RID_XGTY (RID_APP_START + 1306)
+#define RID_XAPPROXY (RID_APP_START + 1307)
+#define RID_XPARALLELY (RID_APP_START + 1308)
+#define RID_XLESLANTY (RID_APP_START + 1309)
+#define RID_XGESLANTY (RID_APP_START + 1310)
+#define RID_XSIMEQY (RID_APP_START + 1311)
+#define RID_XPROPY (RID_APP_START + 1312)
+#define RID_XLEY (RID_APP_START + 1313)
+#define RID_XGEY (RID_APP_START + 1314)
+#define RID_XSIMY (RID_APP_START + 1315)
+#define RID_XTOWARDY (RID_APP_START + 1316)
+#define RID_XLLY (RID_APP_START + 1317)
+#define RID_XGGY (RID_APP_START + 1318)
+#define RID_XDEFY (RID_APP_START + 1319)
+#define RID_XTRANSLY (RID_APP_START + 1320)
+#define RID_XTRANSRY (RID_APP_START + 1321)
+#define RID_XDIVIDESY (RID_APP_START + 1322)
+#define RID_XNDIVIDESY (RID_APP_START + 1323)
+#define RID_DLARROW (RID_APP_START + 1324)
+#define RID_DLRARROW (RID_APP_START + 1325)
+#define RID_DRARROW (RID_APP_START + 1326)
+
+#define RID_XINY (RID_APP_START + 1401)
+#define RID_XNOTINY (RID_APP_START + 1402)
+#define RID_XOWNSY (RID_APP_START + 1403)
+#define RID_XINTERSECTIONY (RID_APP_START + 1405)
+#define RID_XUNIONY (RID_APP_START + 1406)
+#define RID_XSETMINUSY (RID_APP_START + 1407)
+#define RID_XSLASHY (RID_APP_START + 1408)
+#define RID_XSUBSETY (RID_APP_START + 1409)
+#define RID_XSUBSETEQY (RID_APP_START + 1410)
+#define RID_XSUPSETY (RID_APP_START + 1411)
+#define RID_XSUPSETEQY (RID_APP_START + 1412)
+#define RID_XNSUBSETY (RID_APP_START + 1413)
+#define RID_XNSUBSETEQY (RID_APP_START + 1414)
+#define RID_XNSUPSETY (RID_APP_START + 1415)
+#define RID_XNSUPSETEQY (RID_APP_START + 1416)
+#define RID_SETN (RID_APP_START + 1417)
+#define RID_SETZ (RID_APP_START + 1418)
+#define RID_SETQ (RID_APP_START + 1419)
+#define RID_SETR (RID_APP_START + 1420)
+#define RID_SETC (RID_APP_START + 1421)
+
+#define RID_ABSX (RID_APP_START + 1501)
+#define RID_FACTX (RID_APP_START + 1502)
+#define RID_SQRTX (RID_APP_START + 1503)
+#define RID_NROOTXY (RID_APP_START + 1504)
+#define RID_EX (RID_APP_START + 1505)
+#define RID_LNX (RID_APP_START + 1506)
+#define RID_EXPX (RID_APP_START + 1507)
+#define RID_LOGX (RID_APP_START + 1508)
+#define RID_SINX (RID_APP_START + 1509)
+#define RID_COSX (RID_APP_START + 1510)
+#define RID_TANX (RID_APP_START + 1511)
+#define RID_COTX (RID_APP_START + 1512)
+#define RID_SINHX (RID_APP_START + 1513)
+#define RID_COSHX (RID_APP_START + 1514)
+#define RID_TANHX (RID_APP_START + 1515)
+#define RID_COTHX (RID_APP_START + 1516)
+#define RID_ARCSINX (RID_APP_START + 1517)
+#define RID_ARCCOSX (RID_APP_START + 1518)
+#define RID_ARCTANX (RID_APP_START + 1519)
+#define RID_ARCCOTX (RID_APP_START + 1520)
+#define RID_ARSINHX (RID_APP_START + 1521)
+#define RID_ARCOSHX (RID_APP_START + 1522)
+#define RID_ARTANHX (RID_APP_START + 1523)
+#define RID_ARCOTHX (RID_APP_START + 1524)
+
+#define RID_LIMX (RID_APP_START + 1601)
+#define RID_SUMX (RID_APP_START + 1602)
+#define RID_PRODX (RID_APP_START + 1603)
+#define RID_COPRODX (RID_APP_START + 1604)
+#define RID_INTX (RID_APP_START + 1605)
+#define RID_IINTX (RID_APP_START + 1606)
+#define RID_IIINTX (RID_APP_START + 1607)
+#define RID_LINTX (RID_APP_START + 1609)
+#define RID_LLINTX (RID_APP_START + 1610)
+#define RID_LLLINTX (RID_APP_START + 1611)
+#define RID_FROMXTOY (RID_APP_START + 1613)
+#define RID_FROMX (RID_APP_START + 1614)
+#define RID_TOX (RID_APP_START + 1615)
+#define RID_LIMINFX (RID_APP_START + 1616)
+#define RID_LIMSUPX (RID_APP_START + 1617)
+
+#define RID_ACUTEX (RID_APP_START + 1701)
+#define RID_GRAVEX (RID_APP_START + 1702)
+#define RID_CHECKX (RID_APP_START + 1703)
+#define RID_BREVEX (RID_APP_START + 1704)
+#define RID_BARX (RID_APP_START + 1705)
+#define RID_VECX (RID_APP_START + 1706)
+#define RID_HATX (RID_APP_START + 1707)
+#define RID_TILDEX (RID_APP_START + 1708)
+#define RID_CIRCLEX (RID_APP_START + 1709)
+#define RID_DOTX (RID_APP_START + 1710)
+#define RID_DDOTX (RID_APP_START + 1711)
+#define RID_DDDOTX (RID_APP_START + 1712)
+#define RID_OVERLINEX (RID_APP_START + 1713)
+#define RID_UNDERLINEX (RID_APP_START + 1714)
+#define RID_OVERSTRIKEX (RID_APP_START + 1715)
+#define RID_PHANTOMX (RID_APP_START + 1716)
+#define RID_BOLDX (RID_APP_START + 1717)
+#define RID_ITALX (RID_APP_START + 1718)
+#define RID_SIZEXY (RID_APP_START + 1719)
+#define RID_FONTXY (RID_APP_START + 1720)
+#define RID_COLORX (RID_APP_START + 1721)
+#define RID_WIDEHATX (RID_APP_START + 1722)
+#define RID_WIDETILDEX (RID_APP_START + 1723)
+#define RID_WIDEVECX (RID_APP_START + 1724)
+
+#define RID_LRPARENTX (RID_APP_START + 1801)
+#define RID_LRBRACKETX (RID_APP_START + 1802)
+#define RID_LRANGLEX (RID_APP_START + 1803)
+#define RID_LRBRACEX (RID_APP_START + 1804)
+#define RID_LRLINEX (RID_APP_START + 1805)
+#define RID_LRDLINEX (RID_APP_START + 1806)
+#define RID_LRGROUPX (RID_APP_START + 1808)
+#define RID_SLRPARENTX (RID_APP_START + 1809)
+#define RID_SLRBRACKETX (RID_APP_START + 1810)
+#define RID_SLRANGLEX (RID_APP_START + 1811)
+#define RID_SLRBRACEX (RID_APP_START + 1812)
+#define RID_SLRLINEX (RID_APP_START + 1813)
+#define RID_SLRDLINEX (RID_APP_START + 1814)
+#define RID_LRCEILX (RID_APP_START + 1817)
+#define RID_LRFLOORX (RID_APP_START + 1818)
+#define RID_SLRCEILX (RID_APP_START + 1819)
+#define RID_SLRFLOORX (RID_APP_START + 1820)
+#define RID_LMRANGLEXY (RID_APP_START + 1821)
+#define RID_SLMRANGLEXY (RID_APP_START + 1822)
+#define RID_LRDBRACKETX (RID_APP_START + 1823)
+#define RID_SLRDBRACKETX (RID_APP_START + 1824)
+#define RID_XOVERBRACEY (RID_APP_START + 1825)
+#define RID_XUNDERBRACEY (RID_APP_START + 1826)
+
+#define RID_NEWLINE (RID_APP_START + 1901)
+#define RID_SBLANK (RID_APP_START + 1902)
+#define RID_BLANK (RID_APP_START + 1903)
+#define RID_RSUBX (RID_APP_START + 1904)
+#define RID_BINOMXY (RID_APP_START + 1905)
+#define RID_STACK (RID_APP_START + 1906)
+#define RID_MATRIX (RID_APP_START + 1907)
+#define RID_RSUPX (RID_APP_START + 1908)
+#define RID_ALIGNLX (RID_APP_START + 1909)
+#define RID_ALIGNCX (RID_APP_START + 1910)
+#define RID_ALIGNRX (RID_APP_START + 1911)
+#define RID_LSUBX (RID_APP_START + 1912)
+#define RID_LSUPX (RID_APP_START + 1916)
+#define RID_CSUBX (RID_APP_START + 1917)
+#define RID_CSUPX (RID_APP_START + 1918)
+#define RID_NOSPACE (RID_APP_START + 1919)
+
+#define RID_ALEPH (RID_APP_START + 2001)
+#define RID_EMPTYSET (RID_APP_START + 2002)
+#define RID_RE (RID_APP_START + 2003)
+#define RID_IM (RID_APP_START + 2004)
+#define RID_INFINITY (RID_APP_START + 2005)
+#define RID_PARTIAL (RID_APP_START + 2006)
+#define RID_WP (RID_APP_START + 2007)
+#define RID_DOTSAXIS (RID_APP_START + 2008)
+#define RID_DOTSUP (RID_APP_START + 2009)
+#define RID_DOTSDOWN (RID_APP_START + 2010)
+#define RID_DOTSLOW (RID_APP_START + 2011)
+#define RID_DOTSVERT (RID_APP_START + 2012)
+#define RID_NABLA (RID_APP_START + 2013)
+#define RID_HBAR (RID_APP_START + 2014)
+#define RID_LAMBDABAR (RID_APP_START + 2015)
+#define RID_LEFTARROW (RID_APP_START + 2016)
+#define RID_RIGHTARROW (RID_APP_START + 2017)
+#define RID_UPARROW (RID_APP_START + 2018)
+#define RID_DOWNARROW (RID_APP_START + 2019)
+#define RID_EXISTS (RID_APP_START + 1608)
+#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
-#define RID_UNBINOPS_MENU (RID_APP_START + 2164)
-#define RID_RELATIONS_MENU (RID_APP_START + 2165)
-#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166)
-#define RID_FUNCTIONS_MENU (RID_APP_START + 2167)
-#define RID_OPERATORS_MENU (RID_APP_START + 2168)
-#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169)
-#define RID_BRACKETS_MENU (RID_APP_START + 2170)
-#define RID_FORMAT_MENU (RID_APP_START + 2171)
-#define RID_MISC_MENU (RID_APP_START + 2172)
-#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
-
-#define RID_XPP_LINE (RID_APP_START + 3000)
-#define RID_XPP_DLINE (RID_APP_START + 3001)
-#define RID_XPP_SQRT (RID_APP_START + 3002)
-#define RID_XPP_SQRT2 (RID_APP_START + 3003)
-#define RID_XPP_HAT (RID_APP_START + 3004)
-#define RID_XPP_TILDE (RID_APP_START + 3005)
-#define RID_XPP_BAR (RID_APP_START + 3006)
-#define RID_XPP_VEC (RID_APP_START + 3007)
-#define RID_XPP_LBRACE (RID_APP_START + 3008)
-#define RID_XPP_RBRACE (RID_APP_START + 3009)
-#define RID_XPP_LPARENT (RID_APP_START + 3010)
-#define RID_XPP_RPARENT (RID_APP_START + 3011)
-#define RID_XPP_LANGLE (RID_APP_START + 3012)
-#define RID_XPP_RANGLE (RID_APP_START + 3013)
-#define RID_XPP_LBRACKET (RID_APP_START + 3014)
-#define RID_XPP_RBRACKET (RID_APP_START + 3015)
-#define RID_XPP_LDBRACKET (RID_APP_START + 3016)
-#define RID_XPP_RDBRACKET (RID_APP_START + 3017)
-#define RID_XPP_LCEIL (RID_APP_START + 3018)
-#define RID_XPP_RCEIL (RID_APP_START + 3019)
-#define RID_XPP_LFLOOR (RID_APP_START + 3020)
-#define RID_XPP_RFLOOR (RID_APP_START + 3021)
-#define RID_XPP_OVERBRACE (RID_APP_START + 3022)
-#define RID_XPP_UNDERBRACE (RID_APP_START + 3023)
+#define RID_UNBINOPS_MENU (RID_APP_START + 2164)
+#define RID_RELATIONS_MENU (RID_APP_START + 2165)
+#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166)
+#define RID_FUNCTIONS_MENU (RID_APP_START + 2167)
+#define RID_OPERATORS_MENU (RID_APP_START + 2168)
+#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169)
+#define RID_BRACKETS_MENU (RID_APP_START + 2170)
+#define RID_FORMAT_MENU (RID_APP_START + 2171)
+#define RID_MISC_MENU (RID_APP_START + 2172)
+#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
+
+#define RID_XPP_LINE (RID_APP_START + 3000)
+#define RID_XPP_DLINE (RID_APP_START + 3001)
+#define RID_XPP_SQRT (RID_APP_START + 3002)
+#define RID_XPP_SQRT2 (RID_APP_START + 3003)
+#define RID_XPP_HAT (RID_APP_START + 3004)
+#define RID_XPP_TILDE (RID_APP_START + 3005)
+#define RID_XPP_BAR (RID_APP_START + 3006)
+#define RID_XPP_VEC (RID_APP_START + 3007)
+#define RID_XPP_LBRACE (RID_APP_START + 3008)
+#define RID_XPP_RBRACE (RID_APP_START + 3009)
+#define RID_XPP_LPARENT (RID_APP_START + 3010)
+#define RID_XPP_RPARENT (RID_APP_START + 3011)
+#define RID_XPP_LANGLE (RID_APP_START + 3012)
+#define RID_XPP_RANGLE (RID_APP_START + 3013)
+#define RID_XPP_LBRACKET (RID_APP_START + 3014)
+#define RID_XPP_RBRACKET (RID_APP_START + 3015)
+#define RID_XPP_LDBRACKET (RID_APP_START + 3016)
+#define RID_XPP_RDBRACKET (RID_APP_START + 3017)
+#define RID_XPP_LCEIL (RID_APP_START + 3018)
+#define RID_XPP_RCEIL (RID_APP_START + 3019)
+#define RID_XPP_LFLOOR (RID_APP_START + 3020)
+#define RID_XPP_RFLOOR (RID_APP_START + 3021)
+#define RID_XPP_OVERBRACE (RID_APP_START + 3022)
+#define RID_XPP_UNDERBRACE (RID_APP_START + 3023)
#define RID_LOCALIZED_NAMES (RID_APP_START + 3101)
-#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
+#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
#define RID_LOCALIZED_SYMBOLSET_NAMES (RID_APP_START + 3104)
#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
@@ -459,301 +459,301 @@
#define MN_SUB_SENDTO (RID_APP_START + 3120)
-#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1)
-#define HID_SMA_FONTDIALOG (HID_SMA_START + 2)
-#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3)
-#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4)
-#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5)
-#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6)
-#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7)
-#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8)
-#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9)
-#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10)
-#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11)
-#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12)
-#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13)
-#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14)
-#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15)
-#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16)
-#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17)
-#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18)
-#define HID_SMA_OBJECTNAME (HID_SMA_START + 19)
-#define HID_SMA_VIEWNAME (HID_SMA_START + 20)
-#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21)
-#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22)
-#define HID_SMA_APPICO (HID_SMA_START + 23)
-#define HID_SMA_DOCICO (HID_SMA_START + 24)
-#define HID_SMA_TMPICO (HID_SMA_START + 25)
-#define HID_SMA_COMMANDMENU (HID_SMA_START + 26)
-#define HID_SMA_VIEWMENU (HID_SMA_START + 27)
-#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28)
-#define HID_SMA_FONTMENU (HID_SMA_START + 29)
-#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30)
-#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31)
-#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32)
-#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33)
-#define HID_SMA_FONTREGULAR (HID_SMA_START + 34)
-#define HID_SMA_FONTITALIC (HID_SMA_START + 35)
-#define HID_SMA_FONTBOLD (HID_SMA_START + 36)
-#define HID_SMA_PRINTOPTION (HID_SMA_START + 37)
-#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38)
-#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39)
-#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40)
-#define HID_SMA_CREATORSTR (HID_SMA_START + 41)
-#define HID_SMA_FILESMFTYP (HID_SMA_START + 42)
-#define HID_SMA_FILESYMTYP (HID_SMA_START + 43)
-#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44)
-#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45)
-
-#define HID_SMA_PLUSX (HID_SMA_START + 50)
-#define HID_SMA_MINUSX (HID_SMA_START + 51)
-#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52)
-#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53)
-#define HID_SMA_NEGX (HID_SMA_START + 54)
-#define HID_SMA_XPLUSY (HID_SMA_START + 55)
-#define HID_SMA_XMINUSY (HID_SMA_START + 56)
-#define HID_SMA_XCDOTY (HID_SMA_START + 57)
-#define HID_SMA_XTIMESY (HID_SMA_START + 58)
-#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59)
-#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60)
-#define HID_SMA_XDIVY (HID_SMA_START + 61)
-#define HID_SMA_XOVERY (HID_SMA_START + 62)
-#define HID_SMA_XODIVIDEY (HID_SMA_START + 63)
-#define HID_SMA_XODOTY (HID_SMA_START + 64)
-#define HID_SMA_XOMINUSY (HID_SMA_START + 65)
-#define HID_SMA_XOPLUSY (HID_SMA_START + 66)
-#define HID_SMA_XOTIMESY (HID_SMA_START + 67)
-#define HID_SMA_XANDY (HID_SMA_START + 68)
-#define HID_SMA_XORY (HID_SMA_START + 69)
-#define HID_SMA_XEQY (HID_SMA_START + 70)
-#define HID_SMA_XNEQY (HID_SMA_START + 71)
-#define HID_SMA_XLTY (HID_SMA_START + 72)
-#define HID_SMA_XGTY (HID_SMA_START + 73)
-#define HID_SMA_XLEY (HID_SMA_START + 74)
-#define HID_SMA_XGEY (HID_SMA_START + 75)
-#define HID_SMA_XLESLANTY (HID_SMA_START + 76)
-#define HID_SMA_XGESLANTY (HID_SMA_START + 77)
-#define HID_SMA_XLLY (HID_SMA_START + 78)
-#define HID_SMA_XGGY (HID_SMA_START + 79)
-#define HID_SMA_XDEFY (HID_SMA_START + 80)
-#define HID_SMA_XEQUIVY (HID_SMA_START + 81)
-#define HID_SMA_XAPPROXY (HID_SMA_START + 82)
-#define HID_SMA_XSIMY (HID_SMA_START + 83)
-#define HID_SMA_XSIMEQY (HID_SMA_START + 84)
-#define HID_SMA_XPROPY (HID_SMA_START + 85)
-#define HID_SMA_XORTHOY (HID_SMA_START + 86)
-#define HID_SMA_XPARALLELY (HID_SMA_START + 87)
-#define HID_SMA_XTOWARDY (HID_SMA_START + 88)
-#define HID_SMA_XTRANSLY (HID_SMA_START + 89)
-#define HID_SMA_XTRANSRY (HID_SMA_START + 90)
-#define HID_SMA_XINY (HID_SMA_START + 91)
-#define HID_SMA_XNOTINY (HID_SMA_START + 92)
-#define HID_SMA_XOWNSY (HID_SMA_START + 93)
-#define HID_SMA_XUNIONY (HID_SMA_START + 94)
-#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95)
-#define HID_SMA_XSETMINUSY (HID_SMA_START + 96)
-#define HID_SMA_XSLASHY (HID_SMA_START + 97)
-#define HID_SMA_XSUBSETY (HID_SMA_START + 98)
-#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99)
-#define HID_SMA_XSUPSETY (HID_SMA_START + 100)
-#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101)
-#define HID_SMA_XNSUBSETY (HID_SMA_START + 102)
-#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103)
-#define HID_SMA_XNSUPSETY (HID_SMA_START + 104)
-#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105)
-#define HID_SMA_ABSX (HID_SMA_START + 106)
-#define HID_SMA_FACTX (HID_SMA_START + 107)
-#define HID_SMA_SQRTX (HID_SMA_START + 108)
-#define HID_SMA_NROOTXY (HID_SMA_START + 109)
-#define HID_SMA_EX (HID_SMA_START + 110)
-#define HID_SMA_EXPX (HID_SMA_START + 111)
-#define HID_SMA_LNX (HID_SMA_START + 112)
-#define HID_SMA_LOGX (HID_SMA_START + 113)
-#define HID_SMA_SINX (HID_SMA_START + 114)
-#define HID_SMA_COSX (HID_SMA_START + 115)
-#define HID_SMA_TANX (HID_SMA_START + 116)
-#define HID_SMA_COTX (HID_SMA_START + 117)
-#define HID_SMA_ARCSINX (HID_SMA_START + 118)
-#define HID_SMA_ARCCOSX (HID_SMA_START + 119)
-#define HID_SMA_ARCTANX (HID_SMA_START + 120)
-#define HID_SMA_ARCCOTX (HID_SMA_START + 121)
-#define HID_SMA_SINHX (HID_SMA_START + 122)
-#define HID_SMA_COSHX (HID_SMA_START + 123)
-#define HID_SMA_TANHX (HID_SMA_START + 124)
-#define HID_SMA_COTHX (HID_SMA_START + 125)
-#define HID_SMA_ARSINHX (HID_SMA_START + 126)
-#define HID_SMA_ARCOSHX (HID_SMA_START + 127)
-#define HID_SMA_ARTANHX (HID_SMA_START + 128)
-#define HID_SMA_ARCOTHX (HID_SMA_START + 129)
-#define HID_SMA_SUMX (HID_SMA_START + 130)
-#define HID_SMA_PRODX (HID_SMA_START + 131)
-#define HID_SMA_COPRODX (HID_SMA_START + 132)
-#define HID_SMA_LIMX (HID_SMA_START + 133)
-#define HID_SMA_LIMINFX (HID_SMA_START + 134)
-#define HID_SMA_LIMSUPX (HID_SMA_START + 135)
-#define HID_SMA_EXISTS (HID_SMA_START + 136)
-#define HID_SMA_FORALL (HID_SMA_START + 137)
-#define HID_SMA_NABLA (HID_SMA_START + 138)
-#define HID_SMA_INTX (HID_SMA_START + 139)
-#define HID_SMA_IINTX (HID_SMA_START + 140)
-#define HID_SMA_IIINTX (HID_SMA_START + 141)
-#define HID_SMA_LINTX (HID_SMA_START + 142)
-#define HID_SMA_LLINTX (HID_SMA_START + 143)
-#define HID_SMA_LLLINTX (HID_SMA_START + 144)
-#define HID_SMA_FROMX (HID_SMA_START + 145)
-#define HID_SMA_TOX (HID_SMA_START + 146)
-#define HID_SMA_FROMXTOY (HID_SMA_START + 147)
-#define HID_SMA_XCIRCY (HID_SMA_START + 148)
-#define HID_SMA_XDIVIDESY (HID_SMA_START + 149)
-#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150)
-#define HID_SMA_DLARROW (HID_SMA_START + 151)
-#define HID_SMA_DLRARROW (HID_SMA_START + 152)
-#define HID_SMA_DRARROW (HID_SMA_START + 153)
-
-#define HID_SMA_MISC_CAT (HID_SMA_START + 154)
-#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155)
-#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156)
-#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157)
-#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158)
-#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159)
-#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160)
-#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161)
-#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162)
-
-#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163)
-#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164)
-#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165)
-#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166)
-#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167)
-#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168)
-#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169)
-#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170)
-#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171)
-#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172)
-#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173)
-#define HID_SMA_MISC_MENU (HID_SMA_START + 174)
-#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175)
-
-#define HID_SMA_ACUTEX (HID_SMA_START + 180)
-#define HID_SMA_BARX (HID_SMA_START + 181)
-#define HID_SMA_BREVEX (HID_SMA_START + 182)
-#define HID_SMA_CHECKX (HID_SMA_START + 183)
-#define HID_SMA_CIRCLEX (HID_SMA_START + 184)
-#define HID_SMA_DOTX (HID_SMA_START + 185)
-#define HID_SMA_DDOTX (HID_SMA_START + 186)
-#define HID_SMA_DDDOTX (HID_SMA_START + 187)
-#define HID_SMA_GRAVEX (HID_SMA_START + 188)
-#define HID_SMA_HATX (HID_SMA_START + 189)
-#define HID_SMA_TILDEX (HID_SMA_START + 190)
-#define HID_SMA_VECX (HID_SMA_START + 191)
-#define HID_SMA_UNDERLINEX (HID_SMA_START + 192)
-#define HID_SMA_OVERLINEX (HID_SMA_START + 193)
-#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194)
-#define HID_SMA_PHANTOMX (HID_SMA_START + 195)
-#define HID_SMA_BOLDX (HID_SMA_START + 196)
-#define HID_SMA_ITALX (HID_SMA_START + 197)
-#define HID_SMA_SIZEXY (HID_SMA_START + 198)
-#define HID_SMA_FONTXY (HID_SMA_START + 199)
-#define HID_SMA_COLORX (HID_SMA_START + 200)
-#define HID_SMA_LRGROUPX (HID_SMA_START + 201)
-#define HID_SMA_LRPARENTX (HID_SMA_START + 202)
-#define HID_SMA_LRBRACKETX (HID_SMA_START + 203)
-#define HID_SMA_LRBRACEX (HID_SMA_START + 204)
-#define HID_SMA_LRANGLEX (HID_SMA_START + 205)
-#define HID_SMA_LRCEILX (HID_SMA_START + 206)
-#define HID_SMA_LRFLOORX (HID_SMA_START + 207)
-#define HID_SMA_LRLINEX (HID_SMA_START + 208)
-#define HID_SMA_LRDLINEX (HID_SMA_START + 209)
-#define HID_SMA_SLRPARENTX (HID_SMA_START + 210)
-#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211)
-#define HID_SMA_SLRBRACEX (HID_SMA_START + 212)
-#define HID_SMA_SLRANGLEX (HID_SMA_START + 213)
-#define HID_SMA_SLRCEILX (HID_SMA_START + 214)
-#define HID_SMA_SLRFLOORX (HID_SMA_START + 215)
-#define HID_SMA_SLRLINEX (HID_SMA_START + 216)
-#define HID_SMA_SLRDLINEX (HID_SMA_START + 217)
-#define HID_SMA_RSUBX (HID_SMA_START + 218)
-#define HID_SMA_RSUPX (HID_SMA_START + 219)
-#define HID_SMA_LSUBX (HID_SMA_START + 220)
-#define HID_SMA_LSUPX (HID_SMA_START + 221)
-#define HID_SMA_SBLANK (HID_SMA_START + 222)
-#define HID_SMA_BLANK (HID_SMA_START + 223)
-#define HID_SMA_NEWLINE (HID_SMA_START + 224)
-#define HID_SMA_BINOMXY (HID_SMA_START + 225)
-#define HID_SMA_STACK (HID_SMA_START + 226)
-#define HID_SMA_MATRIX (HID_SMA_START + 227)
-#define HID_SMA_ALIGNLX (HID_SMA_START + 228)
-#define HID_SMA_ALIGNCX (HID_SMA_START + 229)
-#define HID_SMA_ALIGNRX (HID_SMA_START + 230)
-#define HID_SMA_ALEPH (HID_SMA_START + 231)
-#define HID_SMA_EMPTYSET (HID_SMA_START + 232)
-#define HID_SMA_RE (HID_SMA_START + 233)
-#define HID_SMA_IM (HID_SMA_START + 234)
-#define HID_SMA_INFINITY (HID_SMA_START + 235)
-#define HID_SMA_PARTIAL (HID_SMA_START + 236)
-#define HID_SMA_WP (HID_SMA_START + 237)
-#define HID_SMA_DOTSAXIS (HID_SMA_START + 238)
-#define HID_SMA_DOTSUP (HID_SMA_START + 239)
-#define HID_SMA_DOTSDOWN (HID_SMA_START + 240)
-#define HID_SMA_DOTSLOW (HID_SMA_START + 241)
-#define HID_SMA_DOTSVERT (HID_SMA_START + 242)
-#define HID_SMA_NOSPACE (HID_SMA_START + 243)
-
-#define HID_SMA_SETN (HID_SMA2_START + 1)
-#define HID_SMA_SETZ (HID_SMA2_START + 2)
-#define HID_SMA_SETQ (HID_SMA2_START + 3)
-#define HID_SMA_SETR (HID_SMA2_START + 4)
-#define HID_SMA_SETC (HID_SMA2_START + 5)
-#define HID_SMA_WIDEHATX (HID_SMA2_START + 6)
-#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7)
-#define HID_SMA_WIDEVECX (HID_SMA2_START + 8)
-#define HID_SMA_CSUBX (HID_SMA2_START + 9)
-#define HID_SMA_CSUPX (HID_SMA2_START + 10)
-#define HID_SMA_HBAR (HID_SMA2_START + 11)
-#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12)
-#define HID_SMA_LEFTARROW (HID_SMA2_START + 13)
-#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14)
-#define HID_SMA_UPARROW (HID_SMA2_START + 15)
-#define HID_SMA_DOWNARROW (HID_SMA2_START + 16)
-
-#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17)
-#define HID_SMA_LINE_DIST (HID_SMA2_START + 18)
-#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19)
-#define HID_SMA_SUP_DIST (HID_SMA2_START + 20)
-#define HID_SMA_SUB_DIST (HID_SMA2_START + 21)
-#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22)
-#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23)
-#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24)
-#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25)
-#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26)
-#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27)
-#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28)
-#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29)
-#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30)
-#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31)
-#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32)
-#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33)
-#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34)
-#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35)
-#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36)
-#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37)
-#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38)
-#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39)
-#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40)
-#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41)
-#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42)
-#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43)
-#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44)
+#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1)
+#define HID_SMA_FONTDIALOG (HID_SMA_START + 2)
+#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3)
+#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4)
+#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5)
+#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6)
+#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7)
+#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8)
+#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9)
+#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10)
+#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11)
+#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12)
+#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13)
+#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14)
+#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15)
+#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16)
+#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17)
+#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18)
+#define HID_SMA_OBJECTNAME (HID_SMA_START + 19)
+#define HID_SMA_VIEWNAME (HID_SMA_START + 20)
+#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21)
+#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22)
+#define HID_SMA_APPICO (HID_SMA_START + 23)
+#define HID_SMA_DOCICO (HID_SMA_START + 24)
+#define HID_SMA_TMPICO (HID_SMA_START + 25)
+#define HID_SMA_COMMANDMENU (HID_SMA_START + 26)
+#define HID_SMA_VIEWMENU (HID_SMA_START + 27)
+#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28)
+#define HID_SMA_FONTMENU (HID_SMA_START + 29)
+#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30)
+#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31)
+#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32)
+#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33)
+#define HID_SMA_FONTREGULAR (HID_SMA_START + 34)
+#define HID_SMA_FONTITALIC (HID_SMA_START + 35)
+#define HID_SMA_FONTBOLD (HID_SMA_START + 36)
+#define HID_SMA_PRINTOPTION (HID_SMA_START + 37)
+#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38)
+#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39)
+#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40)
+#define HID_SMA_CREATORSTR (HID_SMA_START + 41)
+#define HID_SMA_FILESMFTYP (HID_SMA_START + 42)
+#define HID_SMA_FILESYMTYP (HID_SMA_START + 43)
+#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44)
+#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45)
+
+#define HID_SMA_PLUSX (HID_SMA_START + 50)
+#define HID_SMA_MINUSX (HID_SMA_START + 51)
+#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52)
+#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53)
+#define HID_SMA_NEGX (HID_SMA_START + 54)
+#define HID_SMA_XPLUSY (HID_SMA_START + 55)
+#define HID_SMA_XMINUSY (HID_SMA_START + 56)
+#define HID_SMA_XCDOTY (HID_SMA_START + 57)
+#define HID_SMA_XTIMESY (HID_SMA_START + 58)
+#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59)
+#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60)
+#define HID_SMA_XDIVY (HID_SMA_START + 61)
+#define HID_SMA_XOVERY (HID_SMA_START + 62)
+#define HID_SMA_XODIVIDEY (HID_SMA_START + 63)
+#define HID_SMA_XODOTY (HID_SMA_START + 64)
+#define HID_SMA_XOMINUSY (HID_SMA_START + 65)
+#define HID_SMA_XOPLUSY (HID_SMA_START + 66)
+#define HID_SMA_XOTIMESY (HID_SMA_START + 67)
+#define HID_SMA_XANDY (HID_SMA_START + 68)
+#define HID_SMA_XORY (HID_SMA_START + 69)
+#define HID_SMA_XEQY (HID_SMA_START + 70)
+#define HID_SMA_XNEQY (HID_SMA_START + 71)
+#define HID_SMA_XLTY (HID_SMA_START + 72)
+#define HID_SMA_XGTY (HID_SMA_START + 73)
+#define HID_SMA_XLEY (HID_SMA_START + 74)
+#define HID_SMA_XGEY (HID_SMA_START + 75)
+#define HID_SMA_XLESLANTY (HID_SMA_START + 76)
+#define HID_SMA_XGESLANTY (HID_SMA_START + 77)
+#define HID_SMA_XLLY (HID_SMA_START + 78)
+#define HID_SMA_XGGY (HID_SMA_START + 79)
+#define HID_SMA_XDEFY (HID_SMA_START + 80)
+#define HID_SMA_XEQUIVY (HID_SMA_START + 81)
+#define HID_SMA_XAPPROXY (HID_SMA_START + 82)
+#define HID_SMA_XSIMY (HID_SMA_START + 83)
+#define HID_SMA_XSIMEQY (HID_SMA_START + 84)
+#define HID_SMA_XPROPY (HID_SMA_START + 85)
+#define HID_SMA_XORTHOY (HID_SMA_START + 86)
+#define HID_SMA_XPARALLELY (HID_SMA_START + 87)
+#define HID_SMA_XTOWARDY (HID_SMA_START + 88)
+#define HID_SMA_XTRANSLY (HID_SMA_START + 89)
+#define HID_SMA_XTRANSRY (HID_SMA_START + 90)
+#define HID_SMA_XINY (HID_SMA_START + 91)
+#define HID_SMA_XNOTINY (HID_SMA_START + 92)
+#define HID_SMA_XOWNSY (HID_SMA_START + 93)
+#define HID_SMA_XUNIONY (HID_SMA_START + 94)
+#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95)
+#define HID_SMA_XSETMINUSY (HID_SMA_START + 96)
+#define HID_SMA_XSLASHY (HID_SMA_START + 97)
+#define HID_SMA_XSUBSETY (HID_SMA_START + 98)
+#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99)
+#define HID_SMA_XSUPSETY (HID_SMA_START + 100)
+#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101)
+#define HID_SMA_XNSUBSETY (HID_SMA_START + 102)
+#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103)
+#define HID_SMA_XNSUPSETY (HID_SMA_START + 104)
+#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105)
+#define HID_SMA_ABSX (HID_SMA_START + 106)
+#define HID_SMA_FACTX (HID_SMA_START + 107)
+#define HID_SMA_SQRTX (HID_SMA_START + 108)
+#define HID_SMA_NROOTXY (HID_SMA_START + 109)
+#define HID_SMA_EX (HID_SMA_START + 110)
+#define HID_SMA_EXPX (HID_SMA_START + 111)
+#define HID_SMA_LNX (HID_SMA_START + 112)
+#define HID_SMA_LOGX (HID_SMA_START + 113)
+#define HID_SMA_SINX (HID_SMA_START + 114)
+#define HID_SMA_COSX (HID_SMA_START + 115)
+#define HID_SMA_TANX (HID_SMA_START + 116)
+#define HID_SMA_COTX (HID_SMA_START + 117)
+#define HID_SMA_ARCSINX (HID_SMA_START + 118)
+#define HID_SMA_ARCCOSX (HID_SMA_START + 119)
+#define HID_SMA_ARCTANX (HID_SMA_START + 120)
+#define HID_SMA_ARCCOTX (HID_SMA_START + 121)
+#define HID_SMA_SINHX (HID_SMA_START + 122)
+#define HID_SMA_COSHX (HID_SMA_START + 123)
+#define HID_SMA_TANHX (HID_SMA_START + 124)
+#define HID_SMA_COTHX (HID_SMA_START + 125)
+#define HID_SMA_ARSINHX (HID_SMA_START + 126)
+#define HID_SMA_ARCOSHX (HID_SMA_START + 127)
+#define HID_SMA_ARTANHX (HID_SMA_START + 128)
+#define HID_SMA_ARCOTHX (HID_SMA_START + 129)
+#define HID_SMA_SUMX (HID_SMA_START + 130)
+#define HID_SMA_PRODX (HID_SMA_START + 131)
+#define HID_SMA_COPRODX (HID_SMA_START + 132)
+#define HID_SMA_LIMX (HID_SMA_START + 133)
+#define HID_SMA_LIMINFX (HID_SMA_START + 134)
+#define HID_SMA_LIMSUPX (HID_SMA_START + 135)
+#define HID_SMA_EXISTS (HID_SMA_START + 136)
+#define HID_SMA_FORALL (HID_SMA_START + 137)
+#define HID_SMA_NABLA (HID_SMA_START + 138)
+#define HID_SMA_INTX (HID_SMA_START + 139)
+#define HID_SMA_IINTX (HID_SMA_START + 140)
+#define HID_SMA_IIINTX (HID_SMA_START + 141)
+#define HID_SMA_LINTX (HID_SMA_START + 142)
+#define HID_SMA_LLINTX (HID_SMA_START + 143)
+#define HID_SMA_LLLINTX (HID_SMA_START + 144)
+#define HID_SMA_FROMX (HID_SMA_START + 145)
+#define HID_SMA_TOX (HID_SMA_START + 146)
+#define HID_SMA_FROMXTOY (HID_SMA_START + 147)
+#define HID_SMA_XCIRCY (HID_SMA_START + 148)
+#define HID_SMA_XDIVIDESY (HID_SMA_START + 149)
+#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150)
+#define HID_SMA_DLARROW (HID_SMA_START + 151)
+#define HID_SMA_DLRARROW (HID_SMA_START + 152)
+#define HID_SMA_DRARROW (HID_SMA_START + 153)
+
+#define HID_SMA_MISC_CAT (HID_SMA_START + 154)
+#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155)
+#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156)
+#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157)
+#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158)
+#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159)
+#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160)
+#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161)
+#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162)
+
+#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163)
+#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164)
+#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165)
+#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166)
+#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167)
+#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168)
+#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169)
+#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170)
+#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171)
+#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172)
+#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173)
+#define HID_SMA_MISC_MENU (HID_SMA_START + 174)
+#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175)
+
+#define HID_SMA_ACUTEX (HID_SMA_START + 180)
+#define HID_SMA_BARX (HID_SMA_START + 181)
+#define HID_SMA_BREVEX (HID_SMA_START + 182)
+#define HID_SMA_CHECKX (HID_SMA_START + 183)
+#define HID_SMA_CIRCLEX (HID_SMA_START + 184)
+#define HID_SMA_DOTX (HID_SMA_START + 185)
+#define HID_SMA_DDOTX (HID_SMA_START + 186)
+#define HID_SMA_DDDOTX (HID_SMA_START + 187)
+#define HID_SMA_GRAVEX (HID_SMA_START + 188)
+#define HID_SMA_HATX (HID_SMA_START + 189)
+#define HID_SMA_TILDEX (HID_SMA_START + 190)
+#define HID_SMA_VECX (HID_SMA_START + 191)
+#define HID_SMA_UNDERLINEX (HID_SMA_START + 192)
+#define HID_SMA_OVERLINEX (HID_SMA_START + 193)
+#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194)
+#define HID_SMA_PHANTOMX (HID_SMA_START + 195)
+#define HID_SMA_BOLDX (HID_SMA_START + 196)
+#define HID_SMA_ITALX (HID_SMA_START + 197)
+#define HID_SMA_SIZEXY (HID_SMA_START + 198)
+#define HID_SMA_FONTXY (HID_SMA_START + 199)
+#define HID_SMA_COLORX (HID_SMA_START + 200)
+#define HID_SMA_LRGROUPX (HID_SMA_START + 201)
+#define HID_SMA_LRPARENTX (HID_SMA_START + 202)
+#define HID_SMA_LRBRACKETX (HID_SMA_START + 203)
+#define HID_SMA_LRBRACEX (HID_SMA_START + 204)
+#define HID_SMA_LRANGLEX (HID_SMA_START + 205)
+#define HID_SMA_LRCEILX (HID_SMA_START + 206)
+#define HID_SMA_LRFLOORX (HID_SMA_START + 207)
+#define HID_SMA_LRLINEX (HID_SMA_START + 208)
+#define HID_SMA_LRDLINEX (HID_SMA_START + 209)
+#define HID_SMA_SLRPARENTX (HID_SMA_START + 210)
+#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211)
+#define HID_SMA_SLRBRACEX (HID_SMA_START + 212)
+#define HID_SMA_SLRANGLEX (HID_SMA_START + 213)
+#define HID_SMA_SLRCEILX (HID_SMA_START + 214)
+#define HID_SMA_SLRFLOORX (HID_SMA_START + 215)
+#define HID_SMA_SLRLINEX (HID_SMA_START + 216)
+#define HID_SMA_SLRDLINEX (HID_SMA_START + 217)
+#define HID_SMA_RSUBX (HID_SMA_START + 218)
+#define HID_SMA_RSUPX (HID_SMA_START + 219)
+#define HID_SMA_LSUBX (HID_SMA_START + 220)
+#define HID_SMA_LSUPX (HID_SMA_START + 221)
+#define HID_SMA_SBLANK (HID_SMA_START + 222)
+#define HID_SMA_BLANK (HID_SMA_START + 223)
+#define HID_SMA_NEWLINE (HID_SMA_START + 224)
+#define HID_SMA_BINOMXY (HID_SMA_START + 225)
+#define HID_SMA_STACK (HID_SMA_START + 226)
+#define HID_SMA_MATRIX (HID_SMA_START + 227)
+#define HID_SMA_ALIGNLX (HID_SMA_START + 228)
+#define HID_SMA_ALIGNCX (HID_SMA_START + 229)
+#define HID_SMA_ALIGNRX (HID_SMA_START + 230)
+#define HID_SMA_ALEPH (HID_SMA_START + 231)
+#define HID_SMA_EMPTYSET (HID_SMA_START + 232)
+#define HID_SMA_RE (HID_SMA_START + 233)
+#define HID_SMA_IM (HID_SMA_START + 234)
+#define HID_SMA_INFINITY (HID_SMA_START + 235)
+#define HID_SMA_PARTIAL (HID_SMA_START + 236)
+#define HID_SMA_WP (HID_SMA_START + 237)
+#define HID_SMA_DOTSAXIS (HID_SMA_START + 238)
+#define HID_SMA_DOTSUP (HID_SMA_START + 239)
+#define HID_SMA_DOTSDOWN (HID_SMA_START + 240)
+#define HID_SMA_DOTSLOW (HID_SMA_START + 241)
+#define HID_SMA_DOTSVERT (HID_SMA_START + 242)
+#define HID_SMA_NOSPACE (HID_SMA_START + 243)
+
+#define HID_SMA_SETN (HID_SMA2_START + 1)
+#define HID_SMA_SETZ (HID_SMA2_START + 2)
+#define HID_SMA_SETQ (HID_SMA2_START + 3)
+#define HID_SMA_SETR (HID_SMA2_START + 4)
+#define HID_SMA_SETC (HID_SMA2_START + 5)
+#define HID_SMA_WIDEHATX (HID_SMA2_START + 6)
+#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7)
+#define HID_SMA_WIDEVECX (HID_SMA2_START + 8)
+#define HID_SMA_CSUBX (HID_SMA2_START + 9)
+#define HID_SMA_CSUPX (HID_SMA2_START + 10)
+#define HID_SMA_HBAR (HID_SMA2_START + 11)
+#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12)
+#define HID_SMA_LEFTARROW (HID_SMA2_START + 13)
+#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14)
+#define HID_SMA_UPARROW (HID_SMA2_START + 15)
+#define HID_SMA_DOWNARROW (HID_SMA2_START + 16)
+
+#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17)
+#define HID_SMA_LINE_DIST (HID_SMA2_START + 18)
+#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19)
+#define HID_SMA_SUP_DIST (HID_SMA2_START + 20)
+#define HID_SMA_SUB_DIST (HID_SMA2_START + 21)
+#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22)
+#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23)
+#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24)
+#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25)
+#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26)
+#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27)
+#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28)
+#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29)
+#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30)
+#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31)
+#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32)
+#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33)
+#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34)
+#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35)
+#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36)
+#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37)
+#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38)
+#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39)
+#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40)
+#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41)
+#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42)
+#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43)
+#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44)
#define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45)
-#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46)
-#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47)
-#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48)
-#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49)
+#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46)
+#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47)
+#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48)
+#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49)
#define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50)
#define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51)
-#define BMP_ARROW_RIGHT 1
+#define BMP_ARROW_RIGHT 1
#define MN_WIN 60
#define MN_SUB_VIEW 31
@@ -764,7 +764,7 @@
// 342 == SCH_IF_SMAVIEWSHELL, da SFX_INTERFACE_LIB kein
// Define sondern neuerdings ein Enum ist
-#define HID_SMA_VIEWSHELL_DOCUMENT (342)
+#define HID_SMA_VIEWSHELL_DOCUMENT (342)
#endif
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 1422550ff161..0bfb8b0b6aa9 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -2,7 +2,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
@@ -47,8 +47,8 @@
#include "smmod.hxx"
-#define SYMBOLSET_NONE 0xFFFF
-#define SYMBOL_NONE 0xFFFF
+#define SYMBOLSET_NONE 0xFFFF
+#define SYMBOL_NONE 0xFFFF
////////////////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ public:
const String& rSet, BOOL bIsPredefined = FALSE);
SmSym(const SmSym& rSymbol);
- SmSym& operator = (const SmSym& rSymbol);
+ SmSym& operator = (const SmSym& rSymbol);
const Font& GetFace() const { return m_aFace; }
sal_Unicode GetCharacter() const { return m_cChar; }
@@ -140,8 +140,8 @@ typedef std::vector< const SmSym * > SymbolPtrVec_t;
struct lt_SmSymPtr : public std::binary_function< const SmSym *, const SmSym *, bool >
{
- bool operator() ( const SmSym *pSym1, const SmSym *pSym2 )
- {
+ bool operator() ( const SmSym *pSym1, const SmSym *pSym2 )
+ {
return pSym1->GetCharacter() < pSym2->GetCharacter();
}
};
@@ -175,12 +175,12 @@ public:
bool AddOrReplaceSymbol( const SmSym & rSymbol, bool bForceChange = false );
void RemoveSymbol( const String & rSymbolName );
- SmSym * GetSymbolByName(const String& rSymbolName);
- const SmSym * GetSymbolByName(const String& rSymbolName) const
+ SmSym * GetSymbolByName(const String& rSymbolName);
+ const SmSym * GetSymbolByName(const String& rSymbolName) const
{
return ((SmSymbolManager *) this)->GetSymbolByName(rSymbolName);
}
-
+
bool IsModified() const { return m_bModified; }
void SetModified(bool bModify) { m_bModified = bModify; }
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index e35ee9a8891c..9a418e5d879f 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -2,7 +2,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
@@ -37,16 +37,16 @@
#include "dialog.hrc"
-#define NUM_TBX_CATEGORIES 9
+#define NUM_TBX_CATEGORIES 9
class SmToolBoxWindow : public SfxFloatingWindow
{
protected:
- ToolBox aToolBoxCat;
+ ToolBox aToolBoxCat;
FixedLine aToolBoxCat_Delim; // to visualy seperate the catalog part
- ToolBox *pToolBoxCmd;
- ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES];
+ ToolBox *pToolBoxCmd;
+ ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES];
ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */
ImageList *aImageListsH[NUM_TBX_CATEGORIES + 1]; /* high contrast */
USHORT nActiveCategoryRID;
@@ -65,15 +65,15 @@ protected:
public:
SmToolBoxWindow(SfxBindings *pBindings,
SfxChildWindow *pChildWindow,
- Window *pParent);
+ Window *pParent);
~SmToolBoxWindow();
// Window
- virtual void StateChanged( StateChangedType nStateChange );
+ virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent &rEvt );
void AdjustPosSize( BOOL bSetPos );
- void SetCategory(USHORT nCategory);
+ void SetCategory(USHORT nCategory);
};
/**************************************************************************/
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index f96cffd83bb2..833c88c10d55 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -2,7 +2,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
@@ -60,7 +60,7 @@ sal_Unicode ConvertMathToMathML( sal_Unicode cChar );
// enum definitions for characters from the 'StarSymbol' font
// (some chars have more than one alias!)
//! Note: not listed here does not(!) mean "not used"
-//! (see %alpha ... %gamma for example)
+//! (see %alpha ... %gamma for example)
//
enum MathSymbol
{
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index ba84bd08cc70..2ab0ff1bd2d6 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -2,7 +2,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,10 +73,10 @@ protected:
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
public:
SmModel( SfxObjectShell *pObjSh = 0 );
- virtual ~SmModel() throw ();
+ virtual ~SmModel() throw ();
//XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
virtual void SAL_CALL release( ) throw();
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ec5faf1c1ead..084a54a4355f 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -2,7 +2,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
@@ -101,7 +101,7 @@ BOOL IsBold( const Font &rFont );
class SmFace : public Font
{
- long nBorderWidth;
+ long nBorderWidth;
void Impl_Init();
@@ -120,12 +120,12 @@ public:
// overloaded version in order to supply a min value
// for font size (height). (Also used in ctor's to do so.)
- void SetSize(const Size& rSize);
+ void SetSize(const Size& rSize);
- void SetBorderWidth(long nWidth) { nBorderWidth = nWidth; }
- long GetBorderWidth() const;
- long GetDefaultBorderWidth() const { return GetSize().Height() / 20 ; }
- void FreezeBorderWidth() { nBorderWidth = GetDefaultBorderWidth(); }
+ void SetBorderWidth(long nWidth) { nBorderWidth = nWidth; }
+ long GetBorderWidth() const;
+ long GetDefaultBorderWidth() const { return GetSize().Height() / 20 ; }
+ void FreezeBorderWidth() { nBorderWidth = GetDefaultBorderWidth(); }
SmFace & operator = (const SmFace &rFace);
};
@@ -142,14 +142,14 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac);
class SmInfoText : public FixedText
{
protected:
- USHORT nMaxLen;
- String aText;
+ USHORT nMaxLen;
+ String aText;
public:
SmInfoText(Window* pParent, WinBits nWinStyle = 0, USHORT nMax = 128);
SmInfoText(Window* pParent, const ResId& rResId, USHORT nMax = 128);
- void SetText(const String& rStr);
+ void SetText(const String& rStr);
XubString GetText() const { return (aText); }
};
@@ -164,20 +164,20 @@ public:
class SmPickList : public SfxPtrArr
{
protected:
- USHORT nSize;
+ USHORT nSize;
virtual void *CreateItem(const String& rString) = 0;
virtual void *CreateItem(const void *pItem) = 0;
- virtual void DestroyItem(void *pItem) = 0;
+ virtual void DestroyItem(void *pItem) = 0;
- virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0;
+ virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0;
- virtual String GetStringItem(void *pItem) = 0;
+ virtual String GetStringItem(void *pItem) = 0;
- void *GetPtr(USHORT nPos) const { return SfxPtrArr::GetObject(nPos); }
- void *&GetPtr(USHORT nPos) { return SfxPtrArr::GetObject(nPos); }
- void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); }
- void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); }
+ void *GetPtr(USHORT nPos) const { return SfxPtrArr::GetObject(nPos); }
+ void *&GetPtr(USHORT nPos) { return SfxPtrArr::GetObject(nPos); }
+ void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); }
+ void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); }
public:
SmPickList(USHORT nInitSize = 0, USHORT nMaxSize = 5);
@@ -185,20 +185,20 @@ public:
SmPickList& operator = (const SmPickList& rList);
- void *Get(USHORT nPos = 0) const { return GetPtr(nPos); }
+ void *Get(USHORT nPos = 0) const { return GetPtr(nPos); }
using SfxPtrArr::Insert;
- void Insert(const void* pItem);
- void Update(const void* pItem, const void *pNewItem);
+ void Insert(const void* pItem);
+ void Update(const void* pItem, const void *pNewItem);
using SfxPtrArr::Remove;
- void Remove(const void* pItem);
+ void Remove(const void* pItem);
using SfxPtrArr::operator [];
- void *operator [] (USHORT nPos) const { return GetPtr(nPos); }
+ void *operator [] (USHORT nPos) const { return GetPtr(nPos); }
- USHORT GetSize() const { return nSize; }
- USHORT Count() const { return SfxPtrArr::Count(); }
+ USHORT GetSize() const { return nSize; }
+ USHORT Count() const { return SfxPtrArr::Count(); }
- void Clear();
+ void Clear();
};
@@ -212,11 +212,11 @@ class SmStringPickList : public SmPickList
protected:
virtual void *CreateItem(const String& rString);
virtual void *CreateItem(const void *pItem);
- virtual void DestroyItem(void *pItem);
+ virtual void DestroyItem(void *pItem);
- virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const;
+ virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const;
- virtual String GetStringItem(void *pItem);
+ virtual String GetStringItem(void *pItem);
public:
SmStringPickList()
@@ -227,15 +227,15 @@ public:
: SmPickList(rOrig) {}
virtual ~SmStringPickList() { Clear(); }
- virtual void Insert(const String &rString);
- virtual void Update(const String &rString, const String &rNewString);
- virtual void Remove(const String &rString);
+ virtual void Insert(const String &rString);
+ virtual void Update(const String &rString, const String &rNewString);
+ virtual void Remove(const String &rString);
- inline BOOL Contains(const String &rString) const;
- inline String Get(USHORT nPos = 0) const;
+ inline BOOL Contains(const String &rString) const;
+ inline String Get(USHORT nPos = 0) const;
inline SmStringPickList& operator = (const SmStringPickList& rList);
- inline String operator [] (USHORT nPos) const;
+ inline String operator [] (USHORT nPos) const;
};
inline SmStringPickList& SmStringPickList::operator = (const SmStringPickList& rList)
@@ -253,7 +253,7 @@ inline String SmStringPickList::Get(USHORT nPos) const
return nPos < Count() ? *((String *)SmPickList::Get(nPos)) : String();
}
-inline BOOL SmStringPickList::Contains(const String &rString) const
+inline BOOL SmStringPickList::Contains(const String &rString) const
{
return SmPickList::Contains((void *)&rString);
}
@@ -271,11 +271,11 @@ class SmFontPickList : public SmPickList
protected:
virtual void *CreateItem(const String& rString);
virtual void *CreateItem(const void *pItem);
- virtual void DestroyItem(void *pItem);
+ virtual void DestroyItem(void *pItem);
- virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const;
+ virtual BOOL CompareItem(const void *pFirstItem, const void *pSecondItem) const;
- virtual String GetStringItem(void *pItem);
+ virtual String GetStringItem(void *pItem);
public:
SmFontPickList()
@@ -287,22 +287,22 @@ public:
virtual ~SmFontPickList() { Clear(); }
using SfxPtrArr::Insert;
- virtual void Insert(const Font &rFont);
+ virtual void Insert(const Font &rFont);
using SmPickList::Update;
- virtual void Update(const Font &rFont, const Font &rNewFont);
+ virtual void Update(const Font &rFont, const Font &rNewFont);
using SfxPtrArr::Remove;
- virtual void Remove(const Font &rFont);
+ virtual void Remove(const Font &rFont);
using SmPickList::Contains;
- inline BOOL Contains(const Font &rFont) const;
- inline Font Get(USHORT nPos = 0) const;
+ inline BOOL Contains(const Font &rFont) const;
+ inline Font Get(USHORT nPos = 0) const;
- inline SmFontPickList& operator = (const SmFontPickList& rList);
+ inline SmFontPickList& operator = (const SmFontPickList& rList);
using SfxPtrArr::operator [];
- inline Font operator [] (USHORT nPos) const;
+ inline Font operator [] (USHORT nPos) const;
- void ReadFrom(const SmFontDialog& rDialog);
- void WriteTo(SmFontDialog& rDialog) const;
+ void ReadFrom(const SmFontDialog& rDialog);
+ void WriteTo(SmFontDialog& rDialog) const;
};
inline SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList)
@@ -310,7 +310,7 @@ inline SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList)
*(SmPickList *)this = *(SmPickList *)&rList; return *this;
}
-inline Font SmFontPickList::operator [] (USHORT nPos) const
+inline Font SmFontPickList::operator [] (USHORT nPos) const
{
return *((Font *)SmPickList::operator[](nPos));
}
@@ -320,7 +320,7 @@ inline Font SmFontPickList::Get(USHORT nPos) const
return nPos < Count() ? *((Font *)SmPickList::Get(nPos)) : Font();
}
-inline BOOL SmFontPickList::Contains(const Font &rFont) const
+inline BOOL SmFontPickList::Contains(const Font &rFont) const
{
return SmPickList::Contains((void *)&rFont);
}
@@ -344,17 +344,17 @@ public:
SmStringPickComboBox& operator = (const SmStringPickList& rList);
- void SetText(const String& rStr);
+ void SetText(const String& rStr);
- virtual void Insert(const String &rString);
- virtual void Update(const String &rString, const String &rNewString);
- virtual void Remove(const String &rString);
+ virtual void Insert(const String &rString);
+ virtual void Update(const String &rString, const String &rNewString);
+ virtual void Remove(const String &rString);
};
#endif
////////////////////////////////////////////////////////////
//
-// SmFontPickListBox
+// SmFontPickListBox
//
class SmFontPickListBox : public SmFontPickList, public ListBox
@@ -368,11 +368,11 @@ public:
SmFontPickListBox& operator = (const SmFontPickList& rList);
using SfxPtrArr::Insert;
- virtual void Insert(const Font &rFont);
+ virtual void Insert(const Font &rFont);
using Window::Update;
- virtual void Update(const Font &rFont, const Font &rNewFont);
+ virtual void Update(const Font &rFont, const Font &rNewFont);
using SfxPtrArr::Remove;
- virtual void Remove(const Font &rFont);
+ virtual void Remove(const Font &rFont);
};
#endif
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index cc13a35edf9f..925b2cc07e49 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -61,10 +61,10 @@ public:
void ShowCursor(BOOL bShow);
const SmNode * SetCursorPos(USHORT nRow, USHORT nCol);
protected:
- void SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; }
+ void SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; }
using Window::SetCursor;
void SetCursor(const SmNode *pNode);
- void SetCursor(const Rectangle &rRect);
+ void SetCursor(const Rectangle &rRect);
bool IsInlineEditEnabled() const;
private:
@@ -73,11 +73,11 @@ private:
SmGraphicAccessible * pAccessible;
SmViewShell *pViewShell;
- USHORT nZoom;
- short nModifyCount;
+ USHORT nZoom;
+ short nModifyCount;
protected:
- void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; }
+ void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; }
virtual void DataChanged( const DataChangedEvent& );
virtual void Paint(const Rectangle&);
@@ -125,8 +125,8 @@ protected:
SmGraphicWindow &rGraphic;
public:
SmGraphicController(SmGraphicWindow &, USHORT, SfxBindings & );
- virtual void StateChanged(USHORT nSID,
- SfxItemState eState,
+ virtual void StateChanged(USHORT nSID,
+ SfxItemState eState,
const SfxPoolItem* pState);
};
@@ -143,8 +143,8 @@ public:
virtual ~SmEditController();
#endif
- virtual void StateChanged(USHORT nSID,
- SfxItemState eState,
+ virtual void StateChanged(USHORT nSID,
+ SfxItemState eState,
const SfxPoolItem* pState);
};
@@ -152,8 +152,8 @@ public:
class SmCmdBoxWindow : public SfxDockingWindow
{
- SmEditWindow aEdit;
- SmEditController aController;
+ SmEditWindow aEdit;
+ SmEditController aController;
BOOL bExiting;
Timer aInitialFocusTimer;
@@ -172,12 +172,12 @@ protected :
virtual SfxChildAlignment CheckAlignment(SfxChildAlignment eActual,
SfxChildAlignment eWish);
- virtual void ToggleFloatingMode();
+ virtual void ToggleFloatingMode();
public:
- SmCmdBoxWindow(SfxBindings *pBindings,
+ SmCmdBoxWindow(SfxBindings *pBindings,
SfxChildWindow *pChildWindow,
- Window *pParent);
+ Window *pParent);
virtual ~SmCmdBoxWindow ();
@@ -194,9 +194,9 @@ class SmCmdBoxWrapper : public SfxChildWindow
SFX_DECL_CHILDWINDOW(SmCmdBoxWrapper);
protected:
- SmCmdBoxWrapper(Window *pParentWindow,
- USHORT nId,
- SfxBindings *pBindings,
+ SmCmdBoxWrapper(Window *pParentWindow,
+ USHORT nId,
+ SfxBindings *pBindings,
SfxChildWinInfo *pInfo);
#if OSL_DEBUG_LEVEL > 1
@@ -222,15 +222,15 @@ class SmViewShell: public SfxViewShell
// for handling the PasteClipboardState
friend class SmClipboardChangeListener;
- SmGraphicWindow aGraphic;
+ SmGraphicWindow aGraphic;
SmGraphicController aGraphicController;
- String StatusText;
+ String StatusText;
::com::sun::star::uno:: Reference <
::com::sun::star::lang:: XEventListener > xClipEvtLstnr;
- SmClipboardChangeListener* pClipEvtLstnr;
+ SmClipboardChangeListener* pClipEvtLstnr;
SmViewShell_Impl* pImpl;
- BOOL bPasteState;
+ BOOL bPasteState;
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -246,14 +246,14 @@ protected:
const String& rLine);
Size GetTextSize(OutputDevice& rDevice,
const String& rText,
- long MaxWidth);
+ long MaxWidth);
void DrawTextLine(OutputDevice& rDevice,
- const Point& rPosition,
+ const Point& rPosition,
const String& rLine);
void DrawText(OutputDevice& rDevice,
- const Point& rPosition,
+ const Point& rPosition,
const String& rText,
- USHORT MaxWidth);
+ USHORT MaxWidth);
virtual USHORT Print(SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0);
virtual SfxPrinter *GetPrinter(BOOL bCreate = FALSE);
@@ -263,7 +263,7 @@ protected:
BOOL Insert( SfxMedium& rMedium );
BOOL InsertFrom(SfxMedium &rMedium);
- virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
+ virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
const SfxItemSet &rOptions);
virtual void Deactivate(BOOL IsMDIActivate);
virtual void Activate(BOOL IsMDIActivate);
@@ -286,14 +286,14 @@ public:
}
SmEditWindow * GetEditWindow();
- SmGraphicWindow & GetGraphicWindow() { return aGraphic; }
+ SmGraphicWindow & GetGraphicWindow() { return aGraphic; }
const SmGraphicWindow & GetGraphicWindow() const { return aGraphic; }
- void SetStatusText(const String& Text);
+ void SetStatusText(const String& Text);
- void ShowError( const SmErrorDesc *pErrorDesc );
- void NextError();
- void PrevError();
+ void ShowError( const SmErrorDesc *pErrorDesc );
+ void NextError();
+ void PrevError();
SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2)
SFX_DECL_VIEWFACTORY(SmViewShell);
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 99399c8396e3..d90403616cf6 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -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
@@ -27,24 +27,24 @@
SfxVoidItem Adjust SID_ADJUST
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -52,24 +52,24 @@ SfxVoidItem Adjust SID_ADJUST
SfxVoidItem ChangeAlignment SID_ALIGN
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
@@ -77,24 +77,24 @@ SfxVoidItem ChangeAlignment SID_ALIGN
SfxVoidItem ChangeDistance SID_DISTANCE
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
@@ -102,24 +102,24 @@ SfxVoidItem ChangeDistance SID_DISTANCE
SfxVoidItem ChangeFont SID_FONT
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
@@ -127,24 +127,24 @@ SfxVoidItem ChangeFont SID_FONT
SfxVoidItem ChangeFontSize SID_FONTSIZE
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
]
@@ -152,24 +152,24 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE
SfxVoidItem CommandWindow SID_CMDBOXWINDOW
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -177,24 +177,24 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW
SfxVoidItem Preferences SID_PREFERENCES
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_OPTIONS;
]
@@ -202,26 +202,26 @@ SfxVoidItem Preferences SID_PREFERENCES
SfxStringItem ConfigName SID_TEXT
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -229,24 +229,24 @@ SfxStringItem ConfigName SID_TEXT
SfxVoidItem CopyObject SID_COPYOBJECT
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_EDIT;
]
@@ -254,24 +254,24 @@ SfxVoidItem CopyObject SID_COPYOBJECT
SfxVoidItem Draw SID_DRAW
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -279,24 +279,24 @@ SfxVoidItem Draw SID_DRAW
SfxVoidItem FitInWindow SID_FITINWINDOW
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -304,24 +304,24 @@ SfxVoidItem FitInWindow SID_FITINWINDOW
SfxBoolItem FormelCursor SID_FORMULACURSOR
()
[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = TRUE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = TRUE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = TRUE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = TRUE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_MATH;
]
@@ -329,26 +329,26 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR
SfxInt16Item Graphic SID_GAPHIC_SM
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_MATH;
]
@@ -356,24 +356,24 @@ SfxInt16Item Graphic SID_GAPHIC_SM
SfxVoidItem InsertCommand SID_INSERTCOMMAND
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
@@ -381,24 +381,24 @@ SfxVoidItem InsertCommand SID_INSERTCOMMAND
SfxVoidItem InsertConfigName SID_INSERTSYMBOL
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
@@ -406,24 +406,24 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL
SfxBoolItem InsertFormula SID_INSERT_FORMULA
(SfxStringItem Name SID_INSERT_FORMULA,SfxStringItem Filter FN_PARAM_1)
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
@@ -431,24 +431,24 @@ SfxBoolItem InsertFormula SID_INSERT_FORMULA
SfxVoidItem LoadSymbols SID_LOADSYMBOLS
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_OPTIONS;
]
@@ -456,26 +456,26 @@ SfxVoidItem LoadSymbols SID_LOADSYMBOLS
SfxStringItem ModifyStatus SID_MODIFYSTATUS
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = TRUE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -483,24 +483,24 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS
SfxVoidItem NextError SID_NEXTERR
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_NAVIGATOR;
]
@@ -508,24 +508,24 @@ SfxVoidItem NextError SID_NEXTERR
SfxVoidItem NextMark SID_NEXTMARK
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_NAVIGATOR;
]
@@ -533,24 +533,24 @@ SfxVoidItem NextMark SID_NEXTMARK
SfxVoidItem PasteObject SID_PASTEOBJECT
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_EDIT;
]
@@ -558,24 +558,24 @@ SfxVoidItem PasteObject SID_PASTEOBJECT
SfxVoidItem PrevError SID_PREVERR
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_NAVIGATOR;
]
@@ -583,24 +583,24 @@ SfxVoidItem PrevError SID_PREVERR
SfxVoidItem PrevMark SID_PREVMARK
()
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_NAVIGATOR;
]
@@ -608,26 +608,26 @@ SfxVoidItem PrevMark SID_PREVMARK
SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
[
- /* flags: */
+ /* flags: */
AutoUpdate = TRUE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -635,24 +635,24 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
SfxVoidItem SaveSymbols SID_SAVESYMBOLS
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_OPTIONS;
]
@@ -660,24 +660,24 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS
SfxVoidItem SetPaperSize SID_GETEDITTEXT
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_MATH;
]
@@ -685,24 +685,24 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT
SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_OPTIONS;
]
@@ -710,24 +710,24 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
SfxVoidItem Symbols SID_SYMBOLS
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_OPTIONS;
]
@@ -735,26 +735,26 @@ SfxVoidItem Symbols SID_SYMBOLS
SfxBoolItem Textmode SID_TEXTMODE
[
- /* flags: */
- AutoUpdate = TRUE,
+ /* flags: */
+ AutoUpdate = TRUE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -762,26 +762,26 @@ SfxBoolItem Textmode SID_TEXTMODE
SfxStringItem TextStatus SID_TEXTSTATUS
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = TRUE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -789,24 +789,24 @@ SfxStringItem TextStatus SID_TEXTSTATUS
SfxVoidItem ToolBowWindow SID_TOOLBOXWINDOW
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
@@ -814,26 +814,26 @@ SfxVoidItem ToolBowWindow SID_TOOLBOXWINDOW
SfxBoolItem ToolBox SID_TOOLBOX
[
- /* flags: */
- AutoUpdate = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ Readonly = FALSE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -841,24 +841,24 @@ SfxBoolItem ToolBox SID_TOOLBOX
SfxVoidItem View100 SID_VIEW100
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -866,24 +866,24 @@ SfxVoidItem View100 SID_VIEW100
SfxVoidItem View200 SID_VIEW200
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -891,24 +891,24 @@ SfxVoidItem View200 SID_VIEW200
SfxVoidItem View50 SID_VIEW050
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -916,24 +916,24 @@ SfxVoidItem View50 SID_VIEW050
SfxVoidItem ZoomIn SID_ZOOMIN
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
@@ -941,24 +941,24 @@ SfxVoidItem ZoomIn SID_ZOOMIN
SfxVoidItem ZoomOut SID_ZOOMOUT
()
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi
index 019d2c5f5312..af62aa70bbfb 100644
--- a/starmath/sdi/smitems.sdi
+++ b/starmath/sdi/smitems.sdi
@@ -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
@@ -249,10 +249,10 @@ item SvxShadowLocation SvxShadowLocationItem;
struct SvxBrush
{
- BrushStyle Style MID_BRUSHSTYLE;
- BOOL Transparent MID_TRANSPARENT;
- UINT32 BackColor MID_BG_COLOR;
- UINT32 FillColor MID_FG_COLOR;
+ BrushStyle Style MID_BRUSHSTYLE;
+ BOOL Transparent MID_TRANSPARENT;
+ UINT32 BackColor MID_BG_COLOR;
+ UINT32 FillColor MID_FG_COLOR;
};
item SvxBrush SvxBrushItem;
@@ -260,24 +260,24 @@ item SvxBrush SvxBrushItem;
struct SvxCharSetColor
{
- CharSet CharSet MID_CHARSET;
- UINT32 Color MID_FG_COLOR;
+ CharSet CharSet MID_CHARSET;
+ UINT32 Color MID_FG_COLOR;
};
item SvxCharSetColor SvxCharSetColorItem;
//-------------------------------------------------------------------------
-item BOOL SvxAutoKernItem;
+item BOOL SvxAutoKernItem;
item UINT32 SvxColorItem;
-item BOOL SvxContourItem;
-item FontStrikeout SvxCrossedOutItem;
+item BOOL SvxContourItem;
+item FontStrikeout SvxCrossedOutItem;
//-------------------------------------------------------------------------
struct SvxEscapement
{
- INT16 Esc MID_ESCAPEMENT;
- BYTE Prop MID_PROPORTIONAL;
+ INT16 Esc MID_ESCAPEMENT;
+ BYTE Prop MID_PROPORTIONAL;
};
item SvxEscapement SvxEscapementItem;
@@ -285,8 +285,8 @@ item SvxEscapement SvxEscapementItem;
struct SvxFmtBreak
{
- BOOL Auto MID_AUTOBREAK;
- UINT16 Break MID_BREAKxxx;
+ BOOL Auto MID_AUTOBREAK;
+ UINT16 Break MID_BREAKxxx;
}
item SvxFmtBreak SvxFmtBreakItem;
@@ -297,8 +297,8 @@ item BOOL SvxFmtSplitItem;
struct SvxFontHeight
{
- UINT32 Height MID_HEIGHT;
- BYTE Prop MID_PROPORTIONAL;
+ UINT32 Height MID_HEIGHT;
+ BYTE Prop MID_PROPORTIONAL;
};
item SvxFontHeight SvxFontHeightItem;
@@ -306,11 +306,11 @@ item SvxFontHeight SvxFontHeightItem;
struct SvxFont
{
- String StyleName MID_FONTSTYLE;
- FontPitch Pitch MID_FONTPICTH;
- CharSet CharSet MID_CHARSET;
- FontFamily Family MID_FONTFAMILY;
- String FamilyName MID_FONTFAMILYNAME;
+ String StyleName MID_FONTSTYLE;
+ FontPitch Pitch MID_FONTPICTH;
+ CharSet CharSet MID_CHARSET;
+ FontFamily Family MID_FONTFAMILY;
+ String FamilyName MID_FONTFAMILYNAME;
};
item SvxFont SvxFontItem;
@@ -318,11 +318,11 @@ item SvxFont SvxFontItem;
struct SvxHyphenZone
{
- BOOL Hyphen MID_HYPHEN;
- BOOL PageEnd MID_PAGEEND;
- BYTE MinLead MID_MINLEAD;
- BYTE MinTrail MID_MINTRAIL;
- BYTE MaxHyphens MID_MAXHYPHENS;
+ BOOL Hyphen MID_HYPHEN;
+ BOOL PageEnd MID_PAGEEND;
+ BYTE MinLead MID_MINLEAD;
+ BYTE MinTrail MID_MINTRAIL;
+ BYTE MaxHyphens MID_MAXHYPHENS;
};
item SvxHyphenZone SvxHyphenZoneItem;
@@ -334,10 +334,10 @@ item INT16 SvxKerningItem;
struct SvxLine
{
- UINT32 Color MID_FG_COLOR;
- UINT16 OutWidth MID_OUTER_WIDTH;
- UINT16 InWidth MID_INNER_WIDTH;
- UINT16 Distance MID_DISTANCE;
+ UINT32 Color MID_FG_COLOR;
+ UINT16 OutWidth MID_OUTER_WIDTH;
+ UINT16 InWidth MID_INNER_WIDTH;
+ UINT16 Distance MID_DISTANCE;
};
item SvxLine SvxLineItem;
@@ -345,9 +345,9 @@ item SvxLine SvxLineItem;
struct SvxLRSpace
{
- INT16 FirstLineOffset MID_FIRSTLINE_OFFSET; // % or direct
- UINT16 LeftMargin MID_LEFT_MARGIN; // % or direct
- UINT16 RightMargin MID_RIGHT_MARGIN; // % or direct
+ INT16 FirstLineOffset MID_FIRSTLINE_OFFSET; // % or direct
+ UINT16 LeftMargin MID_LEFT_MARGIN; // % or direct
+ UINT16 RightMargin MID_RIGHT_MARGIN; // % or direct
};
item SvxLRSpace SvxLRSpaceItem;
@@ -357,10 +357,10 @@ item UINT16 SvxLanguage;
struct SvxLineSpacing
{
- SvxLineSpace LineSpace MID_LINESPACE;
- UINT16 LineHeight MID_HEIGHT; // % or direct
- SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE;
- INT16 InterSpace MID_INTER_SPACE;
+ SvxLineSpace LineSpace MID_LINESPACE;
+ UINT16 LineHeight MID_HEIGHT; // % or direct
+ SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE;
+ INT16 InterSpace MID_INTER_SPACE;
};
item SvxLineSpacing SvxLineSpacingItem;
@@ -375,10 +375,10 @@ item BYTE SvxOrphansItem;
struct SvxPage
{
- String DescName MID_DESCNAMExxx;
- BOOL Landscape MID_LANDSCAPE;
- UINT16 Use MID_USExxx;
- SvxNumType NumType MID_NUMTYPExxx;
+ String DescName MID_DESCNAMExxx;
+ BOOL Landscape MID_LANDSCAPE;
+ UINT16 Use MID_USExxx;
+ SvxNumType NumType MID_NUMTYPExxx;
};
item SvxPage SvxPageItem;
@@ -390,10 +390,10 @@ item String SvxPageModelItem;
struct SvxPagePosSize
{
- INT32 XPos MID_X;
- INT32 YPos MID_Y;
- INT32 Width MID_WIDTH;
- INT32 Height MID_HEIGHT;
+ INT32 XPos MID_X;
+ INT32 YPos MID_Y;
+ INT32 Width MID_WIDTH;
+ INT32 Height MID_HEIGHT;
};
item SvxPagePosSize SvxPagePosSizeItem;
@@ -403,20 +403,20 @@ item BYTE SvxPaperBinItem;
//-------------------------------------------------------------------------
-item String SvxPostItAuthorItem;
-item String SvxPostItDateItem;
-item String SvxPostItTextItem;
+item String SvxPostItAuthorItem;
+item String SvxPostItDateItem;
+item String SvxPostItTextItem;
item FontItalic SvxPostureItem;
-item BOOL SvxPrintItem;
-item UINT16 SvxPropSizeItem;
+item BOOL SvxPrintItem;
+item UINT16 SvxPropSizeItem;
//-------------------------------------------------------------------------
struct SvxProtect
{
- BOOL Content MID_CONTENT;
- BOOL Pos MID_POS;
- BOOL Size MID_SIZE;
+ BOOL Content MID_CONTENT;
+ BOOL Pos MID_POS;
+ BOOL Size MID_SIZE;
};
item SvxProtect SvxProtectItem;
@@ -424,15 +424,15 @@ item SvxProtect SvxProtectItem;
struct SvxSearch
{
- UINT16 Command MID_COMMAND;
- String SearchString MID_SEARCH_STRING;
- String ReplaceString MID_REPLACE_STRING;
+ UINT16 Command MID_COMMAND;
+ String SearchString MID_SEARCH_STRING;
+ String ReplaceString MID_REPLACE_STRING;
// W)ord, E)xact, B)ack, S)election, R)egExpr, P)attern
- String Flags MID_FLAGS;
- UINT16 Family MID_FAMILY;
- UINT16 CellType MID_CELLTYPE;
- BOOL RowDirection MID_ROW_DIRECTION;
- UINT16 AppFlag MID_APPFLAG;
+ String Flags MID_FLAGS;
+ UINT16 Family MID_FAMILY;
+ UINT16 CellType MID_CELLTYPE;
+ BOOL RowDirection MID_ROW_DIRECTION;
+ UINT16 AppFlag MID_APPFLAG;
};
item SvxSearch SvxSearchItem;
@@ -444,12 +444,12 @@ item BOOL SvxShadowedItem;
struct SvxShadow
{
- SvxShadowLocation Location MID_LOCATION;
- UINT16 Width MID_WIDTH;
- BrushStyle Style MID_BRUSHSTYLE;
- BOOL Transparent MID_TRANSPARENT;
- UINT32 BackColor MID_BG_COLOR;
- UINT32 FillColor MID_FG_COLOR;
+ SvxShadowLocation Location MID_LOCATION;
+ UINT16 Width MID_WIDTH;
+ BrushStyle Style MID_BRUSHSTYLE;
+ BOOL Transparent MID_TRANSPARENT;
+ UINT32 BackColor MID_BG_COLOR;
+ UINT32 FillColor MID_FG_COLOR;
};
item SvxShadow SvxShadowItem;
@@ -457,8 +457,8 @@ item SvxShadow SvxShadowItem;
struct SvxSize
{
- UINT32 Width MID_WIDTH;
- UINT32 Height MID_HEIGHT;
+ UINT32 Width MID_WIDTH;
+ UINT32 Height MID_HEIGHT;
};
item SvxSize SvxSizeItem;
@@ -466,8 +466,8 @@ item SvxSize SvxSizeItem;
struct SvxULSpace
{
- UINT16 Upper MID_UPPER; // % or direct
- UINT16 Lower MID_LOWER; // % or direct
+ UINT16 Upper MID_UPPER; // % or direct
+ UINT16 Lower MID_LOWER; // % or direct
};
item SvxULSpace SvxULSpaceItem
@@ -564,8 +564,8 @@ item SvxCellOrientationEnum SvxOrientationItem;
struct SvxLongLRSpace
{
- INT32 Left MID_LEFT;
- INT32 Right MID_RIGHT;
+ INT32 Left MID_LEFT;
+ INT32 Right MID_RIGHT;
};
item SvxLongLRSpace SvxLongLRSpaceItem;
@@ -573,8 +573,8 @@ item SvxLongLRSpace SvxLongLRSpaceItem;
struct SvxLongULSpace
{
- INT32 Upper MID_UPPER;
- INT32 Lower MID_LOWER;
+ INT32 Upper MID_UPPER;
+ INT32 Lower MID_LOWER;
};
item SvxLongULSpace SvxLongULSpaceItem;
@@ -582,9 +582,9 @@ item SvxLongULSpace SvxLongULSpaceItem;
struct SvxZoom
{
- INT32 Type MID_TYPE;
- UINT16 ValueSet MID_VALUESET;
- INT32 Percent MID_PERCENT;
+ INT32 Type MID_TYPE;
+ UINT16 ValueSet MID_VALUESET;
+ INT32 Percent MID_PERCENT;
};
item SvxZoom SvxZoomItem;
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index f96690b5c1f0..bf93f70255bc 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -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
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index cb7ec0d0dee4..75311fc360c5 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -2,7 +2,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
@@ -482,7 +482,7 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex )
}
Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes(
- sal_Int32 nIndex,
+ sal_Int32 nIndex,
const uno::Sequence< ::rtl::OUString > & /*rRequestedAttributes*/ )
throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -845,7 +845,7 @@ SmEditSource::SmEditSource( const SmEditSource &rSrc ) :
aViewFwd (rSrc.rEditAcc),
aTextFwd (rSrc.rEditAcc, *this),
aEditViewFwd(rSrc.rEditAcc),
- rEditAcc (rSrc.rEditAcc)
+ rEditAcc (rSrc.rEditAcc)
{
}
@@ -1083,7 +1083,7 @@ void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRem
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
-}
+}
void SmTextForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
{
@@ -1145,7 +1145,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
{
EECharAttribArray aAttribs;
- const SfxPoolItem* pLastItem = NULL;
+ const SfxPoolItem* pLastItem = NULL;
SfxItemState eState = SFX_ITEM_DEFAULT;
@@ -1167,8 +1167,8 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
// get list of char attribs
rEditEngine.GetCharAttribs( nPara, aAttribs );
- BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph
- BOOL bGaps = FALSE; // we found items but theire gaps between them
+ BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph
+ BOOL bGaps = FALSE; // we found items but theire gaps between them
USHORT nLastEnd = nPos;
const SfxPoolItem* pParaItem = NULL;
@@ -1180,10 +1180,10 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
const sal_Bool bEmptyPortion = aAttrib.nStart == aAttrib.nEnd;
if( (!bEmptyPortion && (aAttrib.nStart >= nEndPos)) || (bEmptyPortion && (aAttrib.nStart > nEndPos)) )
- break; // break if we are already behind our selektion
+ break; // break if we are already behind our selektion
if( (!bEmptyPortion && (aAttrib.nEnd <= nPos)) || (bEmptyPortion && (aAttrib.nEnd < nPos)) )
- continue; // or if the attribute ends before our selektion
+ continue; // or if the attribute ends before our selektion
if( aAttrib.pAttr->Which() != nWhich )
continue; // skip if is not the searched item
@@ -1282,7 +1282,7 @@ Rectangle SmTextForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
{
Rectangle aRect(0,0,0,0);
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
-
+
if (pEditEngine)
{
// #108900# Handle virtual position one-past-the end of the string
@@ -1306,7 +1306,7 @@ Rectangle SmTextForwarder::GetParaBounds( USHORT nPara ) const
{
Rectangle aRect(0,0,0,0);
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
-
+
if (pEditEngine)
{
const Point aPnt = pEditEngine->GetDocPosTopLeft( nPara );
@@ -1337,8 +1337,8 @@ sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USH
if (pEditEngine)
{
EPosition aDocPos = pEditEngine->FindDocPosition( rPos );
- nPara = aDocPos.nPara;
- nIndex = aDocPos.nIndex;
+ nPara = aDocPos.nPara;
+ nIndex = aDocPos.nIndex;
bRes = sal_True;
}
return bRes;
@@ -1368,7 +1368,7 @@ sal_Bool SmTextForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& n
sal_Bool SmTextForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
- return pEditEngine ?
+ return pEditEngine ?
SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex )
: sal_False;
}
@@ -1384,18 +1384,18 @@ USHORT SmTextForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLineLen(nPara, nLine) : 0;
}
-
+
void SmTextForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
pEditEngine->GetLineBoundaries(rStart, rEnd, nPara, nLine);
-}
+}
USHORT SmTextForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLineNumberAtIndex(nPara, nIndex) : 0;
-}
+}
sal_Bool SmTextForwarder::QuickFormatDoc( BOOL /*bFull*/ )
{
@@ -1478,7 +1478,7 @@ xub_StrLen SmTextForwarder::AppendTextPortion( USHORT nPara, const String &rText
// append text
ESelection aSel( nPara, pEditEngine->GetTextLen( nPara ) );
pEditEngine->QuickInsertText( rText, aSel );
-
+
// set attributes for new appended text
nRes = aSel.nEndPos = pEditEngine->GetTextLen( nPara );
pEditEngine->QuickSetAttribs( rSet, aSel );
@@ -1488,7 +1488,7 @@ xub_StrLen SmTextForwarder::AppendTextPortion( USHORT nPara, const String &rText
void SmTextForwarder::CopyText(const SvxTextForwarder& rSource)
{
-
+
const SmTextForwarder* pSourceForwarder = dynamic_cast< const SmTextForwarder* >( &rSource );
if( !pSourceForwarder )
return;
@@ -1500,7 +1500,7 @@ void SmTextForwarder::CopyText(const SvxTextForwarder& rSource)
pEditEngine->SetText( *pNewTextObject );
delete pNewTextObject;
}
-}
+}
//------------------------------------------------------------------------
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index a71aee2a718e..3b5f4b34f4ea 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -2,7 +2,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
@@ -198,7 +198,7 @@ public:
class SmTextForwarder : /* analog to SvxEditEngineForwarder */
public SvxTextForwarder
{
- SmEditAccessible & rEditAcc;
+ SmEditAccessible & rEditAcc;
SmEditSource & rEditSource;
DECL_LINK( NotifyHdl, EENotify * );
@@ -211,64 +211,64 @@ public:
SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource );
virtual ~SmTextForwarder();
- virtual USHORT GetParagraphCount() const;
- virtual USHORT GetTextLen( USHORT nParagraph ) const;
- virtual String GetText( const ESelection& rSel ) const;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const;
- virtual SfxItemSet GetParaAttribs( USHORT nPara ) const;
- virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+ virtual USHORT GetParagraphCount() const;
+ virtual USHORT GetTextLen( USHORT nParagraph ) const;
+ virtual String GetText( const ESelection& rSel ) const;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const;
+ virtual SfxItemSet GetParaAttribs( USHORT nPara ) const;
+ virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
- virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const;
+ virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const;
- virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const;
- virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const;
+ virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const;
+ virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const;
- virtual void QuickInsertText( const String& rText, const ESelection& rSel );
- virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
- virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
- virtual void QuickInsertLineBreak( const ESelection& rSel );
+ virtual void QuickInsertText( const String& rText, const ESelection& rSel );
+ virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
+ virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
+ virtual void QuickInsertLineBreak( const ESelection& rSel );
virtual SfxItemPool* GetPool() const;
virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
- virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT);
- virtual BOOL IsValid() const;
+ virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT);
+ virtual BOOL IsValid() const;
- virtual LanguageType GetLanguage( USHORT, USHORT ) const;
- virtual USHORT GetFieldCount( USHORT nPara ) const;
- virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const;
+ virtual LanguageType GetLanguage( USHORT, USHORT ) const;
+ virtual USHORT GetFieldCount( USHORT nPara ) const;
+ virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const;
virtual EBulletInfo GetBulletInfo( USHORT nPara ) const;
- virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const;
- virtual Rectangle GetParaBounds( USHORT nPara ) const;
- virtual MapMode GetMapMode() const;
- virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
- virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
- virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
- virtual USHORT GetLineCount( USHORT nPara ) const;
- virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const;
+ virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const;
+ virtual Rectangle GetParaBounds( USHORT nPara ) const;
+ virtual MapMode GetMapMode() const;
+ virtual OutputDevice* GetRefDevice() const;
+ virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
+ virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
+ virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
+ virtual USHORT GetLineCount( USHORT nPara ) const;
+ virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const;
virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nLine ) const;
- virtual sal_Bool Delete( const ESelection& );
- virtual sal_Bool InsertText( const String&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE );
+ virtual sal_Bool Delete( const ESelection& );
+ virtual sal_Bool InsertText( const String&, const ESelection& );
+ virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE );
virtual sal_Int16 GetDepth( USHORT nPara ) const;
virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth );
-
+
virtual const SfxItemSet* GetEmptyItemSetPtr();
// implementation functions for XParagraphAppend and XTextPortionAppend
virtual void AppendParagraph();
virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
-
- virtual void CopyText(const SvxTextForwarder& rSource);
+
+ virtual void CopyText(const SvxTextForwarder& rSource);
};
class SmEditViewForwarder : /* analog to SvxEditEngineViewForwarder */
public SvxEditViewForwarder
{
- SmEditAccessible& rEditAcc;
+ SmEditAccessible& rEditAcc;
// disallow copy-ctor and assignment-operator for now
SmEditViewForwarder( const SmEditViewForwarder & );
@@ -278,17 +278,17 @@ public:
SmEditViewForwarder( SmEditAccessible& rAcc );
virtual ~SmEditViewForwarder();
- virtual BOOL IsValid() const;
+ virtual BOOL IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual sal_Bool GetSelection( ESelection& rSelection ) const;
+ virtual sal_Bool SetSelection( const ESelection& rSelection );
+ virtual sal_Bool Copy();
+ virtual sal_Bool Cut();
+ virtual sal_Bool Paste();
};
@@ -300,7 +300,7 @@ class SmEditSource :
SmTextForwarder aTextFwd;
SmEditViewForwarder aEditViewFwd;
- SmEditAccessible& rEditAcc;
+ SmEditAccessible& rEditAcc;
// disallow copy-ctor and assignment-operator for now
SmEditSource( const SmEditSource &rSrc );
@@ -312,10 +312,10 @@ public:
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
virtual void UpdateData();
- virtual SfxBroadcaster& GetBroadcaster() const;
+ virtual SfxBroadcaster& GetBroadcaster() const;
};
@@ -361,8 +361,8 @@ public:
//! access EditEngine and EditView via the functions in the respective window
//! pointers may be 0 (e.g. during reload)
- EditEngine * GetEditEngine() { return pWin ? pWin->GetEditEngine() : 0; }
- EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; }
+ EditEngine * GetEditEngine() { return pWin ? pWin->GetEditEngine() : 0; }
+ EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; }
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index a7fbbc2a33bf..bccb9c49455b 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 10148c9d39eb..6fd364f87b71 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -2,7 +2,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
@@ -167,7 +167,7 @@ static const char * aFormatPropNames[] =
};
-static Sequence< OUString > lcl_GetPropertyNames(
+static Sequence< OUString > lcl_GetPropertyNames(
const char * aPropNames[], USHORT nCount )
{
@@ -182,7 +182,7 @@ static Sequence< OUString > lcl_GetPropertyNames(
return aNames;
}
-
+
static Sequence< OUString > GetFormatPropertyNames()
{
USHORT nCnt = SAL_N_ELEMENTS(aFormatPropNames);
@@ -236,7 +236,7 @@ SmFontFormat::SmFontFormat()
nWeight = WEIGHT_DONTKNOW;
nItalic = ITALIC_NONE;
}
-
+
SmFontFormat::SmFontFormat( const Font &rFont )
{
@@ -261,7 +261,7 @@ const Font SmFontFormat::GetFont() const
return aRes;
}
-
+
BOOL SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const
{
return aName == rFntFmt.aName &&
@@ -299,7 +299,7 @@ void SmFontFormatList::Clear()
}
-void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
+void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
const SmFontFormat &rFntFmt )
{
const SmFontFormat *pFntFmt = GetFontFormat( rFntFmtId );
@@ -311,8 +311,8 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
SetModified( TRUE );
}
}
-
-
+
+
void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId )
{
USHORT nPos = 0xFFFF;
@@ -333,7 +333,7 @@ void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId )
}
}
-
+
const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId ) const
{
SmFontFormat *pRes = 0;
@@ -345,7 +345,7 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId )
if (aEntries[i].aId == rFntFmtId)
pRes = &aEntries[i].aFntFmt;
}
-
+
return pRes;
}
@@ -371,7 +371,7 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co
if (aEntries[i].aFntFmt == rFntFmt)
aRes = aEntries[i].aId;
}
-
+
return aRes;
}
@@ -400,7 +400,7 @@ const String SmFontFormatList::GetFontFormatId( USHORT nPos ) const
const String SmFontFormatList::GetNewFontFormatId() const
{
// returns first unused FormatId
-
+
String aRes;
String aPrefix( RTL_CONSTASCII_STRINGPARAM( "Id" ) );
@@ -429,7 +429,7 @@ SmMathConfig::SmMathConfig() :
bIsOtherModified = bIsFormatModified = FALSE;
}
-
+
SmMathConfig::~SmMathConfig()
{
@@ -440,7 +440,7 @@ SmMathConfig::~SmMathConfig()
delete pSymbolMgr;
}
-
+
void SmMathConfig::SetOtherModified( BOOL bVal )
{
bIsOtherModified = bVal;
@@ -461,7 +461,7 @@ void SmMathConfig::SetFontFormatListModified( BOOL bVal )
void SmMathConfig::ReadSymbol( SmSym &rSymbol,
- const rtl::OUString &rSymbolName,
+ const rtl::OUString &rSymbolName,
const rtl::OUString &rBaseNode ) const
{
Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
@@ -580,7 +580,7 @@ void SmMathConfig::GetSymbols( std::vector< SmSym > &rSymbols ) const
Sequence< OUString > aNodes( ((SmMathConfig*) this)->GetNodeNames( A2OU( SYMBOL_LIST ) ) );
const OUString *pNode = aNodes.getConstArray();
INT32 nNodes = aNodes.getLength();
-
+
rSymbols.resize( nNodes );
std::vector< SmSym >::iterator aIt( rSymbols.begin() );
std::vector< SmSym >::iterator aEnd( rSymbols.end() );
@@ -598,7 +598,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
const OUString *pNames = aNames.getConstArray();
sal_uIntPtr nSymbolProps = sal::static_int_cast< UINT32 >(aNames.getLength());
-
+
Sequence< PropertyValue > aValues( nCount * nSymbolProps );
PropertyValue *pValues = aValues.getArray();
@@ -685,7 +685,7 @@ void SmMathConfig::LoadFontFormatList()
}
pFontFormatList->SetModified( FALSE );
}
-
+
void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
const OUString &rSymbolName, const OUString &rBaseNode ) const
@@ -755,13 +755,13 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
void SmMathConfig::SaveFontFormatList()
{
SmFontFormatList &rFntFmtList = GetFontFormatList();
-
+
if (!rFntFmtList.IsModified())
return;
Sequence< OUString > aNames = lcl_GetFontPropertyNames();
INT32 nSymbolProps = aNames.getLength();
-
+
USHORT nCount = rFntFmtList.GetCount();
Sequence< PropertyValue > aValues( nCount * nSymbolProps );
@@ -814,7 +814,7 @@ void SmMathConfig::SaveFontFormatList()
}
OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" );
ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues );
-
+
rFntFmtList.SetModified( FALSE );
}
@@ -823,7 +823,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
{
size_t nCount = rSymbols.size();
USHORT i;
-
+
// build list of used font-formats only
//!! font-format IDs may be different !!
SmFontFormatList aUsedList;
@@ -860,7 +860,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
delete [] pTmpFormat;
}
-
+
void SmMathConfig::LoadOther()
{
if (!pOther)
@@ -951,7 +951,7 @@ void SmMathConfig::SaveOther()
*pValue++ <<= (BOOL) pOther->bAutoRedraw;
// View/FormulaCursor
*pValue++ <<= (BOOL) pOther->bFormulaCursor;
-
+
OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
PutProperties( aNames , aValues );
@@ -963,7 +963,7 @@ void SmMathConfig::LoadFormat()
if (!pFormat)
pFormat = new SmFormat;
-
+
Sequence< OUString > aNames( GetFormatPropertyNames() );
INT32 nProps = aNames.getLength();
@@ -1013,7 +1013,7 @@ void SmMathConfig::LoadFormat()
++pVal;
}
- LanguageType nLang = Application::GetSettings().GetUILanguage();
+ LanguageType nLang = Application::GetSettings().GetUILanguage();
for (i = FNT_BEGIN; i < FNT_END; ++i)
{
Font aFnt;
@@ -1067,7 +1067,7 @@ void SmMathConfig::SaveFormat()
// StandardFormat/HorizontalAlignment
*pValue++ <<= (INT16) pFormat->GetHorAlign();
// StandardFormat/BaseSize
- *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts(
+ *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts(
pFormat->GetBaseSize().Height() ) );
USHORT i;
@@ -1090,10 +1090,10 @@ void SmMathConfig::SaveFormat()
*pValue++ <<= aFntFmtId;
}
-
+
OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
PutProperties( aNames , aValues );
-
+
SetFormatModified( FALSE );
}
@@ -1124,7 +1124,7 @@ void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFor
}
}
}
-
+
SmPrintSize SmMathConfig::GetPrintSize() const
{
@@ -1164,7 +1164,7 @@ void SmMathConfig::SetPrintZoomFactor( USHORT nVal )
SetOtherModified( TRUE );
}
}
-
+
void SmMathConfig::SetOtherIfNotEqual( BOOL &rbItem, BOOL bNewVal )
{
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 645cb6264fab..96887406489a 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -2,7 +2,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
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 9d618bbd0cf3..8a84ec218dbe 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -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
@@ -32,198 +32,198 @@
////////////////////////////////////////////////////////////
-String RID_PLUSX { Text = "+<?> " ; };
-String RID_MINUSX { Text = "-<?> " ; };
-String RID_PLUSMINUSX { Text = "+-<?> " ; };
-String RID_MINUSPLUSX { Text = "-+<?> " ; };
-String RID_NEGX { Text = "neg <?> " ; };
-String RID_XPLUSY { Text = "<?> + <?> " ; };
-String RID_XMINUSY { Text = "<?> - <?> " ; };
-String RID_XCDOTY { Text = "<?> cdot <?> " ; };
-String RID_XTIMESY { Text = "<?> times <?> " ; };
-String RID_XSYMTIMESY { Text = "<?> * <?> " ; };
-String RID_XSYMDIVIDEY { Text = "<?> / <?> " ; };
-String RID_XDIVY { Text = "<?> div <?> " ; };
+String RID_PLUSX { Text = "+<?> " ; };
+String RID_MINUSX { Text = "-<?> " ; };
+String RID_PLUSMINUSX { Text = "+-<?> " ; };
+String RID_MINUSPLUSX { Text = "-+<?> " ; };
+String RID_NEGX { Text = "neg <?> " ; };
+String RID_XPLUSY { Text = "<?> + <?> " ; };
+String RID_XMINUSY { Text = "<?> - <?> " ; };
+String RID_XCDOTY { Text = "<?> cdot <?> " ; };
+String RID_XTIMESY { Text = "<?> times <?> " ; };
+String RID_XSYMTIMESY { Text = "<?> * <?> " ; };
+String RID_XSYMDIVIDEY { Text = "<?> / <?> " ; };
+String RID_XDIVY { Text = "<?> div <?> " ; };
String RID_XOVERY { Text = "{<?>} over {<?>} " ; };
-String RID_XODIVIDEY { Text = "<?> odivide <?> " ; };
-String RID_XODOTY { Text = "<?> odot <?> " ; };
-String RID_XOMINUSY { Text = "<?> ominus <?> " ; };
-String RID_XOPLUSY { Text = "<?> oplus <?> " ; };
-String RID_XOTIMESY { Text = "<?> otimes <?> " ; };
-String RID_XANDY { Text = "<?> and <?> " ; };
-String RID_XORY { Text = "<?> or <?> " ; };
-String RID_XEQY { Text = "<?> = <?> " ; };
-String RID_XNEQY { Text = "<?> <> <?> " ; };
-String RID_XLTY { Text = "<?> < <?> " ; };
-String RID_XGTY { Text = "<?> > <?> " ; };
-String RID_XLEY { Text = "<?> <= <?> " ; };
-String RID_XGEY { Text = "<?> >= <?> " ; };
-String RID_XLESLANTY { Text = "<?> leslant <?> " ; };
-String RID_XGESLANTY { Text = "<?> geslant <?> " ; };
-String RID_XLLY { Text = "<?> << <?> " ; };
-String RID_XGGY { Text = "<?> >> <?> " ; };
-String RID_XDEFY { Text = "<?> def <?> " ; };
-String RID_XEQUIVY { Text = "<?> equiv <?> " ; };
-String RID_XAPPROXY { Text = "<?> approx <?> " ; };
-String RID_XSIMY { Text = "<?> sim <?> " ; };
-String RID_XSIMEQY { Text = "<?> simeq <?> " ; };
-String RID_XPROPY { Text = "<?> prop <?> " ; };
-String RID_XORTHOY { Text = "<?> ortho <?> " ; };
-String RID_XPARALLELY { Text = "<?> parallel <?> " ; };
-String RID_XTOWARDY { Text = "<?> toward <?> " ; };
-String RID_XTRANSLY { Text = "<?> transl <?> " ; };
-String RID_XTRANSRY { Text = "<?> transr <?> " ; };
-String RID_XINY { Text = "<?> in <?> " ; };
-String RID_XNOTINY { Text = "<?> notin <?> " ; };
-String RID_XOWNSY { Text = "<?> owns <?> " ; };
-String RID_XUNIONY { Text = "<?> union <?> " ; };
-String RID_XINTERSECTIONY { Text = "<?> intersection <?> " ; };
-String RID_XSETMINUSY { Text = "<?> setminus <?> " ; };
-String RID_XSLASHY { Text = "<?> slash <?> " ; };
-String RID_XSUBSETY { Text = "<?> subset <?> " ; };
-String RID_XSUBSETEQY { Text = "<?> subseteq <?> " ; };
-String RID_XSUPSETY { Text = "<?> supset <?> " ; };
-String RID_XSUPSETEQY { Text = "<?> supseteq <?> " ; };
-String RID_XNSUBSETY { Text = "<?> nsubset <?> " ; };
-String RID_XNSUBSETEQY { Text = "<?> nsubseteq <?> " ; };
-String RID_XNSUPSETY { Text = "<?> nsupset <?> " ; };
-String RID_XNSUPSETEQY { Text = "<?> nsupseteq <?> " ; };
-String RID_ABSX { Text = "abs{<?>} " ; };
+String RID_XODIVIDEY { Text = "<?> odivide <?> " ; };
+String RID_XODOTY { Text = "<?> odot <?> " ; };
+String RID_XOMINUSY { Text = "<?> ominus <?> " ; };
+String RID_XOPLUSY { Text = "<?> oplus <?> " ; };
+String RID_XOTIMESY { Text = "<?> otimes <?> " ; };
+String RID_XANDY { Text = "<?> and <?> " ; };
+String RID_XORY { Text = "<?> or <?> " ; };
+String RID_XEQY { Text = "<?> = <?> " ; };
+String RID_XNEQY { Text = "<?> <> <?> " ; };
+String RID_XLTY { Text = "<?> < <?> " ; };
+String RID_XGTY { Text = "<?> > <?> " ; };
+String RID_XLEY { Text = "<?> <= <?> " ; };
+String RID_XGEY { Text = "<?> >= <?> " ; };
+String RID_XLESLANTY { Text = "<?> leslant <?> " ; };
+String RID_XGESLANTY { Text = "<?> geslant <?> " ; };
+String RID_XLLY { Text = "<?> << <?> " ; };
+String RID_XGGY { Text = "<?> >> <?> " ; };
+String RID_XDEFY { Text = "<?> def <?> " ; };
+String RID_XEQUIVY { Text = "<?> equiv <?> " ; };
+String RID_XAPPROXY { Text = "<?> approx <?> " ; };
+String RID_XSIMY { Text = "<?> sim <?> " ; };
+String RID_XSIMEQY { Text = "<?> simeq <?> " ; };
+String RID_XPROPY { Text = "<?> prop <?> " ; };
+String RID_XORTHOY { Text = "<?> ortho <?> " ; };
+String RID_XPARALLELY { Text = "<?> parallel <?> " ; };
+String RID_XTOWARDY { Text = "<?> toward <?> " ; };
+String RID_XTRANSLY { Text = "<?> transl <?> " ; };
+String RID_XTRANSRY { Text = "<?> transr <?> " ; };
+String RID_XINY { Text = "<?> in <?> " ; };
+String RID_XNOTINY { Text = "<?> notin <?> " ; };
+String RID_XOWNSY { Text = "<?> owns <?> " ; };
+String RID_XUNIONY { Text = "<?> union <?> " ; };
+String RID_XINTERSECTIONY { Text = "<?> intersection <?> " ; };
+String RID_XSETMINUSY { Text = "<?> setminus <?> " ; };
+String RID_XSLASHY { Text = "<?> slash <?> " ; };
+String RID_XSUBSETY { Text = "<?> subset <?> " ; };
+String RID_XSUBSETEQY { Text = "<?> subseteq <?> " ; };
+String RID_XSUPSETY { Text = "<?> supset <?> " ; };
+String RID_XSUPSETEQY { Text = "<?> supseteq <?> " ; };
+String RID_XNSUBSETY { Text = "<?> nsubset <?> " ; };
+String RID_XNSUBSETEQY { Text = "<?> nsubseteq <?> " ; };
+String RID_XNSUPSETY { Text = "<?> nsupset <?> " ; };
+String RID_XNSUPSETEQY { Text = "<?> nsupseteq <?> " ; };
+String RID_ABSX { Text = "abs{<?>} " ; };
String RID_FACTX { Text = "fact {<?>} " ; };
-String RID_SQRTX { Text = "sqrt{<?>} " ; };
-String RID_NROOTXY { Text = "nroot{<?>}{<?>} " ; };
-String RID_EX { Text = "func e^{<?>} " ; };
-String RID_EXPX { Text = "exp(<?>) " ; };
-String RID_LNX { Text = "ln(<?>) " ; };
-String RID_LOGX { Text = "log(<?>) " ; };
-String RID_SINX { Text = "sin(<?>) " ; };
-String RID_COSX { Text = "cos(<?>) " ; };
-String RID_TANX { Text = "tan(<?>) " ; };
-String RID_COTX { Text = "cot(<?>) " ; };
-String RID_ARCSINX { Text = "arcsin(<?>) " ; };
-String RID_ARCCOSX { Text = "arccos(<?>) " ; };
-String RID_ARCTANX { Text = "arctan(<?>) " ; };
-String RID_ARCCOTX { Text = "arccot(<?>) " ; };
-String RID_SINHX { Text = "sinh(<?>) " ; };
-String RID_COSHX { Text = "cosh(<?>) " ; };
-String RID_TANHX { Text = "tanh(<?>) " ; };
-String RID_COTHX { Text = "coth(<?>) " ; };
-String RID_ARSINHX { Text = "arsinh(<?>) " ; };
-String RID_ARCOSHX { Text = "arcosh(<?>) " ; };
-String RID_ARTANHX { Text = "artanh(<?>) " ; };
-String RID_ARCOTHX { Text = "arcoth(<?>) " ; };
-String RID_SUMX { Text = "sum <?> " ; };
-String RID_PRODX { Text = "prod <?> " ; };
-String RID_COPRODX { Text = "coprod <?> " ; };
-String RID_LIMX { Text = "lim <?> " ; };
-String RID_LIMINFX { Text = "liminf <?> " ; };
-String RID_LIMSUPX { Text = "limsup <?> " ; };
-String RID_EXISTS { Text = "exists " ; };
-String RID_FORALL { Text = "forall " ; };
-String RID_INTX { Text = "int <?> " ; };
-String RID_IINTX { Text = "iint <?> " ; };
-String RID_IIINTX { Text = "iiint <?> " ; };
-String RID_LINTX { Text = "lint <?> " ; };
-String RID_LLINTX { Text = "llint <?> " ; };
-String RID_LLLINTX { Text = "lllint <?> " ; };
-String RID_FROMX { Text = "from{<?>} <?> " ; };
-String RID_TOX { Text = "to{<?>} <?> " ; };
-String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; };
-String RID_ACUTEX { Text = "acute <?> " ; };
-String RID_BARX { Text = "bar <?> " ; };
-String RID_BREVEX { Text = "breve <?> " ; };
-String RID_CHECKX { Text = "check <?> " ; };
-String RID_CIRCLEX { Text = "circle <?> " ; };
-String RID_DOTX { Text = "dot <?> " ; };
-String RID_DDOTX { Text = "ddot <?> " ; };
-String RID_DDDOTX { Text = "dddot <?> " ; };
-String RID_GRAVEX { Text = "grave <?> " ; };
-String RID_HATX { Text = "hat <?> " ; };
-String RID_TILDEX { Text = "tilde <?> " ; };
-String RID_VECX { Text = "vec <?> " ; };
+String RID_SQRTX { Text = "sqrt{<?>} " ; };
+String RID_NROOTXY { Text = "nroot{<?>}{<?>} " ; };
+String RID_EX { Text = "func e^{<?>} " ; };
+String RID_EXPX { Text = "exp(<?>) " ; };
+String RID_LNX { Text = "ln(<?>) " ; };
+String RID_LOGX { Text = "log(<?>) " ; };
+String RID_SINX { Text = "sin(<?>) " ; };
+String RID_COSX { Text = "cos(<?>) " ; };
+String RID_TANX { Text = "tan(<?>) " ; };
+String RID_COTX { Text = "cot(<?>) " ; };
+String RID_ARCSINX { Text = "arcsin(<?>) " ; };
+String RID_ARCCOSX { Text = "arccos(<?>) " ; };
+String RID_ARCTANX { Text = "arctan(<?>) " ; };
+String RID_ARCCOTX { Text = "arccot(<?>) " ; };
+String RID_SINHX { Text = "sinh(<?>) " ; };
+String RID_COSHX { Text = "cosh(<?>) " ; };
+String RID_TANHX { Text = "tanh(<?>) " ; };
+String RID_COTHX { Text = "coth(<?>) " ; };
+String RID_ARSINHX { Text = "arsinh(<?>) " ; };
+String RID_ARCOSHX { Text = "arcosh(<?>) " ; };
+String RID_ARTANHX { Text = "artanh(<?>) " ; };
+String RID_ARCOTHX { Text = "arcoth(<?>) " ; };
+String RID_SUMX { Text = "sum <?> " ; };
+String RID_PRODX { Text = "prod <?> " ; };
+String RID_COPRODX { Text = "coprod <?> " ; };
+String RID_LIMX { Text = "lim <?> " ; };
+String RID_LIMINFX { Text = "liminf <?> " ; };
+String RID_LIMSUPX { Text = "limsup <?> " ; };
+String RID_EXISTS { Text = "exists " ; };
+String RID_FORALL { Text = "forall " ; };
+String RID_INTX { Text = "int <?> " ; };
+String RID_IINTX { Text = "iint <?> " ; };
+String RID_IIINTX { Text = "iiint <?> " ; };
+String RID_LINTX { Text = "lint <?> " ; };
+String RID_LLINTX { Text = "llint <?> " ; };
+String RID_LLLINTX { Text = "lllint <?> " ; };
+String RID_FROMX { Text = "from{<?>} <?> " ; };
+String RID_TOX { Text = "to{<?>} <?> " ; };
+String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; };
+String RID_ACUTEX { Text = "acute <?> " ; };
+String RID_BARX { Text = "bar <?> " ; };
+String RID_BREVEX { Text = "breve <?> " ; };
+String RID_CHECKX { Text = "check <?> " ; };
+String RID_CIRCLEX { Text = "circle <?> " ; };
+String RID_DOTX { Text = "dot <?> " ; };
+String RID_DDOTX { Text = "ddot <?> " ; };
+String RID_DDDOTX { Text = "dddot <?> " ; };
+String RID_GRAVEX { Text = "grave <?> " ; };
+String RID_HATX { Text = "hat <?> " ; };
+String RID_TILDEX { Text = "tilde <?> " ; };
+String RID_VECX { Text = "vec <?> " ; };
String RID_UNDERLINEX { Text = "underline {<?>} " ; };
String RID_OVERLINEX { Text = "overline {<?>} " ; };
String RID_OVERSTRIKEX { Text = "overstrike {<?>} " ; };
String RID_PHANTOMX { Text = "phantom {<?>} " ; };
-String RID_BOLDX { Text = "bold <?> " ; };
-String RID_ITALX { Text = "ital <?> " ; };
+String RID_BOLDX { Text = "bold <?> " ; };
+String RID_ITALX { Text = "ital <?> " ; };
String RID_SIZEXY { Text = "size <?> {<?>} " ; };
String RID_FONTXY { Text = "font <?> {<?>} " ; };
String RID_COLORX { Text = "color <?> {<?>} " ; };
-String RID_LRGROUPX { Text = "{<?>} " ; };
-String RID_LRPARENTX { Text = "(<?>) " ; };
-String RID_LRBRACKETX { Text = "[<?>] " ; };
-String RID_LRDBRACKETX { Text = "ldbracket <?> rdbracket " ; };
-String RID_LRBRACEX { Text = "lbrace <?> rbrace " ; };
-String RID_LRANGLEX { Text = "langle <?> rangle " ; };
-String RID_LRCEILX { Text = "lceil <?> rceil " ; };
-String RID_LRFLOORX { Text = "lfloor <?> rfloor " ; };
-String RID_LRLINEX { Text = "lline <?> rline " ; };
-String RID_LRDLINEX { Text = "ldline <?> rdline " ; };
-String RID_LMRANGLEXY { Text = "langle <?> mline <?> rangle " ; };
-String RID_SLRPARENTX { Text = "left ( <?> right ) " ; };
-String RID_SLRBRACKETX { Text = "left [ <?> right ] " ; };
-String RID_SLRDBRACKETX { Text = "left ldbracket <?> right rdbracket " ; };
-String RID_SLRBRACEX { Text = "left lbrace <?> right rbrace " ; };
-String RID_SLRANGLEX { Text = "left langle <?> right rangle " ; };
-String RID_SLRCEILX { Text = "left lceil <?> right rceil " ; };
-String RID_SLRFLOORX { Text = "left lfloor <?> right rfloor " ; };
-String RID_SLRLINEX { Text = "left lline <?> right rline " ; };
-String RID_SLRDLINEX { Text = "left ldline <?> right rdline " ; };
-String RID_SLMRANGLEXY { Text = "left langle <?> mline <?> right rangle " ; };
+String RID_LRGROUPX { Text = "{<?>} " ; };
+String RID_LRPARENTX { Text = "(<?>) " ; };
+String RID_LRBRACKETX { Text = "[<?>] " ; };
+String RID_LRDBRACKETX { Text = "ldbracket <?> rdbracket " ; };
+String RID_LRBRACEX { Text = "lbrace <?> rbrace " ; };
+String RID_LRANGLEX { Text = "langle <?> rangle " ; };
+String RID_LRCEILX { Text = "lceil <?> rceil " ; };
+String RID_LRFLOORX { Text = "lfloor <?> rfloor " ; };
+String RID_LRLINEX { Text = "lline <?> rline " ; };
+String RID_LRDLINEX { Text = "ldline <?> rdline " ; };
+String RID_LMRANGLEXY { Text = "langle <?> mline <?> rangle " ; };
+String RID_SLRPARENTX { Text = "left ( <?> right ) " ; };
+String RID_SLRBRACKETX { Text = "left [ <?> right ] " ; };
+String RID_SLRDBRACKETX { Text = "left ldbracket <?> right rdbracket " ; };
+String RID_SLRBRACEX { Text = "left lbrace <?> right rbrace " ; };
+String RID_SLRANGLEX { Text = "left langle <?> right rangle " ; };
+String RID_SLRCEILX { Text = "left lceil <?> right rceil " ; };
+String RID_SLRFLOORX { Text = "left lfloor <?> right rfloor " ; };
+String RID_SLRLINEX { Text = "left lline <?> right rline " ; };
+String RID_SLRDLINEX { Text = "left ldline <?> right rdline " ; };
+String RID_SLMRANGLEXY { Text = "left langle <?> mline <?> right rangle " ; };
String RID_XOVERBRACEY { Text = "{<?>} overbrace {<?>} " ; };
String RID_XUNDERBRACEY { Text = "{<?>} underbrace {<?>} " ; };
-String RID_RSUBX { Text = "<?>_{<?>}" ; };
-String RID_RSUPX { Text = "<?>^{<?>}" ; };
-String RID_LSUBX { Text = "<?> lsub{<?>} " ; };
-String RID_LSUPX { Text = "<?> lsup{<?>} " ; };
-String RID_CSUBX { Text = "<?> csub{<?>} " ; };
-String RID_CSUPX { Text = "<?> csup{<?>} " ; };
-String RID_SBLANK { Text = "`" ; };
-String RID_BLANK { Text = "~" ; };
-String RID_NEWLINE { Text = "newline " ; };
-String RID_BINOMXY { Text = "binom{<?>}{<?>} " ; };
-String RID_STACK { Text = "stack{<?> # <?> # <?>} " ; };
-String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; };
-String RID_ALIGNLX { Text = "alignl <?> " ; };
-String RID_ALIGNCX { Text = "alignc <?> " ; };
-String RID_ALIGNRX { Text = "alignr <?> " ; };
-String RID_ALEPH { Text = "aleph " ; };
-String RID_EMPTYSET { Text = "emptyset " ; };
-String RID_RE { Text = "Re " ; };
-String RID_IM { Text = "Im " ; };
-String RID_INFINITY { Text = "infinity " ; };
-String RID_PARTIAL { Text = "partial " ; };
-String RID_NABLA { Text = "nabla " ; };
-String RID_WP { Text = "wp " ; };
-String RID_DOTSAXIS { Text = "dotsaxis " ; };
-String RID_DOTSUP { Text = "dotsup " ; };
-String RID_DOTSDOWN { Text = "dotsdown " ; };
-String RID_DOTSLOW { Text = "dotslow " ; };
-String RID_DOTSVERT { Text = "dotsvert " ; };
-String RID_XCIRCY { Text = "<?> circ <?> " ; };
+String RID_RSUBX { Text = "<?>_{<?>}" ; };
+String RID_RSUPX { Text = "<?>^{<?>}" ; };
+String RID_LSUBX { Text = "<?> lsub{<?>} " ; };
+String RID_LSUPX { Text = "<?> lsup{<?>} " ; };
+String RID_CSUBX { Text = "<?> csub{<?>} " ; };
+String RID_CSUPX { Text = "<?> csup{<?>} " ; };
+String RID_SBLANK { Text = "`" ; };
+String RID_BLANK { Text = "~" ; };
+String RID_NEWLINE { Text = "newline " ; };
+String RID_BINOMXY { Text = "binom{<?>}{<?>} " ; };
+String RID_STACK { Text = "stack{<?> # <?> # <?>} " ; };
+String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; };
+String RID_ALIGNLX { Text = "alignl <?> " ; };
+String RID_ALIGNCX { Text = "alignc <?> " ; };
+String RID_ALIGNRX { Text = "alignr <?> " ; };
+String RID_ALEPH { Text = "aleph " ; };
+String RID_EMPTYSET { Text = "emptyset " ; };
+String RID_RE { Text = "Re " ; };
+String RID_IM { Text = "Im " ; };
+String RID_INFINITY { Text = "infinity " ; };
+String RID_PARTIAL { Text = "partial " ; };
+String RID_NABLA { Text = "nabla " ; };
+String RID_WP { Text = "wp " ; };
+String RID_DOTSAXIS { Text = "dotsaxis " ; };
+String RID_DOTSUP { Text = "dotsup " ; };
+String RID_DOTSDOWN { Text = "dotsdown " ; };
+String RID_DOTSLOW { Text = "dotslow " ; };
+String RID_DOTSVERT { Text = "dotsvert " ; };
+String RID_XCIRCY { Text = "<?> circ <?> " ; };
String RID_XWIDESLASHY { Text = "{<?>} wideslash {<?>} " ; };
String RID_XWIDEBSLASHY { Text = "<?> widebslash <?> " ; };
-String RID_XDIVIDESY { Text = "<?> divides <?> " ; };
-String RID_XNDIVIDESY { Text = "<?> ndivides <?> " ; };
-String RID_DLARROW { Text = "<?> dlarrow <?> " ; };
-String RID_DLRARROW { Text = "<?> dlrarrow <?> " ; };
-String RID_DRARROW { Text = "<?> drarrow <?> " ; };
-String RID_SETN { Text = "setN " ; };
-String RID_SETZ { Text = "setZ " ; };
-String RID_SETQ { Text = "setQ " ; };
-String RID_SETR { Text = "setR " ; };
-String RID_SETC { Text = "setC " ; };
+String RID_XDIVIDESY { Text = "<?> divides <?> " ; };
+String RID_XNDIVIDESY { Text = "<?> ndivides <?> " ; };
+String RID_DLARROW { Text = "<?> dlarrow <?> " ; };
+String RID_DLRARROW { Text = "<?> dlrarrow <?> " ; };
+String RID_DRARROW { Text = "<?> drarrow <?> " ; };
+String RID_SETN { Text = "setN " ; };
+String RID_SETZ { Text = "setZ " ; };
+String RID_SETQ { Text = "setQ " ; };
+String RID_SETR { Text = "setR " ; };
+String RID_SETC { Text = "setC " ; };
String RID_WIDEHATX { Text = "widehat {<?>} " ; };
String RID_WIDETILDEX { Text = "widetilde {<?>} " ; };
String RID_WIDEVECX { Text = "widevec {<?>} " ; };
-String RID_HBAR { Text = "hbar " ; };
-String RID_LAMBDABAR { Text = "lambdabar " ; };
-String RID_LEFTARROW { Text = "leftarrow " ; };
-String RID_RIGHTARROW { Text = "rightarrow " ; };
-String RID_UPARROW { Text = "uparrow " ; };
-String RID_DOWNARROW { Text = "downarrow " ; };
-String RID_NOSPACE { Text = "nospace {<?>} " ; };
+String RID_HBAR { Text = "hbar " ; };
+String RID_LAMBDABAR { Text = "lambdabar " ; };
+String RID_LEFTARROW { Text = "leftarrow " ; };
+String RID_RIGHTARROW { Text = "rightarrow " ; };
+String RID_UPARROW { Text = "uparrow " ; };
+String RID_DOWNARROW { Text = "downarrow " ; };
+String RID_NOSPACE { Text = "nospace {<?>} " ; };
//////////////////////////////////////////
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index 38fa63429215..0930c107052e 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -2,7 +2,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
@@ -61,36 +61,36 @@ SmConfig::~SmConfig()
void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
{
- const SfxPoolItem *pItem = NULL;
+ const SfxPoolItem *pItem = NULL;
UINT16 nU16;
BOOL bVal;
if (rSet.GetItemState(SID_PRINTSIZE, TRUE, &pItem) == SFX_ITEM_SET)
- { nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
+ { nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
SetPrintSize( (SmPrintSize) nU16 );
}
if (rSet.GetItemState(SID_PRINTZOOM, TRUE, &pItem) == SFX_ITEM_SET)
- { nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
+ { nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
SetPrintZoomFactor( nU16 );
}
if (rSet.GetItemState(SID_PRINTTITLE, TRUE, &pItem) == SFX_ITEM_SET)
- { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintTitle( bVal );
}
if (rSet.GetItemState(SID_PRINTTEXT, TRUE, &pItem) == SFX_ITEM_SET)
- { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintFormulaText( bVal );
}
if (rSet.GetItemState(SID_PRINTFRAME, TRUE, &pItem) == SFX_ITEM_SET)
- { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintFrame( bVal );
}
if (rSet.GetItemState(SID_AUTOREDRAW, TRUE, &pItem) == SFX_ITEM_SET)
- { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetAutoRedraw( bVal );
}
if (rSet.GetItemState(SID_NO_RIGHT_SPACES, TRUE, &pItem) == SFX_ITEM_SET)
- { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
if (IsIgnoreSpacesRight() != bVal)
{
SetIgnoreSpacesRight( bVal );
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index d3800b09e9ac..61b4745b86a6 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -2,7 +2,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
@@ -50,7 +50,7 @@ void SAL_CALL component_getImplementationEnvironment(
}
sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/,
- void* pRegistryKey )
+ void* pRegistryKey )
{
Reference< ::registry::XRegistryKey >
xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
@@ -79,9 +79,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
- if (
- ( pImplementationName != NULL ) &&
- ( pServiceManager != NULL )
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
)
{
// Define variables which are used in following macros.
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e69c0c31fa09..518d9285a458 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2,7 +2,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
@@ -177,16 +177,16 @@ IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButt
SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions)
: SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions),
aFixedLine1 (this, SmResId( FL_PRINTOPTIONS )),
- aTitle (this, SmResId( CB_TITLEROW )),
- aText (this, SmResId( CB_EQUATION_TEXT )),
- aFrame (this, SmResId( CB_FRAME )),
+ aTitle (this, SmResId( CB_TITLEROW )),
+ aText (this, SmResId( CB_EQUATION_TEXT )),
+ aFrame (this, SmResId( CB_FRAME )),
aFixedLine2 (this, SmResId( FL_PRINT_FORMAT )),
- aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )),
- aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
- aSizeZoomed (this, SmResId( RB_ZOOM )),
- aZoom (this, SmResId( MF_ZOOM )),
+ aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )),
+ aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
+ aSizeZoomed (this, SmResId( RB_ZOOM )),
+ aZoom (this, SmResId( MF_ZOOM )),
aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
- aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING ))
+ aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING ))
{
FreeResource();
@@ -250,8 +250,8 @@ void SmShowFont::Paint(const Rectangle& rRect )
{
Control::Paint( rRect );
- XubString Text (GetFont().GetName());
- Size TextSize(GetTextWidth(Text), GetTextHeight());
+ XubString Text (GetFont().GetName());
+ Size TextSize(GetTextWidth(Text), GetTextHeight());
DrawText(Point((GetOutputSize().Width() - TextSize.Width()) / 2,
(GetOutputSize().Height() - TextSize.Height()) / 2), Text);
@@ -326,13 +326,13 @@ void SmFontDialog::SetFont(const Font &rFont)
SmFontDialog::SmFontDialog(Window * pParent,
OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes)
: ModalDialog(pParent,SmResId(RID_FONTDIALOG)),
- aFixedText1 (this, SmResId(1)),
- aFontBox (this, SmResId(1)),
- aBoldCheckBox (this, SmResId(1)),
+ aFixedText1 (this, SmResId(1)),
+ aFontBox (this, SmResId(1)),
+ aBoldCheckBox (this, SmResId(1)),
aItalicCheckBox (this, SmResId(2)),
- aOKButton1 (this, SmResId(1)),
- aCancelButton1 (this, SmResId(1)),
- aShowFont (this, SmResId(1)),
+ aOKButton1 (this, SmResId(1)),
+ aCancelButton1 (this, SmResId(1)),
+ aShowFont (this, SmResId(1)),
aFixedText2 (this, SmResId(2))
{
if (bFreeRes)
@@ -479,11 +479,11 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
{
rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long >(aBaseSize.GetValue()))) );
- rFormat.SetRelSize(SIZ_TEXT, (USHORT) aTextSize .GetValue());
- rFormat.SetRelSize(SIZ_INDEX, (USHORT) aIndexSize .GetValue());
+ rFormat.SetRelSize(SIZ_TEXT, (USHORT) aTextSize .GetValue());
+ rFormat.SetRelSize(SIZ_INDEX, (USHORT) aIndexSize .GetValue());
rFormat.SetRelSize(SIZ_FUNCTION, (USHORT) aFunctionSize.GetValue());
rFormat.SetRelSize(SIZ_OPERATOR, (USHORT) aOperatorSize.GetValue());
- rFormat.SetRelSize(SIZ_LIMITS, (USHORT) aBorderSize .GetValue());
+ rFormat.SetRelSize(SIZ_LIMITS, (USHORT) aBorderSize .GetValue());
const Size aTmp (rFormat.GetBaseSize());
for (USHORT i = FNT_BEGIN; i <= FNT_END; i++)
@@ -505,8 +505,8 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
{
case 1: pActiveListBox = &aVariableFont; break;
case 2: pActiveListBox = &aFunctionFont; break;
- case 3: pActiveListBox = &aNumberFont; break;
- case 4: pActiveListBox = &aTextFont; break;
+ case 3: pActiveListBox = &aNumberFont; break;
+ case 4: pActiveListBox = &aTextFont; break;
case 5: pActiveListBox = &aSerifFont; bHideCheckboxes = TRUE; break;
case 6: pActiveListBox = &aSansFont; bHideCheckboxes = TRUE; break;
case 7: pActiveListBox = &aFixedFont; bHideCheckboxes = TRUE; break;
@@ -552,16 +552,16 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevic
aFixedText3 (this, SmResId(3)),
aNumberFont (this, SmResId(3)),
aFixedText4 (this, SmResId(4)),
- aTextFont (this, SmResId(4)),
+ aTextFont (this, SmResId(4)),
aFixedText5 (this, SmResId(5)),
- aSerifFont (this, SmResId(5)),
+ aSerifFont (this, SmResId(5)),
aFixedText6 (this, SmResId(6)),
- aSansFont (this, SmResId(6)),
+ aSansFont (this, SmResId(6)),
aFixedText7 (this, SmResId(7)),
- aFixedFont (this, SmResId(7)),
+ aFixedFont (this, SmResId(7)),
aFixedLine1 (this, SmResId(1)),
aFixedLine2 (this, SmResId(2)),
- aOKButton1 (this, SmResId(1)),
+ aOKButton1 (this, SmResId(1)),
aCancelButton1 (this, SmResId(1)),
aMenuButton (this, SmResId(1)),
aDefaultButton (this, SmResId(2)),
@@ -582,10 +582,10 @@ void SmFontTypeDialog::ReadFrom(const SmFormat &rFormat)
aVariableFont = pp->GetConfig()->GetFontPickList(FNT_VARIABLE);
aFunctionFont = pp->GetConfig()->GetFontPickList(FNT_FUNCTION);
aNumberFont = pp->GetConfig()->GetFontPickList(FNT_NUMBER);
- aTextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT);
- aSerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF);
- aSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS);
- aFixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED);
+ aTextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT);
+ aSerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF);
+ aSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS);
+ aFixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED);
aVariableFont.Insert( rFormat.GetFont(FNT_VARIABLE) );
aFunctionFont.Insert( rFormat.GetFont(FNT_FUNCTION) );
@@ -604,9 +604,9 @@ void SmFontTypeDialog::WriteTo(SmFormat &rFormat) const
pp->GetConfig()->GetFontPickList(FNT_VARIABLE) = aVariableFont;
pp->GetConfig()->GetFontPickList(FNT_FUNCTION) = aFunctionFont;
pp->GetConfig()->GetFontPickList(FNT_NUMBER) = aNumberFont;
- pp->GetConfig()->GetFontPickList(FNT_TEXT) = aTextFont;
+ pp->GetConfig()->GetFontPickList(FNT_TEXT) = aTextFont;
pp->GetConfig()->GetFontPickList(FNT_SERIF) = aSerifFont;
- pp->GetConfig()->GetFontPickList(FNT_SANS) = aSansFont;
+ pp->GetConfig()->GetFontPickList(FNT_SANS) = aSansFont;
pp->GetConfig()->GetFontPickList(FNT_FIXED) = aFixedFont;
rFormat.SetFont( FNT_VARIABLE, aVariableFont.Get(0) );
@@ -632,25 +632,25 @@ struct FieldMinMax
static const FieldMinMax pMinMaxData[10][4] =
{
// 0
- {{ 0, 200 }, { 0, 200 }, { 0, 100 }, { 0, 0 }},
+ {{ 0, 200 }, { 0, 200 }, { 0, 100 }, { 0, 0 }},
// 1
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
// 2
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
// 3
- {{ 0, 100 }, { 1, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 1, 100 }, { 0, 0 }, { 0, 0 }},
// 4
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
// 5
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 100 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 100 }},
// 6
- {{ 0, 300 }, { 0, 300 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 300 }, { 0, 300 }, { 0, 0 }, { 0, 0 }},
// 7
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
// 8
- {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
+ {{ 0, 100 }, { 0, 100 }, { 0, 0 }, { 0, 0 }},
// 9
- {{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }}
+ {{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }}
};
SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
@@ -708,7 +708,7 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl )
{
if (Categories[nActiveCategory])
{
- USHORT i;
+ USHORT i;
if (pControl == &aMetricField1)
i = 0;
@@ -781,7 +781,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
// for it too.
Edit *pSubEdit = rField.GetSubEdit();
if (pSubEdit)
- { pSubEdit->SetHelpId(nHelpId);
+ { pSubEdit->SetHelpId(nHelpId);
pSubEdit->SetHelpText(aEmptyText);
}
}
@@ -1021,29 +1021,29 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
// wenn nicht kann oben naemlich das const stehen!
SetCategory(nActiveCategory);
- rFormat.SetDistance( DIS_HORIZONTAL, Categories[0]->GetValue(0) );
- rFormat.SetDistance( DIS_VERTICAL, Categories[0]->GetValue(1) );
- rFormat.SetDistance( DIS_ROOT, Categories[0]->GetValue(2) );
- rFormat.SetDistance( DIS_SUPERSCRIPT, Categories[1]->GetValue(0) );
- rFormat.SetDistance( DIS_SUBSCRIPT, Categories[1]->GetValue(1) );
- rFormat.SetDistance( DIS_NUMERATOR, Categories[2]->GetValue(0) );
- rFormat.SetDistance( DIS_DENOMINATOR, Categories[2]->GetValue(1) );
- rFormat.SetDistance( DIS_FRACTION, Categories[3]->GetValue(0) );
- rFormat.SetDistance( DIS_STROKEWIDTH, Categories[3]->GetValue(1) );
- rFormat.SetDistance( DIS_UPPERLIMIT, Categories[4]->GetValue(0) );
- rFormat.SetDistance( DIS_LOWERLIMIT, Categories[4]->GetValue(1) );
- rFormat.SetDistance( DIS_BRACKETSIZE, Categories[5]->GetValue(0) );
- rFormat.SetDistance( DIS_BRACKETSPACE, Categories[5]->GetValue(1) );
- rFormat.SetDistance( DIS_MATRIXROW, Categories[6]->GetValue(0) );
- rFormat.SetDistance( DIS_MATRIXCOL, Categories[6]->GetValue(1) );
- rFormat.SetDistance( DIS_ORNAMENTSIZE, Categories[7]->GetValue(0) );
- rFormat.SetDistance( DIS_ORNAMENTSPACE, Categories[7]->GetValue(1) );
- rFormat.SetDistance( DIS_OPERATORSIZE, Categories[8]->GetValue(0) );
- rFormat.SetDistance( DIS_OPERATORSPACE, Categories[8]->GetValue(1) );
- rFormat.SetDistance( DIS_LEFTSPACE, Categories[9]->GetValue(0) );
- rFormat.SetDistance( DIS_RIGHTSPACE, Categories[9]->GetValue(1) );
- rFormat.SetDistance( DIS_TOPSPACE, Categories[9]->GetValue(2) );
- rFormat.SetDistance( DIS_BOTTOMSPACE, Categories[9]->GetValue(3) );
+ rFormat.SetDistance( DIS_HORIZONTAL, Categories[0]->GetValue(0) );
+ rFormat.SetDistance( DIS_VERTICAL, Categories[0]->GetValue(1) );
+ rFormat.SetDistance( DIS_ROOT, Categories[0]->GetValue(2) );
+ rFormat.SetDistance( DIS_SUPERSCRIPT, Categories[1]->GetValue(0) );
+ rFormat.SetDistance( DIS_SUBSCRIPT, Categories[1]->GetValue(1) );
+ rFormat.SetDistance( DIS_NUMERATOR, Categories[2]->GetValue(0) );
+ rFormat.SetDistance( DIS_DENOMINATOR, Categories[2]->GetValue(1) );
+ rFormat.SetDistance( DIS_FRACTION, Categories[3]->GetValue(0) );
+ rFormat.SetDistance( DIS_STROKEWIDTH, Categories[3]->GetValue(1) );
+ rFormat.SetDistance( DIS_UPPERLIMIT, Categories[4]->GetValue(0) );
+ rFormat.SetDistance( DIS_LOWERLIMIT, Categories[4]->GetValue(1) );
+ rFormat.SetDistance( DIS_BRACKETSIZE, Categories[5]->GetValue(0) );
+ rFormat.SetDistance( DIS_BRACKETSPACE, Categories[5]->GetValue(1) );
+ rFormat.SetDistance( DIS_MATRIXROW, Categories[6]->GetValue(0) );
+ rFormat.SetDistance( DIS_MATRIXCOL, Categories[6]->GetValue(1) );
+ rFormat.SetDistance( DIS_ORNAMENTSIZE, Categories[7]->GetValue(0) );
+ rFormat.SetDistance( DIS_ORNAMENTSPACE, Categories[7]->GetValue(1) );
+ rFormat.SetDistance( DIS_OPERATORSIZE, Categories[8]->GetValue(0) );
+ rFormat.SetDistance( DIS_OPERATORSPACE, Categories[8]->GetValue(1) );
+ rFormat.SetDistance( DIS_LEFTSPACE, Categories[9]->GetValue(0) );
+ rFormat.SetDistance( DIS_RIGHTSPACE, Categories[9]->GetValue(1) );
+ rFormat.SetDistance( DIS_TOPSPACE, Categories[9]->GetValue(2) );
+ rFormat.SetDistance( DIS_BOTTOMSPACE, Categories[9]->GetValue(3) );
rFormat.SetDistance( DIS_NORMALBRACKETSIZE, Categories[5]->GetValue(3) );
rFormat.SetScaleNormalBrackets( bScaleAllBrackets );
@@ -1074,11 +1074,11 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/
SmAlignDialog::SmAlignDialog(Window * pParent, BOOL bFreeRes)
: ModalDialog(pParent, SmResId(RID_ALIGNDIALOG)),
- aLeft (this, SmResId(1)),
- aCenter (this, SmResId(2)),
- aRight (this, SmResId(3)),
+ aLeft (this, SmResId(1)),
+ aCenter (this, SmResId(2)),
+ aRight (this, SmResId(3)),
aFixedLine1 (this, SmResId(1)),
- aOKButton1 (this, SmResId(1)),
+ aOKButton1 (this, SmResId(1)),
aCancelButton1 (this, SmResId(1)),
aDefaultButton (this, SmResId(1))
{
@@ -1144,7 +1144,7 @@ void SmShowSymbolSet::Paint(const Rectangle&)
for (USHORT i = v; i < nSymbols ; i++)
{
SmSym aSymbol (*aSymbolSet[i]);
- Font aFont (aSymbol.GetFace());
+ Font aFont (aSymbol.GetFace());
aFont.SetAlign(ALIGN_TOP);
// etwas kleinere FontSize nehmen (als nLen) um etwas Luft zu haben
@@ -1154,7 +1154,7 @@ void SmShowSymbolSet::Paint(const Rectangle&)
// keep text color
SetTextColor( aTxtColor );
- int nIV = i - v;
+ int nIV = i - v;
Size aSize(GetTextWidth(aSymbol.GetCharacter()), GetTextHeight());
DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2,
@@ -1201,12 +1201,12 @@ void SmShowSymbolSet::KeyInput(const KeyEvent& rKEvt)
{
case KEY_DOWN: n = n + nColumns; break;
case KEY_UP: n = n - nColumns; break;
- case KEY_LEFT: n -= 1; break;
- case KEY_RIGHT: n += 1; break;
- case KEY_HOME: n = 0; break;
+ case KEY_LEFT: n -= 1; break;
+ case KEY_RIGHT: n += 1; break;
+ case KEY_HOME: n = 0; break;
case KEY_END: n = static_cast< USHORT >(aSymbolSet.size() - 1); break;
- case KEY_PAGEUP: n -= nColumns * nRows; break;
- case KEY_PAGEDOWN: n += nColumns * nRows; break;
+ case KEY_PAGEUP: n -= nColumns * nRows; break;
+ case KEY_PAGEDOWN: n += nColumns * nRows; break;
default:
Control::KeyInput(rKEvt);
@@ -1256,7 +1256,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) :
#endif
// genau passend machen
- aOutputSize.Width() = nColumns * nLen;
+ aOutputSize.Width() = nColumns * nLen;
aOutputSize.Height() = nRows * nLen;
aVScrollBar.SetPosSizePixel(Point(aOutputSize.Width() + 1, -1),
@@ -1275,7 +1275,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) :
void SmShowSymbolSet::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
{
aSymbolSet = rSymbolSet;
-
+
if (static_cast< USHORT >(aSymbolSet.size()) > (nColumns * nRows))
{
aVScrollBar.SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows));
@@ -1448,7 +1448,7 @@ IMPL_LINK( SmSymbolDialog, EditClickHdl, Button *, EMPTYARG pButton )
aSymbolSet = rSymbolMgr.GetSymbolSet( aSymbolSetName );
aSymbolSetDisplay.SetSymbolSet( aSymbolSet );
}
-
+
if (nSymPos >= aSymbolSet.size())
nSymPos = static_cast< USHORT >(aSymbolSet.size()) - 1;
SelectSymbol( nSymPos );
@@ -1481,7 +1481,7 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton )
const SmSym *pSym = GetSymbol();
if (pSym)
{
- XubString aText ('%');
+ XubString aText ('%');
aText += pSym->GetName();
aText += (sal_Unicode)' ';
@@ -1509,7 +1509,7 @@ IMPL_LINK_INLINE_END( SmSymbolDialog, CloseClickHdl, Button *, pButton )
SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice,
SmSymbolManager &rMgr, SmViewShell &rViewShell, BOOL bFreeRes) :
- ModalDialog (pParent, SmResId(RID_SYMBOLDIALOG)),
+ ModalDialog (pParent, SmResId(RID_SYMBOLDIALOG)),
aSymbolSetText (this, SmResId(1)),
aSymbolSets (this, SmResId(1)),
aSymbolSetDisplay (this, SmResId(1)),
@@ -1536,13 +1536,13 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice,
// preview like controls should have a 2D look
aSymbolDisplay.SetBorderStyle( WINDOW_BORDER_MONO );
- aSymbolSets .SetSelectHdl (LINK(this, SmSymbolDialog, SymbolSetChangeHdl));
+ aSymbolSets .SetSelectHdl (LINK(this, SmSymbolDialog, SymbolSetChangeHdl));
aSymbolSetDisplay.SetSelectHdl (LINK(this, SmSymbolDialog, SymbolChangeHdl));
aSymbolSetDisplay.SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl));
- aSymbolDisplay .SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl));
- aCloseBtn .SetClickHdl (LINK(this, SmSymbolDialog, CloseClickHdl));
- aEditBtn .SetClickHdl (LINK(this, SmSymbolDialog, EditClickHdl));
- aGetBtn .SetClickHdl (LINK(this, SmSymbolDialog, GetClickHdl));
+ aSymbolDisplay .SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl));
+ aCloseBtn .SetClickHdl (LINK(this, SmSymbolDialog, CloseClickHdl));
+ aEditBtn .SetClickHdl (LINK(this, SmSymbolDialog, EditClickHdl));
+ aGetBtn .SetClickHdl (LINK(this, SmSymbolDialog, GetClickHdl));
}
@@ -1587,8 +1587,8 @@ void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt )
BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
{
- BOOL bRet = FALSE;
- USHORT nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
+ BOOL bRet = FALSE;
+ USHORT nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
aSymbolSetName = String();
aSymbolSet.clear();
@@ -1949,13 +1949,13 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
aSymbolName.SetText( aNewSymbol.GetName() );
aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
-
+
// update list box entries
FillSymbolSets(aOldSymbolSets, FALSE);
FillSymbolSets(aSymbolSets, FALSE);
FillSymbols(aOldSymbols ,FALSE);
FillSymbols(aSymbols ,FALSE);
-
+
UpdateButtons();
return 0;
@@ -2030,7 +2030,7 @@ void SmSymDefineDialog::UpdateButtons()
SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
OutputDevice *pFntListDevice, SmSymbolManager &rMgr, BOOL bFreeRes) :
- ModalDialog (pParent, SmResId(RID_SYMDEFINEDIALOG)),
+ ModalDialog (pParent, SmResId(RID_SYMDEFINEDIALOG)),
aOldSymbolText (this, SmResId(1)),
aOldSymbols (this, SmResId(1)),
aOldSymbolSetText (this, SmResId(2)),
@@ -2071,7 +2071,7 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
pOrigSymbol = 0;
- // auto completion is troublesome since that symbols character also gets automatically selected in the
+ // auto completion is troublesome since that symbols character also gets automatically selected in the
// display and if the user previously selected a character to define/redefine that one this is bad
aOldSymbols.EnableAutocomplete( FALSE, TRUE );
aSymbols .EnableAutocomplete( FALSE, TRUE );
@@ -2084,13 +2084,13 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
SetSymbolSetManager(rSymbolMgr);
- aOldSymbols .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl));
+ aOldSymbols .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl));
aOldSymbolSets .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolSetChangeHdl));
aSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aOldSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aOldSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
- aStyles .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
+ aStyles .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aFonts .SetSelectHdl(LINK(this, SmSymDefineDialog, FontChangeHdl));
aFontsSubsetLB .SetSelectHdl(LINK(this, SmSymDefineDialog, SubsetChangeHdl));
aStyles .SetSelectHdl(LINK(this, SmSymDefineDialog, StyleChangeHdl));
@@ -2135,7 +2135,7 @@ void SmSymDefineDialog::InitColor_Impl()
aOldSymbolDisplay.SetTextColor( aTxtColor );
aSymbolDisplay .SetBackground( aWall );
aSymbolDisplay .SetTextColor( aTxtColor );
-
+
const Image &rArrowRight = bHighContrast ? aRigthArrow_Im_HC : aRigthArrow_Im;
aRightArrow.SetImage( rArrowRight );
}
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
index 29d87ba1d287..026c17e70063 100644
--- a/starmath/source/dialog.hrc
+++ b/starmath/source/dialog.hrc
@@ -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
@@ -31,17 +31,17 @@
#define FL_PRINTOPTIONS 10
#define CB_TITLEROW 11
-#define CB_EQUATION_TEXT 12
+#define CB_EQUATION_TEXT 12
#define CB_FRAME 13
#define FL_PRINT_FORMAT 20
-#define RB_ORIGINAL_SIZE 21
-#define RB_FIT_TO_PAGE 22
+#define RB_ORIGINAL_SIZE 21
+#define RB_FIT_TO_PAGE 22
#define RB_ZOOM 23
#define MF_ZOOM 24
#define FL_MISC_OPTIONS 30
-#define CB_IGNORE_SPACING 31
+#define CB_IGNORE_SPACING 31
#define FT_FONTS_SUBSET 110
#define LB_FONTS_SUBSET 111
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index b912903fdff6..d2d893f57c99 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -107,7 +107,7 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
-#define DOCUMENT_BUFFER_SIZE (USHORT)32768
+#define DOCUMENT_BUFFER_SIZE (USHORT)32768
static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
@@ -456,7 +456,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSel
//angepasst werden.
rPosition.X() += aFormat.GetDistance( DIS_LEFTSPACE );
- rPosition.Y() += aFormat.GetDistance( DIS_TOPSPACE );
+ rPosition.Y() += aFormat.GetDistance( DIS_TOPSPACE );
//! in case of high contrast-mode (accessibility option!)
//! the draw mode needs to be set to default, because when imbedding
@@ -625,11 +625,11 @@ Printer* SmDocShell::GetPrt()
{
SfxItemSet *pOptions =
new SfxItemSet(GetPool(),
- SID_PRINTSIZE, SID_PRINTSIZE,
- SID_PRINTZOOM, SID_PRINTZOOM,
- SID_PRINTTITLE, SID_PRINTTITLE,
- SID_PRINTTEXT, SID_PRINTTEXT,
- SID_PRINTFRAME, SID_PRINTFRAME,
+ SID_PRINTSIZE, SID_PRINTSIZE,
+ SID_PRINTZOOM, SID_PRINTZOOM,
+ SID_PRINTTITLE, SID_PRINTTITLE,
+ SID_PRINTTEXT, SID_PRINTTEXT,
+ SID_PRINTFRAME, SID_PRINTFRAME,
SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
0);
@@ -661,7 +661,7 @@ void SmDocShell::SetPrinter( SfxPrinter *pNew )
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetPrinter" );
delete pPrinter;
- pPrinter = pNew; //Eigentumsuebergang!
+ pPrinter = pNew; //Eigentumsuebergang!
pPrinter->SetMapMode( MapMode(MAP_100TH_MM) );
SetFormulaArranged(FALSE);
Repaint();
@@ -703,13 +703,13 @@ void SmDocShell::Repaint()
SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
SfxObjectShell( i_nSfxCreationFlags ),
- pTree ( 0 ),
+ pTree ( 0 ),
pEditEngineItemPool ( 0 ),
pEditEngine ( 0 ),
- pPrinter ( 0 ),
+ pPrinter ( 0 ),
pTmpPrinter ( 0 ),
- nModifyCount ( 0 ),
- bIsFormulaArranged ( FALSE )
+ nModifyCount ( 0 ),
+ bIsFormulaArranged ( FALSE )
{
pCursor = NULL;
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SmDocShell" );
@@ -761,7 +761,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertFrom" );
- BOOL bSuccess = FALSE;
+ BOOL bSuccess = FALSE;
const String& rFltName = rMedium.GetFilter()->GetFilterName();
OSL_ENSURE( !rFltName.EqualsAscii( STAROFFICE_XML ), "Wrong filter!");
@@ -1224,7 +1224,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
case SID_AUTO_REDRAW :
{
SmModule *pp = SM_MOD();
- BOOL bRedraw = pp->GetConfig()->IsAutoRedraw();
+ BOOL bRedraw = pp->GetConfig()->IsAutoRedraw();
rSet.Put(SfxBoolItem(SID_AUTO_REDRAW, bRedraw));
}
@@ -1386,15 +1386,15 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
if (nFileFormat == SOFFICE_FILEFORMAT_60 )
{
- *pClassName = SvGlobalName(SO3_SM_CLASSID_60);
- *pFormat = SOT_FORMATSTR_ID_STARMATH_60;
+ *pClassName = SvGlobalName(SO3_SM_CLASSID_60);
+ *pFormat = SOT_FORMATSTR_ID_STARMATH_60;
*pFullTypeName = String(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
*pShortTypeName = String(SmResId(RID_DOCUMENTSTR));
}
else if (nFileFormat == SOFFICE_FILEFORMAT_8 )
{
- *pClassName = SvGlobalName(SO3_SM_CLASSID_60);
- *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8;
+ *pClassName = SvGlobalName(SO3_SM_CLASSID_60);
+ *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8;
*pFullTypeName = String(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
*pShortTypeName = String(SmResId(RID_DOCUMENTSTR));
}
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 83fcfab0351b..cf2c1865bb31 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -2,7 +2,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
@@ -38,10 +38,10 @@
#include "starmath.hrc"
-#define ITEMID_FONT 1
-#define ITEMID_FONTHEIGHT 2
-#define ITEMID_LRSPACE 3
-#define ITEMID_WEIGHT 4
+#define ITEMID_FONT 1
+#define ITEMID_FONTHEIGHT 2
+#define ITEMID_LRSPACE 3
+#define ITEMID_WEIGHT 4
#include <vcl/menu.hxx>
@@ -65,12 +65,12 @@
#include "document.hxx"
#include "config.hxx"
-#define SCROLL_LINE 24
+#define SCROLL_LINE 24
-#define MINWIDTH 200
-#define MINHEIGHT 200
-#define MINSPLIT 40
-#define SPLITTERWIDTH 2
+#define MINWIDTH 200
+#define MINHEIGHT 200
+#define MINSPLIT 40
+#define SPLITTERWIDTH 2
using namespace com::sun::star::accessibility;
@@ -85,13 +85,13 @@ void SmGetLeftSelectionPart(const ESelection aSel,
// returns paragraph number and position of the selections left part
{
// compare start and end of selection and use the one that comes first
- if ( aSel.nStartPara < aSel.nEndPara
- || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) )
- { nPara = aSel.nStartPara;
+ if ( aSel.nStartPara < aSel.nEndPara
+ || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) )
+ { nPara = aSel.nStartPara;
nPos = aSel.nStartPos;
}
else
- { nPara = aSel.nEndPara;
+ { nPara = aSel.nEndPara;
nPos = aSel.nEndPos;
}
}
@@ -255,7 +255,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
// unfortunately this resets the whole edit engine
// thus we need to save at least the text
String aTxt( pEditEngine->GetText( LINEEND_LF ) );
- pEditEngine->Clear(); //#77957 incorrect font size
+ pEditEngine->Clear(); //#77957 incorrect font size
pEditEngine->SetText( aTxt );
}
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 2a553fb862e4..a1086e183712 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
EQNOLEFILEHDR aHdr;
aHdr.Read(pS);
*pS >> nVer;
-
+
if (!pS->GetError())
{
nVersion = nVer;
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index cdc592d8ea0c..cca3c4938fb1 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -2,7 +2,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
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 1117da96421a..0594bbf4f9e2 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -2,7 +2,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
@@ -109,53 +109,53 @@ String GetDefaultFontName( LanguageType nLang, USHORT nIdent )
/////////////////////////////////////////////////////////////////
SmFormat::SmFormat()
-: aBaseSize(0, SmPtsTo100th_mm(12))
+: aBaseSize(0, SmPtsTo100th_mm(12))
{
- nVersion = SM_FMT_VERSION_NOW;
+ nVersion = SM_FMT_VERSION_NOW;
eHorAlign = AlignCenter;
nGreekCharStyle = 0;
bIsTextmode = bScaleNormalBrackets = FALSE;
- vSize[SIZ_TEXT] = 100;
- vSize[SIZ_INDEX] = 60;
+ vSize[SIZ_TEXT] = 100;
+ vSize[SIZ_INDEX] = 60;
vSize[SIZ_FUNCTION] =
vSize[SIZ_OPERATOR] = 100;
- vSize[SIZ_LIMITS] = 60;
-
- vDist[DIS_HORIZONTAL] = 10;
- vDist[DIS_VERTICAL] = 5;
- vDist[DIS_ROOT] = 0;
- vDist[DIS_SUPERSCRIPT] =
- vDist[DIS_SUBSCRIPT] = 20;
- vDist[DIS_NUMERATOR] =
- vDist[DIS_DENOMINATOR] = 0;
- vDist[DIS_FRACTION] = 10;
- vDist[DIS_STROKEWIDTH] = 5;
- vDist[DIS_UPPERLIMIT] =
- vDist[DIS_LOWERLIMIT] = 0;
- vDist[DIS_BRACKETSIZE] =
- vDist[DIS_BRACKETSPACE] = 5;
- vDist[DIS_MATRIXROW] = 3;
- vDist[DIS_MATRIXCOL] = 30;
- vDist[DIS_ORNAMENTSIZE] =
- vDist[DIS_ORNAMENTSPACE] = 0;
- vDist[DIS_OPERATORSIZE] = 50;
- vDist[DIS_OPERATORSPACE] = 20;
- vDist[DIS_LEFTSPACE] =
- vDist[DIS_RIGHTSPACE] = 100;
- vDist[DIS_TOPSPACE] =
- vDist[DIS_BOTTOMSPACE] =
- vDist[DIS_NORMALBRACKETSIZE] = 0;
-
- vFont[FNT_VARIABLE] =
- vFont[FNT_FUNCTION] =
- vFont[FNT_NUMBER] =
- vFont[FNT_TEXT] =
- vFont[FNT_SERIF] = SmFace(C2S(FNTNAME_TIMES), aBaseSize);
- vFont[FNT_SANS] = SmFace(C2S(FNTNAME_HELV), aBaseSize);
- vFont[FNT_FIXED] = SmFace(C2S(FNTNAME_COUR), aBaseSize);
- vFont[FNT_MATH] = SmFace(C2S(FNTNAME_MATH), aBaseSize);
+ vSize[SIZ_LIMITS] = 60;
+
+ vDist[DIS_HORIZONTAL] = 10;
+ vDist[DIS_VERTICAL] = 5;
+ vDist[DIS_ROOT] = 0;
+ vDist[DIS_SUPERSCRIPT] =
+ vDist[DIS_SUBSCRIPT] = 20;
+ vDist[DIS_NUMERATOR] =
+ vDist[DIS_DENOMINATOR] = 0;
+ vDist[DIS_FRACTION] = 10;
+ vDist[DIS_STROKEWIDTH] = 5;
+ vDist[DIS_UPPERLIMIT] =
+ vDist[DIS_LOWERLIMIT] = 0;
+ vDist[DIS_BRACKETSIZE] =
+ vDist[DIS_BRACKETSPACE] = 5;
+ vDist[DIS_MATRIXROW] = 3;
+ vDist[DIS_MATRIXCOL] = 30;
+ vDist[DIS_ORNAMENTSIZE] =
+ vDist[DIS_ORNAMENTSPACE] = 0;
+ vDist[DIS_OPERATORSIZE] = 50;
+ vDist[DIS_OPERATORSPACE] = 20;
+ vDist[DIS_LEFTSPACE] =
+ vDist[DIS_RIGHTSPACE] = 100;
+ vDist[DIS_TOPSPACE] =
+ vDist[DIS_BOTTOMSPACE] =
+ vDist[DIS_NORMALBRACKETSIZE] = 0;
+
+ vFont[FNT_VARIABLE] =
+ vFont[FNT_FUNCTION] =
+ vFont[FNT_NUMBER] =
+ vFont[FNT_TEXT] =
+ vFont[FNT_SERIF] = SmFace(C2S(FNTNAME_TIMES), aBaseSize);
+ vFont[FNT_SANS] = SmFace(C2S(FNTNAME_HELV), aBaseSize);
+ vFont[FNT_FIXED] = SmFace(C2S(FNTNAME_COUR), aBaseSize);
+ vFont[FNT_MATH] = SmFace(C2S(FNTNAME_MATH), aBaseSize);
vFont[FNT_MATH].SetCharSet( RTL_TEXTENCODING_UNICODE );
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 8f009293fb9c..0aec1ea45eb6 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -2,7 +2,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
@@ -33,10 +33,10 @@
#include "starmath.hrc"
-#define ITEMID_FONT 1
-#define ITEMID_FONTHEIGHT 2
-#define ITEMID_LRSPACE 3
-#define ITEMID_WEIGHT 4
+#define ITEMID_FONT 1
+#define ITEMID_FONTHEIGHT 2
+#define ITEMID_LRSPACE 3
+#define ITEMID_WEIGHT 4
//--------- ab hier die "generierten"
#include <tools/string.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index cefb16823bdc..00ad280ac0ad 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 65c524fe0f40..fb108972a17e 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ class SmXMLExportWrapper
public:
SmXMLExportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
: xModel(rRef), bFlat(sal_True) {}
-
+
sal_Bool Export(SfxMedium &rMedium);
void SetFlat(sal_Bool bIn) {bFlat = bIn;}
@@ -70,7 +70,7 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName );
-
+
sal_Bool WriteThroughComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 29d776e4d256..7fdd931c1463 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 473efa97bd75..d5e4d18d7464 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -2,7 +2,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
@@ -54,14 +54,14 @@ class SmXMLImportWrapper
public:
SmXMLImportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
: xModel(rRef) {}
-
+
ULONG Import(SfxMedium &rMedium);
ULONG ReadThroughComponent(
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rFactory,
- ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pFilterName,
sal_Bool bEncrypted );
@@ -72,7 +72,7 @@ public:
const sal_Char* pStreamName,
const sal_Char* pCompatibilityStreamName,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rFactory,
- ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pFilterName );
};
@@ -108,11 +108,11 @@ public:
// XUnoTunnel
sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException);
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-
+
void SAL_CALL endDocument(void)
throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException );
-
+
SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
const rtl::OUString &rLocalName,
const com::sun::star::uno::Reference <
@@ -241,7 +241,7 @@ public:
const rtl::OUString &rLocalName,
const com::sun::star::uno::Reference <
com::sun::star::xml::sax::XAttributeList> &xAttrList);
-
+
const SvXMLTokenMap &GetPresLayoutElemTokenMap();
const SvXMLTokenMap &GetPresLayoutAttrTokenMap();
const SvXMLTokenMap &GetFencedAttrTokenMap();
@@ -251,7 +251,7 @@ public:
const SvXMLTokenMap &GetPresScriptEmptyElemTokenMap();
const SvXMLTokenMap &GetPresTableElemTokenMap();
const SvXMLTokenMap &GetColorTokenMap();
-
+
SmNodeStack & GetNodeStack() {return aNodeStack;}
SmNode *GetTree() { return aNodeStack.Pop();}
sal_Bool GetSuccess() { return bSuccess; }
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index bbfe4f5952ca..9721fad277d6 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2,7 +2,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
@@ -514,17 +514,17 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
case 0xE425:
pC = " leslant ";
break;
- case 0xeb01: //no space
- case 0xeb08: //normal space
+ case 0xeb01: //no space
+ case 0xeb08: //normal space
bRet=TRUE;
break;
- case 0xef04: //tiny space
- case 0xef05: //tiny space
- case 0xeb02: //small space
- case 0xeb04: //medium space
+ case 0xef04: //tiny space
+ case 0xef05: //tiny space
+ case 0xeb02: //small space
+ case 0xeb04: //medium space
rRet.Append('`');
break;
- case 0xeb05: //large space
+ case 0xeb05: //large space
rRet.Append('~');
break;
case 0x3a9:
@@ -610,7 +610,7 @@ int MathType::Parse(SotStorage *pStor)
APPEND(rRet,"{}");
#if OSL_DEBUG_LEVEL > 1
-# ifdef CAOLAN
+# ifdef CAOLAN
//sanity check
//sigh, theres no point! MathType (in some bizarre subvarient) pads
@@ -618,7 +618,7 @@ int MathType::Parse(SotStorage *pStor)
ULONG nEnd = pS->Tell();
OSL_ENSURE(nEnd == pS->Seek(STREAM_SEEK_TO_END),
"Possibly unfully parsed formula");
-# endif
+# endif
#endif
return nRet;
}
@@ -3146,11 +3146,11 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
}
else if (nArse == 0x2225)
*pS << sal_uInt16(0xEC09);
- else if (nArse == 0xE421)
+ else if (nArse == 0xE421)
*pS << sal_uInt16(0x2265);
else if (nArse == 0x230A)
*pS << sal_uInt16(0xF8F0);
- else if (nArse == 0x230B)
+ else if (nArse == 0x230B)
*pS << sal_uInt16(0xF8FB);
else if (nArse == 0xE425)
*pS << sal_uInt16(0x2264);
@@ -3224,7 +3224,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
case TUNDERLINE:
nOldPending = StartTemplate(0x10);
break;
- case TOVERLINE: //If the next node is not text
+ case TOVERLINE: //If the next node is not text
//or text with more than one char
if ((pIsText->GetToken().eType != TTEXT) ||
(pIsText->GetText().Len() > 1))
@@ -3325,7 +3325,7 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/)
if ((nPendingAttributes) &&
(i == ((pTemp->GetText().Len()+1)/2)-1))
{
- *pS << sal_uInt8(0x22); //char, with attributes right
+ *pS << sal_uInt8(0x22); //char, with attributes right
//after the character
}
else
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 881209cdfdaa..b03d943402eb 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -2,7 +2,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
@@ -62,23 +62,23 @@ typedef ::std::set< MathTypeFont, LessMathTypeFont > MathTypeFontSet;
class MathType
{
public:
- MathType(String &rIn) :
+ MathType(String &rIn) :
rRet(rIn), nHAlign(0), nVAlign(0), nDefaultSize(12),
nLSize(0), nDSize(0), nCurSize(0), nLastSize(0), bIsSilent(sal_False)
{
Init();
}
- MathType(String &rIn,SmNode *pIn) :
+ MathType(String &rIn,SmNode *pIn) :
rRet(rIn), pTree(pIn), nHAlign(2), nVAlign(0), nInsertion(0), nDefaultSize(12),
nLSize(0), nDSize(0), nCurSize(0), nLastSize(0), nSpec(0), bIsSilent(sal_False)
{
Init();
}
-
+
int Parse( SotStorage* pStor );
int ConvertFromStarMath( SfxMedium& rMedium );
-
+
private:
/*Ver 2 Header*/
sal_uInt8 nVersion;
diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src
index c6eeeb60b7cd..70348c73d042 100644
--- a/starmath/source/menu_tmpl.src
+++ b/starmath/source/menu_tmpl.src
@@ -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
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index ecfa7d52b08c..9af5027eea5e 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -140,7 +140,7 @@ void SmTmpDevice::SetFont(const Font &rNewFont)
SmNode::SmNode(SmNodeType eNodeType, const SmToken &rNodeToken)
{
- eType = eNodeType;
+ eType = eNodeType;
eScaleMode = SCALE_NONE;
aNodeToken = rNodeToken;
nAccIndex = -1;
@@ -173,7 +173,7 @@ SmNode * SmNode::GetSubNode(USHORT /*nIndex*/)
SmNode * SmNode::GetLeftMost()
- // returns leftmost node of current subtree.
+ // returns leftmost node of current subtree.
//! (this assumes the one with index 0 is always the leftmost subnode
//! for the current node).
{
@@ -190,7 +190,7 @@ void SmNode::SetPhantom(BOOL bIsPhantomP)
bIsPhantom = bIsPhantomP;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetPhantom(bIsPhantom);
@@ -203,7 +203,7 @@ void SmNode::SetColor(const Color& rColor)
GetFont().SetColor(rColor);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetColor(rColor);
@@ -252,7 +252,7 @@ void SmNode::SetFont(const SmFace &rFace)
GetFont() = rFace;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetFont(rFace);
@@ -268,7 +268,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
{
Fraction aVal (SmPtsTo100th_mm(rSize.GetNumerator()),
rSize.GetDenominator());
- long nHeight = (long)aVal;
+ long nHeight = (long)aVal;
aFntSize = GetFont().GetSize();
aFntSize.Width() = 0;
@@ -299,7 +299,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
}
// check the requested size against maximum value
- static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
+ static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
if (aFntSize.Height() > nMaxVal)
aFntSize.Height() = nMaxVal;
@@ -307,8 +307,8 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
}
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetFontSize(rSize, nType);
}
@@ -319,8 +319,8 @@ void SmNode::SetSize(const Fraction &rSize)
GetFont() *= rSize;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetSize(rSize);
}
@@ -344,7 +344,7 @@ void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, BOOL bApplyToSubTree )
void SmNode::PrepareAttributes()
{
- GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL);
+ GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL);
GetFont().SetItalic((Attributes() & ATTR_ITALIC) ? ITALIC_NORMAL : ITALIC_NONE);
}
@@ -352,18 +352,18 @@ void SmNode::PrepareAttributes()
void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
{
#if OSL_DEBUG_LEVEL > 1
- bIsDebug = TRUE;
+ bIsDebug = TRUE;
#else
- bIsDebug = FALSE;
+ bIsDebug = FALSE;
#endif
- bIsPhantom = FALSE;
- nFlags = 0;
+ bIsPhantom = FALSE;
+ nFlags = 0;
nAttributes = 0;
switch (rFormat.GetHorAlign())
- { case AlignLeft: eRectHorAlign = RHA_LEFT; break;
- case AlignCenter: eRectHorAlign = RHA_CENTER; break;
- case AlignRight: eRectHorAlign = RHA_RIGHT; break;
+ { case AlignLeft: eRectHorAlign = RHA_LEFT; break;
+ case AlignCenter: eRectHorAlign = RHA_CENTER; break;
+ case AlignRight: eRectHorAlign = RHA_RIGHT; break;
}
GetFont() = rFormat.GetFont(FNT_MATH);
@@ -373,7 +373,7 @@ void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
GetFont().SetItalic(ITALIC_NONE);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Prepare(rFormat, rDocShell);
@@ -389,7 +389,7 @@ void SmNode::ToggleDebug() const
pThis->bIsDebug = bIsDebug ? FALSE : TRUE;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = pThis->GetSubNode(i)))
pNode->ToggleDebug();
@@ -399,14 +399,14 @@ void SmNode::ToggleDebug() const
void SmNode::Move(const Point& rPosition)
{
- if (rPosition.X() == 0 && rPosition.Y() == 0)
+ if (rPosition.X() == 0 && rPosition.Y() == 0)
return;
SmRect::Move(rPosition);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Move(rPosition);
}
@@ -415,8 +415,8 @@ void SmNode::Move(const Point& rPosition)
void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Arrange(rDev, rFormat);
}
@@ -424,10 +424,10 @@ void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
void SmNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
if (nSize > 1)
rText.Append('{');
- for (USHORT i = 0; i < nSize; i++)
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->CreateTextFromNode(rText);
if (nSize > 1)
@@ -453,15 +453,15 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const
// position 'nRow', 'nCol'.
//! (there should be exactly one such node if any)
{
- if ( IsVisible()
- && nRow == GetToken().nRow
- && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len())
+ if ( IsVisible()
+ && nRow == GetToken().nRow
+ && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len())
return this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
- { const SmNode *pNode = GetSubNode(i);
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
+ { const SmNode *pNode = GetSubNode(i);
if (!pNode)
continue;
@@ -478,16 +478,16 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const
const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
{
- long nDist = LONG_MAX;
+ long nDist = LONG_MAX;
const SmNode *pResult = 0;
if (IsVisible())
pResult = this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
- { const SmNode *pNode = GetSubNode(i);
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
+ { const SmNode *pNode = GetSubNode(i);
if (!pNode)
continue;
@@ -495,7 +495,7 @@ const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
long nTmp;
const SmNode *pFound = pNode->FindRectClosestTo(rPoint);
if (pFound && (nTmp = pFound->OrientedDist(rPoint)) < nDist)
- { nDist = nTmp;
+ { nDist = nTmp;
pResult = pFound;
// quit immediately if 'rPoint' is inside the *should not
@@ -532,8 +532,8 @@ const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const
pResult = this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
{
const SmNode *pNode = GetSubNode(i);
if (!pNode)
@@ -667,7 +667,7 @@ SmStructureNode::~SmStructureNode()
{
SmNode *pNode;
- for (USHORT i = 0; i < GetNumSubNodes(); i++)
+ for (USHORT i = 0; i < GetNumSubNodes(); i++)
if (NULL != (pNode = GetSubNode(i)))
delete pNode;
}
@@ -785,10 +785,10 @@ void SmGraphicNode::GetAccessibleText( String &rText ) const
void SmExpressionNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
if (nSize > 1)
rText.Append('{');
- for (USHORT i = 0; i < nSize; i++)
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
{
pNode->CreateTextFromNode(rText);
@@ -815,7 +815,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
Point rPosition;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
// make distance depend on font size
long nDist = +(rFormat.GetDistance(DIS_VERTICAL)
@@ -828,9 +828,9 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
long nMaxWidth = 0,
nTmp;
USHORT i;
- for (i = 0; i < nSize; i++)
+ for (i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
- { pNode->Arrange(rDev, rFormat);
+ { pNode->Arrange(rDev, rFormat);
if ((nTmp = pNode->GetItalicWidth()) > nMaxWidth)
nMaxWidth = nTmp;
}
@@ -839,8 +839,8 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
SmRect::operator = (SmRect(nMaxWidth, 0));
for (i = 0; i < nSize; i++)
{ if (NULL != (pNode = GetSubNode(i)))
- { const SmRect &rNodeRect = pNode->GetRect();
- const SmNode *pCoNode = pNode->GetLeftMost();
+ { const SmRect &rNodeRect = pNode->GetRect();
+ const SmNode *pCoNode = pNode->GetLeftMost();
RectHorAlign eHorAlign = pCoNode->GetRectHorAlign();
aPos = rNodeRect.AlignTo(*this, RP_BOTTOM,
@@ -881,9 +881,9 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// arranges all subnodes in one row with some extra space between
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
USHORT i;
- for (i = 0; i < nSize; i++)
+ for (i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Arrange(rDev, rFormat);
@@ -934,7 +934,7 @@ void SmExpressionNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
{
SmLineNode::Arrange(rDev, rFormat);
- // copy alignment of leftmost subnode if any
+ // copy alignment of leftmost subnode if any
SmNode *pNode = GetLeftMost();
if (pNode)
SetRectHorAlign(pNode->GetRectHorAlign(), FALSE);
@@ -989,7 +989,7 @@ void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
rVerOffset = (rRect.GetBottom() - rRect.GetAlignB()) / 2;
rHeight = rRect.GetHeight() - rVerOffset;
- OSL_ENSURE(rHeight >= 0, "Sm : Ooops...");
+ OSL_ENSURE(rHeight >= 0, "Sm : Ooops...");
OSL_ENSURE(rVerOffset >= 0, "Sm : Ooops...");
}
@@ -1023,11 +1023,11 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
//! not to get the root symbol but the pExtra when clicking on it in the
//! GraphicWindow. (That is because of the simplicity of the algorithm
//! that finds the node corresponding to a mouseclick in the window.)
- SmNode *pExtra = GetSubNode(0),
+ SmNode *pExtra = GetSubNode(0),
*pRootSym = GetSubNode(1),
- *pBody = GetSubNode(2);
+ *pBody = GetSubNode(2);
OSL_ENSURE(pRootSym, "Sm: NULL pointer");
- OSL_ENSURE(pBody, "Sm: NULL pointer");
+ OSL_ENSURE(pBody, "Sm: NULL pointer");
pBody->Arrange(rDev, rFormat);
@@ -1050,7 +1050,7 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pRootSym->MoveTo(aPos);
if (pExtra)
- { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100));
+ { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100));
pExtra->Arrange(rDev, rFormat);
aPos = GetExtraPos(*pRootSym, *pExtra);
@@ -1142,9 +1142,9 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pDenom->Arrange(rDev, rFormat);
long nFontHeight = GetFont().GetSize().Height(),
- nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L,
- nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L,
- nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()),
+ nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L,
+ nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L,
+ nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()),
nNumDist = bIsTextmode ? 0 :
nFontHeight * rFormat.GetDistance(DIS_NUMERATOR) / 100L,
nDenomDist = bIsTextmode ? 0 :
@@ -1156,7 +1156,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pLine->Arrange(rDev, rFormat);
// get horizontal alignment for numerator
- const SmNode *pLM = pNum->GetLeftMost();
+ const SmNode *pLM = pNum->GetLeftMost();
RectHorAlign eHorAlign = pLM->GetRectHorAlign();
// move numerator to its position
@@ -1165,7 +1165,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pNum->MoveTo(aPos);
// get horizontal alignment for denominator
- pLM = pDenom->GetLeftMost();
+ pLM = pDenom->GetLeftMost();
eHorAlign = pLM->GetRectHorAlign();
// move denominator to its position
@@ -1251,7 +1251,7 @@ USHORT GetLineIntersectionPoint(Point &rResult,
{
// hier achten wir nicht auf Rechengenauigkeit
// (das wuerde aufwendiger und lohnt sich hier kaum)
- double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X()
+ double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X()
- (rPoint1.X() - rPoint2.X()) * rHeading2.Y())
/ fDet;
rResult = Point(rPoint1.X() + (long) (fLambda * rHeading1.X()),
@@ -1264,7 +1264,7 @@ USHORT GetLineIntersectionPoint(Point &rResult,
SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken)
-: SmStructureNode(NBINDIAGONAL, rNodeToken)
+: SmStructureNode(NBINDIAGONAL, rNodeToken)
{
bAscending = FALSE;
SetNumSubNodes(3);
@@ -1275,18 +1275,18 @@ void SmBinDiagonalNode::GetOperPosSize(Point &rPos, Size &rSize,
const Point &rDiagPoint, double fAngleDeg) const
// gibt die Position und Groesse fuer den Diagonalstrich zurueck.
// Vor.: das SmRect des Nodes gibt die Begrenzung vor(!), muss also selbst
- // bereits bekannt sein.
+ // bereits bekannt sein.
{
const double fPi = 3.1415926535897932384626433;
double fAngleRad = fAngleDeg / 180.0 * fPi;
- long nRectLeft = GetItalicLeft(),
+ long nRectLeft = GetItalicLeft(),
nRectRight = GetItalicRight(),
nRectTop = GetTop(),
nRectBottom = GetBottom();
- Point aRightHdg (100, 0),
- aDownHdg (0, 100),
- aDiagHdg ( (long)(100.0 * cos(fAngleRad)),
+ Point aRightHdg (100, 0),
+ aDownHdg (0, 100),
+ aDiagHdg ( (long)(100.0 * cos(fAngleRad)),
(long)(-100.0 * sin(fAngleRad)) );
long nLeft, nRight, nTop, nBottom; // Raender des Rechtecks fuer die
@@ -1488,9 +1488,9 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
long nDelta, nDist;
// iterate over all possible sub-/supscripts
- SmRect aTmpRect (rBodyRect);
+ SmRect aTmpRect (rBodyRect);
for (int i = 0; i < SUBSUP_NUM_ENTRIES; i++)
- { SmSubSup eSubSup = (SmSubSup) i; // cast
+ { SmSubSup eSubSup = (SmSubSup) i; // cast
SmNode *pSubSup = GetSubSup(eSubSup);
if (!pSubSup)
@@ -1499,8 +1499,8 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// switch position of limits if we are in textmode
if (rFormat.IsTextmode() && (GetToken().nGroup & TGLIMIT))
switch (eSubSup)
- { case CSUB: eSubSup = RSUB; break;
- case CSUP: eSubSup = RSUP; break;
+ { case CSUB: eSubSup = RSUB; break;
+ case CSUP: eSubSup = RSUP; break;
default:
break;
}
@@ -1522,7 +1522,7 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
//! be sure that CSUB, CSUP are handled before the other cases!
switch (eSubSup)
- { case RSUB :
+ { case RSUB :
case LSUB :
if (!bIsTextmode)
nDist = nOrigHeight
@@ -1684,14 +1684,14 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pBody->Arrange(rDev, rFormat);
BOOL bIsScaleNormal = rFormat.IsScaleNormalBrackets(),
- bScale = pBody->GetHeight() > 0 &&
+ bScale = pBody->GetHeight() > 0 &&
(GetScaleMode() == SCALE_HEIGHT || bIsScaleNormal),
- bIsABS = GetToken().eType == TABS;
+ bIsABS = GetToken().eType == TABS;
long nFaceHeight = GetFont().GetSize().Height();
// Uebergroesse in % ermitteln
- USHORT nPerc = 0;
+ USHORT nPerc = 0;
if (!bIsABS && bScale)
{ // im Fall von Klammern mit Uebergroesse...
USHORT nIndex = GetScaleMode() == SCALE_HEIGHT ?
@@ -1746,7 +1746,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// damit auch "\(a\) - (a) - left ( a right )" vernuenftig aussieht
RectVerAlign eVerAlign = bScale ? RVA_CENTERY : RVA_BASELINE;
- Point aPos;
+ Point aPos;
aPos = pLeft->AlignTo(*pBody, RP_LEFT, RHA_CENTER, eVerAlign);
aPos.X() -= nDist;
pLeft->MoveTo(aPos);
@@ -1966,14 +1966,14 @@ void SmAlignNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
OSL_ENSURE(GetNumSubNodes() > 0, "Sm: missing subnode");
- SmNode *pNode = GetSubNode(0);
+ SmNode *pNode = GetSubNode(0);
RectHorAlign eHorAlign = RHA_CENTER;
switch (GetToken().eType)
{
- case TALIGNL: eHorAlign = RHA_LEFT; break;
- case TALIGNC: eHorAlign = RHA_CENTER; break;
- case TALIGNR: eHorAlign = RHA_RIGHT; break;
+ case TALIGNL: eHorAlign = RHA_LEFT; break;
+ case TALIGNC: eHorAlign = RHA_CENTER; break;
+ case TALIGNR: eHorAlign = RHA_RIGHT; break;
default:
break;
}
@@ -2003,9 +2003,9 @@ void SmAttributNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// get relative position of attribut
RectVerAlign eVerAlign;
- long nDist = 0;
+ long nDist = 0;
switch (GetToken().eType)
- { case TUNDERLINE :
+ { case TUNDERLINE :
eVerAlign = RVA_ATTRIBUT_LO;
break;
case TOVERSTRIKE :
@@ -2126,9 +2126,9 @@ void SmFontNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
int nFnt = -1;
switch (GetToken().eType)
{
- case TFIXED: nFnt = FNT_FIXED; break;
- case TSANS: nFnt = FNT_SANS; break;
- case TSERIF: nFnt = FNT_SERIF; break;
+ case TFIXED: nFnt = FNT_FIXED; break;
+ case TSANS: nFnt = FNT_SANS; break;
+ case TSERIF: nFnt = FNT_SERIF; break;
default:
break;
}
@@ -2149,7 +2149,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
OSL_ENSURE(pNode, "Sm: missing subnode");
switch (GetToken().eType)
- { case TSIZE :
+ { case TSIZE :
pNode->SetFontSize(aFontSize, nSizeType);
break;
case TSANS :
@@ -2157,22 +2157,22 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
case TFIXED :
pNode->SetFont(GetFont());
break;
- case TUNKNOWN : break; // no assertion on "font <?> <?>"
-
- case TPHANTOM : SetPhantom(TRUE); break;
- case TBOLD : SetAttribut(ATTR_BOLD); break;
- case TITALIC : SetAttribut(ATTR_ITALIC); break;
- case TNBOLD : ClearAttribut(ATTR_BOLD); break;
- case TNITALIC : ClearAttribut(ATTR_ITALIC); break;
-
- case TBLACK : SetColor(Color(COL_BLACK)); break;
- case TWHITE : SetColor(Color(COL_WHITE)); break;
- case TRED : SetColor(Color(COL_RED)); break;
- case TGREEN : SetColor(Color(COL_GREEN)); break;
- case TBLUE : SetColor(Color(COL_BLUE)); break;
- case TCYAN : SetColor(Color(COL_CYAN)); break;
- case TMAGENTA : SetColor(Color(COL_MAGENTA)); break;
- case TYELLOW : SetColor(Color(COL_YELLOW)); break;
+ case TUNKNOWN : break; // no assertion on "font <?> <?>"
+
+ case TPHANTOM : SetPhantom(TRUE); break;
+ case TBOLD : SetAttribut(ATTR_BOLD); break;
+ case TITALIC : SetAttribut(ATTR_ITALIC); break;
+ case TNBOLD : ClearAttribut(ATTR_BOLD); break;
+ case TNITALIC : ClearAttribut(ATTR_ITALIC); break;
+
+ case TBLACK : SetColor(Color(COL_BLACK)); break;
+ case TWHITE : SetColor(Color(COL_WHITE)); break;
+ case TRED : SetColor(Color(COL_RED)); break;
+ case TGREEN : SetColor(Color(COL_GREEN)); break;
+ case TBLUE : SetColor(Color(COL_BLUE)); break;
+ case TCYAN : SetColor(Color(COL_CYAN)); break;
+ case TMAGENTA : SetColor(Color(COL_MAGENTA)); break;
+ case TYELLOW : SetColor(Color(COL_YELLOW)); break;
default:
OSL_ENSURE(FALSE, "Sm: unknown case");
@@ -2195,7 +2195,7 @@ void SmFontNode::SetSizeParameter(const Fraction& rValue, USHORT Type)
SmPolyLineNode::SmPolyLineNode(const SmToken &rNodeToken)
-: SmGraphicNode(NPOLYLINE, rNodeToken)
+: SmGraphicNode(NPOLYLINE, rNodeToken)
{
aPoly.SetSize(2);
nWidth = 0;
@@ -2248,7 +2248,7 @@ void SmPolyLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aPoly.SetPoint(aPointA, 0);
aPoly.SetPoint(aPointB, 1);
- long nThick = GetFont().GetSize().Height()
+ long nThick = GetFont().GetSize().Height()
* rFormat.GetDistance(DIS_STROKEWIDTH) / 100L;
nWidth = nThick + 2 * nBorderwidth;
@@ -2296,7 +2296,7 @@ void SmRectangleNode::Arrange(const OutputDevice &rDev, const SmFormat &/*rForma
if (nHeight == 0)
nHeight = nFontHeight / 30;
if (nWidth == 0)
- nWidth = nFontHeight / 3;
+ nWidth = nFontHeight / 3;
SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE);
aTmpDev.SetFont(GetFont());
@@ -2358,7 +2358,7 @@ void SmTextNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
PrepareAttributes();
- USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ?
+ USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ?
SIZ_FUNCTION : SIZ_TEXT;
GetFont() *= Fraction (rFormat.GetRelSize(nSizeDesc), 100);
@@ -2480,7 +2480,7 @@ void SmMatrixNode::CreateTextFromNode(String &rText)
void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
- Point aPosition,
+ Point aPosition,
aOffset;
SmNode *pNode;
USHORT i, j;
@@ -2488,7 +2488,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// initialize array that is to hold the maximum widhts of all
// elements (subnodes) in that column.
long *pColWidth = new long[nNumCols];
- for (j = 0; j < nNumCols; j++)
+ for (j = 0; j < nNumCols; j++)
pColWidth[j] = 0;
// arrange subnodes and calculate the aboves arrays contents
@@ -2515,17 +2515,17 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// build array that holds the leftmost position for each column
long *pColLeft = new long[nNumCols];
long nX = 0;
- for (j = 0; j < nNumCols; j++)
- { pColLeft[j] = nX;
+ for (j = 0; j < nNumCols; j++)
+ { pColLeft[j] = nX;
nX += pColWidth[j] + nHorDist;
}
- Point aPos, aDelta;
- SmRect aLineRect;
+ Point aPos, aDelta;
+ SmRect aLineRect;
SmRect::operator = (SmRect());
- for (i = 0; i < nNumRows; i++)
- { aLineRect = SmRect();
- for (j = 0; j < nNumCols; j++)
+ for (i = 0; i < nNumRows; i++)
+ { aLineRect = SmRect();
+ for (j = 0; j < nNumCols; j++)
{ SmNode *pTmpNode = GetSubNode(i * nNumCols + j);
OSL_ENSURE(pTmpNode, "Sm: NULL pointer");
@@ -2542,7 +2542,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// caculate horizontal position of element depending on column
// and horizontal alignment
switch (eHorAlign)
- { case RHA_LEFT:
+ { case RHA_LEFT:
aPos.X() = rNodeRect.GetLeft() + pColLeft[j];
break;
case RHA_CENTER:
@@ -2564,10 +2564,10 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aPos.Y() += nVerDist;
// move 'aLineRect' and rectangles in that line to final position
- aDelta.X() = 0; // since horizontal alignment is already done
+ aDelta.X() = 0; // since horizontal alignment is already done
aDelta.Y() = aPos.Y() - aLineRect.GetTop();
aLineRect.Move(aDelta);
- for (j = 0; j < nNumCols; j++)
+ for (j = 0; j < nNumCols; j++)
if (NULL != (pNode = GetSubNode(i * nNumCols + j)))
pNode->Move(aDelta);
@@ -2596,7 +2596,7 @@ SmNode * SmMatrixNode::GetLeftMost()
SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
-: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
+: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
@@ -2684,7 +2684,7 @@ void SmMathSymbolNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
const XubString &rText = GetText();
if (rText.Len() == 0 || rText.GetChar(0) == xub_Unicode('\0'))
- { SmRect::operator = (SmRect());
+ { SmRect::operator = (SmRect());
return;
}
@@ -2726,7 +2726,7 @@ void SmRectangleNode::CreateTextFromNode(String &rText)
void SmAttributNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
OSL_ENSURE(nSize == 2, "Node missing members");
rText.Append('{');
sal_Unicode nLast=0;
@@ -2804,7 +2804,7 @@ SmSpecialNode::SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, US
SmSpecialNode::SmSpecialNode(const SmToken &rNodeToken) :
- SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig
+ SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig
{
bIsFromGreekSymbolSet = lcl_IsFromGreekSymbolSet( rNodeToken.aText );
}
@@ -2814,7 +2814,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell
{
SmNode::Prepare(rFormat, rDocShell);
- const SmSym *pSym;
+ const SmSym *pSym;
SmModule *pp = SM_MOD();
String aName( GetToken().aText.Copy(1) );
@@ -2954,8 +2954,8 @@ void SmBlankNode::IncreaseBy(const SmToken &rToken)
{
switch(rToken.eType)
{
- case TBLANK: nNum += 4; break;
- case TSBLANK: nNum += 1; break;
+ case TBLANK: nNum += 4; break;
+ case TSBLANK: nNum += 1; break;
default:
break;
}
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 4b91b23f25da..072d433c5540 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -61,10 +61,10 @@ static inline BOOL strnccmp(const String &u1, xub_StrLen nIdx,
static const sal_Unicode aDelimiterTable[] =
{
- ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#',
- '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(',
- ')', '{', '}', '[', ']', '^', '_',
- '\0' // end of list symbol
+ ' ', '\t', '\n', '\r', '+', '-', '*', '/', '=', '#',
+ '%', '\\', '"', '~', '`', '>', '<', '&', '|', '(',
+ ')', '{', '}', '[', ']', '^', '_',
+ '\0' // end of list symbol
};
@@ -76,8 +76,8 @@ static inline BOOL IsDigit( sal_Unicode cChar )
///////////////////////////////////////////////////////////////////////////
SmToken::SmToken() :
- eType (TUNKNOWN),
- cMathChar ('\0')
+ eType (TUNKNOWN),
+ cMathChar ('\0')
{
nGroup = nCol = nRow = nLevel = 0;
}
@@ -152,12 +152,12 @@ static const SmTokenTableEntry aTokenTable[] =
{ "dlarrow" , TDLARROW, MS_DLARROW, TGSTANDALONE, 5},
{ "dlrarrow" , TDLRARROW, MS_DLRARROW, TGSTANDALONE, 5},
{ "dot", TDOT, MS_DOT, TGATTRIBUT, 5},
- { "dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TGSTANDALONE, 5}, // 5 to continue expression
- { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, //
+ { "dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TGSTANDALONE, 5}, // 5 to continue expression
+ { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, //
{ "dotsdown", TDOTSDOWN, MS_DOTSDOWN, TGSTANDALONE, 5}, //
{ "dotslow", TDOTSLOW, MS_DOTSLOW, TGSTANDALONE, 5}, //
{ "dotsup", TDOTSUP, MS_DOTSUP, TGSTANDALONE, 5}, //
- { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, //
+ { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, //
{ "downarrow" , TDOWNARROW, MS_DOWNARROW, TGSTANDALONE, 5},
{ "drarrow" , TDRARROW, MS_DRARROW, TGSTANDALONE, 5},
{ "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5},
@@ -214,7 +214,7 @@ static const SmTokenTableEntry aTokenTable[] =
{ "magenta", TMAGENTA, '\0', TGCOLOR, 0},
{ "matrix", TMATRIX, '\0', 0, 5},
{ "minusplus", TMINUSPLUS, MS_MINUSPLUS, TGUNOPER | TGSUM, 5},
- { "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0
+ { "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0
{ "nabla", TNABLA, MS_NABLA, TGSTANDALONE, 5},
{ "nbold", TNBOLD, '\0', TGFONTATTR, 5},
{ "ndivides", TNDIVIDES, MS_NDIVIDES, TGRELATION, 0},
@@ -250,16 +250,16 @@ static const SmTokenTableEntry aTokenTable[] =
{ "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER | TGSUM, 5},
{ "prod", TPROD, MS_PROD, TGOPER, 5},
{ "prop", TPROP, MS_PROP, TGRELATION, 0},
- { "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression
- { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, //
- { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, //
- { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, //
- { "rdline", TRDLINE, MS_DLINE, TGRBRACES, 0}, //
+ { "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression
+ { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, //
+ { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, //
+ { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, //
+ { "rdline", TRDLINE, MS_DLINE, TGRBRACES, 0}, //
{ "red", TRED, '\0', TGCOLOR, 0},
- { "rfloor", TRFLOOR, MS_RFLOOR, TGRBRACES, 0}, //! 0 to terminate expression
+ { "rfloor", TRFLOOR, MS_RFLOOR, TGRBRACES, 0}, //! 0 to terminate expression
{ "right", TRIGHT, '\0', 0, 0},
{ "rightarrow" , TRIGHTARROW, MS_RIGHTARROW, TGSTANDALONE, 5},
- { "rline", TRLINE, MS_LINE, TGRBRACES, 0}, //! 0 to terminate expression
+ { "rline", TRLINE, MS_LINE, TGRBRACES, 0}, //! 0 to terminate expression
{ "rsub", TRSUB, '\0', TGPOWER, 0},
{ "rsup", TRSUP, '\0', TGPOWER, 0},
{ "sans", TSANS, '\0', TGFONT, 0},
@@ -405,10 +405,10 @@ void SmParser::NextToken()
{
static const String aEmptyStr;
- xub_StrLen nBufLen = BufferString.Len();
- ParseResult aRes;
- xub_StrLen nRealStart;
- BOOL bCont;
+ xub_StrLen nBufLen = BufferString.Len();
+ ParseResult aRes;
+ xub_StrLen nRealStart;
+ BOOL bCont;
BOOL bNumStart = FALSE;
CharClass aCC(SM_MOD()->GetSysLocale().GetCharClass().getLocale());
do
@@ -478,16 +478,16 @@ void SmParser::NextToken()
// set index of current token
nTokenIndex = BufferIndex;
- CurToken.nRow = Row;
- CurToken.nCol = nRealStart - ColOff + 1;
+ CurToken.nRow = Row;
+ CurToken.nCol = nRealStart - ColOff + 1;
BOOL bHandled = TRUE;
if (nRealStart >= nBufLen)
{
- CurToken.eType = TEND;
+ CurToken.eType = TEND;
CurToken.cMathChar = '\0';
- CurToken.nGroup = 0;
- CurToken.nLevel = 0;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 0;
CurToken.aText.Erase();
}
else if ((aRes.TokenType & (KParseType::ASC_NUMBER | KParseType::UNI_NUMBER))
@@ -514,7 +514,7 @@ void SmParser::NextToken()
CurToken.cMathChar = '\0';
CurToken.nGroup = 0;
CurToken.nLevel = 5;
- CurToken.aText = aRes.DequotedNameOrString;
+ CurToken.aText = aRes.DequotedNameOrString;
CurToken.nRow = Row;
CurToken.nCol = nRealStart - ColOff + 2;
}
@@ -551,10 +551,10 @@ void SmParser::NextToken()
}
else if (aRes.TokenType == 0 && '_' == BufferString.GetChar( nRealStart ))
{
- CurToken.eType = TRSUB;
+ CurToken.eType = TRSUB;
CurToken.cMathChar = '\0';
- CurToken.nGroup = TGPOWER;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGPOWER;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "_" );
aRes.EndPos = nRealStart + 1;
@@ -574,10 +574,10 @@ void SmParser::NextToken()
if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "<<" ))
{
- CurToken.eType = TLL;
+ CurToken.eType = TLL;
CurToken.cMathChar = MS_LL;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "<<" );
rnEndPos = nRealStart + 2;
@@ -585,10 +585,10 @@ void SmParser::NextToken()
else if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "<=" ))
{
- CurToken.eType = TLE;
+ CurToken.eType = TLE;
CurToken.cMathChar = MS_LE;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "<=" );
rnEndPos = nRealStart + 2;
@@ -596,10 +596,10 @@ void SmParser::NextToken()
else if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "<>" ))
{
- CurToken.eType = TNEQ;
+ CurToken.eType = TNEQ;
CurToken.cMathChar = MS_NEQ;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "<>" );
rnEndPos = nRealStart + 2;
@@ -607,20 +607,20 @@ void SmParser::NextToken()
else if (BufferString.Copy( nRealStart, 3 ).
EqualsAscii( "<?>" ))
{
- CurToken.eType = TPLACE;
+ CurToken.eType = TPLACE;
CurToken.cMathChar = MS_PLACE;
- CurToken.nGroup = 0;
- CurToken.nLevel = 5;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "<?>" );
rnEndPos = nRealStart + 3;
}
else
{
- CurToken.eType = TLT;
+ CurToken.eType = TLT;
CurToken.cMathChar = MS_LT;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "<" );
}
}
@@ -630,10 +630,10 @@ void SmParser::NextToken()
if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( ">=" ))
{
- CurToken.eType = TGE;
+ CurToken.eType = TGE;
CurToken.cMathChar = MS_GE;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( ">=" );
rnEndPos = nRealStart + 2;
@@ -641,20 +641,20 @@ void SmParser::NextToken()
else if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( ">>" ))
{
- CurToken.eType = TGG;
+ CurToken.eType = TGG;
CurToken.cMathChar = MS_GG;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( ">>" );
rnEndPos = nRealStart + 2;
}
else
{
- CurToken.eType = TGT;
+ CurToken.eType = TGT;
CurToken.cMathChar = MS_GT;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( ">" );
}
}
@@ -727,82 +727,82 @@ void SmParser::NextToken()
break;
case '[':
{
- CurToken.eType = TLBRACKET;
+ CurToken.eType = TLBRACKET;
CurToken.cMathChar = MS_LBRACKET;
- CurToken.nGroup = TGLBRACES;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGLBRACES;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "[" );
}
break;
case '\\':
{
- CurToken.eType = TESCAPE;
+ CurToken.eType = TESCAPE;
CurToken.cMathChar = '\0';
- CurToken.nGroup = 0;
- CurToken.nLevel = 5;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "\\" );
}
break;
case ']':
{
- CurToken.eType = TRBRACKET;
+ CurToken.eType = TRBRACKET;
CurToken.cMathChar = MS_RBRACKET;
- CurToken.nGroup = TGRBRACES;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRBRACES;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "]" );
}
break;
case '^':
{
- CurToken.eType = TRSUP;
+ CurToken.eType = TRSUP;
CurToken.cMathChar = '\0';
- CurToken.nGroup = TGPOWER;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGPOWER;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "^" );
}
break;
case '`':
{
- CurToken.eType = TSBLANK;
+ CurToken.eType = TSBLANK;
CurToken.cMathChar = '\0';
- CurToken.nGroup = TGBLANK;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGBLANK;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "`" );
}
break;
case '{':
{
- CurToken.eType = TLGROUP;
+ CurToken.eType = TLGROUP;
CurToken.cMathChar = MS_LBRACE;
- CurToken.nGroup = 0;
- CurToken.nLevel = 5;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "{" );
}
break;
case '|':
{
- CurToken.eType = TOR;
+ CurToken.eType = TOR;
CurToken.cMathChar = MS_OR;
- CurToken.nGroup = TGSUM;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGSUM;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "|" );
}
break;
case '}':
{
- CurToken.eType = TRGROUP;
+ CurToken.eType = TRGROUP;
CurToken.cMathChar = MS_RBRACE;
- CurToken.nGroup = 0;
- CurToken.nLevel = 0;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "}" );
}
break;
case '~':
{
- CurToken.eType = TBLANK;
+ CurToken.eType = TBLANK;
CurToken.cMathChar = '\0';
- CurToken.nGroup = TGBLANK;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGBLANK;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "~" );
}
break;
@@ -811,57 +811,57 @@ void SmParser::NextToken()
if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "##" ))
{
- CurToken.eType = TDPOUND;
+ CurToken.eType = TDPOUND;
CurToken.cMathChar = '\0';
- CurToken.nGroup = 0;
- CurToken.nLevel = 0;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "##" );
rnEndPos = nRealStart + 2;
}
else
{
- CurToken.eType = TPOUND;
+ CurToken.eType = TPOUND;
CurToken.cMathChar = '\0';
- CurToken.nGroup = 0;
- CurToken.nLevel = 0;
+ CurToken.nGroup = 0;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "#" );
}
}
break;
case '&':
{
- CurToken.eType = TAND;
+ CurToken.eType = TAND;
CurToken.cMathChar = MS_AND;
- CurToken.nGroup = TGPRODUCT;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGPRODUCT;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "&" );
}
break;
case '(':
{
- CurToken.eType = TLPARENT;
+ CurToken.eType = TLPARENT;
CurToken.cMathChar = MS_LPARENT;
- CurToken.nGroup = TGLBRACES;
- CurToken.nLevel = 5; //! 0 to continue expression
+ CurToken.nGroup = TGLBRACES;
+ CurToken.nLevel = 5; //! 0 to continue expression
CurToken.aText.AssignAscii( "(" );
}
break;
case ')':
{
- CurToken.eType = TRPARENT;
+ CurToken.eType = TRPARENT;
CurToken.cMathChar = MS_RPARENT;
- CurToken.nGroup = TGRBRACES;
- CurToken.nLevel = 0; //! 0 to terminate expression
+ CurToken.nGroup = TGRBRACES;
+ CurToken.nLevel = 0; //! 0 to terminate expression
CurToken.aText.AssignAscii( ")" );
}
break;
case '*':
{
- CurToken.eType = TMULTIPLY;
+ CurToken.eType = TMULTIPLY;
CurToken.cMathChar = MS_MULTIPLY;
- CurToken.nGroup = TGPRODUCT;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGPRODUCT;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "*" );
}
break;
@@ -870,20 +870,20 @@ void SmParser::NextToken()
if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "+-" ))
{
- CurToken.eType = TPLUSMINUS;
+ CurToken.eType = TPLUSMINUS;
CurToken.cMathChar = MS_PLUSMINUS;
- CurToken.nGroup = TGUNOPER | TGSUM;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGUNOPER | TGSUM;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "+-" );
rnEndPos = nRealStart + 2;
}
else
{
- CurToken.eType = TPLUS;
+ CurToken.eType = TPLUS;
CurToken.cMathChar = MS_PLUS;
- CurToken.nGroup = TGUNOPER | TGSUM;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGUNOPER | TGSUM;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "+" );
}
}
@@ -893,20 +893,20 @@ void SmParser::NextToken()
if (BufferString.Copy( nRealStart, 2 ).
EqualsAscii( "-+" ))
{
- CurToken.eType = TMINUSPLUS;
+ CurToken.eType = TMINUSPLUS;
CurToken.cMathChar = MS_MINUSPLUS;
- CurToken.nGroup = TGUNOPER | TGSUM;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGUNOPER | TGSUM;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "-+" );
rnEndPos = nRealStart + 2;
}
else
{
- CurToken.eType = TMINUS;
+ CurToken.eType = TMINUS;
CurToken.cMathChar = MS_MINUS;
- CurToken.nGroup = TGUNOPER | TGSUM;
- CurToken.nLevel = 5;
+ CurToken.nGroup = TGUNOPER | TGSUM;
+ CurToken.nLevel = 5;
CurToken.aText.AssignAscii( "-" );
}
}
@@ -918,7 +918,7 @@ void SmParser::NextToken()
// will be treated as numbers
CurToken.eType = TNUMBER;
CurToken.cMathChar = '\0';
- CurToken.nGroup = 0;
+ CurToken.nGroup = 0;
CurToken.nLevel = 5;
xub_StrLen nTxtStart = BufferIndex;
@@ -936,19 +936,19 @@ void SmParser::NextToken()
break;
case '/':
{
- CurToken.eType = TDIVIDEBY;
+ CurToken.eType = TDIVIDEBY;
CurToken.cMathChar = MS_SLASH;
- CurToken.nGroup = TGPRODUCT;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGPRODUCT;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "/" );
}
break;
case '=':
{
- CurToken.eType = TASSIGN;
+ CurToken.eType = TASSIGN;
CurToken.cMathChar = MS_ASSIGN;
- CurToken.nGroup = TGRELATION;
- CurToken.nLevel = 0;
+ CurToken.nGroup = TGRELATION;
+ CurToken.nLevel = 0;
CurToken.aText.AssignAscii( "=" );
}
break;
@@ -1019,14 +1019,14 @@ void SmParser::Align()
if (CONVERT_40_TO_50 == GetConversion())
// encapsulate expression to be aligned in group braces
// (here group-open brace)
- { Insert('{', GetTokenIndex());
+ { Insert('{', GetTokenIndex());
bNeedGroupClose = TRUE;
// get first valid align statement in sequence
// (the dominant one in 4.0) and erase all others (especially old
// discarded tokens) from command string.
while (TokenInGroup(TGALIGN))
- { if (TokenInGroup(TGDISCARDED) || pSNode)
+ { if (TokenInGroup(TGDISCARDED) || pSNode)
{ BufferIndex = GetTokenIndex();
BufferString.Erase(BufferIndex, CurToken.aText.Len());
}
@@ -1044,7 +1044,7 @@ void SmParser::Align()
// allow for just one align statement in 5.0
if (CONVERT_40_TO_50 != GetConversion() && TokenInGroup(TGALIGN))
- { Error(PE_DOUBLE_ALIGN);
+ { Error(PE_DOUBLE_ALIGN);
return;
}
}
@@ -1056,7 +1056,7 @@ void SmParser::Align()
Insert('}', GetTokenIndex());
if (pSNode)
- { pSNode->SetSubNodes(NodeStack.Pop(), 0);
+ { pSNode->SetSubNodes(NodeStack.Pop(), 0);
NodeStack.Push(pSNode);
}
}
@@ -1073,7 +1073,7 @@ void SmParser::Line()
// (and go on with expressions that must not have alignment
// statements in 'while' loop below. See also 'Expression()'.)
if (CurToken.eType != TEND && CurToken.eType != TNEWLINE)
- { Align();
+ { Align();
ExpressionArray.resize(++n);
ExpressionArray[n - 1] = NodeStack.Pop();
}
@@ -1112,7 +1112,7 @@ void SmParser::Expression()
NodeStack.Push(pNode); // push the node from above again (now to be used as argument to this current 'nospace' node)
}
- USHORT n = 0;
+ USHORT n = 0;
SmNodeArray RelationArray;
RelationArray.resize(n);
@@ -1122,7 +1122,7 @@ void SmParser::Expression()
RelationArray[n - 1] = NodeStack.Pop();
while (CurToken.nLevel >= 4)
- { Relation();
+ { Relation();
RelationArray.resize(++n);
RelationArray[n - 1] = NodeStack.Pop();
}
@@ -1177,7 +1177,7 @@ void SmParser::Product()
Power();
while (TokenInGroup(TGPRODUCT))
- { SmStructureNode *pSNode;
+ { SmStructureNode *pSNode;
SmNode *pFirst = NodeStack.Pop(),
*pOper;
BOOL bSwitchArgs = FALSE;
@@ -1272,7 +1272,7 @@ void SmParser::SubSup(ULONG nActiveGroup)
// process all sub-/supscripts
int nIndex = 0;
while (TokenInGroup(nActiveGroup))
- { SmTokenType eType (CurToken.eType);
+ { SmTokenType eType (CurToken.eType);
// skip sub-/supscript token
NextToken();
@@ -1287,19 +1287,19 @@ void SmParser::SubSup(ULONG nActiveGroup)
Term();
switch (eType)
- { case TRSUB : nIndex = (int) RSUB; break;
- case TRSUP : nIndex = (int) RSUP; break;
+ { case TRSUB : nIndex = (int) RSUB; break;
+ case TRSUP : nIndex = (int) RSUP; break;
case TFROM :
- case TCSUB : nIndex = (int) CSUB; break;
+ case TCSUB : nIndex = (int) CSUB; break;
case TTO :
- case TCSUP : nIndex = (int) CSUP; break;
- case TLSUB : nIndex = (int) LSUB; break;
- case TLSUP : nIndex = (int) LSUP; break;
+ case TCSUP : nIndex = (int) CSUP; break;
+ case TLSUB : nIndex = (int) LSUB; break;
+ case TLSUP : nIndex = (int) LSUP; break;
default :
OSL_ENSURE(FALSE, "Sm: unknown case");
}
nIndex++;
- OSL_ENSURE(1 <= nIndex && nIndex <= 1 + SUBSUP_NUM_ENTRIES,
+ OSL_ENSURE(1 <= nIndex && nIndex <= 1 + SUBSUP_NUM_ENTRIES,
"SmParser::Power() : sub-/supscript index falsch");
// set sub-/supscript if not already done
@@ -1488,17 +1488,17 @@ void SmParser::Term()
default:
if (TokenInGroup(TGLBRACES))
- { Brace();
+ { Brace();
}
else if (TokenInGroup(TGOPER))
- { Operator();
+ { Operator();
}
else if (TokenInGroup(TGUNOPER))
- { UnOper();
+ { UnOper();
}
else if ( TokenInGroup(TGATTRIBUT)
|| TokenInGroup(TGFONTATTR))
- { SmStructureNodeArray aArray;
+ { SmStructureNodeArray aArray;
BOOL bIsAttr;
USHORT n = 0;
@@ -1530,9 +1530,9 @@ void SmParser::Term()
}
else if (TokenInGroup(TGFUNCTION))
{ if (CONVERT_40_TO_50 != GetConversion())
- { Function();
+ { Function();
}
- else // encapsulate old 4.0 style parsing in braces
+ else // encapsulate old 4.0 style parsing in braces
{
// insert opening brace
Insert('{', GetTokenIndex());
@@ -1545,10 +1545,10 @@ void SmParser::Term()
SmNode *pFunc = NodeStack.Pop();
if (CurToken.eType == TLPARENT)
- { Term();
+ { Term();
}
else
- { Align();
+ { Align();
}
// insert closing brace
@@ -1569,28 +1569,28 @@ void SmParser::Escape()
{
NextToken();
- sal_Unicode cChar;
+ sal_Unicode cChar;
switch (CurToken.eType)
- { case TLPARENT : cChar = MS_LPARENT; break;
- case TRPARENT : cChar = MS_RPARENT; break;
- case TLBRACKET : cChar = MS_LBRACKET; break;
- case TRBRACKET : cChar = MS_RBRACKET; break;
+ { case TLPARENT : cChar = MS_LPARENT; break;
+ case TRPARENT : cChar = MS_RPARENT; break;
+ case TLBRACKET : cChar = MS_LBRACKET; break;
+ case TRBRACKET : cChar = MS_RBRACKET; break;
case TLDBRACKET : cChar = MS_LDBRACKET; break;
case TRDBRACKET : cChar = MS_RDBRACKET; break;
case TLBRACE :
- case TLGROUP : cChar = MS_LBRACE; break;
+ case TLGROUP : cChar = MS_LBRACE; break;
case TRBRACE :
- case TRGROUP : cChar = MS_RBRACE; break;
- case TLANGLE : cChar = MS_LANGLE; break;
- case TRANGLE : cChar = MS_RANGLE; break;
- case TLCEIL : cChar = MS_LCEIL; break;
- case TRCEIL : cChar = MS_RCEIL; break;
- case TLFLOOR : cChar = MS_LFLOOR; break;
- case TRFLOOR : cChar = MS_RFLOOR; break;
+ case TRGROUP : cChar = MS_RBRACE; break;
+ case TLANGLE : cChar = MS_LANGLE; break;
+ case TRANGLE : cChar = MS_RANGLE; break;
+ case TLCEIL : cChar = MS_LCEIL; break;
+ case TRCEIL : cChar = MS_RCEIL; break;
+ case TLFLOOR : cChar = MS_LFLOOR; break;
+ case TRFLOOR : cChar = MS_RFLOOR; break;
case TLLINE :
- case TRLINE : cChar = MS_LINE; break;
+ case TRLINE : cChar = MS_LINE; break;
case TLDLINE :
- case TRDLINE : cChar = MS_DLINE; break;
+ case TRDLINE : cChar = MS_DLINE; break;
default:
Error(PE_UNEXPECTED_TOKEN);
}
@@ -1605,7 +1605,7 @@ void SmParser::Escape()
void SmParser::Operator()
{
if (TokenInGroup(TGOPER))
- { SmStructureNode *pSNode = new SmOperNode(CurToken);
+ { SmStructureNode *pSNode = new SmOperNode(CurToken);
// put operator on top of stack
Oper();
@@ -1649,9 +1649,9 @@ void SmParser::Oper()
const sal_Char* pLim = 0;
switch (eType)
{
- case TLIM : pLim = "lim"; break;
- case TLIMSUP : pLim = "lim sup"; break;
- case TLIMINF : pLim = "lim inf"; break;
+ case TLIM : pLim = "lim"; break;
+ case TLIMSUP : pLim = "lim sup"; break;
+ case TLIMINF : pLim = "lim inf"; break;
default:
break;
}
@@ -1686,9 +1686,9 @@ void SmParser::UnOper()
{
OSL_ENSURE(TokenInGroup(TGUNOPER), "Sm: wrong token");
- SmToken aNodeToken = CurToken;
- SmTokenType eType = CurToken.eType;
- BOOL bIsPostfix = eType == TFACT;
+ SmToken aNodeToken = CurToken;
+ SmTokenType eType = CurToken.eType;
+ BOOL bIsPostfix = eType == TFACT;
SmStructureNode *pSNode;
SmNode *pOper = 0,
@@ -1736,7 +1736,7 @@ void SmParser::UnOper()
pArg = NodeStack.Pop();
if (eType == TABS)
- { pSNode = new SmBraceNode(aNodeToken);
+ { pSNode = new SmBraceNode(aNodeToken);
pSNode->SetScaleMode(SCALE_HEIGHT);
// build nodes for left & right lines
@@ -1753,12 +1753,12 @@ void SmParser::UnOper()
pSNode->SetSubNodes(pLeft, pArg, pRight);
}
else if (eType == TSQRT || eType == TNROOT)
- { pSNode = new SmRootNode(aNodeToken);
+ { pSNode = new SmRootNode(aNodeToken);
pOper = new SmRootSymbolNode(aNodeToken);
pSNode->SetSubNodes(pExtra, pOper, pArg);
}
else
- { pSNode = new SmUnHorNode(aNodeToken);
+ { pSNode = new SmUnHorNode(aNodeToken);
if (bIsPostfix)
pSNode->SetSubNodes(pArg, pOper);
@@ -1775,13 +1775,13 @@ void SmParser::Attribut()
{
OSL_ENSURE(TokenInGroup(TGATTRIBUT), "Sm: wrong token group");
- SmStructureNode *pSNode = new SmAttributNode(CurToken);
- SmNode *pAttr;
+ SmStructureNode *pSNode = new SmAttributNode(CurToken);
+ SmNode *pAttr;
SmScaleMode eScaleMode = SCALE_NONE;
// get appropriate node for the attribut itself
switch (CurToken.eType)
- { case TUNDERLINE :
+ { case TUNDERLINE :
case TOVERLINE :
case TOVERSTRIKE :
pAttr = new SmRectangleNode(CurToken);
@@ -1847,10 +1847,10 @@ void SmParser::Color()
// last color rules, get that one
SmToken aToken;
do
- { NextToken();
+ { NextToken();
if (TokenInGroup(TGCOLOR))
- { aToken = CurToken;
+ { aToken = CurToken;
NextToken();
}
else
@@ -1868,10 +1868,10 @@ void SmParser::Font()
// last font rules, get that one
SmToken aToken;
do
- { NextToken();
+ { NextToken();
if (TokenInGroup(TGFONT))
- { aToken = CurToken;
+ { aToken = CurToken;
NextToken();
}
else
@@ -1908,18 +1908,18 @@ void SmParser::FontSize()
{
OSL_ENSURE(CurToken.eType == TSIZE, "Sm : Ooops...");
- USHORT Type;
+ USHORT Type;
SmFontNode *pFontNode = new SmFontNode(CurToken);
NextToken();
switch (CurToken.eType)
{
- case TNUMBER: Type = FNTSIZ_ABSOLUT; break;
- case TPLUS: Type = FNTSIZ_PLUS; break;
- case TMINUS: Type = FNTSIZ_MINUS; break;
- case TMULTIPLY: Type = FNTSIZ_MULTIPLY; break;
- case TDIVIDEBY: Type = FNTSIZ_DIVIDE; break;
+ case TNUMBER: Type = FNTSIZ_ABSOLUT; break;
+ case TPLUS: Type = FNTSIZ_PLUS; break;
+ case TMINUS: Type = FNTSIZ_MINUS; break;
+ case TMULTIPLY: Type = FNTSIZ_MULTIPLY; break;
+ case TDIVIDEBY: Type = FNTSIZ_DIVIDE; break;
default:
delete pFontNode;
@@ -1986,7 +1986,7 @@ void SmParser::Brace()
SmParseError eError = PE_NONE;
if (CurToken.eType == TLEFT)
- { NextToken();
+ { NextToken();
eScaleMode = SCALE_HEIGHT;
@@ -2000,7 +2000,7 @@ void SmParser::Brace()
pBody = NodeStack.Pop();
if (CurToken.eType == TRIGHT)
- { NextToken();
+ { NextToken();
// check for right bracket
if (TokenInGroup(TGLBRACES) || TokenInGroup(TGRBRACES))
@@ -2029,15 +2029,15 @@ void SmParser::Brace()
SmTokenType eExpectedType = TUNKNOWN;
switch (pLeft->GetToken().eType)
- { case TLPARENT : eExpectedType = TRPARENT; break;
- case TLBRACKET : eExpectedType = TRBRACKET; break;
- case TLBRACE : eExpectedType = TRBRACE; break;
- case TLDBRACKET : eExpectedType = TRDBRACKET; break;
- case TLLINE : eExpectedType = TRLINE; break;
- case TLDLINE : eExpectedType = TRDLINE; break;
- case TLANGLE : eExpectedType = TRANGLE; break;
- case TLFLOOR : eExpectedType = TRFLOOR; break;
- case TLCEIL : eExpectedType = TRCEIL; break;
+ { case TLPARENT : eExpectedType = TRPARENT; break;
+ case TLBRACKET : eExpectedType = TRBRACKET; break;
+ case TLBRACE : eExpectedType = TRBRACE; break;
+ case TLDBRACKET : eExpectedType = TRDBRACKET; break;
+ case TLLINE : eExpectedType = TRLINE; break;
+ case TLDLINE : eExpectedType = TRDLINE; break;
+ case TLANGLE : eExpectedType = TRANGLE; break;
+ case TLFLOOR : eExpectedType = TRFLOOR; break;
+ case TLCEIL : eExpectedType = TRCEIL; break;
default :
OSL_ENSURE(0, "Sm: unknown case");
}
@@ -2062,7 +2062,7 @@ void SmParser::Brace()
NodeStack.Push(pSNode);
}
else
- { delete pSNode;
+ { delete pSNode;
delete pBody;
delete pLeft;
delete pRight;
@@ -2075,8 +2075,8 @@ void SmParser::Brace()
void SmParser::Bracebody(BOOL bIsLeftRight)
{
SmStructureNode *pBody = new SmBracebodyNode(CurToken);
- SmNodeArray aNodes;
- USHORT nNum = 0;
+ SmNodeArray aNodes;
+ USHORT nNum = 0;
// get body if any
if (bIsLeftRight)
@@ -2090,7 +2090,7 @@ void SmParser::Bracebody(BOOL bIsLeftRight)
nNum++;
}
else if (CurToken.eType != TRIGHT)
- { Align();
+ { Align();
nNum++;
if (CurToken.eType != TMLINE && CurToken.eType != TRIGHT)
@@ -2109,7 +2109,7 @@ void SmParser::Bracebody(BOOL bIsLeftRight)
nNum++;
}
else if (!TokenInGroup(TGRBRACES))
- { Align();
+ { Align();
nNum++;
if (CurToken.eType != TMLINE && !TokenInGroup(TGRBRACES))
@@ -2134,7 +2134,7 @@ void SmParser::Function()
switch (CurToken.eType)
{
case TFUNC:
- NextToken(); // skip "FUNC"-statement
+ NextToken(); // skip "FUNC"-statement
// fall through
case TSIN :
@@ -2169,7 +2169,7 @@ void SmParser::Function()
void SmParser::Binom()
{
SmNodeArray ExpressionArray;
- SmStructureNode *pSNode = new SmTableNode(CurToken);
+ SmStructureNode *pSNode = new SmTableNode(CurToken);
NextToken();
@@ -2371,7 +2371,7 @@ void SmParser::GlyphSpecial()
void SmParser::Error(SmParseError eError)
{
SmStructureNode *pSNode = new SmExpressionNode(CurToken);
- SmErrorNode *pErr = new SmErrorNode(eError, CurToken);
+ SmErrorNode *pErr = new SmErrorNode(eError, CurToken);
pSNode->SetSubNodes(pErr, 0);
//! put a structure node on the stack (instead of the error node itself)
@@ -2402,9 +2402,9 @@ SmNode *SmParser::Parse(const String &rBuffer)
BufferString.ConvertLineEnd( LINEEND_LF );
BufferIndex = 0;
nTokenIndex = 0;
- Row = 1;
- ColOff = 0;
- CurError = -1;
+ Row = 1;
+ ColOff = 0;
+ CurError = -1;
for (USHORT i = 0; i < ErrDescList.Count(); i++)
delete ErrDescList.Remove(i);
@@ -2456,19 +2456,19 @@ USHORT SmParser::AddError(SmParseError Type, SmNode *pNode)
USHORT nRID;
switch (Type)
{
- case PE_UNEXPECTED_CHAR: nRID = RID_ERR_UNEXPECTEDCHARACTER; break;
- case PE_LGROUP_EXPECTED: nRID = RID_ERR_LGROUPEXPECTED; break;
- case PE_RGROUP_EXPECTED: nRID = RID_ERR_RGROUPEXPECTED; break;
- case PE_LBRACE_EXPECTED: nRID = RID_ERR_LBRACEEXPECTED; break;
- case PE_RBRACE_EXPECTED: nRID = RID_ERR_RBRACEEXPECTED; break;
- case PE_FUNC_EXPECTED: nRID = RID_ERR_FUNCEXPECTED; break;
- case PE_UNOPER_EXPECTED: nRID = RID_ERR_UNOPEREXPECTED; break;
- case PE_BINOPER_EXPECTED: nRID = RID_ERR_BINOPEREXPECTED; break;
- case PE_SYMBOL_EXPECTED: nRID = RID_ERR_SYMBOLEXPECTED; break;
- case PE_IDENTIFIER_EXPECTED: nRID = RID_ERR_IDENTEXPECTED; break;
- case PE_POUND_EXPECTED: nRID = RID_ERR_POUNDEXPECTED; break;
- case PE_COLOR_EXPECTED: nRID = RID_ERR_COLOREXPECTED; break;
- case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED; break;
+ case PE_UNEXPECTED_CHAR: nRID = RID_ERR_UNEXPECTEDCHARACTER; break;
+ case PE_LGROUP_EXPECTED: nRID = RID_ERR_LGROUPEXPECTED; break;
+ case PE_RGROUP_EXPECTED: nRID = RID_ERR_RGROUPEXPECTED; break;
+ case PE_LBRACE_EXPECTED: nRID = RID_ERR_LBRACEEXPECTED; break;
+ case PE_RBRACE_EXPECTED: nRID = RID_ERR_RBRACEEXPECTED; break;
+ case PE_FUNC_EXPECTED: nRID = RID_ERR_FUNCEXPECTED; break;
+ case PE_UNOPER_EXPECTED: nRID = RID_ERR_UNOPEREXPECTED; break;
+ case PE_BINOPER_EXPECTED: nRID = RID_ERR_BINOPEREXPECTED; break;
+ case PE_SYMBOL_EXPECTED: nRID = RID_ERR_SYMBOLEXPECTED; break;
+ case PE_IDENTIFIER_EXPECTED: nRID = RID_ERR_IDENTEXPECTED; break;
+ case PE_POUND_EXPECTED: nRID = RID_ERR_POUNDEXPECTED; break;
+ case PE_COLOR_EXPECTED: nRID = RID_ERR_COLOREXPECTED; break;
+ case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED; break;
default:
nRID = RID_ERR_UNKOWN;
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 895bb0a18186..228d5c09a557 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -2,7 +2,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
@@ -108,15 +108,15 @@ SmRect::SmRect()
SmRect::SmRect(const SmRect &rRect)
-: aTopLeft(rRect.aTopLeft),
+: aTopLeft(rRect.aTopLeft),
aSize(rRect.aSize)
{
bHasBaseline = rRect.bHasBaseline;
- nBaseline = rRect.nBaseline;
- nAlignT = rRect.nAlignT;
- nAlignM = rRect.nAlignM;
- nAlignB = rRect.nAlignB;
- nGlyphTop = rRect.nGlyphTop;
+ nBaseline = rRect.nBaseline;
+ nAlignT = rRect.nAlignT;
+ nAlignM = rRect.nAlignM;
+ nAlignB = rRect.nAlignB;
+ nGlyphTop = rRect.nGlyphTop;
nGlyphBottom = rRect.nGlyphBottom;
nHiAttrFence = rRect.nHiAttrFence;
nLoAttrFence = rRect.nLoAttrFence;
@@ -129,14 +129,14 @@ SmRect::SmRect(const SmRect &rRect)
void SmRect::CopyAlignInfo(const SmRect &rRect)
{
- nBaseline = rRect.nBaseline;
- bHasBaseline = rRect.bHasBaseline;
- nAlignT = rRect.nAlignT;
- nAlignM = rRect.nAlignM;
- nAlignB = rRect.nAlignB;
+ nBaseline = rRect.nBaseline;
+ bHasBaseline = rRect.bHasBaseline;
+ nAlignT = rRect.nAlignT;
+ nAlignM = rRect.nAlignM;
+ nAlignB = rRect.nAlignB;
bHasAlignInfo = rRect.bHasAlignInfo;
- nLoAttrFence = rRect.nLoAttrFence;
- nHiAttrFence = rRect.nHiAttrFence;
+ nLoAttrFence = rRect.nLoAttrFence;
+ nHiAttrFence = rRect.nHiAttrFence;
}
@@ -149,25 +149,25 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
const FontMetric aFM (rDev.GetFontMetric());
BOOL bIsMath = aFM.GetName().EqualsIgnoreCaseAscii( FONTNAME_MATH );
- BOOL bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
- const long nFontHeight = rDev.GetFont().GetSize().Height();
+ BOOL bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
+ const long nFontHeight = rDev.GetFont().GetSize().Height();
nBorderWidth = nBorder;
bHasAlignInfo = TRUE;
bHasBaseline = TRUE;
- nBaseline = aFM.GetAscent();
- nAlignT = nBaseline - nFontHeight * 750L / 1000L;
- nAlignM = nBaseline - nFontHeight * 121L / 422L;
+ nBaseline = aFM.GetAscent();
+ nAlignT = nBaseline - nFontHeight * 750L / 1000L;
+ nAlignM = nBaseline - nFontHeight * 121L / 422L;
// that's where the horizontal bars of '+', '-', ... are
// (1/3 of ascent over baseline)
// (121 = 1/3 of 12pt ascent, 422 = 12pt fontheight)
- nAlignB = nBaseline;
+ nAlignB = nBaseline;
// workaround for printer fonts with very small (possible 0 or even
// negative(!)) leading
if (aFM.GetIntLeading() < 5 && rDev.GetOutDevType() == OUTDEV_PRINTER)
{
- OutputDevice *pWindow = Application::GetDefaultDevice();
+ OutputDevice *pWindow = Application::GetDefaultDevice();
pWindow->Push(PUSH_MAPMODE | PUSH_FONT);
@@ -176,7 +176,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
long nDelta = pWindow->GetFontMetric().GetIntLeading();
if (nDelta == 0)
- { // dieser Wert entspricht etwa einem Leading von 80 bei einer
+ { // dieser Wert entspricht etwa einem Leading von 80 bei einer
// Fonthoehe von 422 (12pt)
nDelta = nFontHeight * 8L / 43;
}
@@ -258,16 +258,16 @@ SmRect::SmRect(long nWidth, long nHeight)
// it will not provide useful values for baseline, AlignT and AlignB!
// It's purpose is to get a 'SmRect' for the horizontal line in fractions
// as used in 'SmBinVerNode'.
-: aSize(nWidth, nHeight)
+: aSize(nWidth, nHeight)
{
OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: ooops...");
bHasBaseline = FALSE;
bHasAlignInfo = TRUE;
- nBaseline = 0;
- nAlignT = GetTop();
- nAlignB = GetBottom();
- nAlignM = (nAlignT + nAlignB) / 2; // this is the default
+ nBaseline = 0;
+ nAlignT = GetTop();
+ nAlignB = GetBottom();
+ nAlignM = (nAlignT + nAlignB) / 2; // this is the default
nItalicLeftSpace = nItalicRightSpace = 0;
nGlyphTop = nHiAttrFence = GetTop();
nGlyphBottom = nLoAttrFence = GetBottom();
@@ -278,7 +278,7 @@ SmRect::SmRect(long nWidth, long nHeight)
void SmRect::SetLeft(long nLeft)
{
if (nLeft <= GetRight())
- { aSize.Width() = GetRight() - nLeft + 1;
+ { aSize.Width() = GetRight() - nLeft + 1;
aTopLeft.X() = nLeft;
}
}
@@ -301,7 +301,7 @@ void SmRect::SetBottom(long nBottom)
void SmRect::SetTop(long nTop)
{
if (nTop <= GetBottom())
- { aSize.Height() = GetBottom() - nTop + 1;
+ { aSize.Height() = GetBottom() - nTop + 1;
aTopLeft.Y() = nTop;
}
}
@@ -315,7 +315,7 @@ void SmRect::Move(const Point &rPosition)
long nDelta = rPosition.Y();
nBaseline += nDelta;
nAlignT += nDelta;
- nAlignM += nDelta;
+ nAlignM += nDelta;
nAlignB += nDelta;
nGlyphTop += nDelta;
nGlyphBottom += nDelta;
@@ -326,13 +326,13 @@ void SmRect::Move(const Point &rPosition)
const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
RectHorAlign eHor, RectVerAlign eVer) const
-{ Point aPos (GetTopLeft());
+{ Point aPos (GetTopLeft());
// will become the topleft point of the new rectangle position
// set horizontal or vertical new rectangle position depending on
// 'ePos' is one of 'RP_LEFT', 'RP_RIGHT' or 'RP_TOP', 'RP_BOTTOM'
switch (ePos)
- { case RP_LEFT :
+ { case RP_LEFT :
aPos.X() = rRect.GetItalicLeft() - GetItalicRightSpace()
- GetWidth();
break;
@@ -357,7 +357,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
if (ePos == RP_LEFT || ePos == RP_RIGHT || ePos == RP_ATTRIBUT)
// correct error in current vertical position
switch (eVer)
- { case RVA_TOP :
+ { case RVA_TOP :
aPos.Y() += rRect.GetAlignT() - GetAlignT();
break;
case RVA_MID :
@@ -391,10 +391,10 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
}
// check if vertical position is already set
- if (ePos == RP_TOP || ePos == RP_BOTTOM)
+ if (ePos == RP_TOP || ePos == RP_BOTTOM)
// correct error in current horizontal position
switch (eHor)
- { case RHA_LEFT :
+ { case RHA_LEFT :
aPos.X() += rRect.GetItalicLeft() - GetItalicLeft();
break;
case RHA_CENTER :
@@ -427,7 +427,7 @@ SmRect & SmRect::Union(const SmRect &rRect)
nGT = rRect.nGlyphTop,
nGB = rRect.nGlyphBottom;
if (!IsEmpty())
- { long nTmp;
+ { long nTmp;
if ((nTmp = GetLeft()) < nL)
nL = nTmp;
@@ -473,14 +473,14 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode)
if (!HasAlignInfo())
CopyAlignInfo(rRect);
else if (rRect.HasAlignInfo())
- { nAlignT = Min(GetAlignT(), rRect.GetAlignT());
+ { nAlignT = Min(GetAlignT(), rRect.GetAlignT());
nAlignB = Max(GetAlignB(), rRect.GetAlignB());
nHiAttrFence = Min(GetHiAttrFence(), rRect.GetHiAttrFence());
nLoAttrFence = Max(GetLoAttrFence(), rRect.GetLoAttrFence());
OSL_ENSURE(HasAlignInfo(), "Sm: ooops...");
switch (eCopyMode)
- { case RCP_THIS:
+ { case RCP_THIS:
// already done
break;
case RCP_ARG:
@@ -529,15 +529,15 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
long nOldAlignT = GetAlignT(),
nOldAlignM = GetAlignM(),
nOldAlignB = GetAlignB(),
- nOldBaseline = nBaseline; //! depends not on 'HasBaseline'
+ nOldBaseline = nBaseline; //! depends not on 'HasBaseline'
BOOL bOldHasAlignInfo = HasAlignInfo();
ExtendBy(rRect, eCopyMode);
if (bKeepVerAlignParams)
- { nAlignT = nOldAlignT;
- nAlignM = nOldAlignM;
- nAlignB = nOldAlignB;
+ { nAlignT = nOldAlignT;
+ nAlignM = nOldAlignM;
+ nAlignB = nOldAlignB;
nBaseline = nOldBaseline;
bHasAlignInfo = bOldHasAlignInfo;
}
@@ -557,7 +557,7 @@ long SmRect::OrientedDist(const Point &rPoint) const
// build reference point to define the distance
Point aRef;
if (bIsInside)
- { Point aIC (GetItalicCenterX(), GetCenterY());
+ { Point aIC (GetItalicCenterX(), GetCenterY());
aRef.X() = rPoint.X() >= aIC.X() ? GetItalicRight() : GetItalicLeft();
aRef.Y() = rPoint.Y() >= aIC.Y() ? GetBottom() : GetTop();
@@ -592,7 +592,7 @@ long SmRect::OrientedDist(const Point &rPoint) const
BOOL SmRect::IsInsideRect(const Point &rPoint) const
{
- return rPoint.Y() >= GetTop()
+ return rPoint.Y() >= GetTop()
&& rPoint.Y() <= GetBottom()
&& rPoint.X() >= GetLeft()
&& rPoint.X() <= GetRight();
@@ -601,7 +601,7 @@ BOOL SmRect::IsInsideRect(const Point &rPoint) const
BOOL SmRect::IsInsideItalicRect(const Point &rPoint) const
{
- return rPoint.Y() >= GetTop()
+ return rPoint.Y() >= GetTop()
&& rPoint.Y() <= GetBottom()
&& rPoint.X() >= GetItalicLeft()
&& rPoint.X() <= GetItalicRight();
@@ -629,11 +629,11 @@ void SmRect::Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const
rDev.Push(PUSH_LINECOLOR);
if (nFlags & SM_RECT_LINES)
- { long nLeftSpace = 0,
+ { long nLeftSpace = 0,
nRightSpace = 0;
if (nFlags & SM_RECT_ITALIC)
- { nLeftSpace = GetItalicLeftSpace();
+ { nLeftSpace = GetItalicLeftSpace();
nRightSpace = GetItalicRightSpace();
}
@@ -643,24 +643,24 @@ void SmRect::Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const
Point aOffset (rPosition - GetTopLeft());
rDev.SetLineColor(COL_LIGHTBLUE);
- rDev.DrawLine(Point(nLeft, GetAlignB()) += aOffset,
+ rDev.DrawLine(Point(nLeft, GetAlignB()) += aOffset,
Point(nRight, GetAlignB()) += aOffset);
- rDev.DrawLine(Point(nLeft, GetAlignT()) += aOffset,
+ rDev.DrawLine(Point(nLeft, GetAlignT()) += aOffset,
Point(nRight, GetAlignT()) += aOffset);
if (HasBaseline())
- rDev.DrawLine(Point(nLeft, GetBaseline()) += aOffset,
+ rDev.DrawLine(Point(nLeft, GetBaseline()) += aOffset,
Point(nRight, GetBaseline()) += aOffset);
rDev.SetLineColor(COL_GRAY);
- rDev.DrawLine(Point(nLeft, GetHiAttrFence()) += aOffset,
+ rDev.DrawLine(Point(nLeft, GetHiAttrFence()) += aOffset,
Point(nRight, GetHiAttrFence()) += aOffset);
}
if (nFlags & SM_RECT_MID)
- { Point aCenter = rPosition
+ { Point aCenter = rPosition
+ (Point(GetItalicCenterX(), GetAlignM()) -= GetTopLeft()),
- aLenX (GetWidth() / 5, 0),
- aLenY (0, GetHeight() / 16);
+ aLenX (GetWidth() / 5, 0),
+ aLenY (0, GetHeight() / 16);
rDev.SetLineColor(COL_LIGHTGREEN);
rDev.DrawLine(aCenter - aLenX, aCenter + aLenX);
@@ -685,10 +685,10 @@ void SmDrawFrame(OutputDevice &rDev, const Rectangle &rRec,
rDev.SetLineColor(aCol);
- rDev.DrawLine(rRec.TopLeft(), rRec.BottomLeft());
+ rDev.DrawLine(rRec.TopLeft(), rRec.BottomLeft());
rDev.DrawLine(rRec.BottomLeft(), rRec.BottomRight());
rDev.DrawLine(rRec.BottomRight(), rRec.TopRight());
- rDev.DrawLine(rRec.TopRight(), rRec.TopLeft());
+ rDev.DrawLine(rRec.TopRight(), rRec.TopLeft());
rDev.Pop();
}
@@ -704,7 +704,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
// handle special case first
xub_StrLen nLen = rText.Len();
if (nLen == 0)
- { rRect.SetEmpty();
+ { rRect.SetEmpty();
return TRUE;
}
@@ -734,7 +734,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
long nScaleFactor = 1;
while( aFntSize.Height() > 2000 * nScaleFactor )
nScaleFactor *= 2;
-
+
aFnt.SetSize( Size( aFntSize.Width() / nScaleFactor, aFntSize.Height() / nScaleFactor ) );
pGlyphDev->SetFont(aFnt);
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 3a303e62d16c..a8fcfd350c0a 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -2,7 +2,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
@@ -120,7 +120,7 @@ void SAL_CALL component_getImplementationEnvironment(
}
sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/,
- void* pRegistryKey )
+ void* pRegistryKey )
{
Reference< registry::XRegistryKey >
xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ) ;
@@ -212,9 +212,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
- if (
- ( pImplementationName != NULL ) &&
- ( pServiceManager != NULL )
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
)
{
// Define variables which are used in following macros.
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index f599dc1070bb..417078acf08f 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index ae5fc38852ce..27202cb56564 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -2,7 +2,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
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index d425db27f924..bbfe37c39331 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 904394d01735..964e8d347142 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@ SmResId::SmResId( USHORT nId )
SmLocalizedSymbolData::SmLocalizedSymbolData() :
Resource( SmResId(RID_LOCALIZED_NAMES) ),
- aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ),
+ aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ),
aExportSymbolNamesAry ( SmResId(RID_EXPORT_SYMBOL_NAMES) ),
aUiSymbolSetNamesAry ( SmResId(RID_UI_SYMBOLSET_NAMES) ),
aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) ),
@@ -346,19 +346,19 @@ void SmModule::FillStatusBar(StatusBar &rBar)
}
-SfxItemSet* SmModule::CreateItemSet( USHORT nId )
+SfxItemSet* SmModule::CreateItemSet( USHORT nId )
{
- SfxItemSet* pRet = 0;
+ SfxItemSet* pRet = 0;
if(nId == SID_SM_EDITOPTIONS)
{
pRet = new SfxItemSet(GetPool(),
//TP_SMPRINT
- SID_PRINTSIZE, SID_PRINTSIZE,
- SID_PRINTZOOM, SID_PRINTZOOM,
- SID_PRINTTITLE, SID_PRINTTITLE,
- SID_PRINTTEXT, SID_PRINTTEXT,
- SID_PRINTFRAME, SID_PRINTFRAME,
- SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
+ SID_PRINTSIZE, SID_PRINTSIZE,
+ SID_PRINTZOOM, SID_PRINTZOOM,
+ SID_PRINTTITLE, SID_PRINTTITLE,
+ SID_PRINTTEXT, SID_PRINTTEXT,
+ SID_PRINTFRAME, SID_PRINTFRAME,
+ SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
0 );
GetConfig()->ConfigToItemSet(*pRet);
@@ -372,9 +372,9 @@ void SmModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
GetConfig()->ItemSetToConfig(rSet);
}
}
-SfxTabPage* SmModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SmModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
{
- SfxTabPage* pRet = 0;
+ SfxTabPage* pRet = 0;
if(nId == SID_SM_TP_PRINTOPTIONS)
pRet = SmPrintOptionsTabPage::Create( pParent, rSet );
return pRet;
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index c35d77c9afcf..7270427e0b42 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -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
@@ -1064,7 +1064,7 @@ ModalDialog RID_SYMBOLDIALOG
{
OutputSize = TRUE ;
SVLook = TRUE ;
- Closeable = TRUE; // Close Button in Window Leiste explizit einbauen
+ Closeable = TRUE; // Close Button in Window Leiste explizit einbauen
Size = MAP_APPFONT ( 239 , 123 ) ;
Text [ en-US ] = "Symbols" ;
Moveable = TRUE ;
@@ -1273,7 +1273,7 @@ ModalDialog RID_SYMDEFINEDIALOG
Size = MAP_APPFONT ( 54 , 8 ) ;
};
Image 1
- {
+ {
ImageBitmap = Bitmap { File = "ar_right.bmp" ; };
MaskColor = IMAGE_STDBTN_COLOR ;
};
@@ -3560,7 +3560,7 @@ StringArray RID_PRINTUIOPTIONS
< "~Formula text"; >;
< "Specifies whether to include the contents of the 'Commands' window at the bottom of the printout."; >;
< "B~orders"; >;
- < "Applies a thin border to the formula area in the printout."; >;
+ < "Applies a thin border to the formula area in the printout."; >;
< "Size"; >;
< "O~riginal size"; >;
< "Prints the formula without adjusting the current font size."; >;
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index fd2c7ea76f76..5e2c62faca03 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -2,7 +2,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
@@ -118,7 +118,7 @@ bool SmSym::IsEqualInUI( const SmSym& rSymbol ) const
return m_aName == rSymbol.m_aName &&
m_aFace == rSymbol.m_aFace &&
m_cChar == rSymbol.m_cChar;
-}
+}
/**************************************************************************/
@@ -193,13 +193,13 @@ const SymbolPtrVec_t SmSymbolManager::GetSymbols() const
bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChange )
{
bool bAdded = false;
-
+
const String aSymbolName( rSymbol.GetName() );
if (aSymbolName.Len() > 0 && rSymbol.GetSymbolSetName().Len() > 0)
{
const SmSym *pFound = GetSymbolByName( aSymbolName );
const bool bSymbolConflict = pFound && !pFound->IsEqualInUI( rSymbol );
-
+
// avoid having the same symbol name twice but with different symbols in use
if (!pFound || bForceChange)
{
@@ -208,11 +208,11 @@ bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChang
}
else if (pFound && !bForceChange && bSymbolConflict)
{
- // TODO: but what ...
+ // TODO: but what ...
OSL_ENSURE( 0, "symbol conflict, different symbol with same name found!" );
- }
+ }
}
-
+
OSL_ENSURE( bAdded, "failed to add symbol" );
if (bAdded)
m_bModified = true;
@@ -231,7 +231,7 @@ void SmSymbolManager::RemoveSymbol( const String & rSymbolName )
}
}
-
+
std::set< String > SmSymbolManager::GetSymbolSetNames() const
{
std::set< String > aRes;
@@ -241,7 +241,7 @@ std::set< String > SmSymbolManager::GetSymbolSetNames() const
return aRes;
}
-
+
const SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const String& rSymbolSetName )
{
SymbolPtrVec_t aRes;
@@ -256,7 +256,7 @@ const SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const String& rSymbolSetName
}
return aRes;
}
-
+
void SmSymbolManager::Load()
{
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index 7f8e15a15817..36c12cfaa4e8 100644
--- a/starmath/source/symbol.src
+++ b/starmath/source/symbol.src
@@ -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
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index ff253fbb80f1..5cc134d5c28e 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -2,7 +2,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
@@ -141,7 +141,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
SetStyle( GetStyle() | WB_DIALOGCONTROL );
nActiveCategoryRID = sal::static_int_cast< USHORT >(-1);
-
+
aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl));
USHORT i;
@@ -194,7 +194,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra
// list for later use in the respective array.
const ImageList *pIL = 0;
-
+
// get index to use
USHORT nCategoryRID = GetCategoryRID( nResId );
sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID );
@@ -217,13 +217,13 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra
void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID )
{
BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
+
// set image list for toolbox 'catalog'
const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast );
OSL_ENSURE( pImageList, "image list missing" );
if (pImageList)
aToolBoxCat.SetImageList( *pImageList );
-
+
// set image list for active (visible) category of 'catalog'
sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
USHORT nResId = GetImageListRID( nCategoryRID, bHighContrast );
diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc
index 687521d76a32..9b15d99e20ae 100644
--- a/starmath/source/toolbox.hrc
+++ b/starmath/source/toolbox.hrc
@@ -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
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index 1816e483ab90..10145e4ad4ab 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/types.cxx b/starmath/source/types.cxx
index aeb06d7eb5a9..c1ba0f1ce915 100644
--- a/starmath/source/types.cxx
+++ b/starmath/source/types.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 4f0205f5cd38..9fae49f7826b 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -2,7 +2,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
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 6edee27b11a8..1ca204e3b409 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -2,7 +2,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
@@ -74,8 +74,8 @@ using namespace ::com::sun::star::script;
using rtl::OUString;
-#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
-#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
+#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
+#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
////////////////////////////////////////////////////////////
@@ -91,16 +91,16 @@ SmPrintUIOptions::SmPrintUIOptions()
OSL_ENSURE( pConfig, "SmConfig not found" );
if (!pConfig)
return;
-
+
// create sequence of print UI options
// (Actually IsIgnoreSpacesRight is a parser option. Without it we need only 8 properties here.)
m_aUIProperties.realloc( 9 );
-
+
// create Section for formula (results in an extra tab page in dialog)
SvtModuleOptions aOpt;
String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
- aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) );
+ aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) );
m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
// create subgroup for print options
@@ -140,7 +140,7 @@ SmPrintUIOptions::SmPrintUIOptions()
aPrintFormatProp,
aChoices, static_cast< sal_Int32 >(pConfig->GetPrintSize())
);
-
+
// create a numeric box for scale dependent on PrintFormat = "Scaling" (matches to SID_PRINTZOOM)
vcl::PrinterOptionsHelper::UIControlOptions aRangeOpt( aPrintFormatProp, 2, sal_True );
m_aUIProperties[ 7 ].Value = getRangeControlOpt( rtl::OUString(),
@@ -150,7 +150,7 @@ SmPrintUIOptions::SmPrintUIOptions()
10, // min value
1000, // max value
aRangeOpt );
-
+
Sequence< PropertyValue > aHintNoLayoutPage( 1 );
aHintNoLayoutPage[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HintNoLayoutPage" ) );
aHintNoLayoutPage[0].Value = makeAny( sal_True );
@@ -237,68 +237,68 @@ PropertySetInfo * lcl_createModelPropertyInfo ()
{
static PropertyMapEntry aModelPropertyInfoMap[] =
{
- { RTL_CONSTASCII_STRINGPARAM( "Alignment" ), HANDLE_ALIGNMENT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight" ), HANDLE_BASE_FONT_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM( "Alignment" ), HANDLE_ALIGNMENT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight" ), HANDLE_BASE_FONT_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM( "BasicLibraries" ), HANDLE_BASIC_LIBRARIES , &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0},
- { RTL_CONSTASCII_STRINGPARAM( "BottomMargin" ), HANDLE_BOTTOM_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BOTTOMSPACE },
- { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed" ), HANDLE_CUSTOM_FONT_NAME_FIXED , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FIXED },
- { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans" ), HANDLE_CUSTOM_FONT_NAME_SANS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SANS },
- { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif" ), HANDLE_CUSTOM_FONT_NAME_SERIF , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SERIF },
+ { RTL_CONSTASCII_STRINGPARAM( "BottomMargin" ), HANDLE_BOTTOM_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BOTTOMSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed" ), HANDLE_CUSTOM_FONT_NAME_FIXED , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FIXED },
+ { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans" ), HANDLE_CUSTOM_FONT_NAME_SANS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SANS },
+ { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif" ), HANDLE_CUSTOM_FONT_NAME_SERIF , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_SERIF },
{ RTL_CONSTASCII_STRINGPARAM( "DialogLibraries" ), HANDLE_DIALOG_LIBRARIES , &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), PropertyAttribute::READONLY, 0},
- { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"), HANDLE_CUSTOM_FONT_FIXED_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED},
+ { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"), HANDLE_CUSTOM_FONT_FIXED_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED},
{ RTL_CONSTASCII_STRINGPARAM( "FontFixedIsItalic"), HANDLE_CUSTOM_FONT_FIXED_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FIXED},
- { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"), HANDLE_FONT_FUNCTIONS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION},
+ { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"), HANDLE_FONT_FUNCTIONS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION},
{ RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsItalic"), HANDLE_FONT_FUNCTIONS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_FUNCTION},
- { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions" ), HANDLE_FONT_NAME_FUNCTIONS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FUNCTION },
- { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers" ), HANDLE_FONT_NAME_NUMBERS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_NUMBER },
- { RTL_CONSTASCII_STRINGPARAM( "FontNameText" ), HANDLE_FONT_NAME_TEXT , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_TEXT },
- { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables" ), HANDLE_FONT_NAME_VARIABLES , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_VARIABLE },
- { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"), HANDLE_FONT_NUMBERS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER},
+ { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions" ), HANDLE_FONT_NAME_FUNCTIONS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_FUNCTION },
+ { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers" ), HANDLE_FONT_NAME_NUMBERS , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_NUMBER },
+ { RTL_CONSTASCII_STRINGPARAM( "FontNameText" ), HANDLE_FONT_NAME_TEXT , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_TEXT },
+ { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables" ), HANDLE_FONT_NAME_VARIABLES , &::getCppuType((const OUString*)0), PROPERTY_NONE, FNT_VARIABLE },
+ { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"), HANDLE_FONT_NUMBERS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER},
{ RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsItalic"), HANDLE_FONT_NUMBERS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_NUMBER},
- { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"), HANDLE_CUSTOM_FONT_SANS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS},
+ { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"), HANDLE_CUSTOM_FONT_SANS_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS},
{ RTL_CONSTASCII_STRINGPARAM( "FontSansIsItalic"), HANDLE_CUSTOM_FONT_SANS_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SANS},
- { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"), HANDLE_CUSTOM_FONT_SERIF_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF},
+ { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"), HANDLE_CUSTOM_FONT_SERIF_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF},
{ RTL_CONSTASCII_STRINGPARAM( "FontSerifIsItalic"), HANDLE_CUSTOM_FONT_SERIF_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_SERIF},
{ RTL_CONSTASCII_STRINGPARAM( "FontTextIsBold"), HANDLE_FONT_TEXT_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_TEXT},
{ RTL_CONSTASCII_STRINGPARAM( "FontTextIsItalic"), HANDLE_FONT_TEXT_POSTURE , &::getBooleanCppuType(), PROPERTY_NONE, FNT_TEXT},
{ RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsBold"), HANDLE_FONT_VARIABLES_WEIGHT , &::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE},
{ RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsItalic"), HANDLE_FONT_VARIABLES_POSTURE, &::getBooleanCppuType(), PROPERTY_NONE, FNT_VARIABLE},
- { RTL_CONSTASCII_STRINGPARAM( "Formula" ), HANDLE_FORMULA , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets" ), HANDLE_IS_SCALE_ALL_BRACKETS , &::getBooleanCppuType(), PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM( "IsTextMode" ), HANDLE_IS_TEXT_MODE , &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM( "Formula" ), HANDLE_FORMULA , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets" ), HANDLE_IS_SCALE_ALL_BRACKETS , &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM( "IsTextMode" ), HANDLE_IS_TEXT_MODE , &::getBooleanCppuType(), PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle" ), HANDLE_GREEK_CHAR_STYLE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ), HANDLE_LEFT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LEFTSPACE },
- { RTL_CONSTASCII_STRINGPARAM( "PrinterName" ), HANDLE_PRINTER_NAME , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0 },
- { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup" ), HANDLE_PRINTER_SETUP , &::getCppuType((const Sequence < sal_Int8 >*)0), PROPERTY_NONE, 0 },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance" ), HANDLE_RELATIVE_BRACKET_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSPACE },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize" ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSIZE },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions" ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_FUNCTION},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices" ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_INDEX },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits" ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_LIMITS },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators" ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_OPERATOR},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText" ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_TEXT },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_FRACTION },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight" ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_STROKEWIDTH },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth"), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_DENOMINATOR },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight" ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NUMERATOR },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript" ), HANDLE_RELATIVE_INDEX_SUBSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUBSCRIPT },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript" ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUPERSCRIPT },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing" ), HANDLE_RELATIVE_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_VERTICAL },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance" ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LOWERLIMIT },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing" ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXCOL},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing" ), HANDLE_RELATIVE_MATRIX_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXROW},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize" ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSIZE },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing" ), HANDLE_RELATIVE_OPERATOR_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSPACE},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing" ), HANDLE_RELATIVE_ROOT_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ROOT },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize" ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NORMALBRACKETSIZE},
- { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing" ), HANDLE_RELATIVE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_HORIZONTAL },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight" ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSPACE },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE },
- { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT },
- { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ), HANDLE_LEFT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LEFTSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "PrinterName" ), HANDLE_PRINTER_NAME , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0 },
+ { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup" ), HANDLE_PRINTER_SETUP , &::getCppuType((const Sequence < sal_Int8 >*)0), PROPERTY_NONE, 0 },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance" ), HANDLE_RELATIVE_BRACKET_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize" ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_BRACKETSIZE },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions" ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_FUNCTION},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices" ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_INDEX },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits" ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_LIMITS },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators" ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_OPERATOR},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText" ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, SIZ_TEXT },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_FRACTION },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight" ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_STROKEWIDTH },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth"), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_DENOMINATOR },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight" ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NUMERATOR },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript" ), HANDLE_RELATIVE_INDEX_SUBSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUBSCRIPT },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript" ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_SUPERSCRIPT },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing" ), HANDLE_RELATIVE_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_VERTICAL },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance" ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_LOWERLIMIT },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing" ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXCOL},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing" ), HANDLE_RELATIVE_MATRIX_LINE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_MATRIXROW},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize" ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSIZE },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing" ), HANDLE_RELATIVE_OPERATOR_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_OPERATORSPACE},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing" ), HANDLE_RELATIVE_ROOT_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ROOT },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize" ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_NORMALBRACKETSIZE},
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing" ), HANDLE_RELATIVE_SPACING , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_HORIZONTAL },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight" ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE },
+ { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT },
+ { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE },
{ RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const rtl::OUString * >(0)), PropertyAttribute::READONLY, 0 },
- { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 },
- { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE },
+ { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 },
+ { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE },
// --> PB 2004-08-25 #i33095# Security Options
{ RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 },
// <--
@@ -373,7 +373,7 @@ const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId()
if(!aSeq.getLength())
{
aSeq.realloc( 16 );
- rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+ rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
}
return aSeq;
}
@@ -787,7 +787,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
*pValue <<= nVal;
}
break;
- case HANDLE_RELATIVE_FONT_HEIGHT_TEXT :
+ case HANDLE_RELATIVE_FONT_HEIGHT_TEXT :
case HANDLE_RELATIVE_FONT_HEIGHT_INDICES :
case HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS :
case HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS :
@@ -992,7 +992,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer(
if (!m_pPrintUIOptions)
m_pPrintUIOptions = new SmPrintUIOptions();
m_pPrintUIOptions->appendPrintUIOptions( aRenderer );
-
+
return aRenderer;
}
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 330314118ad7..71f140377cc8 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@
// return pointer to active SmViewShell, if this is not possible
// return 0 instead.
-//!! Since this method is based on the current focus it is somewhat
+//!! Since this method is based on the current focus it is somewhat
//!! unreliable and may return unexpected 0 pointers!
SmViewShell * SmGetActiveView()
{
@@ -77,7 +77,7 @@ SmPickList::~SmPickList()
SmPickList& SmPickList::operator=(const SmPickList& rList)
{
- USHORT nPos;
+ USHORT nPos;
Clear();
nSize = rList.nSize;
@@ -103,7 +103,7 @@ void SmPickList::Insert(const void *pItem)
void SmPickList::Update(const void *pItem, const void *pNewItem)
{
- USHORT nPos;
+ USHORT nPos;
for (nPos = 0; nPos < Count(); nPos++)
if (CompareItem(GetPtr(nPos), pItem))
@@ -116,7 +116,7 @@ void SmPickList::Update(const void *pItem, const void *pNewItem)
void SmPickList::Remove(const void *pItem)
{
- USHORT nPos;
+ USHORT nPos;
for (nPos = 0; nPos < Count(); nPos++)
if (CompareItem(GetPtr(nPos), pItem))
@@ -129,7 +129,7 @@ void SmPickList::Remove(const void *pItem)
void SmPickList::Clear()
{
- USHORT nPos;
+ USHORT nPos;
for (nPos = 0; nPos < Count(); nPos++)
DestroyItem(GetPtr(nPos));
@@ -158,15 +158,15 @@ void SmFontPickList::DestroyItem(void *pItem)
BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem) const
{
- Font *pFirstFont, *pSecondFont;
+ Font *pFirstFont, *pSecondFont;
- pFirstFont = (Font *)pFirstItem;
+ pFirstFont = (Font *)pFirstItem;
pSecondFont = (Font *)pSecondItem;
if (pFirstFont->GetName() == pSecondFont->GetName())
- if ((pFirstFont->GetFamily() == pSecondFont->GetFamily()) &&
+ if ((pFirstFont->GetFamily() == pSecondFont->GetFamily()) &&
(pFirstFont->GetCharSet() == pSecondFont->GetCharSet()) &&
- (pFirstFont->GetWeight() == pSecondFont->GetWeight()) &&
+ (pFirstFont->GetWeight() == pSecondFont->GetWeight()) &&
(pFirstFont->GetItalic() == pSecondFont->GetItalic()))
return (TRUE);
@@ -176,7 +176,7 @@ BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem
String SmFontPickList::GetStringItem(void *pItem)
{
Font *pFont;
- String aString;
+ String aString;
const sal_Char *pDelim = ", ";
pFont = (Font *)pItem;
@@ -231,8 +231,8 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const
IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ )
{
- USHORT nPos;
- String aString;
+ USHORT nPos;
+ String aString;
nPos = GetSelectEntryPos();
@@ -337,7 +337,7 @@ void SmFace::SetSize(const Size& rSize)
Size aSize (rSize);
// check the requested size against minimum value
- static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2);
+ static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2);
if (aSize.Height() < nMinVal)
aSize.Height() = nMinVal;
@@ -371,9 +371,9 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac)
// scales the width and height of 'rFace' by 'rFrac' and returns a
// reference to 'rFace'.
// It's main use is to make scaling fonts look easier.
-{ const Size &rFaceSize = rFace.GetSize();
+{ const Size &rFaceSize = rFace.GetSize();
- rFace.SetSize(Size(Fraction(rFaceSize.Width()) *= rFrac,
+ rFace.SetSize(Size(Fraction(rFaceSize.Width()) *= rFrac,
Fraction(rFaceSize.Height()) *= rFrac));
return rFace;
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a48fe61b2444..7874d0666ece 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -79,13 +79,13 @@
#include "mathmlimport.hxx"
#include "cursor.hxx"
-#define MINWIDTH 200
-#define MINHEIGHT 200
-#define MINSPLIT 40
-#define SPLITTERWIDTH 2
+#define MINWIDTH 200
+#define MINHEIGHT 200
+#define MINSPLIT 40
+#define SPLITTERWIDTH 2
-#define MINZOOM 25
-#define MAXZOOM 800
+#define MINZOOM 25
+#define MAXZOOM 800
#define SmViewShell
#include "smslots.hxx"
@@ -186,7 +186,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt)
pNode = pTree->FindRectClosestTo(aPos);
if (pNode)
- { SmEditWindow *pEdit = pViewShell->GetEditWindow();
+ { SmEditWindow *pEdit = pViewShell->GetEditWindow();
const SmToken aToken (pNode->GetToken());
// set selection to the beginning of the token
@@ -278,10 +278,10 @@ void SmGraphicWindow::SetCursor(const Rectangle &rRect)
SmModule *pp = SM_MOD();
if (IsCursorVisible())
- ShowCursor(FALSE); // clean up remainings of old cursor
+ ShowCursor(FALSE); // clean up remainings of old cursor
aCursorRect = rRect;
if (pp->GetConfig()->IsShowFormulaCursor())
- ShowCursor(TRUE); // draw new cursor
+ ShowCursor(TRUE); // draw new cursor
}
const SmNode * SmGraphicWindow::SetCursorPos(USHORT nRow, USHORT nCol)
@@ -316,7 +316,7 @@ void SmGraphicWindow::Paint(const Rectangle&)
SmDocShell &rDoc = *pViewShell->GetDoc();
Point aPoint;
- rDoc.DrawFormula(*this, aPoint, TRUE); //! modifies aPoint to be the topleft
+ rDoc.DrawFormula(*this, aPoint, TRUE); //! modifies aPoint to be the topleft
//! corner of the formula
SetFormulaDrawPos(aPoint);
if(IsInlineEditEnabled()) {
@@ -324,12 +324,12 @@ void SmGraphicWindow::Paint(const Rectangle&)
if(pViewShell->GetDoc()->HasCursor())
pViewShell->GetDoc()->GetCursor().Draw(*this, aPoint);
} else {
- SetIsCursorVisible(FALSE); // (old) cursor must be drawn again
+ SetIsCursorVisible(FALSE); // (old) cursor must be drawn again
const SmEditWindow *pEdit = pViewShell->GetEditWindow();
if (pEdit)
- { // get new position for formula-cursor (for possible altered formula)
- USHORT nRow, nCol;
+ { // get new position for formula-cursor (for possible altered formula)
+ USHORT nRow, nCol;
SmGetLeftSelectionPart(pEdit->GetSelection(), nRow, nCol);
nRow++;
nCol++;
@@ -545,8 +545,8 @@ void SmGraphicWindow::ZoomToFitInWindow()
// set defined mapmode before calling 'LogicToPixel' below
SetMapMode(MapMode(MAP_100TH_MM));
- Size aSize (LogicToPixel(rDoc.GetSize()));
- Size aWindowSize (GetSizePixel());
+ Size aSize (LogicToPixel(rDoc.GetSize()));
+ Size aWindowSize (GetSizePixel());
if (aSize.Width() > 0 && aSize.Height() > 0)
{
@@ -571,7 +571,7 @@ uno::Reference< XAccessible > SmGraphicWindow::CreateAccessible()
SmGraphicController::SmGraphicController(SmGraphicWindow &rSmGraphic,
USHORT nId_,
- SfxBindings &rBindings) :
+ SfxBindings &rBindings) :
SfxControllerItem(nId_, rBindings),
rGraphic(rSmGraphic)
{
@@ -652,17 +652,17 @@ void SmCmdBoxWindow::Resize()
{
switch (GetAlignment())
{
- case SFX_ALIGN_TOP: aRect.Bottom()--; break;
- case SFX_ALIGN_BOTTOM: aRect.Top()++; break;
- case SFX_ALIGN_LEFT: aRect.Right()--; break;
- case SFX_ALIGN_RIGHT: aRect.Left()++; break;
+ case SFX_ALIGN_TOP: aRect.Bottom()--; break;
+ case SFX_ALIGN_BOTTOM: aRect.Top()++; break;
+ case SFX_ALIGN_LEFT: aRect.Right()--; break;
+ case SFX_ALIGN_RIGHT: aRect.Left()++; break;
default:
break;
}
}
DecorationView aView(this);
- aRect.Left() += 8; aRect.Top() += 8;
+ aRect.Left() += 8; aRect.Top() += 8;
aRect.Right()-= 8; aRect.Bottom()-= 8;
aRect = aView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN );
@@ -708,7 +708,7 @@ void SmCmdBoxWindow::Paint(const Rectangle& /*rRect*/)
DrawLine( aFrom, aTo );
aView.DrawFrame(aRect, FRAME_DRAW_OUT);
}
- aRect.Left() += 8; aRect.Top() += 8;
+ aRect.Left() += 8; aRect.Top() += 8;
aRect.Right()-= 8; aRect.Bottom()-= 8;
aRect = aView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN );
}
@@ -966,11 +966,11 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long M
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetTextSize" );
- Size aSize;
- String aLine;
- Size TextSize;
- String aText;
- USHORT nLines = rText.GetTokenCount('\n');
+ Size aSize;
+ String aLine;
+ Size TextSize;
+ String aText;
+ USHORT nLines = rText.GetTokenCount('\n');
for (USHORT i = 0; i < nLines; i++)
{
@@ -985,7 +985,7 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long M
{
do
{
- xub_StrLen m = aLine.Len();
+ xub_StrLen m = aLine.Len();
xub_StrLen nLen = m;
for (xub_StrLen n = 0; n < nLen; n++)
@@ -1028,9 +1028,9 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawTextLine" );
- String aText;
- Point aPoint (rPosition);
- USHORT nTabs = rLine.GetTokenCount('\t');
+ String aText;
+ Point aPoint (rPosition);
+ USHORT nTabs = rLine.GetTokenCount('\t');
if (nTabs > 0)
{
@@ -1057,11 +1057,11 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawText" );
- USHORT nLines = rText.GetTokenCount('\n');
- Point aPoint (rPosition);
- Size aSize;
- String aLine;
- String aText;
+ USHORT nLines = rText.GetTokenCount('\n');
+ Point aPoint (rPosition);
+ Size aSize;
+ String aLine;
+ String aText;
for (USHORT i = 0; i < nLines; i++)
{
@@ -1074,7 +1074,7 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const
{
do
{
- xub_StrLen m = aLine.Len();
+ xub_StrLen m = aLine.Len();
xub_StrLen nLen = m;
for (xub_StrLen n = 0; n < nLen; n++)
@@ -1230,7 +1230,7 @@ void SmViewShell::Impl_Print(
Size OutputSize (rOutDev.LogicToPixel(Size(aOutRect.GetWidth(),
aOutRect.GetHeight()), MapMode(MAP_100TH_MM)));
Size GraphicSize (rOutDev.LogicToPixel(aSize, MapMode(MAP_100TH_MM)));
- USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()),
+ USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()),
(long)Fraction(OutputSize.Height() * 100L, GraphicSize.Height()));
Fraction aFraction ((USHORT) Max ((USHORT) MINZOOM, Min((USHORT) MAXZOOM, (USHORT) (nZ - 10))), (USHORT) 100);
@@ -1324,7 +1324,7 @@ SmEditWindow *SmViewShell::GetEditWindow()
if (pWrapper != NULL)
{
- SmEditWindow *pEditWin = pWrapper->GetEditWindow();
+ SmEditWindow *pEditWin = pWrapper->GetEditWindow();
OSL_ENSURE( pEditWin, "SmEditWindow missing" );
return pEditWin;
}
@@ -1760,10 +1760,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
SfxPrinter *pPrinter = GetPrinter( TRUE );
Point aPoint;
Rectangle OutputRect(aPoint, pPrinter->GetOutputSize());
- Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(),
+ Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(),
OutputRect.GetHeight()), aMap));
- Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap));
- USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()),
+ Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap));
+ USHORT nZ = (USHORT) Min((long)Fraction(OutputSize.Width() * 100L, GraphicSize.Width()),
(long)Fraction(OutputSize.Height() * 100L, GraphicSize.Height()));
aGraphic.SetZoom (nZ);
break;
diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src
index e55a97852b62..5a87a5709eaa 100644
--- a/starmath/util/hidother.src
+++ b/starmath/util/hidother.src
@@ -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
@@ -26,92 +26,92 @@
************************************************************************/
#include "../inc/starmath.hrc"
-hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; };
-hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; };
-hidspecial HID_SMA_FONTSIZEDIALOG { HelpId = HID_SMA_FONTSIZEDIALOG; };
-hidspecial HID_SMA_FONTTYPEDIALOG { HelpId = HID_SMA_FONTTYPEDIALOG; };
-hidspecial HID_SMA_DISTANCEDIALOG { HelpId = HID_SMA_DISTANCEDIALOG; };
-hidspecial HID_SMA_ALIGNDIALOG { HelpId = HID_SMA_ALIGNDIALOG; };
-hidspecial HID_SMA_PRINTOPTIONPAGE { HelpId = HID_SMA_PRINTOPTIONPAGE; };
-hidspecial HID_SMA_SYMBOLDIALOG { HelpId = HID_SMA_SYMBOLDIALOG; };
-hidspecial HID_SMA_SYMDEFINEDIALOG { HelpId = HID_SMA_SYMDEFINEDIALOG; };
-hidspecial HID_SMA_EXTRAOPTIONPAGE { HelpId = HID_SMA_EXTRAOPTIONPAGE; };
-hidspecial HID_SMA_DOCSAVEQUERY { HelpId = HID_SMA_DOCSAVEQUERY; };
-hidspecial HID_SMA_OBJECTSAVEQUERY { HelpId = HID_SMA_OBJECTSAVEQUERY; };
-hidspecial HID_SMA_DEFAULTSAVEQUERY { HelpId = HID_SMA_DEFAULTSAVEQUERY; };
-hidspecial HID_SMA_ILLEGALOBJECTERROR { HelpId = HID_SMA_ILLEGALOBJECTERROR; };
-hidspecial HID_SMA_ILLEGALFILEERROR { HelpId = HID_SMA_ILLEGALFILEERROR; };
-hidspecial HID_SMA_WRITESYMBOLERROR { HelpId = HID_SMA_WRITESYMBOLERROR; };
-hidspecial HID_SMA_READSYMBOLERROR { HelpId = HID_SMA_READSYMBOLERROR; };
+hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; };
+hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; };
+hidspecial HID_SMA_FONTSIZEDIALOG { HelpId = HID_SMA_FONTSIZEDIALOG; };
+hidspecial HID_SMA_FONTTYPEDIALOG { HelpId = HID_SMA_FONTTYPEDIALOG; };
+hidspecial HID_SMA_DISTANCEDIALOG { HelpId = HID_SMA_DISTANCEDIALOG; };
+hidspecial HID_SMA_ALIGNDIALOG { HelpId = HID_SMA_ALIGNDIALOG; };
+hidspecial HID_SMA_PRINTOPTIONPAGE { HelpId = HID_SMA_PRINTOPTIONPAGE; };
+hidspecial HID_SMA_SYMBOLDIALOG { HelpId = HID_SMA_SYMBOLDIALOG; };
+hidspecial HID_SMA_SYMDEFINEDIALOG { HelpId = HID_SMA_SYMDEFINEDIALOG; };
+hidspecial HID_SMA_EXTRAOPTIONPAGE { HelpId = HID_SMA_EXTRAOPTIONPAGE; };
+hidspecial HID_SMA_DOCSAVEQUERY { HelpId = HID_SMA_DOCSAVEQUERY; };
+hidspecial HID_SMA_OBJECTSAVEQUERY { HelpId = HID_SMA_OBJECTSAVEQUERY; };
+hidspecial HID_SMA_DEFAULTSAVEQUERY { HelpId = HID_SMA_DEFAULTSAVEQUERY; };
+hidspecial HID_SMA_ILLEGALOBJECTERROR { HelpId = HID_SMA_ILLEGALOBJECTERROR; };
+hidspecial HID_SMA_ILLEGALFILEERROR { HelpId = HID_SMA_ILLEGALFILEERROR; };
+hidspecial HID_SMA_WRITESYMBOLERROR { HelpId = HID_SMA_WRITESYMBOLERROR; };
+hidspecial HID_SMA_READSYMBOLERROR { HelpId = HID_SMA_READSYMBOLERROR; };
hidspecial HID_SMA_NOMATHTYPEFACEWARNING { HelpId = HID_SMA_NOMATHTYPEFACEWARNING; };
-hidspecial HID_SMA_OBJECTNAME { HelpId = HID_SMA_OBJECTNAME; };
-hidspecial HID_SMA_VIEWNAME { HelpId = HID_SMA_VIEWNAME; };
-hidspecial HID_SMA_UNDOEDITNAME { HelpId = HID_SMA_UNDOEDITNAME; };
-hidspecial HID_SMA_UNDOFORMATNAME { HelpId = HID_SMA_UNDOFORMATNAME; };
-hidspecial HID_SMA_APPICO { HelpId = HID_SMA_APPICO; };
-hidspecial HID_SMA_DOCICO { HelpId = HID_SMA_DOCICO; };
-hidspecial HID_SMA_TMPICO { HelpId = HID_SMA_TMPICO; };
-hidspecial HID_SMA_COMMANDMENU { HelpId = HID_SMA_COMMANDMENU; };
-hidspecial HID_SMA_VIEWMENU { HelpId = HID_SMA_VIEWMENU; };
-hidspecial HID_SMA_DISTANCEMENU { HelpId = HID_SMA_DISTANCEMENU; };
-hidspecial HID_SMA_FONTMENU { HelpId = HID_SMA_FONTMENU; };
-hidspecial HID_SMA_STARTUPWINDOW { HelpId = HID_SMA_STARTUPWINDOW; };
-hidspecial HID_SMA_TOOLBOXWINDOW { HelpId = HID_SMA_TOOLBOXWINDOW; };
-hidspecial HID_SMA_CMDBOXWINDOW { HelpId = HID_SMA_CMDBOXWINDOW; };
-hidspecial HID_SMA_UPDATEOBJECT { HelpId = HID_SMA_UPDATEOBJECT; };
-hidspecial HID_SMA_FONTREGULAR { HelpId = HID_SMA_FONTREGULAR; };
-hidspecial HID_SMA_FONTITALIC { HelpId = HID_SMA_FONTITALIC; };
-hidspecial HID_SMA_FONTBOLD { HelpId = HID_SMA_FONTBOLD; };
-hidspecial HID_SMA_PRINTOPTION { HelpId = HID_SMA_PRINTOPTION; };
-hidspecial HID_SMA_DOCUMENTSTR { HelpId = HID_SMA_DOCUMENTSTR; };
-hidspecial HID_SMA_SYMBOLFILESSTR { HelpId = HID_SMA_SYMBOLFILESSTR; };
-hidspecial HID_SMA_ALLFILESSTR { HelpId = HID_SMA_ALLFILESSTR; };
-hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; };
-hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; };
-hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; };
-hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; };
-hidspecial HID_SMA_VIEWSHELL_DOCUMENT { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; };
-hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; };
+hidspecial HID_SMA_OBJECTNAME { HelpId = HID_SMA_OBJECTNAME; };
+hidspecial HID_SMA_VIEWNAME { HelpId = HID_SMA_VIEWNAME; };
+hidspecial HID_SMA_UNDOEDITNAME { HelpId = HID_SMA_UNDOEDITNAME; };
+hidspecial HID_SMA_UNDOFORMATNAME { HelpId = HID_SMA_UNDOFORMATNAME; };
+hidspecial HID_SMA_APPICO { HelpId = HID_SMA_APPICO; };
+hidspecial HID_SMA_DOCICO { HelpId = HID_SMA_DOCICO; };
+hidspecial HID_SMA_TMPICO { HelpId = HID_SMA_TMPICO; };
+hidspecial HID_SMA_COMMANDMENU { HelpId = HID_SMA_COMMANDMENU; };
+hidspecial HID_SMA_VIEWMENU { HelpId = HID_SMA_VIEWMENU; };
+hidspecial HID_SMA_DISTANCEMENU { HelpId = HID_SMA_DISTANCEMENU; };
+hidspecial HID_SMA_FONTMENU { HelpId = HID_SMA_FONTMENU; };
+hidspecial HID_SMA_STARTUPWINDOW { HelpId = HID_SMA_STARTUPWINDOW; };
+hidspecial HID_SMA_TOOLBOXWINDOW { HelpId = HID_SMA_TOOLBOXWINDOW; };
+hidspecial HID_SMA_CMDBOXWINDOW { HelpId = HID_SMA_CMDBOXWINDOW; };
+hidspecial HID_SMA_UPDATEOBJECT { HelpId = HID_SMA_UPDATEOBJECT; };
+hidspecial HID_SMA_FONTREGULAR { HelpId = HID_SMA_FONTREGULAR; };
+hidspecial HID_SMA_FONTITALIC { HelpId = HID_SMA_FONTITALIC; };
+hidspecial HID_SMA_FONTBOLD { HelpId = HID_SMA_FONTBOLD; };
+hidspecial HID_SMA_PRINTOPTION { HelpId = HID_SMA_PRINTOPTION; };
+hidspecial HID_SMA_DOCUMENTSTR { HelpId = HID_SMA_DOCUMENTSTR; };
+hidspecial HID_SMA_SYMBOLFILESSTR { HelpId = HID_SMA_SYMBOLFILESSTR; };
+hidspecial HID_SMA_ALLFILESSTR { HelpId = HID_SMA_ALLFILESSTR; };
+hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; };
+hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; };
+hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; };
+hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; };
+hidspecial HID_SMA_VIEWSHELL_DOCUMENT { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; };
+hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; };
-hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; };
-hidspecial HID_SMA_LINE_DIST { HelpId = HID_SMA_LINE_DIST; };
-hidspecial HID_SMA_ROOT_DIST { HelpId = HID_SMA_ROOT_DIST; };
-hidspecial HID_SMA_SUP_DIST { HelpId = HID_SMA_SUP_DIST; };
-hidspecial HID_SMA_SUB_DIST { HelpId = HID_SMA_SUB_DIST; };
-hidspecial HID_SMA_NUMERATOR_DIST { HelpId = HID_SMA_NUMERATOR_DIST; };
-hidspecial HID_SMA_DENOMINATOR_DIST { HelpId = HID_SMA_DENOMINATOR_DIST; };
-hidspecial HID_SMA_FRACLINE_EXCWIDTH { HelpId = HID_SMA_FRACLINE_EXCWIDTH; };
-hidspecial HID_SMA_FRACLINE_LINEWIDTH { HelpId = HID_SMA_FRACLINE_LINEWIDTH; };
-hidspecial HID_SMA_UPPERLIMIT_DIST { HelpId = HID_SMA_UPPERLIMIT_DIST; };
-hidspecial HID_SMA_LOWERLIMIT_DIST { HelpId = HID_SMA_LOWERLIMIT_DIST; };
-hidspecial HID_SMA_BRACKET_EXCHEIGHT { HelpId = HID_SMA_BRACKET_EXCHEIGHT; };
-hidspecial HID_SMA_BRACKET_DIST { HelpId = HID_SMA_BRACKET_DIST; };
-hidspecial HID_SMA_BRACKET_EXCHEIGHT2 { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; };
-hidspecial HID_SMA_MATRIXROW_DIST { HelpId = HID_SMA_MATRIXROW_DIST; };
-hidspecial HID_SMA_MATRIXCOL_DIST { HelpId = HID_SMA_MATRIXCOL_DIST; };
-hidspecial HID_SMA_ATTRIBUT_DIST { HelpId = HID_SMA_ATTRIBUT_DIST; };
-hidspecial HID_SMA_INTERATTRIBUT_DIST { HelpId = HID_SMA_INTERATTRIBUT_DIST; };
-hidspecial HID_SMA_OPERATOR_EXCHEIGHT { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; };
-hidspecial HID_SMA_OPERATOR_DIST { HelpId = HID_SMA_OPERATOR_DIST; };
-hidspecial HID_SMA_LEFTBORDER_DIST { HelpId = HID_SMA_LEFTBORDER_DIST; };
-hidspecial HID_SMA_RIGHTBORDER_DIST { HelpId = HID_SMA_RIGHTBORDER_DIST; };
-hidspecial HID_SMA_UPPERBORDER_DIST { HelpId = HID_SMA_UPPERBORDER_DIST; };
-hidspecial HID_SMA_LOWERBORDER_DIST { HelpId = HID_SMA_LOWERBORDER_DIST; };
+hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; };
+hidspecial HID_SMA_LINE_DIST { HelpId = HID_SMA_LINE_DIST; };
+hidspecial HID_SMA_ROOT_DIST { HelpId = HID_SMA_ROOT_DIST; };
+hidspecial HID_SMA_SUP_DIST { HelpId = HID_SMA_SUP_DIST; };
+hidspecial HID_SMA_SUB_DIST { HelpId = HID_SMA_SUB_DIST; };
+hidspecial HID_SMA_NUMERATOR_DIST { HelpId = HID_SMA_NUMERATOR_DIST; };
+hidspecial HID_SMA_DENOMINATOR_DIST { HelpId = HID_SMA_DENOMINATOR_DIST; };
+hidspecial HID_SMA_FRACLINE_EXCWIDTH { HelpId = HID_SMA_FRACLINE_EXCWIDTH; };
+hidspecial HID_SMA_FRACLINE_LINEWIDTH { HelpId = HID_SMA_FRACLINE_LINEWIDTH; };
+hidspecial HID_SMA_UPPERLIMIT_DIST { HelpId = HID_SMA_UPPERLIMIT_DIST; };
+hidspecial HID_SMA_LOWERLIMIT_DIST { HelpId = HID_SMA_LOWERLIMIT_DIST; };
+hidspecial HID_SMA_BRACKET_EXCHEIGHT { HelpId = HID_SMA_BRACKET_EXCHEIGHT; };
+hidspecial HID_SMA_BRACKET_DIST { HelpId = HID_SMA_BRACKET_DIST; };
+hidspecial HID_SMA_BRACKET_EXCHEIGHT2 { HelpId = HID_SMA_BRACKET_EXCHEIGHT2; };
+hidspecial HID_SMA_MATRIXROW_DIST { HelpId = HID_SMA_MATRIXROW_DIST; };
+hidspecial HID_SMA_MATRIXCOL_DIST { HelpId = HID_SMA_MATRIXCOL_DIST; };
+hidspecial HID_SMA_ATTRIBUT_DIST { HelpId = HID_SMA_ATTRIBUT_DIST; };
+hidspecial HID_SMA_INTERATTRIBUT_DIST { HelpId = HID_SMA_INTERATTRIBUT_DIST; };
+hidspecial HID_SMA_OPERATOR_EXCHEIGHT { HelpId = HID_SMA_OPERATOR_EXCHEIGHT; };
+hidspecial HID_SMA_OPERATOR_DIST { HelpId = HID_SMA_OPERATOR_DIST; };
+hidspecial HID_SMA_LEFTBORDER_DIST { HelpId = HID_SMA_LEFTBORDER_DIST; };
+hidspecial HID_SMA_RIGHTBORDER_DIST { HelpId = HID_SMA_RIGHTBORDER_DIST; };
+hidspecial HID_SMA_UPPERBORDER_DIST { HelpId = HID_SMA_UPPERBORDER_DIST; };
+hidspecial HID_SMA_LOWERBORDER_DIST { HelpId = HID_SMA_LOWERBORDER_DIST; };
//! this shouldn't have been necessary!
-hidspecial HID_SMA_ALEPH { HelpId = HID_SMA_ALEPH; };
-hidspecial HID_SMA_EMPTYSET { HelpId = HID_SMA_EMPTYSET; };
-hidspecial HID_SMA_RE { HelpId = HID_SMA_RE; };
-hidspecial HID_SMA_IM { HelpId = HID_SMA_IM; };
-hidspecial HID_SMA_INFINITY { HelpId = HID_SMA_INFINITY; };
-hidspecial HID_SMA_PARTIAL { HelpId = HID_SMA_PARTIAL; };
-hidspecial HID_SMA_WP { HelpId = HID_SMA_WP; };
-hidspecial HID_SMA_DOTSAXIS { HelpId = HID_SMA_DOTSAXIS; };
-hidspecial HID_SMA_DOTSUP { HelpId = HID_SMA_DOTSUP; };
-hidspecial HID_SMA_DOTSDOWN { HelpId = HID_SMA_DOTSDOWN; };
-hidspecial HID_SMA_DOTSLOW { HelpId = HID_SMA_DOTSLOW; };
-hidspecial HID_SMA_DOTSVERT { HelpId = HID_SMA_DOTSVERT; };
-hidspecial HID_SMA_NABLA { HelpId = HID_SMA_NABLA; };
-hidspecial HID_SMA_EXISTS { HelpId = HID_SMA_EXISTS; };
-hidspecial HID_SMA_FORALL { HelpId = HID_SMA_FORALL; };
+hidspecial HID_SMA_ALEPH { HelpId = HID_SMA_ALEPH; };
+hidspecial HID_SMA_EMPTYSET { HelpId = HID_SMA_EMPTYSET; };
+hidspecial HID_SMA_RE { HelpId = HID_SMA_RE; };
+hidspecial HID_SMA_IM { HelpId = HID_SMA_IM; };
+hidspecial HID_SMA_INFINITY { HelpId = HID_SMA_INFINITY; };
+hidspecial HID_SMA_PARTIAL { HelpId = HID_SMA_PARTIAL; };
+hidspecial HID_SMA_WP { HelpId = HID_SMA_WP; };
+hidspecial HID_SMA_DOTSAXIS { HelpId = HID_SMA_DOTSAXIS; };
+hidspecial HID_SMA_DOTSUP { HelpId = HID_SMA_DOTSUP; };
+hidspecial HID_SMA_DOTSDOWN { HelpId = HID_SMA_DOTSDOWN; };
+hidspecial HID_SMA_DOTSLOW { HelpId = HID_SMA_DOTSLOW; };
+hidspecial HID_SMA_DOTSVERT { HelpId = HID_SMA_DOTSVERT; };
+hidspecial HID_SMA_NABLA { HelpId = HID_SMA_NABLA; };
+hidspecial HID_SMA_EXISTS { HelpId = HID_SMA_EXISTS; };
+hidspecial HID_SMA_FORALL { HelpId = HID_SMA_FORALL; };
diff --git a/starmath/workben/smath-dump-watch.sh b/starmath/workben/smath-dump-watch.sh
index 21ec5f14ad35..6ca1b0c703a9 100755
--- a/starmath/workben/smath-dump-watch.sh
+++ b/starmath/workben/smath-dump-watch.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# Watches for formula dumps by starmath and renders them
+# Watches for formula dumps by starmath and renders them
# If starmath is compiled with the macro DEBUG_ENABLE_DUMPASDOT defined.
# shift+enter, in the visual formula editor will make starmath dump a
# graphviz graph of the formula tree structure. This is very useful when
@@ -20,7 +20,7 @@
touch /tmp/smath-dump.gv;
while inotifywait -q -e close_write /tmp/smath-dump.gv;
do
- dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null
- kill `pidof -s feh`; > /dev/null
- feh /tmp/smath-dump.png & > /dev/null
+ dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null
+ kill `pidof -s feh`; > /dev/null
+ feh /tmp/smath-dump.png & > /dev/null
done
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 2eeee761b33e..eb2c2641438d 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -51,21 +51,21 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
SwFmtFld* aField );
virtual ~SwAnnotationWin();
- virtual void UpdateData();
- virtual void SetPostItText();
- virtual void Delete();
- virtual void GotoPos();
+ virtual void UpdateData();
+ virtual void SetPostItText();
+ virtual void Delete();
+ virtual void GotoPos();
- virtual String GetAuthor();
- virtual Date GetDate();
- virtual Time GetTime();
+ virtual String GetAuthor();
+ virtual Date GetDate();
+ virtual Time GetTime();
virtual sal_uInt32 MoveCaret();
- virtual bool CalcFollow();
- void InitAnswer(OutlinerParaObject* pText);
+ virtual bool CalcFollow();
+ void InitAnswer(OutlinerParaObject* pText);
- virtual bool IsProtected();
+ virtual bool IsProtected();
protected:
virtual MenuButton* CreateMenuButton();
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 7c4e522daf3b..f4e0e6372645 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 9b8fffba0ef4..dddeab5227da 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index 18c0aba92b2f..4043e75c4f32 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 08ac070fd891..bc6f0b154c8c 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -2,7 +2,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
@@ -132,7 +132,7 @@
/**
*/
- virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+ virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
/** austauschen einer Grafik (mit Undo)
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 6b1a30b8d06f..84e7ba134b8c 100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@
*/
class IDocumentDeviceAccess
{
- public:
+ public:
/** Return the printer set at the document.
@@ -138,7 +138,7 @@
[in] the new PrintData.
*/
virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData) = 0;
-
+
protected:
virtual ~IDocumentDeviceAccess() {};
};
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 9d247673ece2..a5c426be432b 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index badcb82be23d..b75ccbc7911c 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -2,7 +2,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
@@ -54,7 +54,7 @@ typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
class IDocumentExternalData
{
protected:
- typedef ::std::hash_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash>
+ typedef ::std::hash_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash>
tExternalData;
tExternalData m_externalData;
@@ -62,7 +62,7 @@ protected:
virtual ~IDocumentExternalData() {};
public:
- virtual void setExternalData(sw::tExternalDataType eType,
+ virtual void setExternalData(sw::tExternalDataType eType,
sw::tExternalDataPointer pPayload) = 0;
virtual sw::tExternalDataPointer getExternalData(sw::tExternalDataType eType) = 0;
};
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index d5b3ec4aa7f5..6c40d8cf05ea 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -2,7 +2,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
@@ -148,7 +148,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
virtual SwDocUpdtFld& GetUpdtFlds() const = 0;
- /* @@@MAINTAINABILITY-HORROR@@@
+ /* @@@MAINTAINABILITY-HORROR@@@
SwNode (see parameter pChk) is (?) part of the private
data structure of SwDoc and should not be exposed
*/
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 7593aa670a99..0e645f196191 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx
index b4a6327dcc33..9f0ffa0401a3 100644
--- a/sw/inc/IDocumentLineNumberAccess.hxx
+++ b/sw/inc/IDocumentLineNumberAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 449316fa0729..e3457bcf9f7c 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -2,7 +2,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
@@ -39,11 +39,11 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
*/
class IDocumentLinksAdministration
{
- public:
+ public:
/** Links un-/sichtbar in LinkManager einfuegen (gelinkte Bereiche)
*/
virtual bool IsVisibleLinks() const = 0;
-
+
/**
*/
virtual void SetVisibleLinks(bool bFlag) = 0;
@@ -51,7 +51,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
/**
*/
virtual sfx2::LinkManager& GetLinkManager() = 0;
-
+
/**
*/
virtual const sfx2::LinkManager& GetLinkManager() const = 0;
@@ -60,31 +60,31 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
*/
virtual void UpdateLinks(BOOL bUI) = 0;
-
+
/** SS fuers Linken von Dokumentteilen
*/
virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
-
+
/**
*/
virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
-
+
/**
*/
virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem) = 0;
-
+
/** embedded alle lokalen Links (Bereiche/Grafiken)
*/
virtual bool EmbedAllLinks() = 0;
-
+
/**
*/
virtual void SetLinksUpdated(const bool bNewLinksUpdated) = 0;
-
+
/**
- */
+ */
virtual bool LinksUpdated() const = 0;
-
+
protected:
virtual ~IDocumentLinksAdministration() {};
};
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index 8031993f17e4..e2ce05f7f495 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index b5f47031d9e3..32ed7e03f453 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index e3cff0189cf4..ad03f51905c4 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -2,7 +2,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
@@ -84,18 +84,18 @@ class IDocumentMarkAccess
const ::rtl::OUString& rProposedName,
MarkType eMark) =0;
- virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+ virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType) = 0;
- virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+ virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType) = 0;
/** Returns a mark in the document for a paragraph.
If there is none, a mark will be created.
@param rTxtNode
- [in] the paragraph being marked (a selection over the paragraph is marked)
+ [in] the paragraph being marked (a selection over the paragraph is marked)
@param eMark
[in] the type of the new mark.
@@ -109,18 +109,18 @@ class IDocumentMarkAccess
/** Moves an existing mark to a new selection and performs needed updates.
@param io_pMark
[in/out] the mark to be moved
-
+
@param rPaM
- [in] new selection to be marked
+ [in] new selection to be marked
*/
virtual void repositionMark(::sw::mark::IMark* io_pMark,
const SwPaM& rPaM) =0;
- /** Renames an existing Mark, if possible.
+ /** Renames an existing Mark, if possible.
@param io_pMark
[in/out] the mark to be renamed
-
+
@param rNewName
[in] new name for the mark
@@ -132,9 +132,9 @@ class IDocumentMarkAccess
/** Corrects marks (absolute)
This method ignores the previous position of the mark in the paragraph
- @param rOldNode
+ @param rOldNode
[in] the node from which nodes should be moved
-
+
@param rNewPos
[in] new position to which marks will be moved, if nOffset == 0
@@ -148,11 +148,11 @@ class IDocumentMarkAccess
/** Corrects marks (relative)
This method uses the previous position of the mark in the paragraph as offset
- @param rOldNode
+ @param rOldNode
[in] the node from which nodes should be moved
-
+
@param rNewPos
- [in] new position to which marks from the start of the paragraph will be
+ [in] new position to which marks from the start of the paragraph will be
moved, if nOffset == 0
@param nOffset
@@ -208,7 +208,7 @@ class IDocumentMarkAccess
[in] the name of the mark to find.
@returns
- an iterator pointing to the mark, or pointing to getMarksEnd() if nothing was found.
+ an iterator pointing to the mark, or pointing to getMarksEnd() if nothing was found.
*/
virtual const_iterator_t findMark(const ::rtl::OUString& rMark) const =0;
@@ -233,7 +233,7 @@ class IDocumentMarkAccess
[in] the name of the bookmark to find.
@returns
- an iterator pointing to the bookmark, or getBookmarksEnd() if nothing was found.
+ an iterator pointing to the bookmark, or getBookmarksEnd() if nothing was found.
*/
virtual const_iterator_t findBookmark(const ::rtl::OUString& rMark) const =0;
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 9468fa9c14bb..f0e2cc963e02 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 0e00188dac6b..97f53e81ff3a 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 2b120901f6ba..2c8c5abdb71c 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 22c836c871ea..e4a7552a439c 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -2,7 +2,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
@@ -25,41 +25,41 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
+
#ifndef IDOCUMENTSTATE_HXX_INCLUDED
#define IDOCUMENTSTATE_HXX_INCLUDED
-
+
#include <tools/solar.h>
-
+
/** Get information about the current document state
*/
class IDocumentState
- {
+ {
public:
/** Bei Formataenderungen muss das zu Fuss gerufen werden!
*/
virtual void SetModified() = 0;
-
+
/**
*/
virtual void ResetModified() = 0;
-
+
/** Dokumentaenderungen?
*/
- virtual bool IsModified() const = 0;
-
+ virtual bool IsModified() const = 0;
+
/** Zustaende ueber Ladezustand
frueher DocInfo
*/
virtual bool IsLoaded() const = 0;
-
+
/**
*/
- virtual bool IsUpdateExpFld() const = 0;
-
+ virtual bool IsUpdateExpFld() const = 0;
+
/**
*/
- virtual bool IsNewDoc() const = 0;
+ virtual bool IsNewDoc() const = 0;
/**
*/
@@ -67,16 +67,16 @@
/**
*/
- virtual void SetPageNums(bool b) = 0;
-
+ virtual void SetPageNums(bool b) = 0;
+
/**
*/
virtual void SetNewDoc(bool b) = 0;
-
+
/**
*/
virtual void SetUpdateExpFldStat(bool b) = 0;
-
+
/**
*/
virtual void SetLoaded(bool b = sal_True) = 0;
@@ -84,7 +84,7 @@
protected:
virtual ~IDocumentState() {};
};
-
+
#endif // IDOCUMENTSTATE_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index c40372997da9..e31f1483caaf 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -2,7 +2,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
@@ -42,9 +42,9 @@
*/
virtual void DocInfoChgd() = 0;
- /** Dokument - Statistics
+ /** Dokument - Statistics
*/
- virtual const SwDocStat &GetDocStat() const = 0;
+ virtual const SwDocStat &GetDocStat() const = 0;
/**
*/
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 92727e8c705e..cdb9ef08fcf8 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index c918edc074d4..a717f4606953 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -2,7 +2,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
@@ -25,14 +25,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
+
#ifndef IDOCUMENTTIMERACCESS_HXX_INCLUDED
#define IDOCUMENTTIMERACCESS_HXX_INCLUDED
-
+
/** Get information about the current document state
*/
class IDocumentTimerAccess
- {
+ {
public:
/**
Set modus to start, i.e. start timer if block count == 0
@@ -57,7 +57,7 @@
protected:
virtual ~IDocumentTimerAccess() {};
};
-
+
#endif // IDOCUMENTTIMERACCESS_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 45f33f58dc1b..89b54629d372 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -2,7 +2,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
@@ -177,7 +177,7 @@ public:
bis zum Ende des Undo-Arrays
*/
virtual void ClearRedo() = 0;
-
+
/** Manipulates the position of the undo stack which reset the modified flag
*/
virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition ) = 0;
@@ -185,11 +185,11 @@ public:
/** Gets the position of the undo stack which reset the modified flag
*/
virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const = 0;
-
+
protected:
virtual ~IDocumentUndoRedo() {};
};
-
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index dbaf3867d496..f3581ecbe4fc 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -2,7 +2,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
@@ -37,9 +37,9 @@ class SwDoc;
/** Organizer of the contact between SwTxtNodes and grammar checker
*/
class IGrammarContact
-{
+{
public:
-
+
/** Update cursor position reacts to a change of the current input cursor
As long as the cursor in inside a paragraph, the grammar checking does
not show new grammar faults. When the cursor leaves the paragraph, these
@@ -47,7 +47,7 @@ public:
@returns void
*/
virtual void updateCursorPosition( const SwPosition& rNewPos ) = 0;
-
+
/** getGrammarCheck checks if the given text node is blocked by the current cursor
if not, the normal markup list is returned
if blocked, it will return a markup list "proxy"
diff --git a/sw/inc/IInterface.hxx b/sw/inc/IInterface.hxx
index 1fbdf7947732..fbe9d116edc3 100644
--- a/sw/inc/IInterface.hxx
+++ b/sw/inc/IInterface.hxx
@@ -2,7 +2,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
@@ -28,43 +28,43 @@
#ifndef IINTERFACE_HXX_INCLUDED
#define IINTERFACE_HXX_INCLUDED
-
+
#include <sal/types.h>
-
- /** The base interface
+
+ /** The base interface
*/
class IInterface
- {
+ {
public:
-
+
/** Aquire a reference to an instance. A caller shall release
the instance by calling 'release' when it is no longer needed.
'acquire' and 'release' calls need to be balanced.
-
- @returns
+
+ @returns
the current reference count of the instance for debugging purposes.
*/
virtual sal_Int32 acquire() = 0;
-
+
/** Releases a reference to an instance. A caller has to call
'release' when a before aquired reference to an instance
- is no longer needed. 'acquire' and 'release' calls need to
- be balanced.
-
- @returns
+ is no longer needed. 'acquire' and 'release' calls need to
+ be balanced.
+
+ @returns
the current reference count of the instance for debugging purposes.
*/
- virtual sal_Int32 release() = 0;
-
+ virtual sal_Int32 release() = 0;
+
/** Returns the current reference count. This method should be used for
debugging purposes. Using it otherwise is a signal of a design flaw.
*/
virtual sal_Int32 getReferenceCount() const = 0;
-
+
protected:
virtual ~IInterface() {};
};
-
+
#endif // IDOCUMENT_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 66d1dc6d19df..5ef17ebd5053 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 946492a3b794..2823b10ec078 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -66,12 +66,12 @@ class SwSidebarItem;
class SwFrm;
class Window;
-#define SORT_POS 1
-#define SORT_AUTHOR 2
-#define SORT_DATE 3
+#define SORT_POS 1
+#define SORT_AUTHOR 2
+#define SORT_DATE 3
-#define COL_NOTES_SIDEPANE_ARROW_ENABLED RGB_COLORDATA(0,0,0)
-#define COL_NOTES_SIDEPANE_ARROW_DISABLED RGB_COLORDATA(172,168,153)
+#define COL_NOTES_SIDEPANE_ARROW_ENABLED RGB_COLORDATA(0,0,0)
+#define COL_NOTES_SIDEPANE_ARROW_DISABLED RGB_COLORDATA(172,168,153)
typedef std::list<SwSidebarItem*> SwSidebarItem_list;
typedef std::list<SwSidebarItem*>::iterator SwSidebarItem_iterator;
@@ -146,21 +146,21 @@ class SwNoteProps: public utl::ConfigItem
class SwPostItMgr: public SfxListener
{
private:
- SwView* mpView;
- SwWrtShell* mpWrtShell;
- SwEditWin* mpEditWin;
+ SwView* mpView;
+ SwWrtShell* mpWrtShell;
+ SwEditWin* mpEditWin;
std::list< SwSidebarItem*> mvPostItFlds;
- std::vector<SwPostItPageItem*> mPages;
- ULONG mnEventId;
- bool mbWaitingForCalcRects;
+ std::vector<SwPostItPageItem*> mPages;
+ ULONG mnEventId;
+ bool mbWaitingForCalcRects;
sw::sidebarwindows::SwSidebarWin* mpActivePostIt;
- bool mbLayout;
- long mbLayoutHeight;
- long mbLayouting;
- bool mbReadOnly;
- bool mbDeleteNote;
- FieldShadowState mShadowState;
- OutlinerParaObject* mpAnswer;
+ bool mbLayout;
+ long mbLayoutHeight;
+ long mbLayouting;
+ bool mbReadOnly;
+ bool mbDeleteNote;
+ FieldShadowState mShadowState;
+ OutlinerParaObject* mpAnswer;
bool mbIsShowAnchor;
// data structure to collect the <SwSidebarWin> instances for certain <SwFrm> instances.
@@ -168,26 +168,26 @@ class SwPostItMgr: public SfxListener
typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator SwSidebarWin_iterator;
- void AddPostIts(bool bCheckExistance = true,bool bFocus = true);
- //void AddRedlineComments(bool bCheckExistance, bool bFocus);
+ void AddPostIts(bool bCheckExistance = true,bool bFocus = true);
+ //void AddRedlineComments(bool bCheckExistance, bool bFocus);
void RemoveSidebarWin();
- void PreparePageContainer();
- void Scroll(const long lScroll,const unsigned long aPage );
+ void PreparePageContainer();
+ void Scroll(const long lScroll,const unsigned long aPage );
void AutoScroll(const sw::sidebarwindows::SwSidebarWin* pPostIt,const unsigned long aPage );
- bool ScrollbarHit(const unsigned long aPage,const Point &aPoint);
+ bool ScrollbarHit(const unsigned long aPage,const Point &aPoint);
bool LayoutByPage( std::list<sw::sidebarwindows::SwSidebarWin*> &aVisiblePostItList,
const Rectangle aBorder,
long lNeededHeight);
- void CheckForRemovedPostIts();
- bool ArrowEnabled(USHORT aDirection,unsigned long aPage) const;
- bool BorderOverPageBorder(unsigned long aPage) const;
- bool HasScrollbars() const;
- void Focus(SfxBroadcaster& rBC);
-
- sal_Int32 GetInitialAnchorDistance() const;
- sal_Int32 GetScrollSize() const;
- sal_Int32 GetSpaceBetween() const;
- void SetReadOnlyState();
+ void CheckForRemovedPostIts();
+ bool ArrowEnabled(USHORT aDirection,unsigned long aPage) const;
+ bool BorderOverPageBorder(unsigned long aPage) const;
+ bool HasScrollbars() const;
+ void Focus(SfxBroadcaster& rBC);
+
+ sal_Int32 GetInitialAnchorDistance() const;
+ sal_Int32 GetScrollSize() const;
+ sal_Int32 GetSpaceBetween() const;
+ void SetReadOnlyState();
DECL_LINK( CalcHdl, void*);
sw::sidebarwindows::SwSidebarWin* GetSidebarWin(const SfxBroadcaster* pBroadcaster) const;
@@ -202,8 +202,8 @@ class SwPostItMgr: public SfxListener
~SwPostItMgr();
typedef std::list< SwSidebarItem* >::const_iterator const_iterator;
- const_iterator begin() const { return mvPostItFlds.begin(); }
- const_iterator end() const { return mvPostItFlds.end(); }
+ const_iterator begin() const { return mvPostItFlds.begin(); }
+ const_iterator end() const { return mvPostItFlds.end(); }
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -264,12 +264,12 @@ class SwPostItMgr: public SfxListener
void SetSpellChecking();
- Color GetColorDark(sal_uInt16 aAuthorIndex);
- Color GetColorLight(sal_uInt16 aAuthorIndex);
+ Color GetColorDark(sal_uInt16 aAuthorIndex);
+ Color GetColorLight(sal_uInt16 aAuthorIndex);
Color GetColorAnchor(sal_uInt16 aAuthorIndex);
- void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;}
+ void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;}
OutlinerParaObject* IsAnswer() {return mpAnswer;}
void CheckMetaText();
void StartSpelling();
diff --git a/sw/inc/RefreshListenerContainer.hxx b/sw/inc/RefreshListenerContainer.hxx
index cc9506d843b1..155b5face17e 100644
--- a/sw/inc/RefreshListenerContainer.hxx
+++ b/sw/inc/RefreshListenerContainer.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 7720c387b7ea..981b1a7dfa07 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -99,47 +99,47 @@ class SwSidebarWin : public Window
long GetPostItTextHeight();
- void SwitchToPostIt(USHORT aDirection);
- virtual void SwitchToFieldPos();
+ void SwitchToPostIt(USHORT aDirection);
+ virtual void SwitchToFieldPos();
virtual sal_uInt32 MoveCaret() = 0;
- virtual void UpdateData() = 0;
- virtual void SetPostItText() = 0;
- virtual void Delete();
- virtual void GotoPos() = 0;
+ virtual void UpdateData() = 0;
+ virtual void SetPostItText() = 0;
+ virtual void Delete();
+ virtual void GotoPos() = 0;
virtual String GetAuthor() = 0;
virtual Date GetDate() = 0;
virtual Time GetTime() = 0;
- void ExecuteCommand(USHORT nSlot);
- void InitControls();
+ void ExecuteCommand(USHORT nSlot);
+ void InitControls();
void HidePostIt();
void DoResize();
- void ResizeIfNeccessary(long aOldHeight, long aNewHeight);
- void SetScrollbar();
+ void ResizeIfNeccessary(long aOldHeight, long aNewHeight);
+ void SetScrollbar();
- void SetVirtualPosSize( const Point& aPoint, const Size& aSize);
- const Point VirtualPos() { return mPosSize.TopLeft(); }
- const Size VirtualSize() { return mPosSize.GetSize(); }
+ void SetVirtualPosSize( const Point& aPoint, const Size& aSize);
+ const Point VirtualPos() { return mPosSize.TopLeft(); }
+ const Size VirtualSize() { return mPosSize.GetSize(); }
void ShowAnchorOnly(const Point &aPoint);
void ShowNote();
void HideNote();
- void ResetAttributes();
+ void ResetAttributes();
void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition);
- void SetReadonly(BOOL bSet);
- BOOL IsReadOnly() { return mbReadonly;}
- bool IsPreview() { return nFlags & PB_Preview;}
+ void SetReadonly(BOOL bSet);
+ BOOL IsReadOnly() { return mbReadonly;}
+ bool IsPreview() { return nFlags & PB_Preview;}
void SetColor(Color aColorDark,Color aColorLight, Color aColorAnchor);
const Color& ColorAnchor() { return mColorAnchor; }
const Color& ColorDark() { return mColorDark; }
const Color& ColorLight() { return mColorLight; }
- void Rescale();
+ void Rescale();
void SetViewState(::sw::sidebarwindows::ViewState bViewState);
@@ -147,25 +147,25 @@ class SwSidebarWin : public Window
void SetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; };
virtual bool CalcFollow() = 0;
- sal_Int32 GetMetaHeight();
- sal_Int32 GetMinimumSizeWithMeta();
- sal_Int32 GetMinimumSizeWithoutMeta();
- sal_Int32 GetMetaButtonAreaWidth();
- sal_Int32 GetScrollbarWidth();
+ sal_Int32 GetMetaHeight();
+ sal_Int32 GetMinimumSizeWithMeta();
+ sal_Int32 GetMinimumSizeWithoutMeta();
+ sal_Int32 GetMetaButtonAreaWidth();
+ sal_Int32 GetScrollbarWidth();
- void SetSpellChecking();
+ void SetSpellChecking();
- void ToggleInsMode();
+ void ToggleInsMode();
- virtual void ActivatePostIt();
- virtual void DeactivatePostIt();
+ virtual void ActivatePostIt();
+ virtual void DeactivatePostIt();
void SetChangeTracking( const SwPostItHelper::SwLayoutStatus aStatus,
const Color& aColor);
SwPostItHelper::SwLayoutStatus GetLayoutStatus() { return mLayoutStatus; }
Color GetChangeColor() { return mChangeColor; }
- virtual bool IsProtected() {return mbReadonly;};
+ virtual bool IsProtected() {return mbReadonly;};
DECL_LINK( WindowEventListener, VclSimpleEvent* );
inline bool IsMouseOverSidebarWin() const { return mbMouseOver; }
@@ -245,27 +245,27 @@ class SwSidebarWin : public Window
class SwRedComment : public SwSidebarWin
{
private:
- SwRedline* pRedline;
+ SwRedline* pRedline;
protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
public:
SwRedComment( Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits,SwRedline* pRed);
virtual ~SwRedComment() {};
- virtual void UpdateData();
- virtual void SetPostItText();
- virtual void Delete();
- virtual void GotoPos();
- virtual void SetPopup();
- virtual void ActivatePostIt();
- virtual void DeactivatePostIt();
+ virtual void UpdateData();
+ virtual void SetPostItText();
+ virtual void Delete();
+ virtual void GotoPos();
+ virtual void SetPopup();
+ virtual void ActivatePostIt();
+ virtual void DeactivatePostIt();
- virtual String GetAuthor();
- virtual Date GetDate();
- virtual Time GetTime();
+ virtual String GetAuthor();
+ virtual Date GetDate();
+ virtual Time GetTime();
- virtual bool IsProtected();
+ virtual bool IsProtected();
};
*/
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index b6870c745635..8ec30648b775 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -2,7 +2,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
@@ -54,8 +54,8 @@ class SwApplet_Impl
{
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet;
SvCommandList aCommandList; // und die szugehorige Command-List
- SfxItemSet aItemSet;
- String sAlt;
+ SfxItemSet aItemSet;
+ String sAlt;
public:
static USHORT GetOptionType( const String& rName, BOOL bApplet );
diff --git a/sw/inc/SwCapObjType.hxx b/sw/inc/SwCapObjType.hxx
index e0f194f5cdbb..3fae8a859e00 100644
--- a/sw/inc/SwCapObjType.hxx
+++ b/sw/inc/SwCapObjType.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 25e1a4181755..44040cbafac2 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -2,7 +2,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
@@ -36,12 +36,12 @@ typedef USHORT SwGetPoolIdFromName;
namespace nsSwGetPoolIdFromName
{
const SwGetPoolIdFromName GET_POOLID_TXTCOLL = 0x01;
- const SwGetPoolIdFromName GET_POOLID_CHRFMT = 0x02;
- const SwGetPoolIdFromName GET_POOLID_FRMFMT = 0x04;
+ const SwGetPoolIdFromName GET_POOLID_CHRFMT = 0x02;
+ const SwGetPoolIdFromName GET_POOLID_FRMFMT = 0x04;
const SwGetPoolIdFromName GET_POOLID_PAGEDESC = 0x08;
const SwGetPoolIdFromName GET_POOLID_NUMRULE = 0x10;
}
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 69cf305cd0e0..d05552d7c160 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index e8c0ac0e08d1..4d880b6b8831 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwNumberTreeTypes.hxx b/sw/inc/SwNumberTreeTypes.hxx
index a50140d96c27..378d7f4b753b 100644
--- a/sw/inc/SwNumberTreeTypes.hxx
+++ b/sw/inc/SwNumberTreeTypes.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 8de178aac4bb..c2d60502b8bf 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index d06293ad82bb..7b59e871bebf 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -2,7 +2,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
@@ -45,13 +45,13 @@ private:
SwSmartTagMgr( const rtl::OUString& rModuleName );
virtual ~SwSmartTagMgr();
-
+
public:
static SwSmartTagMgr& Get();
-
+
// ::com::sun::star::util::XModifyListener
virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
-
+
// ::com::sun::star::util::XChangesListener
virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 1269c2efd1c4..429c5f32a6f8 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -2,7 +2,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
@@ -44,8 +44,8 @@
* These UI names are loaded from the resource files on demand.
*
* It also holds all information about the 'Programmatic' names of styles
- * which remain static (and are hardcoded in the corresponding cxx file)
- * for all languages.
+ * which remain static (and are hardcoded in the corresponding cxx file)
+ * for all languages.
*
* This class also provides static functions which can be used for the
* following conversions:
@@ -59,7 +59,7 @@
*
* The relationship of these tables to the style families is as follows:
*
- * 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML
+ * 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML
* name arrays.
* 2. Character contains the ChrFmt and HTMLChrFmt name arrays.
* 3. Page contains the PageDesc name array.
@@ -97,8 +97,8 @@ class SwStyleNameMapper
protected:
// UI Name tables
- static SvStringsDtor *pTextUINameArray,
- *pListsUINameArray,
+ static SvStringsDtor *pTextUINameArray,
+ *pListsUINameArray,
*pExtraUINameArray,
*pRegisterUINameArray,
*pDocUINameArray,
@@ -109,8 +109,8 @@ protected:
*pPageDescUINameArray,
*pNumRuleUINameArray,
// Programmatic Name tables
- *pTextProgNameArray,
- *pListsProgNameArray,
+ *pTextProgNameArray,
+ *pListsProgNameArray,
*pExtraProgNameArray,
*pRegisterProgNameArray,
*pDocProgNameArray,
@@ -133,12 +133,12 @@ protected:
*pFrameProgMap,
*pNumRuleProgMap;
- static SvStringsDtor* NewUINameArray( SvStringsDtor*&,
- sal_uInt16 nStt,
+ static SvStringsDtor* NewUINameArray( SvStringsDtor*&,
+ sal_uInt16 nStt,
sal_uInt16 nEnd );
- static SvStringsDtor* NewProgNameArray( SvStringsDtor*&,
- const SwTableEntry *pTable,
+ static SvStringsDtor* NewProgNameArray( SvStringsDtor*&,
+ const SwTableEntry *pTable,
sal_uInt8 nCount);
static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool bProgName );
@@ -150,18 +150,18 @@ protected:
public:
// This gets the UI Name from the programmatic name
static const String& GetUIName ( const String& rName, SwGetPoolIdFromName );
- static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+ static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
// Get the programmatic Name from the UI name
static const String& GetProgName ( const String& rName, SwGetPoolIdFromName );
- static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+ static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
// This gets the UI Name from the Pool ID
SW_DLLPUBLIC static void FillUIName ( sal_uInt16 nId, String& rFillName );
SW_DLLPUBLIC static const String& GetUIName ( sal_uInt16 nId, const String& rName );
// This gets the programmatic Name from the Pool ID
- static void FillProgName( sal_uInt16 nId, String& rFillName );
+ static void FillProgName( sal_uInt16 nId, String& rFillName );
SW_DLLPUBLIC static const String& GetProgName ( sal_uInt16 nId, const String& rName );
// This gets the PoolId from the UI Name
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index b2d8671a8a8b..eba56ed8c659 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx
index 3b11b548261a..b68ae488bec3 100644
--- a/sw/inc/SwUndoFmt.hxx
+++ b/sw/inc/SwUndoFmt.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwUndoPageDesc.hxx b/sw/inc/SwUndoPageDesc.hxx
index 4b52347198a7..b112437bd7b4 100644
--- a/sw/inc/SwUndoPageDesc.hxx
+++ b/sw/inc/SwUndoPageDesc.hxx
@@ -2,7 +2,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
@@ -41,9 +41,9 @@ class SwUndoPageDesc : public SwUndo
SwDoc * pDoc;
bool bExchange;
- // To avoid duplication of (header/footer)content nodes for simple page desc changes
- void ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest );
-
+ // To avoid duplication of (header/footer)content nodes for simple page desc changes
+ void ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest );
+
public:
SwUndoPageDesc(const SwPageDesc & aOld, const SwPageDesc & aNew,
SwDoc * pDoc);
diff --git a/sw/inc/SwUndoTOXChange.hxx b/sw/inc/SwUndoTOXChange.hxx
index 9c6838e470a1..1b498b5154e0 100644
--- a/sw/inc/SwUndoTOXChange.hxx
+++ b/sw/inc/SwUndoTOXChange.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 7a9971f8f875..8655fc468b11 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ public:
SvStrings & rSectionList;
// #110680#
- SwXMLSectionList(
+ SwXMLSectionList(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
SvStrings & rNewSectionList );
@@ -60,13 +60,13 @@ private:
SwXMLSectionList & rLocalRef;
public:
SvXMLSectionListContext ( SwXMLSectionList& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SvXMLSectionListContext ( void );
};
@@ -77,13 +77,13 @@ private:
SwXMLSectionList & rLocalRef;
public:
SvXMLIgnoreSectionListContext ( SwXMLSectionList& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SvXMLIgnoreSectionListContext ( void );
};
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index 731cccf33c58..b5e511037d91 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.hxx
@@ -2,7 +2,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
@@ -44,10 +44,10 @@ public:
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
- virtual const SwPaM* GetPaM() const = 0;
- virtual SwPaM* GetPaM() = 0;
- virtual const SwDoc* GetDoc() const = 0;
- virtual SwDoc* GetDoc() = 0;
+ virtual const SwPaM* GetPaM() const = 0;
+ virtual SwPaM* GetPaM() = 0;
+ virtual const SwDoc* GetDoc() const = 0;
+ virtual SwDoc* GetDoc() = 0;
};
#endif // _SW_TEXTCURSORHELPER_HXX
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 445d0c401e00..cecaa83776d6 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 93692b635357..7170d762d2f1 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -2,7 +2,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
@@ -296,7 +296,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
const long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (::com::sun::star::uno::RuntimeException);
+ ) throw (::com::sun::star::uno::RuntimeException);
// additional Core/Pixel conversions for internal use; also works
// for preview
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 476e72f8ec81..69648ca8f11e 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@ public:
void SetMaxCount( USHORT n );
- USHORT GetMinWordLen() const { return nMinWrdLen; }
+ USHORT GetMinWordLen() const { return nMinWrdLen; }
void SetMinWordLen( USHORT n );
const SvStringsISortDtor& GetWordList() const { return aWordLst; }
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 47594915644e..d8f563651e72 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 66311bc4e84d..b8a97575afa7 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 5155673ba074..b9eb7063207f 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -2,7 +2,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
@@ -41,28 +41,28 @@ class SwAuthDataArr;
--------------------------------------------------*/
class SwAuthEntry
{
- String aAuthFields[AUTH_FIELD_END];
- USHORT nRefCount;
+ String aAuthFields[AUTH_FIELD_END];
+ USHORT nRefCount;
public:
SwAuthEntry() : nRefCount(0){}
SwAuthEntry( const SwAuthEntry& rCopy );
- BOOL operator==(const SwAuthEntry& rComp);
+ BOOL operator==(const SwAuthEntry& rComp);
- inline const String& GetAuthorField(ToxAuthorityField ePos)const;
- inline void SetAuthorField(ToxAuthorityField ePos,
+ inline const String& GetAuthorField(ToxAuthorityField ePos)const;
+ inline void SetAuthorField(ToxAuthorityField ePos,
const String& rField);
- void AddRef() { ++nRefCount; }
- void RemoveRef() { --nRefCount; }
- USHORT GetRefCount() { return nRefCount; }
+ void AddRef() { ++nRefCount; }
+ void RemoveRef() { --nRefCount; }
+ USHORT GetRefCount() { return nRefCount; }
};
/* -----------------20.10.99 16:49-------------------
--------------------------------------------------*/
struct SwTOXSortKey
{
- ToxAuthorityField eField;
- BOOL bSortAscending;
+ ToxAuthorityField eField;
+ BOOL bSortAscending;
SwTOXSortKey() :
eField(AUTH_FIELD_END),
bSortAscending(TRUE){}
@@ -76,14 +76,14 @@ class SortKeyArr;
class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
{
- SwDoc* m_pDoc;
- SwAuthDataArr* m_pDataArr;
- SvLongs* m_pSequArr;
- SortKeyArr* m_pSortKeyArr;
- sal_Unicode m_cPrefix;
- sal_Unicode m_cSuffix;
- BOOL m_bIsSequence :1;
- BOOL m_bSortByDocument :1;
+ SwDoc* m_pDoc;
+ SwAuthDataArr* m_pDataArr;
+ SvLongs* m_pSequArr;
+ SortKeyArr* m_pSortKeyArr;
+ sal_Unicode m_cPrefix;
+ sal_Unicode m_cSuffix;
+ BOOL m_bIsSequence :1;
+ BOOL m_bSortByDocument :1;
LanguageType m_eLanguage;
String m_sSortAlgorithm;
@@ -96,62 +96,62 @@ public:
~SwAuthorityFieldType();
virtual SwFieldType* Copy() const;
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
SwDoc* GetDoc(){ return m_pDoc; }
- void RemoveField(long nHandle);
- long AddField(const String& rFieldContents);
- BOOL AddField(long nHandle);
- void DelSequenceArray()
+ void RemoveField(long nHandle);
+ long AddField(const String& rFieldContents);
+ BOOL AddField(long nHandle);
+ void DelSequenceArray()
{
m_pSequArr->Remove(0, m_pSequArr->Count());
}
- const SwAuthEntry* GetEntryByHandle(long nHandle) const;
+ const SwAuthEntry* GetEntryByHandle(long nHandle) const;
- void GetAllEntryIdentifiers( SvStringsDtor& rToFill )const;
- const SwAuthEntry* GetEntryByIdentifier(const String& rIdentifier)const;
+ void GetAllEntryIdentifiers( SvStringsDtor& rToFill )const;
+ const SwAuthEntry* GetEntryByIdentifier(const String& rIdentifier)const;
bool ChangeEntryContent(const SwAuthEntry* pNewEntry);
// import interface
- USHORT AppendField(const SwAuthEntry& rInsert);
- long GetHandle(USHORT nPos);
+ USHORT AppendField(const SwAuthEntry& rInsert);
+ long GetHandle(USHORT nPos);
- USHORT GetSequencePos(long nHandle);
+ USHORT GetSequencePos(long nHandle);
- BOOL IsSequence() const {return m_bIsSequence;}
- void SetSequence(BOOL bSet)
+ BOOL IsSequence() const {return m_bIsSequence;}
+ void SetSequence(BOOL bSet)
{
DelSequenceArray();
m_bIsSequence = bSet;
}
- void SetPreSuffix( sal_Unicode cPre, sal_Unicode cSuf)
+ void SetPreSuffix( sal_Unicode cPre, sal_Unicode cSuf)
{
m_cPrefix = cPre;
m_cSuffix = cSuf;
}
- sal_Unicode GetPrefix() const { return m_cPrefix;}
- sal_Unicode GetSuffix() const { return m_cSuffix;}
+ sal_Unicode GetPrefix() const { return m_cPrefix;}
+ sal_Unicode GetSuffix() const { return m_cSuffix;}
- BOOL IsSortByDocument() const {return m_bSortByDocument;}
- void SetSortByDocument(BOOL bSet)
+ BOOL IsSortByDocument() const {return m_bSortByDocument;}
+ void SetSortByDocument(BOOL bSet)
{
DelSequenceArray();
m_bSortByDocument = bSet;
}
- USHORT GetSortKeyCount() const ;
- const SwTOXSortKey* GetSortKey(USHORT nIdx) const ;
- void SetSortKeys(USHORT nKeyCount, SwTOXSortKey nKeys[]);
+ USHORT GetSortKeyCount() const ;
+ const SwTOXSortKey* GetSortKey(USHORT nIdx) const ;
+ void SetSortKeys(USHORT nKeyCount, SwTOXSortKey nKeys[]);
//initui.cxx
- static const String& GetAuthFieldName(ToxAuthorityField eType);
- static const String& GetAuthTypeName(ToxAuthorityType eType);
+ static const String& GetAuthFieldName(ToxAuthorityField eType);
+ static const String& GetAuthTypeName(ToxAuthorityType eType);
LanguageType GetLanguage() const {return m_eLanguage;}
void SetLanguage(LanguageType nLang) {m_eLanguage = nLang;}
@@ -172,11 +172,11 @@ public:
SwAuthorityField(SwAuthorityFieldType* pType, long nHandle);
~SwAuthorityField();
- const String& GetFieldText(ToxAuthorityField eField) const;
+ const String& GetFieldText(ToxAuthorityField eField) const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
- virtual void SetPar1(const String& rStr);
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
+ virtual void SetPar1(const String& rStr);
virtual SwFieldType* ChgTyp( SwFieldType* );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
@@ -188,12 +188,12 @@ public:
};
// --- inlines -----------------------------------------------------------
-inline const String& SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const
+inline const String& SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const
{
DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
return aAuthFields[ePos];
}
-inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const String& rField)
+inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const String& rField)
{
DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
if(AUTH_FIELD_END > ePos)
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 7c369a6acecc..b082e70f7900 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -2,7 +2,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
@@ -33,20 +33,20 @@
#include <tools/color.hxx>
#include "swdllapi.h"
-#define COL_NONE TRGB_COLORDATA( 0x80, 0xFF, 0xFF, 0xFF )
+#define COL_NONE TRGB_COLORDATA( 0x80, 0xFF, 0xFF, 0xFF )
class SW_DLLPUBLIC AuthorCharAttr
{
public:
- USHORT nItemId;
- USHORT nAttr;
+ USHORT nItemId;
+ USHORT nAttr;
ColorData nColor;
AuthorCharAttr();
inline BOOL operator == ( const AuthorCharAttr& rAttr ) const
{
- return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
+ return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
nColor == rAttr.nColor;
}
};
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 2032300ea0dc..425f8395e12f 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class BigPtrEntry
public:
virtual ~BigPtrEntry() {}
protected:
- BigPtrEntry() : pBlock(0), nOffset(0) {}
+ BigPtrEntry() : pBlock(0), nOffset(0) {}
inline ULONG GetPos() const;
inline BigPtrArray& GetArray() const;
@@ -63,27 +63,27 @@ typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
// Overhead definiert haben, reichen 80% = 800 Eintraege vollkommen aus
// Will mann voellige Kompression haben, muss eben 100 angegeben werden.
-#define COMPRESSLVL 80
+#define COMPRESSLVL 80
-struct BlockInfo { // Block-Info:
- BigPtrArray* pBigArr; // in diesem Array steht der Block
- ElementPtr* pData; // Datenblock
- ULONG nStart, nEnd; // Start- und EndIndex
- USHORT nElem; // Anzahl Elemente
+struct BlockInfo { // Block-Info:
+ BigPtrArray* pBigArr; // in diesem Array steht der Block
+ ElementPtr* pData; // Datenblock
+ ULONG nStart, nEnd; // Start- und EndIndex
+ USHORT nElem; // Anzahl Elemente
};
class SW_DLLPUBLIC BigPtrArray
{
- BlockInfo** ppInf; // Block-Infos
- ULONG nSize; // Anzahl Elemente
- USHORT nMaxBlock; // akt. max Anzahl Bloecke
- USHORT nBlock; // Anzahl Bloecke
- USHORT nCur; // letzter Block
-
- USHORT Index2Block( ULONG ) const; // Blocksuche
- BlockInfo* InsBlock( USHORT ); // Block einfuegen
- void BlockDel( USHORT ); // es wurden Bloecke geloescht
- void UpdIndex( USHORT ); // Indexe neu berechnen
+ BlockInfo** ppInf; // Block-Infos
+ ULONG nSize; // Anzahl Elemente
+ USHORT nMaxBlock; // akt. max Anzahl Bloecke
+ USHORT nBlock; // Anzahl Bloecke
+ USHORT nCur; // letzter Block
+
+ USHORT Index2Block( ULONG ) const; // Blocksuche
+ BlockInfo* InsBlock( USHORT ); // Block einfuegen
+ void BlockDel( USHORT ); // es wurden Bloecke geloescht
+ void UpdIndex( USHORT ); // Indexe neu berechnen
protected:
// fuelle alle Bloecke auf.
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index ac95208423e1..5b16b3eab660 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@
class String;
/*************************************************************************
- * class SwBreakIt
+ * class SwBreakIt
*************************************************************************/
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwBreakIt
LanguageType aForbiddenLang; // language of the current forbiddenChar struct
void _GetLocale( const LanguageType aLang );
- void _GetForbidden( const LanguageType aLang );
+ void _GetForbidden( const LanguageType aLang );
void createBreakIterator() const;
void createScriptTypeDetector();
@@ -89,10 +89,10 @@ public:
return xBreak;
}
- com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > GetScriptTypeDetector()
- {
+ com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > GetScriptTypeDetector()
+ {
createScriptTypeDetector();
- return xCTLDetect;
+ return xCTLDetect;
}
const com::sun::star::lang::Locale& GetLocale( const LanguageType aLang )
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 9ce4a11a2159..4c5c4494c36e 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -2,7 +2,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
@@ -65,15 +65,15 @@ class SW_DLLPUBLIC SwClient
friend class SwModify;
friend class SwClientIter;
- SwClient *pLeft, *pRight; // fuer die AVL-Sortierung
- BOOL bModifyLocked : 1; // wird in SwModify::Modify benutzt,
+ SwClient *pLeft, *pRight; // fuer die AVL-Sortierung
+ BOOL bModifyLocked : 1; // wird in SwModify::Modify benutzt,
// eigentlich ein Member des SwModify
// aber aus Platzgruenden hier.
- BOOL bInModify : 1; // ist in einem Modify. (Debug!!!)
- BOOL bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden"
- BOOL bInCache : 1; // Ist im BorderAttrCache des Layout,
+ BOOL bInModify : 1; // ist in einem Modify. (Debug!!!)
+ BOOL bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden"
+ BOOL bInCache : 1; // Ist im BorderAttrCache des Layout,
// Traegt sich dann im Modify aus!
- BOOL bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung
+ BOOL bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung
protected:
SwModify *pRegisteredIn;
@@ -93,14 +93,14 @@ public:
//werden.
TYPEINFO();
- void LockModify() { bModifyLocked = TRUE; }
- void UnlockModify() { bModifyLocked = FALSE; }
- void SetInCache( BOOL bNew ) { bInCache = bNew; }
- void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; }
- BOOL IsModifyLocked() const { return bModifyLocked; }
- BOOL IsInDocDTOR() const { return bInDocDTOR; }
- BOOL IsInCache() const { return bInCache; }
- BOOL IsInSwFntCache() const { return bInSwFntCache; }
+ void LockModify() { bModifyLocked = TRUE; }
+ void UnlockModify() { bModifyLocked = FALSE; }
+ void SetInCache( BOOL bNew ) { bInCache = bNew; }
+ void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; }
+ BOOL IsModifyLocked() const { return bModifyLocked; }
+ BOOL IsInDocDTOR() const { return bInDocDTOR; }
+ BOOL IsInCache() const { return bInCache; }
+ BOOL IsInSwFntCache() const { return bInSwFntCache; }
// erfrage vom Client Informationen
virtual BOOL GetInfo( SfxPoolItem& ) const;
@@ -140,9 +140,9 @@ public:
virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue );
void Add(SwClient *pDepend);
SwClient *Remove(SwClient *pDepend)
- { return bInDocDTOR ? 0 : _Remove( pDepend ); }
+ { return bInDocDTOR ? 0 : _Remove( pDepend ); }
- const SwClient* GetDepends() const { return pRoot; }
+ const SwClient* GetDepends() const { return pRoot; }
// erfrage vom Client Informationen
virtual BOOL GetInfo( SfxPoolItem& ) const;
@@ -197,8 +197,8 @@ private:
class SwClientIter
{
- friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
- friend void SwModify::Add(SwClient *); // nur fuer OSL_ENSURE(!
+ friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
+ friend void SwModify::Add(SwClient *); // nur fuer OSL_ENSURE(!
SwModify const& rRoot;
SwClient *pAkt, *pDelNext;
@@ -208,25 +208,25 @@ class SwClientIter
SwClient* mpWatchClient; // if set, SwModify::_Remove checks if this client is removed
- TypeId aSrchId; // fuer First/Next - suche diesen Type
+ TypeId aSrchId; // fuer First/Next - suche diesen Type
public:
SW_DLLPUBLIC SwClientIter( SwModify const& );
SW_DLLPUBLIC ~SwClientIter();
- const SwModify& GetModify() const { return rRoot; }
+ const SwModify& GetModify() const { return rRoot; }
#ifndef CFRONT
- SwClient* operator++(int); // zum Naechsten
- SwClient* operator--(int); // zum Vorherigen
+ SwClient* operator++(int); // zum Naechsten
+ SwClient* operator--(int); // zum Vorherigen
#endif
- SwClient* operator++(); // zum Naechsten
- SwClient* operator--(); // zum Vorherigen
+ SwClient* operator++(); // zum Naechsten
+ SwClient* operator--(); // zum Vorherigen
- SwClient* GoStart(); // zum Anfang
- SwClient* GoEnd(); // zum Ende
+ SwClient* GoStart(); // zum Anfang
+ SwClient* GoEnd(); // zum Ende
- inline SwClient* GoRoot(); // wieder ab Root (==Start) anfangen
+ inline SwClient* GoRoot(); // wieder ab Root (==Start) anfangen
SwClient* operator()() const
{ return pDelNext == pAkt ? pAkt : pDelNext; }
@@ -240,7 +240,7 @@ public:
void SetWatchClient( SwClient* pWatch ) { mpWatchClient = pWatch; }
};
-inline SwClient* SwClientIter::GoRoot() // wieder ab Root anfangen
+inline SwClient* SwClientIter::GoRoot() // wieder ab Root anfangen
{
pAkt = rRoot.pRoot;
return (pDelNext = pAkt);
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 36614e6725f5..bcc0ff6fa079 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -2,7 +2,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
@@ -41,29 +41,29 @@ class LocaleDataWrapper;
class SwFieldType;
class SwDoc;
-#define TBLSZ 47 // sollte Primzahl sein, wegen HashTable
+#define TBLSZ 47 // sollte Primzahl sein, wegen HashTable
-const sal_Unicode cListDelim = '|';
+const sal_Unicode cListDelim = '|';
/******************************************************************************
- * Calculate Operations
+ * Calculate Operations
******************************************************************************/
enum SwCalcOper
{
- CALC_NAME, CALC_NUMBER, CALC_ENDCALC,
+ CALC_NAME, CALC_NUMBER, CALC_ENDCALC,
CALC_PLUS='+', CALC_MINUS='-', CALC_MUL='*',
CALC_DIV='/', CALC_PRINT=';', CALC_ASSIGN='=',
CALC_LP='(', CALC_RP=')', CALC_PHD='%',
CALC_POW='^',
CALC_LISTOP = cListDelim,
- CALC_NOT=256, CALC_AND=257, CALC_OR=258,
- CALC_XOR=259, CALC_EQ=260, CALC_NEQ=261,
- CALC_LEQ=262, CALC_GEQ=263, CALC_LES=264,
- CALC_GRE=265, CALC_SUM=266, CALC_MEAN=267,
- CALC_SQRT=268, CALC_MIN=269, CALC_MIN_IN=270,
- CALC_MAX=271, CALC_MAX_IN=272, CALC_SIN=273,
- CALC_COS=274, CALC_TAN=275, CALC_ASIN=276,
- CALC_ACOS=278, CALC_ATAN=279, CALC_TDIF=280,
+ CALC_NOT=256, CALC_AND=257, CALC_OR=258,
+ CALC_XOR=259, CALC_EQ=260, CALC_NEQ=261,
+ CALC_LEQ=262, CALC_GEQ=263, CALC_LES=264,
+ CALC_GRE=265, CALC_SUM=266, CALC_MEAN=267,
+ CALC_SQRT=268, CALC_MIN=269, CALC_MIN_IN=270,
+ CALC_MAX=271, CALC_MAX_IN=272, CALC_SIN=273,
+ CALC_COS=274, CALC_TAN=275, CALC_ASIN=276,
+ CALC_ACOS=278, CALC_ATAN=279, CALC_TDIF=280,
CALC_ROUND=281, CALC_DATE=282, CALC_MONTH=283,
CALC_DAY=284
};
@@ -102,18 +102,18 @@ extern const sal_Char __FAR_DATA sCalc_Round[];
extern const sal_Char __FAR_DATA sCalc_Date[];
/******************************************************************************
- * Calculate ErrorCodes
+ * Calculate ErrorCodes
******************************************************************************/
enum SwCalcError
{
CALC_NOERR=0,
- CALC_SYNTAX, // Syntax Fehler
- CALC_ZERODIV, // Division durch Null
- CALC_BRACK, // Fehlerhafte Klammerung
- CALC_POWERR, // Ueberlauf in Quadratfunktion
- CALC_VARNFND, // Variable wurde nicht gefunden
- CALC_OVERFLOW, // Ueberlauf
- CALC_WRONGTIME // falsches Zeitformat
+ CALC_SYNTAX, // Syntax Fehler
+ CALC_ZERODIV, // Division durch Null
+ CALC_BRACK, // Fehlerhafte Klammerung
+ CALC_POWERR, // Ueberlauf in Quadratfunktion
+ CALC_VARNFND, // Variable wurde nicht gefunden
+ CALC_OVERFLOW, // Ueberlauf
+ CALC_WRONGTIME // falsches Zeitformat
};
class SwSbxValue : public SbxValue
@@ -121,14 +121,14 @@ class SwSbxValue : public SbxValue
bool bVoid;
public:
//JP 03.02.99: immer auf eine Zahl defaulten, damit auch gerechnet wird.
- // Ansonsten wird daraus ein SbxEMPTY und damit ist nichts
- // anzufangen.
+ // Ansonsten wird daraus ein SbxEMPTY und damit ist nichts
+ // anzufangen.
SwSbxValue( long n = 0 ) : bVoid(false) { PutLong( n ); }
SwSbxValue( const double& rD ) : bVoid(false) { PutDouble( rD ); }
- SwSbxValue( const SwSbxValue& rVal ) :
+ SwSbxValue( const SwSbxValue& rVal ) :
SvRefBase( rVal ),
- SbxValue( rVal ),
- bVoid(rVal.bVoid)
+ SbxValue( rVal ),
+ bVoid(rVal.bVoid)
{}
virtual ~SwSbxValue();
@@ -138,25 +138,25 @@ public:
// Strings sonderbehandeln BOOLs sonderbehandeln
double GetDouble() const;
SwSbxValue& MakeDouble();
-
+
bool IsVoidValue() {return bVoid;}
void SetVoidValue(bool bSet) {bVoid = bSet;}
};
/******************************************************************************
- * Calculate HashTables fuer VarTable und Operations
+ * Calculate HashTables fuer VarTable und Operations
******************************************************************************/
struct SwHash
{
SwHash( const String& rStr );
virtual ~SwHash();
- String aStr;
+ String aStr;
SwHash *pNext;
};
struct SwCalcExp : public SwHash
{
- SwSbxValue nValue;
+ SwSbxValue nValue;
const SwFieldType* pFldType;
SwCalcExp( const String& rStr, const SwSbxValue& rVal,
@@ -173,39 +173,39 @@ struct _CalcOp;
_CalcOp* FindOperator( const String& rSearch );
/******************************************************************************
- * class SwCalc
+ * class SwCalc
******************************************************************************/
class SwCalc
{
- SwHash* VarTable[ TBLSZ ];
- String aVarName, sCurrSym;
- String sCommand;
- SvPtrarr aRekurStk;
- SwSbxValue nLastLeft;
- SwSbxValue nNumberValue;
- SwCalcExp aErrExpr;
- xub_StrLen nCommandPos;
-
- SwDoc& rDoc;
+ SwHash* VarTable[ TBLSZ ];
+ String aVarName, sCurrSym;
+ String sCommand;
+ SvPtrarr aRekurStk;
+ SwSbxValue nLastLeft;
+ SwSbxValue nNumberValue;
+ SwCalcExp aErrExpr;
+ xub_StrLen nCommandPos;
+
+ SwDoc& rDoc;
SvtSysLocale m_aSysLocale;
const LocaleDataWrapper* pLclData;
- CharClass* pCharClass;
+ CharClass* pCharClass;
- USHORT nListPor;
- SwCalcOper eCurrOper;
- SwCalcOper eCurrListOper;
+ USHORT nListPor;
+ SwCalcOper eCurrOper;
+ SwCalcOper eCurrListOper;
SwCalcError eError;
- SwCalcOper GetToken();
- SwSbxValue Expr();
- SwSbxValue Term();
- SwSbxValue Prim();
+ SwCalcOper GetToken();
+ SwSbxValue Expr();
+ SwSbxValue Term();
+ SwSbxValue Prim();
- BOOL ParseTime( USHORT*, USHORT*, USHORT* );
+ BOOL ParseTime( USHORT*, USHORT*, USHORT* );
- String GetColumnName( const String& rName );
- String GetDBName( const String& rName );
+ String GetColumnName( const String& rName );
+ String GetDBName( const String& rName );
// dont call this methods
SwCalc( const SwCalc& );
@@ -215,21 +215,21 @@ public:
SwCalc( SwDoc& rD );
~SwCalc();
- SwSbxValue Calculate( const String &rStr );
- String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE );
- String GetStrResult( double, BOOL bRound = TRUE );
+ SwSbxValue Calculate( const String &rStr );
+ String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE );
+ String GetStrResult( double, BOOL bRound = TRUE );
- SwCalcExp* VarInsert( const String& r );
- SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 );
- void VarChange( const String& rStr, const SwSbxValue& rValue );
- void VarChange( const String& rStr, double );
- SwHash** GetVarTable() { return VarTable; }
+ SwCalcExp* VarInsert( const String& r );
+ SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 );
+ void VarChange( const String& rStr, const SwSbxValue& rValue );
+ void VarChange( const String& rStr, double );
+ SwHash** GetVarTable() { return VarTable; }
- BOOL Push( const VoidPtr pPtr );
- void Pop( const VoidPtr pPtr );
+ BOOL Push( const VoidPtr pPtr );
+ void Pop( const VoidPtr pPtr );
- void SetCalcError( SwCalcError eErr ) { eError = eErr; }
- BOOL IsCalcError() const { return 0 != eError; }
+ void SetCalcError( SwCalcError eErr ) { eError = eErr; }
+ BOOL IsCalcError() const { return 0 != eError; }
static bool Str2Double( const String& rStr, xub_StrLen& rPos,
double& rVal,
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 96d67dedd50c..b6bd5eb30103 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@
//***********************************************************
struct CollName {
-// const char* pStr;
+// const char* pStr;
ULONG nCnd;
ULONG nSubCond;
};
@@ -71,9 +71,9 @@ rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex );
class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem
{
- static CommandStruct aCmds[COND_COMMAND_COUNT];
+ static CommandStruct aCmds[COND_COMMAND_COUNT];
- String sStyles[COND_COMMAND_COUNT];
+ String sStyles[COND_COMMAND_COUNT];
public:
SwCondCollItem(USHORT nWhich = FN_COND_COLL);
@@ -81,13 +81,13 @@ public:
TYPEINFO();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
- static const CommandStruct* GetCmds();
+ static const CommandStruct* GetCmds();
- const String& GetStyle(USHORT nPos) const;
- void SetStyle( const String* pStyle, USHORT nPos);
+ const String& GetStyle(USHORT nPos) const;
+ void SetStyle( const String* pStyle, USHORT nPos);
};
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 27aae1368c83..5356990c21ec 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -2,7 +2,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
@@ -37,14 +37,14 @@
class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
{
- BOOL bAuto; // automatisch vergebenes Flag
+ BOOL bAuto; // automatisch vergebenes Flag
public:
SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT,
BOOL bAuto = FALSE );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr )
{
@@ -53,13 +53,13 @@ public:
return *this;
}
- BOOL GetAutoFlag() const { return bAuto; }
- void SetAutoFlag( BOOL bFlag = TRUE ) { bAuto = bFlag; }
+ BOOL GetAutoFlag() const { return bAuto; }
+ void SetAutoFlag( BOOL bFlag = TRUE ) { bAuto = bFlag; }
};
class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
{
- SwModify* pDefinedIn; // Modify-Object, in dem die Formel steht
+ SwModify* pDefinedIn; // Modify-Object, in dem die Formel steht
// kann nur TablenBoxFormat sein
public:
@@ -67,14 +67,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
// erfrage und setze den Modify-Pointer
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
inline void ChgDefinedIn( const SwModify* pNew )
{ pDefinedIn = (SwModify*)pNew; }
// suche den Node, in dem die Formel steht:
- // BoxAttribut -> BoxStartNode
+ // BoxAttribut -> BoxStartNode
virtual const SwNode* GetNodeOfFormula() const;
SwTableBox* GetTableBox();
@@ -96,7 +96,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp )
{
@@ -104,7 +104,7 @@ public:
return *this;
}
- double GetValue() const { return nValue; }
+ double GetValue() const { return nValue; }
};
@@ -113,18 +113,18 @@ public:
inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
-inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
{ return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
-inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
//***************************************************************************
-inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
+inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const
{ return aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const
{ return aSet.GetTblBoxValue(bInP); }
#endif
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index efdccf488995..a5968b974c4e 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -2,7 +2,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
@@ -47,8 +47,8 @@ class SwTblCalcPara
USHORT nStackCnt, nMaxSize;
public:
- SwTableSortBoxes *pBoxStk; // Stack fuers erkennen von Rekursionen !
- SwCalc& rCalc; // akt. Calculator
+ SwTableSortBoxes *pBoxStk; // Stack fuers erkennen von Rekursionen !
+ SwCalc& rCalc; // akt. Calculator
const SwTable* pTbl; // akt. Tabelle
SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
@@ -57,8 +57,8 @@ public:
bool CalcWithStackOverflow();
bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
- void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
- void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
+ void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
+ void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
};
@@ -97,13 +97,13 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
protected:
enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME };
- String sFormel; // akt. Formel
- NameType eNmType; // akt. Darstellungs Art
+ String sFormel; // akt. Formel
+ NameType eNmType; // akt. Darstellungs Art
bool bValidValue; // TRUE: Formel neu berechnen
// suche den Node, in dem die Formel steht:
- // TextFeld -> TextNode,
- // BoxAttribut -> BoxStartNode
+ // TextFeld -> TextNode,
+ // BoxAttribut -> BoxStartNode
// !!! MUSS VON JEDER ABLEITUNG UEBERLADEN WERDEN !!!
virtual const SwNode* GetNodeOfFormula() const = 0;
@@ -119,7 +119,7 @@ protected:
public:
- SwTableFormula( const SwTableFormula& rCpy ) { *this = rCpy; }
+ SwTableFormula( const SwTableFormula& rCpy ) { *this = rCpy; }
virtual ~SwTableFormula();
SwTableFormula& operator=( const SwTableFormula& rCpy )
{
@@ -141,13 +141,13 @@ public:
// ist gerade eine intern Darstellung aktiv
bool IsIntrnlName() const { return eNmType == INTRNL_NAME; }
// erfrage die akt. Darstellung der Formel
- NameType GetNameType() const { return eNmType; }
+ NameType GetNameType() const { return eNmType; }
// erfrage/setze das Flag, ob der akt. Wert gueltig ist
bool IsValid() const { return bValidValue; }
inline void ChgValid( bool bNew ) { bValidValue = bNew; }
- const String& GetFormula() const { return sFormel; }
+ const String& GetFormula() const { return sFormel; }
void SetFormula( const String& rNew )
{
sFormel = rNew;
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 3480af7cade8..b6380bb30499 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -2,7 +2,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
@@ -29,11 +29,11 @@
#define _CHARATR_HXX
#include <format.hxx>
-#include <hintids.hxx> // fuer die WhichIds
+#include <hintids.hxx> // fuer die WhichIds
/******************************************************************************
- * Implementierung der Charakter-Attribut Methoden vom SwAttrSet
+ * Implementierung der Charakter-Attribut Methoden vom SwAttrSet
* AMA 12.10.94: Umstellung auf SvxItems.
******************************************************************************/
@@ -91,9 +91,9 @@ inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(BOOL bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); }
inline const SvxEscapementItem &SwAttrSet::GetEscapement(BOOL bInP) const
{ return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); }
-inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const
{ return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); }
-inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
{ return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); }
inline const SvxBlinkItem &SwAttrSet::GetBlink(BOOL bInP) const
{ return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
@@ -101,19 +101,19 @@ inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const
{ return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); }
inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const
{ return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
-inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const
{ return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); }
-inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const
+inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const
{ return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); }
-inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const
+inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const
{ return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); }
-inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const
+inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const
{ return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); }
inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const
{ return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); }
/******************************************************************************
- * Implementierung der Charakter-Attribut Methoden vom SwFmt
+ * Implementierung der Charakter-Attribut Methoden vom SwFmt
* AMA: 12.10.94: Umstellung auf SvxItems.
******************************************************************************/
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 39837e16ddd7..0eba12bd1fbf 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx
index 30e322eb99a1..28a0a381db03 100644
--- a/sw/inc/chcmprse.hxx
+++ b/sw/inc/chcmprse.hxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
#ifndef _CHCMPRSE_HXX
#define _CHCMPRSE_HXX
-enum SwCharCompressType{ CHARCOMPRESS_NONE,
+enum SwCharCompressType{ CHARCOMPRESS_NONE,
CHARCOMPRESS_PUNCTUATION,
CHARCOMPRESS_PUNCTUATION_KANA };
diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx
index 1b3380a82156..5e0a12561aca 100644
--- a/sw/inc/checkit.hxx
+++ b/sw/inc/checkit.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index fe37e4c465a9..560cffc10a03 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -2,7 +2,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
@@ -39,11 +39,11 @@ class SwTxtNode;
enum SwChapterFormat
{
CF_BEGIN,
- CF_NUMBER = CF_BEGIN, // nur die Kapitelnummer
- CF_TITLE, // nur die "Ueberschrift"
- CF_NUM_TITLE, // Kapitelnummer und "Ueberschrift"
- CF_NUMBER_NOPREPST, // nur die Kapitelnummer ohne Post/Prefix
- CF_NUM_NOPREPST_TITLE, // Kapitelnummer ohne Post/Prefix und "Ueberschrift"
+ CF_NUMBER = CF_BEGIN, // nur die Kapitelnummer
+ CF_TITLE, // nur die "Ueberschrift"
+ CF_NUM_TITLE, // Kapitelnummer und "Ueberschrift"
+ CF_NUMBER_NOPREPST, // nur die Kapitelnummer ohne Post/Prefix
+ CF_NUM_NOPREPST_TITLE, // Kapitelnummer ohne Post/Prefix und "Ueberschrift"
CF_END
};
@@ -56,7 +56,7 @@ class SwChapterFieldType : public SwFieldType
public:
SwChapterFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const;
};
@@ -83,11 +83,11 @@ public:
// <--
void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
- virtual String Expand() const;
+ virtual String Expand() const;
virtual SwField* Copy() const;
inline BYTE GetLevel() const;
- inline void SetLevel(BYTE);
+ inline void SetLevel(BYTE);
inline const String& GetNumber() const;
inline const String& GetTitle() const;
@@ -95,8 +95,8 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
-inline BYTE SwChapterField::GetLevel() const { return nLevel; }
-inline void SwChapterField::SetLevel(BYTE nLev) { nLevel = nLev; }
+inline BYTE SwChapterField::GetLevel() const { return nLevel; }
+inline void SwChapterField::SetLevel(BYTE nLev) { nLevel = nLev; }
inline const String& SwChapterField::GetNumber() const { return sNumber; }
inline const String& SwChapterField::GetTitle() const { return sTitle; }
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 447229eb8965..7e3175a3a3d8 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -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
@@ -45,7 +45,7 @@
#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
#define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4)
#define SW_STR_NONE (RC_CHRDLG_BEGIN + 5)
-//#define STR_NUMFMT (RC_CHRDLG_BEGIN + 6)
+//#define STR_NUMFMT (RC_CHRDLG_BEGIN + 6)
#define MSG_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd8cc254a72b..3d4eea357680 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -2,7 +2,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
@@ -42,33 +42,33 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
/* Flags die mittels des Disable-Features in den Slot-Definitionen ausgenutzt
* werden */
-#define SW_DISABLE_ON_PROTECTED_CURSOR 0x00000001
-#define SW_DISABLE_ON_MAILBOX_EDITOR 0x00000002
-
-
-#define FN_FILE SID_SW_START
-#define FN_EDIT (SID_SW_START + 100)
-#define FN_VIEW (SID_SW_START + 200)
-#define FN_INSERT (SID_SW_START + 300)
-#define FN_FORMAT (SID_SW_START + 400)
-#define FN_EXTRA (SID_SW_START + 600)
-#define FN_WINDOW (SID_SW_START + 700)
-#define FN_HELP (SID_SW_START + 800)
-#define FN_SELECTION (SID_SW_START + 900)
-#define FN_QUERY (SID_SW_START + 1000)
-#define FN_ENVELP (SID_SW_START + 1050)
-#define FN_PARAM (SID_SW_START + 1100)
-#define FN_STAT (SID_SW_START + 1180)
-#define FN_PRNOPT (SID_SW_START + 1200)
-#define FN_PGPREVIEW (SID_SW_START + 1250)
-#define FN_FRAME (SID_SW_START + 1300)
-#define FN_INSERT2 (SID_SW_START + 1400)
-#define FN_FORMAT2 (SID_SW_START + 1600)
+#define SW_DISABLE_ON_PROTECTED_CURSOR 0x00000001
+#define SW_DISABLE_ON_MAILBOX_EDITOR 0x00000002
+
+
+#define FN_FILE SID_SW_START
+#define FN_EDIT (SID_SW_START + 100)
+#define FN_VIEW (SID_SW_START + 200)
+#define FN_INSERT (SID_SW_START + 300)
+#define FN_FORMAT (SID_SW_START + 400)
+#define FN_EXTRA (SID_SW_START + 600)
+#define FN_WINDOW (SID_SW_START + 700)
+#define FN_HELP (SID_SW_START + 800)
+#define FN_SELECTION (SID_SW_START + 900)
+#define FN_QUERY (SID_SW_START + 1000)
+#define FN_ENVELP (SID_SW_START + 1050)
+#define FN_PARAM (SID_SW_START + 1100)
+#define FN_STAT (SID_SW_START + 1180)
+#define FN_PRNOPT (SID_SW_START + 1200)
+#define FN_PGPREVIEW (SID_SW_START + 1250)
+#define FN_FRAME (SID_SW_START + 1300)
+#define FN_INSERT2 (SID_SW_START + 1400)
+#define FN_FORMAT2 (SID_SW_START + 1600)
#define FN_EDIT2 (SID_SW_START + 1800)
-#define FN_QUERY2 (SID_SW_START + 2000)
-#define FN_EXTRA2 (SID_SW_START + 2200)
-#define FN_PARAM2 (SID_SW_START + 2400)
-#define FN_NOTES (SID_SW_START + 2500)
+#define FN_QUERY2 (SID_SW_START + 2000)
+#define FN_EXTRA2 (SID_SW_START + 2200)
+#define FN_PARAM2 (SID_SW_START + 2400)
+#define FN_NOTES (SID_SW_START + 2500)
/* More accurately, this range should be from FN_EXTRA2 to FN_PARAM2-1, but
* FN_NUMBER_NEWSTART comes from FN_FORMAT2, and FN_PARAM_LINK_DISPLAY_NAME
@@ -76,188 +76,188 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
* EDIT2 and QUERY2 and PARAM2 in the range...hopefully this will be fixed
* soon */
-#define FN_UNO_RANGE_BEGIN FN_FORMAT2
-#define FN_UNO_RANGE_END (FN_PARAM2 + 199)
+#define FN_UNO_RANGE_BEGIN FN_FORMAT2
+#define FN_UNO_RANGE_END (FN_PARAM2 + 199)
-#define HELP_OFFSET 1100
-#define CMD_STR_OFFSET 2200
-#define CMD_STR_OFFSET_MULTILANG 3300
-#define CMDID_END 5500
+#define HELP_OFFSET 1100
+#define CMD_STR_OFFSET 2200
+#define CMD_STR_OFFSET_MULTILANG 3300
+#define CMDID_END 5500
/*--------------------------------------------------------------------
Bereich: Datei
--------------------------------------------------------------------*/
-#define FN_CLOSE_FILE (FN_FILE + 1 ) /* Schliessen */
-#define FN_LAUNCH_REGISTRY (FN_FILE + 2 ) /* Ablage */
+#define FN_CLOSE_FILE (FN_FILE + 1 ) /* Schliessen */
+#define FN_LAUNCH_REGISTRY (FN_FILE + 2 ) /* Ablage */
-#define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Globaldokument erzeugen */
-#define FN_NEW_FILE (FN_FILE + 5 ) /* Neu */
-#define FN_NEW_FILE_DLG (FN_FILE + 6 ) /* Neu Dialog */
-#define FN_OPEN_FILE (FN_FILE + 7 ) /* Oeffnen */
-#define FN_EDIT_FILE (FN_FILE + 8 ) /* Oeffnen oder ToTop */
+#define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Globaldokument erzeugen */
+#define FN_NEW_FILE (FN_FILE + 5 ) /* Neu */
+#define FN_NEW_FILE_DLG (FN_FILE + 6 ) /* Neu Dialog */
+#define FN_OPEN_FILE (FN_FILE + 7 ) /* Oeffnen */
+#define FN_EDIT_FILE (FN_FILE + 8 ) /* Oeffnen oder ToTop */
-#define FN_INETFILE (FN_FILE + 9 ) /* Internet File-Dialog */
+#define FN_INETFILE (FN_FILE + 9 ) /* Internet File-Dialog */
-#define FN_PRINT_FILE (FN_FILE + 10) /* Drucken */
-#define FN_PRINT_FILE_OPTIONS (FN_FILE + 11) /* Drucken Optionen */
-#define FN_SAVE_FILE_AS (FN_FILE + 12) /* Speichern unter */
-#define FN_SAVE_FILE (FN_FILE + 13) /* Speichern */
-#define FN_SETUP_PRINTER (FN_FILE + 14) /* Druckereinstellung */
-#define FN_SETUP_PRINTER_DLG (FN_FILE + 15) /* Druckereinstellung */
-#define FN_SHOW_PREVIEW (FN_FILE + 16) /* Druckbild */
-#define FN_EXIT (FN_FILE + 17) /* Writer beenden */
-#define FN_PRINT_CFG_DLG (FN_FILE + 18) /* Optionen Drucken */
+#define FN_PRINT_FILE (FN_FILE + 10) /* Drucken */
+#define FN_PRINT_FILE_OPTIONS (FN_FILE + 11) /* Drucken Optionen */
+#define FN_SAVE_FILE_AS (FN_FILE + 12) /* Speichern unter */
+#define FN_SAVE_FILE (FN_FILE + 13) /* Speichern */
+#define FN_SETUP_PRINTER (FN_FILE + 14) /* Druckereinstellung */
+#define FN_SETUP_PRINTER_DLG (FN_FILE + 15) /* Druckereinstellung */
+#define FN_SHOW_PREVIEW (FN_FILE + 16) /* Druckbild */
+#define FN_EXIT (FN_FILE + 17) /* Writer beenden */
+#define FN_PRINT_CFG_DLG (FN_FILE + 18) /* Optionen Drucken */
-#define FN_SAVE_ALL (FN_FILE + 23) /* Alle Files speichern */
-#define FN_NEW_FILE_DEFAULT (FN_FILE + 24) /* Neue Datei mit Standardvorlage */
-#define FN_PRINT_FILE_DEFAULT (FN_FILE + 25) /* Drucken mit Defaults */
-#define FN_LAUNCH_EQ_EDITOR (FN_FILE + 26) /* Formel Editor */
-#define FN_CHANGE_PRINTER (FN_FILE + 27) /* Drucker einstellen */
-#define FN_FAX_END (FN_FILE + 29) /* Faxen fertig, Id fuer PostMessage */
+#define FN_SAVE_ALL (FN_FILE + 23) /* Alle Files speichern */
+#define FN_NEW_FILE_DEFAULT (FN_FILE + 24) /* Neue Datei mit Standardvorlage */
+#define FN_PRINT_FILE_DEFAULT (FN_FILE + 25) /* Drucken mit Defaults */
+#define FN_LAUNCH_EQ_EDITOR (FN_FILE + 26) /* Formel Editor */
+#define FN_CHANGE_PRINTER (FN_FILE + 27) /* Drucker einstellen */
+#define FN_FAX_END (FN_FILE + 29) /* Faxen fertig, Id fuer PostMessage */
-#define FN_SELECT_DATABASE (FN_FILE + 30) /* Selektion Datenbank */
-#define FN_DOC_INFO_DLG (FN_FILE + 31) /* Dokumentinfo */
-#define FN_DOC_MGR_DLG (FN_FILE + 32) /* Dokument-Manager */
+#define FN_SELECT_DATABASE (FN_FILE + 30) /* Selektion Datenbank */
+#define FN_DOC_INFO_DLG (FN_FILE + 31) /* Dokumentinfo */
+#define FN_DOC_MGR_DLG (FN_FILE + 32) /* Dokument-Manager */
-#define FN_GET_DOCSTAT (FN_FILE + 33) /* Dokumentstatistik einzeln auslesen */
+#define FN_GET_DOCSTAT (FN_FILE + 33) /* Dokumentstatistik einzeln auslesen */
#define FN_SAVE_SELECTION (FN_FILE + 35) /* Selektion speichern */
-#define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Outline zu StarImpress senden */
+#define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Outline zu StarImpress senden */
#define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37) /* Outline in das Clipboad copieren */
-#define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* HTML-Dokument "erzeugen" */
+#define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* HTML-Dokument "erzeugen" */
-#define FN_APP_START (FN_FILE + 98) /* fuer Makro bei App.Start */
-#define FN_APP_END (FN_FILE + 99) /* fuer Makro bei App.Ende */
+#define FN_APP_START (FN_FILE + 98) /* fuer Makro bei App.Start */
+#define FN_APP_END (FN_FILE + 99) /* fuer Makro bei App.Ende */
/*--------------------------------------------------------------------
Bereich: Bearbeiten
--------------------------------------------------------------------*/
-#define FN_CLEAR (FN_EDIT + 1 ) /* Loeschen */
-#define FN_COPY (FN_EDIT + 2 ) /* Kopieren */
-#define FN_CUT (FN_EDIT + 3 ) /* Ausschneiden */
-#define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Textbefehl bearbeiten */
-#define FN_EDIT_FIELD_DLG (FN_EDIT + 5 ) /* Textbefehl bearbeiten */
-#define FN_EDIT_FILE_INFO (FN_EDIT + 6 ) /* Dokumentinfo */
-#define FN_EDIT_FILE_INFO_DLG (FN_EDIT + 7 ) /* Dokumentinfo Dialog */
-#define FN_EDIT_LINK (FN_EDIT + 8 ) /* Verknuepfungen */
-#define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Verknuepfungen */
-#define FN_GOTO (FN_EDIT + 11) /* Gehe zu */
-
-#define FN_PASTE (FN_EDIT + 13) /* Einfuegen */
-#define FN_PASTESPECIAL_DLG (FN_EDIT + 15) /* Verknuepfung einfuegen */
-#define FN_NUMBER_BULLETS (FN_EDIT + 21) /* Bullets */
-#define FN_REPEAT (FN_EDIT + 22) /* Letzten Befehl wiederholen */
-#define FN_EDIT_IDX_ENTRY_DLG (FN_EDIT + 23) /* Index-Entry bearbeiten */
-#define FN_UPDATE_FIELDS (FN_EDIT + 26) /* Feldinhalte erneuern */
-#define FN_EXECUTE_MACROFIELD (FN_EDIT + 27) /* Macrofeld ausfuehren */
-#define FN_EDIT_FORMULA (FN_EDIT + 28) /* Formel in RibbonBar bearbeiten */
-#define FN_CALC_TABLE (FN_EDIT + 29) /* Tabelle durchrechnen */
+#define FN_CLEAR (FN_EDIT + 1 ) /* Loeschen */
+#define FN_COPY (FN_EDIT + 2 ) /* Kopieren */
+#define FN_CUT (FN_EDIT + 3 ) /* Ausschneiden */
+#define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Textbefehl bearbeiten */
+#define FN_EDIT_FIELD_DLG (FN_EDIT + 5 ) /* Textbefehl bearbeiten */
+#define FN_EDIT_FILE_INFO (FN_EDIT + 6 ) /* Dokumentinfo */
+#define FN_EDIT_FILE_INFO_DLG (FN_EDIT + 7 ) /* Dokumentinfo Dialog */
+#define FN_EDIT_LINK (FN_EDIT + 8 ) /* Verknuepfungen */
+#define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Verknuepfungen */
+#define FN_GOTO (FN_EDIT + 11) /* Gehe zu */
+
+#define FN_PASTE (FN_EDIT + 13) /* Einfuegen */
+#define FN_PASTESPECIAL_DLG (FN_EDIT + 15) /* Verknuepfung einfuegen */
+#define FN_NUMBER_BULLETS (FN_EDIT + 21) /* Bullets */
+#define FN_REPEAT (FN_EDIT + 22) /* Letzten Befehl wiederholen */
+#define FN_EDIT_IDX_ENTRY_DLG (FN_EDIT + 23) /* Index-Entry bearbeiten */
+#define FN_UPDATE_FIELDS (FN_EDIT + 26) /* Feldinhalte erneuern */
+#define FN_EXECUTE_MACROFIELD (FN_EDIT + 27) /* Macrofeld ausfuehren */
+#define FN_EDIT_FORMULA (FN_EDIT + 28) /* Formel in RibbonBar bearbeiten */
+#define FN_CALC_TABLE (FN_EDIT + 29) /* Tabelle durchrechnen */
/*--------------------------------------------------------------------
Bereich: Bullets
--------------------------------------------------------------------*/
-#define FN_NUM_BULLET_DOWN (FN_EDIT + 30) /* Runterstufen */
-#define FN_NUM_BULLET_UP (FN_EDIT + 31) /* Raufstufen */
-#define FN_NUM_BULLET_PREV (FN_EDIT + 32) /* zum vorigen Eintrag */
-#define FN_NUM_BULLET_NEXT (FN_EDIT + 33) /* zum naechsten Eintrag */
-#define FN_NUM_BULLET_MOVEUP (FN_EDIT + 34) /* nach oben schieben */
-#define FN_NUM_BULLET_MOVEDOWN (FN_EDIT + 35) /* nach unten schieben */
-#define FN_NUM_BULLET_NONUM (FN_EDIT + 36) /* Eintrag ohne Nummer */
+#define FN_NUM_BULLET_DOWN (FN_EDIT + 30) /* Runterstufen */
+#define FN_NUM_BULLET_UP (FN_EDIT + 31) /* Raufstufen */
+#define FN_NUM_BULLET_PREV (FN_EDIT + 32) /* zum vorigen Eintrag */
+#define FN_NUM_BULLET_NEXT (FN_EDIT + 33) /* zum naechsten Eintrag */
+#define FN_NUM_BULLET_MOVEUP (FN_EDIT + 34) /* nach oben schieben */
+#define FN_NUM_BULLET_MOVEDOWN (FN_EDIT + 35) /* nach unten schieben */
+#define FN_NUM_BULLET_NONUM (FN_EDIT + 36) /* Eintrag ohne Nummer */
#ifndef FN_NUM_BULLET_OFF //in SVX already
-#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */
+#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */
#endif
// schon im SVX
-//#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */
+//#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */
-#define FN_NUM_BULLET_OUTLINE_DOWN (FN_EDIT + 39) /* Runterstufen mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_UP (FN_EDIT + 40) /* Raufstufen mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_MOVEUP (FN_EDIT + 41) /* nach oben schieben mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_MOVEDOWN (FN_EDIT + 42) /* nach unten schieben mit Unterpunkten */
-#define FN_UPDATE_INPUTFIELDS (FN_EDIT + 43) /* Eingabefelder updaten */
+#define FN_NUM_BULLET_OUTLINE_DOWN (FN_EDIT + 39) /* Runterstufen mit Unterpunkten */
+#define FN_NUM_BULLET_OUTLINE_UP (FN_EDIT + 40) /* Raufstufen mit Unterpunkten */
+#define FN_NUM_BULLET_OUTLINE_MOVEUP (FN_EDIT + 41) /* nach oben schieben mit Unterpunkten */
+#define FN_NUM_BULLET_OUTLINE_MOVEDOWN (FN_EDIT + 42) /* nach unten schieben mit Unterpunkten */
+#define FN_UPDATE_INPUTFIELDS (FN_EDIT + 43) /* Eingabefelder updaten */
// schon im SVX
-//#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Numerierung an */
+//#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Numerierung an */
-#define FN_NUM_OR_NONUM (FN_EDIT + 46) /* Nummer ein-/aus */
+#define FN_NUM_OR_NONUM (FN_EDIT + 46) /* Nummer ein-/aus */
-#define FN_GOTO_NEXT_INPUTFLD (FN_EDIT + 47) /* zum naechsten EingabeFeld */
-#define FN_GOTO_PREV_INPUTFLD (FN_EDIT + 48) /* zum vorherigen EingabeFeld */
+#define FN_GOTO_NEXT_INPUTFLD (FN_EDIT + 47) /* zum naechsten EingabeFeld */
+#define FN_GOTO_PREV_INPUTFLD (FN_EDIT + 48) /* zum vorherigen EingabeFeld */
-#define FN_REPEAT_SEARCH (FN_EDIT + 50) /* Suche wiederholen */
-#define FN_REPEAT_REPLACE (FN_EDIT + 51) /* Ersetzen wiederholen */
-#define FN_UPDATE_GRAFIC (FN_EDIT + 53) /* Grafik aendern */
-#define FN_SETTAB_ATCURPOS (FN_EDIT + 54) /* Tab an der aktuellen Pos setzen */
-#define FN_SET_LR_IND_ATCURPOS (FN_EDIT + 55) /* EZE und LR setzen */
-#define FN_FRMCNT_TO_BODY (FN_EDIT + 56) /* Rahmeninhalt zu Text */
-#define FN_UPDATE_TOXBASE (FN_EDIT + 57) /* Naechstes Verzeichnis erneuern */
+#define FN_REPEAT_SEARCH (FN_EDIT + 50) /* Suche wiederholen */
+#define FN_REPEAT_REPLACE (FN_EDIT + 51) /* Ersetzen wiederholen */
+#define FN_UPDATE_GRAFIC (FN_EDIT + 53) /* Grafik aendern */
+#define FN_SETTAB_ATCURPOS (FN_EDIT + 54) /* Tab an der aktuellen Pos setzen */
+#define FN_SET_LR_IND_ATCURPOS (FN_EDIT + 55) /* EZE und LR setzen */
+#define FN_FRMCNT_TO_BODY (FN_EDIT + 56) /* Rahmeninhalt zu Text */
+#define FN_UPDATE_TOXBASE (FN_EDIT + 57) /* Naechstes Verzeichnis erneuern */
-#define FN_REPAGINATE (FN_EDIT + 61) /* Neuformatierung erzwingen */
-#define FN_EDIT_FOOTNOTE (FN_EDIT + 62) /* Fussnote bearbeiten */
+#define FN_REPAGINATE (FN_EDIT + 61) /* Neuformatierung erzwingen */
+#define FN_EDIT_FOOTNOTE (FN_EDIT + 62) /* Fussnote bearbeiten */
-#define FN_EDIT_REGION (FN_EDIT + 65) /* Bereiche bearbeiten */
-#define FN_GOTO_REFERENCE (FN_EDIT + 66) /* Von der Refmark zur Referenz */
+#define FN_EDIT_REGION (FN_EDIT + 65) /* Bereiche bearbeiten */
+#define FN_GOTO_REFERENCE (FN_EDIT + 66) /* Von der Refmark zur Referenz */
// schon im Svx definiert
-#define FN_NEXT_BOOKMARK (FN_EDIT + 68) /* */
-#define FN_PREV_BOOKMARK (FN_EDIT + 69) /* */
+#define FN_NEXT_BOOKMARK (FN_EDIT + 68) /* */
+#define FN_PREV_BOOKMARK (FN_EDIT + 69) /* */
/*Navigator ToolBoxen*/
-#define FN_SELECT_BOOKMARK (FN_EDIT + 70) /**/
-#define FN_ITEM_DOWN (FN_EDIT + 71) /**/
-#define FN_ITEM_LEFT (FN_EDIT + 72) /**/
-#define FN_ITEM_RIGHT (FN_EDIT + 73) /**/
-#define FN_ITEM_UP (FN_EDIT + 74) /**/
-#define FN_DOWN (FN_EDIT + 75) /**/
-
-#define FN_SELECT_FOOTER (FN_EDIT + 77) /**/
-#define FN_SELECT_FRAME (FN_EDIT + 78) /**/
-#define FN_SELECT_HEADER (FN_EDIT + 79) /**/
-#define FN_PAGENUMBER (FN_EDIT + 80) /**/
-#define FN_SELECT_AUTO_BOOKMARK (FN_EDIT + 81) /**/
-#define FN_SELECT_FOOTNOTE (FN_EDIT + 82) /**/
+#define FN_SELECT_BOOKMARK (FN_EDIT + 70) /**/
+#define FN_ITEM_DOWN (FN_EDIT + 71) /**/
+#define FN_ITEM_LEFT (FN_EDIT + 72) /**/
+#define FN_ITEM_RIGHT (FN_EDIT + 73) /**/
+#define FN_ITEM_UP (FN_EDIT + 74) /**/
+#define FN_DOWN (FN_EDIT + 75) /**/
+
+#define FN_SELECT_FOOTER (FN_EDIT + 77) /**/
+#define FN_SELECT_FRAME (FN_EDIT + 78) /**/
+#define FN_SELECT_HEADER (FN_EDIT + 79) /**/
+#define FN_PAGENUMBER (FN_EDIT + 80) /**/
+#define FN_SELECT_AUTO_BOOKMARK (FN_EDIT + 81) /**/
+#define FN_SELECT_FOOTNOTE (FN_EDIT + 82) /**/
#define FN_SELECT_SET_AUTO_BOOKMARK (FN_EDIT + 83) /**/
-#define FN_SELECT_TABLE (FN_EDIT + 84) /**/
-#define FN_SELECT_INDEX (FN_EDIT + 85) /**/
-#define FN_UP (FN_EDIT + 86) /**/
+#define FN_SELECT_TABLE (FN_EDIT + 84) /**/
+#define FN_SELECT_INDEX (FN_EDIT + 85) /**/
+#define FN_UP (FN_EDIT + 86) /**/
-//#define FN_DELETE_REGION (FN_EDIT + 89) /* Bereiche loeschen */
+//#define FN_DELETE_REGION (FN_EDIT + 89) /* Bereiche loeschen */
-#define FN_SELECT_PARA (FN_EDIT + 97) /* Absatz selektieren */
+#define FN_SELECT_PARA (FN_EDIT + 97) /* Absatz selektieren */
-#define FN_SELECT_CONTENT (FN_EDIT + 99) /* Navigator - Inhaltstyp */
+#define FN_SELECT_CONTENT (FN_EDIT + 99) /* Navigator - Inhaltstyp */
-//#define FN_REDLINE_PROTECT (FN_EDIT2 + 23) /* Redlining password */ ->moved to SVX
+//#define FN_REDLINE_PROTECT (FN_EDIT2 + 23) /* Redlining password */ ->moved to SVX
#define FN_UPDATE_ALL_LINKS (FN_EDIT2 + 24) /* alle Links updaten */
-//#define FN_REDLINE_ON (FN_EDIT2 + 25) /* Redlining anschalten */ -> moved to SVX
-#define FN_REDLINE_SHOW (FN_EDIT2 + 26) /* Redlining anzeigen */
-#define FN_REDLINE_COMMENT (FN_EDIT2 + 27) /* Redlining kommentieren */
+//#define FN_REDLINE_ON (FN_EDIT2 + 25) /* Redlining anschalten */ -> moved to SVX
+#define FN_REDLINE_SHOW (FN_EDIT2 + 26) /* Redlining anzeigen */
+#define FN_REDLINE_COMMENT (FN_EDIT2 + 27) /* Redlining kommentieren */
-#define FN_UPDATE_ALL (FN_EDIT2 + 28) /* FN_UPDATE_ALL_LINKS,
+#define FN_UPDATE_ALL (FN_EDIT2 + 28) /* FN_UPDATE_ALL_LINKS,
FN_UPDATE_FIELDS,
FN_UPDATE_TOX,
CalcLayout */
-#define FN_REDLINE_ACCEPT (FN_EDIT2 + 29) /* Redlining annehmen/ablehnen */
+#define FN_REDLINE_ACCEPT (FN_EDIT2 + 29) /* Redlining annehmen/ablehnen */
#define FN_ATTR_COLUMNS (FN_EDIT2 + 31) /* SlotId fuer SwFmtCol */
-#define FN_EDIT_CURRENT_TOX (FN_EDIT2 + 32) /* edit current index */
+#define FN_EDIT_CURRENT_TOX (FN_EDIT2 + 32) /* edit current index */
#define FN_EDIT_AUTH_ENTRY_DLG (FN_EDIT2 + 33) /* edit authorities entry*/
-#define FN_UPDATE_CHARTS (FN_EDIT2 + 34) /* update all charts */
+#define FN_UPDATE_CHARTS (FN_EDIT2 + 34) /* update all charts */
-#define FN_EDIT_HYPERLINK (FN_EDIT2 + 35) /* edit hyperlink */
+#define FN_EDIT_HYPERLINK (FN_EDIT2 + 35) /* edit hyperlink */
#define FN_NUM_CONTINUE (FN_EDIT2 + 36) /* continue previous numbering */
#define FN_REDLINE_ACCEPT_DIRECT (FN_EDIT2 + 37) /* accept redline at current position*/
#define FN_REDLINE_REJECT_DIRECT (FN_EDIT2 + 38) /* reject redline at current position*/
@@ -268,52 +268,52 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Bearbeiten
--------------------------------------------------------------------*/
-#define FN_REFRESH_VIEW (FN_VIEW + 1) /* Refresh/Redraw */
-#define FN_SHOW_OUTLINE_VIEW (FN_VIEW + 2) /* Gliederungsansicht */
+#define FN_REFRESH_VIEW (FN_VIEW + 1) /* Refresh/Redraw */
+#define FN_SHOW_OUTLINE_VIEW (FN_VIEW + 2) /* Gliederungsansicht */
-#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw Umlauf-Dlg */
+#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw Umlauf-Dlg */
-#define FN_RULER (FN_VIEW + 11) /* Horizontales Lineal */
+#define FN_RULER (FN_VIEW + 11) /* Horizontales Lineal */
-#define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* Grafiken anzeigen */
-#define FN_VIEW_BOUNDS (FN_VIEW + 14) /* Begrenzungen */
-#define FN_VIEW_FIELDS (FN_VIEW + 15) /* Textbefehle */
-#define FN_VLINEAL (FN_VIEW + 16) /* Vertikales Lineal */
-#define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertikaler Scrollbar */
-#define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontaler Scrollbar */
-#define FN_TOOLBOX_TOGGLE (FN_VIEW + 19) /* Toolboxinhalte umschalten */
-#define FN_VIEWOPTIONS_ON (FN_VIEW + 20) /* Gruppe Viewoptions an */
-#define FN_VIEWOPTIONS_OFF (FN_VIEW + 21) /* Gruppe Viewoptions aus */
-#define FN_CONTROLS_ON (FN_VIEW + 22) /* Gruppe Bedienelemte an */
-#define FN_CONTROLS_OFF (FN_VIEW + 23) /* Gruppe Bedienelemte aus */
+#define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* Grafiken anzeigen */
+#define FN_VIEW_BOUNDS (FN_VIEW + 14) /* Begrenzungen */
+#define FN_VIEW_FIELDS (FN_VIEW + 15) /* Textbefehle */
+#define FN_VLINEAL (FN_VIEW + 16) /* Vertikales Lineal */
+#define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertikaler Scrollbar */
+#define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontaler Scrollbar */
+#define FN_TOOLBOX_TOGGLE (FN_VIEW + 19) /* Toolboxinhalte umschalten */
+#define FN_VIEWOPTIONS_ON (FN_VIEW + 20) /* Gruppe Viewoptions an */
+#define FN_VIEWOPTIONS_OFF (FN_VIEW + 21) /* Gruppe Viewoptions aus */
+#define FN_CONTROLS_ON (FN_VIEW + 22) /* Gruppe Bedienelemte an */
+#define FN_CONTROLS_OFF (FN_VIEW + 23) /* Gruppe Bedienelemte aus */
-#define FN_VIEW_META_CHARS (FN_VIEW + 24) /* Sonderzeichen anzeigen */
-#define FN_VIEW_MARKS (FN_VIEW + 25) /* Markierungen anzeigen */
-#define FN_VIEW_FIELDNAME (FN_VIEW + 26) /* Feldname anzeigen */
-#define FN_VIEW_TABLEGRID (FN_VIEW + 27) /* Tabellenbegrenzungen anzeigen */
+#define FN_VIEW_META_CHARS (FN_VIEW + 24) /* Sonderzeichen anzeigen */
+#define FN_VIEW_MARKS (FN_VIEW + 25) /* Markierungen anzeigen */
+#define FN_VIEW_FIELDNAME (FN_VIEW + 26) /* Feldname anzeigen */
+#define FN_VIEW_TABLEGRID (FN_VIEW + 27) /* Tabellenbegrenzungen anzeigen */
-#define FN_SET_PAGE (FN_VIEW + 29) /* Seitenvorlage am Absatz setzen */
+#define FN_SET_PAGE (FN_VIEW + 29) /* Seitenvorlage am Absatz setzen */
-#define FN_TOOLBOX_SWITCH (FN_VIEW + 30) /* Auf Textshell umschalten */
+#define FN_TOOLBOX_SWITCH (FN_VIEW + 30) /* Auf Textshell umschalten */
//noch mehr Navigator
-#define FN_CONTENT_LB (FN_VIEW + 32) /**/
+#define FN_CONTENT_LB (FN_VIEW + 32) /**/
#define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/
#define FN_SHOW_ROOT (FN_VIEW + 34) /**/
#define FN_DROP_REGION (FN_VIEW + 35) /**/
-#define FN_OUTLINE_LEVEL (FN_VIEW + 36) /**/
+#define FN_OUTLINE_LEVEL (FN_VIEW + 36) /**/
#define FN_PRINT_LAYOUT (FN_VIEW + 37) /* invertierter BrowseMode */
#define FN_DROP_REGION_LINK (FN_VIEW + 38) /**/
#define FN_DROP_REGION_COPY (FN_VIEW + 39) /**/
-#define FN_SCROLL_NAVIGATION (FN_VIEW + 40) /* Navigationscontroller am Scrollbar*/
-#define FN_SCROLL_NEXT_PREV (FN_VIEW + 41) /* arbeitet den MoveType ab */
+#define FN_SCROLL_NAVIGATION (FN_VIEW + 40) /* Navigationscontroller am Scrollbar*/
+#define FN_SCROLL_NEXT_PREV (FN_VIEW + 41) /* arbeitet den MoveType ab */
-#define FN_VIEW_HIDDEN_PARA (FN_VIEW + 42) /* Versteckte Absaetze */
-#define FN_VIEW_SMOOTH_SCROLL (FN_VIEW + 43)
+#define FN_VIEW_HIDDEN_PARA (FN_VIEW + 42) /* Versteckte Absaetze */
+#define FN_VIEW_SMOOTH_SCROLL (FN_VIEW + 43)
#define FN_GLOBAL_SWITCH (FN_VIEW + 44) /* umschalten zw. Global und Inhalt*/
#define FN_GLOBAL_EDIT (FN_VIEW + 45) /* bearbeiten */
@@ -323,96 +323,96 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_CREATE_NAVIGATION (FN_VIEW + 49) /* Navigations-Controller erzeugen */
#define FN_PREVIEW_ZOOM (FN_VIEW + 51) /* der Tabellencontroller fuer den Zoom */
-#define FN_SET_MODOPT_TBLNUMFMT (FN_VIEW + 52) /* Zahlenerkennung in Tabellen */
+#define FN_SET_MODOPT_TBLNUMFMT (FN_VIEW + 52) /* Zahlenerkennung in Tabellen */
#define FN_HSCROLL_METRIC (FN_VIEW + 53) /* Metric horizontal scrollbar */
#define FN_VSCROLL_METRIC (FN_VIEW + 54) /* Metric vertical scrollbar */
-#define FN_VIEW_NOTES (FN_VIEW + 55)
+#define FN_VIEW_NOTES (FN_VIEW + 55)
/*--------------------------------------------------------------------
Bereich: Einfuegen
--------------------------------------------------------------------*/
// schon im Svx definiert
-#define FN_INSERT_BOOKMARK (FN_INSERT + 2 ) /* Sprungmarke einfuegen */
+#define FN_INSERT_BOOKMARK (FN_INSERT + 2 ) /* Sprungmarke einfuegen */
// schon im SVX unter der gleichen Id
-//#define FN_INSERT_BREAK (FN_INSERT + 3 ) /* Umbruch */
+//#define FN_INSERT_BREAK (FN_INSERT + 3 ) /* Umbruch */
-#define FN_INSERT_BREAK_DLG (FN_INSERT + 4 ) /* Umbruch */
-#define FN_INSERT_COLUMN_BREAK (FN_INSERT + 5 ) /* Spaltenumbruch */
-#define FN_INSERT_DATE_TIME (FN_INSERT + 6 ) /* Datum/Uhrzeit */
-#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textbefehl */
-#define FN_CHANGE_DBFIELD (FN_INSERT + 9 ) /* Datenbankfeld aendern */
+#define FN_INSERT_BREAK_DLG (FN_INSERT + 4 ) /* Umbruch */
+#define FN_INSERT_COLUMN_BREAK (FN_INSERT + 5 ) /* Spaltenumbruch */
+#define FN_INSERT_DATE_TIME (FN_INSERT + 6 ) /* Datum/Uhrzeit */
+#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textbefehl */
+#define FN_CHANGE_DBFIELD (FN_INSERT + 9 ) /* Datenbankfeld aendern */
-#define FN_INSERT_CAPTION (FN_INSERT + 10) /* Beschriftung */
+#define FN_INSERT_CAPTION (FN_INSERT + 10) /* Beschriftung */
#define FN_INSERT_DBFIELD (FN_INSERT + 11) /* Insert database field - for recording */
#define FN_INSERT_FOOTNOTE_DLG (FN_INSERT + 12) /* Dialog Fussnote */
-#define FN_INSERT_REF_FIELD (FN_INSERT + 13) /* Refernzfeld einfuegen */
+#define FN_INSERT_REF_FIELD (FN_INSERT + 13) /* Refernzfeld einfuegen */
-#define FN_INSERT_HYPERLINK (FN_INSERT + 14) /* Zeichendialog/HyperlinkPage*/
+#define FN_INSERT_HYPERLINK (FN_INSERT + 14) /* Zeichendialog/HyperlinkPage*/
-#define FN_INSERT_INDEX (FN_INSERT + 16) /* Stichworteintrag */
-#define FN_INSERT_INDEX_DLG (FN_INSERT + 17) /* Stichworteintrag */
-#define FN_INSERT_LINEBREAK (FN_INSERT + 18) /* Zeilenumbruch */
+#define FN_INSERT_INDEX (FN_INSERT + 16) /* Stichworteintrag */
+#define FN_INSERT_INDEX_DLG (FN_INSERT + 17) /* Stichworteintrag */
+#define FN_INSERT_LINEBREAK (FN_INSERT + 18) /* Zeilenumbruch */
#define FN_INSERT_FIELD_DATA_ONLY (FN_INSERT + 19) /* field dialog for mail merge*/
-#define FN_INSERT_OBJECT (FN_INSERT + 21) /* Object */
-#define FN_INSERT_OBJECT_DLG (FN_INSERT + 22) /* Object */
-#define FN_INSERT_PAGEBREAK (FN_INSERT + 23) /* Seitenumbruch */
-#define FN_INSERT_PAGENO (FN_INSERT + 24) /* Seitennummer */
-#define FN_INSERT_PARAGRAPH (FN_INSERT + 25) /* Absatz */
-#define FN_INSERT_RECORD (FN_INSERT + 26) /* Datensatz einfuegen */
-#define FN_MERGE_RECORD (FN_INSERT + 27) /* Datensatz mischen */
-#define FN_INSERT_SYMBOL (FN_INSERT + 28) /* Sonderzeichen */
-#define FN_POSTIT (FN_INSERT + 29) /* PostIt einfuegen/bearbeiten */
-#define FN_INSERT_TABLE (FN_INSERT + 30) /* Tabelle */
+#define FN_INSERT_OBJECT (FN_INSERT + 21) /* Object */
+#define FN_INSERT_OBJECT_DLG (FN_INSERT + 22) /* Object */
+#define FN_INSERT_PAGEBREAK (FN_INSERT + 23) /* Seitenumbruch */
+#define FN_INSERT_PAGENO (FN_INSERT + 24) /* Seitennummer */
+#define FN_INSERT_PARAGRAPH (FN_INSERT + 25) /* Absatz */
+#define FN_INSERT_RECORD (FN_INSERT + 26) /* Datensatz einfuegen */
+#define FN_MERGE_RECORD (FN_INSERT + 27) /* Datensatz mischen */
+#define FN_INSERT_SYMBOL (FN_INSERT + 28) /* Sonderzeichen */
+#define FN_POSTIT (FN_INSERT + 29) /* PostIt einfuegen/bearbeiten */
+#define FN_INSERT_TABLE (FN_INSERT + 30) /* Tabelle */
#define FN_INSERT_STRING (FN_INSERT+31)
-#define FN_INSERT_COLS (FN_INSERT + 32) /* Spalten einfuegen */
-#define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33) /* Rahmen einfuegen aktiv */
-#define FN_INSERT_FRAME (FN_INSERT + 34) /* Rahmen einfuegen */
+#define FN_INSERT_COLS (FN_INSERT + 32) /* Spalten einfuegen */
+#define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33) /* Rahmen einfuegen aktiv */
+#define FN_INSERT_FRAME (FN_INSERT + 34) /* Rahmen einfuegen */
-#define FN_INSERT_IDX_ENTRY_DLG (FN_INSERT + 35) /* Verzeichniseintrag einfuegen */
+#define FN_INSERT_IDX_ENTRY_DLG (FN_INSERT + 35) /* Verzeichniseintrag einfuegen */
#define FN_INSERT_FRAME_INTERACT_NOCOL (FN_INSERT + 36) /*insert interactive non column frame*/
//#define FN_INSERT_SOFT_HYPHEN (FN_INSERT + 43) /* weicher Trenner */
//#define FN_INSERT_HARD_SPACE (FN_INSERT + 44) /* hartes Space */
-#define FN_TOOL_GROUP (FN_INSERT + 47) /* Objekte gruppieren */
-#define FN_TOOL_UNGROUP (FN_INSERT + 48) /* Gruppierng aufheben */
+#define FN_TOOL_GROUP (FN_INSERT + 47) /* Objekte gruppieren */
+#define FN_TOOL_UNGROUP (FN_INSERT + 48) /* Gruppierng aufheben */
-#define FN_TOOL_ANKER (FN_INSERT + 49) /* Draw-Objekt umankern */
-#define FN_TOOL_ANKER_PAGE (FN_INSERT + 50) /* Draw-Objekt an Seite verankern */
-#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51) /* Draw-Objekt am Absatz verankern */
-#define FN_TOOL_HIERARCHIE (FN_INSERT + 52) /* Hierarchie aendern */
+#define FN_TOOL_ANKER (FN_INSERT + 49) /* Draw-Objekt umankern */
+#define FN_TOOL_ANKER_PAGE (FN_INSERT + 50) /* Draw-Objekt an Seite verankern */
+#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51) /* Draw-Objekt am Absatz verankern */
+#define FN_TOOL_HIERARCHIE (FN_INSERT + 52) /* Hierarchie aendern */
#define FN_MAILMERGE_WIZARD (FN_INSERT + 64) /* mail merge wizard */
-#define FN_QRY_OPEN_TABLE (FN_INSERT + 65) /* Datenbank oeffnen (Basic) */
-#define FN_TOOL_ANKER_FRAME (FN_INSERT + 66) /* Draw-Objekt am Rahmen verankern */
+#define FN_QRY_OPEN_TABLE (FN_INSERT + 65) /* Datenbank oeffnen (Basic) */
+#define FN_TOOL_ANKER_FRAME (FN_INSERT + 66) /* Draw-Objekt am Rahmen verankern */
#define FN_QRY_MERGE (FN_INSERT + 67) /* Datensatz einfuegen (Serienbrief) */
#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68) /* back-to-mail-merge-wizard child window*/
-#define FN_INSERT_SMA (FN_INSERT + 69) /* Einfuegen StarMath */
+#define FN_INSERT_SMA (FN_INSERT + 69) /* Einfuegen StarMath */
-#define FN_QRY_GET_COLUMN_NAME (FN_INSERT + 70) /* Anzahl der Spalten (Basic) */
-#define FN_QRY_GET_COLUMN_TYPE (FN_INSERT + 71) /* Type des Datenbankfeldes ermitteln (Basic) */
-#define FN_QRY_GET_COLUMN_TEXT (FN_INSERT + 72) /* Inhalt des aktuellen Datensatzes (Basic) */
-#define FN_QRY_DEL_DEFINED_DB (FN_INSERT + 75) /* Datenbankdefinition loeschen (Basic) */
+#define FN_QRY_GET_COLUMN_NAME (FN_INSERT + 70) /* Anzahl der Spalten (Basic) */
+#define FN_QRY_GET_COLUMN_TYPE (FN_INSERT + 71) /* Type des Datenbankfeldes ermitteln (Basic) */
+#define FN_QRY_GET_COLUMN_TEXT (FN_INSERT + 72) /* Inhalt des aktuellen Datensatzes (Basic) */
+#define FN_QRY_DEL_DEFINED_DB (FN_INSERT + 75) /* Datenbankdefinition loeschen (Basic) */
-#define FN_DRAWTEXT_ATTR_DLG (FN_INSERT + 76) /* DrawText positionieren */
+#define FN_DRAWTEXT_ATTR_DLG (FN_INSERT + 76) /* DrawText positionieren */
-#define FN_QRY_APPEND_RECORD (FN_INSERT + 77) /* Neuen Datensatz anhaengen */
-#define FN_QRY_UPDATE_RECORD (FN_INSERT + 78) /* Datensatzspalte aendern */
-#define FN_QRY_DELETE_RECORD (FN_INSERT + 79) /* Datensatz loeschen */
-#define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80) /* Physikalische (absolute) Datensatznummer erfragen (Basic) */
+#define FN_QRY_APPEND_RECORD (FN_INSERT + 77) /* Neuen Datensatz anhaengen */
+#define FN_QRY_UPDATE_RECORD (FN_INSERT + 78) /* Datensatzspalte aendern */
+#define FN_QRY_DELETE_RECORD (FN_INSERT + 79) /* Datensatz loeschen */
+#define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80) /* Physikalische (absolute) Datensatznummer erfragen (Basic) */
#define FN_TOOL_ANKER_CHAR (FN_INSERT + 84) /* DrawObject zeichengebunden */
//#define FN_INSERT_HARDHYPHEN (FN_INSERT + 85) /* Bindestrich ohne Umbruch*/
-#define FN_QRY_INSERT (FN_INSERT + 86) /* Datensatz-Selektion in Text einfuegen */
-#define FN_QRY_MERGE_FIELD (FN_INSERT + 87) /* Datensatz-Selektion in Felder einfuegen */
-#define FN_QRY_INSERT_FIELD (FN_INSERT + 88) /* Datenbankfeld einfuegen */
+#define FN_QRY_INSERT (FN_INSERT + 86) /* Datensatz-Selektion in Text einfuegen */
+#define FN_QRY_MERGE_FIELD (FN_INSERT + 87) /* Datensatz-Selektion in Felder einfuegen */
+#define FN_QRY_INSERT_FIELD (FN_INSERT + 88) /* Datenbankfeld einfuegen */
-#define FN_INSERT_CTRL (FN_INSERT + 89) /* Werkzeugleistencontroller Einfuegen*/
-#define FN_INSERT_OBJ_CTRL (FN_INSERT + 90) /* Werkzeugleistencontroller Einfuegen/Objekt*/
+#define FN_INSERT_CTRL (FN_INSERT + 89) /* Werkzeugleistencontroller Einfuegen*/
+#define FN_INSERT_OBJ_CTRL (FN_INSERT + 90) /* Werkzeugleistencontroller Einfuegen/Objekt*/
#define FN_INSERT_FIELD_CTRL (FN_INSERT + 91) /* Werkzeugleistencontroller Einfuegen/Feldbefehle*/
#define FN_INSERT_FLD_DATE (FN_INSERT + 92)
@@ -428,147 +428,147 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Einfuegen (2.Teil)
--------------------------------------------------------------------*/
-#define FN_QRY_GET_ALL_DBNAME (FN_INSERT2 + 1) /* Alle konfigurierten Datenabanknamen ermitteln */
-#define FN_QRY_GET_DBNAME_COUNT (FN_INSERT2 + 2) /* Anzahl aller konfigurierten Datenabanknamen */
-#define FN_QRY_GET_TABLE_NAME (FN_INSERT2 + 3) /* Tabellenname einer Datenbank ermitteln */
-#define FN_QRY_GET_TABLE_COUNT (FN_INSERT2 + 4) /* Anzahl aller Tabellen einer Datenbank ermitteln */
+#define FN_QRY_GET_ALL_DBNAME (FN_INSERT2 + 1) /* Alle konfigurierten Datenabanknamen ermitteln */
+#define FN_QRY_GET_DBNAME_COUNT (FN_INSERT2 + 2) /* Anzahl aller konfigurierten Datenabanknamen */
+#define FN_QRY_GET_TABLE_NAME (FN_INSERT2 + 3) /* Tabellenname einer Datenbank ermitteln */
+#define FN_QRY_GET_TABLE_COUNT (FN_INSERT2 + 4) /* Anzahl aller Tabellen einer Datenbank ermitteln */
#define FN_MAILMERGE_SENDMAIL_CHILDWINDOW (FN_INSERT2 + 5) /* child window provided by mailmerge */
-#define FN_SBA_BRW_UPDATE (FN_INSERT2 + 7) /* Datensaetze in Felder einfuegen */
-#define FN_SBA_BRW_INSERT (FN_INSERT2 + 8) /* Datensaetze in Text einfuegen */
-#define FN_SBA_BRW_MERGE (FN_INSERT2 + 9) /* Serienbriefdruck */
-#define FN_JAVAEDIT (FN_INSERT2 + 10) /* Scriptfeld bearbeiten */
+#define FN_SBA_BRW_UPDATE (FN_INSERT2 + 7) /* Datensaetze in Felder einfuegen */
+#define FN_SBA_BRW_INSERT (FN_INSERT2 + 8) /* Datensaetze in Text einfuegen */
+#define FN_SBA_BRW_MERGE (FN_INSERT2 + 9) /* Serienbriefdruck */
+#define FN_JAVAEDIT (FN_INSERT2 + 10) /* Scriptfeld bearbeiten */
#define FN_INSERT_HRULER (FN_INSERT2 + 11) /* horiz. Grafiklinie einfuegen */
#define FN_TOOL_ANKER_AT_CHAR (FN_INSERT2 + 12) /* Object zeichengebunden */
-#define FN_INSERT_PAGEHEADER (FN_INSERT2 + 13) /* Standard Kopfzeile einfuegen */
-#define FN_INSERT_PAGEFOOTER (FN_INSERT2 + 14) /* Standard Fusszeile einfuegen */
+#define FN_INSERT_PAGEHEADER (FN_INSERT2 + 13) /* Standard Kopfzeile einfuegen */
+#define FN_INSERT_PAGEFOOTER (FN_INSERT2 + 14) /* Standard Fusszeile einfuegen */
-#define FN_INSERT_ENDNOTE (FN_INSERT2 + 18) /* Endnote einfuegen*/
+#define FN_INSERT_ENDNOTE (FN_INSERT2 + 18) /* Endnote einfuegen*/
#define FN_INSERT_REGION (FN_INSERT2 + 19) /* Insert section */
-#define FN_INSERT_MULTI_TOX (FN_INSERT2 + 20) /* insert any TOX */
-#define FN_INSERT_AUTH_ENTRY_DLG (FN_INSERT2 + 21) /* insert entry for table of authorities*/
+#define FN_INSERT_MULTI_TOX (FN_INSERT2 + 20) /* insert any TOX */
+#define FN_INSERT_AUTH_ENTRY_DLG (FN_INSERT2 + 21) /* insert entry for table of authorities*/
/*--------------------------------------------------------------------
Bereich: Format
--------------------------------------------------------------------*/
-#define FN_AUTOFORMAT_APPLY (FN_FORMAT + 1 ) /* Autoformat-Optionen anwenden */
-#define FN_AUTOFORMAT_AUTO (FN_FORMAT + 2 ) /* Autoformat waehrend der Eingabe */
-#define FN_GROW_FONT_SIZE (FN_FORMAT + 3 ) /* Groesse */
-#define FN_SHRINK_FONT_SIZE (FN_FORMAT + 4 ) /* Groesse */
-#define FN_UNDERLINE_DOUBLE (FN_FORMAT + 5 ) /* Doppelt unterstreichen */
+#define FN_AUTOFORMAT_APPLY (FN_FORMAT + 1 ) /* Autoformat-Optionen anwenden */
+#define FN_AUTOFORMAT_AUTO (FN_FORMAT + 2 ) /* Autoformat waehrend der Eingabe */
+#define FN_GROW_FONT_SIZE (FN_FORMAT + 3 ) /* Groesse */
+#define FN_SHRINK_FONT_SIZE (FN_FORMAT + 4 ) /* Groesse */
+#define FN_UNDERLINE_DOUBLE (FN_FORMAT + 5 ) /* Doppelt unterstreichen */
#define FN_AUTOFORMAT_REDLINE_APPLY (FN_FORMAT + 6 ) /* Autoformat mit Redlining anwenden */
-#define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* Hochstellung */
-#define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* Tiefstellung */
+#define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* Hochstellung */
+#define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* Tiefstellung */
-#define FN_SET_CASEMAP (FN_FORMAT + 14) /* CaseMap */
-#define FN_SET_LANGUAGE (FN_FORMAT + 15) /* Sprache */
-#define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */
+#define FN_SET_CASEMAP (FN_FORMAT + 14) /* CaseMap */
+#define FN_SET_LANGUAGE (FN_FORMAT + 15) /* Sprache */
+#define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */
-#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
+#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
//schon in svxids.hrc
-//#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) /* Ausrichtung Absatz */
-#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* Spiegeln horizontal */
-#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* Spiegeln vertikal */
-#define FN_SET_LINE_SPACE (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
-#define FN_SET_ADJUST (FN_FORMAT + 28) /* Ausrichtung parametrisiert */
-#define FN_SET_LRMARGIN (FN_FORMAT + 29) /* linker/rechter Rand */
-#define FN_SET_ULMARGIN (FN_FORMAT + 30) /* oberer/unterer Rand */
-#define FN_UNINDENT_TO_TABSTOP (FN_FORMAT + 31) /* Einrueckung auf die vorgige Tabpostion */
-
-#define FN_SET_HYPHEN_ZONE (FN_FORMAT + 32) /* Silbentrennung */
-#define FN_SET_KEEP_TOGETHER (FN_FORMAT + 34) /* nicht trennen */
-#define FN_SET_KEEP_WITH_NEXT (FN_FORMAT + 35) /* mit folgendem zus. */
-#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */
-#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */
-
-
-#define FN_REGISTER_COLLECTION (FN_FORMAT + 43) /* Referenzvorlage an der Seite */
-#define FN_REGISTER_MODE (FN_FORMAT + 44) /* Registermodus an/aus */
-#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* Zahlenformat in Tabelle */
-#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* Umrandung */
-#define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* Spalten pro Seite */
-#define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* Hintergrund */
-#define FN_FORMAT_PAGE (FN_FORMAT + 51) /* Seite */
-#define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* Seite */
-#define FN_FORMAT_COLUMN (FN_FORMAT + 53) /* Spalten */
-#define FN_FORMAT_DROPCAPS (FN_FORMAT + 54) /* Initialien */
-#define FN_FORMAT_FRAME (FN_FORMAT + 55) /* Rahmen */
-#define FN_FORMAT_FRAME_DLG (FN_FORMAT + 56) /* Rahmen */
-#define FN_FORMAT_GRAFIC (FN_FORMAT + 57) /* Grafik */
-#define FN_FORMAT_GRAFIC_DLG (FN_FORMAT + 58) /* Grafik */
-#define FN_FORMAT_TABLE (FN_FORMAT + 59) /* Tabelle */
-#define FN_FORMAT_TABLE_DLG (FN_FORMAT + 60) /* Tabelle */
-#define FN_FORMAT_OLE_DLG (FN_FORMAT + 61) /* OLE bearbeiten */
-
-#define FN_NEW_STYLE_BY_EXAMPLE (FN_FORMAT + 62) /* Vorlage erzeugen by Example */
-#define FN_UPDATE_STYLE_BY_EXAMPLE (FN_FORMAT + 63) /* Vorlage aktualisieren */
-#define FN_STYLE_SHEET_FRAME_DLG (FN_FORMAT + 64) /* Rahmenvorlage */
-#define FN_STYLE_SHEET_DOC_DLG (FN_FORMAT + 65) /* Dokumentvorlage */
-#define FN_STYLE_SHEET_GRAFIK_DLG (FN_FORMAT + 66) /* Dokumentvorlage */
-#define FN_FORMAT_FOOTNOTE (FN_FORMAT + 67) /* Fussnoten */
-#define FN_FORMAT_FOOTNOTE_DLG (FN_FORMAT + 68) /* Fussnoten-Dialog */
+//#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) /* Ausrichtung Absatz */
+#define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* Spiegeln horizontal */
+#define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* Spiegeln vertikal */
+#define FN_SET_LINE_SPACE (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
+#define FN_SET_ADJUST (FN_FORMAT + 28) /* Ausrichtung parametrisiert */
+#define FN_SET_LRMARGIN (FN_FORMAT + 29) /* linker/rechter Rand */
+#define FN_SET_ULMARGIN (FN_FORMAT + 30) /* oberer/unterer Rand */
+#define FN_UNINDENT_TO_TABSTOP (FN_FORMAT + 31) /* Einrueckung auf die vorgige Tabpostion */
+
+#define FN_SET_HYPHEN_ZONE (FN_FORMAT + 32) /* Silbentrennung */
+#define FN_SET_KEEP_TOGETHER (FN_FORMAT + 34) /* nicht trennen */
+#define FN_SET_KEEP_WITH_NEXT (FN_FORMAT + 35) /* mit folgendem zus. */
+#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */
+#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */
+
+
+#define FN_REGISTER_COLLECTION (FN_FORMAT + 43) /* Referenzvorlage an der Seite */
+#define FN_REGISTER_MODE (FN_FORMAT + 44) /* Registermodus an/aus */
+#define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* Zahlenformat in Tabelle */
+#define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* Umrandung */
+#define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* Spalten pro Seite */
+#define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* Hintergrund */
+#define FN_FORMAT_PAGE (FN_FORMAT + 51) /* Seite */
+#define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* Seite */
+#define FN_FORMAT_COLUMN (FN_FORMAT + 53) /* Spalten */
+#define FN_FORMAT_DROPCAPS (FN_FORMAT + 54) /* Initialien */
+#define FN_FORMAT_FRAME (FN_FORMAT + 55) /* Rahmen */
+#define FN_FORMAT_FRAME_DLG (FN_FORMAT + 56) /* Rahmen */
+#define FN_FORMAT_GRAFIC (FN_FORMAT + 57) /* Grafik */
+#define FN_FORMAT_GRAFIC_DLG (FN_FORMAT + 58) /* Grafik */
+#define FN_FORMAT_TABLE (FN_FORMAT + 59) /* Tabelle */
+#define FN_FORMAT_TABLE_DLG (FN_FORMAT + 60) /* Tabelle */
+#define FN_FORMAT_OLE_DLG (FN_FORMAT + 61) /* OLE bearbeiten */
+
+#define FN_NEW_STYLE_BY_EXAMPLE (FN_FORMAT + 62) /* Vorlage erzeugen by Example */
+#define FN_UPDATE_STYLE_BY_EXAMPLE (FN_FORMAT + 63) /* Vorlage aktualisieren */
+#define FN_STYLE_SHEET_FRAME_DLG (FN_FORMAT + 64) /* Rahmenvorlage */
+#define FN_STYLE_SHEET_DOC_DLG (FN_FORMAT + 65) /* Dokumentvorlage */
+#define FN_STYLE_SHEET_GRAFIK_DLG (FN_FORMAT + 66) /* Dokumentvorlage */
+#define FN_FORMAT_FOOTNOTE (FN_FORMAT + 67) /* Fussnoten */
+#define FN_FORMAT_FOOTNOTE_DLG (FN_FORMAT + 68) /* Fussnoten-Dialog */
// schon im Svx definiert
-//#define FN_FORMAT_RESET (FN_FORMAT + 69) /* Format zuruecksetzen */
+//#define FN_FORMAT_RESET (FN_FORMAT + 69) /* Format zuruecksetzen */
-#define FN_FRAME_TO_TOP (FN_FORMAT + 70) /* Rahmen nach oben */
-#define FN_FRAME_TO_BOTTOM (FN_FORMAT + 71) /* Rahmen nach unten */
+#define FN_FRAME_TO_TOP (FN_FORMAT + 70) /* Rahmen nach oben */
+#define FN_FRAME_TO_BOTTOM (FN_FORMAT + 71) /* Rahmen nach unten */
-#define FN_FRAME_NOWRAP (FN_FORMAT + 72) /* Rahmen kein Umlauf */
-#define FN_FRAME_WRAP (FN_FORMAT + 73) /* Rahmen Umlauf */
-#define FN_FRAME_WRAPTHRU (FN_FORMAT + 74) /* Rahmen Durchlauf */
+#define FN_FRAME_NOWRAP (FN_FORMAT + 72) /* Rahmen kein Umlauf */
+#define FN_FRAME_WRAP (FN_FORMAT + 73) /* Rahmen Umlauf */
+#define FN_FRAME_WRAPTHRU (FN_FORMAT + 74) /* Rahmen Durchlauf */
-#define FN_FRAME_ALIGN_HORZ_LEFT (FN_FORMAT + 75) /* Rahmen horz. links */
-#define FN_FRAME_ALIGN_HORZ_RIGHT (FN_FORMAT + 76) /* Rahmen horz. rechts */
-#define FN_FRAME_ALIGN_HORZ_CENTER (FN_FORMAT + 77) /* Rahmen horz. zentriert */
-#define FN_FRAME_ALIGN_VERT_TOP (FN_FORMAT + 78) /* Rahmen vert. oben */
-#define FN_FRAME_ALIGN_VERT_BOTTOM (FN_FORMAT + 79) /* Rahmen vert. unten */
-#define FN_FRAME_ALIGN_VERT_CENTER (FN_FORMAT + 80) /* Rahmen vert. zentriert */
+#define FN_FRAME_ALIGN_HORZ_LEFT (FN_FORMAT + 75) /* Rahmen horz. links */
+#define FN_FRAME_ALIGN_HORZ_RIGHT (FN_FORMAT + 76) /* Rahmen horz. rechts */
+#define FN_FRAME_ALIGN_HORZ_CENTER (FN_FORMAT + 77) /* Rahmen horz. zentriert */
+#define FN_FRAME_ALIGN_VERT_TOP (FN_FORMAT + 78) /* Rahmen vert. oben */
+#define FN_FRAME_ALIGN_VERT_BOTTOM (FN_FORMAT + 79) /* Rahmen vert. unten */
+#define FN_FRAME_ALIGN_VERT_CENTER (FN_FORMAT + 80) /* Rahmen vert. zentriert */
-#define FN_SET_FRM_POSITION (FN_FORMAT + 82)/* Rahmenposition -- " -- */
-#define FN_SET_FRM_OPTIONS (FN_FORMAT + 86)/* Rahmenoptionen -- " -- */
+#define FN_SET_FRM_POSITION (FN_FORMAT + 82)/* Rahmenposition -- " -- */
+#define FN_SET_FRM_OPTIONS (FN_FORMAT + 86)/* Rahmenoptionen -- " -- */
-#define FN_SET_PAGE_STYLE (FN_FORMAT + 93) /* Anwenden Seitenv. */
+#define FN_SET_PAGE_STYLE (FN_FORMAT + 93) /* Anwenden Seitenv. */
-#define FN_FORMAT_TITLEPAGE_DLG (FN_FORMAT + 98) /* Title Page */
+#define FN_FORMAT_TITLEPAGE_DLG (FN_FORMAT + 98) /* Title Page */
#define FN_TABLE_REP (FN_FORMAT + 99) /* TableRepresentation */
-#define FN_CONVERT_TEXT_TABLE (FN_FORMAT + 100) /* Konvertierung Text <-> Tabelle */
-#define FN_TABLE_INSERT_ROW (FN_FORMAT + 101) /* Tabelle: Zeile einfuegen */
-#define FN_TABLE_INSERT_COL (FN_FORMAT + 102) /* Tabelle: Spalte einfuegen */
-#define FN_TABLE_DELETE_ROW (FN_FORMAT + 103) /* Tabelle: Zeile loeschen */
-#define FN_TABLE_DELETE_COL (FN_FORMAT + 104) /* Tabelle: Spalte loeschen */
-#define FN_TABLE_SPLIT_CELLS (FN_FORMAT + 105) /* Tabelle: Zellen teilen */
-#define FN_TABLE_MERGE_CELLS (FN_FORMAT + 106) /* Tabelle: Zellen verbinden */
-#define FN_TABLE_SET_ROW_HEIGHT (FN_FORMAT + 107) /* Tabelle: Zeilenhoehe setzen */
-#define FN_TABLE_SET_COL_WIDTH (FN_FORMAT + 108) /* Tabelle: Spaltenbreite setzen */
-#define FN_TABLE_SET_ULSPACE (FN_FORMAT + 109) /* Tabelle: oberen / unteren Abstand einstellen */
+#define FN_CONVERT_TEXT_TABLE (FN_FORMAT + 100) /* Konvertierung Text <-> Tabelle */
+#define FN_TABLE_INSERT_ROW (FN_FORMAT + 101) /* Tabelle: Zeile einfuegen */
+#define FN_TABLE_INSERT_COL (FN_FORMAT + 102) /* Tabelle: Spalte einfuegen */
+#define FN_TABLE_DELETE_ROW (FN_FORMAT + 103) /* Tabelle: Zeile loeschen */
+#define FN_TABLE_DELETE_COL (FN_FORMAT + 104) /* Tabelle: Spalte loeschen */
+#define FN_TABLE_SPLIT_CELLS (FN_FORMAT + 105) /* Tabelle: Zellen teilen */
+#define FN_TABLE_MERGE_CELLS (FN_FORMAT + 106) /* Tabelle: Zellen verbinden */
+#define FN_TABLE_SET_ROW_HEIGHT (FN_FORMAT + 107) /* Tabelle: Zeilenhoehe setzen */
+#define FN_TABLE_SET_COL_WIDTH (FN_FORMAT + 108) /* Tabelle: Spaltenbreite setzen */
+#define FN_TABLE_SET_ULSPACE (FN_FORMAT + 109) /* Tabelle: oberen / unteren Abstand einstellen */
#define FN_OPTIMIZE_TABLE (FN_FORMAT + 110) /* ToolBoxItem fuer Optimierung in Tabellen */
-#define FN_TABLE_SET_SHADOW (FN_FORMAT + 111) /* Tabelle: Schatten einstellen */
-#define FN_TABLE_GOTO_CELL (FN_FORMAT + 112) /* Tabelle: Zelle anspringen */
-#define FN_TABLE_SELECT_ROW (FN_FORMAT + 113) /* Tabelle: Zeile selektieren */
-#define FN_TABLE_SELECT_COL (FN_FORMAT + 114) /* Tabelle: Spalte selektieren */
-#define FN_TABLE_SELECT_ALL (FN_FORMAT + 115) /* Tabelle: Tabelle selektieren */
-#define FN_TABLE_SET_READ_ONLY (FN_FORMAT + 116) /* Tabelle: Tabelle schuetzen */
-#define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117) /* Tabelle: Tabellezellen schuetzen */
-#define FN_TABLE_UNSET_READ_ONLY_CELLS (FN_FORMAT + 119) /* Tabelle: Tabellezellen schuetzen aufheben */
+#define FN_TABLE_SET_SHADOW (FN_FORMAT + 111) /* Tabelle: Schatten einstellen */
+#define FN_TABLE_GOTO_CELL (FN_FORMAT + 112) /* Tabelle: Zelle anspringen */
+#define FN_TABLE_SELECT_ROW (FN_FORMAT + 113) /* Tabelle: Zeile selektieren */
+#define FN_TABLE_SELECT_COL (FN_FORMAT + 114) /* Tabelle: Spalte selektieren */
+#define FN_TABLE_SELECT_ALL (FN_FORMAT + 115) /* Tabelle: Tabelle selektieren */
+#define FN_TABLE_SET_READ_ONLY (FN_FORMAT + 116) /* Tabelle: Tabelle schuetzen */
+#define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117) /* Tabelle: Tabellezellen schuetzen */
+#define FN_TABLE_UNSET_READ_ONLY_CELLS (FN_FORMAT + 119) /* Tabelle: Tabellezellen schuetzen aufheben */
#define FN_TABLE_HEADLINE_REPEAT (FN_FORMAT + 120) /* also used in SwXTextTable*/
-#define FN_TABLE_ADJUST_CELLS (FN_FORMAT + 121) /* Tabelle: Zellen anpassen */
+#define FN_TABLE_ADJUST_CELLS (FN_FORMAT + 121) /* Tabelle: Zellen anpassen */
-#define FN_FRAME_UP (FN_FORMAT + 122) /* Rahmen um eine Ebene nach oben */
-#define FN_FRAME_DOWN (FN_FORMAT + 123) /* Rahmen um eine Ebene nach unten */
+#define FN_FRAME_UP (FN_FORMAT + 122) /* Rahmen um eine Ebene nach oben */
+#define FN_FRAME_DOWN (FN_FORMAT + 123) /* Rahmen um eine Ebene nach unten */
-#define FN_TABLE_INSERT_CHART (FN_FORMAT + 124)
+#define FN_TABLE_INSERT_CHART (FN_FORMAT + 124)
-#define FN_SET_FRM_LRSPACE (FN_FORMAT + 125) /* Rahmen Seitenabstand */
-#define FN_SET_FRM_ULSPACE (FN_FORMAT + 126) /* Rahmen Kopf-/Fussabstand */
-#define FN_TABLE_SET_LRSPACE (FN_FORMAT + 127) /* Tabelle: linker / rechter Abstand einstellen */
-#define FN_TABLE_OPTIMAL_HEIGHT (FN_FORMAT + 128) /* Zellenhoehe optimal*/
+#define FN_SET_FRM_LRSPACE (FN_FORMAT + 125) /* Rahmen Seitenabstand */
+#define FN_SET_FRM_ULSPACE (FN_FORMAT + 126) /* Rahmen Kopf-/Fussabstand */
+#define FN_TABLE_SET_LRSPACE (FN_FORMAT + 127) /* Tabelle: linker / rechter Abstand einstellen */
+#define FN_TABLE_OPTIMAL_HEIGHT (FN_FORMAT + 128) /* Zellenhoehe optimal*/
#define FN_TABLE_DELETE_TABLE (FN_FORMAT + 129) /* remove current table*/
#define FN_TABLE_SELECT_CELL (FN_FORMAT + 130) /* selects the current table cell */
#define FN_CONVERT_TEXT_TO_TABLE (FN_FORMAT + 131) /* convert selected text to table */
@@ -578,20 +578,20 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Seitenvorlage
--------------------------------------------------------------------*/
-#define FN_NEW_PAGE_STYLE (FN_FORMAT + 129) /* Anlegen Seitenvorlage */
+#define FN_NEW_PAGE_STYLE (FN_FORMAT + 129) /* Anlegen Seitenvorlage */
#define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* linker / rechter Rand */
#define FN_PAGE_STYLE_SET_UL_MARGIN (FN_FORMAT + 131) /* oberer / unterer Rand */
-#define FN_PAGE_STYLE_SET_PAGE (FN_FORMAT + 134) /* linke, rechte... */
+#define FN_PAGE_STYLE_SET_PAGE (FN_FORMAT + 134) /* linke, rechte... */
#define FN_PAGE_STYLE_SET_PAPER_SIZE (FN_FORMAT + 135) /* Papiergroesse */
#define FN_PAGE_STYLE_SET_PAPER_BIN (FN_FORMAT + 136) /* Druckerschacht */
#define FN_PAGE_STYLE_SET_NUMBER_FORMAT (FN_FORMAT + 137) /* Numerierungsart */
-#define FN_PAGE_STYLE_SET_COLS (FN_FORMAT + 138) /* Spaltenanzahl */
+#define FN_PAGE_STYLE_SET_COLS (FN_FORMAT + 138) /* Spaltenanzahl */
/* OS: Diese Ids werden nur noch fuer die Hilfe benoetigt und sind fuer den
Dialog durch die Ids ohne _DLG ersetzt*/
-#define FN_TABLE_INSERT_COL_DLG (FN_FORMAT + 142) /* Tabelle: Dlg. Spalte einfuegen */
-#define FN_TABLE_INSERT_ROW_DLG (FN_FORMAT + 143) /* Tabelle: Dlg. Zeile einfuegen */
+#define FN_TABLE_INSERT_COL_DLG (FN_FORMAT + 142) /* Tabelle: Dlg. Spalte einfuegen */
+#define FN_TABLE_INSERT_ROW_DLG (FN_FORMAT + 143) /* Tabelle: Dlg. Zeile einfuegen */
#define FN_GOTO_NEXT_CELL (FN_FORMAT + 145) /* Table: go to next cell */
#define FN_GOTO_PREV_CELL (FN_FORMAT + 146) /* Table: go to previous cell */
@@ -603,114 +603,114 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Ribbon
--------------------------------------------------------------------*/
-#define FN_SET_BACKGROUND_COLOR (FN_FORMAT + 150) /* Hintergrundfarbe */
+#define FN_SET_BACKGROUND_COLOR (FN_FORMAT + 150) /* Hintergrundfarbe */
-#define FN_SET_BORDER_POS (FN_FORMAT + 152) /* Position Umrandung */
-#define FN_SET_BORDER_LINES (FN_FORMAT + 153) /* Linienart Umrandung */
-#define FN_SET_BORDER_COLOR (FN_FORMAT + 154) /* Farbe Umrandung */
+#define FN_SET_BORDER_POS (FN_FORMAT + 152) /* Position Umrandung */
+#define FN_SET_BORDER_LINES (FN_FORMAT + 153) /* Linienart Umrandung */
+#define FN_SET_BORDER_COLOR (FN_FORMAT + 154) /* Farbe Umrandung */
-#define FN_FORMULA_CALC (FN_FORMAT + 156) /* Formelauswahl */
-#define FN_FORMULA_CANCEL (FN_FORMAT + 157) /* Formel nicht uebernehmen */
-#define FN_FORMULA_APPLY (FN_FORMAT + 158) /* Formel uebernehmen */
+#define FN_FORMULA_CALC (FN_FORMAT + 156) /* Formelauswahl */
+#define FN_FORMULA_CANCEL (FN_FORMAT + 157) /* Formel nicht uebernehmen */
+#define FN_FORMULA_APPLY (FN_FORMAT + 158) /* Formel uebernehmen */
-#define FN_TABLE_UNSET_READ_ONLY (FN_FORMAT + 159) /* Zellenschutz fuer Tab. aufheben */
+#define FN_TABLE_UNSET_READ_ONLY (FN_FORMAT + 159) /* Zellenschutz fuer Tab. aufheben */
-#define FN_FORMULA_POSITION (FN_FORMAT + 160) /* Positionsanzeige */
-#define FN_FORMULA_EDIT (FN_FORMAT + 161) /* Editfeld */
+#define FN_FORMULA_POSITION (FN_FORMAT + 160) /* Positionsanzeige */
+#define FN_FORMULA_EDIT (FN_FORMAT + 161) /* Editfeld */
-#define FN_FRAME_WRAP_IDEAL (FN_FORMAT + 163) /* Rahmen Idealer Umlauf */
-#define FN_FRAME_WRAPTHRU_TRANSP (FN_FORMAT + 164) /* Rahmen Transparenter Durchlauf */
+#define FN_FRAME_WRAP_IDEAL (FN_FORMAT + 163) /* Rahmen Idealer Umlauf */
+#define FN_FRAME_WRAPTHRU_TRANSP (FN_FORMAT + 164) /* Rahmen Transparenter Durchlauf */
-#define FN_FRAME_ALIGN_VERT_ROW_TOP (FN_FORMAT + 165) /* Rahmen vert. Zeile oben */
-#define FN_FRAME_ALIGN_VERT_ROW_BOTTOM (FN_FORMAT + 166) /* Rahmen vert. Zeile unten */
-#define FN_FRAME_ALIGN_VERT_ROW_CENTER (FN_FORMAT + 167) /* Rahmen vert. Zeile zentriert */
+#define FN_FRAME_ALIGN_VERT_ROW_TOP (FN_FORMAT + 165) /* Rahmen vert. Zeile oben */
+#define FN_FRAME_ALIGN_VERT_ROW_BOTTOM (FN_FORMAT + 166) /* Rahmen vert. Zeile unten */
+#define FN_FRAME_ALIGN_VERT_ROW_CENTER (FN_FORMAT + 167) /* Rahmen vert. Zeile zentriert */
-#define FN_FRAME_ALIGN_VERT_CHAR_TOP (FN_FORMAT + 168) /* Rahmen vert. Zeichen oben */
-#define FN_FRAME_ALIGN_VERT_CHAR_BOTTOM (FN_FORMAT + 169) /* Rahmen vert. Zeichen unten */
-#define FN_FRAME_ALIGN_VERT_CHAR_CENTER (FN_FORMAT + 170) /* Rahmen vert. Zeichen zentriert */
+#define FN_FRAME_ALIGN_VERT_CHAR_TOP (FN_FORMAT + 168) /* Rahmen vert. Zeichen oben */
+#define FN_FRAME_ALIGN_VERT_CHAR_BOTTOM (FN_FORMAT + 169) /* Rahmen vert. Zeichen unten */
+#define FN_FRAME_ALIGN_VERT_CHAR_CENTER (FN_FORMAT + 170) /* Rahmen vert. Zeichen zentriert */
-#define FN_TABLE_SET_DEF_BORDER (FN_FORMAT + 171) /* vordefinierte Umrandungen setzen */
+#define FN_TABLE_SET_DEF_BORDER (FN_FORMAT + 171) /* vordefinierte Umrandungen setzen */
-#define FN_FRAME_WRAP_LEFT (FN_FORMAT + 172) /* Rahmen Umlauf links */
-#define FN_FRAME_WRAP_RIGHT (FN_FORMAT + 173) /* Rahmen Umlauf links */
+#define FN_FRAME_WRAP_LEFT (FN_FORMAT + 172) /* Rahmen Umlauf links */
+#define FN_FRAME_WRAP_RIGHT (FN_FORMAT + 173) /* Rahmen Umlauf links */
#define FN_TABLE_SET_ROW_AUTOHEIGHT (FN_FORMAT + 174) /* Tabelle: Minimale automatische Zeilenhoehe setzen */
-#define FN_WRAP_ANCHOR_ONLY (FN_FORMAT + 181) /* Umlauf nur fuer ersten Absatz */
+#define FN_WRAP_ANCHOR_ONLY (FN_FORMAT + 181) /* Umlauf nur fuer ersten Absatz */
-#define FN_TABLE_BALANCE_CELLS (FN_FORMAT + 182) /* Spalten gleichmaessig verteilen */
-#define FN_TABLE_BALANCE_ROWS (FN_FORMAT + 183) /* Zeilen gleichmaessig verteilen */
+#define FN_TABLE_BALANCE_CELLS (FN_FORMAT + 182) /* Spalten gleichmaessig verteilen */
+#define FN_TABLE_BALANCE_ROWS (FN_FORMAT + 183) /* Zeilen gleichmaessig verteilen */
-#define FN_FRAME_WRAP_CONTOUR (FN_FORMAT + 184) /* Rahmen Kunturumlauf */
+#define FN_FRAME_WRAP_CONTOUR (FN_FORMAT + 184) /* Rahmen Kunturumlauf */
-#define FN_TABLE_VERT_NONE (FN_FORMAT + 185) /* vertikale Ausrichtung in Tabellenzellen */
-#define FN_TABLE_VERT_CENTER (FN_FORMAT + 186) /* -"- */
-#define FN_TABLE_VERT_BOTTOM (FN_FORMAT + 187) /* -"- */
-#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* -"- */
+#define FN_TABLE_VERT_NONE (FN_FORMAT + 185) /* vertikale Ausrichtung in Tabellenzellen */
+#define FN_TABLE_VERT_CENTER (FN_FORMAT + 186) /* -"- */
+#define FN_TABLE_VERT_BOTTOM (FN_FORMAT + 187) /* -"- */
+#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* -"- */
#define FN_TABLE_MODE_FIX (FN_FORMAT + 189) /* Tabellenmodus */
#define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */
-#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
+#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
#define FN_TABLE_BOX_TEXTDIRECTION (FN_FORMAT + 192) /* text direction of table cells */
-#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* Autosumme*/
-#define FN_SET_CONTROL_HANDLER (FN_FORMAT + 199) /* Macro setzen */
+#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* Autosumme*/
+#define FN_SET_CONTROL_HANDLER (FN_FORMAT + 199) /* Macro setzen */
#define FN_IS_IMAGE (FN_FORMAT2 + 6) /* Numerierung : mit Grafik?*/
-#define FN_GOTO_NEXT_REGION (FN_FORMAT2 + 9) /* Naechsten Bereich anspringen */
+#define FN_GOTO_NEXT_REGION (FN_FORMAT2 + 9) /* Naechsten Bereich anspringen */
#define FN_GOTO_PREV_REGION (FN_FORMAT2 + 10) /* Vorherigen " */
-#define FN_GET_SBXCONTROL (FN_FORMAT2 + 11) /* SbxObject rausreichen */
+#define FN_GET_SBXCONTROL (FN_FORMAT2 + 11) /* SbxObject rausreichen */
#define FN_ABSTRACT_NEWDOC (FN_FORMAT2 + 12) /* Abstract in neuem Doc */
#define FN_ABSTRACT_STARIMPRESS (FN_FORMAT2 + 13) /* Abstract an StarImpress */
/* OD 2006-03-09 #i51726# - all drawing objects can be named now. */
#define FN_NAME_SHAPE (FN_FORMAT2 + 14) /* Name shapes */
// #i68101#
-#define FN_TITLE_DESCRIPTION_SHAPE (FN_FORMAT2 + 15) /* shape title and description */
+#define FN_TITLE_DESCRIPTION_SHAPE (FN_FORMAT2 + 15) /* shape title and description */
-#define FN_NUMBER_FORMAT (FN_FORMAT2 + 120) /* Boxen/NumberFormatter eistellen */
-#define FN_NUMBER_STANDARD (FN_FORMAT2 + 121)
-#define FN_NUMBER_TWODEC (FN_FORMAT2 + 123)
+#define FN_NUMBER_FORMAT (FN_FORMAT2 + 120) /* Boxen/NumberFormatter eistellen */
+#define FN_NUMBER_STANDARD (FN_FORMAT2 + 121)
+#define FN_NUMBER_TWODEC (FN_FORMAT2 + 123)
#define FN_NUMBER_SCIENTIFIC (FN_FORMAT2 + 124)
-#define FN_NUMBER_DATE (FN_FORMAT2 + 125)
-#define FN_NUMBER_TIME (FN_FORMAT2 + 126)
-#define FN_NUMBER_CURRENCY (FN_FORMAT2 + 127)
-#define FN_NUMBER_PERCENT (FN_FORMAT2 + 128)
+#define FN_NUMBER_DATE (FN_FORMAT2 + 125)
+#define FN_NUMBER_TIME (FN_FORMAT2 + 126)
+#define FN_NUMBER_CURRENCY (FN_FORMAT2 + 127)
+#define FN_NUMBER_PERCENT (FN_FORMAT2 + 128)
-#define FN_FRAME_CHAIN (FN_FORMAT2 + 136)
-#define FN_FRAME_UNCHAIN (FN_FORMAT2 + 137)
+#define FN_FRAME_CHAIN (FN_FORMAT2 + 136)
+#define FN_FRAME_UNCHAIN (FN_FORMAT2 + 137)
-#define FN_NUMBER_NEWSTART (FN_FORMAT2 + 138)
-#define FN_NUMBER_NEWSTART_AT (FN_FORMAT2 + 139)
+#define FN_NUMBER_NEWSTART (FN_FORMAT2 + 138)
+#define FN_NUMBER_NEWSTART_AT (FN_FORMAT2 + 139)
-#define FN_FRAME_MIRROR_ON_EVEN_PAGES (FN_FORMAT2 + 140)
-#define FN_GRAPHIC_MIRROR_ON_EVEN_PAGES (FN_FORMAT2 + 141)
+#define FN_FRAME_MIRROR_ON_EVEN_PAGES (FN_FORMAT2 + 140)
+#define FN_GRAPHIC_MIRROR_ON_EVEN_PAGES (FN_FORMAT2 + 141)
-#define FN_TABLE_SPLIT_TABLE (FN_FORMAT2 + 142)
-#define FN_SYNC_LABELS (FN_FORMAT2 + 143)
+#define FN_TABLE_SPLIT_TABLE (FN_FORMAT2 + 142)
+#define FN_SYNC_LABELS (FN_FORMAT2 + 143)
#define FN_FORMAT_LINENUMBER (FN_FORMAT2 + 144)
-#define FN_TABLE_RELATIVE_WIDTH (FN_FORMAT2 + 147) /* Tabelle: relative Breite - UNO */
-#define FN_TABLE_WIDTH (FN_FORMAT2 + 148) /* Tabelle: Breite - UNO */
-#define FN_TABLE_IS_RELATIVE_WIDTH (FN_FORMAT2 + 149) /* Tabelle: ist Breite relativ?- UNO */
+#define FN_TABLE_RELATIVE_WIDTH (FN_FORMAT2 + 147) /* Tabelle: relative Breite - UNO */
+#define FN_TABLE_WIDTH (FN_FORMAT2 + 148) /* Tabelle: Breite - UNO */
+#define FN_TABLE_IS_RELATIVE_WIDTH (FN_FORMAT2 + 149) /* Tabelle: ist Breite relativ?- UNO */
-#define FN_INC_INDENT_OFFSET (FN_FORMAT2 + 150)
-#define FN_DEC_INDENT_OFFSET (FN_FORMAT2 + 151)
+#define FN_INC_INDENT_OFFSET (FN_FORMAT2 + 150)
+#define FN_DEC_INDENT_OFFSET (FN_FORMAT2 + 151)
-#define FN_TABLE_MERGE_TABLE (FN_FORMAT2 + 152)
+#define FN_TABLE_MERGE_TABLE (FN_FORMAT2 + 152)
#define FN_TABLE_ROW_SPLIT (FN_FORMAT2 + 153)
-#define FN_FORMAT_APPLY_HEAD1 (FN_FORMAT2 + 154)
-#define FN_FORMAT_APPLY_HEAD2 (FN_FORMAT2 + 155)
-#define FN_FORMAT_APPLY_HEAD3 (FN_FORMAT2 + 156)
-#define FN_FORMAT_APPLY_DEFAULT (FN_FORMAT2 + 157)
-#define FN_FORMAT_APPLY_TEXTBODY (FN_FORMAT2 + 158)
+#define FN_FORMAT_APPLY_HEAD1 (FN_FORMAT2 + 154)
+#define FN_FORMAT_APPLY_HEAD2 (FN_FORMAT2 + 155)
+#define FN_FORMAT_APPLY_HEAD3 (FN_FORMAT2 + 156)
+#define FN_FORMAT_APPLY_DEFAULT (FN_FORMAT2 + 157)
+#define FN_FORMAT_APPLY_TEXTBODY (FN_FORMAT2 + 158)
#define FN_REMOVE_DIRECT_CHAR_FORMATS (FN_FORMAT2 + 159)
#define FN_SAVE_GRAPHIC (FN_FORMAT2 + 160)
@@ -719,75 +719,75 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Extras
--------------------------------------------------------------------*/
-#define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* Zeilennumerierung */
-#define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* Silbentrennung */
-#define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* Woerter lernen */
-#define FN_DICTIONARY_DLG (FN_EXTRA + 8 ) /* Woerterbuecher */
-#define FN_NUMBERING (FN_EXTRA + 9 ) /* Nummerierung/Bullets */
-#define FN_NUMBERING_DLG (FN_EXTRA + 10) /* Nummerierung/Bullets */
-#define FN_NUMBERING_OUTLINE (FN_EXTRA + 11) /* Gliederungsnumerierung */
-#define FN_NUMBERING_OUTLINE_DLG (FN_EXTRA + 12) /* Gliederungsnumerierung */
-#define FN_SORTING_DLG (FN_EXTRA + 14) /* Sortieren */
-#define FN_CALCULATE (FN_EXTRA + 15) /* Berechnen */
-#define FN_GENERATE_TOC_DLG (FN_EXTRA + 16) /* Inhaltsverzeichnis */
-#define FN_GENERATE_INDEX_DLG (FN_EXTRA + 17) /* Stichwortverzeichnis */
-#define FN_GENERATE_DIR_DLG (FN_EXTRA + 18) /* Verzeichnis */
-#define FN_GLOSSARY_DLG (FN_EXTRA + 20) /* Textbausteine */
-#define FN_MACRO_CHOOSER (FN_EXTRA + 21) /* Makro aufnehmen */
-
-
-#define FN_PLAY_MACRO (FN_EXTRA + 23) /* Makro abspielen */
-#define FN_LAUNCH_BASIC (FN_EXTRA + 25) /* Makro abspielen */
-#define FN_EXPAND_GLOSSARY (FN_EXTRA + 28) /* Textbausteine expandieren */
-#define FN_CONFIG_TOOLBOX (FN_EXTRA + 29) /* Konfiguration Toolbox */
-#define FN_CONFIG_MENU (FN_EXTRA + 30) /* Konfiguration Menu */
-#define FN_CONFIG_KEY (FN_EXTRA + 31) /* Konfiguration Tastatur */
-#define FN_CHANGE_PAGENUM (FN_EXTRA + 34) /* Seitennummer aendern */
-
-#define FN_MACRO_POPUP (FN_EXTRA + 37) /* Alle Macrofunktionen */
-#define FN_BULLET (FN_EXTRA + 38) /* Bullet-Liste */
-
-
-// Bereich: Gloassaries
+#define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* Zeilennumerierung */
+#define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* Silbentrennung */
+#define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* Woerter lernen */
+#define FN_DICTIONARY_DLG (FN_EXTRA + 8 ) /* Woerterbuecher */
+#define FN_NUMBERING (FN_EXTRA + 9 ) /* Nummerierung/Bullets */
+#define FN_NUMBERING_DLG (FN_EXTRA + 10) /* Nummerierung/Bullets */
+#define FN_NUMBERING_OUTLINE (FN_EXTRA + 11) /* Gliederungsnumerierung */
+#define FN_NUMBERING_OUTLINE_DLG (FN_EXTRA + 12) /* Gliederungsnumerierung */
+#define FN_SORTING_DLG (FN_EXTRA + 14) /* Sortieren */
+#define FN_CALCULATE (FN_EXTRA + 15) /* Berechnen */
+#define FN_GENERATE_TOC_DLG (FN_EXTRA + 16) /* Inhaltsverzeichnis */
+#define FN_GENERATE_INDEX_DLG (FN_EXTRA + 17) /* Stichwortverzeichnis */
+#define FN_GENERATE_DIR_DLG (FN_EXTRA + 18) /* Verzeichnis */
+#define FN_GLOSSARY_DLG (FN_EXTRA + 20) /* Textbausteine */
+#define FN_MACRO_CHOOSER (FN_EXTRA + 21) /* Makro aufnehmen */
+
+
+#define FN_PLAY_MACRO (FN_EXTRA + 23) /* Makro abspielen */
+#define FN_LAUNCH_BASIC (FN_EXTRA + 25) /* Makro abspielen */
+#define FN_EXPAND_GLOSSARY (FN_EXTRA + 28) /* Textbausteine expandieren */
+#define FN_CONFIG_TOOLBOX (FN_EXTRA + 29) /* Konfiguration Toolbox */
+#define FN_CONFIG_MENU (FN_EXTRA + 30) /* Konfiguration Menu */
+#define FN_CONFIG_KEY (FN_EXTRA + 31) /* Konfiguration Tastatur */
+#define FN_CHANGE_PAGENUM (FN_EXTRA + 34) /* Seitennummer aendern */
+
+#define FN_MACRO_POPUP (FN_EXTRA + 37) /* Alle Macrofunktionen */
+#define FN_BULLET (FN_EXTRA + 38) /* Bullet-Liste */
+
+
+// Bereich: Gloassaries
// schon im Svx definiert
-//#define FN_GET_GLOSSARY_GROUP_COUNT (FN_EXTRA + 42) /* Anzahl der Bausteingruppen */
+//#define FN_GET_GLOSSARY_GROUP_COUNT (FN_EXTRA + 42) /* Anzahl der Bausteingruppen */
-#define FN_AUTO_CORRECT (FN_EXTRA + 49 ) /* Autocorrect aus Basic */
+#define FN_AUTO_CORRECT (FN_EXTRA + 49 ) /* Autocorrect aus Basic */
#define FN_UPDATE_TOX (FN_EXTRA + 53) /* alle Verzeichnisse aktualisieren */
#define FN_UPDATE_CUR_TOX (FN_EXTRA + 54) /* aktuelles Verzeichnisse aktualisieren */
#define FN_REMOVE_CUR_TOX (FN_EXTRA + 55) /* remove the current TOX*/
-#define FN_NAVIGATION_PI_GOTO_PAGE (FN_EXTRA + 59 ) /* Seitenanwahl aus Navi-PI */
+#define FN_NAVIGATION_PI_GOTO_PAGE (FN_EXTRA + 59 ) /* Seitenanwahl aus Navi-PI */
-#define FN_LETTER_WIZZARD (FN_EXTRA + 60 )
-#define FN_FAX_WIZZARD (FN_EXTRA + 61 )
-#define FN_MEMO_WIZZARD (FN_EXTRA + 62 )
-#define FN_AGENDA_WIZZARD (FN_EXTRA + 63 )
+#define FN_LETTER_WIZZARD (FN_EXTRA + 60 )
+#define FN_FAX_WIZZARD (FN_EXTRA + 61 )
+#define FN_MEMO_WIZZARD (FN_EXTRA + 62 )
+#define FN_AGENDA_WIZZARD (FN_EXTRA + 63 )
-#define FN_SET_BASIC_METRIC (FN_EXTRA + 80) /* Defaultmetrik Basic setzen */
+#define FN_SET_BASIC_METRIC (FN_EXTRA + 80) /* Defaultmetrik Basic setzen */
-#define FN_RESERVED_9 (FN_EXTRA + 86) /* Platzhalter */
-#define FN_RESERVED_8 (FN_EXTRA + 87) /* Platzhalter */
-#define FN_RESERVED_7 (FN_EXTRA + 88) /* Platzhalter */
-#define FN_RESERVED_6 (FN_EXTRA + 89) /* Platzhalter */
-#define FN_RESERVED_5 (FN_EXTRA + 90) /* Platzhalter */
-#define FN_RESERVED_4 (FN_EXTRA + 91) /* Platzhalter */
-#define FN_RESERVED_3 (FN_EXTRA + 92) /* Platzhalter */
-#define FN_RESERVED_2 (FN_EXTRA + 93) /* Platzhalter */
-#define FN_RESERVED_1 (FN_EXTRA + 94) /* Platzhalter */
+#define FN_RESERVED_9 (FN_EXTRA + 86) /* Platzhalter */
+#define FN_RESERVED_8 (FN_EXTRA + 87) /* Platzhalter */
+#define FN_RESERVED_7 (FN_EXTRA + 88) /* Platzhalter */
+#define FN_RESERVED_6 (FN_EXTRA + 89) /* Platzhalter */
+#define FN_RESERVED_5 (FN_EXTRA + 90) /* Platzhalter */
+#define FN_RESERVED_4 (FN_EXTRA + 91) /* Platzhalter */
+#define FN_RESERVED_3 (FN_EXTRA + 92) /* Platzhalter */
+#define FN_RESERVED_2 (FN_EXTRA + 93) /* Platzhalter */
+#define FN_RESERVED_1 (FN_EXTRA + 94) /* Platzhalter */
#define FN_COLLECTION_GROUP_CNT (FN_EXTRA + 96)
#define FN_COLLECTION_GROUP_IDX (FN_EXTRA + 97)
#define FN_COLL_TYPE (FN_EXTRA + 98) /* Typ fuer GlobalDoc-Collection*/
#define FN_COLL_ADD (FN_EXTRA + 99)
-#define FN_COLL_TITLE (FN_EXTRA2 + 1) /* Bereichsname oder Index-Title */
-#define FN_SHADOWCURSOR (FN_EXTRA2 + 4) /* Shadow Cursor ein/ausschalten */
+#define FN_COLL_TITLE (FN_EXTRA2 + 1) /* Bereichsname oder Index-Title */
+#define FN_SHADOWCURSOR (FN_EXTRA2 + 4) /* Shadow Cursor ein/ausschalten */
#define FN_VIEW_IN_FRAME (FN_EXTRA2 + 8) /* die View befindet sich in einem FrameDoc*/
@@ -808,74 +808,74 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_REFERENCE_MARK (FN_EXTRA2 + 22)
#define FN_UNO_TEXT_SECTION (FN_EXTRA2 + 23)
#define FN_UNO_FOOTNOTE (FN_EXTRA2 + 24)
-#define FN_UNO_ENDNOTE (FN_EXTRA2 + 25)
+#define FN_UNO_ENDNOTE (FN_EXTRA2 + 25)
#define FN_UNO_RANGE_COL_LABEL (FN_EXTRA2 + 26)
#define FN_UNO_RANGE_ROW_LABEL (FN_EXTRA2 + 27)
#define FN_UNO_TABLE_COLUMS (FN_EXTRA2 + 28)
#define FN_UNO_TABLE_BORDER (FN_EXTRA2 + 29)
-#define FN_UNO_TABLE_COLUMN_SEPARATORS (FN_EXTRA2 + 30)
-#define FN_UNO_TABLE_COLUMN_RELATIVE_SUM (FN_EXTRA2 + 31)
+#define FN_UNO_TABLE_COLUMN_SEPARATORS (FN_EXTRA2 + 30)
+#define FN_UNO_TABLE_COLUMN_RELATIVE_SUM (FN_EXTRA2 + 31)
#define FN_UNO_TABLE_CELL_BACKGROUND (FN_EXTRA2 + 32)
#define FN_UNO_ROW_HEIGHT (FN_EXTRA2 + 33)
#define FN_UNO_ROW_AUTO_HEIGHT (FN_EXTRA2 + 34)
-#define FN_UNO_HEADER (FN_EXTRA2 + 35)
-#define FN_UNO_HEADER_LEFT (FN_EXTRA2 + 36)
-#define FN_UNO_HEADER_RIGHT (FN_EXTRA2 + 37)
-#define FN_UNO_FOOTER (FN_EXTRA2 + 38)
-#define FN_UNO_FOOTER_LEFT (FN_EXTRA2 + 39)
-#define FN_UNO_FOOTER_RIGHT (FN_EXTRA2 + 40)
+#define FN_UNO_HEADER (FN_EXTRA2 + 35)
+#define FN_UNO_HEADER_LEFT (FN_EXTRA2 + 36)
+#define FN_UNO_HEADER_RIGHT (FN_EXTRA2 + 37)
+#define FN_UNO_FOOTER (FN_EXTRA2 + 38)
+#define FN_UNO_FOOTER_LEFT (FN_EXTRA2 + 39)
+#define FN_UNO_FOOTER_RIGHT (FN_EXTRA2 + 40)
#define FN_UNO_HEADER_BACKGROUND (FN_EXTRA2 + 41)
-#define FN_UNO_HEADER_BOX (FN_EXTRA2 + 42)
-#define FN_UNO_HEADER_LR_SPACE (FN_EXTRA2 + 43)
-#define FN_UNO_HEADER_SHADOW (FN_EXTRA2 + 44)
+#define FN_UNO_HEADER_BOX (FN_EXTRA2 + 42)
+#define FN_UNO_HEADER_LR_SPACE (FN_EXTRA2 + 43)
+#define FN_UNO_HEADER_SHADOW (FN_EXTRA2 + 44)
#define FN_UNO_FOOTER_BACKGROUND (FN_EXTRA2 + 45)
-#define FN_UNO_FOOTER_BOX (FN_EXTRA2 + 46)
-#define FN_UNO_FOOTER_LR_SPACE (FN_EXTRA2 + 47)
-#define FN_UNO_FOOTER_SHADOW (FN_EXTRA2 + 48)
+#define FN_UNO_FOOTER_BOX (FN_EXTRA2 + 46)
+#define FN_UNO_FOOTER_LR_SPACE (FN_EXTRA2 + 47)
+#define FN_UNO_FOOTER_SHADOW (FN_EXTRA2 + 48)
#define FN_UNO_HEADER_BODY_DISTANCE (FN_EXTRA2 + 49)
-#define FN_UNO_HEADER_IS_DYNAMIC_DISTANCE (FN_EXTRA2 + 50)
+#define FN_UNO_HEADER_IS_DYNAMIC_DISTANCE (FN_EXTRA2 + 50)
#define FN_UNO_FOOTER_BODY_DISTANCE (FN_EXTRA2 + 51)
-#define FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE (FN_EXTRA2 + 52)
+#define FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE (FN_EXTRA2 + 52)
#define FN_UNO_HEADER_SHARE_CONTENT (FN_EXTRA2 + 53)
#define FN_UNO_FOOTER_SHARE_CONTENT (FN_EXTRA2 + 54)
#define FN_UNO_HEADER_HEIGHT (FN_EXTRA2 + 55)
#define FN_UNO_FOOTER_HEIGHT (FN_EXTRA2 + 56)
-#define FN_UNO_HEADER_ON (FN_EXTRA2 + 57)
-#define FN_UNO_FOOTER_ON (FN_EXTRA2 + 58)
+#define FN_UNO_HEADER_ON (FN_EXTRA2 + 57)
+#define FN_UNO_FOOTER_ON (FN_EXTRA2 + 58)
#define FN_UNO_FOLLOW_STYLE (FN_EXTRA2 + 59)
-#define FN_API_CALL (FN_EXTRA2 + 60)
+#define FN_API_CALL (FN_EXTRA2 + 60)
#define FN_UNO_IS_PHYSICAL (FN_EXTRA2 + 61)
#define FN_UNO_IS_AUTO_UPDATE (FN_EXTRA2 + 62)
#define FN_UNO_DISPLAY_NAME (FN_EXTRA2 + 63)
-#define FN_UNO_WRAP (FN_EXTRA2 + 64)
+#define FN_UNO_WRAP (FN_EXTRA2 + 64)
#define FN_UNO_ANCHOR_TYPES (FN_EXTRA2 + 65)
-#define FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL (FN_EXTRA2 + 66)
+#define FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL (FN_EXTRA2 + 66)
#define FN_UNO_PARA_CONDITIONAL_STYLE_NAME (FN_EXTRA2 + 67)
#define FN_UNO_CATEGORY (FN_EXTRA2 + 68)
-#define FN_UNO_IS_NUMBER (FN_EXTRA2 + 69)
-#define FN_UNO_TEXT_WRAP (FN_EXTRA2 + 70)
+#define FN_UNO_IS_NUMBER (FN_EXTRA2 + 69)
+#define FN_UNO_TEXT_WRAP (FN_EXTRA2 + 70)
#define FN_UNO_ANCHOR_TYPE (FN_EXTRA2 + 71)
#define FN_SKIP_HIDDEN_TEXT (FN_EXTRA2 + 72)
#define FN_SKIP_PROTECTED_TEXT (FN_EXTRA2 + 73)
#define FN_UNO_Z_ORDER (FN_EXTRA2 + 74)
#define FN_UNO_REDLINE_NODE_START (FN_EXTRA2 + 75)
-#define FN_UNO_REDLINE_NODE_END (FN_EXTRA2 + 76)
+#define FN_UNO_REDLINE_NODE_END (FN_EXTRA2 + 76)
#define FN_UNO_TEXT_PORTION_TYPE (FN_EXTRA2 + 77)
#define FN_UNO_CONTROL_CHARACTER (FN_EXTRA2 + 78)
#define FN_UNO_BOOKMARK (FN_EXTRA2 + 79)
#define FN_UNO_IS_COLLAPSED (FN_EXTRA2 + 80)
#define FN_UNO_IS_START (FN_EXTRA2 + 81)
#define FN_UNO_IS_AUTOMATIC_CONTOUR (FN_EXTRA2 + 82)
-#define FN_UNO_IS_PIXEL_CONTOUR (FN_EXTRA2 + 83)
+#define FN_UNO_IS_PIXEL_CONTOUR (FN_EXTRA2 + 83)
#define FN_UNO_ALTERNATIVE_TEXT (FN_EXTRA2 + 84)
#define FN_UNO_ACTUAL_SIZE (FN_EXTRA2 + 85)
#define FN_UNO_GRAPHIC_U_R_L (FN_EXTRA2 + 86)
#define FN_UNO_GRAPHIC_FILTER (FN_EXTRA2 + 87)
-#define FN_UNO_CELL_NAME (FN_EXTRA2 + 88)
+#define FN_UNO_CELL_NAME (FN_EXTRA2 + 88)
#define FN_INSERT_GLOSSARY (FN_EXTRA2 + 89)
#define FN_NEW_GLOSSARY (FN_EXTRA2 + 90)
#define FN_SET_ACT_GLOSSARY (FN_EXTRA2 + 91)
@@ -919,98 +919,98 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Traveling & Selektion
--------------------------------------------------------------------*/
-#define FN_CHAR_LEFT (FN_SELECTION + 1 ) /* */
-#define FN_CHAR_RIGHT (FN_SELECTION + 2 ) /* */
-#define FN_LINE_UP (FN_SELECTION + 3 ) /* */
-#define FN_LINE_DOWN (FN_SELECTION + 4 ) /* */
-#define FN_START_OF_LINE (FN_SELECTION + 5 ) /* StartOfLine */
-#define FN_END_OF_LINE (FN_SELECTION + 6 ) /* EndOfLine */
-#define FN_START_OF_DOCUMENT (FN_SELECTION + 7 ) /* StartOfDocument */
+#define FN_CHAR_LEFT (FN_SELECTION + 1 ) /* */
+#define FN_CHAR_RIGHT (FN_SELECTION + 2 ) /* */
+#define FN_LINE_UP (FN_SELECTION + 3 ) /* */
+#define FN_LINE_DOWN (FN_SELECTION + 4 ) /* */
+#define FN_START_OF_LINE (FN_SELECTION + 5 ) /* StartOfLine */
+#define FN_END_OF_LINE (FN_SELECTION + 6 ) /* EndOfLine */
+#define FN_START_OF_DOCUMENT (FN_SELECTION + 7 ) /* StartOfDocument */
//schon in svxids.hrc
-//#define FN_END_OF_DOCUMENT (FN_SELECTION + 8 ) /* EndOfDocument */
-#define FN_START_OF_NEXT_PAGE (FN_SELECTION + 9 ) /* StartOfNextPage ??? */
-#define FN_END_OF_NEXT_PAGE (FN_SELECTION + 10) /* ??? */
-#define FN_START_OF_PREV_PAGE (FN_SELECTION + 11) /* StartOfPrevPage ??? */
-#define FN_END_OF_PREV_PAGE (FN_SELECTION + 12) /* ??? */
-#define FN_START_OF_PAGE (FN_SELECTION + 13) /* StartOfPage */
-#define FN_END_OF_PAGE (FN_SELECTION + 14) /* EndOfPage */
-#define FN_START_OF_WINDOW (FN_SELECTION + 15) /* StartOfWindow */
-#define FN_END_OF_WINDOW (FN_SELECTION + 16) /* EndOfWindow */
-#define FN_START_OF_COLUMN (FN_SELECTION + 17) /* StartOfColumn */
-#define FN_END_OF_COLUMN (FN_SELECTION + 18) /* EndOfColumn */
-#define FN_START_OF_PARA (FN_SELECTION + 19) /* StartOfPara */
-#define FN_END_OF_PARA (FN_SELECTION + 20) /* EndOfPara */
-#define FN_NEXT_WORD (FN_SELECTION + 21) /* NextWord */
-#define FN_PREV_WORD (FN_SELECTION + 22) /* PrevWord */
-#define FN_NEXT_SENT (FN_SELECTION + 23) /* NextSentence */
-#define FN_PREV_SENT (FN_SELECTION + 24) /* PrevSentence */
-#define FN_DELETE (FN_SELECTION + 25) /* Delete */
-#define FN_BACKSPACE (FN_SELECTION + 26) /* Backspace */
-#define FN_DELETE_SENT (FN_SELECTION + 27) /* DeleteToEndOfSentence */
-#define FN_DELETE_BACK_SENT (FN_SELECTION + 28) /* DeleteToStartOfSentence */
-#define FN_DELETE_WORD (FN_SELECTION + 29) /* DeleteToEndOfWord */
-#define FN_DELETE_BACK_WORD (FN_SELECTION + 30) /* DeleteToStartOfWord */
-#define FN_DELETE_LINE (FN_SELECTION + 31) /* DeleteToEndOfLine */
-#define FN_DELETE_BACK_LINE (FN_SELECTION + 32) /* DeleteToStartOfLine */
-#define FN_DELETE_PARA (FN_SELECTION + 33) /* DeleteToEndOfPara */
-#define FN_DELETE_BACK_PARA (FN_SELECTION + 34) /* DeleteToStartOfPara */
-#define FN_DELETE_WHOLE_LINE (FN_SELECTION + 35) /* DeleteLine ??? */
-#define FN_SET_INS_MODE (FN_SELECTION + 36) /* Einfuegemodus / Overwrite */
-#define FN_PAGEUP (FN_SELECTION + 37) /* PageUpWithCursor */
-#define FN_PAGEDOWN (FN_SELECTION + 38) /* PageDownWithCursor */
-#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selektionsmodus */
-#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selektionsmodus */
-#define FN_ESCAPE (FN_SELECTION + 41) /* Normal */
+//#define FN_END_OF_DOCUMENT (FN_SELECTION + 8 ) /* EndOfDocument */
+#define FN_START_OF_NEXT_PAGE (FN_SELECTION + 9 ) /* StartOfNextPage ??? */
+#define FN_END_OF_NEXT_PAGE (FN_SELECTION + 10) /* ??? */
+#define FN_START_OF_PREV_PAGE (FN_SELECTION + 11) /* StartOfPrevPage ??? */
+#define FN_END_OF_PREV_PAGE (FN_SELECTION + 12) /* ??? */
+#define FN_START_OF_PAGE (FN_SELECTION + 13) /* StartOfPage */
+#define FN_END_OF_PAGE (FN_SELECTION + 14) /* EndOfPage */
+#define FN_START_OF_WINDOW (FN_SELECTION + 15) /* StartOfWindow */
+#define FN_END_OF_WINDOW (FN_SELECTION + 16) /* EndOfWindow */
+#define FN_START_OF_COLUMN (FN_SELECTION + 17) /* StartOfColumn */
+#define FN_END_OF_COLUMN (FN_SELECTION + 18) /* EndOfColumn */
+#define FN_START_OF_PARA (FN_SELECTION + 19) /* StartOfPara */
+#define FN_END_OF_PARA (FN_SELECTION + 20) /* EndOfPara */
+#define FN_NEXT_WORD (FN_SELECTION + 21) /* NextWord */
+#define FN_PREV_WORD (FN_SELECTION + 22) /* PrevWord */
+#define FN_NEXT_SENT (FN_SELECTION + 23) /* NextSentence */
+#define FN_PREV_SENT (FN_SELECTION + 24) /* PrevSentence */
+#define FN_DELETE (FN_SELECTION + 25) /* Delete */
+#define FN_BACKSPACE (FN_SELECTION + 26) /* Backspace */
+#define FN_DELETE_SENT (FN_SELECTION + 27) /* DeleteToEndOfSentence */
+#define FN_DELETE_BACK_SENT (FN_SELECTION + 28) /* DeleteToStartOfSentence */
+#define FN_DELETE_WORD (FN_SELECTION + 29) /* DeleteToEndOfWord */
+#define FN_DELETE_BACK_WORD (FN_SELECTION + 30) /* DeleteToStartOfWord */
+#define FN_DELETE_LINE (FN_SELECTION + 31) /* DeleteToEndOfLine */
+#define FN_DELETE_BACK_LINE (FN_SELECTION + 32) /* DeleteToStartOfLine */
+#define FN_DELETE_PARA (FN_SELECTION + 33) /* DeleteToEndOfPara */
+#define FN_DELETE_BACK_PARA (FN_SELECTION + 34) /* DeleteToStartOfPara */
+#define FN_DELETE_WHOLE_LINE (FN_SELECTION + 35) /* DeleteLine ??? */
+#define FN_SET_INS_MODE (FN_SELECTION + 36) /* Einfuegemodus / Overwrite */
+#define FN_PAGEUP (FN_SELECTION + 37) /* PageUpWithCursor */
+#define FN_PAGEDOWN (FN_SELECTION + 38) /* PageDownWithCursor */
+#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selektionsmodus */
+#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selektionsmodus */
+#define FN_ESCAPE (FN_SELECTION + 41) /* Normal */
#define FN_SHIFT_BACKSPACE (FN_SELECTION + 42) /* wie Backspace */
-#define FN_SELECT_WORD (FN_SELECTION + 43) /* Wort selektieren */
+#define FN_SELECT_WORD (FN_SELECTION + 43) /* Wort selektieren */
-#define FN_GOTO_NEXT_OBJ (FN_SELECTION + 44) /* N�chstes Objekt anspringen */
-#define FN_GOTO_PREV_OBJ (FN_SELECTION + 45) /* Vorhergehendes Objekt anspringen */
+#define FN_GOTO_NEXT_OBJ (FN_SELECTION + 44) /* N�chstes Objekt anspringen */
+#define FN_GOTO_PREV_OBJ (FN_SELECTION + 45) /* Vorhergehendes Objekt anspringen */
-#define FN_START_TABLE (FN_SELECTION + 47) /* an den Anfang der Tabelle */
-#define FN_END_TABLE (FN_SELECTION + 48) /* an das Ende der Tabelle */
-#define FN_NEXT_TABLE (FN_SELECTION + 49) /* zur vorhergehenden Tabelle */
-#define FN_PREV_TABLE (FN_SELECTION + 50) /* zur naechsten Tabelle */
+#define FN_START_TABLE (FN_SELECTION + 47) /* an den Anfang der Tabelle */
+#define FN_END_TABLE (FN_SELECTION + 48) /* an das Ende der Tabelle */
+#define FN_NEXT_TABLE (FN_SELECTION + 49) /* zur vorhergehenden Tabelle */
+#define FN_PREV_TABLE (FN_SELECTION + 50) /* zur naechsten Tabelle */
-#define FN_START_OF_NEXT_COLUMN (FN_SELECTION + 51) /* zum Anfang der naechsten Spalte */
-#define FN_END_OF_NEXT_COLUMN (FN_SELECTION + 52) /* zum Ende der naechsten Spalte */
-#define FN_START_OF_PREV_COLUMN (FN_SELECTION + 53) /* zum Anfang der vorhergehenden Spalte */
-#define FN_END_OF_PREV_COLUMN (FN_SELECTION + 54) /* zum Ende der vorhergehenden Spalte */
+#define FN_START_OF_NEXT_COLUMN (FN_SELECTION + 51) /* zum Anfang der naechsten Spalte */
+#define FN_END_OF_NEXT_COLUMN (FN_SELECTION + 52) /* zum Ende der naechsten Spalte */
+#define FN_START_OF_PREV_COLUMN (FN_SELECTION + 53) /* zum Anfang der vorhergehenden Spalte */
+#define FN_END_OF_PREV_COLUMN (FN_SELECTION + 54) /* zum Ende der vorhergehenden Spalte */
-#define FN_FOOTNOTE_TO_ANCHOR (FN_SELECTION + 55) /* aus der Fussnote zum Anchor */
-#define FN_NEXT_FOOTNOTE (FN_SELECTION + 56) /* zur naechsten Fussnote */
-#define FN_PREV_FOOTNOTE (FN_SELECTION + 57) /* zur vorhergehenden Fussnote */
+#define FN_FOOTNOTE_TO_ANCHOR (FN_SELECTION + 55) /* aus der Fussnote zum Anchor */
+#define FN_NEXT_FOOTNOTE (FN_SELECTION + 56) /* zur naechsten Fussnote */
+#define FN_PREV_FOOTNOTE (FN_SELECTION + 57) /* zur vorhergehenden Fussnote */
-#define FN_CNTNT_TO_NEXT_FRAME (FN_SELECTION + 58) /* aus dem Inhalt zum naechsten Rahmen */
-#define FN_FRAME_TO_ANCHOR (FN_SELECTION + 59) /* vom Rahmen zum Anker */
+#define FN_CNTNT_TO_NEXT_FRAME (FN_SELECTION + 58) /* aus dem Inhalt zum naechsten Rahmen */
+#define FN_FRAME_TO_ANCHOR (FN_SELECTION + 59) /* vom Rahmen zum Anker */
-#define FN_TO_HEADER (FN_SELECTION + 60) /* Toggle zwischen Content und Kopfzeile */
-#define FN_TO_FOOTER (FN_SELECTION + 61) /* Toggle zwischen Content und Fusszeile */
+#define FN_TO_HEADER (FN_SELECTION + 60) /* Toggle zwischen Content und Kopfzeile */
+#define FN_TO_FOOTER (FN_SELECTION + 61) /* Toggle zwischen Content und Fusszeile */
-#define FN_IDX_MARK_TO_IDX (FN_SELECTION + 62) /* von der Verzeichnismarkierung zum Verzeichnis */
+#define FN_IDX_MARK_TO_IDX (FN_SELECTION + 62) /* von der Verzeichnismarkierung zum Verzeichnis */
#define FN_TO_FOOTNOTE_AREA (FN_SELECTION + 63) /* jump into the appropriate footnote area */
-#define FN_SET_BLOCK_MODE (FN_SELECTION + 64) /* selection mode: block */
+#define FN_SET_BLOCK_MODE (FN_SELECTION + 64) /* selection mode: block */
-#define FN_PREV_PARA (FN_SELECTION + 74)
-#define FN_NEXT_PARA (FN_SELECTION + 75)
+#define FN_PREV_PARA (FN_SELECTION + 74)
+#define FN_NEXT_PARA (FN_SELECTION + 75)
-#define FN_GOTO_NEXT_MARK (FN_SELECTION + 76) /* N�chsten Platzhalter anspringen */
-#define FN_GOTO_PREV_MARK (FN_SELECTION + 77) /* Vorhergehenden Platzhalter anspringen */
+#define FN_GOTO_NEXT_MARK (FN_SELECTION + 76) /* N�chsten Platzhalter anspringen */
+#define FN_GOTO_PREV_MARK (FN_SELECTION + 77) /* Vorhergehenden Platzhalter anspringen */
// schon im SVX unter der gleichen Id
-//#define FN_START_DOC_DIRECT (FN_SELECTION + 78) /* Direkt zum Dokanfang springen */
-//#define FN_END_DOC_DIRECT (FN_SELECTION + 79) /* Direkt zum Dokanfang springen */
+//#define FN_START_DOC_DIRECT (FN_SELECTION + 78) /* Direkt zum Dokanfang springen */
+//#define FN_END_DOC_DIRECT (FN_SELECTION + 79) /* Direkt zum Dokanfang springen */
-#define FN_NEXT_TOXMARK (FN_SELECTION + 83) /* zur naechsten Verz. Markierung */
-#define FN_PREV_TOXMARK (FN_SELECTION + 84) /* zur vorherigen Verz. Markierung */
-#define FN_NEXT_TBLFML (FN_SELECTION + 85) /* zur naechsten Tabellenformel */
-#define FN_PREV_TBLFML (FN_SELECTION + 86) /* zur vorherigen Tabellenformel */
-#define FN_NEXT_TBLFML_ERR (FN_SELECTION + 87) /* zur naechsten fehl. Tabellenformel */
-#define FN_PREV_TBLFML_ERR (FN_SELECTION + 88) /* zur vorherigen fehl. Tabellenformel */
+#define FN_NEXT_TOXMARK (FN_SELECTION + 83) /* zur naechsten Verz. Markierung */
+#define FN_PREV_TOXMARK (FN_SELECTION + 84) /* zur vorherigen Verz. Markierung */
+#define FN_NEXT_TBLFML (FN_SELECTION + 85) /* zur naechsten Tabellenformel */
+#define FN_PREV_TBLFML (FN_SELECTION + 86) /* zur vorherigen Tabellenformel */
+#define FN_NEXT_TBLFML_ERR (FN_SELECTION + 87) /* zur naechsten fehl. Tabellenformel */
+#define FN_PREV_TBLFML_ERR (FN_SELECTION + 88) /* zur vorherigen fehl. Tabellenformel */
#define FN_READONLY_SELECTION_MODE (FN_SELECTION + 89) /* switches text selection mode in readonly documents*/
#define FN_SELECTION_MODE_DEFAULT (FN_SELECTION + 90) /* use default selection mode - not block mode */
@@ -1022,30 +1022,30 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
-#define FN_IS_MODIFIED (FN_QUERY +16) /* Dokument geaendert? */
-#define FN_RESET_MODIFIED (FN_QUERY +17) /* Geaendert-Flag zuruecksetzen */
+#define FN_IS_MODIFIED (FN_QUERY +16) /* Dokument geaendert? */
+#define FN_RESET_MODIFIED (FN_QUERY +17) /* Geaendert-Flag zuruecksetzen */
-#define FN_GET_DOC_INFO (FN_QUERY +22) /* Wert Dokumentinfo erfragen */
-#define FN_GET_ERRNO (FN_QUERY +26) /* Error-Nummer abfragen */
-#define FN_GET_DOCMAN_PATH (FN_QUERY +27) /* Pfad zu einer Gruppe im Docmgr erfragen */
+#define FN_GET_DOC_INFO (FN_QUERY +22) /* Wert Dokumentinfo erfragen */
+#define FN_GET_ERRNO (FN_QUERY +26) /* Error-Nummer abfragen */
+#define FN_GET_DOCMAN_PATH (FN_QUERY +27) /* Pfad zu einer Gruppe im Docmgr erfragen */
-#define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */
-#define FN_EXECUTE_DRAG (FN_QUERY +30) /* D&D starten */
+#define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */
+#define FN_EXECUTE_DRAG (FN_QUERY +30) /* D&D starten */
-#define FN_GET_PRINT_AREA (FN_QUERY +32) /* Attribut fuer druckbaren Seitenbereich besorgen */
+#define FN_GET_PRINT_AREA (FN_QUERY +32) /* Attribut fuer druckbaren Seitenbereich besorgen */
-// #define FN_IS_START_OF_PAGE (FN_QUERY +40) /**/
-// #define FN_IS_END_OF_PAGE (FN_QUERY +41) /**/
+// #define FN_IS_START_OF_PAGE (FN_QUERY +40) /**/
+// #define FN_IS_END_OF_PAGE (FN_QUERY +41) /**/
-#define FN_GET_PARAGRAPH (FN_QUERY +48) /* Paragraph-Object von der Textshell
+#define FN_GET_PARAGRAPH (FN_QUERY +48) /* Paragraph-Object von der Textshell
an die View weiterreichen*/
// hier ist Schluss!!!
-#define FN_DB_FORM_LETTER (FN_QUERY2 + 0) /* form letter */
-#define FN_DB_INSERT_CONTENT (FN_QUERY2 + 1) /* merge data into fields*/
-#define FN_DB_INSERT_COLUMNS (FN_QUERY2 + 2) /* insert data into text/table/as fields*/
+#define FN_DB_FORM_LETTER (FN_QUERY2 + 0) /* form letter */
+#define FN_DB_INSERT_CONTENT (FN_QUERY2 + 1) /* merge data into fields*/
+#define FN_DB_INSERT_COLUMNS (FN_QUERY2 + 2) /* insert data into text/table/as fields*/
#define FN_DB_CONNECTION_ANY (FN_QUERY2 + 3)
#define FN_DB_COLUMN_ANY (FN_QUERY2 + 4)
#define FN_DB_DATA_SOURCE_ANY (FN_QUERY2 + 5)
@@ -1053,85 +1053,85 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_DB_DATA_COMMAND_TYPE_ANY (FN_QUERY2 + 7)
#define FN_DB_DATA_COLUMN_NAME_ANY (FN_QUERY2 + 8)
#define FN_DB_DATA_SELECTION_ANY (FN_QUERY2 + 9)
-#define FN_DB_DATA_CURSOR_ANY (FN_QUERY2 + 10)
+#define FN_DB_DATA_CURSOR_ANY (FN_QUERY2 + 10)
/*--------------------------------------------------------------------
Bereich: Envelope
--------------------------------------------------------------------*/
-#define FN_ENVELOP (FN_ENVELP )
+#define FN_ENVELOP (FN_ENVELP )
-#define FN_DELETE_NOTE (FN_NOTES+0)
-#define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1)
-#define FN_DELETE_ALL_NOTES (FN_NOTES+2)
-#define FN_HIDE_NOTE (FN_NOTES+3)
-#define FN_HIDE_NOTE_AUTHOR (FN_NOTES+4)
-#define FN_HIDE_ALL_NOTES (FN_NOTES+5)
+#define FN_DELETE_NOTE (FN_NOTES+0)
+#define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1)
+#define FN_DELETE_ALL_NOTES (FN_NOTES+2)
+#define FN_HIDE_NOTE (FN_NOTES+3)
+#define FN_HIDE_NOTE_AUTHOR (FN_NOTES+4)
+#define FN_HIDE_ALL_NOTES (FN_NOTES+5)
-#define FN_DELETE_COMMENT (FN_NOTES+6)
-#define FN_REPLY (FN_NOTES+7)
+#define FN_DELETE_COMMENT (FN_NOTES+6)
+#define FN_REPLY (FN_NOTES+7)
/*--------------------------------------------------------------------
Bereich: Parameter
--------------------------------------------------------------------*/
-#define FN_PARAM_TABLE_COLS (FN_PARAM)
-#define FN_PARAM_TABLE_ROWS (FN_PARAM+1)
+#define FN_PARAM_TABLE_COLS (FN_PARAM)
+#define FN_PARAM_TABLE_ROWS (FN_PARAM+1)
#define FN_PARAM_MOVE_COUNT (FN_PARAM+2)
#define FN_PARAM_MOVE_SELECTION (FN_PARAM+3)
-#define FN_PARAM_SEARCH_WORDONLY (FN_PARAM+5)
-#define FN_PARAM_SEARCH_EXACT (FN_PARAM+6)
-#define FN_PARAM_SEARCH_REGEXP (FN_PARAM+7)
-#define FN_PARAM_SEARCH_BACKWARDS (FN_PARAM+8)
-#define FN_PARAM_SEARCH_FINDALL (FN_PARAM+9)
-#define FN_PARAM_SEARCH_SELECTION (FN_PARAM+10)
-#define FN_PARAM_SEARCH_TEXT (FN_PARAM+11)
+#define FN_PARAM_SEARCH_WORDONLY (FN_PARAM+5)
+#define FN_PARAM_SEARCH_EXACT (FN_PARAM+6)
+#define FN_PARAM_SEARCH_REGEXP (FN_PARAM+7)
+#define FN_PARAM_SEARCH_BACKWARDS (FN_PARAM+8)
+#define FN_PARAM_SEARCH_FINDALL (FN_PARAM+9)
+#define FN_PARAM_SEARCH_SELECTION (FN_PARAM+10)
+#define FN_PARAM_SEARCH_TEXT (FN_PARAM+11)
#define FN_PARAM_SEARCH_TEXTREPLACE (FN_PARAM+12)
-#define FN_PARAM_PARADLGLIMITS (FN_PARAM+15)
-#define FN_PARAM_FRMMODE (FN_PARAM+16)
+#define FN_PARAM_PARADLGLIMITS (FN_PARAM+15)
+#define FN_PARAM_FRMMODE (FN_PARAM+16)
-#define FN_PARAM_ADDPRINTER (FN_PARAM+18)
-#define FN_PARAM_GRID (FN_PARAM+19)
-#define FN_PARAM_DOCDISP (FN_PARAM+20)
-#define FN_PARAM_ELEM (FN_PARAM+21)
-#define FN_PARAM_SWTEST (FN_PARAM+22)
+#define FN_PARAM_ADDPRINTER (FN_PARAM+18)
+#define FN_PARAM_GRID (FN_PARAM+19)
+#define FN_PARAM_DOCDISP (FN_PARAM+20)
+#define FN_PARAM_ELEM (FN_PARAM+21)
+#define FN_PARAM_SWTEST (FN_PARAM+22)
-#define FN_PARAM_FTN_INFO (FN_PARAM+23)
+#define FN_PARAM_FTN_INFO (FN_PARAM+23)
-#define FN_PARAM_REGION_NAME (FN_PARAM+24)
-#define FN_PARAM_REGION_CONDITION (FN_PARAM+25)
-#define FN_PARAM_REGION_HIDDEN (FN_PARAM+26)
-#define FN_PARAM_REGION_PROTECT (FN_PARAM+27)
+#define FN_PARAM_REGION_NAME (FN_PARAM+24)
+#define FN_PARAM_REGION_CONDITION (FN_PARAM+25)
+#define FN_PARAM_REGION_HIDDEN (FN_PARAM+26)
+#define FN_PARAM_REGION_PROTECT (FN_PARAM+27)
#define FN_PARAM_REGION_EDIT_IN_READONLY (FN_PARAM+28)
-#define FN_PARAM_INSERT_AFTER (FN_PARAM+29)
+#define FN_PARAM_INSERT_AFTER (FN_PARAM+29)
//#define FN_PARAM_FILTER (FN_PARAM+30) already defined in svx/svxids.hrc
-#define FN_PARAM_INDEX_NAME (FN_PARAM+31)
-#define FN_PARAM_INDEX_OPTIONS (FN_PARAM+32)
-#define FN_PARAM_INDEX_FORMAT (FN_PARAM+33)
-#define FN_PARAM_INDEX_LEVEL (FN_PARAM+34)
-#define FN_PARAM_INDEX_TEMPLATE (FN_PARAM+35)
-#define FN_PARAM_INDEX_ALTSTR (FN_PARAM+36)
-#define FN_PARAM_INDEX_PRIMKEY (FN_PARAM+37)
-#define FN_PARAM_INDEX_SECKEY (FN_PARAM+38)
-#define FN_PARAM_WIDTH (FN_PARAM+39)
-#define FN_PARAM_LOCATION (FN_PARAM+40)
-#define FN_PARAM_DIR (FN_PARAM+41)
-#define FN_PARAM_COUNT (FN_PARAM+42)
-#define FN_PARAM_COLOR (FN_PARAM+43)
-
-#define FN_PARAM_TABLE_NAME (FN_PARAM+44)
-#define FN_PARAM_TABLE_WIDTH (FN_PARAM+45)
-#define FN_PARAM_TABLE_ULSPACE (FN_PARAM+46)
-#define FN_PARAM_TABLE_LRSPACE (FN_PARAM+47)
-#define FN_PARAM_TABLE_SHADOW (FN_PARAM+48)
-#define FN_PARAM_TABLE_ALIGN (FN_PARAM+49)
-#define FN_PARAM_TABLE_HEADLINE (FN_PARAM+50)
-#define FN_PARAM_TABLE_SPACE (FN_PARAM+51)
-#define FN_PARAM_TABLE_COLUMNS (FN_PARAM+52)
+#define FN_PARAM_INDEX_NAME (FN_PARAM+31)
+#define FN_PARAM_INDEX_OPTIONS (FN_PARAM+32)
+#define FN_PARAM_INDEX_FORMAT (FN_PARAM+33)
+#define FN_PARAM_INDEX_LEVEL (FN_PARAM+34)
+#define FN_PARAM_INDEX_TEMPLATE (FN_PARAM+35)
+#define FN_PARAM_INDEX_ALTSTR (FN_PARAM+36)
+#define FN_PARAM_INDEX_PRIMKEY (FN_PARAM+37)
+#define FN_PARAM_INDEX_SECKEY (FN_PARAM+38)
+#define FN_PARAM_WIDTH (FN_PARAM+39)
+#define FN_PARAM_LOCATION (FN_PARAM+40)
+#define FN_PARAM_DIR (FN_PARAM+41)
+#define FN_PARAM_COUNT (FN_PARAM+42)
+#define FN_PARAM_COLOR (FN_PARAM+43)
+
+#define FN_PARAM_TABLE_NAME (FN_PARAM+44)
+#define FN_PARAM_TABLE_WIDTH (FN_PARAM+45)
+#define FN_PARAM_TABLE_ULSPACE (FN_PARAM+46)
+#define FN_PARAM_TABLE_LRSPACE (FN_PARAM+47)
+#define FN_PARAM_TABLE_SHADOW (FN_PARAM+48)
+#define FN_PARAM_TABLE_ALIGN (FN_PARAM+49)
+#define FN_PARAM_TABLE_HEADLINE (FN_PARAM+50)
+#define FN_PARAM_TABLE_SPACE (FN_PARAM+51)
+#define FN_PARAM_TABLE_COLUMNS (FN_PARAM+52)
#define FN_PARAM_GRF_CONNECT (FN_PARAM+53)
#define FN_PARAM_FIELD_TYPE (FN_PARAM+54)
@@ -1140,45 +1140,45 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_PARAM_FIELD_FORMAT (FN_PARAM+57)
-#define FN_PARAM_EVENT (FN_PARAM+68)
-#define FN_PARAM_URL (FN_PARAM+69)
-#define FN_PARAM_GRF_REALSIZE (FN_PARAM+70)
-#define FN_PARAM_GRF_DIALOG (FN_PARAM+71)
-#define FN_PARAM_GRF_CLIENTMAP (FN_PARAM+74) /* ClientMap */
-#define FN_PARAM_GRF_SERVERMAP (FN_PARAM+75) /* ServerMap */
-#define FN_PARAM_GRF_TARGETFRAME (FN_PARAM+76) /* TargetFrame */
+#define FN_PARAM_EVENT (FN_PARAM+68)
+#define FN_PARAM_URL (FN_PARAM+69)
+#define FN_PARAM_GRF_REALSIZE (FN_PARAM+70)
+#define FN_PARAM_GRF_DIALOG (FN_PARAM+71)
+#define FN_PARAM_GRF_CLIENTMAP (FN_PARAM+74) /* ClientMap */
+#define FN_PARAM_GRF_SERVERMAP (FN_PARAM+75) /* ServerMap */
+#define FN_PARAM_GRF_TARGETFRAME (FN_PARAM+76) /* TargetFrame */
#define FN_INET_FIELD_MACRO (FN_PARAM+77) /* Id fuer URL-Feld-Macros*/
-#define FN_PARAM_PRINTER (FN_PARAM+78) /* Drucker* */
-#define FN_PARAM_STDFONTS (FN_PARAM+79) /* ConfigItem Standardfonts */
+#define FN_PARAM_PRINTER (FN_PARAM+78) /* Drucker* */
+#define FN_PARAM_STDFONTS (FN_PARAM+79) /* ConfigItem Standardfonts */
-#define FN_PARAM_WRTSHELL (FN_PARAM2) /* SwWrtShell */
+#define FN_PARAM_WRTSHELL (FN_PARAM2) /* SwWrtShell */
#define FN_COND_COLL (FN_PARAM2+1) /* Item fuer bed. Vorlagen */
-#define FN_PARAM_SELECTION (FN_PARAM2+2) /* selektiertes Wort fuer Format/Zeichen/Hyperlink */
+#define FN_PARAM_SELECTION (FN_PARAM2+2) /* selektiertes Wort fuer Format/Zeichen/Hyperlink */
-#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem die aktuelle NumRule */
+#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem die aktuelle NumRule */
#define FN_PARAM_CHILD_LEVELS (FN_PARAM2+4) /* Werden Child-Levels benutzt ?*/
-#define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* vorgewaehlte Numerierung*/
+#define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* vorgewaehlte Numerierung*/
#define FN_PARAM_HEIGHT (FN_PARAM2+6) /* Param fuer Hoehe */
#define FN_PARAM_DIST (FN_PARAM2+7) /* und Breite, wg. metrischer Umwandlung */
-#define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* Fuer ShadowCursor Optionen */
+#define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* Fuer ShadowCursor Optionen */
-#define FN_PARAM_ACT_NUMLEVEL (FN_PARAM2+9) /* BYTE-Item mit aktuellen NumLevel */
+#define FN_PARAM_ACT_NUMLEVEL (FN_PARAM2+9) /* BYTE-Item mit aktuellen NumLevel */
-#define FN_PARAM_9 (FN_PARAM2+10)
+#define FN_PARAM_9 (FN_PARAM2+10)
#define FN_PARAM_10 (FN_PARAM2+11)
#define FN_TEXT_RANGE (FN_PARAM2+12) /* TextRange Property*/
-#define FN_PARAM_CRSR_IN_PROTECTED (FN_PARAM2+13) /* Cursor in geschuetzten Bereichen*/
+#define FN_PARAM_CRSR_IN_PROTECTED (FN_PARAM2+13) /* Cursor in geschuetzten Bereichen*/
#define FN_PARAM_TOX_TYPE (FN_PARAM2+14) /* TOX type in tox dialog*/
#define FN_PARAM_LINK_DISPLAY_NAME (FN_PARAM2+15) /* LinkDisplayName property*/
-#define FN_PARAM_NUM_LEVEL (FN_PARAM2+16) /* rtf filter*/
-#define FN_PARAM_COUNTOUR_PP (FN_PARAM2+17) /* contour PolyPolygon*/
+#define FN_PARAM_NUM_LEVEL (FN_PARAM2+16) /* rtf filter*/
+#define FN_PARAM_COUNTOUR_PP (FN_PARAM2+17) /* contour PolyPolygon*/
#define FN_ANCHOR_POSITION (FN_PARAM2+18) /* AnchorPosition property */
#define FN_DROP_TEXT (FN_PARAM2+18) /* text set in drop caps tab page - for recording */
@@ -1201,41 +1201,41 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
Bereich: Druckoptionen
--------------------------------------------------------------------*/
-#define FN_PRNOPT_GRAPHIC (FN_PRNOPT + 1)
-#define FN_PRNOPT_TABLE (FN_PRNOPT + 2)
-#define FN_PRNOPT_LEFT_PAGE (FN_PRNOPT + 3)
-#define FN_PRNOPT_RIGHT_PAGE (FN_PRNOPT + 4)
-#define FN_PRNOPT_REVERSE (FN_PRNOPT + 5)
-#define FN_PRNOPT_PAPER_FROM_SETUP (FN_PRNOPT + 6)
-#define FN_PRNOPT_POSTITS (FN_PRNOPT + 8)
+#define FN_PRNOPT_GRAPHIC (FN_PRNOPT + 1)
+#define FN_PRNOPT_TABLE (FN_PRNOPT + 2)
+#define FN_PRNOPT_LEFT_PAGE (FN_PRNOPT + 3)
+#define FN_PRNOPT_RIGHT_PAGE (FN_PRNOPT + 4)
+#define FN_PRNOPT_REVERSE (FN_PRNOPT + 5)
+#define FN_PRNOPT_PAPER_FROM_SETUP (FN_PRNOPT + 6)
+#define FN_PRNOPT_POSTITS (FN_PRNOPT + 8)
#define FN_PRNOPT_BEGIN FN_PRNOPT_GRAPHIC
-#define FN_PRNOPT_END FN_PRNOPT_POSTITS
+#define FN_PRNOPT_END FN_PRNOPT_POSTITS
/*--------------------------------------------------------------------
Beschreibung: Status : nicht mehr als 19!
--------------------------------------------------------------------*/
-#define FN_STAT_PAGE (FN_STAT + 1)
-#define FN_STAT_TEMPLATE (FN_STAT + 2)
-#define FN_STAT_ZOOM (FN_STAT + 3)
-#define FN_STAT_INSOVER (FN_STAT + 4)
-#define FN_STAT_SELMODE (FN_STAT + 5)
-#define FN_STAT_CONTEXT (FN_STAT + 7)
-#define FN_STAT_BOOKMARK (FN_STAT + 8) /* Fuer Popup Bookmarks*/
+#define FN_STAT_PAGE (FN_STAT + 1)
+#define FN_STAT_TEMPLATE (FN_STAT + 2)
+#define FN_STAT_ZOOM (FN_STAT + 3)
+#define FN_STAT_INSOVER (FN_STAT + 4)
+#define FN_STAT_SELMODE (FN_STAT + 5)
+#define FN_STAT_CONTEXT (FN_STAT + 7)
+#define FN_STAT_BOOKMARK (FN_STAT + 8) /* Fuer Popup Bookmarks*/
/*--------------------------------------------------------------------
Bereich: Seitenvorschau
--------------------------------------------------------------------*/
-#define FN_SHOW_TWO_PAGES (FN_PGPREVIEW + 1)
+#define FN_SHOW_TWO_PAGES (FN_PGPREVIEW + 1)
//already in svx/svxids.hrc
#ifndef FN_SHOW_MULTIPLE_PAGES
#define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2)
#endif
-#define FN_PRINT_PAGEPREVIEW (FN_PGPREVIEW + 3)
+#define FN_PRINT_PAGEPREVIEW (FN_PGPREVIEW + 3)
#define FN_CLOSE_PAGEPREVIEW (FN_PGPREVIEW + 4)
-#define FN_SHOW_BOOKVIEW (FN_PGPREVIEW + 5)
+#define FN_SHOW_BOOKVIEW (FN_PGPREVIEW + 5)
/*--------------------------------------------------------------------
Bereich: Rahmenattribute
@@ -1248,7 +1248,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_HORI_ORIENT (FN_FRAME + 5)
#define FN_SET_FRM_NAME (FN_FRAME + 6)
#define FN_KEEP_ASPECT_RATIO (FN_FRAME + 7)
-#define FN_GRF_KEEP_ZOOM (FN_FRAME + 8)
+#define FN_GRF_KEEP_ZOOM (FN_FRAME + 8)
#define FN_IID_COL1 (FN_FRAME + 13)
#define FN_IID_COL2 (FN_FRAME + 14)
@@ -1264,41 +1264,41 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
//Member-Ids fuer Fill/SetVariable an Items
-#define MID_STYLE 0xe0
-#define MID_PWIDTH 0xe1
-#define MID_ADJUST 0xe2
-#define MID_TDIST 0xe3
-#define MID_BDIST 0xe4
-#define MID_LINES 0xe5
-#define MID_CHARS 0xe6
-#define MID_DIST 0xe7
-
-#define MID_1 0xe8
-#define MID_2 0xe9
-#define MID_3 0xea
-#define MID_4 0xeb
-#define MID_5 0xec
-#define MID_6 0xed
-#define MID_7 0xee
-#define MID_8 0xef
-#define MID_9 0xf0
-#define MID_A 0xf1
-#define MID_B 0xf2
-#define MID_C 0xf3
-#define MID_D 0xf4
-#define MID_E 0xf5
-#define MID_F 0xf6
-#define MID_10 0xf7
-#define MID_11 0xf8
-#define MID_12 0xf9
-#define MID_13 0xfa
+#define MID_STYLE 0xe0
+#define MID_PWIDTH 0xe1
+#define MID_ADJUST 0xe2
+#define MID_TDIST 0xe3
+#define MID_BDIST 0xe4
+#define MID_LINES 0xe5
+#define MID_CHARS 0xe6
+#define MID_DIST 0xe7
+
+#define MID_1 0xe8
+#define MID_2 0xe9
+#define MID_3 0xea
+#define MID_4 0xeb
+#define MID_5 0xec
+#define MID_6 0xed
+#define MID_7 0xee
+#define MID_8 0xef
+#define MID_9 0xf0
+#define MID_A 0xf1
+#define MID_B 0xf2
+#define MID_C 0xf3
+#define MID_D 0xf4
+#define MID_E 0xf5
+#define MID_F 0xf6
+#define MID_10 0xf7
+#define MID_11 0xf8
+#define MID_12 0xf9
+#define MID_13 0xfa
#ifndef SID_SW_DOCMAN_PATH
#define SID_SW_DOCMAN_PATH (SID_OFASLOTS_START + 6)
#endif
// defines fuer Event-Zuweisung per Macro
-#define MAC_EVENT_MOUSEOVER 0x01 //
+#define MAC_EVENT_MOUSEOVER 0x01 //
#define MAC_EVENT_MOUSECLICK 0x02 // Hyperlink ausloesen
#define MAC_EVENT_MOUSEOUT 0x03 //
#define MAC_EVENT_OBJECT_SELECT 0x04 // Obj. selektieren
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 26b6f54d79e3..cd8c6d6e2c8b 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -2,7 +2,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
@@ -40,18 +40,18 @@ class SwTableFUNC;
class SwTableWidthDlg : public SvxStandardDialog
{
- FixedText aColFT;
- NumericField aColEdit;
- FixedText aWidthFT;
- MetricField aWidthEdit;
+ FixedText aColFT;
+ NumericField aColEdit;
+ FixedText aWidthFT;
+ MetricField aWidthEdit;
FixedLine aWidthFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- SwTableFUNC &rFnc;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ SwTableFUNC &rFnc;
protected:
- virtual void Apply();
+ virtual void Apply();
DECL_LINK( LoseFocusHdl, Edit* pEdt=0 );
public:
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 981c89ef37db..31ff558c855d 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -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
@@ -33,40 +33,40 @@
// die Strings
// ---------------
-#define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0)
-#define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1)
-#define STR_TABLE_DEFNAME (RC_COMCORE_BEGIN + 2)
-#define STR_GRAPHIC_DEFNAME (RC_COMCORE_BEGIN + 3)
-#define STR_OBJECT_DEFNAME (RC_COMCORE_BEGIN + 4)
-#define STR_FRAME_DEFNAME (RC_COMCORE_BEGIN + 5)
-#define STR_REGION_DEFNAME (RC_COMCORE_BEGIN + 6)
-#define STR_COMCORE_CANT_SHOW (RC_COMCORE_BEGIN + 7)
-#define RID_GRAPHIC_REPLACEBMP (RC_COMCORE_BEGIN + 8)
-#define RID_GRAPHIC_ERRORBMP (RC_COMCORE_BEGIN + 9)
-#define STR_NUMRULE_DEFNAME (RC_COMCORE_BEGIN + 10)
-#define STR_EMPTYPAGE (RC_COMCORE_BEGIN + 11)
-#define RID_SHELLRES_AUTOFMTSTRS (RC_COMCORE_BEGIN + 12)
-#define STR_MULT_INTERACT_HYPH_WARN (RC_COMCORE_BEGIN + 13)
-#define STR_MULT_INTERACT_SPELL_WARN (RC_COMCORE_BEGIN + 14)
-#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
-#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
-#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
-#define MSG_DISABLE_READLINE_QUESTION (RC_COMCORE_BEGIN + 18)
+#define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0)
+#define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1)
+#define STR_TABLE_DEFNAME (RC_COMCORE_BEGIN + 2)
+#define STR_GRAPHIC_DEFNAME (RC_COMCORE_BEGIN + 3)
+#define STR_OBJECT_DEFNAME (RC_COMCORE_BEGIN + 4)
+#define STR_FRAME_DEFNAME (RC_COMCORE_BEGIN + 5)
+#define STR_REGION_DEFNAME (RC_COMCORE_BEGIN + 6)
+#define STR_COMCORE_CANT_SHOW (RC_COMCORE_BEGIN + 7)
+#define RID_GRAPHIC_REPLACEBMP (RC_COMCORE_BEGIN + 8)
+#define RID_GRAPHIC_ERRORBMP (RC_COMCORE_BEGIN + 9)
+#define STR_NUMRULE_DEFNAME (RC_COMCORE_BEGIN + 10)
+#define STR_EMPTYPAGE (RC_COMCORE_BEGIN + 11)
+#define RID_SHELLRES_AUTOFMTSTRS (RC_COMCORE_BEGIN + 12)
+#define STR_MULT_INTERACT_HYPH_WARN (RC_COMCORE_BEGIN + 13)
+#define STR_MULT_INTERACT_SPELL_WARN (RC_COMCORE_BEGIN + 14)
+#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
+#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
+#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
+#define MSG_DISABLE_READLINE_QUESTION (RC_COMCORE_BEGIN + 18)
// -> #111827#
-#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
-#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
-#define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
-#define STR_REDLINE_TABLE (RC_COMCORE_BEGIN + 22)
-#define STR_REDLINE_FMTCOLL (RC_COMCORE_BEGIN + 23)
+#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
+#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
+#define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
+#define STR_REDLINE_TABLE (RC_COMCORE_BEGIN + 22)
+#define STR_REDLINE_FMTCOLL (RC_COMCORE_BEGIN + 23)
#define STR_CLIPBOARD (RC_COMCORE_BEGIN + 24)
-#define STR_START_QUOTE (RC_COMCORE_BEGIN + 25)
-#define STR_END_QUOTE (RC_COMCORE_BEGIN + 26)
-#define STR_LDOTS (RC_COMCORE_BEGIN + 27)
-#define STR_YIELDS (RC_COMCORE_BEGIN + 28)
+#define STR_START_QUOTE (RC_COMCORE_BEGIN + 25)
+#define STR_END_QUOTE (RC_COMCORE_BEGIN + 26)
+#define STR_LDOTS (RC_COMCORE_BEGIN + 27)
+#define STR_YIELDS (RC_COMCORE_BEGIN + 28)
#define STR_PARAGRAPHS (RC_COMCORE_BEGIN + 29)
-#define STR_MULTISEL (RC_COMCORE_BEGIN + 30)
-#define STR_REDLINE_MULTIPLE (RC_COMCORE_BEGIN + 31)
-#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
+#define STR_MULTISEL (RC_COMCORE_BEGIN + 30)
+#define STR_REDLINE_MULTIPLE (RC_COMCORE_BEGIN + 31)
+#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
#define STR_FIELD (RC_COMCORE_BEGIN + 33)
// <- #111827#
// -> #115575#
@@ -91,30 +91,30 @@
// <- #146850#
// defines fuer die Autoformat Redline Kommentare
-#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
+#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
#define STR_AUTOFMTREDL_USE_REPLACE 1
#define STR_AUTOFMTREDL_CPTL_STT_WORD 2
#define STR_AUTOFMTREDL_CPTL_STT_SENT 3
#define STR_AUTOFMTREDL_TYPO 4
#define STR_AUTOFMTREDL_USER_STYLE 5
#define STR_AUTOFMTREDL_BULLET 6
-#define STR_AUTOFMTREDL_UNDER 7
-#define STR_AUTOFMTREDL_BOLD 8
+#define STR_AUTOFMTREDL_UNDER 7
+#define STR_AUTOFMTREDL_BOLD 8
#define STR_AUTOFMTREDL_FRACTION 9
#define STR_AUTOFMTREDL_DETECT_URL 10
#define STR_AUTOFMTREDL_DASH 11
#define STR_AUTOFMTREDL_ORDINAL 12
#define STR_AUTOFMTREDL_RIGHT_MARGIN 13
-#define STR_AUTOFMTREDL_SET_TMPL_TEXT 14
-#define STR_AUTOFMTREDL_SET_TMPL_INDENT 15
-#define STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT 16
-#define STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT 17
-#define STR_AUTOFMTREDL_SET_TMPL_HEADLINE 18
-#define STR_AUTOFMTREDL_SET_NUMBULET 19
-#define STR_AUTOFMTREDL_DEL_MORELINES 20
+#define STR_AUTOFMTREDL_SET_TMPL_TEXT 14
+#define STR_AUTOFMTREDL_SET_TMPL_INDENT 15
+#define STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT 16
+#define STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT 17
+#define STR_AUTOFMTREDL_SET_TMPL_HEADLINE 18
+#define STR_AUTOFMTREDL_SET_NUMBULET 19
+#define STR_AUTOFMTREDL_DEL_MORELINES 20
#define STR_AUTOFMTREDL_NON_BREAK_SPACE 21
// !!!!!!!!!!!!!!!!!!!!!!!!!! das Ende immer richtig setzen !!!!!!!!!!!!
-#define STR_AUTOFMTREDL_END 22
+#define STR_AUTOFMTREDL_END 22
#endif
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 767b32abacd4..1e06d5f850e9 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 0066b28e2aca..a4150ece1a1f 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -2,7 +2,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
@@ -36,8 +36,8 @@
// the same, but in complex text cell skip over legatures and char skip
// into it.
// These defines exist only to cut off the dependicies to I18N project.
-const USHORT CRSR_SKIP_CHARS = 0;
-const USHORT CRSR_SKIP_CELLS = 1;
+const USHORT CRSR_SKIP_CHARS = 0;
+const USHORT CRSR_SKIP_CELLS = 1;
const USHORT CRSR_SKIP_HIDDEN = 2;
#endif
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index e3710a39c7df..f7ae36388e1a 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -2,7 +2,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
@@ -36,21 +36,21 @@
enum SwFillMode
{
- FILL_TAB, // default, Auffuellen mit Tabulatoren
- FILL_SPACE, // ... mit Tabulatoren und Spaces
- FILL_MARGIN, // nur links, zentriert, rechts Ausrichten
+ FILL_TAB, // default, Auffuellen mit Tabulatoren
+ FILL_SPACE, // ... mit Tabulatoren und Spaces
+ FILL_MARGIN, // nur links, zentriert, rechts Ausrichten
FILL_INDENT // durch linken Absatzeinzug
};
struct SwFillCrsrPos
{
- SwRect aCrsr; // Position und Groesse des Shadowcursors
- USHORT nParaCnt; // Anzahl der einzufuegenden Absaetze
- USHORT nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs
- USHORT nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen
- USHORT nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche
+ SwRect aCrsr; // Position und Groesse des Shadowcursors
+ USHORT nParaCnt; // Anzahl der einzufuegenden Absaetze
+ USHORT nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs
+ USHORT nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen
+ USHORT nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche
sal_Int16 eOrient; // Absatzausrichtung
- SwFillMode eMode; // Gewuenschte Auffuellregel
+ SwFillMode eMode; // Gewuenschte Auffuellregel
SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) :
nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ),
eOrient( com::sun::star::text::HoriOrientation::NONE ), eMode( eMd )
@@ -67,7 +67,7 @@ struct SwFillCrsrPos
struct Sw2LinesPos
{
- SwRect aLine; // Position and size of the line
+ SwRect aLine; // Position and size of the line
SwRect aPortion; // Position and size of the multi portion
SwRect aPortion2; // needed for nested multi portions
BYTE nMultiType; // Multiportion type
@@ -123,35 +123,35 @@ struct SwSpecialPos
// CrsrTravelling-Staties (fuer GetCrsrOfst)
enum CrsrMoveState
{
- MV_NONE, // default
- MV_UPDOWN, // Crsr Up/Down
- MV_RIGHTMARGIN, // an rechten Rand
- MV_LEFTMARGIN, // an linken Rand
- MV_SETONLYTEXT, // mit dem Cursr nur im Text bleiben
- MV_TBLSEL // nicht in wiederholte Headlines
+ MV_NONE, // default
+ MV_UPDOWN, // Crsr Up/Down
+ MV_RIGHTMARGIN, // an rechten Rand
+ MV_LEFTMARGIN, // an linken Rand
+ MV_SETONLYTEXT, // mit dem Cursr nur im Text bleiben
+ MV_TBLSEL // nicht in wiederholte Headlines
};
// struct fuer spaetere Erweiterungen
struct SwCrsrMoveState
{
- SwFillCrsrPos *pFill; // fuer das automatische Auffuellen mit Tabs etc.
- Sw2LinesPos *p2Lines; // for selections inside/around 2line portions
+ SwFillCrsrPos *pFill; // fuer das automatische Auffuellen mit Tabs etc.
+ Sw2LinesPos *p2Lines; // for selections inside/around 2line portions
SwSpecialPos* pSpecialPos; // for positions inside fields
- Point aRealHeight; // enthaelt dann die Position/Hoehe des Cursors
+ Point aRealHeight; // enthaelt dann die Position/Hoehe des Cursors
CrsrMoveState eState;
BYTE nCursorBidiLevel;
- BOOL bStop :1;
- BOOL bRealHeight :1; // Soll die reale Hoehe berechnet werden?
- BOOL bFieldInfo :1; // Sollen Felder erkannt werden?
- BOOL bPosCorr :1; // Point musste korrigiert werden
- BOOL bFtnNoInfo :1; // Fussnotennumerierung erkannt
- BOOL bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern
+ BOOL bStop :1;
+ BOOL bRealHeight :1; // Soll die reale Hoehe berechnet werden?
+ BOOL bFieldInfo :1; // Sollen Felder erkannt werden?
+ BOOL bPosCorr :1; // Point musste korrigiert werden
+ BOOL bFtnNoInfo :1; // Fussnotennumerierung erkannt
+ BOOL bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern
// suchen lassen, sprich niemals in das
// GetCntntPos laufen.
- BOOL bFillRet :1; // wird nur im FillModus temp. genutzt
- BOOL bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden
- BOOL bRealWidth :1; // Calculation of the width required
- BOOL b2Lines :1; // Check 2line portions and fill p2Lines
+ BOOL bFillRet :1; // wird nur im FillModus temp. genutzt
+ BOOL bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden
+ BOOL bRealWidth :1; // Calculation of the width required
+ BOOL b2Lines :1; // Check 2line portions and fill p2Lines
BOOL bNoScroll :1; // No scrolling of undersized textframes
BOOL bPosMatchesBounds :1; // GetCrsrOfst should not return the next
// position if screen position is inside second
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 317390629aa7..bdadb2966fcf 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@ typedef SwCntntFrm * (*SwPosColumn)( const SwLayoutFrm * );
extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
extern SwPosColumn fnColumnStart, fnColumnEnd;
-// Richtungsparameter fuer MoveRegion (Bereiche!)
+// Richtungsparameter fuer MoveRegion (Bereiche!)
typedef SwMoveFnCollection* SwPosRegion;
typedef BOOL (*SwWhichRegion)( SwPaM&, SwPosRegion, BOOL bInReadOnly );
extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
@@ -82,20 +82,20 @@ extern SwPosRegion fnRegionStart, fnRegionEnd;
/*
* folgende Kombinationen sind erlaubt:
- * - suche einen im Body: -> FND_IN_BODY
- * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL
+ * - suche einen im Body: -> FND_IN_BODY
+ * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL
* - suche in Selectionen: einen / alle -> FND_IN_SEL [ | FND_IN_SELALL ]
* - suche im nicht Body: einen / alle -> FND_IN_OTHER [ | FND_IN_SELALL ]
- * - suche ueberall alle: -> FND_IN_SELALL
+ * - suche ueberall alle: -> FND_IN_SELALL
*/
enum FindRanges
{
FND_IN_BODY = 0x00, // suche "eins" mur im Body-Text
FND_IN_OTHER = 0x02, // suche "alles" in Footer/Header/Fly...
FND_IN_SEL = 0x04, // suche in Selectionen
- FND_IN_BODYONLY = 0x08, // suche nur im Body - nur in Verbindung mit
+ FND_IN_BODYONLY = 0x08, // suche nur im Body - nur in Verbindung mit
// FND_IN_SELALL !!!
- FND_IN_SELALL = 0x01 // - alle ( nur im nicht Body und Selectionen)
+ FND_IN_SELALL = 0x01 // - alle ( nur im nicht Body und Selectionen)
};
@@ -117,6 +117,6 @@ SW_DLLPUBLIC SwWhichTable GetfnTableCurr();
SW_DLLPUBLIC SwPosTable GetfnTableStart();
SW_DLLPUBLIC SwPosTable GetfnTableEnd();
-#endif // _CSHTYP_HXX
+#endif // _CSHTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7cc143514541..760952a2a4aa 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -2,7 +2,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
@@ -42,10 +42,10 @@ class SwFrm;
class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
{
- SwDBData aDBData; //
- String sName; // only used in ::GetName() !
- String sColumn;
- long nRefCnt;
+ SwDBData aDBData; //
+ String sName; // only used in ::GetName() !
+ String sColumn;
+ long nRefCnt;
public:
@@ -55,11 +55,11 @@ public:
virtual const String& GetName() const;
virtual SwFieldType* Copy() const;
- inline void AddRef() { nRefCnt++; }
- void ReleaseRef();
+ inline void AddRef() { nRefCnt++; }
+ void ReleaseRef();
- const String& GetColumnName() const {return sColumn;}
- const SwDBData& GetDBData() const {return aDBData;}
+ const String& GetColumnName() const {return sColumn;}
+ const SwDBData& GetDBData() const {return aDBData;}
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -75,44 +75,44 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
{
String aContent;
String sFieldCode; // contains Word's field code
- USHORT nSubType;
- BOOL bIsInBodyTxt : 1;
- BOOL bValidValue : 1;
- BOOL bInitialized : 1;
+ USHORT nSubType;
+ BOOL bIsInBodyTxt : 1;
+ BOOL bValidValue : 1;
+ BOOL bInitialized : 1;
public:
SwDBField(SwDBFieldType*, ULONG nFmt = 0);
virtual ~SwDBField();
- virtual SwFieldType* ChgTyp( SwFieldType* );
+ virtual SwFieldType* ChgTyp( SwFieldType* );
// Der aktuelle Text
- inline void SetExpansion(const String& rStr);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ inline void SetExpansion(const String& rStr);
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nType);
// Name oder Inhalt
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
// fuer Berechnungen in Ausdruecken
- void ChgValue( double d, BOOL bVal );
+ void ChgValue( double d, BOOL bVal );
// Evaluierung ueber den DBMgr String rauspulen
- void Evaluate();
+ void Evaluate();
// Evaluierung fuer Kopf und Fusszeilen
- void ChangeExpansion( const SwFrm*, const SwTxtFld* );
- void InitContent();
- void InitContent(const String& rExpansion);
+ void ChangeExpansion( const SwFrm*, const SwTxtFld* );
+ void InitContent();
+ void InitContent(const String& rExpansion);
- inline void ChgBodyTxtFlag( BOOL bIsInBody );
+ inline void ChgBodyTxtFlag( BOOL bIsInBody );
- inline BOOL IsInitialized() const { return bInitialized; }
- inline void ClearInitialized() { bInitialized = FALSE; }
- inline void SetInitialized() { bInitialized = TRUE; }
+ inline BOOL IsInitialized() const { return bInitialized; }
+ inline void ClearInitialized() { bInitialized = FALSE; }
+ inline void SetInitialized() { bInitialized = TRUE; }
// Name erfragen
virtual const String& GetPar1() const;
@@ -124,7 +124,7 @@ public:
{ sFieldCode = rStr; }
// DBName
- inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
+ inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -142,24 +142,24 @@ inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
class SW_DLLPUBLIC SwDBNameInfField : public SwField
{
- SwDBData aDBData;
+ SwDBData aDBData;
USHORT nSubType;
protected:
const SwDBData& GetDBData() const {return aDBData;}
- SwDBData& GetDBData() {return aDBData;}
+ SwDBData& GetDBData() {return aDBData;}
SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, ULONG nFmt = 0);
public:
// DBName
- inline const SwDBData& GetRealDBData() { return aDBData; }
+ inline const SwDBData& GetRealDBData() { return aDBData; }
- SwDBData GetDBData(SwDoc* pDoc);
- void SetDBData(const SwDBData& rDBData); // #111840#
+ SwDBData GetDBData(SwDoc* pDoc);
+ void SetDBData(const SwDBData& rDBData); // #111840#
// Name oder Inhalt
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
virtual USHORT GetSubType() const;
@@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
public:
SwDBNextSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const;
};
@@ -186,31 +186,31 @@ public:
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
{
- String aCond;
- BOOL bCondValid;
+ String aCond;
+ BOOL bCondValid;
public:
SwDBNextSetField( SwDBNextSetFieldType*,
const String& rCond, const String& rDummy, const SwDBData& rDBData);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- void Evaluate(SwDoc*);
- inline void SetCondValid(BOOL bCond);
- inline BOOL IsCondValid() const;
+ void Evaluate(SwDoc*);
+ inline void SetCondValid(BOOL bCond);
+ inline BOOL IsCondValid() const;
// Condition
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
-inline BOOL SwDBNextSetField::IsCondValid() const
+inline BOOL SwDBNextSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNextSetField::SetCondValid(BOOL bCond)
+inline void SwDBNextSetField::SetCondValid(BOOL bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -222,7 +222,7 @@ class SwDBNumSetFieldType : public SwFieldType
public:
SwDBNumSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const;
};
@@ -234,37 +234,37 @@ public:
class SwDBNumSetField : public SwDBNameInfField
{
- String aCond;
- String aPar2;
- BOOL bCondValid;
+ String aCond;
+ String aPar2;
+ BOOL bCondValid;
public:
SwDBNumSetField(SwDBNumSetFieldType*, const String& rCond, const String& rDBNum, const SwDBData& rDBData);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline BOOL IsCondValid() const;
- inline void SetCondValid(BOOL bCond);
- void Evaluate(SwDoc*);
+ inline BOOL IsCondValid() const;
+ inline void SetCondValid(BOOL bCond);
+ void Evaluate(SwDoc*);
// Condition
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
// Datensatznummer
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
// Die Datensatznummer steht in nFormat !!
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
-inline BOOL SwDBNumSetField::IsCondValid() const
+inline BOOL SwDBNumSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNumSetField::SetCondValid(BOOL bCond)
+inline void SwDBNumSetField::SetCondValid(BOOL bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -277,7 +277,7 @@ class SwDBNameFieldType : public SwFieldType
public:
SwDBNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(ULONG) const;
virtual SwFieldType* Copy() const;
};
@@ -290,7 +290,7 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
public:
SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
- virtual String Expand() const;
+ virtual String Expand() const;
virtual SwField* Copy() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -314,25 +314,25 @@ public:
class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
{
- long nNumber;
+ long nNumber;
public:
SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
- void Evaluate(SwDoc*);
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
+ void Evaluate(SwDoc*);
- inline long GetSetNumber() const;
- inline void SetSetNumber(long nNum);
+ inline long GetSetNumber() const;
+ inline void SetSetNumber(long nNum);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
-inline long SwDBSetNumberField::GetSetNumber() const
+inline long SwDBSetNumberField::GetSetNumber() const
{ return nNumber; }
-inline void SwDBSetNumberField::SetSetNumber(long nNum)
+inline void SwDBSetNumberField::SetSetNumber(long nNum)
{ nNumber = nNum; }
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index ce751a65f4d7..299b7c00e29a 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 7ab16cb3ca53..bf4ca268c69d 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -2,7 +2,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
@@ -87,10 +87,10 @@ class SwMailMergeConfigItem;
enum DBMgrOptions
{
- DBMGR_MERGE, // Datensaetze in Felder
- DBMGR_INSERT, // Datensaetze in Text
- DBMGR_MERGE_MAILMERGE, // Serienbriefe drucken
- DBMGR_MERGE_MAILING, // Serienbriefe als email versenden
+ DBMGR_MERGE, // Datensaetze in Felder
+ DBMGR_INSERT, // Datensaetze in Text
+ DBMGR_MERGE_MAILMERGE, // Serienbriefe drucken
+ DBMGR_MERGE_MAILING, // Serienbriefe als email versenden
DBMGR_MERGE_MAILFILES, // Serienbriefe als Datei(en) speichern
DBMGR_MERGE_DOCUMENTS, // Print merged documents
DBMGR_MERGE_SINGLE_FILE // save merge as single file
@@ -101,19 +101,19 @@ enum DBMgrOptions
/*--------------------------------------------------------------------
Beschreibung: (neue) Logische Datenbanken verwalten
--------------------------------------------------------------------*/
-#define SW_DB_SELECT_UNKNOWN 0
-#define SW_DB_SELECT_TABLE 1
+#define SW_DB_SELECT_UNKNOWN 0
+#define SW_DB_SELECT_TABLE 1
#define SW_DB_SELECT_QUERY 2
struct SwDSParam : public SwDBData
{
- com::sun::star::util::Date aNullDate;
+ com::sun::star::util::Date aNullDate;
- ::com::sun::star::uno::Reference<com::sun::star::util::XNumberFormatter> xFormatter;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection;
+ ::com::sun::star::uno::Reference<com::sun::star::util::XNumberFormatter> xFormatter;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection;
BOOL bScrollable;
BOOL bEndOfDB;
BOOL bAfterSelection;
@@ -128,8 +128,8 @@ struct SwDSParam : public SwDBData
{}
SwDSParam(const SwDBData& rData,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& xResSet,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection) :
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& xResSet,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection) :
SwDBData(rData),
xResultSet(xResSet),
aSelection(rSelection),
@@ -200,18 +200,18 @@ friend class SwConnectionDisposedListener_Impl;
static SwDbtoolsClient* pDbtoolsClient;
String sEMailAddrFld; // Mailing: Spaltenname der E-Mail Adresse
- String sSubject; // Mailing: Subject
- String sAttached; // Mailing: Attachte Files
- USHORT nMergeType;
- BOOL bInitDBFields : 1; // TRUE: Datenbank an Feldern beim Mergen
+ String sSubject; // Mailing: Subject
+ String sAttached; // Mailing: Attachte Files
+ USHORT nMergeType;
+ BOOL bInitDBFields : 1; // TRUE: Datenbank an Feldern beim Mergen
BOOL bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic
- BOOL bCancel : 1; // Serienbrief-Save abgebrochen
+ BOOL bCancel : 1; // Serienbrief-Save abgebrochen
- BOOL bInMerge : 1; //merge process active
+ BOOL bInMerge : 1; //merge process active
BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API)
BOOL bMergeLock : 1; // prevent update of database fields while document is
// actually printed at the ViewShell
- SwDSParamArr aDataSourceParams;
+ SwDSParamArr aDataSourceParams;
SwNewDBMgr_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send
@@ -237,8 +237,8 @@ public:
~SwNewDBMgr();
// Art des aktellen Mergens. Siehe DBMgrOptions-enum
- inline USHORT GetMergeType() const { return nMergeType; }
- inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; }
+ inline USHORT GetMergeType() const { return nMergeType; }
+ inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; }
// MailMergeEvent source
const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; }
@@ -252,8 +252,8 @@ public:
BOOL Merge(SwWrtShell* pSh);
// Datenbankfelder mit fehlendem Datenbankname initialisieren
- inline BOOL IsInitDBFields() const { return bInitDBFields; }
- inline void SetInitDBFields(BOOL b) { bInitDBFields = b; }
+ inline BOOL IsInitDBFields() const { return bInitDBFields; }
+ inline void SetInitDBFields(BOOL b) { bInitDBFields = b; }
// Serienbriefe einzelnd oder alle zusammen drucken/speichern
inline BOOL IsSingleJobs() const { return bSingleJobs; }
@@ -261,16 +261,16 @@ public:
// Mailing
// email-Daten setzen
- inline void SetEMailColumn(const String& sColName) { sEMailAddrFld = sColName; }
- inline void SetSubject(const String& sSbj) { sSubject = sSbj; }
- inline void SetAttachment(const String& sAtt) { sAttached = sAtt; }
+ inline void SetEMailColumn(const String& sColName) { sEMailAddrFld = sColName; }
+ inline void SetSubject(const String& sSbj) { sSubject = sSbj; }
+ inline void SetAttachment(const String& sAtt) { sAttached = sAtt; }
// Listbox mit allen Tabellennamen einer Datenbank fuellen
- BOOL GetTableNames(ListBox* pListBox, const String& rDBName );
+ BOOL GetTableNames(ListBox* pListBox, const String& rDBName );
// Listbox mit allen Spaltennamen einer Datenbanktabelle fuellen
- BOOL GetColumnNames(ListBox* pListBox,
+ BOOL GetColumnNames(ListBox* pListBox,
const String& rDBName, const String& rTableName, BOOL bAppend = FALSE);
BOOL GetColumnNames(ListBox* pListBox,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
@@ -291,14 +291,14 @@ public:
const String& rTableName,
const String& rColNm );
- inline BOOL IsInMerge() const { return bInMerge; }
- void EndMerge();
+ inline BOOL IsInMerge() const { return bInMerge; }
+ void EndMerge();
- void ExecuteFormLetter(SwWrtShell& rSh,
+ void ExecuteFormLetter(SwWrtShell& rSh,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties,
BOOL bWithDataSourceBrowser = FALSE);
- void InsertText(SwWrtShell& rSh,
+ void InsertText(SwWrtShell& rSh,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties);
// check if a data source is open
@@ -309,7 +309,7 @@ public:
BOOL OpenDataSource(const String& rDataSource, const String& rTableOrQuery,
sal_Int32 nCommandType = -1, bool bCreate = false);
sal_uInt32 GetSelectedRecordId(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
- BOOL GetColumnCnt(const String& rSourceName, const String& rTableName,
+ BOOL GetColumnCnt(const String& rSourceName, const String& rTableName,
const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
String& rResult, double* pNumber);
//create and store or find an already stored connection to a data source for use
@@ -323,18 +323,18 @@ public:
//close all data sources - after fields were updated
- void CloseAll(BOOL bIncludingMerge = TRUE);
+ void CloseAll(BOOL bIncludingMerge = TRUE);
- BOOL GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage,
+ BOOL GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage,
String &rResult, double *pNumber, sal_uInt32 *pFormat);
- BOOL ToNextMergeRecord();
+ BOOL ToNextMergeRecord();
BOOL ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
- BOOL ExistsNextRecord()const;
- sal_uInt32 GetSelectedRecordId();
- sal_Bool ToRecordId(sal_Int32 nSet);
+ BOOL ExistsNextRecord()const;
+ sal_uInt32 GetSelectedRecordId();
+ sal_Bool ToRecordId(sal_Int32 nSet);
- const SwDBData& GetAddressDBName();
+ const SwDBData& GetAddressDBName();
static String GetDBField(
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xColumnProp,
@@ -348,7 +348,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>
GetColumnSupplier(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>,
const String& rTableOrQuery,
- BYTE eTableOrQuery = SW_DB_SELECT_UNKNOWN);
+ BYTE eTableOrQuery = SW_DB_SELECT_UNKNOWN);
static ::com::sun::star::uno::Sequence<rtl::OUString> GetExistingDatabaseNames();
@@ -374,20 +374,20 @@ public:
getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName);
/** creates a RowSet, which must be disposed after use.
- @param _sDataSourceName
+ @param _sDataSourceName
The data source name
- @param _sCommand
+ @param _sCommand
The command.
- @param _nCommandType
+ @param _nCommandType
The type of the command.
- @param _xConnection
+ @param _xConnection
The active connection which may be <NULL/>.
@return
The new created RowSet.
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
- createCursor( const ::rtl::OUString& _sDataSourceName,
+ createCursor( const ::rtl::OUString& _sDataSourceName,
const ::rtl::OUString& _sCommand,
sal_Int32 _nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index e7feeb92e69a..3e086c1fc65a 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -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
@@ -32,9 +32,9 @@
// Dialoge --------------------------------------------------------------------
-#define DLG_DBSELECTION (RC_DBUI_BEGIN)
-#define DLG_PRINTMONITOR (RC_DBUI_BEGIN + 1)
-#define DLG_AP_INSERT_DB_SEL (RC_DBUI_BEGIN + 2)
+#define DLG_DBSELECTION (RC_DBUI_BEGIN)
+#define DLG_PRINTMONITOR (RC_DBUI_BEGIN + 1)
+#define DLG_AP_INSERT_DB_SEL (RC_DBUI_BEGIN + 2)
#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
#define DLG_MM_DOCSELECT_PAGE (RC_DBUI_BEGIN + 4)
@@ -66,7 +66,7 @@
#define DLG_MM_CREATIONMONITOR (RC_DBUI_BEGIN + 30)
// Strings ------------------------------------------------------------------
-#define STR_DB_EMAIL (RC_DBUI_BEGIN)
+#define STR_DB_EMAIL (RC_DBUI_BEGIN)
#define SA_ADDRESS_HEADER (RC_DBUI_BEGIN + 1)
#define STR_NOTASSIGNED (RC_DBUI_BEGIN + 2)
#define STR_FILTER_ALL (RC_DBUI_BEGIN + 3)
@@ -85,22 +85,22 @@
// Elemente -----------------------------------------------------------------
-#define TLB_DBLIST 1
-#define BTN_OK 2
-#define BTN_CANCEL 3
-#define BTN_HELP 4
-
-#define FT_DOCNAME 5
-#define FT_PRINTING 6
-#define FT_PRINTER 7
-#define FT_PRINTINFO 8
-#define PB_CANCELPRNMON 9
-#define FT_SENDING 10
-#define STR_EMAILMON 11
-#define FT_STATUS 12
+#define TLB_DBLIST 1
+#define BTN_OK 2
+#define BTN_CANCEL 3
+#define BTN_HELP 4
+
+#define FT_DOCNAME 5
+#define FT_PRINTING 6
+#define FT_PRINTER 7
+#define FT_PRINTINFO 8
+#define PB_CANCELPRNMON 9
+#define FT_SENDING 10
+#define STR_EMAILMON 11
+#define FT_STATUS 12
#define FT_CREATEDOCUMENTS 13
-#define FT_PROGRESS 14
-#define FT_COUNTING 15
+#define FT_PROGRESS 14
+#define FT_COUNTING 15
#define STR_SAVEMON 16
#define FT_SAVING 17
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 05e2c17bde70..2547b1631bf2 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -2,7 +2,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
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef _DCONTACT_HXX
-#define _DCONTACT_HXX
+#define _DCONTACT_HXX
#include <svx/svdobj.hxx>
// OD 14.05.2003 #108784#
@@ -67,7 +67,7 @@ class SwIndex;
//Implementierung in dcontact.cxx
SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj );
inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj )
-{ return ::FindFrmFmt( (SdrObject*)pObj ); }
+{ return ::FindFrmFmt( (SdrObject*)pObj ); }
sal_Bool HasWrap( const SdrObject* pObj );
void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
@@ -144,8 +144,8 @@ public:
virtual SdrObject *GetMaster() = 0;
virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
- SwFrmFmt *GetFmt(){ return (SwFrmFmt*)GetRegisteredIn(); }
- const SwFrmFmt *GetFmt() const
+ SwFrmFmt *GetFmt(){ return (SwFrmFmt*)GetRegisteredIn(); }
+ const SwFrmFmt *GetFmt() const
{ return (const SwFrmFmt*)GetRegisteredIn(); }
// OD 05.09.2003 #112039# - accessor for member <mbInDTOR>
@@ -302,7 +302,7 @@ class SwDrawVirtObj : public SdrVirtObj
SwDrawContact& mrDrawContact;
using SdrVirtObj::GetPlusHdl;
-
+
protected:
// AW: Need own sdr::contact::ViewContact since AnchorPos from parent is
// not used but something own (top left of new SnapRect minus top left
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 631791749a85..d1e68cc7d0e9 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -2,7 +2,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
@@ -57,8 +57,8 @@ public:
USHORT = sfx2::LINKUPDATE_ONCALL );
~SwDDEFieldType();
- const String& GetExpansion() const { return aExpansion; }
- void SetExpansion( const String& rStr ) { aExpansion = rStr,
+ const String& GetExpansion() const { return aExpansion; }
+ void SetExpansion( const String& rStr ) { aExpansion = rStr,
bCRLFFlag = FALSE; }
virtual SwFieldType* Copy() const;
@@ -70,26 +70,26 @@ public:
String GetCmd() const;
void SetCmd( const String& rStr );
- USHORT GetType() const { return refLink->GetUpdateMode(); }
- void SetType( USHORT nType ) { refLink->SetUpdateMode( nType ); }
+ USHORT GetType() const { return refLink->GetUpdateMode(); }
+ void SetType( USHORT nType ) { refLink->SetUpdateMode( nType ); }
- BOOL IsDeleted() const { return bDeleted; }
- void SetDeleted( BOOL b ) { bDeleted = b; }
+ BOOL IsDeleted() const { return bDeleted; }
+ void SetDeleted( BOOL b ) { bDeleted = b; }
void UpdateNow() { refLink->Update(); }
- void Disconnect() { refLink->Disconnect(); }
+ void Disconnect() { refLink->Disconnect(); }
const ::sfx2::SvBaseLink& GetBaseLink() const { return *refLink; }
::sfx2::SvBaseLink& GetBaseLink() { return *refLink; }
- const SwDoc* GetDoc() const { return pDoc; }
- SwDoc* GetDoc() { return pDoc; }
+ const SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() { return pDoc; }
void SetDoc( SwDoc* pDoc );
- void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); }
- void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); }
+ void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); }
+ void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); }
- void SetCRLFDelFlag( BOOL bFlag = TRUE ) { bCRLFFlag = bFlag; }
+ void SetCRLFDelFlag( BOOL bFlag = TRUE ) { bCRLFFlag = bFlag; }
};
/*--------------------------------------------------------------------
@@ -102,7 +102,7 @@ public:
SwDDEField(SwDDEFieldType*);
~SwDDEField();
- virtual String Expand() const;
+ virtual String Expand() const;
virtual SwField* Copy() const;
// ueber Typen Parameter ermitteln
@@ -110,8 +110,8 @@ public:
virtual const String& GetPar1() const;
// Commando
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
};
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index f630cf9d7c41..8d3c82776c16 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -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
@@ -39,7 +39,7 @@
#define DLG_LINKS (RC_DIALOG_BEGIN + 6)
#define DLG_LINKEDIT (RC_DIALOG_BEGIN + 7)
#define DLG_INSERT_ABSTRACT (RC_DIALOG_BEGIN + 8)
-#define DLG_ASCII_FILTER (RC_DIALOG_BEGIN + 9)
+#define DLG_ASCII_FILTER (RC_DIALOG_BEGIN + 9)
#define DLG_WORDCOUNT (RC_DIALOG_BEGIN + 10)
#define RID_QB_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
#define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12)
@@ -63,18 +63,18 @@
// Bereiche *****************************************************************
-#define RC_REGIONSW_BEGIN (RC_DIALOG_BEGIN + 60)
-#define RC_REGIONSW_END (RC_DIALOG_BEGIN + 79)
+#define RC_REGIONSW_BEGIN (RC_DIALOG_BEGIN + 60)
+#define RC_REGIONSW_END (RC_DIALOG_BEGIN + 79)
-#define RC_MACASSGN_BEGIN (RC_DIALOG_BEGIN + 80)
-#define RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
+#define RC_MACASSGN_BEGIN (RC_DIALOG_BEGIN + 80)
+#define RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
-#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
-#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
-#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
-#define RC_DLG_SWBORDERDLG (RC_DIALOG_BEGIN + 93)
-#define RC_DLG_SWWRAPDLG (RC_DIALOG_BEGIN + 94)
-#define RC_DLG_SWFLDEDITDLG (RC_DIALOG_BEGIN + 95)
+#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
+#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
+#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
+#define RC_DLG_SWBORDERDLG (RC_DIALOG_BEGIN + 93)
+#define RC_DLG_SWWRAPDLG (RC_DIALOG_BEGIN + 94)
+#define RC_DLG_SWFLDEDITDLG (RC_DIALOG_BEGIN + 95)
// Ueberlaufpruefung ********************************************************
#define DIALOG_ACT_END RC_MACASSGN_END
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index c60f6e7040bf..6e597d04c85e 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx> // helper for implementations
namespace com { namespace sun { namespace star {
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star {
// dictionaries of the dictionary list, or properties) were made.
//
-class SwLinguServiceEventListener :
+class SwLinguServiceEventListener :
public cppu::WeakImplHelper2
<
com::sun::star::linguistic2::XLinguServiceEventListener,
@@ -64,10 +64,10 @@ class SwLinguServiceEventListener :
{
com::sun::star::uno::Reference<
com::sun::star::frame::XDesktop > xDesktop;
- com::sun::star::uno::Reference<
+ com::sun::star::uno::Reference<
com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr;
- com::sun::star::uno::Reference<
- com::sun::star::linguistic2::XProofreadingIterator > xGCIterator;
+ com::sun::star::uno::Reference<
+ com::sun::star::linguistic2::XProofreadingIterator > xGCIterator;
// disallow use of copy-constructor and assignment operator
SwLinguServiceEventListener(const SwLinguServiceEventListener &);
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx
index 02078a05b624..421d8eba30c8 100644
--- a/sw/inc/dobjfac.hxx
+++ b/sw/inc/dobjfac.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 750673d532ce..bc0f6e5fae73 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,7 +2,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
@@ -67,7 +67,7 @@ class SwList;
#include <swtypes.hxx>
#include <ndarr.hxx>
#include <swatrset.hxx>
-#include <toxe.hxx> // enums
+#include <toxe.hxx> // enums
#include <flyenum.hxx>
#include <itabenum.hxx>
#include <swdbdata.hxx>
@@ -291,20 +291,20 @@ class SW_DLLPUBLIC SwDoc :
// -------------------------------------------------------------------
// die Objecte
- SwNodes aNodes; // Inhalt des Dokumentes
- SwNodes aUndoNodes; // Inhalt fuer das Undo
- SwAttrPool* mpAttrPool; // der Attribut Pool
- SwPageDescs aPageDescs; // PageDescriptoren
- Link aOle2Link; // OLE 2.0-Benachrichtigung
+ SwNodes aNodes; // Inhalt des Dokumentes
+ SwNodes aUndoNodes; // Inhalt fuer das Undo
+ SwAttrPool* mpAttrPool; // der Attribut Pool
+ SwPageDescs aPageDescs; // PageDescriptoren
+ Link aOle2Link; // OLE 2.0-Benachrichtigung
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
*/
Timer aIdleTimer; // der eigene IdleTimer
- Timer aOLEModifiedTimer; // Timer for update modified OLE-Objecs
- SwDBData aDBData; // database descriptor
+ Timer aOLEModifiedTimer; // Timer for update modified OLE-Objecs
+ SwDBData aDBData; // database descriptor
::com::sun::star::uno::Sequence <sal_Int8 > aRedlinePasswd;
- String sTOIAutoMarkURL; // ::com::sun::star::util::URL of table of index AutoMark file
- SvStringsDtor aPatternNms; // Array fuer die Namen der Dokument-Vorlagen
+ String sTOIAutoMarkURL; // ::com::sun::star::util::URL of table of index AutoMark file
+ SvStringsDtor aPatternNms; // Array fuer die Namen der Dokument-Vorlagen
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
xXForms; // container with XForms models
mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
@@ -315,60 +315,60 @@ class SW_DLLPUBLIC SwDoc :
// -------------------------------------------------------------------
// die Pointer
//Defaultformate
- SwFrmFmt *pDfltFrmFmt;
- SwFrmFmt *pEmptyPageFmt; // Format fuer die Default-Leerseite.
- SwFrmFmt *pColumnContFmt; // Format fuer Spaltencontainer
- SwCharFmt *pDfltCharFmt;
- SwTxtFmtColl *pDfltTxtFmtColl; // Defaultformatcollections
- SwGrfFmtColl *pDfltGrfFmtColl;
-
- SwFrmFmts *pFrmFmtTbl; // Formattabellen
- SwCharFmts *pCharFmtTbl;
- SwSpzFrmFmts *pSpzFrmFmtTbl;
- SwSectionFmts *pSectionFmtTbl;
- SwFrmFmts *pTblFrmFmtTbl; // spz. fuer Tabellen
- SwTxtFmtColls *pTxtFmtCollTbl; // FormatCollections
- SwGrfFmtColls *pGrfFmtCollTbl;
-
- SwTOXTypes *pTOXTypes; // Verzeichnisse
- SwDefTOXBase_Impl * pDefTOXBases; // defaults of SwTOXBase's
-
- SwRootFrm *pLayout; // Rootframe des spezifischen Layouts.
- SdrModel *pDrawModel; // StarView Drawing
-
- SwUndos *pUndos; // Undo/Redo History
-
- SwDocUpdtFld *pUpdtFlds; // Struktur zum Field-Update
- SwFldTypes *pFldTypes; // Feldtypen
- SwNewDBMgr *pNewDBMgr; // Pointer auf den neuen DBMgr fuer
+ SwFrmFmt *pDfltFrmFmt;
+ SwFrmFmt *pEmptyPageFmt; // Format fuer die Default-Leerseite.
+ SwFrmFmt *pColumnContFmt; // Format fuer Spaltencontainer
+ SwCharFmt *pDfltCharFmt;
+ SwTxtFmtColl *pDfltTxtFmtColl; // Defaultformatcollections
+ SwGrfFmtColl *pDfltGrfFmtColl;
+
+ SwFrmFmts *pFrmFmtTbl; // Formattabellen
+ SwCharFmts *pCharFmtTbl;
+ SwSpzFrmFmts *pSpzFrmFmtTbl;
+ SwSectionFmts *pSectionFmtTbl;
+ SwFrmFmts *pTblFrmFmtTbl; // spz. fuer Tabellen
+ SwTxtFmtColls *pTxtFmtCollTbl; // FormatCollections
+ SwGrfFmtColls *pGrfFmtCollTbl;
+
+ SwTOXTypes *pTOXTypes; // Verzeichnisse
+ SwDefTOXBase_Impl * pDefTOXBases; // defaults of SwTOXBase's
+
+ SwRootFrm *pLayout; // Rootframe des spezifischen Layouts.
+ SdrModel *pDrawModel; // StarView Drawing
+
+ SwUndos *pUndos; // Undo/Redo History
+
+ SwDocUpdtFld *pUpdtFlds; // Struktur zum Field-Update
+ SwFldTypes *pFldTypes; // Feldtypen
+ SwNewDBMgr *pNewDBMgr; // Pointer auf den neuen DBMgr fuer
// Evaluierung der DB-Fields
VirtualDevice *pVirDev; // can be used for formatting
SfxPrinter *pPrt; // can be used for formatting
SwPrintData *pPrtData; // Print configuration
- SwDoc *pGlossaryDoc; // Pointer auf das Glossary-Dokument. Dieses
+ SwDoc *pGlossaryDoc; // Pointer auf das Glossary-Dokument. Dieses
- SwNumRule *pOutlineRule;
- SwFtnInfo *pFtnInfo;
- SwEndNoteInfo *pEndNoteInfo;
+ SwNumRule *pOutlineRule;
+ SwFtnInfo *pFtnInfo;
+ SwEndNoteInfo *pEndNoteInfo;
SwLineNumberInfo*pLineNumberInfo;
- SwFtnIdxs *pFtnIdxs;
- SwDocStat *pDocStat; // Statistic Informationen
- SvxMacroTableDtor *pMacroTable; // Tabelle der dokumentglobalen Macros
+ SwFtnIdxs *pFtnIdxs;
+ SwDocStat *pDocStat; // Statistic Informationen
+ SvxMacroTableDtor *pMacroTable; // Tabelle der dokumentglobalen Macros
- SwDocShell *pDocShell; // Ptr auf die SfxDocShell vom Doc
+ SwDocShell *pDocShell; // Ptr auf die SfxDocShell vom Doc
SfxObjectShellRef* pDocShRef; // fuers Kopieren von OLE-Nodes (wenn keine
// DocShell gesetzt ist, muss dieser
// Ref-Pointer gesetzt sein!!!!)
- sfx2::LinkManager *pLinkMgr; // Liste von Verknuepften (Grafiken/DDE/OLE)
+ sfx2::LinkManager *pLinkMgr; // Liste von Verknuepften (Grafiken/DDE/OLE)
- SwAutoCorrExceptWord *pACEWord; // fuer die automatische Uebernahme von
+ SwAutoCorrExceptWord *pACEWord; // fuer die automatische Uebernahme von
// autokorrigierten Woertern, die "zurueck"
// verbessert werden
- SwURLStateChanged *pURLStateChgd; // SfxClient fuer Aenderungen in der
+ SwURLStateChanged *pURLStateChgd; // SfxClient fuer Aenderungen in der
// INetHistory
- SvNumberFormatter *pNumberFormatter; // NumFormatter fuer die Tabellen/Felder
+ SvNumberFormatter *pNumberFormatter; // NumFormatter fuer die Tabellen/Felder
mutable SwNumRuleTbl *pNumRuleTbl; // Liste aller benannten NumRules
@@ -383,16 +383,16 @@ class SW_DLLPUBLIC SwDoc :
tHashMapForLists maListStyleLists;
// <--
- SwRedlineTbl *pRedlineTbl; // Liste aller Redlines
- String *pAutoFmtRedlnComment; // Kommentar fuer Redlines, die
+ SwRedlineTbl *pRedlineTbl; // Liste aller Redlines
+ String *pAutoFmtRedlnComment; // Kommentar fuer Redlines, die
// uebers Autoformat eingefuegt werden
- SwUnoCrsrTbl *pUnoCrsrTbl;
+ SwUnoCrsrTbl *pUnoCrsrTbl;
- SwPagePreViewPrtData *pPgPViewPrtData; // Einzuege/Abstaende fuers
+ SwPagePreViewPrtData *pPgPViewPrtData; // Einzuege/Abstaende fuers
// Drucken der Seitenansicht
- SwPaM *pExtInputRing;
+ SwPaM *pExtInputRing;
- SwLayouter *pLayouter; // ::com::sun::star::frame::Controller for complex layout formatting
+ SwLayouter *pLayouter; // ::com::sun::star::frame::Controller for complex layout formatting
// like footnote/endnote in sections
IStyleAccess *pStyleAccess; // handling of automatic styles
SwLayoutCache *pLayoutCache; // Layout cache to read and save with the
@@ -407,7 +407,7 @@ class SW_DLLPUBLIC SwDoc :
SwChartLockController_Helper *pChartControllerHelper;
// table of forbidden characters of this document
- rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+ rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
// --> OD 2007-10-26 #i83479#
@@ -427,23 +427,23 @@ private:
// -------------------------------------------------------------------
// sonstige
- sal_uInt16 nUndoPos; // akt. Undo-InsertPosition (fuers Redo!)
- sal_uInt16 nUndoSavePos; // Position im Undo-Array, ab der das Doc
+ sal_uInt16 nUndoPos; // akt. Undo-InsertPosition (fuers Redo!)
+ sal_uInt16 nUndoSavePos; // Position im Undo-Array, ab der das Doc
// nicht als modifiziert gilt
- sal_uInt16 nUndoCnt; // Anzahl von Undo Aktionen
- sal_uInt16 nUndoSttEnd; // != 0 -> innerhalb einer Klammerung
+ sal_uInt16 nUndoCnt; // Anzahl von Undo Aktionen
+ sal_uInt16 nUndoSttEnd; // != 0 -> innerhalb einer Klammerung
- sal_uInt16 nAutoFmtRedlnCommentNo; // SeqNo fuers UI-seitige zusammenfassen
+ sal_uInt16 nAutoFmtRedlnCommentNo; // SeqNo fuers UI-seitige zusammenfassen
// von AutoFmt-Redlines. Wird vom SwAutoFmt
// verwaltet!
- sal_uInt16 nLinkUpdMode; // UpdateMode fuer Links
+ sal_uInt16 nLinkUpdMode; // UpdateMode fuer Links
SwFldUpdateFlags eFldUpdMode; // Mode fuer Felder/Charts automatisch aktualisieren
- RedlineMode_t eRedlineMode; // aktueller Redline Modus
- SwCharCompressType eChrCmprType; // for ASIAN: compress punctuation/kana
+ RedlineMode_t eRedlineMode; // aktueller Redline Modus
+ SwCharCompressType eChrCmprType; // for ASIAN: compress punctuation/kana
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
- sal_Int8 nLockExpFld; // Wenn != 0 hat UpdateExpFlds() keine Wirkung
+ sal_Int8 nLockExpFld; // Wenn != 0 hat UpdateExpFlds() keine Wirkung
/* Draw Model Layer IDs
* LayerIds, Heaven == ueber dem Dokument
@@ -615,8 +615,8 @@ private:
sal_Bool mbStartIdleTimer ; // idle timer mode start/stop
- static SwAutoCompleteWord *pACmpltWords; // Liste aller Worte fuers AutoComplete
- static sal_uInt16 nUndoActions; // anzahl von Undo ::com::sun::star::chaos::Action
+ static SwAutoCompleteWord *pACmpltWords; // Liste aller Worte fuers AutoComplete
+ static sal_uInt16 nUndoActions; // anzahl von Undo ::com::sun::star::chaos::Action
//---------------- private Methoden ------------------------------
void checkRedlining(RedlineMode_t& _rReadlineMode);
@@ -625,7 +625,7 @@ private:
// bis zum angegebenen Ende
DECL_LINK( AddDrawUndo, SdrUndoAction * );
// DrawModel
- void DrawNotifyUndoHdl(); // wegen CLOOKs
+ void DrawNotifyUndoHdl(); // wegen CLOOKs
// nur fuer den internen Gebrauch deshalb privat.
// Kopieren eines Bereiches im oder in ein anderes Dokument !
@@ -663,7 +663,7 @@ private:
VirtualDevice& CreateVirtualDevice_() const;
SfxPrinter& CreatePrinter_() const;
- void PrtDataChanged(); //Printer oder JobSetup geandert, es muss
+ void PrtDataChanged(); //Printer oder JobSetup geandert, es muss
//fuer entsprechende Invalidierungen und
//Benachrichtigungen gesorgt werden.
@@ -671,7 +671,7 @@ private:
SwDoc( const SwDoc &);
// fuer Felder:
- void _InitFieldTypes(); // wird vom CTOR gerufen!!
+ void _InitFieldTypes(); // wird vom CTOR gerufen!!
void _MakeFldList( int eMode );
// Datenbankfelder:
@@ -737,8 +737,8 @@ public:
/* @@@MAINTAINABILITY-HORROR@@@
Implementation details made public.
*/
- SwNodes& GetNodes() { return aNodes; }
- const SwNodes& GetNodes() const { return aNodes; }
+ SwNodes& GetNodes() { return aNodes; }
+ const SwNodes& GetNodes() const { return aNodes; }
/** IInterface
*/
@@ -919,7 +919,7 @@ public:
const enum InsertFlags nInsertMode = INS_EMPTYEXPAND );
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const String& rGrfName, const String& rFltName, const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
- virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+ virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
virtual SwDrawFrmFmt* Insert(const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet* pFlyAttrSet, SwFrmFmt*);
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
@@ -959,7 +959,7 @@ public:
/** IDocumentStatistics
*/
virtual void DocInfoChgd();
- virtual const SwDocStat &GetDocStat() const;
+ virtual const SwDocStat &GetDocStat() const;
virtual void SetDocStat(const SwDocStat& rStat);
virtual void UpdateDocStat(SwDocStat& rStat);
@@ -1060,7 +1060,7 @@ public:
// <--
/** IDocumentExternalData */
- virtual void setExternalData(::sw::tExternalDataType eType,
+ virtual void setExternalData(::sw::tExternalDataType eType,
::sw::tExternalDataPointer pPayload);
virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType);
@@ -1075,7 +1075,7 @@ public:
*/
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
inline void SetOLEPrtNotifyPending( bool bSet = true );
- void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
+ void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
#if OSL_DEBUG_LEVEL > 1
bool InXMLExport() const { return mbXMLExport; }
@@ -1095,9 +1095,9 @@ public:
SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
// JP 08.05.98: fuer Flys muss jetzt diese Schnittstelle benutzt
- // werden. pAnchorPos muss gesetzt sein, wenn keine
- // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
- // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
+ // werden. pAnchorPos muss gesetzt sein, wenn keine
+ // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
+ // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
/* #109161# new parameter bCalledFromShell
TRUE: An existing adjust item at pAnchorPos is propagated to
@@ -1137,11 +1137,11 @@ public:
/** Footnotes
*/
// Fussnoten Informationen
- const SwFtnInfo& GetFtnInfo() const { return *pFtnInfo; }
+ const SwFtnInfo& GetFtnInfo() const { return *pFtnInfo; }
void SetFtnInfo(const SwFtnInfo& rInfo);
const SwEndNoteInfo& GetEndNoteInfo() const { return *pEndNoteInfo; }
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
- SwFtnIdxs& GetFtnIdxs() { return *pFtnIdxs; }
+ SwFtnIdxs& GetFtnIdxs() { return *pFtnIdxs; }
const SwFtnIdxs& GetFtnIdxs() const { return *pFtnIdxs; }
// change footnotes in area
bool SetCurFtn( const SwPaM& rPam, const String& rNumStr,
@@ -1185,9 +1185,9 @@ public:
/** Database ???
*/
- /* Datenbank && DB-Manager */
- void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; }
- SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
+ /* Datenbank && DB-Manager */
+ void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; }
+ SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
void ChangeDBFields( const SvStringsDtor& rOldNames,
const String& rNewName );
void SetInitDBFields(sal_Bool b);
@@ -1250,22 +1250,22 @@ public:
sal_Bool DontExpandFmt( const SwPosition& rPos, sal_Bool bFlag = sal_True );
/* Formate */
- const SwFrmFmts* GetFrmFmts() const { return pFrmFmtTbl; }
- SwFrmFmts* GetFrmFmts() { return pFrmFmtTbl; }
- const SwCharFmts* GetCharFmts() const { return pCharFmtTbl;}
+ const SwFrmFmts* GetFrmFmts() const { return pFrmFmtTbl; }
+ SwFrmFmts* GetFrmFmts() { return pFrmFmtTbl; }
+ const SwCharFmts* GetCharFmts() const { return pCharFmtTbl;}
/* LayoutFormate (Rahmen, DrawObjecte), mal const mal nicht */
- const SwSpzFrmFmts* GetSpzFrmFmts() const { return pSpzFrmFmtTbl; }
- SwSpzFrmFmts* GetSpzFrmFmts() { return pSpzFrmFmtTbl; }
+ const SwSpzFrmFmts* GetSpzFrmFmts() const { return pSpzFrmFmtTbl; }
+ SwSpzFrmFmts* GetSpzFrmFmts() { return pSpzFrmFmtTbl; }
- const SwFrmFmt *GetDfltFrmFmt() const { return pDfltFrmFmt; }
- SwFrmFmt *GetDfltFrmFmt() { return pDfltFrmFmt; }
+ const SwFrmFmt *GetDfltFrmFmt() const { return pDfltFrmFmt; }
+ SwFrmFmt *GetDfltFrmFmt() { return pDfltFrmFmt; }
const SwFrmFmt *GetEmptyPageFmt() const { return pEmptyPageFmt; }
- SwFrmFmt *GetEmptyPageFmt() { return pEmptyPageFmt; }
+ SwFrmFmt *GetEmptyPageFmt() { return pEmptyPageFmt; }
const SwFrmFmt *GetColumnContFmt() const{ return pColumnContFmt; }
- SwFrmFmt *GetColumnContFmt() { return pColumnContFmt; }
+ SwFrmFmt *GetColumnContFmt() { return pColumnContFmt; }
const SwCharFmt *GetDfltCharFmt() const { return pDfltCharFmt;}
- SwCharFmt *GetDfltCharFmt() { return pDfltCharFmt;}
+ SwCharFmt *GetDfltCharFmt() { return pDfltCharFmt;}
// Returns the interface of the management of (auto)styles
IStyleAccess& GetIStyleAccess() { return *pStyleAccess; }
@@ -1275,19 +1275,19 @@ public:
SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
BOOL bBroadcast = FALSE, BOOL bAuto = TRUE);
- void DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast = FALSE );
+ void DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast = FALSE );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
- { return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); }
+ { return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); }
// --> OD 2005-01-13 #i40550#
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
BOOL bBroadcast = FALSE,
BOOL bAuto = TRUE );
// <--
- void DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
- void DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE);
+ void DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
+ void DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE);
SwCharFmt* FindCharFmtByName( const String& rName ) const
- { return (SwCharFmt*)FindFmtByName( (SvPtrarr&)*pCharFmtTbl, rName ); }
+ { return (SwCharFmt*)FindFmtByName( (SvPtrarr&)*pCharFmtTbl, rName ); }
/* Formatcollections (Vorlagen) */
// TXT
@@ -1317,25 +1317,25 @@ public:
bool bResetListAttrs = false );
// <--
SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
- { return (SwTxtFmtColl*)FindFmtByName( (SvPtrarr&)*pTxtFmtCollTbl, rName ); }
+ { return (SwTxtFmtColl*)FindFmtByName( (SvPtrarr&)*pTxtFmtCollTbl, rName ); }
void ChkCondColls();
// GRF
- const SwGrfFmtColl* GetDfltGrfFmtColl() const { return pDfltGrfFmtColl; }
- const SwGrfFmtColls *GetGrfFmtColls() const { return pGrfFmtCollTbl; }
+ const SwGrfFmtColl* GetDfltGrfFmtColl() const { return pDfltGrfFmtColl; }
+ const SwGrfFmtColls *GetGrfFmtColls() const { return pGrfFmtCollTbl; }
SwGrfFmtColl *MakeGrfFmtColl(const String &rFmtName,
SwGrfFmtColl *pDerivedFrom);
SwGrfFmtColl* FindGrfFmtCollByName( const String& rName ) const
- { return (SwGrfFmtColl*)FindFmtByName( (SvPtrarr&)*pGrfFmtCollTbl, rName ); }
+ { return (SwGrfFmtColl*)FindFmtByName( (SvPtrarr&)*pGrfFmtCollTbl, rName ); }
// Tabellen-Formate
- const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; }
- SwFrmFmts* GetTblFrmFmts() { return pTblFrmFmtTbl; }
+ const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; }
+ SwFrmFmts* GetTblFrmFmts() { return pTblFrmFmtTbl; }
sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed ) const;
SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const;
SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
- void DelTblFrmFmt( SwTableFmt* pFmt );
+ void DelTblFrmFmt( SwTableFmt* pFmt );
SwTableFmt* FindTblFmtByName( const String& rName, sal_Bool bAll = sal_False ) const;
//Rahmenzugriff
@@ -1363,7 +1363,7 @@ public:
String* GetDocPattern( sal_uInt16 nPos ) const { return aPatternNms[nPos]; }
// Loesche alle nicht referenzierten FeldTypen
- void GCFieldTypes(); // impl. in docfld.cxx
+ void GCFieldTypes(); // impl. in docfld.cxx
// akt. Dokument mit Textbausteindokument verbinden/erfragen
void SetGlossaryDoc( SwDoc* pDoc ) { pGlossaryDoc = pDoc; }
@@ -1374,11 +1374,11 @@ public:
// get the set of printable pages for the XRenderable API by
// evaluating the respective settings (see implementation)
- void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+ void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
sal_Int32 nDocPageCount );
- void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+ void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
sal_Int32 nDocPageCount );
- void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions,
+ void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount );
sal_uInt16 GetPageCount() const;
@@ -1445,7 +1445,7 @@ public:
sal_Bool bExpand = sal_False );
const SwTOXBaseSection* InsertTableOf( ULONG nSttNd, ULONG nEndNd,
const SwTOXBase& rTOX,
- const SfxItemSet* pSet = 0 );
+ const SfxItemSet* pSet = 0 );
const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const;
const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX) const;
@@ -1460,9 +1460,9 @@ public:
void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; }
bool IsUpdateTOX() const { return mbUpdateTOX; }
- const String& GetTOIAutoMarkURL() const {return sTOIAutoMarkURL;}
- void SetTOIAutoMarkURL(const String& rSet) {sTOIAutoMarkURL = rSet;}
- void ApplyAutoMark();
+ const String& GetTOIAutoMarkURL() const {return sTOIAutoMarkURL;}
+ void SetTOIAutoMarkURL(const String& rSet) {sTOIAutoMarkURL = rSet;}
+ void ApplyAutoMark();
bool IsInReading() const { return mbInReading; }
void SetInReading( bool bNew ) { mbInReading = bNew; }
@@ -1484,8 +1484,8 @@ public:
const SwTOXType* InsertTOXType( const SwTOXType& rTyp );
const SwTOXTypes& GetTOXTypes() const { return *pTOXTypes; }
- const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
- void SetDefaultTOXBase(const SwTOXBase& rBase);
+ const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
+ void SetDefaultTOXBase(const SwTOXBase& rBase);
// - Schluessel fuer die Indexverwaltung
sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
@@ -1596,7 +1596,7 @@ public:
sal_Bool DelNumRule( const String& rName, BOOL bBroadCast = FALSE );
String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
- void UpdateNumRule(); // alle invaliden Updaten
+ void UpdateNumRule(); // alle invaliden Updaten
// #106897#
void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 );
sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
@@ -1617,7 +1617,7 @@ public:
\param rPos position to start search
\param bForward - TRUE: search forward
- FALSE: search backward
- \param bNum - TRUE: search for enumeration
+ \param bNum - TRUE: search for enumeration
- FALSE: search for itemize
\param bOutline - TRUE: search for outline numbering rule
- FALSE: search for non-outline numbering rule
@@ -1661,9 +1661,9 @@ public:
// fuege eine neue Tabelle auf der Position rPos ein. (es
// wird vor dem Node eingefuegt !!)
//JP 28.10.96:
- // fuer AutoFormat bei der Eingabe: dann muessen die Spalten
- // auf die vordefinierten Breite gesetzt werden. Im Array stehen die
- // Positionen der Spalten!! (nicht deren Breite!)
+ // fuer AutoFormat bei der Eingabe: dann muessen die Spalten
+ // auf die vordefinierten Breite gesetzt werden. Im Array stehen die
+ // Positionen der Spalten!! (nicht deren Breite!)
/* #109161# new parameter bCalledFromShell:
TRUE: called from shell -> propagate existing adjust item at
@@ -1785,8 +1785,8 @@ public:
// returne die RefMark per Index - fuer Uno
const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
// returne die Namen aller im Doc gesetzten Referenzen.
- // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
- // gesetzt ist
+ // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
+ // gesetzt ist
sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
//Einfuegen einer Beschriftung - falls ein FlyFormat erzeugt wird, so
@@ -1801,14 +1801,14 @@ public:
const sal_uInt16 nId, const String& rCharacterStyle, SdrObject& rObj );
// erfrage den Attribut Pool
- const SwAttrPool& GetAttrPool() const { return *mpAttrPool; }
- SwAttrPool& GetAttrPool() { return *mpAttrPool; }
+ const SwAttrPool& GetAttrPool() const { return *mpAttrPool; }
+ SwAttrPool& GetAttrPool() { return *mpAttrPool; }
// suche ueber das Layout eine EditShell und ggfs. eine ViewShell
SwEditShell* GetEditShell( ViewShell** ppSh = 0 ) const;
// OLE 2.0-Benachrichtung
- inline void SetOle2Link(const Link& rLink) {aOle2Link = rLink;}
+ inline void SetOle2Link(const Link& rLink) {aOle2Link = rLink;}
inline const Link& GetOle2Link() const {return aOle2Link;}
// insert section (the ODF kind of section, not the nodesarray kind)
@@ -1831,8 +1831,8 @@ public:
Unnecessary compile/link time dependency.
*/
// Pointer auf die SfxDocShell vom Doc, kann 0 sein !!!
- SwDocShell* GetDocShell() { return pDocShell; }
- const SwDocShell* GetDocShell() const { return pDocShell; }
+ SwDocShell* GetDocShell() { return pDocShell; }
+ const SwDocShell* GetDocShell() const { return pDocShell; }
void SetDocShell( SwDocShell* pDSh );
// falls beim Kopieren von OLE-Nodes eine DocShell angelegt werden muss,
@@ -1880,7 +1880,7 @@ public:
// speicher die akt. Werte fuer die automatische Aufnahme von Ausnahmen
// in die Autokorrektur
void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
- SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return pACEWord; }
+ SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return pACEWord; }
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
@@ -1898,7 +1898,7 @@ public:
sal_Bool bModulus = sal_True );
// Numberformatter erfragen
- inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True );
+ inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True );
inline const SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ) const;
// loesche den nicht sichtbaren ::com::sun::star::ucb::Content aus dem Document, wie z.B.:
@@ -1913,10 +1913,10 @@ public:
// falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
sal_Bool GenerateGlobalDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
- sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
+ sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
sal_Bool GenerateHTMLDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
- sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
+ sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
// vergleiche zwei Dokument miteinander
long CompareDoc( const SwDoc& rDoc );
@@ -1937,7 +1937,7 @@ public:
void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& );
// !!!NUR fuer die SW-Textblocks!! beachtet kein LAYOUT!!!
- void ClearDoc(); // loescht den gesamten Inhalt.
+ void ClearDoc(); // loescht den gesamten Inhalt.
// erfrage / setze die Daten fuer die PagePreView
const SwPagePreViewPrtData* GetPreViewPrtData() const { return pPgPViewPrtData; }
@@ -1947,12 +1947,12 @@ public:
void SetPreViewPrtData( const SwPagePreViewPrtData* pData );
// update all modified OLE-Objects. The modification is called over the
- // StarOne - Interface --> Bug 67026
+ // StarOne - Interface --> Bug 67026
void SetOLEObjModified()
- { if( GetRootFrm() ) aOLEModifiedTimer.Start(); }
+ { if( GetRootFrm() ) aOLEModifiedTimer.Start(); }
// -------------------- Uno - Schnittstellen ---------------------------
- const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; }
+ const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; }
SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr = sal_False );
// -------------------- Uno - Schnittstellen ---------------------------
@@ -2024,7 +2024,7 @@ public:
bool ContainsHiddenChars() const;
// call back for API wrapper
- SwModify* GetUnoCallBack() const;
+ SwModify* GetUnoCallBack() const;
IGrammarContact* getGrammarContact() const { return mpGrammarContact; }
@@ -2222,6 +2222,6 @@ namespace docfunc
bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
}
// <--
-#endif //_DOC_HXX
+#endif //_DOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 98679a595667..ff50ef01f891 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -2,7 +2,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
@@ -50,7 +50,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
#include <svl/svarray.hxx>
typedef SwFieldType* SwFldTypePtr;
-#define GROW_FLDTYPES 16
+#define GROW_FLDTYPES 16
//PageDescriptor-Schnittstelle
//typedef SwPageDesc * SwPageDescPtr;
@@ -127,6 +127,6 @@ typedef SwOLENode* SwOLENodePtr;
SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16,16)
-#endif //_DOCARY_HXX
+#endif //_DOCARY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index b772dc699c41..b472217ca9bd 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ public:
~SwDocFac();
// Das Dokument ist nach dem Aufruf von Read(..) angelegt
- SwDoc* GetDoc();
+ SwDoc* GetDoc();
};
#endif
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 47b0b8014240..8e5980e244e5 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -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
@@ -38,9 +38,9 @@
#define DLG_SEL_GLOS (RC_DOCHDL_BEGIN + 6)
#define STR_NO_TABLE (RC_DOCHDL_BEGIN + 7)
-#define STR_PRIVATETEXT (RC_DOCHDL_BEGIN + 8)
-#define STR_PRIVATEGRAPHIC (RC_DOCHDL_BEGIN + 9)
-#define STR_PRIVATEOLE (RC_DOCHDL_BEGIN + 10)
+#define STR_PRIVATETEXT (RC_DOCHDL_BEGIN + 8)
+#define STR_PRIVATEGRAPHIC (RC_DOCHDL_BEGIN + 9)
+#define STR_PRIVATEOLE (RC_DOCHDL_BEGIN + 10)
#define STR_DDEFORMAT (RC_DOCHDL_BEGIN + 11)
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 2c5e509dc74e..b3950f39ceca 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -2,7 +2,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
@@ -64,19 +64,19 @@ class IDocumentChartDataProviderAccess;
class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
{
- SwDoc* pDoc; // Document
- rtl::Reference< SfxStyleSheetBasePool > mxBasePool; // Durchreiche fuer Formate
- FontList* pFontList; // aktuelle FontListe
+ SwDoc* pDoc; // Document
+ rtl::Reference< SfxStyleSheetBasePool > mxBasePool; // Durchreiche fuer Formate
+ FontList* pFontList; // aktuelle FontListe
// Nix geht ohne die WrtShell (historische Gruende)
// RuekwaertsPointer auf die View (historische Gruende)
// Dieser gilt solange bis im Activate ein neuer gesetzt wird
// oder dieser im Dtor der View geloescht wird
//
- SwView* pView;
- SwWrtShell* pWrtShell;
+ SwView* pView;
+ SwWrtShell* pWrtShell;
- Timer aFinishedTimer; // Timer fuers ueberpriefen der
+ Timer aFinishedTimer; // Timer fuers ueberpriefen der
// Grafik-Links. Sind alle da,
// dann ist Doc voll. geladen
@@ -86,11 +86,11 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
bool bInUpdateFontList; //prevent nested calls of UpdateFontList
bool bIsATemplate; //prevent nested calls of UpdateFontList
// Methoden fuer den Zugriff aufs Doc
- SW_DLLPRIVATE void AddLink();
- SW_DLLPRIVATE void RemoveLink();
+ SW_DLLPRIVATE void AddLink();
+ SW_DLLPRIVATE void RemoveLink();
// Hint abfangen fuer DocInfo
- SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
// FileIO
SW_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
@@ -101,34 +101,34 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SW_DLLPRIVATE virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+ SW_DLLPRIVATE virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
// DocInfo dem Doc melden
//
SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &);
// OLE-Geraffel
- SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, USHORT);
+ SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, USHORT);
// Methoden fuer StyleSheets
- SW_DLLPRIVATE USHORT Edit( const String &rName, const String& rParent, USHORT nFamily,
+ SW_DLLPRIVATE USHORT Edit( const String &rName, const String& rParent, USHORT nFamily,
USHORT nMask, BOOL bNew,
BOOL bColumn = FALSE,
SwWrtShell* pActShell = 0,
BOOL bBasic = FALSE );
- SW_DLLPRIVATE USHORT Delete(const String &rName, USHORT nFamily);
- SW_DLLPRIVATE USHORT ApplyStyles(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0,
+ SW_DLLPRIVATE USHORT Delete(const String &rName, USHORT nFamily);
+ SW_DLLPRIVATE USHORT ApplyStyles(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0,
USHORT nMode = 0 );
- SW_DLLPRIVATE USHORT DoWaterCan( const String &rName, USHORT nFamily);
- SW_DLLPRIVATE USHORT UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE USHORT MakeByExample(const String &rName,
+ SW_DLLPRIVATE USHORT DoWaterCan( const String &rName, USHORT nFamily);
+ SW_DLLPRIVATE USHORT UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0);
+ SW_DLLPRIVATE USHORT MakeByExample(const String &rName,
USHORT nFamily, USHORT nMask, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE void InitDraw();
- SW_DLLPRIVATE void SubInitNew(); // fuer InitNew und HtmlSourceModus
+ SW_DLLPRIVATE void InitDraw();
+ SW_DLLPRIVATE void SubInitNew(); // fuer InitNew und HtmlSourceModus
- SW_DLLPRIVATE void RemoveOLEObjects();
- SW_DLLPRIVATE void CalcLayoutForOLEObjects();
+ SW_DLLPRIVATE void RemoveOLEObjects();
+ SW_DLLPRIVATE void CalcLayoutForOLEObjects();
SW_DLLPRIVATE void Init_Impl();
SW_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
@@ -163,24 +163,24 @@ public:
DECL_LINK( Ole2ModifiedHdl, void * );
// OLE-Geraffel
- virtual void SetVisArea( const Rectangle &rRect );
+ virtual void SetVisArea( const Rectangle &rRect );
virtual Rectangle GetVisArea( USHORT nAspect ) const;
virtual Printer *GetDocumentPrinter();
virtual OutputDevice* GetDocumentRefDev();
- virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
- virtual ULONG GetMiscStatus() const;
+ virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
+ virtual ULONG GetMiscStatus() const;
- virtual void PrepareReload();
- virtual void SetModified( BOOL = TRUE );
+ virtual void PrepareReload();
+ virtual void SetModified( BOOL = TRUE );
// Dispatcher
- void Execute(SfxRequest &);
- void ExecStyleSheet(SfxRequest&);
- void ExecDB(SfxRequest&);
+ void Execute(SfxRequest &);
+ void ExecStyleSheet(SfxRequest&);
+ void ExecDB(SfxRequest&);
- void GetState(SfxItemSet &);
- void StateAlways(SfxItemSet &);
- void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 );
+ void GetState(SfxItemSet &);
+ void StateAlways(SfxItemSet &);
+ void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 );
// Doc rausreichen aber VORSICHT
inline SwDoc* GetDoc() { return pDoc; }
@@ -191,19 +191,19 @@ public:
void UpdateFontList();
- void UpdateChildWindows();
+ void UpdateChildWindows();
// globaler IO
- virtual BOOL Save();
+ virtual BOOL Save();
// fuer VorlagenPI
- virtual SfxStyleSheetBasePool* GetStyleSheetPool();
+ virtual SfxStyleSheetBasePool* GetStyleSheetPool();
// Fuer Organizer
virtual BOOL Insert(SfxObjectShell &rSource,
- USHORT nSourceIdx1,
- USHORT nSourceIdx2,
- USHORT nSourceIdx3,
+ USHORT nSourceIdx1,
+ USHORT nSourceIdx2,
+ USHORT nSourceIdx3,
USHORT& nIdx1,
USHORT& nIdx2,
USHORT& nIdx3,
@@ -213,15 +213,15 @@ public:
USHORT nIdx2 = INDEX_IGNORE,
USHORT nIdx3 = INDEX_IGNORE);
- virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode );
+ virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode );
// View setzen fuer Aktionen ueber Shell
- void SetView(SwView* pVw);
+ void SetView(SwView* pVw);
const SwView *GetView() const { return pView; }
SwView *GetView() { return pView; }
// Zugriff auf die zur SwView gehoerige SwWrtShell
- SwWrtShell *GetWrtShell() { return pWrtShell; }
+ SwWrtShell *GetWrtShell() { return pWrtShell; }
const SwWrtShell *GetWrtShell() const { return pWrtShell; }
// fuer die Core - die kennt die DocShell aber keine WrtShell!
@@ -256,7 +256,7 @@ public:
// Seitenvorlagedialog anzeigen, ggf. auf Spaltenpage
void FormatPage( const String& rPage,
BOOL bColumn = FALSE,
- SwWrtShell* pActShell = 0 );
+ SwWrtShell* pActShell = 0 );
// --> OD 2006-11-07 #i59688#
// linked graphics are now loaded on demand.
@@ -272,7 +272,7 @@ public:
virtual void CancelTransfers();
// Doc aus Html-Source neu laden
- void ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView );
+ void ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView );
sal_Int16 GetUpdateDocMode() const {return nUpdateDocMode;}
@@ -289,7 +289,7 @@ public:
void InvalidateModel();
void ReactivateModel();
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
// --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index 9c36ed834779..8b156bff737a 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -2,7 +2,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
@@ -34,18 +34,18 @@
struct SW_DLLPUBLIC SwDocStat
{
- USHORT nTbl;
- USHORT nGrf;
- USHORT nOLE;
- ULONG nPage;
+ USHORT nTbl;
+ USHORT nGrf;
+ USHORT nOLE;
+ ULONG nPage;
/// paragraphs for document statistic: non-empty and non-hidden ones
- ULONG nPara;
+ ULONG nPara;
/// all paragraphs, including empty/hidden ones
ULONG nAllPara;
- ULONG nWord;
- ULONG nChar;
- ULONG nCharExcludingSpaces;
- BOOL bModified;
+ ULONG nWord;
+ ULONG nChar;
+ ULONG nCharExcludingSpaces;
+ BOOL bModified;
SwDocStat();
void Reset();
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index c7b0d4fde10f..6bafce8c5f17 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@ class SwFrmFmt;
class SwNumRule;
/*--------------------------------------------------------------------
- Beschreibung: Lokale Hilfsklasse
+ Beschreibung: Lokale Hilfsklasse
--------------------------------------------------------------------*/
class SwPoolFmtList : public SvStringsDtor
{
@@ -59,27 +59,27 @@ public:
/*--------------------------------------------------------------------
- Beschreibung: temp. StyleSheet
+ Beschreibung: temp. StyleSheet
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
{
friend class SwDocStyleSheetPool;
friend class SwStyleSheetIterator;
- SwCharFmt* pCharFmt;
- SwTxtFmtColl* pColl;
- SwFrmFmt* pFrmFmt;
- const SwPageDesc* pDesc;
- const SwNumRule* pNumRule;
+ SwCharFmt* pCharFmt;
+ SwTxtFmtColl* pColl;
+ SwFrmFmt* pFrmFmt;
+ const SwPageDesc* pDesc;
+ const SwNumRule* pNumRule;
- SwDoc& rDoc;
- SfxItemSet aCoreSet;
+ SwDoc& rDoc;
+ SfxItemSet aCoreSet;
- BOOL bPhysical;
+ BOOL bPhysical;
// leere Huelse zum richtigen StyleSheet (Core) machen
- SW_DLLPRIVATE void Create();
+ SW_DLLPRIVATE void Create();
// den StyleSheet mit Daten fuellen
enum FillStyleType {
@@ -94,21 +94,21 @@ protected:
virtual ~SwDocStyleSheet();
public:
- SwDocStyleSheet( SwDoc& rDoc,
- const String& rName,
- SwDocStyleSheetPool& rPool,
- SfxStyleFamily eFam,
- USHORT nMask);
+ SwDocStyleSheet( SwDoc& rDoc,
+ const String& rName,
+ SwDocStyleSheetPool& rPool,
+ SfxStyleFamily eFam,
+ USHORT nMask);
SwDocStyleSheet( const SwDocStyleSheet& );
- void Reset();
+ void Reset();
- void SetMask(USHORT nMsk) { nMask = nMsk; }
- void SetFamily(SfxStyleFamily eFam) { nFamily = eFam; }
+ void SetMask(USHORT nMsk) { nMask = nMsk; }
+ void SetFamily(SfxStyleFamily eFam) { nFamily = eFam; }
- BOOL IsPhysical() const { return bPhysical; }
- void SetPhysical(BOOL bPhys);
+ BOOL IsPhysical() const { return bPhysical; }
+ void SetPhysical(BOOL bPhys);
// --> OD 2008-02-11 #newlistlevelattrs#
// add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value FALSE,
@@ -119,14 +119,14 @@ public:
const bool bResetIndentAttrsAtParagraphStyle = false );
// <--
- virtual SfxItemSet& GetItemSet();
+ virtual SfxItemSet& GetItemSet();
// --> OD 2008-02-12 #newlistlevelattrs#
// new method for paragraph styles to merge indent attributes of applied list
// style into the given item set, if the list style indent attributes are applicable.
void MergeIndentAttrsOfListStyle( SfxItemSet& rSet );
// <--
- virtual const String& GetParent() const;
- virtual const String& GetFollow() const;
+ virtual const String& GetParent() const;
+ virtual const String& GetFollow() const;
virtual ULONG GetHelpId( String& rFile );
virtual void SetHelpId( const String& r, ULONG nId );
@@ -134,47 +134,47 @@ public:
// Vorbelegen der member ohne physikalischen Zugriff
// wird vom StyleSheetPool benutzt
//
- void PresetName(const String& rName) { aName = rName; }
- void PresetNameAndFamily(const String& rName);
- void PresetParent(const String& rName){ aParent = rName; }
- void PresetFollow(const String& rName){ aFollow = rName; }
-
- virtual BOOL SetName( const String& rStr);
- virtual BOOL SetParent( const String& rStr);
- virtual BOOL SetFollow( const String& rStr);
-
- virtual BOOL HasFollowSupport() const;
- virtual BOOL HasParentSupport() const;
- virtual BOOL HasClearParentSupport() const;
- virtual String GetDescription();
- virtual String GetDescription(SfxMapUnit eUnit);
-
- SwCharFmt* GetCharFmt();
- SwTxtFmtColl* GetCollection();
- SwFrmFmt* GetFrmFmt();
- const SwPageDesc* GetPageDesc();
- const SwNumRule* GetNumRule();
- void SetNumRule(const SwNumRule& rRule);
-
- virtual BOOL IsUsed() const;
+ void PresetName(const String& rName) { aName = rName; }
+ void PresetNameAndFamily(const String& rName);
+ void PresetParent(const String& rName){ aParent = rName; }
+ void PresetFollow(const String& rName){ aFollow = rName; }
+
+ virtual BOOL SetName( const String& rStr);
+ virtual BOOL SetParent( const String& rStr);
+ virtual BOOL SetFollow( const String& rStr);
+
+ virtual BOOL HasFollowSupport() const;
+ virtual BOOL HasParentSupport() const;
+ virtual BOOL HasClearParentSupport() const;
+ virtual String GetDescription();
+ virtual String GetDescription(SfxMapUnit eUnit);
+
+ SwCharFmt* GetCharFmt();
+ SwTxtFmtColl* GetCollection();
+ SwFrmFmt* GetFrmFmt();
+ const SwPageDesc* GetPageDesc();
+ const SwNumRule* GetNumRule();
+ void SetNumRule(const SwNumRule& rRule);
+
+ virtual BOOL IsUsed() const;
};
/*--------------------------------------------------------------------
- Beschreibung: Iterator fuer den Pool
+ Beschreibung: Iterator fuer den Pool
--------------------------------------------------------------------*/
class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
{
rtl::Reference< SwDocStyleSheet > mxIterSheet;
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
- SwPoolFmtList aLst;
- USHORT nLastPos;
- BOOL bFirstCalled;
+ SwPoolFmtList aLst;
+ USHORT nLastPos;
+ BOOL bFirstCalled;
- void AppendStyleList(const SvStringsDtor& rLst,
- BOOL bUsed,
- USHORT nSection,
- char cType);
+ void AppendStyleList(const SvStringsDtor& rLst,
+ BOOL bUsed,
+ USHORT nSection,
+ char cType);
public:
SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
@@ -191,14 +191,14 @@ public:
};
/*--------------------------------------------------------------------
- Beschreibung: Pool fuer
+ Beschreibung: Pool fuer
--------------------------------------------------------------------*/
class SwDocStyleSheetPool : public SfxStyleSheetBasePool
{
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
- SwDoc& rDoc;
- BOOL bOrganizer : 1; // TRUE: fuer den Organizer
+ SwDoc& rDoc;
+ BOOL bOrganizer : 1; // TRUE: fuer den Organizer
virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, USHORT nMask);
@@ -221,8 +221,8 @@ public:
virtual void Remove( SfxStyleSheetBase* pStyle);
- void SetOrganizerMode( BOOL bMode ) { bOrganizer = bMode; }
- BOOL IsOrganizerMode() const { return bOrganizer; }
+ void SetOrganizerMode( BOOL bMode ) { bOrganizer = bMode; }
+ BOOL IsOrganizerMode() const { return bOrganizer; }
virtual SfxStyleSheetIterator* CreateIterator( SfxStyleFamily,
USHORT nMask );
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index ca3707496435..171902346ee8 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -2,7 +2,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
@@ -70,36 +70,36 @@ enum SwDocStatSubType
DS_END
};
-typedef sal_uInt16 SwDocInfoSubType;
+typedef sal_uInt16 SwDocInfoSubType;
namespace nsSwDocInfoSubType
{
// NB: these must denote consecutive integers!
// NB2: these are extended by 4 DI_INFO values for backward compatibility
// in filter/html/htmlfld.cxx, so make sure that DI_SUBTYPE_END
// really is the end, and is at least 4 less than DI_SUB_*!
- const SwDocInfoSubType DI_SUBTYPE_BEGIN = 0;
- const SwDocInfoSubType DI_TITEL = DI_SUBTYPE_BEGIN;
- const SwDocInfoSubType DI_THEMA = 1;
- const SwDocInfoSubType DI_KEYS = 2;
- const SwDocInfoSubType DI_COMMENT = 3;
- const SwDocInfoSubType DI_CREATE = 4;
- const SwDocInfoSubType DI_CHANGE = 5;
- const SwDocInfoSubType DI_PRINT = 6;
- const SwDocInfoSubType DI_DOCNO = 7;
- const SwDocInfoSubType DI_EDIT = 8;
- const SwDocInfoSubType DI_CUSTOM = 9;
- const SwDocInfoSubType DI_SUBTYPE_END = 10;
-
-
- const SwDocInfoSubType DI_SUB_AUTHOR = 0x0100;
- const SwDocInfoSubType DI_SUB_TIME = 0x0200;
- const SwDocInfoSubType DI_SUB_DATE = 0x0300;
- const SwDocInfoSubType DI_SUB_FIXED = 0x1000;
+ const SwDocInfoSubType DI_SUBTYPE_BEGIN = 0;
+ const SwDocInfoSubType DI_TITEL = DI_SUBTYPE_BEGIN;
+ const SwDocInfoSubType DI_THEMA = 1;
+ const SwDocInfoSubType DI_KEYS = 2;
+ const SwDocInfoSubType DI_COMMENT = 3;
+ const SwDocInfoSubType DI_CREATE = 4;
+ const SwDocInfoSubType DI_CHANGE = 5;
+ const SwDocInfoSubType DI_PRINT = 6;
+ const SwDocInfoSubType DI_DOCNO = 7;
+ const SwDocInfoSubType DI_EDIT = 8;
+ const SwDocInfoSubType DI_CUSTOM = 9;
+ const SwDocInfoSubType DI_SUBTYPE_END = 10;
+
+
+ const SwDocInfoSubType DI_SUB_AUTHOR = 0x0100;
+ const SwDocInfoSubType DI_SUB_TIME = 0x0200;
+ const SwDocInfoSubType DI_SUB_DATE = 0x0300;
+ const SwDocInfoSubType DI_SUB_FIXED = 0x1000;
const SwDocInfoSubType DI_SUB_MASK = 0xff00;
}
-enum RegInfoFormat // Nur noch zum laden alter Dokumente!!!
+enum RegInfoFormat // Nur noch zum laden alter Dokumente!!!
{
RF_AUTHOR,
RF_TIME,
@@ -116,16 +116,16 @@ enum SwPageNumSubType
enum SwExtUserSubType
{
- EU_COMPANY /*EU_FIRMA*/,
- EU_FIRSTNAME /*EU_VORNAME*/,
- EU_NAME /*EU_NAME*/,
- EU_SHORTCUT /*EU_ABK*/,
- EU_STREET /*EU_STRASSE*/,
- EU_COUNTRY /*EU_LAND*/,
- EU_ZIP /*EU_PLZ*/,
- EU_CITY /*EU_ORT*/,
- EU_TITLE /*EU_TITEL*/,
- EU_POSITION /*EU_POS*/,
+ EU_COMPANY /*EU_FIRMA*/,
+ EU_FIRSTNAME /*EU_VORNAME*/,
+ EU_NAME /*EU_NAME*/,
+ EU_SHORTCUT /*EU_ABK*/,
+ EU_STREET /*EU_STRASSE*/,
+ EU_COUNTRY /*EU_LAND*/,
+ EU_ZIP /*EU_PLZ*/,
+ EU_CITY /*EU_ORT*/,
+ EU_TITLE /*EU_TITEL*/,
+ EU_POSITION /*EU_POS*/,
EU_PHONE_PRIVATE /*EU_TELPRIV*/,
EU_PHONE_COMPANY /*EU_TELFIRMA*/,
EU_FAX,
@@ -150,9 +150,9 @@ enum SwJumpEditFormat
class SwPageNumberFieldType : public SwFieldType
{
- sal_Int16 nNumberingType;
- USHORT nNum, nMax;
- BOOL bVirtuell;
+ sal_Int16 nNumberingType;
+ USHORT nNum, nMax;
+ BOOL bVirtuell;
public:
SwPageNumberFieldType();
@@ -169,27 +169,27 @@ public:
class SW_DLLPUBLIC SwPageNumberField : public SwField
{
- String sUserStr;
+ String sUserStr;
USHORT nSubType;
- short nOffset;
+ short nOffset;
public:
SwPageNumberField(SwPageNumberFieldType*, USHORT nSub = PG_RANDOM,
sal_uInt32 nFmt = 0, short nOff = 0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
- virtual USHORT GetSubType() const;
+ virtual USHORT GetSubType() const;
// virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
- const String& GetUserString() const { return sUserStr; }
- void SetUserString( const String& rS ) { sUserStr = rS; }
+ const String& GetUserString() const { return sUserStr; }
+ void SetUserString( const String& rS ) { sUserStr = rS; }
};
/*--------------------------------------------------------------------
@@ -201,7 +201,7 @@ class SwAuthorFieldType : public SwFieldType
public:
SwAuthorFieldType();
- String Expand(ULONG) const;
+ String Expand(ULONG) const;
virtual SwFieldType* Copy() const;
};
@@ -211,15 +211,15 @@ public:
class SwAuthorField : public SwField
{
- String aContent;
+ String aContent;
public:
SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline void SetExpansion(const String& rStr) { aContent = rStr; }
+ inline void SetExpansion(const String& rStr) { aContent = rStr; }
inline const String& GetContent() const { return aContent; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
@@ -236,7 +236,7 @@ class SwFileNameFieldType : public SwFieldType
public:
SwFileNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(ULONG) const;
virtual SwFieldType* Copy() const;
};
@@ -251,10 +251,10 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
public:
SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline void SetExpansion(const String& rStr) { aContent = rStr; }
+ inline void SetExpansion(const String& rStr) { aContent = rStr; }
inline const String& GetContent() const { return aContent; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
@@ -271,7 +271,7 @@ class SwTemplNameFieldType : public SwFieldType
public:
SwTemplNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(ULONG) const;
virtual SwFieldType* Copy() const;
};
@@ -284,8 +284,8 @@ class SW_DLLPUBLIC SwTemplNameField : public SwField
public:
SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -297,12 +297,12 @@ public:
class SwDocStatFieldType : public SwFieldType
{
- SwDoc* pDoc;
- sal_Int16 nNumberingType;//com::sun::star::style::NumberingType
+ SwDoc* pDoc;
+ sal_Int16 nNumberingType;//com::sun::star::style::NumberingType
public:
SwDocStatFieldType(SwDoc*);
- String Expand(USHORT nSubType, sal_uInt32 nFmt) const;
+ String Expand(USHORT nSubType, sal_uInt32 nFmt) const;
virtual SwFieldType* Copy() const;
inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; }
@@ -322,11 +322,11 @@ public:
void ChangeExpansion( const SwFrm* pFrm );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nSub);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -343,8 +343,8 @@ public:
virtual SwFieldType* Copy() const;
- void SetHiddenFlag( BOOL bSetHidden = TRUE );
- inline BOOL GetHiddenFlag() const { return bHidden; }
+ void SetHiddenFlag( BOOL bSetHidden = TRUE );
+ inline BOOL GetHiddenFlag() const { return bHidden; }
};
/*--------------------------------------------------------------------
@@ -353,23 +353,23 @@ public:
class SwHiddenTxtField : public SwField
{
- String aTRUETxt; // Text wenn Bedingung TRUE
- String aFALSETxt; // Wenn Bedingung falsch
- String aContent; // Ausgewerteter DB-Text
+ String aTRUETxt; // Text wenn Bedingung TRUE
+ String aFALSETxt; // Wenn Bedingung falsch
+ String aContent; // Ausgewerteter DB-Text
- String aCond; // Bedingung
+ String aCond; // Bedingung
USHORT nSubType;
- BOOL bCanToggle : 1; // kann das Feld einzeln getoggelt werden?
- BOOL bIsHidden : 1; // ist es nicht sichtbar?
- BOOL bValid : 1; // DB-Feld evaluiert?
+ BOOL bCanToggle : 1; // kann das Feld einzeln getoggelt werden?
+ BOOL bIsHidden : 1; // ist es nicht sichtbar?
+ BOOL bValid : 1; // DB-Feld evaluiert?
public:
SwHiddenTxtField( SwHiddenTxtFieldType*,
- BOOL bConditional,
- const String& rCond,
- const String& rTxt,
- BOOL bHidden = FALSE,
+ BOOL bConditional,
+ const String& rCond,
+ const String& rTxt,
+ BOOL bHidden = FALSE,
USHORT nSubType = TYP_HIDDENTXTFLD);
SwHiddenTxtField( SwHiddenTxtFieldType*,
@@ -378,26 +378,26 @@ public:
const String& rFalse,
USHORT nSubType = TYP_HIDDENTXTFLD);
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- void Evaluate(SwDoc*);
+ void Evaluate(SwDoc*);
- inline void SetValue(BOOL bHidden) { bIsHidden = bHidden; }
+ inline void SetValue(BOOL bHidden) { bIsHidden = bHidden; }
String GetColumnName(const String& rName);
- String GetDBName(const String& rName, SwDoc *pDoc);
+ String GetDBName(const String& rName, SwDoc *pDoc);
// Condition
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
virtual const String& GetPar1() const;
// True/False - String
- virtual void SetPar2(const String& rStr);
- virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
- virtual USHORT GetSubType() const;
+ virtual USHORT GetSubType() const;
// virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -421,21 +421,21 @@ public:
class SwHiddenParaField : public SwField
{
- String aCond;
- BOOL bIsHidden:1;
+ String aCond;
+ BOOL bIsHidden:1;
public:
// Direkte Eingabe alten Wert loeschen
SwHiddenParaField(SwHiddenParaFieldType*, const String& rCond);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- void SetHidden(BOOL bHidden) { bIsHidden = bHidden; }
- BOOL IsHidden() const { return bIsHidden; }
+ void SetHidden(BOOL bHidden) { bIsHidden = bHidden; }
+ BOOL IsHidden() const { return bIsHidden; }
// Bedingung erfragen/setzen
virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -462,7 +462,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField
{
String aMacro;
String aText;
- BOOL bIsScriptURL;
+ BOOL bIsScriptURL;
public:
// Direkte Eingabe alten Wert loeschen
@@ -470,21 +470,21 @@ public:
const String& rTxt);
inline const String& GetMacro() const { return aMacro; }
- String GetLibName() const;
- String GetMacroName() const;
- SvxMacro GetSvxMacro() const;
+ String GetLibName() const;
+ String GetMacroName() const;
+ SvxMacro GetSvxMacro() const;
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual String Expand() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
virtual SwField* Copy() const;
// Library und FileName
virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
// Macrotext
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -503,12 +503,12 @@ public:
class SwPostItFieldType : public SwFieldType
{
private:
- SwDoc* mpDoc;
+ SwDoc* mpDoc;
public:
SwPostItFieldType(SwDoc* pDoc);
virtual SwFieldType* Copy() const;
- SwDoc* GetDoc() {return mpDoc;};
+ SwDoc* GetDoc() {return mpDoc;};
};
/*--------------------------------------------------------------------
@@ -517,10 +517,10 @@ public:
class SW_DLLPUBLIC SwPostItField : public SwField
{
- String sTxt; // die Anmerkung
- String sAuthor; // der Author
- DateTime aDateTime; // Datum und Zeit der Anmerkung
- OutlinerParaObject* mpText;
+ String sTxt; // die Anmerkung
+ String sAuthor; // der Author
+ DateTime aDateTime; // Datum und Zeit der Anmerkung
+ OutlinerParaObject* mpText;
SwTextAPIObject* m_pTextObject;
public:
@@ -528,22 +528,22 @@ public:
const String& rAuthor, const String& rTxt, const DateTime& rDate);
~SwPostItField();
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline const Date GetDate() const { return aDateTime.GetDate(); }
- inline const Time GetTime() const { return aDateTime.GetTime(); }
+ inline const Date GetDate() const { return aDateTime.GetDate(); }
+ inline const Time GetTime() const { return aDateTime.GetTime(); }
// Author
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
// Text
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
- const String& GetTxt() const { return sTxt; }
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
+ const String& GetTxt() const { return sTxt; }
- const OutlinerParaObject* GetTextObject() const;
+ const OutlinerParaObject* GetTextObject() const;
void SetTextObject( OutlinerParaObject* pText );
sal_uInt32 GetNumberOfParagraphs() const;
@@ -562,13 +562,13 @@ class SwDocInfoFieldType : public SwValueFieldType
public:
SwDocInfoFieldType(SwDoc* pDc);
- String Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang, const String& rName) const;
+ String Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang, const String& rName) const;
virtual SwFieldType* Copy() const;
};
class SW_DLLPUBLIC SwDocInfoField : public SwValueField
{
- USHORT nSubType;
+ USHORT nSubType;
String aContent;
String aName;
@@ -576,15 +576,15 @@ public:
SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, sal_uInt32 nFmt=0);
SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, const String& rValue, sal_uInt32 nFmt=0);
- virtual void SetSubType(USHORT);
- virtual USHORT GetSubType() const;
- virtual void SetLanguage(USHORT nLng);
- virtual String Expand() const;
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual SwField* Copy() const;
- String GetName() const { return aName; }
+ virtual void SetSubType(USHORT);
+ virtual USHORT GetSubType() const;
+ virtual void SetLanguage(USHORT nLng);
+ virtual String Expand() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual SwField* Copy() const;
+ String GetName() const { return aName; }
void SetName( const String& rName ) { aName = rName; }
- inline void SetExpansion(const String& rStr) { aContent = rStr; }
+ inline void SetExpansion(const String& rStr) { aContent = rStr; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -602,25 +602,25 @@ public:
inline void SetData(const String& rStr) { aData = rStr; }
- String Expand(USHORT nSubType, sal_uInt32 nFormat) const;
+ String Expand(USHORT nSubType, sal_uInt32 nFormat) const;
virtual SwFieldType* Copy() const;
};
class SwExtUserField : public SwField
{
- String aContent;
- USHORT nType;
+ String aContent;
+ USHORT nType;
public:
SwExtUserField(SwExtUserFieldType*, USHORT nSub, sal_uInt32 nFmt=0);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nSub);
- inline void SetExpansion(const String& rStr) { aContent = rStr; }
+ inline void SetExpansion(const String& rStr) { aContent = rStr; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -636,9 +636,9 @@ class SwRefPageSetFieldType : public SwFieldType
public:
SwRefPageSetFieldType();
- virtual SwFieldType* Copy() const;
+ virtual SwFieldType* Copy() const;
// ueberlagert, weil es nichts zum Updaten gibt!
- virtual void Modify( SfxPoolItem *, SfxPoolItem * );
+ virtual void Modify( SfxPoolItem *, SfxPoolItem * );
};
/*--------------------------------------------------------------------
@@ -647,23 +647,23 @@ public:
class SwRefPageSetField : public SwField
{
- short nOffset;
- BOOL bOn;
+ short nOffset;
+ BOOL bOn;
public:
SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0,
BOOL bOn = TRUE );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
- BOOL IsOn() const { return bOn; }
+ BOOL IsOn() const { return bOn; }
- short GetOffset() const { return nOffset; }
- void SetOffset( short nOff ) { nOffset = nOff; }
+ short GetOffset() const { return nOffset; }
+ void SetOffset( short nOff ) { nOffset = nOff; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -674,8 +674,8 @@ public:
class SwRefPageGetFieldType : public SwFieldType
{
- SwDoc* pDoc;
- sal_Int16 nNumberingType;
+ SwDoc* pDoc;
+ sal_Int16 nNumberingType;
void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
@@ -700,10 +700,10 @@ class SwRefPageGetField : public SwField
public:
SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- void SetText( const String& rTxt ) { sTxt = rTxt; }
+ void SetText( const String& rTxt ) { sTxt = rTxt; }
void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
@@ -733,16 +733,16 @@ public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const String& sText, const String& sHelp );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
// Platzhalter-Text
virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
// HinweisText
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
SwCharFmt* GetCharFmt() const
{ return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); }
@@ -769,11 +769,11 @@ public:
class SwScriptField : public SwField
{
- String sType; // Type von Code (Java/VBScript/...)
- String sCode; // der Code als Text
+ String sType; // Type von Code (Java/VBScript/...)
+ String sCode; // der Code als Text
// der Code als JavaCode ?
- BOOL bCodeURL; // Code enthaelt URL eines Scripts
+ BOOL bCodeURL; // Code enthaelt URL eines Scripts
public:
SwScriptField( SwScriptFieldType*, const String& rType,
@@ -781,18 +781,18 @@ public:
virtual String GetDescription() const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
// Type
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
// Text
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
- BOOL IsCodeURL() const { return bCodeURL; }
- void SetCodeURL( BOOL bURL ) { bCodeURL = bURL; }
+ BOOL IsCodeURL() const { return bCodeURL; }
+ void SetCodeURL( BOOL bURL ) { bCodeURL = bURL; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -813,21 +813,21 @@ public:
Beschreibung: Script Field
--------------------------------------------------------------------*/
-#define MAX_COMBINED_CHARACTERS 6
+#define MAX_COMBINED_CHARACTERS 6
class SW_DLLPUBLIC SwCombinedCharField : public SwField
{
- String sCharacters; // combine these characters
+ String sCharacters; // combine these characters
public:
SwCombinedCharField( SwCombinedCharFieldType*, const String& rChars );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
// Characters
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index a5f1e451a434..c37f3d252137 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -2,7 +2,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
@@ -37,8 +37,8 @@ class SwDoc;
class SwDPage : public FmFormPage, public SdrObjUserCall
{
- SdrPageGridFrameList* pGridLst;
- SwDoc& rDoc;
+ SdrPageGridFrameList* pGridLst;
+ SwDoc& rDoc;
public:
SwDPage(SwDrawDocument& rNewModel, BOOL bMasterPage=FALSE);
@@ -57,7 +57,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
};
-#endif // _DPAGE_HXX
+#endif // _DPAGE_HXX
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index f08dbcfdac6c..3aa8220ffb6c 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -2,7 +2,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
@@ -42,8 +42,8 @@ public:
SwDrawDocument( SwDoc* pDoc );
~SwDrawDocument();
- const SwDoc& GetDoc() const { return *pDoc; }
- SwDoc& GetDoc() { return *pDoc; }
+ const SwDoc& GetDoc() const { return *pDoc; }
+ SwDoc& GetDoc() { return *pDoc; }
virtual SdrPage* AllocPage(bool bMasterPage);
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index 9e6eced6fc44..a163c3457b11 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -2,7 +2,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
@@ -64,9 +64,9 @@ public:
// fuers Sortieren
inline int operator==( const SwGlblDocContent& rCmp ) const
- { return GetDocPos() == rCmp.GetDocPos(); }
+ { return GetDocPos() == rCmp.GetDocPos(); }
inline int operator<( const SwGlblDocContent& rCmp ) const
- { return GetDocPos() < rCmp.GetDocPos(); }
+ { return GetDocPos() < rCmp.GetDocPos(); }
};
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index b06c8afe8b73..99477d80e448 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -2,7 +2,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
@@ -55,8 +55,8 @@ struct SwPamRange
{
ULONG nStart, nEnd;
- SwPamRange() : nStart( 0 ), nEnd( 0 ) {}
- SwPamRange( ULONG nS, ULONG nE ) : nStart( nS ), nEnd( nE ) {}
+ SwPamRange() : nStart( 0 ), nEnd( 0 ) {}
+ SwPamRange( ULONG nS, ULONG nE ) : nStart( nS ), nEnd( nE ) {}
BOOL operator==( const SwPamRange& rRg )
{ return nStart == rRg.nStart ? TRUE : FALSE; }
@@ -75,7 +75,7 @@ public:
SwPaM& SetPam( USHORT nArrPos, SwPaM& rPam );
USHORT Count() const
- { return _SwPamRanges::Count(); }
+ { return _SwPamRanges::Count(); }
SwPamRange operator[]( USHORT nPos ) const
{ return _SwPamRanges::operator[](nPos); }
};
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c84d3b24e542..e7c353b7d0b7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <vcl/font.hxx>
#include <editeng/swafopt.hxx>
#include "swdllapi.h"
-#include <crsrsh.hxx> // fuer Basisklasse
+#include <crsrsh.hxx> // fuer Basisklasse
#include <itabenum.hxx>
#include <swdbdata.hxx>
#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
@@ -59,7 +59,7 @@ class SfxPoolItem;
class SfxItemSet;
class SvxAutoCorrect;
-class SwField; // fuer Felder
+class SwField; // fuer Felder
class SwFieldType;
class SwDDEFieldType;
class SwNewDBMgr;
@@ -72,22 +72,22 @@ class SwAutoCompleteWord;
class SwFmtRefMark;
class SwNumRule; // Numerierung
-//class SwNodeNum; // Numerierung
+//class SwNodeNum; // Numerierung
-class SwUndoIds; // fuer Undo
+class SwUndoIds; // fuer Undo
class SwTxtFmtColl;
class SwGrfNode;
class SwFlyFrmFmt;
-class SwFrmFmt; // fuer GetTxtNodeFmts()
+class SwFrmFmt; // fuer GetTxtNodeFmts()
class SwCharFmt;
class SwExtTextInput;
class SwRootFrm; // fuer CTOR
-class Graphic; // fuer GetGraphic
-class GraphicObject; // fuer GetGraphicObj
-class SwFmtINetFmt; // InsertURL
+class Graphic; // fuer GetGraphic
+class GraphicObject; // fuer GetGraphicObj
+class SwFmtINetFmt; // InsertURL
class SwTable;
-class SwTextBlocks; // fuer GlossaryRW
+class SwTextBlocks; // fuer GlossaryRW
class SwFmtFtn;
class SwSection;
class SwSectionData;
@@ -125,11 +125,11 @@ class LinkManager;
}
#define GETSELTXT_PARABRK_TO_BLANK 0
-#define GETSELTXT_PARABRK_KEEP 1
-#define GETSELTXT_PARABRK_TO_ONLYCR 2
+#define GETSELTXT_PARABRK_KEEP 1
+#define GETSELTXT_PARABRK_TO_ONLYCR 2
/****************************************************************
- * zum Abfragen der INet-Attribute fuer den Navigator
+ * zum Abfragen der INet-Attribute fuer den Navigator
****************************************************************/
struct SwGetINetAttr
{
@@ -143,15 +143,15 @@ struct SwGetINetAttr
SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 )
/****************************************************************
- * Typen der Inhaltsformen
+ * Typen der Inhaltsformen
****************************************************************/
-#define CNT_TXT 0x0001
-#define CNT_GRF 0x0002
-#define CNT_OLE 0x0010
+#define CNT_TXT 0x0001
+#define CNT_GRF 0x0002
+#define CNT_OLE 0x0010
/* Teste einen USHORT auf eine bestimmte Inhaltsform */
-#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
-#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
-#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
+#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
+#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
+#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
{
@@ -188,9 +188,9 @@ public:
// Ersetz einen selektierten Bereich in einem TextNode mit dem
// String. Ist fuers Suchen&Ersetzen gedacht.
// bRegExpRplc - ersetze Tabs (\\t) und setze den gefundenen String
- // ein ( nicht \& )
- // z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
- // --> "xx\t<Tab>..zzz..&"
+ // ein ( nicht \& )
+ // z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
+ // --> "xx\t<Tab>..zzz..&"
BOOL Replace( const String& rNewStr, BOOL bRegExpRplc = FALSE );
// loescht den Inhalt aller Bereiche;
@@ -224,9 +224,9 @@ public:
long Copy( SwEditShell* pDestShell = 0 );
// fuers Kopieren uebers ClipBoard:
- // wird Tabelle in Tabelle kopiert, verschiebe aus dieser dann
- // alle Cursor. Copy und Paste muss aufgrund der FlyFrames in
- // der FEShell stehen!
+ // wird Tabelle in Tabelle kopiert, verschiebe aus dieser dann
+ // alle Cursor. Copy und Paste muss aufgrund der FlyFrames in
+ // der FEShell stehen!
// kopiere alle Selectionen und das Doc
//JP 21.10.96: und fuer die SVX-Autokorrektur
BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
@@ -292,12 +292,12 @@ public:
/* Formatcollections, neu */
/* GetXXXCount() liefert die Anzahl der im Dokument vorhandenen XXX
- * GetXXX(i) liefert das i-te XXX (ERR_RAISE bei Ueberindizierung!)
- * DelXXX(i) loescht das i-te XXX (ERR_RAISE bei Ueberindizierung!)
- * GetCurXXX() liefert das am Cursor oder in den Bereichen
- * geltende XXX (0, wenn nicht eindeutig!)
- * SetXXX() setzt am Cursor oder in den Bereichen das XXX
- * MakeXXX() macht ein XXX, abgeleitet vom pDerivedFrom
+ * GetXXX(i) liefert das i-te XXX (ERR_RAISE bei Ueberindizierung!)
+ * DelXXX(i) loescht das i-te XXX (ERR_RAISE bei Ueberindizierung!)
+ * GetCurXXX() liefert das am Cursor oder in den Bereichen
+ * geltende XXX (0, wenn nicht eindeutig!)
+ * SetXXX() setzt am Cursor oder in den Bereichen das XXX
+ * MakeXXX() macht ein XXX, abgeleitet vom pDerivedFrom
*/
// TXT
@@ -336,7 +336,7 @@ public:
void Insert2(SwField&, const bool bForceExpandHints = false);
SwField* GetCurFld() const;
- void UpdateFlds( SwField & ); // ein einzelnes Feld
+ void UpdateFlds( SwField & ); // ein einzelnes Feld
USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
SwFieldType* GetFldType(USHORT nId, USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
@@ -385,41 +385,41 @@ public:
void UpdateDocStat( SwDocStat& rStat );
// Verzeichnismarke einfuegen loeschen
- void Insert(const SwTOXMark& rMark);
- void DeleteTOXMark(SwTOXMark* pMark);
+ void Insert(const SwTOXMark& rMark);
+ void DeleteTOXMark(SwTOXMark* pMark);
// Alle Markierungen am aktuellen SPoint ermitteln
- USHORT GetCurTOXMarks(SwTOXMarks& rMarks) const ;
+ USHORT GetCurTOXMarks(SwTOXMarks& rMarks) const ;
// Verzeichnis einfuegen, und bei Bedarf erneuern
- void InsertTableOf(const SwTOXBase& rTOX,
+ void InsertTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
- BOOL UpdateTableOf(const SwTOXBase& rTOX,
+ BOOL UpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
- const SwTOXBase* GetCurTOX() const;
- const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate = FALSE );
- void SetDefaultTOXBase(const SwTOXBase& rBase);
+ const SwTOXBase* GetCurTOX() const;
+ const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate = FALSE );
+ void SetDefaultTOXBase(const SwTOXBase& rBase);
- BOOL IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
- void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly);
+ BOOL IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
+ void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly);
- USHORT GetTOXCount() const;
- const SwTOXBase* GetTOX( USHORT nPos ) const;
- BOOL DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes = FALSE );
+ USHORT GetTOXCount() const;
+ const SwTOXBase* GetTOX( USHORT nPos ) const;
+ BOOL DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes = FALSE );
// nach einlesen einer Datei alle Verzeichnisse updaten
void SetUpdateTOX( BOOL bFlag = TRUE );
BOOL IsUpdateTOX() const;
// Verzeichnis-Typen verwalten
- USHORT GetTOXTypeCount(TOXTypes eTyp) const;
- const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const;
- void InsertTOXType(const SwTOXType& rTyp);
+ USHORT GetTOXTypeCount(TOXTypes eTyp) const;
+ const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const;
+ void InsertTOXType(const SwTOXType& rTyp);
//AutoMark file
- const String& GetTOIAutoMarkURL() const;
- void SetTOIAutoMarkURL(const String& rSet);
- void ApplyAutoMark();
+ const String& GetTOIAutoMarkURL() const;
+ void SetTOIAutoMarkURL(const String& rSet);
+ void ApplyAutoMark();
// Schluessel fuer die Indexverwaltung
USHORT GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
@@ -650,7 +650,7 @@ public:
//Updaten der Inhalte aller Charts zu der Tabelle mit dem angegeben Namen
void UpdateCharts( const String &rName );
- // aktuelles Wort erfragen
+ // aktuelles Wort erfragen
String GetCurWord();
// Textbaustein aus dem Textbausteindokument in
@@ -772,8 +772,8 @@ public:
// returne zum Namen die im Doc gesetzte Referenz
const SwFmtRefMark* GetRefMark( const String& rName ) const;
// returne die Namen aller im Doc gesetzten Referenzen
- // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
- // gesetzt ist
+ // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
+ // gesetzt ist
USHORT GetRefMarks( SvStringsDtor* = 0 ) const;
// rufe die Autokorrektur auf
@@ -809,7 +809,7 @@ public:
BOOL GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
bool SetCurFtn( const SwFmtFtn& rFillFtn );
bool HasFtns( bool bEndNotes = false ) const;
-//z.Zt nicht benoetigt USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const;
+//z.Zt nicht benoetigt USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const;
// gebe Liste aller Fussnoten und deren Anfangstexte
USHORT GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
@@ -867,7 +867,7 @@ public:
// Numberformatter vom Doc erfragen
SvNumberFormatter* GetNumberFormatter();
const SvNumberFormatter* GetNumberFormatter() const
- { return ((SwEditShell*)this)->GetNumberFormatter(); }
+ { return ((SwEditShell*)this)->GetNumberFormatter(); }
// Schnitstellen fuers GlobalDokument
BOOL IsGlobalDoc() const;
@@ -928,7 +928,7 @@ public:
// von japanischen/chinesischen Zeichen)
SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage);
String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE);
-// SwExtTextInput* GetExtTextInput() const;
+// SwExtTextInput* GetExtTextInput() const;
void SetExtTextInputData( const CommandExtTextInputData& );
// Schnistelle fuer den Zugriff auf die AutoComplete-Liste
@@ -959,7 +959,7 @@ inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
}
inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
-{ return ((SwEditShell*)this)->GetLinkManager(); }
+{ return ((SwEditShell*)this)->GetLinkManager(); }
/*
* Klasse fuer den automatisierten Aufruf von Start- und
@@ -972,7 +972,7 @@ public:
~SwActKontext();
};
-#define ACT_KONTEXT(x) SwActKontext _aActKontext_(x)
+#define ACT_KONTEXT(x) SwActKontext _aActKontext_(x)
/*
* Klasse fuer den automatisierten Aufruf von Start- und
@@ -985,7 +985,7 @@ public:
~SwMvKontext();
};
-#define MV_KONTEXT(x) SwMvKontext _aMvKontext_(x)
+#define MV_KONTEXT(x) SwMvKontext _aMvKontext_(x)
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index bc54ac9a626c..29a42485f1d8 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -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
@@ -79,8 +79,8 @@
#define STR_BTN_NEWDOC (RC_ENVLOP_BEGIN + 65)
#define STR_SENDER_TOKENS (RC_ENVLOP_BEGIN + 66)
-#define RC_ENVPRT_HC_BEGIN (RC_ENVLOP_BEGIN + 70)
-#define RC_ENVPRT_HC_END (RC_ENVLOP_BEGIN + 82)
+#define RC_ENVPRT_HC_BEGIN (RC_ENVLOP_BEGIN + 70)
+#define RC_ENVPRT_HC_END (RC_ENVLOP_BEGIN + 82)
// Ueberlaufpruefung ----------------------------------------------------------
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
index 20e734966523..1b89d0aa846b 100644
--- a/sw/inc/errhdl.hxx
+++ b/sw/inc/errhdl.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <sal/types.h>
#include "swdllapi.h"
-extern BOOL bAssert; // TRUE, wenn eine ASSERT Box hochkam
+extern BOOL bAssert; // TRUE, wenn eine ASSERT Box hochkam
// -----------------------------------------------------------------------
@@ -50,7 +50,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char* );
// -----------------------------------------------------------------------
#define ASSERT_ID( cond, id ) \
if( !(cond) ) { \
- const char *_pFileName = __FILE__; \
+ const char *_pFileName = __FILE__; \
::AssertFail( (USHORT)id, _pFileName ); \
}
@@ -60,7 +60,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char* );
// ignoriert
// -----------------------------------------------------------------------
#else
-#define ASSERT_ID( cond, id ) ;
+#define ASSERT_ID( cond, id ) ;
#endif // PRODUCT
diff --git a/sw/inc/error.h b/sw/inc/error.h
index 004d40cb885a..7ca8f71674bf 100644
--- a/sw/inc/error.h
+++ b/sw/inc/error.h
@@ -2,7 +2,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
@@ -32,19 +32,19 @@
#define ERR_SWGBASE 25000
/*** Error Codes **********************************************************/
-#define ERR_VAR_IDX (ERR_SWGBASE+ 0)
-#define ERR_OUTOFSCOPE (ERR_SWGBASE+ 1)
+#define ERR_VAR_IDX (ERR_SWGBASE+ 0)
+#define ERR_OUTOFSCOPE (ERR_SWGBASE+ 1)
/* Error Codes fuer Numerierungsregeln */
-#define ERR_NUMLEVEL (ERR_SWGBASE+ 2)
+#define ERR_NUMLEVEL (ERR_SWGBASE+ 2)
/* Error Codes fuer TxtNode */
-#define ERR_NOHINTS (ERR_SWGBASE+ 3)
+#define ERR_NOHINTS (ERR_SWGBASE+ 3)
// von _START bis _END sind in der COREDL.DLL entsprechende Strings
// abgelegt, die erfragt werden koennen.
-#define ERR_SWGMSG_START (ERR_VAR_IDX)
-#define ERR_SWGMSG_END (ERR_NOHINTS)
+#define ERR_SWGMSG_START (ERR_VAR_IDX)
+#define ERR_SWGMSG_END (ERR_NOHINTS)
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 8ad32b06ab70..cbcea3de98d5 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class _SetGetExpFlds;
class SwEditShell;
// Vorwaertsdeklaration: besorge den "Body-TextNode", fuer Exp.Fld in Fly's
-// Header/Footers/Footnodes
+// Header/Footers/Footnodes
const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
const SwFrm& rFrm );
// Wandlung Address -> Adressen
@@ -64,7 +64,7 @@ SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10, 10 )
class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList
{
public:
- SwSeqFldList() : _SwSeqFldList( 10, 10 ) {}
+ SwSeqFldList() : _SwSeqFldList( 10, 10 ) {}
BOOL InsertSort( _SeqFldLstElem* );
BOOL SeekEntry( const _SeqFldLstElem& , USHORT* pPos = 0 );
@@ -93,54 +93,54 @@ public:
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
{
- String sExpand;
- BOOL bIsInBodyTxt;
- USHORT nSubType;
+ String sExpand;
+ BOOL bIsInBodyTxt;
+ USHORT nSubType;
- bool bLateInitialization; // #i82544#
+ bool bLateInitialization; // #i82544#
public:
SwGetExpField( SwGetExpFieldType*, const String& rFormel,
USHORT nSubType = nsSwGetSetExpType::GSE_EXPR, ULONG nFmt = 0);
- virtual void SetValue( const double& rVal );
- virtual void SetLanguage(USHORT nLng);
+ virtual void SetValue( const double& rVal );
+ virtual void SetLanguage(USHORT nLng);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline const String& GetExpStr() const;
- inline void ChgExpStr(const String& rExpand);
+ inline const String& GetExpStr() const;
+ inline void ChgExpStr(const String& rExpand);
// wird von der Formatierung abgefragt
- inline BOOL IsInBodyTxt() const;
+ inline BOOL IsInBodyTxt() const;
// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
- inline void ChgBodyTxtFlag( BOOL bIsInBody );
+ inline void ChgBodyTxtFlag( BOOL bIsInBody );
// fuer Felder in Header/Footer/Footnotes/Flys:
// (wird nur von der Formatierung aufgerufen!!)
- void ChangeExpansion( const SwFrm&, const SwTxtFld& );
+ void ChangeExpansion( const SwFrm&, const SwTxtFld& );
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
// Die Formel aendern
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nType);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
- static USHORT GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc);
- // #i82544#
- void SetLateInitialization() { bLateInitialization = true;}
+ static USHORT GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc);
+ // #i82544#
+ void SetLateInitialization() { bLateInitialization = true;}
};
inline void SwGetExpField::ChgExpStr(const String& rExpand)
{ sExpand = rExpand;}
inline const String& SwGetExpField::GetExpStr() const
- { return sExpand; }
+ { return sExpand; }
// wird von der Formatierung abgefragt
inline BOOL SwGetExpField::IsInBodyTxt() const
@@ -159,33 +159,33 @@ class SwSetExpField;
class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
{
- String sName;
+ String sName;
const SwNode* pOutlChgNd;
-// sal_Unicode cDelim;
- String sDelim;
- USHORT nType;
- BYTE nLevel;
- BOOL bDeleted;
+// sal_Unicode cDelim;
+ String sDelim;
+ USHORT nType;
+ BYTE nLevel;
+ BOOL bDeleted;
public:
SwSetExpFieldType( SwDoc* pDoc, const String& rName,
USHORT nType = nsSwGetSetExpType::GSE_EXPR );
virtual SwFieldType* Copy() const;
- virtual const String& GetName() const;
+ virtual const String& GetName() const;
- inline void SetType(USHORT nTyp);
- inline USHORT GetType() const;
+ inline void SetType(USHORT nTyp);
+ inline USHORT GetType() const;
- void SetSeqFormat(ULONG nFormat);
- ULONG GetSeqFormat();
+ void SetSeqFormat(ULONG nFormat);
+ ULONG GetSeqFormat();
- BOOL IsDeleted() const { return bDeleted; }
- void SetDeleted( BOOL b ) { bDeleted = b; }
+ BOOL IsDeleted() const { return bDeleted; }
+ void SetDeleted( BOOL b ) { bDeleted = b; }
// ueberlagert, weil das Set-Field selbst dafuer sorgt, das
// es aktualisiert wird.
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
- inline const String& GetSetRefName() const;
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
+ inline const String& GetSetRefName() const;
USHORT SetSeqRefNo( SwSetExpField& rFld );
@@ -193,17 +193,17 @@ public:
String MakeSeqName( USHORT nSeqNo );
// Seqencefelder ggfs. Kapitelweise numerieren
-// sal_Unicode GetDelimiter() const { return cDelim; }
-// void SetDelimiter( sal_Unicode c ) { cDelim = c; }
- const String& GetDelimiter() const { return sDelim; }
- void SetDelimiter( const String& s ) { sDelim = s; }
- BYTE GetOutlineLvl() const { return nLevel; }
- void SetOutlineLvl( BYTE n ) { nLevel = n; }
+// sal_Unicode GetDelimiter() const { return cDelim; }
+// void SetDelimiter( sal_Unicode c ) { cDelim = c; }
+ const String& GetDelimiter() const { return sDelim; }
+ void SetDelimiter( const String& s ) { sDelim = s; }
+ BYTE GetOutlineLvl() const { return nLevel; }
+ void SetOutlineLvl( BYTE n ) { nLevel = n; }
void SetChapter( SwSetExpField& rFld, const SwNode& rNd );
// Member nur fuers SwDoc::UpdateExpFld - wird nur waehrend der Laufzeit
// von SequencefeldTypen benoetigt!!!
- const SwNode* GetOutlineChgNd() const { return pOutlChgNd; }
- void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
+ const SwNode* GetOutlineChgNd() const { return pOutlChgNd; }
+ void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
@@ -216,7 +216,7 @@ inline void SwSetExpFieldType::SetType( USHORT nTyp )
}
inline USHORT SwSetExpFieldType::GetType() const
- { return nType; }
+ { return nType; }
inline const String& SwSetExpFieldType::GetSetRefName() const
{ return sName; }
@@ -228,67 +228,67 @@ inline const String& SwSetExpFieldType::GetSetRefName() const
class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
{
- String sExpand;
- String aPText;
- String aSeqText;
- BOOL bInput;
- USHORT nSeqNo;
- USHORT nSubType;
+ String sExpand;
+ String aPText;
+ String aSeqText;
+ BOOL bInput;
+ USHORT nSeqNo;
+ USHORT nSubType;
public:
SwSetExpField(SwSetExpFieldType*, const String& rFormel, ULONG nFmt = 0);
- virtual void SetValue( const double& rVal );
+ virtual void SetValue( const double& rVal );
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- inline const String& GetExpStr() const;
+ inline const String& GetExpStr() const;
- inline void ChgExpStr( const String& rExpand );
+ inline void ChgExpStr( const String& rExpand );
- inline void SetPromptText(const String& rStr);
- inline const String& GetPromptText() const;
+ inline void SetPromptText(const String& rStr);
+ inline const String& GetPromptText() const;
- inline void SetInputFlag(BOOL bInp);
- inline BOOL GetInputFlag() const;
+ inline void SetInputFlag(BOOL bInp);
+ inline BOOL GetInputFlag() const;
virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nType);
- inline BOOL IsSequenceFld() const;
+ inline BOOL IsSequenceFld() const;
// fuer SequenceFelder - logische Nummer
- inline void SetSeqNumber( USHORT n ) { nSeqNo = n; }
- inline USHORT GetSeqNumber() const { return nSeqNo; }
+ inline void SetSeqNumber( USHORT n ) { nSeqNo = n; }
+ inline USHORT GetSeqNumber() const { return nSeqNo; }
// Der Name nur erfragen
- virtual const String& GetPar1() const;
+ virtual const String& GetPar1() const;
// Die Formel
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
inline const String& SwSetExpField::GetExpStr() const
- { return sExpand; }
+ { return sExpand; }
inline void SwSetExpField::ChgExpStr( const String& rExpand )
- { sExpand = rExpand; }
+ { sExpand = rExpand; }
inline void SwSetExpField::SetPromptText(const String& rStr)
- { aPText = rStr; }
+ { aPText = rStr; }
inline const String& SwSetExpField::GetPromptText() const
- { return aPText; }
+ { return aPText; }
inline void SwSetExpField::SetInputFlag(BOOL bInp)
{ bInput = bInp; }
-inline BOOL SwSetExpField::GetInputFlag() const
+inline BOOL SwSetExpField::GetInputFlag() const
{ return bInput; }
inline BOOL SwSetExpField::IsSequenceFld() const
@@ -316,7 +316,7 @@ public:
class SW_DLLPUBLIC SwInputField : public SwField
{
String aContent;
- String aPText;
+ String aPText;
String aHelp;
String aToolTip;
USHORT nSubType;
@@ -326,17 +326,17 @@ public:
const String& rPrompt, USHORT nSubType = 0,
ULONG nFmt = 0);
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
// Content
- virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual const String& GetPar1() const;
+ virtual void SetPar1(const String& rStr);
// aPromptText
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
virtual String GetHelp() const;
virtual void SetHelp(const String & rStr);
@@ -346,8 +346,8 @@ public:
virtual BOOL isFormField() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nSub);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
@@ -362,25 +362,25 @@ public:
SwInputFieldList( SwEditShell* pShell, BOOL bBuildTmpLst = FALSE );
~SwInputFieldList();
- USHORT Count() const;
+ USHORT Count() const;
SwField* GetField(USHORT nId);
- void GotoFieldPos(USHORT nId);
- void PushCrsr();
- void PopCrsr();
+ void GotoFieldPos(USHORT nId);
+ void PushCrsr();
+ void PopCrsr();
// vergleiche TmpLst mit akt Feldern. Alle neue kommen in die SortLst
// damit sie geupdatet werden koennen. Returnt die Anzahl.
// (Fuer Textbausteine: nur seine Input-Felder aktualisieren)
- USHORT BuildSortLst();
+ USHORT BuildSortLst();
// Alle unselektierten Felder aus Liste entfernen
- void RemoveUnselectedFlds();
+ void RemoveUnselectedFlds();
private:
- SwEditShell* pSh;
- _SetGetExpFlds* pSrtLst;
- SvPtrarr aTmpLst;
+ SwEditShell* pSh;
+ _SetGetExpFlds* pSrtLst;
+ SvPtrarr aTmpLst;
};
/*--------------------------------------------------------------------
@@ -398,13 +398,13 @@ public:
// MSC will den hier nicht
//typedef void (SwField:: *FnScanFormel)( const SwTable&, String&,
-// String&, String* = 0, void* = 0 );
+// String&, String* = 0, void* = 0 );
class SwTblField : public SwValueField, public SwTableFormula
{
- String sExpand;
- USHORT nSubType;
+ String sExpand;
+ USHORT nSubType;
// suche den TextNode, in dem das Feld steht
virtual const SwNode* GetNodeOfFormula() const;
@@ -413,22 +413,22 @@ public:
SwTblField( SwTblFieldType*, const String& rFormel,
USHORT nSubType = 0, ULONG nFmt = 0);
- virtual void SetValue( const double& rVal );
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual void SetValue( const double& rVal );
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nType);
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- const String& GetExpStr() const { return sExpand; }
- void ChgExpStr(const String& rStr) { sExpand = rStr; }
+ const String& GetExpStr() const { return sExpand; }
+ void ChgExpStr(const String& rStr) { sExpand = rStr; }
// berechne sich selbst
- void CalcField( SwTblCalcPara& rCalcPara );
+ void CalcField( SwTblCalcPara& rCalcPara );
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
// Die Formel
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
};
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index d3fe1ffe32cd..4ad5af8d2f5a 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -2,7 +2,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
@@ -49,13 +49,13 @@ public:
virtual ~SwExtTextInput();
void SetInputData( const CommandExtTextInputData& rData );
- const SvUShorts& GetAttrs() const { return aAttrs; }
+ const SvUShorts& GetAttrs() const { return aAttrs; }
void SetInsText( BOOL bFlag ) { bInsText = bFlag; }
- BOOL IsOverwriteCursor() const { return bIsOverwriteCursor; }
+ BOOL IsOverwriteCursor() const { return bIsOverwriteCursor; }
void SetOverwriteCursor( BOOL bFlag );
void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;}
};
-#endif //_EXTINPUT_HXX
+#endif //_EXTINPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 3f1bc140dae0..ea647115fd84 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient
{
friend class SwTxtCharFmt;
- SwTxtCharFmt* pTxtAttr; // mein TextAttribut
+ SwTxtCharFmt* pTxtAttr; // mein TextAttribut
public:
SwFmtCharFmt() : pTxtAttr(0) {}
@@ -63,19 +63,19 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
// an das SwTxtCharFmt weiterleiten (vom SwClient)
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
- virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
+ virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 80e4deed29ad..aed33cdec1e2 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -72,46 +72,46 @@ namespace svx
// return values for GetFrmType() und GetSelFrmType().
//! values can be combined via logival or
-#define FRMTYPE_NONE (USHORT) 0
-#define FRMTYPE_PAGE (USHORT) 1
-#define FRMTYPE_HEADER (USHORT) 2
-#define FRMTYPE_FOOTER (USHORT) 4
-#define FRMTYPE_BODY (USHORT) 8
-#define FRMTYPE_COLUMN (USHORT) 16
-#define FRMTYPE_TABLE (USHORT) 32
-#define FRMTYPE_FLY_FREE (USHORT) 64
-#define FRMTYPE_FLY_ATCNT (USHORT) 128
-#define FRMTYPE_FLY_INCNT (USHORT) 256
-#define FRMTYPE_FOOTNOTE (USHORT) 512
-#define FRMTYPE_FTNPAGE (USHORT) 1024
-#define FRMTYPE_FLY_ANY (USHORT) 2048
-#define FRMTYPE_DRAWOBJ (USHORT) 4096
-#define FRMTYPE_COLSECT (USHORT) 8192
-#define FRMTYPE_COLSECTOUTTAB (USHORT) 16384
+#define FRMTYPE_NONE (USHORT) 0
+#define FRMTYPE_PAGE (USHORT) 1
+#define FRMTYPE_HEADER (USHORT) 2
+#define FRMTYPE_FOOTER (USHORT) 4
+#define FRMTYPE_BODY (USHORT) 8
+#define FRMTYPE_COLUMN (USHORT) 16
+#define FRMTYPE_TABLE (USHORT) 32
+#define FRMTYPE_FLY_FREE (USHORT) 64
+#define FRMTYPE_FLY_ATCNT (USHORT) 128
+#define FRMTYPE_FLY_INCNT (USHORT) 256
+#define FRMTYPE_FOOTNOTE (USHORT) 512
+#define FRMTYPE_FTNPAGE (USHORT) 1024
+#define FRMTYPE_FLY_ANY (USHORT) 2048
+#define FRMTYPE_DRAWOBJ (USHORT) 4096
+#define FRMTYPE_COLSECT (USHORT) 8192
+#define FRMTYPE_COLSECTOUTTAB (USHORT) 16384
#define FRMTYPE_ANYCOLSECT ( FRMTYPE_COLSECT | FRMTYPE_COLSECTOUTTAB )
//! values can be combined via logival or
-#define GOTOOBJ_DRAW_CONTROL (USHORT) 1
-#define GOTOOBJ_DRAW_SIMPLE (USHORT) 2
-#define GOTOOBJ_DRAW_ANY (USHORT) 3
-#define GOTOOBJ_FLY_FRM (USHORT) 4
-#define GOTOOBJ_FLY_GRF (USHORT) 8
-#define GOTOOBJ_FLY_OLE (USHORT) 16
-#define GOTOOBJ_FLY_ANY (USHORT) 28
-#define GOTOOBJ_GOTO_ANY (USHORT) 31
+#define GOTOOBJ_DRAW_CONTROL (USHORT) 1
+#define GOTOOBJ_DRAW_SIMPLE (USHORT) 2
+#define GOTOOBJ_DRAW_ANY (USHORT) 3
+#define GOTOOBJ_FLY_FRM (USHORT) 4
+#define GOTOOBJ_FLY_GRF (USHORT) 8
+#define GOTOOBJ_FLY_OLE (USHORT) 16
+#define GOTOOBJ_FLY_ANY (USHORT) 28
+#define GOTOOBJ_GOTO_ANY (USHORT) 31
//! values can be combined via logival or
-#define FLYPROTECT_CONTENT (USHORT) 1 // kann verodert werden!
-#define FLYPROTECT_SIZE (USHORT) 2
-#define FLYPROTECT_POS (USHORT) 4
-#define FLYPROTECT_PARENT (USHORT) 8 // nur Parents untersuchen
-#define FLYPROTECT_FIXED (USHORT) 16 // nur nicht aufhebbarer Schutz
+#define FLYPROTECT_CONTENT (USHORT) 1 // kann verodert werden!
+#define FLYPROTECT_SIZE (USHORT) 2
+#define FLYPROTECT_POS (USHORT) 4
+#define FLYPROTECT_PARENT (USHORT) 8 // nur Parents untersuchen
+#define FLYPROTECT_FIXED (USHORT) 16 // nur nicht aufhebbarer Schutz
// z.B. durch OLE-Server, gilt auch
// fuer Dialog
-enum ObjCntType //Fuer das Ermitteln des Cntnts per Positon (D&D)
+enum ObjCntType //Fuer das Ermitteln des Cntnts per Positon (D&D)
{
OBJCNT_NONE,
OBJCNT_FLY,
@@ -122,25 +122,25 @@ enum ObjCntType //Fuer das Ermitteln des Cntnts per Positon (D&D)
OBJCNT_URLBUTTON,
OBJCNT_GROUPOBJ,
- OBJCNT_DONTCARE // nicht bestimmbar - unterschiedliche Objecte selektiert
+ OBJCNT_DONTCARE // nicht bestimmbar - unterschiedliche Objecte selektiert
};
//fuer GetAnyCurRect
enum CurRectType
{
- RECT_PAGE, //Rect der aktuellen Seite.
- RECT_PAGE_CALC, //... Seite wird ggf. Formatiert
+ RECT_PAGE, //Rect der aktuellen Seite.
+ RECT_PAGE_CALC, //... Seite wird ggf. Formatiert
RECT_PAGE_PRT, //Rect der aktuellen PrtArea der Seite
RECT_FRM, //Rect des aktuellen Rahmen
RECT_FLY_EMBEDDED, //Rect des aktuellen FlyFrm
RECT_FLY_PRT_EMBEDDED, //Rect der PrtArea des FlyFrm
- RECT_SECTION, //Rect des aktuellen Bereichs
- RECT_OUTTABSECTION, //Rect des aktuellen Bereichs,
+ RECT_SECTION, //Rect des aktuellen Bereichs
+ RECT_OUTTABSECTION, //Rect des aktuellen Bereichs,
// aber ausserhalb der Tabelle
- RECT_SECTION_PRT, //Rect der aktuellen PrtArea des Bereichs
- RECT_OUTTABSECTION_PRT, //Rect der aktuellen PrtArea des Bereichs,
+ RECT_SECTION_PRT, //Rect der aktuellen PrtArea des Bereichs
+ RECT_OUTTABSECTION_PRT, //Rect der aktuellen PrtArea des Bereichs,
// aber ausserhalb der Tabelle
- RECT_HEADERFOOTER, //Rect des aktuellen Headers/Footer
+ RECT_HEADERFOOTER, //Rect des aktuellen Headers/Footer
RECT_HEADERFOOTER_PRT, //Rect der PrtArea des aktuellen Headers/Footers
RECT_PAGES_AREA //Rect covering the pages area
@@ -153,9 +153,9 @@ struct SwGetCurColNumPara
SwGetCurColNumPara() : pFrmFmt( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
};
-#define SW_PASTESDR_INSERT 1
-#define SW_PASTESDR_REPLACE 2
-#define SW_PASTESDR_SETATTR 3
+#define SW_PASTESDR_INSERT 1
+#define SW_PASTESDR_REPLACE 2
+#define SW_PASTESDR_SETATTR 3
#define SW_ADD_SELECT 1
#define SW_ENTER_GROUP 2
@@ -259,14 +259,14 @@ public:
void DelSelectedObj();
//Selektion nach oben unten bewegen (Z-Order).
- //TRUE == ganz nach oben/unten
+ //TRUE == ganz nach oben/unten
//FALSE == einen ueberholen
void SelectionToTop ( BOOL bTop = TRUE );
void SelectionToBottom( BOOL bBottom = TRUE );
- short GetLayerId() const; //1 Heaven, 0 Hell, -1 Uneindeutig
- void SelectionToHeaven(); //Ueber dem Dokument
- void SelectionToHell(); //Unter dem Dokument
+ short GetLayerId() const; //1 Heaven, 0 Hell, -1 Uneindeutig
+ void SelectionToHeaven(); //Ueber dem Dokument
+ void SelectionToHell(); //Unter dem Dokument
// folgende zwei Methoden returnen den enum SdrHdlKind, um sich ein
// includen von SVDRAW.HXX zu ersparen als int deklariert.
@@ -291,7 +291,7 @@ public:
// Obgleich (0,TRUE) eine Art Standard ist, sind die Parameter nicht defaultet, damit
// bei jeder Benutzung insbesondere das bStopAtFly bewusst genutzt wird.
USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
- USHORT GetSelFrmType() const; //Selektion (Drawing)
+ USHORT GetSelFrmType() const; //Selektion (Drawing)
/** #108784# check whether selected frame contains a control;
* companion method to GetSelFrmType, used for preventing
@@ -324,14 +324,14 @@ public:
void SetObjRect( const SwRect& rRect );
long BeginDrag( const Point *pPt, BOOL bProp );
- long Drag ( const Point *pPt, BOOL bProp );
+ long Drag ( const Point *pPt, BOOL bProp );
long EndDrag ( const Point *pPt, BOOL bProp );
void BreakDrag();
//Methoden fuer die Statuszeile.
- Point GetAnchorObjDiff() const; //Abstand zum Anker
- Point GetObjAbsPos() const; //Absolute Position
- Size GetObjSize() const; //Groesse, ggf. die umschliessende
+ Point GetAnchorObjDiff() const; //Abstand zum Anker
+ Point GetObjAbsPos() const; //Absolute Position
+ Size GetObjSize() const; //Groesse, ggf. die umschliessende
//SS fuer die BriefUmschlaege: hole alle Seitengebundenen Objekte
//und setze diese auf eine neue Seite.
@@ -376,8 +376,8 @@ public:
// determines whether a frame or its environment is vertically formatted and right-to-left
BOOL IsFrmVertical(BOOL bEnvironment, BOOL& bRightToLeft) const;
- SwFrmFmt* GetCurFrmFmt() const; //Wenn Rahmen, dann Rahmenvorlage, sonst 0
- void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen
+ SwFrmFmt* GetCurFrmFmt() const; //Wenn Rahmen, dann Rahmenvorlage, sonst 0
+ void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen
const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
// finde/loeschen den Fly, in dem der Cursor steht
@@ -429,8 +429,8 @@ public:
void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
// check resize of OLE-Object
- BOOL IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; }
- void SetCheckForOLEInCaption( BOOL bFlag ) { bCheckForOLEInCaption = bFlag; }
+ BOOL IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; }
+ void SetCheckForOLEInCaption( BOOL bFlag ) { bCheckForOLEInCaption = bFlag; }
// setze am selektierten FlyFrame einen Namen
void SetFlyName( const String& rName );
@@ -476,11 +476,11 @@ public:
//Setzen vom DragMode (z.B. Rotate), tut nix bei Rahmenselektion.
void SetDragMode( UINT16 eSdrDragMode );
- USHORT IsObjSelected() const; //Liefert gleich die Anzahl der Objekte,
+ USHORT IsObjSelected() const; //Liefert gleich die Anzahl der Objekte,
//zaehlt aber nicht die Objekte in Gruppen.
sal_Bool IsObjSelected( const SdrObject& rObj ) const;
- void EndTextEdit(); //Loescht ggf. das Objekt.
+ void EndTextEdit(); //Loescht ggf. das Objekt.
//Ankertyp des selektierten Objektes, -1 bei Uneindeutigkeit oder
//Rahmenselektion; FLY_AT_PAGE bzw. FLY_AT_PARA aus frmatr.hxx sonst.
@@ -496,7 +496,7 @@ public:
BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos );
BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eObjInventor, const Point &);
void MoveCreate ( const Point &rPos );
- BOOL EndCreate ( UINT16 eSdrCreateCmd );
+ BOOL EndCreate ( UINT16 eSdrCreateCmd );
void BreakCreate();
BOOL IsDrawCreate() const;
void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId);
@@ -508,15 +508,15 @@ public:
void BreakMark();
//Gruppe erzeugen, aufloesen, nix bei Rahmenselektion.
- BOOL IsGroupSelected(); //Kann auch eine Mischselektion sein!
- void GroupSelection(); //Hinterher ist die Gruppe selektiert.
- void UnGroupSelection(); //Die Einzelobjekte sind Selektiert
+ BOOL IsGroupSelected(); //Kann auch eine Mischselektion sein!
+ void GroupSelection(); //Hinterher ist die Gruppe selektiert.
+ void UnGroupSelection(); //Die Einzelobjekte sind Selektiert
//Es koennen noch immer Gruppen dabei sein.
// OD 27.06.2003 #108784# - change return type.
bool IsGroupAllowed() const;
- void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal
+ void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal
//frmatr.hxx. Hier kein enum wg. Abhaengigkeiten
//Der BOOL ist nur fuer internen Gebrauch! Anker wird nur - anhand der
@@ -592,7 +592,7 @@ public:
const SfxItemSet* pFlyAttrSet = 0,
const SfxItemSet* pGrfAttrSet = 0,
SwFrmFmt* = 0 );
- BOOL FinishOLEObj(); // Server wird beendet
+ BOOL FinishOLEObj(); // Server wird beendet
//Attribute der Tabelle besorgen/setzen.
void GetTblAttr( SfxItemSet & ) const;
@@ -609,13 +609,13 @@ public:
BOOL DeleteCol();
BOOL DeleteRow();
- BOOL DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle.
+ BOOL DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle.
- USHORT MergeTab(); //Merged selektierte Tabellenteile zusammen
+ USHORT MergeTab(); //Merged selektierte Tabellenteile zusammen
//Fehler ueber enum zurueck
// Zelle Vertikal oder Horizontal splitten.
BOOL SplitTab( BOOL nVert = TRUE, USHORT nCnt = 1, BOOL bSameHeight = FALSE );
- BOOL Sort(const SwSortOptions&); //Sortieren.
+ BOOL Sort(const SwSortOptions&); //Sortieren.
void SetRowHeight( const SwFmtFrmSize &rSz );
//Der Pointer muss vom Aufrufer zerstoert werden wenn != 0
@@ -625,14 +625,14 @@ public:
void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
void SetBoxAlign( USHORT nOrient );
- USHORT GetBoxAlign() const; //USHRT_MAX fuer uneindeutig!
+ USHORT GetBoxAlign() const; //USHRT_MAX fuer uneindeutig!
//Ausgleichen der Zeilenhoehen. Mit bTstOnly festellen ob mehr als eine
//Zeile markiert ist.
BOOL BalanceRowHeight( BOOL bTstOnly );
void SetTabBorders( const SfxItemSet& rSet );
- void GetTabBorders( SfxItemSet& rSet) const;
+ void GetTabBorders( SfxItemSet& rSet) const;
void SetTabLineStyle(const Color* pColor, BOOL bSetLine = FALSE, const SvxBorderLine* pBorderLine = NULL);
void SetTabBackground( const SvxBrushItem &rNew );
@@ -667,8 +667,8 @@ public:
void ProtectCells(); //Falls eine Tabselektion besteht, wird sie ver-
// nichtet, wenn der Cursor nicht in Readonly darf
- void UnProtectCells(); // auf die Tabellenselektin
- void UnProtectTbls(); //bei allen Tabellen in der Selektion den Schutz aufheben
+ void UnProtectCells(); // auf die Tabellenselektin
+ void UnProtectTbls(); //bei allen Tabellen in der Selektion den Schutz aufheben
BOOL HasTblAnyProtection( const String* pTblName = 0,
BOOL* pFullTblProtection = 0 );
BOOL CanUnProtectCells() const;
@@ -703,14 +703,14 @@ public:
// Autosumme
BOOL GetAutoSum( String& rFml ) const;
- //Phy: Tatsaechliche Seitenanzahl.
+ //Phy: Tatsaechliche Seitenanzahl.
//Virt: Vom User evtl. gesetzten Offset mit einbeziehen.
- USHORT GetPhyPageNum();
+ USHORT GetPhyPageNum();
// Setzt an der aktuellen Postion einen neuen Page Offset
void SetNewPageOffset( USHORT nOffset );
- void SetPageOffset( USHORT nOffset ); //Aendert den letzten Page Offset
- USHORT GetPageOffset() const; //Liefert den letzten Page Offset
+ void SetPageOffset( USHORT nOffset ); //Aendert den letzten Page Offset
+ USHORT GetPageOffset() const; //Liefert den letzten Page Offset
//SS fuer Beschriftungen
void InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
@@ -720,12 +720,12 @@ public:
const BOOL bCpyBrd = TRUE );
//Das Lineal will auch noch etwas von uns wissen.
- USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte
+ USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte
USHORT GetCurMouseColNum( const Point &rPt,
SwGetCurColNumPara* pPara = 0 ) const;
- USHORT GetCurTabColNum() const; //0 == in keiner Tabelle
+ USHORT GetCurTabColNum() const; //0 == in keiner Tabelle
USHORT GetCurMouseTabColNum( const Point &rPt ) const;
- USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte
+ USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte
BOOL IsTableRightToLeft() const;
BOOL IsMouseTableRightToLeft( const Point &rPt ) const;
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index c3b8c1be4614..9bc2fb1b67b3 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -2,7 +2,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
@@ -28,7 +28,7 @@
#ifndef _FLDBAS_HXX
#define _FLDBAS_HXX
-#ifndef FIELDIDS_ONLY // SWG-Testreader!!
+#ifndef FIELDIDS_ONLY // SWG-Testreader!!
#include <i18npool/lang.h>
#include <tools/debug.hxx>
@@ -41,10 +41,10 @@ class SwDoc;
class SvStringsDtor;
class SvNumberFormatter;
-#endif // FIELDIDS_ONLY
+#endif // FIELDIDS_ONLY
/*--------------------------------------------------------------------
- Beschreibung: die ID's fuer die Feldtypen
+ Beschreibung: die ID's fuer die Feldtypen
--------------------------------------------------------------------*/
enum RES_FIELDS
@@ -88,7 +88,7 @@ enum RES_FIELDS
RES_JUMPEDITFLD,
RES_SCRIPTFLD,
RES_DATETIMEFLD,
- RES_AUTHORITY, //Table of authorities
+ RES_AUTHORITY, //Table of authorities
RES_COMBINED_CHARS,
RES_DROPDOWN,
RES_FIELDS_END
@@ -101,7 +101,7 @@ enum RES_FIELDS
enum SwFldTypesEnum
{
TYP_BEGIN,
- TYP_DATEFLD = TYP_BEGIN, // 0
+ TYP_DATEFLD = TYP_BEGIN, // 0
TYP_TIMEFLD,
TYP_FILENAMEFLD,
TYP_DBNAMEFLD,
@@ -111,7 +111,7 @@ enum SwFldTypesEnum
TYP_AUTHORFLD,
TYP_SETFLD,
TYP_GETFLD,
- TYP_FORMELFLD, // 10
+ TYP_FORMELFLD, // 10
TYP_HIDDENTXTFLD,
TYP_SETREFFLD,
TYP_GETREFFLD,
@@ -121,7 +121,7 @@ enum SwFldTypesEnum
TYP_HIDDENPARAFLD,
TYP_DOCINFOFLD,
TYP_DBFLD,
- TYP_USERFLD, // 20
+ TYP_USERFLD, // 20
TYP_POSTITFLD,
TYP_TEMPLNAMEFLD,
TYP_SEQFLD,
@@ -131,7 +131,7 @@ enum SwFldTypesEnum
TYP_CONDTXTFLD,
TYP_NEXTPAGEFLD,
TYP_PREVPAGEFLD,
- TYP_EXTUSERFLD, // 30
+ TYP_EXTUSERFLD, // 30
TYP_FIXDATEFLD,
TYP_FIXTIMEFLD,
TYP_SETINPFLD,
@@ -140,7 +140,7 @@ enum SwFldTypesEnum
TYP_GETREFPAGEFLD,
TYP_INTERNETFLD,
TYP_JUMPEDITFLD,
- TYP_SCRIPTFLD, // 40
+ TYP_SCRIPTFLD, // 40
TYP_AUTHORITY,
TYP_COMBINED_CHARS,
TYP_DROPDOWN,
@@ -163,62 +163,62 @@ enum SwFileNameFormat
enum SwVarFormat
{
- VVF_CMD = 0x0010, // Kommando anzeigen
+ VVF_CMD = 0x0010, // Kommando anzeigen
VVF_INVISIBLE = 0x0040, // unsichtbar
- VVF_XXP = 0x0400, // 1234%
- VVF_XX_XXP = 0x0800, // 1.234,56%
- VVF_CLEAR = 0x000f,
+ VVF_XXP = 0x0400, // 1234%
+ VVF_XX_XXP = 0x0800, // 1.234,56%
+ VVF_CLEAR = 0x000f,
// ab hier neue Formate
- VVF_SYS = 0x2000, //Zahlenformat aus der Systemeinstellung
- VVF_X = 0x2100, // 1234
+ VVF_SYS = 0x2000, //Zahlenformat aus der Systemeinstellung
+ VVF_X = 0x2100, // 1234
VVF_X_X = 0x2200, // 1234,5
- VVF_X_XX = 0x2300, // 1245,56
- VVF_XX_X = 0x2400, // 1.234,5
- VVF_XX_XX = 0x2500, // 1.234,56
- VVF_XX_XXX = 0x2600, // 1.234,567
- VVF_SYS_CUR = 0x2700, // W???hrungsformat aus der Systemeinstellung
- VVF_CUR_X = 0x2800, // DM 1234
- VVF_CUR_XX_XX = 0x2900, // DM 1234,56 DM 1234,00
- VVF_CUR_XX_X0 = 0x2a00, // DM 1234,56 DM 1234,--
- VVF_X_CUR = 0x2b00, // 1234 DM
- VVF_XX_XX_CUR = 0x2c00, // 1234,56 DM 1234,00 DM
- VVF_XX_X0_CUR = 0x2d00, // 1234,56 DM 1234,-- DM
+ VVF_X_XX = 0x2300, // 1245,56
+ VVF_XX_X = 0x2400, // 1.234,5
+ VVF_XX_XX = 0x2500, // 1.234,56
+ VVF_XX_XXX = 0x2600, // 1.234,567
+ VVF_SYS_CUR = 0x2700, // W???hrungsformat aus der Systemeinstellung
+ VVF_CUR_X = 0x2800, // DM 1234
+ VVF_CUR_XX_XX = 0x2900, // DM 1234,56 DM 1234,00
+ VVF_CUR_XX_X0 = 0x2a00, // DM 1234,56 DM 1234,--
+ VVF_X_CUR = 0x2b00, // 1234 DM
+ VVF_XX_XX_CUR = 0x2c00, // 1234,56 DM 1234,00 DM
+ VVF_XX_X0_CUR = 0x2d00, // 1234,56 DM 1234,-- DM
// Kompatibilitaet:
- VF_CMD = VVF_CMD,
+ VF_CMD = VVF_CMD,
VF_INVISIBLE = VVF_INVISIBLE,
- VF_XXP = VVF_XXP,
- VF_XX_XXP = VVF_XX_XXP,
- VF_VISIBLE = VVF_SYS,
- VF_XX = VVF_X,
- VF_XX_XX = VVF_XX_XX,
- VF_XX_XX_CUR = VVF_SYS_CUR,
- VF_CLEAR = VVF_CLEAR
+ VF_XXP = VVF_XXP,
+ VF_XX_XXP = VVF_XX_XXP,
+ VF_VISIBLE = VVF_SYS,
+ VF_XX = VVF_X,
+ VF_XX_XX = VVF_XX_XX,
+ VF_XX_XX_CUR = VVF_SYS_CUR,
+ VF_CLEAR = VVF_CLEAR
};
typedef USHORT SwGetSetExpType;
namespace nsSwGetSetExpType
{
- const SwGetSetExpType GSE_STRING = 0x0001; // String
- const SwGetSetExpType GSE_EXPR = 0x0002; // Expression
- const SwGetSetExpType GSE_INP = 0x0004; // InputField
- const SwGetSetExpType GSE_SEQ = 0x0008; // Sequence
- const SwGetSetExpType GSE_FORMULA = 0x0010; // Formel
+ const SwGetSetExpType GSE_STRING = 0x0001; // String
+ const SwGetSetExpType GSE_EXPR = 0x0002; // Expression
+ const SwGetSetExpType GSE_INP = 0x0004; // InputField
+ const SwGetSetExpType GSE_SEQ = 0x0008; // Sequence
+ const SwGetSetExpType GSE_FORMULA = 0x0010; // Formel
}
typedef USHORT SwExtendedSubType;
namespace nsSwExtendedSubType
{
- const SwExtendedSubType SUB_CMD = 0x0100; // Kommando anzeigen
- const SwExtendedSubType SUB_INVISIBLE = 0x0200; // unsichtbar
- const SwExtendedSubType SUB_OWN_FMT = 0x0400; // SwDBField: Uebernimmt Formatierung nicht
+ const SwExtendedSubType SUB_CMD = 0x0100; // Kommando anzeigen
+ const SwExtendedSubType SUB_INVISIBLE = 0x0200; // unsichtbar
+ const SwExtendedSubType SUB_OWN_FMT = 0x0400; // SwDBField: Uebernimmt Formatierung nicht
// aus Datenbank
}
enum SwInputFieldSubType
{
- INP_TXT = 0x01,
+ INP_TXT = 0x01,
INP_USR = 0x02,
INP_VAR = 0x03
};
@@ -226,8 +226,8 @@ enum SwInputFieldSubType
enum SwUserType
{
- UF_STRING = 0x01,
- UF_EXPR = 0x02
+ UF_STRING = 0x01,
+ UF_EXPR = 0x02
};
enum SwDateTimeSubType
@@ -237,7 +237,7 @@ enum SwDateTimeSubType
TIMEFLD = 4
};
-#ifndef FIELDIDS_ONLY // SWG-Testreader!!
+#ifndef FIELDIDS_ONLY // SWG-Testreader!!
extern USHORT __FAR_DATA aTypeTab[];
@@ -246,14 +246,14 @@ extern USHORT __FAR_DATA aTypeTab[];
Beschreibung: Allgemeine Tools
--------------------------------------------------------------------*/
-String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
+String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
-//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
-//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
+//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
+//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
String FormatNumber(USHORT nNum, sal_uInt32 nFormat);
/*--------------------------------------------------------------------
- Beschreibung: Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor.
+ Beschreibung: Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor.
Zu jeder Klasse SwFields existiert
1 Instanz der zugehoerigen Typenklasse
Basisklasse aller Feldtypen ist SwFieldType
@@ -265,10 +265,10 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
{
USHORT nWhich;
- friend void _FinitUI(); // um den Pointer zu loeschen!
- static SvStringsDtor* pFldNames;
+ friend void _FinitUI(); // um den Pointer zu loeschen!
+ static SvStringsDtor* pFldNames;
- static void _GetFldName(); // legt die FldNames an, fldmgr.cxx!
+ static void _GetFldName(); // legt die FldNames an, fldmgr.cxx!
protected:
// single argument ctors shall be explicit.
@@ -279,17 +279,17 @@ public:
#if OSL_DEBUG_LEVEL > 1
virtual ~SwFieldType();
#endif
- static const String& GetTypeStr( USHORT nTypeId );
+ static const String& GetTypeStr( USHORT nTypeId );
// nur in abgeleiteten Klassen
- virtual const String& GetName() const;
- virtual SwFieldType* Copy() const = 0;
+ virtual const String& GetName() const;
+ virtual SwFieldType* Copy() const = 0;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
- USHORT Which() const { return nWhich; }
+ USHORT Which() const { return nWhich; }
- inline void UpdateFlds() const;
+ inline void UpdateFlds() const;
};
inline void SwFieldType::UpdateFlds() const
@@ -308,25 +308,25 @@ class SW_DLLPUBLIC SwField
{
private:
mutable String m_Cache; /// #i85766# cached expansion (for clipboard)
- USHORT nLang; // Immer ueber SetLanguage aendern!
+ USHORT nLang; // Immer ueber SetLanguage aendern!
BOOL bIsAutomaticLanguage;
- sal_uInt32 nFormat;
+ sal_uInt32 nFormat;
- SwFieldType* pType;
+ SwFieldType* pType;
- virtual String Expand() const = 0;
- virtual SwField* Copy() const = 0;
+ virtual String Expand() const = 0;
+ virtual SwField* Copy() const = 0;
protected:
- void SetFormat(sal_uInt32 nSet) {nFormat = nSet;}
+ void SetFormat(sal_uInt32 nSet) {nFormat = nSet;}
SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM);
public:
- virtual ~SwField();
+ virtual ~SwField();
// Typ feststellen
- inline SwFieldType* GetTyp() const;
+ inline SwFieldType* GetTyp() const;
// neuen Typ setzen (wird fuer das Kopieren zwischen Dokumenten benutzt)
virtual SwFieldType* ChgTyp( SwFieldType* );
@@ -338,7 +338,7 @@ public:
String ExpandField(bool const bInClipboard) const;
// liefert den Namen oder den Inhalt
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
SwField * CopyField() const;
@@ -351,31 +351,31 @@ public:
#endif
// TYP_ID
- USHORT GetTypeId() const;
- virtual USHORT GetSubType() const;
+ USHORT GetTypeId() const;
+ virtual USHORT GetSubType() const;
virtual void SetSubType(USHORT);
// Sprache an der Feldposition
- inline USHORT GetLanguage() const;
- virtual void SetLanguage(USHORT nLng);
+ inline USHORT GetLanguage() const;
+ virtual void SetLanguage(USHORT nLng);
// Parameter fuer Dialog und BASIC erfragen
- inline sal_uInt32 GetFormat() const;
+ inline sal_uInt32 GetFormat() const;
virtual const String& GetPar1() const;
- virtual String GetPar2() const;
+ virtual String GetPar2() const;
- virtual String GetFormula() const;
+ virtual String GetFormula() const;
- virtual void ChangeFormat(sal_uInt32 n);
- virtual void SetPar1(const String& rStr);
- virtual void SetPar2(const String& rStr);
+ virtual void ChangeFormat(sal_uInt32 n);
+ virtual void SetPar1(const String& rStr);
+ virtual void SetPar2(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
// hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..)
- BOOL HasClickHdl() const;
+ BOOL HasClickHdl() const;
// ist es ein Fix-Feld?
- BOOL IsFixed() const;
+ BOOL IsFixed() const;
BOOL IsAutomaticLanguage() const { return bIsAutomaticLanguage;}
void SetAutomaticLanguage(BOOL bSet){bIsAutomaticLanguage = bSet;}
@@ -383,67 +383,67 @@ public:
virtual String GetDescription() const;
};
-inline SwFieldType* SwField::GetTyp() const
- { return pType; }
+inline SwFieldType* SwField::GetTyp() const
+ { return pType; }
inline sal_uInt32 SwField::GetFormat() const
- { return nFormat; }
+ { return nFormat; }
inline USHORT SwField::GetLanguage() const
- { return nLang; }
+ { return nLang; }
/*--------------------------------------------------------------------
- Beschreibung: Felder mit Values, die ueber der Numberformatter
+ Beschreibung: Felder mit Values, die ueber der Numberformatter
formatiert werden muessen
--------------------------------------------------------------------*/
class SwValueFieldType : public SwFieldType
{
- SwDoc* pDoc;
- BOOL bUseFormat; // Numberformatter verwenden
+ SwDoc* pDoc;
+ BOOL bUseFormat; // Numberformatter verwenden
protected:
SwValueFieldType( SwDoc* pDocPtr, USHORT nWhichId );
SwValueFieldType( const SwValueFieldType& rTyp );
public:
- inline SwDoc* GetDoc() const { return pDoc; }
- inline void SetDoc(SwDoc* pNewDoc) { pDoc = pNewDoc; }
+ inline SwDoc* GetDoc() const { return pDoc; }
+ inline void SetDoc(SwDoc* pNewDoc) { pDoc = pNewDoc; }
- inline BOOL UseFormat() const { return bUseFormat; }
- inline void EnableFormat(BOOL bFormat = TRUE) { bUseFormat = bFormat; }
+ inline BOOL UseFormat() const { return bUseFormat; }
+ inline void EnableFormat(BOOL bFormat = TRUE) { bUseFormat = bFormat; }
- String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const;
- void DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const;
- void DoubleToString(String &rValue, const double &rVal, sal_uInt32 nFmt) const;
+ String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const;
+ void DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const;
+ void DoubleToString(String &rValue, const double &rVal, sal_uInt32 nFmt) const;
};
class SW_DLLPUBLIC SwValueField : public SwField
{
double fValue;
-// String sExpand;
+// String sExpand;
protected:
SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
SwValueField( const SwValueField& rFld );
public:
- virtual ~SwValueField();
+ virtual ~SwValueField();
- virtual SwFieldType* ChgTyp( SwFieldType* );
- virtual void SetLanguage(USHORT nLng);
+ virtual SwFieldType* ChgTyp( SwFieldType* );
+ virtual void SetLanguage(USHORT nLng);
// os: wozu war das denn da?
-// virtual void ChangeFormat(ULONG n);
+// virtual void ChangeFormat(ULONG n);
- inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
+ inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
- virtual double GetValue() const;
- virtual void SetValue( const double& rVal );
+ virtual double GetValue() const;
+ virtual void SetValue( const double& rVal );
- inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const
+ inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const
{ return ((SwValueFieldType*)GetTyp())->ExpandValue(rVal, nFmt, nLng); }
- static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
+ static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
};
class SW_DLLPUBLIC SwFormulaField : public SwValueField
@@ -455,14 +455,14 @@ protected:
SwFormulaField( const SwFormulaField& rFld );
public:
- virtual String GetFormula() const;
- void SetFormula(const String& rStr);
+ virtual String GetFormula() const;
+ void SetFormula(const String& rStr);
- void SetExpandedFormula(const String& rStr);
- String GetExpandedFormula() const;
+ void SetExpandedFormula(const String& rStr);
+ String GetExpandedFormula() const;
};
-#endif // FIELDIDS_ONLY
+#endif // FIELDIDS_ONLY
#endif // _FLDBAS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index ddb950b35ae2..cb54a0759b20 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -2,7 +2,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
@@ -63,14 +63,14 @@ enum SwDateFormat
DFF_YMD ,
DFF_YYMD ,
DF_END ,
-// Kompatibilitaet:
- DF_SSYS = DFF_SSYS,
- DF_LSYS = DFF_LSYS,
- DF_SHORT = DFF_DMY,
- DF_SCENT = DFF_DMYY,
- DF_LMON = DFF_DMMYY,
- DF_LMONTH = DFF_DMMMYY,
- DF_LDAYMON = DFF_DDMMMYY,
+// Kompatibilitaet:
+ DF_SSYS = DFF_SSYS,
+ DF_LSYS = DFF_LSYS,
+ DF_SHORT = DFF_DMY,
+ DF_SCENT = DFF_DMYY,
+ DF_LMON = DFF_DMMYY,
+ DF_LMONTH = DFF_DMMMYY,
+ DF_LDAYMON = DFF_DDMMMYY,
DF_LDAYMONTH= DFF_DDDMMMYY
};
@@ -113,34 +113,34 @@ public:
class SW_DLLPUBLIC SwDateTimeField : public SwValueField
{
- USHORT nSubType;
- long nOffset; // Offset in Minuten
+ USHORT nSubType;
+ long nOffset; // Offset in Minuten
public:
SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD,
ULONG nFmt = 0, USHORT nLng = 0);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nSub);
- virtual double GetValue() const;
+ virtual double GetValue() const;
- virtual void SetPar2(const String& rStr);
- virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
- inline BOOL IsDate() const
+ inline BOOL IsDate() const
{ return (nSubType & DATEFLD) != 0; }
- inline void SetOffset(long nMinutes) { nOffset = nMinutes; }
- inline long GetOffset() const { return nOffset; }
+ inline void SetOffset(long nMinutes) { nOffset = nMinutes; }
+ inline long GetOffset() const { return nOffset; }
Date GetDate(BOOL bUseOffset = FALSE) const;
Time GetTime(BOOL bUseOffset = FALSE) const;
void SetDateTime(const DateTime& rDT);
static double GetDateTime(SwDoc* pDoc, const DateTime& rDT);
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 6ad316a1281e..1c899ac9a06a 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fldinit.hxx b/sw/inc/fldinit.hxx
index 0d2d1adfab3f..d302446623ae 100644
--- a/sw/inc/fldinit.hxx
+++ b/sw/inc/fldinit.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index b08972ed4d96..7ebaf11c1470 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -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
@@ -30,66 +30,66 @@
#include "rcid.hrc"
-#define DLG_FLD RC_FLDDLG_BEGIN
+#define DLG_FLD RC_FLDDLG_BEGIN
#define DLG_RECORD_MRG (RC_FLDDLG_BEGIN + 1)
#define DLG_RECORD_INS (RC_FLDDLG_BEGIN + 2)
#define DLG_FLD_EDIT (RC_FLDDLG_BEGIN + 3)
#define DLG_POSTIT (RC_FLDDLG_BEGIN + 4)
#define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5)
-#define DLG_BRCFG (RC_FLDDLG_BEGIN + 6)
-#define DLG_BRSEEK (RC_FLDDLG_BEGIN + 7)
-#define DLG_BRSORT (RC_FLDDLG_BEGIN + 8)
-#define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9)
-#define DLG_JAVAEDIT (RC_FLDDLG_BEGIN + 10)
-#define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11)
+#define DLG_BRCFG (RC_FLDDLG_BEGIN + 6)
+#define DLG_BRSEEK (RC_FLDDLG_BEGIN + 7)
+#define DLG_BRSORT (RC_FLDDLG_BEGIN + 8)
+#define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9)
+#define DLG_JAVAEDIT (RC_FLDDLG_BEGIN + 10)
+#define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11)
#define DLG_FLD_DROPDOWN (RC_FLDDLG_BEGIN + 12)
/*--------------------------------------------------------------------
Beschreibung: TypeId
--------------------------------------------------------------------*/
-#define STR_TYPE_BEGIN RC_FLDDLG_BEGIN
-#define STR_DATEFLD STR_TYPE_BEGIN
-#define STR_TIMEFLD (STR_TYPE_BEGIN + 1)
-#define STR_FILENAMEFLD (STR_TYPE_BEGIN + 2)
-#define STR_DBNAMEFLD (STR_TYPE_BEGIN + 3)
-#define STR_CHAPTERFLD (STR_TYPE_BEGIN + 4)
-#define STR_PAGENUMBERFLD (STR_TYPE_BEGIN + 5)
-#define STR_DOCSTATFLD (STR_TYPE_BEGIN + 6)
-#define STR_AUTHORFLD (STR_TYPE_BEGIN + 7)
-#define STR_SETFLD (STR_TYPE_BEGIN + 8)
-#define STR_GETFLD (STR_TYPE_BEGIN + 9)
-#define STR_FORMELFLD (STR_TYPE_BEGIN + 10)
-#define STR_CONDTXTFLD (STR_TYPE_BEGIN + 11)
-#define STR_SETREFFLD (STR_TYPE_BEGIN + 12)
-#define STR_GETREFFLD (STR_TYPE_BEGIN + 13)
-#define STR_DDEFLD (STR_TYPE_BEGIN + 14)
-#define STR_MACROFLD (STR_TYPE_BEGIN + 15)
-#define STR_INPUTFLD (STR_TYPE_BEGIN + 16)
-#define STR_DOCINFOFLD (STR_TYPE_BEGIN + 17)
-#define STR_DBFLD (STR_TYPE_BEGIN + 19)
-#define STR_USERFLD (STR_TYPE_BEGIN + 20)
-#define STR_POSTITFLD (STR_TYPE_BEGIN + 21)
-#define STR_HIDDENPARAFLD (STR_TYPE_BEGIN + 22)
-
-#define STR_TEMPLNAMEFLD (STR_TYPE_BEGIN + 24)
-#define STR_SEQFLD (STR_TYPE_BEGIN + 25)
-#define STR_DBNEXTSETFLD (STR_TYPE_BEGIN + 26)
-#define STR_DBNUMSETFLD (STR_TYPE_BEGIN + 27)
-#define STR_DBSETNUMBERFLD (STR_TYPE_BEGIN + 28)
-#define STR_PREVPAGEFLD (STR_TYPE_BEGIN + 29)
-#define STR_NEXTPAGEFLD (STR_TYPE_BEGIN + 30)
-#define STR_HIDDENTXTFLD (STR_TYPE_BEGIN + 31)
-#define STR_EXTUSERFLD (STR_TYPE_BEGIN + 32)
-#define STR_SETINPUTFLD (STR_TYPE_BEGIN + 33)
-#define STR_USRINPUTFLD (STR_TYPE_BEGIN + 34)
-#define STR_SETREFPAGEFLD (STR_TYPE_BEGIN + 35)
-#define STR_GETREFPAGEFLD (STR_TYPE_BEGIN + 36)
-#define STR_INTERNETFLD (STR_TYPE_BEGIN + 37)
-#define STR_JUMPEDITFLD (STR_TYPE_BEGIN + 38)
-#define STR_SCRIPTFLD (STR_TYPE_BEGIN + 39)
+#define STR_TYPE_BEGIN RC_FLDDLG_BEGIN
+#define STR_DATEFLD STR_TYPE_BEGIN
+#define STR_TIMEFLD (STR_TYPE_BEGIN + 1)
+#define STR_FILENAMEFLD (STR_TYPE_BEGIN + 2)
+#define STR_DBNAMEFLD (STR_TYPE_BEGIN + 3)
+#define STR_CHAPTERFLD (STR_TYPE_BEGIN + 4)
+#define STR_PAGENUMBERFLD (STR_TYPE_BEGIN + 5)
+#define STR_DOCSTATFLD (STR_TYPE_BEGIN + 6)
+#define STR_AUTHORFLD (STR_TYPE_BEGIN + 7)
+#define STR_SETFLD (STR_TYPE_BEGIN + 8)
+#define STR_GETFLD (STR_TYPE_BEGIN + 9)
+#define STR_FORMELFLD (STR_TYPE_BEGIN + 10)
+#define STR_CONDTXTFLD (STR_TYPE_BEGIN + 11)
+#define STR_SETREFFLD (STR_TYPE_BEGIN + 12)
+#define STR_GETREFFLD (STR_TYPE_BEGIN + 13)
+#define STR_DDEFLD (STR_TYPE_BEGIN + 14)
+#define STR_MACROFLD (STR_TYPE_BEGIN + 15)
+#define STR_INPUTFLD (STR_TYPE_BEGIN + 16)
+#define STR_DOCINFOFLD (STR_TYPE_BEGIN + 17)
+#define STR_DBFLD (STR_TYPE_BEGIN + 19)
+#define STR_USERFLD (STR_TYPE_BEGIN + 20)
+#define STR_POSTITFLD (STR_TYPE_BEGIN + 21)
+#define STR_HIDDENPARAFLD (STR_TYPE_BEGIN + 22)
+
+#define STR_TEMPLNAMEFLD (STR_TYPE_BEGIN + 24)
+#define STR_SEQFLD (STR_TYPE_BEGIN + 25)
+#define STR_DBNEXTSETFLD (STR_TYPE_BEGIN + 26)
+#define STR_DBNUMSETFLD (STR_TYPE_BEGIN + 27)
+#define STR_DBSETNUMBERFLD (STR_TYPE_BEGIN + 28)
+#define STR_PREVPAGEFLD (STR_TYPE_BEGIN + 29)
+#define STR_NEXTPAGEFLD (STR_TYPE_BEGIN + 30)
+#define STR_HIDDENTXTFLD (STR_TYPE_BEGIN + 31)
+#define STR_EXTUSERFLD (STR_TYPE_BEGIN + 32)
+#define STR_SETINPUTFLD (STR_TYPE_BEGIN + 33)
+#define STR_USRINPUTFLD (STR_TYPE_BEGIN + 34)
+#define STR_SETREFPAGEFLD (STR_TYPE_BEGIN + 35)
+#define STR_GETREFPAGEFLD (STR_TYPE_BEGIN + 36)
+#define STR_INTERNETFLD (STR_TYPE_BEGIN + 37)
+#define STR_JUMPEDITFLD (STR_TYPE_BEGIN + 38)
+#define STR_SCRIPTFLD (STR_TYPE_BEGIN + 39)
#define STR_AUTHORITY (STR_TYPE_BEGIN + 40)
-#define STR_COMBINED_CHARS (STR_TYPE_BEGIN + 41)
+#define STR_COMBINED_CHARS (STR_TYPE_BEGIN + 41)
#define STR_DROPDOWN (STR_TYPE_BEGIN + 42)
#define STR_CUSTOM (STR_TYPE_BEGIN + 43)
#define STR_TYPE_END (STR_TYPE_BEGIN + 44)
@@ -98,141 +98,141 @@
Beschreibung: SubTypes
--------------------------------------------------------------------*/
-#define FLD_DATE_BEGIN STR_TYPE_END
-#define FLD_DATE_FIX FLD_DATE_BEGIN
-#define FLD_DATE_STD (FLD_DATE_BEGIN + 1)
-#define FLD_DATE_END (FLD_DATE_BEGIN + 2)
-
-#define FLD_TIME_BEGIN FLD_DATE_END
-#define FLD_TIME_FIX FLD_TIME_BEGIN
-#define FLD_TIME_STD (FLD_TIME_BEGIN + 1)
-#define FLD_TIME_END (FLD_TIME_BEGIN + 2)
-
-#define FLD_STAT_BEGIN FLD_TIME_END
-#define FLD_STAT_PAGE FLD_STAT_BEGIN
-#define FLD_STAT_PARA (FLD_STAT_BEGIN + 1)
-#define FLD_STAT_WORD (FLD_STAT_BEGIN + 2)
-#define FLD_STAT_CHAR (FLD_STAT_BEGIN + 3)
-#define FLD_STAT_TABLE (FLD_STAT_BEGIN + 4)
-#define FLD_STAT_GRF (FLD_STAT_BEGIN + 5)
-#define FLD_STAT_OBJ (FLD_STAT_BEGIN + 6)
-#define FLD_STAT_END (FLD_STAT_BEGIN + 7)
-
-#define FLD_INPUT_BEGIN FLD_STAT_END
-#define FLD_INPUT_TEXT FLD_INPUT_BEGIN
-#define FLD_INPUT_END (FLD_INPUT_BEGIN + 1)
-
-#define FLD_EU_BEGIN FLD_INPUT_END
+#define FLD_DATE_BEGIN STR_TYPE_END
+#define FLD_DATE_FIX FLD_DATE_BEGIN
+#define FLD_DATE_STD (FLD_DATE_BEGIN + 1)
+#define FLD_DATE_END (FLD_DATE_BEGIN + 2)
+
+#define FLD_TIME_BEGIN FLD_DATE_END
+#define FLD_TIME_FIX FLD_TIME_BEGIN
+#define FLD_TIME_STD (FLD_TIME_BEGIN + 1)
+#define FLD_TIME_END (FLD_TIME_BEGIN + 2)
+
+#define FLD_STAT_BEGIN FLD_TIME_END
+#define FLD_STAT_PAGE FLD_STAT_BEGIN
+#define FLD_STAT_PARA (FLD_STAT_BEGIN + 1)
+#define FLD_STAT_WORD (FLD_STAT_BEGIN + 2)
+#define FLD_STAT_CHAR (FLD_STAT_BEGIN + 3)
+#define FLD_STAT_TABLE (FLD_STAT_BEGIN + 4)
+#define FLD_STAT_GRF (FLD_STAT_BEGIN + 5)
+#define FLD_STAT_OBJ (FLD_STAT_BEGIN + 6)
+#define FLD_STAT_END (FLD_STAT_BEGIN + 7)
+
+#define FLD_INPUT_BEGIN FLD_STAT_END
+#define FLD_INPUT_TEXT FLD_INPUT_BEGIN
+#define FLD_INPUT_END (FLD_INPUT_BEGIN + 1)
+
+#define FLD_EU_BEGIN FLD_INPUT_END
#define FLD_EU_FIRMA FLD_EU_BEGIN
-#define FLD_EU_VORNAME (FLD_EU_BEGIN + 1)
-#define FLD_EU_NAME (FLD_EU_BEGIN + 2)
-#define FLD_EU_ABK (FLD_EU_BEGIN + 3)
-#define FLD_EU_STRASSE (FLD_EU_BEGIN + 4)
-#define FLD_EU_LAND (FLD_EU_BEGIN + 5)
-#define FLD_EU_PLZ (FLD_EU_BEGIN + 6)
-#define FLD_EU_ORT (FLD_EU_BEGIN + 7)
-#define FLD_EU_TITEL (FLD_EU_BEGIN + 8)
-#define FLD_EU_POS (FLD_EU_BEGIN + 9)
-#define FLD_EU_TELPRIV (FLD_EU_BEGIN + 10)
-#define FLD_EU_TELFIRMA (FLD_EU_BEGIN + 11)
-#define FLD_EU_FAX (FLD_EU_BEGIN + 12)
+#define FLD_EU_VORNAME (FLD_EU_BEGIN + 1)
+#define FLD_EU_NAME (FLD_EU_BEGIN + 2)
+#define FLD_EU_ABK (FLD_EU_BEGIN + 3)
+#define FLD_EU_STRASSE (FLD_EU_BEGIN + 4)
+#define FLD_EU_LAND (FLD_EU_BEGIN + 5)
+#define FLD_EU_PLZ (FLD_EU_BEGIN + 6)
+#define FLD_EU_ORT (FLD_EU_BEGIN + 7)
+#define FLD_EU_TITEL (FLD_EU_BEGIN + 8)
+#define FLD_EU_POS (FLD_EU_BEGIN + 9)
+#define FLD_EU_TELPRIV (FLD_EU_BEGIN + 10)
+#define FLD_EU_TELFIRMA (FLD_EU_BEGIN + 11)
+#define FLD_EU_FAX (FLD_EU_BEGIN + 12)
#define FLD_EU_EMAIL (FLD_EU_BEGIN + 13)
#define FLD_EU_STATE (FLD_EU_BEGIN + 14)
-#define FLD_EU_END (FLD_EU_BEGIN + 15)
+#define FLD_EU_END (FLD_EU_BEGIN + 15)
-#define FLD_PAGEREF_BEGIN FLD_EU_END
-#define FLD_PAGEREF_OFF FLD_PAGEREF_BEGIN
-#define FLD_PAGEREF_ON (FLD_PAGEREF_BEGIN+1)
-#define FLD_PAGEREF_END (FLD_PAGEREF_BEGIN+2)
+#define FLD_PAGEREF_BEGIN FLD_EU_END
+#define FLD_PAGEREF_OFF FLD_PAGEREF_BEGIN
+#define FLD_PAGEREF_ON (FLD_PAGEREF_BEGIN+1)
+#define FLD_PAGEREF_END (FLD_PAGEREF_BEGIN+2)
/*----------------------------------------------------------
Format-Id's
----------------------------------------------------------*/
// Text
-#define FMT_TEXT FLD_PAGEREF_END
+#define FMT_TEXT FLD_PAGEREF_END
// Nummern
-#define FMT_NUM_BEGIN (FMT_TEXT + 1)
-#define FMT_NUM_ABC FMT_NUM_BEGIN
-#define FMT_NUM_SABC (FMT_NUM_BEGIN + 1)
-#define FMT_NUM_ABC_N (FMT_NUM_BEGIN + 2)
-#define FMT_NUM_SABC_N (FMT_NUM_BEGIN + 3)
-#define FMT_NUM_ROMAN (FMT_NUM_BEGIN + 4)
-#define FMT_NUM_SROMAN (FMT_NUM_BEGIN + 5)
-#define FMT_NUM_ARABIC (FMT_NUM_BEGIN + 6)
-#define FMT_NUM_PAGEDESC (FMT_NUM_BEGIN + 7)
-#define FMT_NUM_PAGESPECIAL (FMT_NUM_BEGIN + 8)
-#define FMT_NUM_END (FMT_NUM_BEGIN + 9)
+#define FMT_NUM_BEGIN (FMT_TEXT + 1)
+#define FMT_NUM_ABC FMT_NUM_BEGIN
+#define FMT_NUM_SABC (FMT_NUM_BEGIN + 1)
+#define FMT_NUM_ABC_N (FMT_NUM_BEGIN + 2)
+#define FMT_NUM_SABC_N (FMT_NUM_BEGIN + 3)
+#define FMT_NUM_ROMAN (FMT_NUM_BEGIN + 4)
+#define FMT_NUM_SROMAN (FMT_NUM_BEGIN + 5)
+#define FMT_NUM_ARABIC (FMT_NUM_BEGIN + 6)
+#define FMT_NUM_PAGEDESC (FMT_NUM_BEGIN + 7)
+#define FMT_NUM_PAGESPECIAL (FMT_NUM_BEGIN + 8)
+#define FMT_NUM_END (FMT_NUM_BEGIN + 9)
// AuthorFormat
-#define FMT_AUTHOR_BEGIN FMT_NUM_END
-#define FMT_AUTHOR_NAME FMT_AUTHOR_BEGIN
-#define FMT_AUTHOR_SCUT (FMT_AUTHOR_BEGIN + 1)
-#define FMT_AUTHOR_END (FMT_AUTHOR_BEGIN + 2)
+#define FMT_AUTHOR_BEGIN FMT_NUM_END
+#define FMT_AUTHOR_NAME FMT_AUTHOR_BEGIN
+#define FMT_AUTHOR_SCUT (FMT_AUTHOR_BEGIN + 1)
+#define FMT_AUTHOR_END (FMT_AUTHOR_BEGIN + 2)
// Variable setzen
-#define FMT_SETVAR_BEGIN FMT_AUTHOR_END
+#define FMT_SETVAR_BEGIN FMT_AUTHOR_END
#define FMT_SETVAR_SYS (FMT_SETVAR_BEGIN + 0)
-#define FMT_SETVAR_TEXT (FMT_SETVAR_BEGIN + 1)
-#define FMT_SETVAR_END (FMT_SETVAR_BEGIN + 2)
+#define FMT_SETVAR_TEXT (FMT_SETVAR_BEGIN + 1)
+#define FMT_SETVAR_END (FMT_SETVAR_BEGIN + 2)
// Variable einfuegen
-#define FMT_GETVAR_BEGIN FMT_SETVAR_END
-#define FMT_GETVAR_TEXT (FMT_GETVAR_BEGIN + 0)
-#define FMT_GETVAR_NAME (FMT_GETVAR_BEGIN + 1)
-#define FMT_GETVAR_END (FMT_GETVAR_BEGIN + 2)
+#define FMT_GETVAR_BEGIN FMT_SETVAR_END
+#define FMT_GETVAR_TEXT (FMT_GETVAR_BEGIN + 0)
+#define FMT_GETVAR_NAME (FMT_GETVAR_BEGIN + 1)
+#define FMT_GETVAR_END (FMT_GETVAR_BEGIN + 2)
// Userfeld einfuegen
-#define FMT_USERVAR_BEGIN FMT_GETVAR_END
-#define FMT_USERVAR_TEXT (FMT_USERVAR_BEGIN + 0)
-#define FMT_USERVAR_CMD (FMT_USERVAR_BEGIN + 1)
-#define FMT_USERVAR_END (FMT_USERVAR_BEGIN + 2)
+#define FMT_USERVAR_BEGIN FMT_GETVAR_END
+#define FMT_USERVAR_TEXT (FMT_USERVAR_BEGIN + 0)
+#define FMT_USERVAR_CMD (FMT_USERVAR_BEGIN + 1)
+#define FMT_USERVAR_END (FMT_USERVAR_BEGIN + 2)
// Datenbankfeld einfuegen
-#define FMT_DBFLD_BEGIN FMT_USERVAR_END
-#define FMT_DBFLD_DB (FMT_DBFLD_BEGIN + 0)
-#define FMT_DBFLD_SYS (FMT_DBFLD_BEGIN + 1)
-#define FMT_DBFLD_END (FMT_DBFLD_BEGIN + 2)
+#define FMT_DBFLD_BEGIN FMT_USERVAR_END
+#define FMT_DBFLD_DB (FMT_DBFLD_BEGIN + 0)
+#define FMT_DBFLD_SYS (FMT_DBFLD_BEGIN + 1)
+#define FMT_DBFLD_END (FMT_DBFLD_BEGIN + 2)
//FileNameFormat
// Achtung die letzten 4 Formate gibt es in RTF nicht (Verlust!)
-#define FMT_FF_BEGIN FMT_DBFLD_END
-#define FMT_FF_NAME FMT_FF_BEGIN
-#define FMT_FF_PATHNAME (FMT_FF_BEGIN + 1)
-#define FMT_FF_PATH (FMT_FF_BEGIN + 2)
-#define FMT_FF_NAME_NOEXT (FMT_FF_BEGIN + 3)
-#define FMT_FF_UI_NAME (FMT_FF_BEGIN + 4)
-#define FMT_FF_UI_RANGE (FMT_FF_BEGIN + 5)
-#define FMT_FF_END (FMT_FF_BEGIN + 6)
+#define FMT_FF_BEGIN FMT_DBFLD_END
+#define FMT_FF_NAME FMT_FF_BEGIN
+#define FMT_FF_PATHNAME (FMT_FF_BEGIN + 1)
+#define FMT_FF_PATH (FMT_FF_BEGIN + 2)
+#define FMT_FF_NAME_NOEXT (FMT_FF_BEGIN + 3)
+#define FMT_FF_UI_NAME (FMT_FF_BEGIN + 4)
+#define FMT_FF_UI_RANGE (FMT_FF_BEGIN + 5)
+#define FMT_FF_END (FMT_FF_BEGIN + 6)
// Registry-Format
-#define FMT_REG_BEGIN FMT_FF_END
-#define FMT_REG_AUTHOR FMT_REG_BEGIN
-#define FMT_REG_TIME (FMT_REG_BEGIN + 1)
-#define FMT_REG_DATE (FMT_REG_BEGIN + 2)
-#define FMT_REG_END (FMT_REG_BEGIN + 3)
+#define FMT_REG_BEGIN FMT_FF_END
+#define FMT_REG_AUTHOR FMT_REG_BEGIN
+#define FMT_REG_TIME (FMT_REG_BEGIN + 1)
+#define FMT_REG_DATE (FMT_REG_BEGIN + 2)
+#define FMT_REG_END (FMT_REG_BEGIN + 3)
// Kapitel
-#define FMT_CHAPTER_BEGIN FMT_REG_END
-#define FMT_CHAPTER_NO FMT_CHAPTER_BEGIN
-#define FMT_CHAPTER_NAME (FMT_CHAPTER_BEGIN + 1)
-#define FMT_CHAPTER_NAMENO (FMT_CHAPTER_BEGIN + 2)
-#define FMT_CHAPTER_NO_NOSEPARATOR (FMT_CHAPTER_BEGIN + 3)
-#define FMT_CHAPTER_END (FMT_CHAPTER_BEGIN + 4)
+#define FMT_CHAPTER_BEGIN FMT_REG_END
+#define FMT_CHAPTER_NO FMT_CHAPTER_BEGIN
+#define FMT_CHAPTER_NAME (FMT_CHAPTER_BEGIN + 1)
+#define FMT_CHAPTER_NAMENO (FMT_CHAPTER_BEGIN + 2)
+#define FMT_CHAPTER_NO_NOSEPARATOR (FMT_CHAPTER_BEGIN + 3)
+#define FMT_CHAPTER_END (FMT_CHAPTER_BEGIN + 4)
// DDE-Formate
-#define FMT_DDE_BEGIN FMT_CHAPTER_END
-#define FMT_DDE_NORMAL FMT_DDE_BEGIN
-#define FMT_DDE_HOT (FMT_DDE_BEGIN + 1)
-#define FMT_DDE_END (FMT_DDE_BEGIN + 2)
-
-#define FMT_REF_BEGIN FMT_DDE_END
-#define FMT_REF_PAGE FMT_REF_BEGIN
-#define FMT_REF_CHAPTER (FMT_REF_BEGIN + 1)
-#define FMT_REF_TEXT (FMT_REF_BEGIN + 2)
-#define FMT_REF_UPDOWN (FMT_REF_BEGIN + 3)
-#define FMT_REF_PAGE_PGDSC (FMT_REF_BEGIN + 4)
-#define FMT_REF_ONLYNUMBER (FMT_REF_BEGIN + 5)
+#define FMT_DDE_BEGIN FMT_CHAPTER_END
+#define FMT_DDE_NORMAL FMT_DDE_BEGIN
+#define FMT_DDE_HOT (FMT_DDE_BEGIN + 1)
+#define FMT_DDE_END (FMT_DDE_BEGIN + 2)
+
+#define FMT_REF_BEGIN FMT_DDE_END
+#define FMT_REF_PAGE FMT_REF_BEGIN
+#define FMT_REF_CHAPTER (FMT_REF_BEGIN + 1)
+#define FMT_REF_TEXT (FMT_REF_BEGIN + 2)
+#define FMT_REF_UPDOWN (FMT_REF_BEGIN + 3)
+#define FMT_REF_PAGE_PGDSC (FMT_REF_BEGIN + 4)
+#define FMT_REF_ONLYNUMBER (FMT_REF_BEGIN + 5)
#define FMT_REF_ONLYCAPTION (FMT_REF_BEGIN + 6)
#define FMT_REF_ONLYSEQNO (FMT_REF_BEGIN + 7)
#define FMT_REF_NUMBER (FMT_REF_BEGIN + 8)
@@ -241,52 +241,52 @@
#define FMT_REF_END (FMT_REF_BEGIN + 11)
// Platzhalter
-#define FMT_MARK_BEGIN FMT_REF_END
-#define FMT_MARK_TEXT FMT_MARK_BEGIN
-#define FMT_MARK_TABLE (FMT_MARK_BEGIN + 1)
-#define FMT_MARK_FRAME (FMT_MARK_BEGIN + 2)
-#define FMT_MARK_GRAFIC (FMT_MARK_BEGIN + 3)
-#define FMT_MARK_OLE (FMT_MARK_BEGIN + 4)
-#define FMT_MARK_END (FMT_MARK_BEGIN + 5)
+#define FMT_MARK_BEGIN FMT_REF_END
+#define FMT_MARK_TEXT FMT_MARK_BEGIN
+#define FMT_MARK_TABLE (FMT_MARK_BEGIN + 1)
+#define FMT_MARK_FRAME (FMT_MARK_BEGIN + 2)
+#define FMT_MARK_GRAFIC (FMT_MARK_BEGIN + 3)
+#define FMT_MARK_OLE (FMT_MARK_BEGIN + 4)
+#define FMT_MARK_END (FMT_MARK_BEGIN + 5)
/*--------------------------------------------------------------------
Beschreibung: globale String-Ressourcen
--------------------------------------------------------------------*/
-#define STR_FLDUI FMT_MARK_END
-#define STR_INSERT STR_FLDUI
-#define STR_ALL (STR_FLDUI + 1)
-#define STR_EXTRA (STR_FLDUI + 2)
+#define STR_FLDUI FMT_MARK_END
+#define STR_INSERT STR_FLDUI
+#define STR_ALL (STR_FLDUI + 1)
+#define STR_EXTRA (STR_FLDUI + 2)
/*--------------------------------------------------------------------
Beschreibung: Buttons fuer Field-Edit-Dlg
--------------------------------------------------------------------*/
-#define BTN_FLDEDT_PREV STR_EXTRA
-#define BTN_FLDEDT_NEXT (STR_EXTRA + 1)
-#define PB_FLDEDT_ADDRESS (STR_EXTRA + 2)
+#define BTN_FLDEDT_PREV STR_EXTRA
+#define BTN_FLDEDT_NEXT (STR_EXTRA + 1)
+#define PB_FLDEDT_ADDRESS (STR_EXTRA + 2)
/*--------------------------------------------------------------------
Beschreibung: Zusaetzliche Strings
--------------------------------------------------------------------*/
-#define STR_COND STR_EXTRA
-#define STR_TEXT (STR_EXTRA + 1)
-#define STR_DDE_CMD (STR_EXTRA + 2)
-#define STR_INSTEXT (STR_EXTRA + 3)
-#define STR_COMBCHRS_FT (STR_EXTRA + 4)
-#define STR_PROMPT (STR_EXTRA + 5)
-#define STR_MACNAME (STR_EXTRA + 6)
-#define STR_SETNO (STR_EXTRA + 7)
-#define STR_OFFSET (STR_EXTRA + 8)
-#define STR_VALUE (STR_EXTRA + 9)
-
-#define STR_URLPROMPT (STR_EXTRA + 11)
-#define STR_FORMULA (STR_EXTRA + 12)
-#define STR_ALL_DATABASE (STR_EXTRA + 13)
-#define STR_FLD_EDIT_DLG (STR_EXTRA + 14)
-
-#define FLDDLG_ACT_END (STR_FLD_EDIT_DLG)
+#define STR_COND STR_EXTRA
+#define STR_TEXT (STR_EXTRA + 1)
+#define STR_DDE_CMD (STR_EXTRA + 2)
+#define STR_INSTEXT (STR_EXTRA + 3)
+#define STR_COMBCHRS_FT (STR_EXTRA + 4)
+#define STR_PROMPT (STR_EXTRA + 5)
+#define STR_MACNAME (STR_EXTRA + 6)
+#define STR_SETNO (STR_EXTRA + 7)
+#define STR_OFFSET (STR_EXTRA + 8)
+#define STR_VALUE (STR_EXTRA + 9)
+
+#define STR_URLPROMPT (STR_EXTRA + 11)
+#define STR_FORMULA (STR_EXTRA + 12)
+#define STR_ALL_DATABASE (STR_EXTRA + 13)
+#define STR_FLD_EDIT_DLG (STR_EXTRA + 14)
+
+#define FLDDLG_ACT_END (STR_FLD_EDIT_DLG)
#endif
diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx
index aa764c03e31f..d53d06e0cd57 100644
--- a/sw/inc/fldupde.hxx
+++ b/sw/inc/fldupde.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/flyenum.hxx b/sw/inc/flyenum.hxx
index 74f5c4ea5075..b2060e7950ba 100644
--- a/sw/inc/flyenum.hxx
+++ b/sw/inc/flyenum.hxx
@@ -2,7 +2,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
@@ -39,14 +39,14 @@ enum FlyCntType
};
//Returnwerte fuer Chainable und Chain
-#define SW_CHAIN_OK 0
-#define SW_CHAIN_NOT_EMPTY 1 //Nur leere Frames duerfen connected werden
-#define SW_CHAIN_IS_IN_CHAIN 2 //Destination ist bereits in einer chain
-#define SW_CHAIN_WRONG_AREA 3 //Destination steht in einer nicht erlaubten
+#define SW_CHAIN_OK 0
+#define SW_CHAIN_NOT_EMPTY 1 //Nur leere Frames duerfen connected werden
+#define SW_CHAIN_IS_IN_CHAIN 2 //Destination ist bereits in einer chain
+#define SW_CHAIN_WRONG_AREA 3 //Destination steht in einer nicht erlaubten
//Section (Kopf-/Fusszeile)
-#define SW_CHAIN_NOT_FOUND 4 //Destination und/oder Source nicht gefunden
-#define SW_CHAIN_SOURCE_CHAINED 5 //Source hat bereits einen Follow
-#define SW_CHAIN_SELF 6 //Sich selbst zu verketten ist
+#define SW_CHAIN_NOT_FOUND 4 //Destination und/oder Source nicht gefunden
+#define SW_CHAIN_SOURCE_CHAINED 5 //Source hat bereits einen Follow
+#define SW_CHAIN_SELF 6 //Sich selbst zu verketten ist
//natuerlich nicht erleubt.
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index c0c358b79ed6..ce910fcea513 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -2,7 +2,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
@@ -38,9 +38,9 @@ class SwNodeIndex;
// Struktur zum Erfragen der akt. freifliegenden Rahmen am Dokument.
class SW_DLLPUBLIC SwPosFlyFrm
{
- const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
-// SwPosition* pPos; // Position in den ContentNode
- SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
+ const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
+// SwPosition* pPos; // Position in den ContentNode
+ SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
UINT32 nOrdNum;
public:
SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos );
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index ab6cc9d91af1..86eac8793cb1 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -2,7 +2,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
@@ -42,11 +42,11 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
{
- SwPosition *pCntntAnchor; //0 Fuer Seitengebundene Rahmen.
+ SwPosition *pCntntAnchor; //0 Fuer Seitengebundene Rahmen.
//Index fuer Absatzgebundene Rahmen.
//Position fuer Zeichengebundene Rahmen
RndStdIds nAnchorId;
- USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen.
+ USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen.
// OD 2004-05-05 #i28701# - getting anchor positions ordered
sal_uInt32 mnOrder;
@@ -57,20 +57,20 @@ public:
SwFmtAnchor( const SwFmtAnchor &rCpy );
~SwFmtAnchor();
- // Zuweisungsoperator
+ // Zuweisungsoperator
SwFmtAnchor &operator=( const SwFmtAnchor& );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
RndStdIds GetAnchorId() const { return nAnchorId; }
USHORT GetPageNum() const { return nPageNum; }
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index ad80534c3c47..72bd54af6d6f 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -2,7 +2,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
@@ -57,15 +57,15 @@ public:
// "pure virtual methods" of SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 9d8775f6f121..1765c1981fd9 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 45acfcfc0597..fbc17b322721 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -2,7 +2,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
@@ -38,13 +38,13 @@
class SwColumn
{
- USHORT nWish; //Wunschbreite incl. Raender.
+ USHORT nWish; //Wunschbreite incl. Raender.
//Verhaelt sich proportional zum Verhaeltniss:
//Wunschbreite der Umgebung / aktuelle Breite der Spalte
- USHORT nUpper; //Oberer Rand
- USHORT nLower; //Unterer Rand
- USHORT nLeft; //Linker Rand
- USHORT nRight; //Rechter Rand
+ USHORT nUpper; //Oberer Rand
+ USHORT nLower; //Unterer Rand
+ USHORT nLeft; //Linker Rand
+ USHORT nRight; //Rechter Rand
public:
SwColumn();
@@ -78,18 +78,18 @@ enum SwColLineAdj
class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
{
-// Pen aPen; //Pen fuer die Linine zwischen den Spalten
- ULONG nLineWidth; //width of the separator line
- Color aLineColor; //color of the separator line
+// Pen aPen; //Pen fuer die Linine zwischen den Spalten
+ ULONG nLineWidth; //width of the separator line
+ Color aLineColor; //color of the separator line
- BYTE nLineHeight; //Prozentuale Hoehe der Linien
+ BYTE nLineHeight; //Prozentuale Hoehe der Linien
//(Relativ zu der Hoehe der Spalten incl. UL).
- SwColLineAdj eAdj; //Linie wird oben, mittig oder unten ausgerichtet.
+ SwColLineAdj eAdj; //Linie wird oben, mittig oder unten ausgerichtet.
- SwColumns aColumns; //Informationen fuer die einzelnen Spalten.
- USHORT nWidth; //Gesamtwunschbreite aller Spalten.
+ SwColumns aColumns; //Informationen fuer die einzelnen Spalten.
+ USHORT nWidth; //Gesamtwunschbreite aller Spalten.
- BOOL bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen
+ BOOL bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen
//der GutterWidth eine 'optische Verteilung'
//vorgenommen.
//Es muss zurueckgesetzt werden wenn an den
@@ -109,39 +109,39 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
const SwColumns &GetColumns() const { return aColumns; }
- SwColumns &GetColumns() { return aColumns; }
- USHORT GetNumCols() const { return aColumns.Count(); }
-// const Pen& GetLinePen() const { return aPen; }
- ULONG GetLineWidth() const { return nLineWidth;}
- const Color& GetLineColor() const { return aLineColor;}
+ SwColumns &GetColumns() { return aColumns; }
+ USHORT GetNumCols() const { return aColumns.Count(); }
+// const Pen& GetLinePen() const { return aPen; }
+ ULONG GetLineWidth() const { return nLineWidth;}
+ const Color& GetLineColor() const { return aLineColor;}
- SwColLineAdj GetLineAdj() const { return eAdj; }
- BOOL IsOrtho() const { return bOrtho; }
- USHORT GetWishWidth() const { return nWidth; }
- BYTE GetLineHeight()const { return nLineHeight; }
+ SwColLineAdj GetLineAdj() const { return eAdj; }
+ BOOL IsOrtho() const { return bOrtho; }
+ USHORT GetWishWidth() const { return nWidth; }
+ BYTE GetLineHeight()const { return nLineHeight; }
//Return USHRT_MAX wenn uneindeutig.
//Return die kleinste Breite wenn bMin True ist.
USHORT GetGutterWidth( BOOL bMin = FALSE ) const;
-// void SetLinePen( const Pen& rNew ) { aPen = rNew; }
+// void SetLinePen( const Pen& rNew ) { aPen = rNew; }
void SetLineWidth(ULONG nLWidth) { nLineWidth = nLWidth;}
- void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
+ void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetLineHeight( BYTE nNew ) { nLineHeight = nNew; }
void SetLineAdj( SwColLineAdj eNew ){ eAdj = eNew; }
- void SetWishWidth( USHORT nNew ) { nWidth = nNew; }
+ void SetWishWidth( USHORT nNew ) { nWidth = nNew; }
//Mit dieser Funktion koennen die Spalten (immer wieder) initialisert
//werden. Das Ortho Flag wird automatisch gesetzt.
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index ef5fbf6e4970..edf45863319a 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem
{
- SwClient aPrev, //Vorgaenger (SwFlyFrmFmt), wenn es diesen gibt.
+ SwClient aPrev, //Vorgaenger (SwFlyFrmFmt), wenn es diesen gibt.
aNext; //Nachfolger (SwFlyFrmFmt), wenn es diesen gibt.
@@ -53,14 +53,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 39cf3c51e27f..ae8bd5dc5173 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -2,7 +2,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
@@ -44,14 +44,14 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
public:
-// SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
+// SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
SwFmtCntnt( const SwStartNode* pStartNode = 0 );
SwFmtCntnt( const SwFmtCntnt &rCpy );
~SwFmtCntnt();
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
void SetNewCntntIdx( const SwNodeIndex *pIdx );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 34f2e64db731..f143d39f76a9 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -2,7 +2,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
@@ -31,9 +31,9 @@
#include <svl/svarray.hxx>
#include "swdllapi.h"
#include <format.hxx>
-#include <swtypes.hxx> // fuer MAXLEVEL
+#include <swtypes.hxx> // fuer MAXLEVEL
-class SwDoc; // fuer friend
+class SwDoc; // fuer friend
class SwFmtColl : public SwFmt
{
@@ -69,9 +69,9 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
// <--
protected:
- //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei
- bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
-
+ //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei
+ bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
+
SwTxtFmtColl *pNextTxtFmtColl;
SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
@@ -82,8 +82,8 @@ protected:
// --> OD 2007-01-24 #i73790#
mbStayAssignedToListLevelOfOutlineStyle( false ),
// <--
- //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
- mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
+ //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
+ mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
{ pNextTxtFmtColl = this; }
SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
@@ -94,15 +94,15 @@ protected:
// --> OD 2007-01-24 #i73790#
mbStayAssignedToListLevelOfOutlineStyle( false ),
// <--
- //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
- mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
+ //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
+ mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
{ pNextTxtFmtColl = this; }
public:
// zum "abfischen" von UL-/LR-/FontHeight Aenderungen
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
@@ -191,7 +191,7 @@ protected:
{}
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
};
typedef SwGrfFmtColl* SwGrfFmtCollPtr;
@@ -204,18 +204,18 @@ SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2,4)
enum Master_CollConditions
{
- PARA_IN_LIST = 0x0001,
- PARA_IN_OUTLINE = 0x0002,
- PARA_IN_FRAME = 0x0004,
- PARA_IN_TABLEHEAD = 0x0008,
- PARA_IN_TABLEBODY = 0x0010,
- PARA_IN_SECTION = 0x0020,
- PARA_IN_FOOTENOTE = 0x0040,
- PARA_IN_FOOTER = 0x0080,
- PARA_IN_HEADER = 0x0100,
- PARA_IN_ENDNOTE = 0x0200,
+ PARA_IN_LIST = 0x0001,
+ PARA_IN_OUTLINE = 0x0002,
+ PARA_IN_FRAME = 0x0004,
+ PARA_IN_TABLEHEAD = 0x0008,
+ PARA_IN_TABLEBODY = 0x0010,
+ PARA_IN_SECTION = 0x0020,
+ PARA_IN_FOOTENOTE = 0x0040,
+ PARA_IN_FOOTER = 0x0080,
+ PARA_IN_HEADER = 0x0100,
+ PARA_IN_ENDNOTE = 0x0200,
// ...
- USRFLD_EXPRESSION = (int)0x8000
+ USRFLD_EXPRESSION = (int)0x8000
};
@@ -229,7 +229,7 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
} aSubCondition;
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
@@ -249,13 +249,13 @@ public:
int operator!=( const SwCollCondition& rCmp ) const
{ return ! (*this == rCmp); }
- ULONG GetCondition() const { return nCondition; }
- ULONG GetSubCondition() const { return aSubCondition.nSubCondition; }
+ ULONG GetCondition() const { return nCondition; }
+ ULONG GetSubCondition() const { return aSubCondition.nSubCondition; }
const String* GetFldExpression() const
{ return aSubCondition.pFldExpression; }
void SetCondition( ULONG nCond, ULONG nSubCond );
- SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); }
+ SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); }
};
@@ -278,15 +278,15 @@ protected:
{}
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
virtual ~SwConditionTxtFmtColl();
// zum "abfischen" von Aenderungen
-// virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+// virtual void Modify( SfxPoolItem*, SfxPoolItem* );
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
- const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
+ const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
void InsertCondition( const SwCollCondition& rCond );
BOOL RemoveCondition( const SwCollCondition& rCond );
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index 87dec890101a..af85cc8dc329 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index c8ba2f4538a8..4dc71a8b63bf 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index f40452edf101..86100dd6ae3b 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -2,7 +2,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
@@ -38,8 +38,8 @@ class SwTxtFlyCnt;
class SwFmtFlyCnt : public SfxPoolItem
{
friend class SwTxtFlyCnt;
- SwTxtFlyCnt* pTxtAttr; // mein TextAttribut
- SwFrmFmt* pFmt; // mein Fly/DrawFrame-Format
+ SwTxtFlyCnt* pTxtAttr; // mein TextAttribut
+ SwFrmFmt* pFmt; // mein Fly/DrawFrame-Format
// geschuetzter CopyCtor
SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt);
@@ -47,15 +47,15 @@ public:
SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
inline SwFrmFmt *GetFrmFmt() const { return pFmt; }
// fuer Undo: loesche "logisch" das FlyFrmFormat, wird sich im
// Undo-Object gemerkt.
inline void SetFlyFmt( SwFrmFmt* pNew = 0 ) { pFmt = pNew; }
- const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
- SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; }
+ const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
+ SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; }
// OD 27.06.2003 #108784#
bool Sw3ioExportAllowed() const;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 991a12d27aa5..448b1eb1cc0f 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -2,7 +2,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
@@ -46,9 +46,9 @@ class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient, public SfxBro
friend void _InitCore();
SwField *pField;
- SwTxtFld* pTxtAttr; // mein TextAttribut
+ SwTxtFld* pTxtAttr; // mein TextAttribut
- SwFmtFld(); // das default-Attibut
+ SwFmtFld(); // das default-Attibut
// geschuetzter CopyCtor
// @@@ copy construction allowed, but copy assignment is not? @@@
@@ -67,13 +67,13 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
- const SwField *GetFld() const { return pField; }
- SwField *GetFld() { return pField; }
+ const SwField *GetFld() const { return pField; }
+ SwField *GetFld() { return pField; }
// #111840#
/**
@@ -85,8 +85,8 @@ public:
*/
void SetFld(SwField * pField);
- const SwTxtFld *GetTxtFld() const { return pTxtAttr; }
- SwTxtFld *GetTxtFld() { return pTxtAttr; }
+ const SwTxtFld *GetTxtFld() const { return pTxtAttr; }
+ SwTxtFld *GetTxtFld() { return pTxtAttr; }
BOOL IsFldInDoc() const;
BOOL IsProtect() const;
@@ -94,11 +94,11 @@ public:
class SW_DLLPUBLIC SwFmtFldHint : public SfxHint
{
-#define SWFMTFLD_INSERTED 1
-#define SWFMTFLD_REMOVED 2
-#define SWFMTFLD_FOCUS 3
-#define SWFMTFLD_CHANGED 4
-#define SWFMTFLD_LANGUAGE 5
+#define SWFMTFLD_INSERTED 1
+#define SWFMTFLD_REMOVED 2
+#define SWFMTFLD_FOCUS 3
+#define SWFMTFLD_CHANGED 4
+#define SWFMTFLD_LANGUAGE 5
const SwFmtFld* pFld;
sal_Int16 nWhich;
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index fa7cb6ee84ab..a15cba7cc418 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 7e97e669f614..6aac5dfa186b 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -2,7 +2,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
@@ -51,8 +51,8 @@ public:
inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
// "pure virtual Methoden" vom SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual USHORT GetValueCount() const;
SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
};
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 7af1d51f4ff0..dbe1fc76d51a 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -2,7 +2,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
@@ -41,20 +41,20 @@ class IntlWrapper;
enum SwFrmSize
{
- ATT_VAR_SIZE, //Frm ist in der Var-Richtung variabel
- ATT_FIX_SIZE, //Frm ist in der Var-Richtung unbeweglich
- ATT_MIN_SIZE //Der Wert in der Var-Richtung beschreibt eine
+ ATT_VAR_SIZE, //Frm ist in der Var-Richtung variabel
+ ATT_FIX_SIZE, //Frm ist in der Var-Richtung unbeweglich
+ ATT_MIN_SIZE //Der Wert in der Var-Richtung beschreibt eine
//Minimalgroesse, die nicht unter- wohl aber
//ueberschritten werden kann.
};
class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
{
- Size aSize;
+ Size aSize;
SwFrmSize eFrmHeightType;
SwFrmSize eFrmWidthType;
- BYTE nWidthPercent; //Fuer Tabellen kann die Breite in Prozent
- BYTE nHeightPercent; //angegeben sein.
+ BYTE nWidthPercent; //Fuer Tabellen kann die Breite in Prozent
+ BYTE nHeightPercent; //angegeben sein.
//Fuer Rahmen koennen Hoehe und/oder Breite
//in Prozent angegeben sein. Wenn nur eine
//der Angaben in Prozent angeben ist, kann
@@ -75,14 +75,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
SwFrmSize GetHeightSizeType() const { return eFrmHeightType; }
void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; }
@@ -95,13 +95,13 @@ public:
SwTwips GetHeight() const { return aSize.Height(); }
SwTwips GetWidth() const { return aSize.Width(); }
- void SetHeight( const SwTwips nNew ) { aSize.Height() = nNew; }
- void SetWidth ( const SwTwips nNew ) { aSize.Width() = nNew; }
+ void SetHeight( const SwTwips nNew ) { aSize.Height() = nNew; }
+ void SetWidth ( const SwTwips nNew ) { aSize.Width() = nNew; }
BYTE GetHeightPercent() const{ return nHeightPercent; }
- BYTE GetWidthPercent() const { return nWidthPercent; }
- void SetHeightPercent( BYTE n ) { nHeightPercent = n; }
- void SetWidthPercent ( BYTE n ) { nWidthPercent = n; }
+ BYTE GetWidthPercent() const { return nWidthPercent; }
+ void SetHeightPercent( BYTE n ) { nHeightPercent = n; }
+ void SetWidthPercent ( BYTE n ) { nWidthPercent = n; }
};
inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index a1d8f3692e55..1631b1599919 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -2,7 +2,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
@@ -40,9 +40,9 @@ class SwTxtFtn;
class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem
{
friend class SwTxtFtn;
- SwTxtFtn* pTxtAttr; //mein TextAttribut
- String aNumber; //Benutzerdefinierte 'Nummer'
- USHORT nNumber; //Automatische Nummerierung
+ SwTxtFtn* pTxtAttr; //mein TextAttribut
+ String aNumber; //Benutzerdefinierte 'Nummer'
+ USHORT nNumber; //Automatische Nummerierung
bool m_bEndNote; // is it an End note?
// geschuetzter CopyCtor
@@ -55,21 +55,21 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
const String &GetNumStr() const { return aNumber; }
const USHORT &GetNumber() const { return nNumber; }
bool IsEndNote() const { return m_bEndNote;}
- void SetNumStr( const String& rStr ) { aNumber = rStr; }
- void SetNumber( USHORT nNo ) { nNumber = nNo; }
+ void SetNumStr( const String& rStr ) { aNumber = rStr; }
+ void SetNumber( USHORT nNo ) { nNumber = nNo; }
void SetEndNote( bool b );
void SetNumber( const SwFmtFtn& rFtn )
{ nNumber = rFtn.nNumber; aNumber = rFtn.aNumber; }
const SwTxtFtn *GetTxtFtn() const { return pTxtAttr; }
- SwTxtFtn *GetTxtFtn() { return pTxtAttr; }
+ SwTxtFtn *GetTxtFtn() { return pTxtAttr; }
void GetFtnText( String& rStr ) const;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index ddfe8825c502..95e7d0d1432f 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -2,7 +2,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
@@ -36,20 +36,20 @@
enum SwFtnEndPosEnum
{
- FTNEND_ATPGORDOCEND, // at page or document end
- FTNEND_ATTXTEND, // at end of the current text end
- FTNEND_ATTXTEND_OWNNUMSEQ, // -""- and with own number sequence
- FTNEND_ATTXTEND_OWNNUMANDFMT, // -""- and with onw numberformat
+ FTNEND_ATPGORDOCEND, // at page or document end
+ FTNEND_ATTXTEND, // at end of the current text end
+ FTNEND_ATTXTEND_OWNNUMSEQ, // -""- and with own number sequence
+ FTNEND_ATTXTEND_OWNNUMANDFMT, // -""- and with onw numberformat
FTNEND_ATTXTEND_END
};
class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
{
- String sPrefix;
- String sSuffix;
+ String sPrefix;
+ String sSuffix;
SvxNumberType aFmt;
- USHORT nOffset;
+ USHORT nOffset;
protected:
SwFmtFtnEndAtTxtEnd( USHORT nWhichL, SwFtnEndPosEnum ePos )
@@ -62,20 +62,20 @@ protected:
{}
public:
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
// will be used at time??
-// void FillVariable( SbxVariable &rVar,
-// SfxMapUnit eCoreMetric,
-// SfxMapUnit eUserMetric ) const;
-// virtual SfxArgumentError SetVariable( const SbxVariable &rVal,
-// SfxMapUnit eCoreMetric,
-// SfxMapUnit eUserMetric );
+// void FillVariable( SbxVariable &rVar,
+// SfxMapUnit eCoreMetric,
+// SfxMapUnit eUserMetric ) const;
+// virtual SfxArgumentError SetVariable( const SbxVariable &rVal,
+// SfxMapUnit eCoreMetric,
+// SfxMapUnit eUserMetric );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -86,19 +86,19 @@ public:
SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
- sal_Int16 GetNumType() const { return aFmt.GetNumberingType(); }
- void SetNumType( sal_Int16 eType ) { aFmt.SetNumberingType(eType); }
+ sal_Int16 GetNumType() const { return aFmt.GetNumberingType(); }
+ void SetNumType( sal_Int16 eType ) { aFmt.SetNumberingType(eType); }
- const SvxNumberType& GetSwNumType() const { return aFmt; }
+ const SvxNumberType& GetSwNumType() const { return aFmt; }
- USHORT GetOffset() const { return nOffset; }
- void SetOffset( USHORT nOff ) { nOffset = nOff; }
+ USHORT GetOffset() const { return nOffset; }
+ void SetOffset( USHORT nOff ) { nOffset = nOff; }
- const String& GetPrefix() const { return sPrefix; }
- void SetPrefix(const String& rSet) { sPrefix = rSet; }
+ const String& GetPrefix() const { return sPrefix; }
+ void SetPrefix(const String& rSet) { sPrefix = rSet; }
- const String& GetSuffix() const { return sSuffix; }
- void SetSuffix(const String& rSet) { sSuffix = rSet; }
+ const String& GetSuffix() const { return sSuffix; }
+ void SetSuffix(const String& rSet) { sSuffix = rSet; }
};
class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 1059c43bd316..9c81aeb707d5 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
{
- BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
+ BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
public:
SwFmtHeader( BOOL bOn = FALSE );
@@ -55,7 +55,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -63,7 +63,7 @@ public:
const IntlWrapper* pIntl = 0 ) const;
const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)pRegisteredIn; }
BOOL IsActive() const { return bActive; }
void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
@@ -74,7 +74,7 @@ public:
class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
{
- BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
+ BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
public:
SwFmtFooter( BOOL bOn = FALSE );
@@ -87,7 +87,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -95,7 +95,7 @@ public:
const IntlWrapper* pIntl = 0 ) const;
const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)pRegisteredIn; }
BOOL IsActive() const { return bActive; }
void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 17ded9853de4..21c6df638b8a 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -2,7 +2,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
@@ -43,13 +43,13 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
{
friend class SwTxtINetFmt;
- String aURL; // die URL
- String aTargetFrame; // in diesen Frame soll die URL
+ String aURL; // die URL
+ String aTargetFrame; // in diesen Frame soll die URL
String aINetFmt;
String aVisitedFmt;
- String aName; // Name des Links
+ String aName; // Name des Links
SvxMacroTableDtor* pMacroTbl;
- SwTxtINetFmt* pTxtAttr; // mein TextAttribut
+ SwTxtINetFmt* pTxtAttr; // mein TextAttribut
USHORT nINetId;
USHORT nVisitedId;
public:
@@ -62,44 +62,44 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- const SwTxtINetFmt* GetTxtINetFmt() const { return pTxtAttr; }
- SwTxtINetFmt* GetTxtINetFmt() { return pTxtAttr; }
+ const SwTxtINetFmt* GetTxtINetFmt() const { return pTxtAttr; }
+ SwTxtINetFmt* GetTxtINetFmt() { return pTxtAttr; }
- const String& GetValue() const { return aURL; }
+ const String& GetValue() const { return aURL; }
- const String& GetName() const { return aName; }
- void SetName( const String& rNm ) { aName = rNm; }
+ const String& GetName() const { return aName; }
+ void SetName( const String& rNm ) { aName = rNm; }
- const String& GetTargetFrame() const { return aTargetFrame; }
+ const String& GetTargetFrame() const { return aTargetFrame; }
- const String& GetINetFmt() const { return aINetFmt; }
- void SetINetFmt( const String& rNm ) { aINetFmt = rNm; }
+ const String& GetINetFmt() const { return aINetFmt; }
+ void SetINetFmt( const String& rNm ) { aINetFmt = rNm; }
- const String& GetVisitedFmt() const { return aVisitedFmt; }
- void SetVisitedFmt( const String& rNm ) { aVisitedFmt = rNm; }
+ const String& GetVisitedFmt() const { return aVisitedFmt; }
+ void SetVisitedFmt( const String& rNm ) { aVisitedFmt = rNm; }
- USHORT GetINetFmtId() const { return nINetId; }
- void SetINetFmtId( USHORT nNew ) { nINetId = nNew; }
+ USHORT GetINetFmtId() const { return nINetId; }
+ void SetINetFmtId( USHORT nNew ) { nINetId = nNew; }
- USHORT GetVisitedFmtId() const { return nVisitedId; }
- void SetVisitedFmtId( USHORT nNew ) { nVisitedId = nNew; }
+ USHORT GetVisitedFmtId() const { return nVisitedId; }
+ void SetVisitedFmtId( USHORT nNew ) { nVisitedId = nNew; }
// setze eine neue oder loesche die akt. MakroTabelle
void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
- const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; }
+ const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; }
// setze / erfrage ein Makro
void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index cdd0c349f629..96e8578ce4ca 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -2,7 +2,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
@@ -38,8 +38,8 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem
{
- ULONG nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert
- ULONG bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden.
+ ULONG nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert
+ ULONG bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden.
public:
SwFmtLineNumber();
@@ -49,20 +49,20 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
ULONG GetStartValue() const { return nStartValue; }
- BOOL IsCount() const { return bCountLines != 0; }
+ BOOL IsCount() const { return bCountLines != 0; }
void SetStartValue( ULONG nNew ) { nStartValue = nNew; }
- void SetCountLines( BOOL b ) { bCountLines = b; }
+ void SetCountLines( BOOL b ) { bCountLines = b; }
};
inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index b700cc3a8046..cddcbfff0105 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 8eb29b7b8aea..b708fc8ef2fe 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 58351442b4f3..6393b7f3e6c8 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -2,7 +2,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
@@ -55,14 +55,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
sal_Int16 GetVertOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
@@ -74,7 +74,7 @@ public:
};
//SwFmtHoriOrient, wie und woran orientiert --
-// sich der FlyFrm in der Hoizontalen ----------
+// sich der FlyFrm in der Hoizontalen ----------
#define IVER_HORIORIENT_TOGGLE ((USHORT)0x0001)
#define IVER_HORIORIENT_REL ((USHORT)0x0002)
@@ -93,14 +93,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
sal_Int16 GetHoriOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 5ed51fd6817d..c5ecb3c24dc6 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -2,7 +2,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
@@ -43,8 +43,8 @@ class IntlWrapper;
//Pagedescriptor
//Client vom SwPageDesc der durch das Attribut "beschrieben" wird.
-#define IVER_FMTPAGEDESC_NOAUTO ((USHORT)0x0001)
-#define IVER_FMTPAGEDESC_LONGPAGE ((USHORT)0x0002)
+#define IVER_FMTPAGEDESC_NOAUTO ((USHORT)0x0001)
+#define IVER_FMTPAGEDESC_LONGPAGE ((USHORT)0x0002)
class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
{
@@ -52,9 +52,9 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
// Auto-Flag setzen zu koennen !!
friend BOOL InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, USHORT,
SwHistory* );
- USHORT nNumOffset; // Seitennummer Offset
- USHORT nDescNameIdx; // SW3-Reader: Stringpool-Index des Vorlagennamens
- SwModify* pDefinedIn; // Verweis auf das Objekt, in dem das
+ USHORT nNumOffset; // Seitennummer Offset
+ USHORT nDescNameIdx; // SW3-Reader: Stringpool-Index des Vorlagennamens
+ SwModify* pDefinedIn; // Verweis auf das Objekt, in dem das
// Attribut gesetzt wurde (CntntNode/Format)
public:
@@ -67,22 +67,22 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); }
const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); }
- USHORT GetNumOffset() const { return nNumOffset; }
- void SetNumOffset( USHORT nNum ) { nNumOffset = nNum; }
+ USHORT GetNumOffset() const { return nNumOffset; }
+ void SetNumOffset( USHORT nNum ) { nNumOffset = nNum; }
// erfrage/setze, wo drin das Attribut verankert ist
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 4682c51bd46f..0cbc93f6e3ce 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ class SwTxtRefMark;
class SwFmtRefMark : public SfxPoolItem
{
friend class SwTxtRefMark;
- SwTxtRefMark* pTxtAttr; // mein TextAttribut
+ SwTxtRefMark* pTxtAttr; // mein TextAttribut
// geschuetzter CopyCtor
SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark);
@@ -52,10 +52,10 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; }
- SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; }
+ const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; }
+ SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; }
inline String &GetRefName() { return aRefName; }
inline const String &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 6b01ba4777aa..a3e4b1f20ff5 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 1e30ad697938..9a48047369c4 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -2,7 +2,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
@@ -38,12 +38,12 @@ class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem
{
friend class SwTxtRuby;
- String sRubyTxt; // the ruby txt
- String sCharFmtName; // name of the charformat
- SwTxtRuby* pTxtAttr; // the TextAttribut
- USHORT nCharFmtId; // PoolId of the charformat
- USHORT nPosition; // Position of the Ruby-Character
- USHORT nAdjustment; // specific adjustment of the Ruby-Ch.
+ String sRubyTxt; // the ruby txt
+ String sCharFmtName; // name of the charformat
+ SwTxtRuby* pTxtAttr; // the TextAttribut
+ USHORT nCharFmtId; // PoolId of the charformat
+ USHORT nPosition; // Position of the Ruby-Character
+ USHORT nAdjustment; // specific adjustment of the Ruby-Ch.
public:
SwFmtRuby( const String& rRubyTxt );
@@ -54,7 +54,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -62,29 +62,29 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
- SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
+ const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
+ SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
- const String& GetText() const { return sRubyTxt; }
- void SetText( const String& rTxt ) { sRubyTxt = rTxt; }
+ const String& GetText() const { return sRubyTxt; }
+ void SetText( const String& rTxt ) { sRubyTxt = rTxt; }
- const String& GetCharFmtName() const { return sCharFmtName; }
- void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; }
+ const String& GetCharFmtName() const { return sCharFmtName; }
+ void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; }
- USHORT GetCharFmtId() const { return nCharFmtId; }
- void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; }
+ USHORT GetCharFmtId() const { return nCharFmtId; }
+ void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; }
- USHORT GetPosition() const { return nPosition; }
- void SetPosition( USHORT nNew ) { nPosition = nNew; }
+ USHORT GetPosition() const { return nPosition; }
+ void SetPosition( USHORT nNew ) { nPosition = nNew; }
- USHORT GetAdjustment() const { return nAdjustment; }
- void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; }
+ USHORT GetAdjustment() const { return nAdjustment; }
+ void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; }
};
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 7f06c3d6f4cc..8ca69435071c 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -2,7 +2,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
@@ -40,13 +40,13 @@
class IntlWrapper;
//SwFmtSurround, wie soll sich der ---------------
-// Dokumentinhalt unter dem Rahmen verhalten ---
+// Dokumentinhalt unter dem Rahmen verhalten ---
class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem
{
- BOOL bAnchorOnly :1;
- BOOL bContour :1;
- BOOL bOutside :1;
+ BOOL bAnchorOnly :1;
+ BOOL bContour :1;
+ BOOL bOutside :1;
public:
SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL );
SwFmtSurround( const SwFmtSurround & );
@@ -54,25 +54,25 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual USHORT GetValueCount() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
SwSurround GetSurround()const { return SwSurround( GetValue() ); }
- BOOL IsAnchorOnly() const { return bAnchorOnly; }
- BOOL IsContour() const { return bContour; }
- BOOL IsOutside() const { return bOutside; }
- void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( USHORT( eNew ) ); }
- void SetAnchorOnly( BOOL bNew ) { bAnchorOnly = bNew; }
- void SetContour( BOOL bNew ) { bContour = bNew; }
- void SetOutside( BOOL bNew ) { bOutside = bNew; }
+ BOOL IsAnchorOnly() const { return bAnchorOnly; }
+ BOOL IsContour() const { return bContour; }
+ BOOL IsOutside() const { return bOutside; }
+ void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( USHORT( eNew ) ); }
+ void SetAnchorOnly( BOOL bNew ) { bAnchorOnly = bNew; }
+ void SetContour( BOOL bNew ) { bContour = bNew; }
+ void SetOutside( BOOL bNew ) { bOutside = bNew; }
};
inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
diff --git a/sw/inc/fmtsrndenum.hxx b/sw/inc/fmtsrndenum.hxx
index a4160047953f..314c32b654b4 100644
--- a/sw/inc/fmtsrndenum.hxx
+++ b/sw/inc/fmtsrndenum.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/fmtui.hrc b/sw/inc/fmtui.hrc
index a25aa4425c5e..4b2e0c513b3e 100644
--- a/sw/inc/fmtui.hrc
+++ b/sw/inc/fmtui.hrc
@@ -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
@@ -31,9 +31,9 @@
#include "rcid.hrc"
-#define DLG_FMTENTRY (RC_FMTUI_BEGIN)
-#define DLG_NEW_FILE (RC_FMTUI_BEGIN + 1)
-#define STR_PAGE_STD (RC_FMTUI_BEGIN + 2)
+#define DLG_FMTENTRY (RC_FMTUI_BEGIN)
+#define DLG_NEW_FILE (RC_FMTUI_BEGIN + 1)
+#define STR_PAGE_STD (RC_FMTUI_BEGIN + 2)
#define STR_PAGE_BORDER (RC_FMTUI_BEGIN + 3)
#define STR_PAGE_HEADER (RC_FMTUI_BEGIN + 4)
#define STR_PAGE_FOOTER (RC_FMTUI_BEGIN + 5)
@@ -41,9 +41,9 @@
#define STR_PAGE_FOOTNOTE (RC_FMTUI_BEGIN + 7)
#define STR_PAGE_TEXTGRID (RC_FMTUI_BEGIN + 8)
-#define DLG_STD_CHAR (RC_FMTUI_BEGIN + 15)
+#define DLG_STD_CHAR (RC_FMTUI_BEGIN + 15)
-#define MN_TEXT (RC_FMTUI_BEGIN + 20)
+#define MN_TEXT (RC_FMTUI_BEGIN + 20)
#define MN_GRAFIC (RC_FMTUI_BEGIN + 21)
#define MN_TABLE (RC_FMTUI_BEGIN + 22)
@@ -51,37 +51,37 @@
#define MN_REGION_SUB (RC_FMTUI_BEGIN + 25)
-#define DLG_DOC_STYLE (RC_FMTUI_BEGIN + 26)
-#define DLG_NEW_COLL (RC_FMTUI_BEGIN + 28)
+#define DLG_DOC_STYLE (RC_FMTUI_BEGIN + 26)
+#define DLG_NEW_COLL (RC_FMTUI_BEGIN + 28)
-#define DLG_TEMPLATE_PI (RC_FMTUI_BEGIN + 29)
-#define DLG_HELP_ID (RC_FMTUI_BEGIN + 30)
+#define DLG_TEMPLATE_PI (RC_FMTUI_BEGIN + 29)
+#define DLG_HELP_ID (RC_FMTUI_BEGIN + 30)
-#define STR_OVERWRITE (RC_FMTUI_BEGIN + 32)
-#define ST_CUSTOMIZE 1
+#define STR_OVERWRITE (RC_FMTUI_BEGIN + 32)
+#define ST_CUSTOMIZE 1
// die Abstaende zur Basis 2 nicht aendern !!!!
-#define DLG_TEMPLATE_BASE (RC_FMTUI_BEGIN + 40)
-#define DLG_TEMPLATE_1 (RC_FMTUI_BEGIN + 41)
-#define DLG_TEMPLATE_2 (RC_FMTUI_BEGIN + 42)
-#define DLG_TEMPLATE_3 (RC_FMTUI_BEGIN + 44)
-#define DLG_TEMPLATE_4 (RC_FMTUI_BEGIN + 48)
-#define DLG_TEMPLATE_5 (RC_FMTUI_BEGIN + 56)
+#define DLG_TEMPLATE_BASE (RC_FMTUI_BEGIN + 40)
+#define DLG_TEMPLATE_1 (RC_FMTUI_BEGIN + 41)
+#define DLG_TEMPLATE_2 (RC_FMTUI_BEGIN + 42)
+#define DLG_TEMPLATE_3 (RC_FMTUI_BEGIN + 44)
+#define DLG_TEMPLATE_4 (RC_FMTUI_BEGIN + 48)
+#define DLG_TEMPLATE_5 (RC_FMTUI_BEGIN + 56)
#if DLG_TEMPLATE_5 > RC_FMTUI_END
#error Resource-Id Ueberlauf in #file, #line
#endif
-#define TEMPLATEPI_IDX_ALL 1
-#define TEMPLATEPI_IDX_USED 2
-#define TEMPLATEPI_IDX_USER 3
-#define TEMPLATEPI_IDX_AUTOMATIC 4
-#define TEMPLATEPI_IDX_TEXT 5
-#define TEMPLATEPI_IDX_CHAPTER 6
-#define TEMPLATEPI_IDX_LIST 7
-#define TEMPLATEPI_IDX_IDX 8
-#define TEMPLATEPI_IDX_EXTRA 9
+#define TEMPLATEPI_IDX_ALL 1
+#define TEMPLATEPI_IDX_USED 2
+#define TEMPLATEPI_IDX_USER 3
+#define TEMPLATEPI_IDX_AUTOMATIC 4
+#define TEMPLATEPI_IDX_TEXT 5
+#define TEMPLATEPI_IDX_CHAPTER 6
+#define TEMPLATEPI_IDX_LIST 7
+#define TEMPLATEPI_IDX_IDX 8
+#define TEMPLATEPI_IDX_EXTRA 9
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index f9661580e5b5..8cbccecc0286 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -2,7 +2,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
@@ -40,12 +40,12 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
{
- String sTargetFrameName; // in diesen Frame soll die URL
- String sURL; //Einfache URL
- String sName; // Name des Anchors
- ImageMap *pMap; //ClientSide Images
+ String sTargetFrameName; // in diesen Frame soll die URL
+ String sURL; //Einfache URL
+ String sName; // Name des Anchors
+ ImageMap *pMap; //ClientSide Images
- BOOL bIsServerMap; //mit der URL eine ServerSideImageMap
+ BOOL bIsServerMap; //mit der URL eine ServerSideImageMap
SwFmtURL& operator=( const SwFmtURL& );
@@ -59,27 +59,27 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; }
void SetURL( const String &rURL, BOOL bServerMap );
- void SetMap( const ImageMap *pM ); //Pointer wird kopiert!
+ void SetMap( const ImageMap *pM ); //Pointer wird kopiert!
const String &GetTargetFrameName()const { return sTargetFrameName; }
- const String &GetURL() const { return sURL; }
- BOOL IsServerMap() const { return bIsServerMap; }
- const ImageMap *GetMap() const { return pMap; }
- ImageMap *GetMap() { return pMap; }
+ const String &GetURL() const { return sURL; }
+ BOOL IsServerMap() const { return bIsServerMap; }
+ const ImageMap *GetMap() const { return pMap; }
+ ImageMap *GetMap() { return pMap; }
- const String& GetName() const { return sName; }
- void SetName( const String& rNm ) { sName = rNm; }
+ const String& GetName() const { return sName; }
+ void SetName( const String& rNm ) { sName = rNm; }
};
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index d7b0a1176961..76052e3ac128 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index ecb2de67cfbb..ac4d1f513580 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,7 +2,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
@@ -30,9 +30,9 @@
#include <tools/solar.h>
#include "swdllapi.h"
-#include <errhdl.hxx> // fuer ASSERT
-#include <swatrset.hxx> // fuer SfxItemPool/-Set, Attr forward decl.
-#include <calbck.hxx> // fuer SwModify
+#include <errhdl.hxx> // fuer ASSERT
+#include <swatrset.hxx> // fuer SfxItemPool/-Set, Attr forward decl.
+#include <calbck.hxx> // fuer SwModify
#include <hintids.hxx>
class IDocumentSettingAccess;
@@ -52,17 +52,17 @@ class SW_DLLPUBLIC SwFmt : public SwModify
SwAttrSet aSet;
USHORT nWhichId;
- USHORT nFmtId; // Format-ID fuer Lesen/Schreiben
- USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte Formate
+ USHORT nFmtId; // Format-ID fuer Lesen/Schreiben
+ USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte Formate
// (ist keine harte Attributierung !!)
- USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage
- BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen
- BOOL bWritten : 1; // TRUE: bereits geschrieben
- BOOL bAutoFmt : 1; // FALSE: es handelt sich um eine Vorlage
+ USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage
+ BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen
+ BOOL bWritten : 1; // TRUE: bereits geschrieben
+ BOOL bAutoFmt : 1; // FALSE: es handelt sich um eine Vorlage
// ist dflt immer auf TRUE !
- BOOL bFmtInDTOR : 1; // TRUE: das Format wird geloscht. Damit man in
+ BOOL bFmtInDTOR : 1; // TRUE: das Format wird geloscht. Damit man in
// der FmtChg-Message das erkennen kann!!!
- BOOL bAutoUpdateFmt : 1; // TRUE: am Format werden die Attribute
+ BOOL bAutoUpdateFmt : 1; // TRUE: am Format werden die Attribute
// eines kompletten Absatzes gesetzt (UI-seitig!)
protected:
@@ -73,7 +73,7 @@ protected:
SwFmt( const SwFmt& rFmt );
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
virtual ~SwFmt();
SwFmt &operator=(const SwFmt&);
@@ -118,7 +118,7 @@ public:
inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
inline BOOL IsDefault() const { return DerivedFrom() == 0; }
- inline const String& GetName() const { return aFmtName; }
+ inline const String& GetName() const { return aFmtName; }
void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False );
inline void SetName( const sal_Char* pNewName,
sal_Bool bBroadcast=sal_False);
@@ -128,8 +128,8 @@ public:
// Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
// im Zugriff.
- const SwDoc *GetDoc() const { return aSet.GetDoc(); }
- SwDoc *GetDoc() { return aSet.GetDoc(); }
+ const SwDoc *GetDoc() const { return aSet.GetDoc(); }
+ SwDoc *GetDoc() { return aSet.GetDoc(); }
/** Provides access to the document settings interface
*/
@@ -168,25 +168,25 @@ public:
void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; }
// erfrage die Attribut-Beschreibung, returnt den reingereichten String
void GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const
- { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
+ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const
+ { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
// Das Format-ID fuer Lesen/Schreiben:
void ResetWritten() { bWritten = FALSE; }
// Abfragen/Setzen vom AutoFmt-Flag
- BOOL IsAuto() const { return bAutoFmt; }
- void SetAuto( BOOL bNew = FALSE ) { bAutoFmt = bNew; }
+ BOOL IsAuto() const { return bAutoFmt; }
+ void SetAuto( BOOL bNew = FALSE ) { bAutoFmt = bNew; }
// Abfragen/Setzen vom bAutoUpdateFmt-Flag
- BOOL IsAutoUpdateFmt() const { return bAutoUpdateFmt; }
- void SetAutoUpdateFmt( BOOL bNew = TRUE ) { bAutoUpdateFmt = bNew; }
+ BOOL IsAutoUpdateFmt() const { return bAutoUpdateFmt; }
+ void SetAutoUpdateFmt( BOOL bNew = TRUE ) { bAutoUpdateFmt = bNew; }
BOOL IsFmtInDTOR() const { return bFmtInDTOR; }
// GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in
- // den Parents gesucht werden soll. Wird nichts gefunden,
- // wird das deflt. Attribut returnt.
- // Charakter-Attribute - impl. steht im charatr.hxx
+ // den Parents gesucht werden soll. Wird nichts gefunden,
+ // wird das deflt. Attribut returnt.
+ // Charakter-Attribute - impl. steht im charatr.hxx
// AMA 12.10.94: Umstellung von SwFmt... auf Svx...
inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const;
inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const;
@@ -207,8 +207,8 @@ public:
inline const SvxEscapementItem &GetEscapement( BOOL = TRUE ) const;
inline const SvxCaseMapItem &GetCaseMap( BOOL = TRUE ) const;
inline const SvxNoHyphenItem &GetNoHyphenHere( BOOL = TRUE ) const;
- inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const;
- inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const;
+ inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const;
+ inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const;
inline const SvxFontItem &GetCJKFont( BOOL = TRUE ) const;
inline const SvxFontHeightItem &GetCJKSize( BOOL = TRUE ) const;
@@ -228,7 +228,7 @@ public:
inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const;
inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const;
- // Frame-Attribute - impl. steht im frmatr.hxx,
+ // Frame-Attribute - impl. steht im frmatr.hxx,
inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const;
inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const;
inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const;
@@ -269,7 +269,7 @@ public:
// OD 2004-05-05 #i28701#
inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
- // Grafik-Attribute - impl. steht im grfatr.hxx
+ // Grafik-Attribute - impl. steht im grfatr.hxx
inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const;
inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const;
inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const;
@@ -283,7 +283,7 @@ public:
inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const;
inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const;
- // Paragraph-Attribute - impl. steht im paratr.hxx
+ // Paragraph-Attribute - impl. steht im paratr.hxx
inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const;
inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const;
inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const;
@@ -301,7 +301,7 @@ public:
inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const;
inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
- // TabellenBox-Attribute - impl. steht im cellatr.hxx
+ // TabellenBox-Attribute - impl. steht im cellatr.hxx
inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const;
inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const;
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index fe839a140411..2743719ed38f 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -2,7 +2,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
@@ -28,14 +28,14 @@
#ifndef _FRMATR_HXX
#define _FRMATR_HXX
-#include <hintids.hxx> //die Ids der Attribute, vor frmitems damit die
-#include <format.hxx> //fuer Implementierung der inlines
+#include <hintids.hxx> //die Ids der Attribute, vor frmitems damit die
+#include <format.hxx> //fuer Implementierung der inlines
//------------------------ Inlines ---------------------------------
/******************************************************************************
- * Implementierung der FrameAttribut Methoden vom SwAttrSet
+ * Implementierung der FrameAttribut Methoden vom SwAttrSet
******************************************************************************/
inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const
@@ -67,7 +67,7 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(BOOL bInP) const
/******************************************************************************
- * Implementierung der FrameAttribut Methoden vom SwFmt
+ * Implementierung der FrameAttribut Methoden vom SwFmt
******************************************************************************/
inline const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const
@@ -94,9 +94,9 @@ inline const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const
{ return aSet.GetBreak(bInP); }
inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
{ return aSet.GetMacro(bInP); }
-inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const
+inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const
{ return aSet.GetFrmDir(bInP); }
-
+
#endif //_FRMATR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 8427b69a25b3..6cf2790d4989 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@ class SdrObject;
class SW_DLLPUBLIC SwFrmFmt: public SwFmt
{
friend class SwDoc;
- friend class SwPageDesc; //darf den protected CTor rufen.
+ friend class SwPageDesc; //darf den protected CTor rufen.
::com::sun::star::uno::WeakReference<
::com::sun::star::uno::XInterface> m_wXObject;
@@ -72,7 +72,7 @@ protected:
{}
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
//Vernichtet alle Frms in aDepend (Frms werden per PTR_CAST erkannt).
virtual void DelFrms();
@@ -86,8 +86,8 @@ public:
// returnt das IMapObject, das an dem Format (Fly), in der ImageMap
// an der Point Position definiert ist.
- // rPoint - teste auf der DocPosition
- // pFly - optionaler FlyFrame, falls der schon bekannt ist.
+ // rPoint - teste auf der DocPosition
+ // pFly - optionaler FlyFrame, falls der schon bekannt ist.
IMapObject* GetIMapObject( const Point& rPoint,
const SwFlyFrm *pFly = 0 ) const;
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 079aa046faba..76391bafe764 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ class SwSectionNode;
// ueberall, wo der NodeIndex gebraucht wird, werden die hier fehlenden
// Headerfiles schon includes. Darum hier nur als define und nicht als
// inline Methode (spart Compile-Zeit)
-#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex())
+#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex())
typedef SwTxtFtn* SwTxtFtnPtr;
@@ -50,8 +50,8 @@ class SwFtnIdxs : public _SwFtnIdxs
public:
SwFtnIdxs() {}
- void UpdateFtn( const SwNodeIndex& rStt ); // ab Pos. alle Updaten
- void UpdateAllFtn(); // alle Fussnoten updaten
+ void UpdateFtn( const SwNodeIndex& rStt ); // ab Pos. alle Updaten
+ void UpdateAllFtn(); // alle Fussnoten updaten
SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, USHORT* pPos = 0 ) const;
};
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 0114e115da17..32c9d4e087c5 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -2,7 +2,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
@@ -40,17 +40,17 @@ class SwDoc;
class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
{
- SwDepend aPageDescDep;
- SwDepend aCharFmtDep, aAnchorCharFmtDep;
- String sPrefix;
- String sSuffix;
+ SwDepend aPageDescDep;
+ SwDepend aCharFmtDep, aAnchorCharFmtDep;
+ String sPrefix;
+ String sSuffix;
protected:
bool m_bEndNote;
public:
SvxNumberType aFmt;
- USHORT nFtnOffset;
+ USHORT nFtnOffset;
- void ChgPageDesc( SwPageDesc *pDesc );
+ void ChgPageDesc( SwPageDesc *pDesc );
SwPageDesc *GetPageDesc( SwDoc &rDoc ) const;
SwClient *GetPageDescDep() const { return (SwClient*)&aPageDescDep; }
@@ -73,11 +73,11 @@ public:
SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
SwEndNoteInfo(const SwEndNoteInfo&);
- const String& GetPrefix() const { return sPrefix; }
- const String& GetSuffix() const { return sSuffix; }
+ const String& GetPrefix() const { return sPrefix; }
+ const String& GetSuffix() const { return sSuffix; }
- void SetPrefix(const String& rSet) { sPrefix = rSet; }
- void SetSuffix(const String& rSet) { sSuffix = rSet; }
+ void SetPrefix(const String& rSet) { sPrefix = rSet; }
+ void SetSuffix(const String& rSet) { sSuffix = rSet; }
};
enum SwFtnPos
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo
public:
String aQuoVadis;
- String aErgoSum;
+ String aErgoSum;
SwFtnPos ePos;
SwFtnNum eNum;
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 709a25692cd7..984bac601792 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -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
@@ -36,11 +36,11 @@
// STRINGS -----------------------------------------------------------
-#define STR_DLLNOTFOUND (RC_GLOBALS_BEGIN + 0)
-#define STR_FMT_STD (RC_GLOBALS_BEGIN + 1)
-#define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
+#define STR_DLLNOTFOUND (RC_GLOBALS_BEGIN + 0)
+#define STR_FMT_STD (RC_GLOBALS_BEGIN + 1)
+#define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
-#define STR_SEPARATOR (RC_GLOBALS_BEGIN + 4)
+#define STR_SEPARATOR (RC_GLOBALS_BEGIN + 4)
#define STR_BASIC_IMPORT (RC_GLOBALS_BEGIN + 5)
@@ -48,14 +48,14 @@
#define STR_BASIC_END (RC_GLOBALS_BEGIN + 7)
#define STR_BASIC_REC_LIB (RC_GLOBALS_BEGIN + 8)
#define STR_TEMPLATE_WILDCARD (RC_GLOBALS_BEGIN + 9)
-#define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10)
+#define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10)
-#define STR_PAGE (RC_GLOBALS_BEGIN + 14)
+#define STR_PAGE (RC_GLOBALS_BEGIN + 14)
#define STR_PRINTOPTUI (RC_GLOBALS_BEGIN + 15)
//EventStrings
-#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 17 )
+#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 17 )
#define STR_EVENT_START_INS_GLOSSARY ( RC_GLOBALS_BEGIN + 18 )
#define STR_EVENT_END_INS_GLOSSARY ( RC_GLOBALS_BEGIN + 19 )
#define STR_EVENT_MOUSEOVER_OBJECT ( RC_GLOBALS_BEGIN + 20 )
@@ -64,21 +64,21 @@
#define STR_EVENT_IMAGE_LOAD ( RC_GLOBALS_BEGIN + 23 )
#define STR_EVENT_IMAGE_ABORT ( RC_GLOBALS_BEGIN + 24 )
#define STR_EVENT_IMAGE_ERROR ( RC_GLOBALS_BEGIN + 25 )
-#define STR_EVENT_FRM_KEYINPUT_A ( RC_GLOBALS_BEGIN + 26 )
-#define STR_EVENT_FRM_KEYINPUT_NOA ( RC_GLOBALS_BEGIN + 27 )
+#define STR_EVENT_FRM_KEYINPUT_A ( RC_GLOBALS_BEGIN + 26 )
+#define STR_EVENT_FRM_KEYINPUT_NOA ( RC_GLOBALS_BEGIN + 27 )
#define STR_EVENT_FRM_RESIZE ( RC_GLOBALS_BEGIN + 28 )
-#define STR_EVENT_FRM_MOVE ( RC_GLOBALS_BEGIN + 29 )
+#define STR_EVENT_FRM_MOVE ( RC_GLOBALS_BEGIN + 29 )
// Strings fuer Rahmenausrichtungen im Popup
-#define STR_TOP_BASE (RC_GLOBALS_BEGIN + 30)
-#define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 31)
-#define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 32)
+#define STR_TOP_BASE (RC_GLOBALS_BEGIN + 30)
+#define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 31)
+#define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 32)
#define STR_TOP (RC_GLOBALS_BEGIN + 33)
#define STR_BOTTOM (RC_GLOBALS_BEGIN + 34)
#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 35)
#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 36)
-#define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 37)
+#define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 37)
#define STR_AUTH (RC_GLOBALS_BEGIN + 38)
#define STR_TBL (RC_GLOBALS_BEGIN + 39)
@@ -89,28 +89,28 @@
// BITMAPS -----------------------------------------------------------
-#define RES_TABL (RC_GLOBALS_BEGIN + 1)
-#define RES_TABR (RC_GLOBALS_BEGIN + 2)
-#define RES_TABD (RC_GLOBALS_BEGIN + 3)
-#define RES_TABC (RC_GLOBALS_BEGIN + 4)
+#define RES_TABL (RC_GLOBALS_BEGIN + 1)
+#define RES_TABR (RC_GLOBALS_BEGIN + 2)
+#define RES_TABD (RC_GLOBALS_BEGIN + 3)
+#define RES_TABC (RC_GLOBALS_BEGIN + 4)
// DIALOGE -----------------------------------------------------------
-#define DLG_LISTBOX (RC_GLOBALS_BEGIN + 1)
-#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
-#define DLG_SPECIAL (RC_GLOBALS_BEGIN + 3)
+#define DLG_LISTBOX (RC_GLOBALS_BEGIN + 1)
+#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
+#define DLG_SPECIAL (RC_GLOBALS_BEGIN + 3)
// QUERYBOX ---------------------------------------------------------
-#define DLG_WRAP (RC_GLOBALS_BEGIN + 4)
-#define DLG_BODY (RC_GLOBALS_BEGIN + 5)
-#define DLG_PRT_FIELDNAME (RC_GLOBALS_BEGIN + 6)
+#define DLG_WRAP (RC_GLOBALS_BEGIN + 4)
+#define DLG_BODY (RC_GLOBALS_BEGIN + 5)
+#define DLG_PRT_FIELDNAME (RC_GLOBALS_BEGIN + 6)
// INFOBOX ------------------------------------------------------------
-#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
-#define ERR_CLPBRD_WRITE (RC_GLOBALS_BEGIN + 2)
-#define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
+#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
+#define ERR_CLPBRD_WRITE (RC_GLOBALS_BEGIN + 2)
+#define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
// ACC ---------------------------------------------------------------
@@ -140,68 +140,68 @@
#define FN_NEXT_SENT_SEL (RC_GLOBALS_BEGIN + 23) // NextSentence
#define FN_PREV_SENT_SEL (RC_GLOBALS_BEGIN + 24) // PrevSentence
-#define FN_START_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 25)
-#define FN_END_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 26)
-#define FN_START_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 27)
-#define FN_END_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 28)
-#define FN_PAGEUP_SEL (RC_GLOBALS_BEGIN + 29)
-#define FN_PAGEDOWN_SEL (RC_GLOBALS_BEGIN + 30)
+#define FN_START_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 25)
+#define FN_END_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 26)
+#define FN_START_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 27)
+#define FN_END_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 28)
+#define FN_PAGEUP_SEL (RC_GLOBALS_BEGIN + 29)
+#define FN_PAGEDOWN_SEL (RC_GLOBALS_BEGIN + 30)
// TABPAGES -----------------------------------------------------------
-#define TP_PAGE_STD (RC_GLOBALS_BEGIN + 1)
-#define TP_PAGE_EXT (RC_GLOBALS_BEGIN + 2)
+#define TP_PAGE_STD (RC_GLOBALS_BEGIN + 1)
+#define TP_PAGE_EXT (RC_GLOBALS_BEGIN + 2)
-#define TP_PARA_STD (RC_GLOBALS_BEGIN + 3)
-#define TP_PARA_EXT (RC_GLOBALS_BEGIN + 4)
+#define TP_PARA_STD (RC_GLOBALS_BEGIN + 3)
+#define TP_PARA_EXT (RC_GLOBALS_BEGIN + 4)
-#define TP_FRAME_STD (RC_GLOBALS_BEGIN + 5)
-#define TP_FRAME_EXT (RC_GLOBALS_BEGIN + 6)
+#define TP_FRAME_STD (RC_GLOBALS_BEGIN + 5)
+#define TP_FRAME_EXT (RC_GLOBALS_BEGIN + 6)
-#define TP_CHAR_STD (RC_GLOBALS_BEGIN + 7)
-#define TP_CHAR_EXT (RC_GLOBALS_BEGIN + 8)
+#define TP_CHAR_STD (RC_GLOBALS_BEGIN + 7)
+#define TP_CHAR_EXT (RC_GLOBALS_BEGIN + 8)
-#define TP_TABULATOR (RC_GLOBALS_BEGIN + 9)
-#define TP_DROPCAPS (RC_GLOBALS_BEGIN + 10)
-#define TP_BACKGROUND (RC_GLOBALS_BEGIN + 11)
-#define TP_BORDER (RC_GLOBALS_BEGIN + 12)
-#define TP_COLUMN (RC_GLOBALS_BEGIN + 13)
+#define TP_TABULATOR (RC_GLOBALS_BEGIN + 9)
+#define TP_DROPCAPS (RC_GLOBALS_BEGIN + 10)
+#define TP_BACKGROUND (RC_GLOBALS_BEGIN + 11)
+#define TP_BORDER (RC_GLOBALS_BEGIN + 12)
+#define TP_COLUMN (RC_GLOBALS_BEGIN + 13)
-#define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15)
+#define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15)
-#define TP_HEADER_PAGE (RC_GLOBALS_BEGIN + 16)
-#define TP_FOOTER_PAGE (RC_GLOBALS_BEGIN + 17)
-#define TP_FOOTNOTE_PAGE (RC_GLOBALS_BEGIN + 18)
+#define TP_HEADER_PAGE (RC_GLOBALS_BEGIN + 16)
+#define TP_FOOTER_PAGE (RC_GLOBALS_BEGIN + 17)
+#define TP_FOOTNOTE_PAGE (RC_GLOBALS_BEGIN + 18)
#define TP_OPTGENERAL_PAGE (RC_GLOBALS_BEGIN + 19) //Sfx-Seiten
-#define TP_OPTSAVE_PAGE (RC_GLOBALS_BEGIN + 20)
-#define TP_OPTPATH_PAGE (RC_GLOBALS_BEGIN + 21)
-#define TP_OPTSPELL_PAGE (RC_GLOBALS_BEGIN + 22)
+#define TP_OPTSAVE_PAGE (RC_GLOBALS_BEGIN + 20)
+#define TP_OPTPATH_PAGE (RC_GLOBALS_BEGIN + 21)
+#define TP_OPTSPELL_PAGE (RC_GLOBALS_BEGIN + 22)
//Sw-Seiten
-#define SW_EDIT_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 23)
+#define SW_EDIT_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 23)
#define SW_BROWSER_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 24)
-#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25)
-#define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26)
-#define TP_OPTCOLOR_PAGE (RC_GLOBALS_BEGIN + 27)
+#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25)
+#define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26)
+#define TP_OPTCOLOR_PAGE (RC_GLOBALS_BEGIN + 27)
#define SW_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 28)
#define SW_OPTIONS_TDLG_ELEM (RC_GLOBALS_BEGIN + 29)
#define SW_OPTIONS_TDLG_PRINT (RC_GLOBALS_BEGIN + 30)
-#define TP_FRM_STD (RC_GLOBALS_BEGIN + 31)
+#define TP_FRM_STD (RC_GLOBALS_BEGIN + 31)
-#define TP_OPTGRID_PAGE (RC_GLOBALS_BEGIN + 33)
+#define TP_OPTGRID_PAGE (RC_GLOBALS_BEGIN + 33)
-#define TP_FORMAT_TABLE (RC_GLOBALS_BEGIN + 34)
-#define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35)
+#define TP_FORMAT_TABLE (RC_GLOBALS_BEGIN + 34)
+#define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35)
-#define DLG_FRM_STD (RC_GLOBALS_BEGIN + 36)
-#define DLG_FRM_GRF (RC_GLOBALS_BEGIN + 37)
-#define DLG_FRM_OLE (RC_GLOBALS_BEGIN + 38)
+#define DLG_FRM_STD (RC_GLOBALS_BEGIN + 36)
+#define DLG_FRM_GRF (RC_GLOBALS_BEGIN + 37)
+#define DLG_FRM_OLE (RC_GLOBALS_BEGIN + 38)
-#define RID_INPUT_TOOLBOX (RC_GLOBALS_BEGIN + 39)
+#define RID_INPUT_TOOLBOX (RC_GLOBALS_BEGIN + 39)
-#define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40)
+#define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40)
#define TP_FRM_URL (RC_GLOBALS_BEGIN + 42)
#define TP_CHAR_URL (RC_GLOBALS_BEGIN + 43)
@@ -222,7 +222,7 @@
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
#define TP_OPTTABLE_PAGE (RC_GLOBALS_BEGIN + 56)
-#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
+#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
#define DLG_NUM_BULLET (RC_GLOBALS_BEGIN + 58)
#define TP_PICK_SINGLE_NUM (RC_GLOBALS_BEGIN + 59)
@@ -230,50 +230,50 @@
#define TP_PICK_NUM (RC_GLOBALS_BEGIN + 61)
#define TP_PICK_BMP (RC_GLOBALS_BEGIN + 62)
-#define TP_FLD_DB (RC_GLOBALS_BEGIN + 64)
-#define TP_FLD_DOKINF (RC_GLOBALS_BEGIN + 65)
-#define TP_FLD_VAR (RC_GLOBALS_BEGIN + 66)
-#define TP_FLD_DOK (RC_GLOBALS_BEGIN + 67)
-#define TP_FLD_FUNC (RC_GLOBALS_BEGIN + 68)
-#define TP_FLD_REF (RC_GLOBALS_BEGIN + 69)
+#define TP_FLD_DB (RC_GLOBALS_BEGIN + 64)
+#define TP_FLD_DOKINF (RC_GLOBALS_BEGIN + 65)
+#define TP_FLD_VAR (RC_GLOBALS_BEGIN + 66)
+#define TP_FLD_DOK (RC_GLOBALS_BEGIN + 67)
+#define TP_FLD_FUNC (RC_GLOBALS_BEGIN + 68)
+#define TP_FLD_REF (RC_GLOBALS_BEGIN + 69)
-#define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70)
+#define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70)
#define TP_NUM_OPTIONS (RC_GLOBALS_BEGIN + 71)
#define TP_NUM_POSITION (RC_GLOBALS_BEGIN + 72)
-#define TP_NUMPARA (RC_GLOBALS_BEGIN + 73)
+#define TP_NUMPARA (RC_GLOBALS_BEGIN + 73)
-#define TP_REDLINE_OPT (RC_GLOBALS_BEGIN + 74)
+#define TP_REDLINE_OPT (RC_GLOBALS_BEGIN + 74)
-#define TP_LINENUMBERING (RC_GLOBALS_BEGIN + 75)
-#define TP_OUTLINE_NUM (RC_GLOBALS_BEGIN + 76)
+#define TP_LINENUMBERING (RC_GLOBALS_BEGIN + 75)
+#define TP_OUTLINE_NUM (RC_GLOBALS_BEGIN + 76)
#define TP_OPTINSERT_PAGE (RC_GLOBALS_BEGIN + 77)
-#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78)
+#define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78)
#define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79)
-#define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN + 80)
-#define TP_INSERT_TOX (RC_GLOBALS_BEGIN + 81)
-#define TP_TOX_FORM_ENTRY (RC_GLOBALS_BEGIN + 82)
-#define TP_TOX_FORM_STYLES (RC_GLOBALS_BEGIN + 83)
+#define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN + 80)
+#define TP_INSERT_TOX (RC_GLOBALS_BEGIN + 81)
+#define TP_TOX_FORM_ENTRY (RC_GLOBALS_BEGIN + 82)
+#define TP_TOX_FORM_STYLES (RC_GLOBALS_BEGIN + 83)
#define DLG_INSERT_TOX_TABDLG (RC_GLOBALS_BEGIN + 84)
#define TP_INSERT_SECTION (RC_GLOBALS_BEGIN + 85)
#define DLG_INSERT_SECTION (RC_GLOBALS_BEGIN + 86)
#define DLG_SECTION_PROPERTIES (RC_GLOBALS_BEGIN + 87)
#define DLG_RENAME_XNAMED (RC_GLOBALS_BEGIN + 88)
-#define DLG_MULTI_TOX (RC_GLOBALS_BEGIN + 89)
-#define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90)
+#define DLG_MULTI_TOX (RC_GLOBALS_BEGIN + 89)
+#define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90)
#define TP_TOX_ENTRY (RC_GLOBALS_BEGIN + 91)
#define TP_TOX_STYLES (RC_GLOBALS_BEGIN + 92)
#define TP_VISITING_CARDS (RC_GLOBALS_BEGIN + 93)
#define DLG_ADD_IDX_STYLES (RC_GLOBALS_BEGIN + 94)
-#define TP_PRIVATE_DATA (RC_GLOBALS_BEGIN + 95)
-#define TP_BUSINESS_DATA (RC_GLOBALS_BEGIN + 96)
-#define TP_SECTION_FTNENDNOTES (RC_GLOBALS_BEGIN + 97)
-#define TP_CHAR_POS (RC_GLOBALS_BEGIN + 98)
-#define TP_CHAR_TWOLN (RC_GLOBALS_BEGIN + 99)
+#define TP_PRIVATE_DATA (RC_GLOBALS_BEGIN + 95)
+#define TP_BUSINESS_DATA (RC_GLOBALS_BEGIN + 96)
+#define TP_SECTION_FTNENDNOTES (RC_GLOBALS_BEGIN + 97)
+#define TP_CHAR_POS (RC_GLOBALS_BEGIN + 98)
+#define TP_CHAR_TWOLN (RC_GLOBALS_BEGIN + 99)
#define TP_PARA_ASIAN (RC_GLOBALS_BEGIN + 100)
#define TP_TEXTGRID_PAGE (RC_GLOBALS_BEGIN + 101)
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
-#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
+#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104)
#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105)
//maximum: RC_GLOBALS_BEGIN + 120
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 4876cd79e57d..4f91c086caef 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ public:
SwGlobalDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
~SwGlobalDocShell();
- virtual void FillClass( SvGlobalName * pClassName,
+ virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pClipFormat,
String * pAppName,
String * pLongUserName,
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 89d3f156f149..5f968cb742fc 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -2,7 +2,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
@@ -28,17 +28,17 @@
#ifndef _GRFATR_HXX
#define _GRFATR_HXX
-#include <hintids.hxx> // fuer die WhichIds @@@ must be included first @@@
+#include <hintids.hxx> // fuer die WhichIds @@@ must be included first @@@
#include <tools/gen.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svx/grfcrop.hxx>
#include "swdllapi.h"
-#include <swatrset.hxx> // fuer inlines
-#include <format.hxx> // fuer inlines
+#include <swatrset.hxx> // fuer inlines
+#include <format.hxx> // fuer inlines
/******************************************************************************
- * class SwMirrorGrf
+ * class SwMirrorGrf
******************************************************************************/
enum MirrorGraph
@@ -68,17 +68,17 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
// pure virtual-Methiden von SfxEnumItem
- virtual USHORT GetValueCount() const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual USHORT GetValueCount() const;
+ virtual int operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
@@ -88,13 +88,13 @@ public:
return *this;
}
- inline BOOL IsGrfToggle() const { return bGrfToggle; }
- inline void SetGrfToggle( BOOL bNew ) { bGrfToggle = bNew; }
+ inline BOOL IsGrfToggle() const { return bGrfToggle; }
+ inline void SetGrfToggle( BOOL bNew ) { bGrfToggle = bNew; }
};
/******************************************************************************
- * class SwAttrCropGrf
+ * class SwAttrCropGrf
******************************************************************************/
class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
@@ -102,11 +102,11 @@ class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
public:
TYPEINFO();
SwCropGrf();
- SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight,
- sal_Int32 nTop, sal_Int32 nBottom );
+ SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight,
+ sal_Int32 nTop, sal_Int32 nBottom );
// "pure virtual Methoden" vom SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
};
class SwRotationGrf : public SfxUInt16Item
@@ -122,19 +122,19 @@ public:
// pure virtual-Methiden from SfxInt16Item
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; }
- const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
+ void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; }
+ const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
};
class SW_DLLPUBLIC SwLuminanceGrf : public SfxInt16Item
@@ -229,22 +229,22 @@ public:
}
// pure virtual-Methiden von SfxEnumItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- const double& GetValue() const { return nValue; }
- void SetValue( const double& rVal ) { nValue = rVal; }
+ const double& GetValue() const { return nValue; }
+ void SetValue( const double& rVal ) { nValue = rVal; }
};
class SwInvertGrf: public SfxBoolItem
@@ -277,9 +277,9 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
};
@@ -291,26 +291,26 @@ public:
{}
// pure virtual-Methoden von SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
// pure virtual-Methiden von SfxEnumItem
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
};
/******************************************************************************
- * Implementierung der GrafikAttribut Methoden vom SwAttrSet
+ * Implementierung der GrafikAttribut Methoden vom SwAttrSet
******************************************************************************/
inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const
@@ -335,11 +335,11 @@ inline const SwInvertGrf &SwAttrSet::GetInvertGrf(BOOL bInP) const
{ return (const SwInvertGrf&)Get( RES_GRFATR_INVERT,bInP); }
inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(BOOL bInP) const
{ return (const SwTransparencyGrf&)Get( RES_GRFATR_TRANSPARENCY,bInP); }
-inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const
+inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const
{ return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); }
/******************************************************************************
- * Implementierung der GrafikAttribut Methoden vom SwFmt
+ * Implementierung der GrafikAttribut Methoden vom SwFmt
******************************************************************************/
inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const
@@ -358,7 +358,7 @@ inline const SwChannelGGrf &SwFmt::GetChannelGGrf(BOOL bInP) const
{ return aSet.GetChannelGGrf( bInP); }
inline const SwChannelBGrf &SwFmt::GetChannelBGrf(BOOL bInP) const
{ return aSet.GetChannelBGrf( bInP); }
-inline const SwGammaGrf &SwFmt::GetGammaGrf(BOOL bInP) const
+inline const SwGammaGrf &SwFmt::GetGammaGrf(BOOL bInP) const
{ return aSet.GetGammaGrf( bInP); }
inline const SwInvertGrf &SwFmt::GetInvertGrf(BOOL bInP) const
{ return aSet.GetInvertGrf( bInP); }
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 049abfa1afd3..d6fc29498bad 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -2,7 +2,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
@@ -29,74 +29,74 @@
#include <svl/solar.hrc>
#endif
-#define HID_BASE HID_APP_START
+#define HID_BASE HID_APP_START
-#define HID_BIB_BASE (HID_BASE + 1)
-#define HID_DBSEL (HID_BASE + 2)
-#define HID_DBEDIT (HID_BASE + 3)
-#define HID_PRINT_OPTION (HID_BASE + 4)
+#define HID_BIB_BASE (HID_BASE + 1)
+#define HID_DBSEL (HID_BASE + 2)
+#define HID_DBEDIT (HID_BASE + 3)
+#define HID_PRINT_OPTION (HID_BASE + 4)
#define HID_MERGE_PRINTMONITOR (HID_BASE + 5)
-#define HID_FLD_INPUT (HID_BASE + 6)
-#define HID_CONFIG_MISC (HID_BASE + 7)
-#define HID_CONFIG_PATH (HID_BASE + 8)
-#define HID_CONFIG_TB (HID_BASE + 9)
-#define HID_PG_FOOTNOTE (HID_BASE + 10)
-#define HID_FORMAT_GRAPHIC (HID_BASE + 11)
-#define HID_FILTERSTATUS (HID_BASE + 12)
-#define HID_DOCINFO_EDT (HID_BASE + 13)
-#define HID_DBLOGON (HID_BASE + 14)
-#define HID_MAC_ASSIGN (HID_BASE + 15)
-#define HID_CONFIG_MN (HID_BASE + 16)
-#define HID_PAPERSIZE (HID_BASE + 17)
-#define HID_PASSWD (HID_BASE + 18)
-#define HID_SPELLING_OPTIONS (HID_BASE + 19)
-#define HID_HYPHENATE_OPTIONS (HID_BASE + 20)
-#define HID_FORMAT_COLUMN (HID_BASE + 21)
-#define HID_CONFIG_SAVE (HID_BASE + 22)
-#define HID_NUM_NAMES (HID_BASE + 23)
-#define HID_SYMBOL_SELECT (HID_BASE + 24)
-#define HID_CONFIG_KY (HID_BASE + 25)
-#define HID_LINKEDIT (HID_BASE + 26)
-#define HID_GRAPHIC_PREVIEW (HID_BASE + 28)
-#define HID_DICTIONARY (HID_BASE + 29)
-#define HID_SET_STYLE (HID_BASE + 30)
-#define HID_RIBBONBAR (HID_BASE + 31)
-#define HID_STATUSLINE (HID_BASE + 32)
-#define HID_DOCBAR (HID_BASE + 33)
-#define HID_VRULER (HID_BASE + 34)
-#define HID_MAKRO_WINDOW (HID_BASE + 35)
-#define HID_ENVELOP_FORMAT (HID_BASE + 37)
-#define HID_ENVELOP_PRINTER (HID_BASE + 38)
-
-#define HID_HEADER_FOOTER_DLG (HID_BASE + 39)
-#define HID_GRID_DLG (HID_BASE + 40)
-#define HID_USER_ADDRESS_DLG (HID_BASE + 41)
-#define HID_SELECT_FAX_DLG (HID_BASE + 42)
-
-#define HID_LABEL_FORMAT (HID_BASE + 43)
-#define HID_BRSORT (HID_BASE + 44)
-#define HID_BRSEEK (HID_BASE + 45)
-#define HID_BRCFG (HID_BASE + 46)
-
-#define HID_FORMEDT_CONTENT (HID_BASE + 47)
-#define HID_FORMEDT_USER (HID_BASE + 48)
-#define HID_FORMEDT_INDEX (HID_BASE + 49)
-
-#define HID_SCRL_PAGEUP (HID_BASE + 50)
-#define HID_SCRL_PAGEDOWN (HID_BASE + 51)
-
-#define HID_DRAW_WIN (HID_BASE + 52)
-#define HID_EDIT_WIN (HID_BASE + 53)
-
-#define HID_INSERT_CTRL (HID_BASE + 54) // TbxControl Einfuegen
+#define HID_FLD_INPUT (HID_BASE + 6)
+#define HID_CONFIG_MISC (HID_BASE + 7)
+#define HID_CONFIG_PATH (HID_BASE + 8)
+#define HID_CONFIG_TB (HID_BASE + 9)
+#define HID_PG_FOOTNOTE (HID_BASE + 10)
+#define HID_FORMAT_GRAPHIC (HID_BASE + 11)
+#define HID_FILTERSTATUS (HID_BASE + 12)
+#define HID_DOCINFO_EDT (HID_BASE + 13)
+#define HID_DBLOGON (HID_BASE + 14)
+#define HID_MAC_ASSIGN (HID_BASE + 15)
+#define HID_CONFIG_MN (HID_BASE + 16)
+#define HID_PAPERSIZE (HID_BASE + 17)
+#define HID_PASSWD (HID_BASE + 18)
+#define HID_SPELLING_OPTIONS (HID_BASE + 19)
+#define HID_HYPHENATE_OPTIONS (HID_BASE + 20)
+#define HID_FORMAT_COLUMN (HID_BASE + 21)
+#define HID_CONFIG_SAVE (HID_BASE + 22)
+#define HID_NUM_NAMES (HID_BASE + 23)
+#define HID_SYMBOL_SELECT (HID_BASE + 24)
+#define HID_CONFIG_KY (HID_BASE + 25)
+#define HID_LINKEDIT (HID_BASE + 26)
+#define HID_GRAPHIC_PREVIEW (HID_BASE + 28)
+#define HID_DICTIONARY (HID_BASE + 29)
+#define HID_SET_STYLE (HID_BASE + 30)
+#define HID_RIBBONBAR (HID_BASE + 31)
+#define HID_STATUSLINE (HID_BASE + 32)
+#define HID_DOCBAR (HID_BASE + 33)
+#define HID_VRULER (HID_BASE + 34)
+#define HID_MAKRO_WINDOW (HID_BASE + 35)
+#define HID_ENVELOP_FORMAT (HID_BASE + 37)
+#define HID_ENVELOP_PRINTER (HID_BASE + 38)
+
+#define HID_HEADER_FOOTER_DLG (HID_BASE + 39)
+#define HID_GRID_DLG (HID_BASE + 40)
+#define HID_USER_ADDRESS_DLG (HID_BASE + 41)
+#define HID_SELECT_FAX_DLG (HID_BASE + 42)
+
+#define HID_LABEL_FORMAT (HID_BASE + 43)
+#define HID_BRSORT (HID_BASE + 44)
+#define HID_BRSEEK (HID_BASE + 45)
+#define HID_BRCFG (HID_BASE + 46)
+
+#define HID_FORMEDT_CONTENT (HID_BASE + 47)
+#define HID_FORMEDT_USER (HID_BASE + 48)
+#define HID_FORMEDT_INDEX (HID_BASE + 49)
+
+#define HID_SCRL_PAGEUP (HID_BASE + 50)
+#define HID_SCRL_PAGEDOWN (HID_BASE + 51)
+
+#define HID_DRAW_WIN (HID_BASE + 52)
+#define HID_EDIT_WIN (HID_BASE + 53)
+
+#define HID_INSERT_CTRL (HID_BASE + 54) // TbxControl Einfuegen
#define HID_INSERT_OBJ_CTRL (HID_BASE + 55)
#define HID_INSERT_FIELD_CTRL (HID_BASE + 56)
-#define HID_SOURCEVIEW (HID_BASE + 57)
-#define HID_TBL_OPT_CTRL (HID_BASE + 58)
+#define HID_SOURCEVIEW (HID_BASE + 57)
+#define HID_TBL_OPT_CTRL (HID_BASE + 58)
#define HID_AUTOFORMAT_CLB (HID_BASE + 59)
-#define HID_SCRL_NAVI (HID_BASE + 60)
+#define HID_SCRL_NAVI (HID_BASE + 60)
#define HID_NAVI_DRAG_HYP (HID_BASE + 61)
#define HID_NAVI_DRAG_LINK (HID_BASE + 62)
#define HID_NAVI_DRAG_COPY (HID_BASE + 63)
@@ -105,22 +105,22 @@
#define HID_AUTOFORMAT_EXEC (HID_BASE + 65)
#define HID_AUTOFORMAT_CLOSE (HID_BASE + 66)
-#define HID_PAGEPREVIEW (HID_BASE + 67)
+#define HID_PAGEPREVIEW (HID_BASE + 67)
#define HID_SOURCE_EDITWIN (HID_BASE + 68)
// Dialog Help-IDs **********************************************************
-#define HID_CONVERT_FROM (HID_BASE + 200)
-#define HID_CONVERT_TO (HID_BASE + 201)
-#define HID_EDIT_POSTIT (HID_BASE + 202)
-#define HID_INSERT_CHART (HID_BASE + 203)
-#define HID_PAGE_PREVIEW (HID_BASE + 204)
-#define HID_INSERT_HYPERLINK (HID_BASE + 205)
-#define HID_NAVIGATOR_TREELIST (HID_BASE + 206)
+#define HID_CONVERT_FROM (HID_BASE + 200)
+#define HID_CONVERT_TO (HID_BASE + 201)
+#define HID_EDIT_POSTIT (HID_BASE + 202)
+#define HID_INSERT_CHART (HID_BASE + 203)
+#define HID_PAGE_PREVIEW (HID_BASE + 204)
+#define HID_INSERT_HYPERLINK (HID_BASE + 205)
+#define HID_NAVIGATOR_TREELIST (HID_BASE + 206)
#define HID_DLG_CAPTION (HID_BASE + 207)
#define HID_DLG_GLOSS_DECIDE (HID_BASE + 208)
-#define HID_NAVIGATOR_TOOLBOX (HID_BASE + 209)
-#define HID_NAVIGATOR_LISTBOX (HID_BASE + 210)
+#define HID_NAVIGATOR_TOOLBOX (HID_BASE + 209)
+#define HID_NAVIGATOR_LISTBOX (HID_BASE + 210)
#define HID_NUM_BULLET_DLG (HID_BASE + 211)
#define HID_VS_SINGLENUM (HID_BASE + 212)
#define HID_VS_NUM (HID_BASE + 213)
@@ -162,13 +162,13 @@
#define HID_NAVI_TBX23 (HID_BASE + 249)
#define HID_NAVI_TBX24 (HID_BASE + 250)
#define HID_NAVIGATOR_GLOBAL_TOOLBOX (HID_BASE + 251)
-#define HID_NAVIGATOR_GLOB_TREELIST (HID_BASE + 252)
-#define HID_GLOS_GROUP_TREE (HID_BASE + 253)
+#define HID_NAVIGATOR_GLOB_TREELIST (HID_BASE + 252)
+#define HID_GLOS_GROUP_TREE (HID_BASE + 253)
#define HID_GLBLTREE_UPDATE (HID_BASE + 254)
#define HID_GLBLTREE_INSERT (HID_BASE + 255)
-#define HID_GLBLTREE_EDIT (HID_BASE + 256)
-#define HID_GLBLTREE_DEL (HID_BASE + 257)
-#define HID_GLBLTREE_INS_IDX (HID_BASE + 258)
+#define HID_GLBLTREE_EDIT (HID_BASE + 256)
+#define HID_GLBLTREE_DEL (HID_BASE + 257)
+#define HID_GLBLTREE_INS_IDX (HID_BASE + 258)
#define HID_GLBLTREE_INS_CNTIDX (HID_BASE + 259)
#define HID_GLBLTREE_INS_USRIDX (HID_BASE + 260)
#define HID_GLBLTREE_INS_FILE (HID_BASE + 261)
@@ -177,47 +177,47 @@
#define HID_GLBLTREE_UPD_SEL (HID_BASE + 264)
#define HID_GLBLTREE_UPD_IDX (HID_BASE + 265)
#define HID_GLBLTREE_UPD_LINK (HID_BASE + 266)
-#define HID_GLBLTREEUPD_ALL (HID_BASE + 267)
-#define HID_NUM_OUTL_NAMED_NUMS (HID_BASE + 268)
-#define HID_NUM_OUTL_NUM_SAVEAS (HID_BASE + 269)
-#define HID_NUM_NAMED_NUMS (HID_BASE + 270)
-#define HID_NUM_NUM_SAVEAS (HID_BASE + 271)
-#define HID_NUM_STD_NUMBER (HID_BASE + 272)
-#define HID_NUM_DEL_NUMBER (HID_BASE + 273)
-#define HID_NUM_STD_BULLET (HID_BASE + 274)
-#define HID_NUM_DEL_BULLET (HID_BASE + 275)
-#define HID_NAVI_CONTENT (HID_BASE + 276)
-#define HID_NAVI_GLOBAL (HID_BASE + 277)
+#define HID_GLBLTREEUPD_ALL (HID_BASE + 267)
+#define HID_NUM_OUTL_NAMED_NUMS (HID_BASE + 268)
+#define HID_NUM_OUTL_NUM_SAVEAS (HID_BASE + 269)
+#define HID_NUM_NAMED_NUMS (HID_BASE + 270)
+#define HID_NUM_NUM_SAVEAS (HID_BASE + 271)
+#define HID_NUM_STD_NUMBER (HID_BASE + 272)
+#define HID_NUM_DEL_NUMBER (HID_BASE + 273)
+#define HID_NUM_STD_BULLET (HID_BASE + 274)
+#define HID_NUM_DEL_BULLET (HID_BASE + 275)
+#define HID_NAVI_CONTENT (HID_BASE + 276)
+#define HID_NAVI_GLOBAL (HID_BASE + 277)
#define HID_LTEMPL_NUMBERING (HID_BASE + 278)
-#define HID_FLDVAR_APPLY (HID_BASE + 279)
-#define HID_FLDVAR_DELETE (HID_BASE + 280)
-#define HID_FLDEDT_ADDRESS (HID_BASE + 281)
-#define HID_SORT_ACTION (HID_BASE + 282)
-#define HID_SORT_AUTHOR (HID_BASE + 283)
-#define HID_SORT_DATE (HID_BASE + 284)
-#define HID_SORT_COMMENT (HID_BASE + 285)
-#define HID_SW_SORT_POSITION (HID_BASE + 286)
-#define HID_SYNC_BTN (HID_BASE + 287)
-#define HID_EDIT_COMMENT (HID_BASE + 288)
-#define HID_SEL_TEMPLATE (HID_BASE + 289)
-#define HID_DLG_SEQUENCE_OPTION (HID_BASE + 290)
-#define HID_DLG_FLDEDT_NEXT (HID_BASE + 291)
-#define HID_DLG_FLDEDT_PREV (HID_BASE + 292)
-#define HID_DLG_FLDEDT_ADDRESS (HID_BASE + 293)
-#define HID_DLG_PRV_PRT_OPTIONS (HID_BASE + 294)
-
-#define HID_FILEDLG_CHARDLG (HID_BASE + 295)
-#define HID_FILEDLG_LOADTEMPLATE (HID_BASE + 296)
-#define HID_FILEDLG_ROMENU (HID_BASE + 297)
-#define HID_FILEDLG_MAILMRGE1 (HID_BASE + 298)
-#define HID_FILEDLG_MAILMRGE2 (HID_BASE + 299)
-#define HID_FILEDLG_FRMPAGE (HID_BASE + 300)
-#define HID_FILEDLG_SRCVIEW (HID_BASE + 301)
-#define HID_FILEDLG_WIZDOKU (HID_BASE + 302)
+#define HID_FLDVAR_APPLY (HID_BASE + 279)
+#define HID_FLDVAR_DELETE (HID_BASE + 280)
+#define HID_FLDEDT_ADDRESS (HID_BASE + 281)
+#define HID_SORT_ACTION (HID_BASE + 282)
+#define HID_SORT_AUTHOR (HID_BASE + 283)
+#define HID_SORT_DATE (HID_BASE + 284)
+#define HID_SORT_COMMENT (HID_BASE + 285)
+#define HID_SW_SORT_POSITION (HID_BASE + 286)
+#define HID_SYNC_BTN (HID_BASE + 287)
+#define HID_EDIT_COMMENT (HID_BASE + 288)
+#define HID_SEL_TEMPLATE (HID_BASE + 289)
+#define HID_DLG_SEQUENCE_OPTION (HID_BASE + 290)
+#define HID_DLG_FLDEDT_NEXT (HID_BASE + 291)
+#define HID_DLG_FLDEDT_PREV (HID_BASE + 292)
+#define HID_DLG_FLDEDT_ADDRESS (HID_BASE + 293)
+#define HID_DLG_PRV_PRT_OPTIONS (HID_BASE + 294)
+
+#define HID_FILEDLG_CHARDLG (HID_BASE + 295)
+#define HID_FILEDLG_LOADTEMPLATE (HID_BASE + 296)
+#define HID_FILEDLG_ROMENU (HID_BASE + 297)
+#define HID_FILEDLG_MAILMRGE1 (HID_BASE + 298)
+#define HID_FILEDLG_MAILMRGE2 (HID_BASE + 299)
+#define HID_FILEDLG_FRMPAGE (HID_BASE + 300)
+#define HID_FILEDLG_SRCVIEW (HID_BASE + 301)
+#define HID_FILEDLG_WIZDOKU (HID_BASE + 302)
#define HID_PREVIEW_ZOOM (HID_BASE + 303)
#define HID_REDLINE_AUTOFMT_ACCEPT (HID_BASE + 304)
-#define HID_MULTI_TOX_DLG (HID_BASE + 305)
+#define HID_MULTI_TOX_DLG (HID_BASE + 305)
#define HID_ASCII_FILTER (HID_BASE + 306)
#define HID_GLBLTREE_EDIT_LINK (HID_BASE + 307)
#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308)// #100286#
@@ -226,34 +226,34 @@
// TabPage Help-IDs *********************************************************
-#define HID_DROPCAPS (HID_BASE + 400)
-#define HID_FRM_EXT (HID_BASE + 401)
-#define HID_FRM_STD (HID_BASE + 402)
-#define HID_GRF_EXT (HID_BASE + 403)
-#define HID_COLUMN (HID_BASE + 404)
-#define HID_DOC_STAT (HID_BASE + 405)
-#define HID_MACROASSIGN (HID_BASE + 406)
-#define HID_FOOTNOTE_PAGE (HID_BASE + 407)
-#define HID_OPTDOCDISP_PAGE (HID_BASE + 408)
-#define HID_OPTGRID_PAGE (HID_BASE + 409)
-#define HID_OPTTEST_PAGE (HID_BASE + 410)
-#define HID_OPTPRINT_PAGE (HID_BASE + 411)
-#define HID_FORMAT_TABLE (HID_BASE + 412)
-#define HID_TABLE_COLUMN (HID_BASE + 413)
-#define HID_LAB_LAB (HID_BASE + 414)
-#define HID_LAB_PRT (HID_BASE + 415)
-#define HID_ENV_PRT (HID_BASE + 416)
-#define HID_LAB_FMT (HID_BASE + 417)
-#define HID_ENV_ENV (HID_BASE + 418)
-#define HID_ENV_FMT (HID_BASE + 419)
-#define HID_FRM_URL (HID_BASE + 421)
-#define HID_CHAR_URL (HID_BASE + 422)
+#define HID_DROPCAPS (HID_BASE + 400)
+#define HID_FRM_EXT (HID_BASE + 401)
+#define HID_FRM_STD (HID_BASE + 402)
+#define HID_GRF_EXT (HID_BASE + 403)
+#define HID_COLUMN (HID_BASE + 404)
+#define HID_DOC_STAT (HID_BASE + 405)
+#define HID_MACROASSIGN (HID_BASE + 406)
+#define HID_FOOTNOTE_PAGE (HID_BASE + 407)
+#define HID_OPTDOCDISP_PAGE (HID_BASE + 408)
+#define HID_OPTGRID_PAGE (HID_BASE + 409)
+#define HID_OPTTEST_PAGE (HID_BASE + 410)
+#define HID_OPTPRINT_PAGE (HID_BASE + 411)
+#define HID_FORMAT_TABLE (HID_BASE + 412)
+#define HID_TABLE_COLUMN (HID_BASE + 413)
+#define HID_LAB_LAB (HID_BASE + 414)
+#define HID_LAB_PRT (HID_BASE + 415)
+#define HID_ENV_PRT (HID_BASE + 416)
+#define HID_LAB_FMT (HID_BASE + 417)
+#define HID_ENV_ENV (HID_BASE + 418)
+#define HID_ENV_FMT (HID_BASE + 419)
+#define HID_FRM_URL (HID_BASE + 421)
+#define HID_CHAR_URL (HID_BASE + 422)
#define HID_CONTENT_OPT (HID_BASE + 423)
#define HID_LAYOUT_OPT (HID_BASE + 424)
#define HID_STD_FONT (HID_BASE + 425)
#define HID_COND_COLL (HID_BASE + 426)
-#define HID_FRM_ADD (HID_BASE + 427)
-#define HID_TABLE_TEXTFLOW (HID_BASE + 428)
+#define HID_FRM_ADD (HID_BASE + 427)
+#define HID_TABLE_TEXTFLOW (HID_BASE + 428)
#define HID_AUTOFMT_BY_INPUT (HID_BASE + 429)
#define HID_AUTOFMT_APPLY (HID_BASE + 430)
#define HID_OPTTABLE_PAGE (HID_BASE + 431)
@@ -262,93 +262,93 @@
#define HID_PICK_NUM (HID_BASE + 434)
#define HID_PICK_BMP (HID_BASE + 435)
-#define HID_FLD_DB (HID_BASE + 437)
-#define HID_FLD_DOKINF (HID_BASE + 438)
-#define HID_FLD_VAR (HID_BASE + 439)
-#define HID_FLD_DOK (HID_BASE + 440)
-#define HID_FLD_FUNC (HID_BASE + 441)
-#define HID_FLD_REF (HID_BASE + 442)
-#define HID_OPTSHDWCRSR (HID_BASE + 443)
+#define HID_FLD_DB (HID_BASE + 437)
+#define HID_FLD_DOKINF (HID_BASE + 438)
+#define HID_FLD_VAR (HID_BASE + 439)
+#define HID_FLD_DOK (HID_BASE + 440)
+#define HID_FLD_FUNC (HID_BASE + 441)
+#define HID_FLD_REF (HID_BASE + 442)
+#define HID_OPTSHDWCRSR (HID_BASE + 443)
#define HID_NUM_OPTIONS (HID_BASE + 444)
#define HID_NUM_POSITION (HID_BASE + 445)
-#define HID_NUMPARA (HID_BASE + 446)
-#define HID_FOOTNOTE_OPTIONS (HID_BASE + 447)
-#define HID_ENDNOTE_OPTIONS (HID_BASE + 448)
-#define HID_REDLINE_OPT (HID_BASE + 449)
-#define HID_LINENUMBERING (HID_BASE + 450)
-#define HID_REDLINE_ACCEPT (HID_BASE + 451)
+#define HID_NUMPARA (HID_BASE + 446)
+#define HID_FOOTNOTE_OPTIONS (HID_BASE + 447)
+#define HID_ENDNOTE_OPTIONS (HID_BASE + 448)
+#define HID_REDLINE_OPT (HID_BASE + 449)
+#define HID_LINENUMBERING (HID_BASE + 450)
+#define HID_REDLINE_ACCEPT (HID_BASE + 451)
#define HID_EDIT_FLD_DB (HID_BASE + 452)
#define HID_EDIT_FLD_DOKINF (HID_BASE + 453)
-#define HID_EDIT_FLD_VAR (HID_BASE + 454)
-#define HID_EDIT_FLD_DOK (HID_BASE + 455)
-#define HID_EDIT_FLD_FUNC (HID_BASE + 456)
-#define HID_EDIT_FLD_REF (HID_BASE + 457)
-#define HID_REDLINE_CTRL (HID_BASE + 458)
+#define HID_EDIT_FLD_VAR (HID_BASE + 454)
+#define HID_EDIT_FLD_DOK (HID_BASE + 455)
+#define HID_EDIT_FLD_FUNC (HID_BASE + 456)
+#define HID_EDIT_FLD_REF (HID_BASE + 457)
+#define HID_REDLINE_CTRL (HID_BASE + 458)
#define HID_TP_OUTLINE_NUM (HID_BASE + 459)
#define HID_OPTINSERT_PAGE (HID_BASE + 460)
-#define HID_OPTCAPTION_PAGE (HID_BASE + 461)
-#define HID_OPTLOAD_PAGE (HID_BASE + 462)
-#define HID_INSERT_TOX_PAGE (HID_BASE + 463)
-#define HID_TOX_FORM_ENTRY_PAGE (HID_BASE + 464)
-#define HID_TOX_FORM_STYLES_PAGE (HID_BASE + 465)
+#define HID_OPTCAPTION_PAGE (HID_BASE + 461)
+#define HID_OPTLOAD_PAGE (HID_BASE + 462)
+#define HID_INSERT_TOX_PAGE (HID_BASE + 463)
+#define HID_TOX_FORM_ENTRY_PAGE (HID_BASE + 464)
+#define HID_TOX_FORM_STYLES_PAGE (HID_BASE + 465)
#define HID_INSERT_TOX_TABDLG (HID_BASE + 466)
#define HID_INSERT_SECTION_PAGE (HID_BASE + 467)
#define HID_INSERT_SECTION_DLG (HID_BASE + 468)
#define HID_SECTION_PROPERTIES_DLG (HID_BASE + 469)
#define HID_RENAME_XNAMED (HID_BASE + 470)
-#define HID_TP_TOX_SELECT (HID_BASE + 471)
+#define HID_TP_TOX_SELECT (HID_BASE + 471)
#define HID_TP_TOX_ENTRY (HID_BASE + 472)
-#define HID_TOX_STYLES_PAGE (HID_BASE + 473)
+#define HID_TOX_STYLES_PAGE (HID_BASE + 473)
#define HID_TP_VISITING_CARDS (HID_BASE + 474)
#define HID_DLG_ADD_IDX_STYLES (HID_BASE + 475)
#define HID_ADD_STYLES_TLB (HID_BASE + 476)
#define HID_OLE_CHECKLB (HID_BASE + 477)
#define HID_DLG_CREATE_AUTH_ENTRY (HID_BASE + 478)
-#define HID_TP_PRIVATE_DATA (HID_BASE + 479)
+#define HID_TP_PRIVATE_DATA (HID_BASE + 479)
-#define HID_TP_BUSINESS_DATA (HID_BASE + 480)
-#define HID_SECTION_FTNENDNOTES_PAGE (HID_BASE + 481)
-#define HID_TEXTGRID_PAGE (HID_BASE + 482)
-#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483)
-#define HID_COMPATIBILITY_OPTIONS_BOX (HID_BASE + 484)
+#define HID_TP_BUSINESS_DATA (HID_BASE + 480)
+#define HID_SECTION_FTNENDNOTES_PAGE (HID_BASE + 481)
+#define HID_TEXTGRID_PAGE (HID_BASE + 482)
+#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483)
+#define HID_COMPATIBILITY_OPTIONS_BOX (HID_BASE + 484)
// AutoPilot Help-IDs *********************************************************
-#define HID_LETTER_PAGE1 (HID_BASE + 501)
-#define HID_LETTER_PAGE2 (HID_BASE + 502)
-#define HID_LETTER_PAGE3 (HID_BASE + 503)
-#define HID_LETTER_PAGE4 (HID_BASE + 504)
-#define HID_LETTER_PAGE5 (HID_BASE + 505)
-#define HID_LETTER_PAGE6 (HID_BASE + 506)
-#define HID_LETTER_PAGE7 (HID_BASE + 507)
-#define HID_LETTER_PAGE8 (HID_BASE + 508)
-#define HID_LETTER_PAGE9 (HID_BASE + 509)
-
-#define HID_FAX_PAGE1 (HID_BASE + 511)
-#define HID_FAX_PAGE2 (HID_BASE + 512)
-#define HID_FAX_PAGE3 (HID_BASE + 513)
-#define HID_FAX_PAGE4 (HID_BASE + 514)
-#define HID_FAX_PAGE5 (HID_BASE + 515)
-#define HID_FAX_PAGE6 (HID_BASE + 516)
-#define HID_FAX_PAGE7 (HID_BASE + 517)
-#define HID_FAX_PAGE8 (HID_BASE + 518)
-
-#define HID_MEMO_PAGE1 (HID_BASE + 521)
-#define HID_MEMO_PAGE2 (HID_BASE + 522)
-#define HID_MEMO_PAGE3 (HID_BASE + 523)
-#define HID_MEMO_PAGE4 (HID_BASE + 524)
-#define HID_MEMO_PAGE5 (HID_BASE + 525)
-
-#define HID_AGENDA_PAGE1 (HID_BASE + 531)
-#define HID_AGENDA_PAGE2 (HID_BASE + 532)
-#define HID_AGENDA_PAGE3 (HID_BASE + 533)
-#define HID_AGENDA_PAGE4 (HID_BASE + 534)
-#define HID_AGENDA_PAGE5 (HID_BASE + 535)
-#define HID_AGENDA_PAGE6 (HID_BASE + 536)
-
-#define HID_AUTOPILOT_NEXT (HID_BASE + 537)
-#define HID_AUTOPILOT_PREV (HID_BASE + 538)
-#define HID_AUTOPILOT_OK (HID_BASE + 539)
+#define HID_LETTER_PAGE1 (HID_BASE + 501)
+#define HID_LETTER_PAGE2 (HID_BASE + 502)
+#define HID_LETTER_PAGE3 (HID_BASE + 503)
+#define HID_LETTER_PAGE4 (HID_BASE + 504)
+#define HID_LETTER_PAGE5 (HID_BASE + 505)
+#define HID_LETTER_PAGE6 (HID_BASE + 506)
+#define HID_LETTER_PAGE7 (HID_BASE + 507)
+#define HID_LETTER_PAGE8 (HID_BASE + 508)
+#define HID_LETTER_PAGE9 (HID_BASE + 509)
+
+#define HID_FAX_PAGE1 (HID_BASE + 511)
+#define HID_FAX_PAGE2 (HID_BASE + 512)
+#define HID_FAX_PAGE3 (HID_BASE + 513)
+#define HID_FAX_PAGE4 (HID_BASE + 514)
+#define HID_FAX_PAGE5 (HID_BASE + 515)
+#define HID_FAX_PAGE6 (HID_BASE + 516)
+#define HID_FAX_PAGE7 (HID_BASE + 517)
+#define HID_FAX_PAGE8 (HID_BASE + 518)
+
+#define HID_MEMO_PAGE1 (HID_BASE + 521)
+#define HID_MEMO_PAGE2 (HID_BASE + 522)
+#define HID_MEMO_PAGE3 (HID_BASE + 523)
+#define HID_MEMO_PAGE4 (HID_BASE + 524)
+#define HID_MEMO_PAGE5 (HID_BASE + 525)
+
+#define HID_AGENDA_PAGE1 (HID_BASE + 531)
+#define HID_AGENDA_PAGE2 (HID_BASE + 532)
+#define HID_AGENDA_PAGE3 (HID_BASE + 533)
+#define HID_AGENDA_PAGE4 (HID_BASE + 534)
+#define HID_AGENDA_PAGE5 (HID_BASE + 535)
+#define HID_AGENDA_PAGE6 (HID_BASE + 536)
+
+#define HID_AUTOPILOT_NEXT (HID_BASE + 537)
+#define HID_AUTOPILOT_PREV (HID_BASE + 538)
+#define HID_AUTOPILOT_OK (HID_BASE + 539)
// HelpIds fuers Menue *****************************************************
@@ -362,39 +362,39 @@
#define HID_MN_SUB_ARRANGE (HID_BASE + 607)
#define HID_MN_SUB_SPELLING (HID_BASE + 608)
#define HID_MN_SUB_UPDATE (HID_BASE + 609)
-#define HID_MN_SUB_MIRROR (HID_BASE + 610)
+#define HID_MN_SUB_MIRROR (HID_BASE + 610)
#define HID_MN_SUB_ALIGN (HID_BASE + 611)
#define HID_MN_SUB_OPTIONS (HID_BASE + 612)
-#define HID_MN_CALC_PHD (HID_BASE + 613)
-#define HID_MN_CALC_SQRT (HID_BASE + 614)
-#define HID_MN_CALC_OR (HID_BASE + 615)
-#define HID_MN_CALC_XOR (HID_BASE + 616)
-#define HID_MN_CALC_AND (HID_BASE + 617)
-#define HID_MN_CALC_NOT (HID_BASE + 618)
-#define HID_MN_CALC_EQ (HID_BASE + 619)
-#define HID_MN_CALC_NEQ (HID_BASE + 620)
-#define HID_MN_CALC_LEQ (HID_BASE + 621)
-#define HID_MN_CALC_GEQ (HID_BASE + 622)
-#define HID_MN_CALC_LES (HID_BASE + 623)
-#define HID_MN_CALC_GRE (HID_BASE + 624)
-#define HID_MN_CALC_SUM (HID_BASE + 625)
-#define HID_MN_CALC_MEAN (HID_BASE + 626)
-#define HID_MN_CALC_MIN (HID_BASE + 627)
-#define HID_MN_CALC_MAX (HID_BASE + 628)
-#define HID_MN_CALC_SIN (HID_BASE + 629)
-#define HID_MN_CALC_COS (HID_BASE + 630)
-#define HID_MN_CALC_TAN (HID_BASE + 631)
-#define HID_MN_CALC_ASIN (HID_BASE + 632)
-#define HID_MN_CALC_ACOS (HID_BASE + 633)
-#define HID_MN_CALC_ATAN (HID_BASE + 634)
-#define HID_MN_CALC_POW (HID_BASE + 635)
-#define HID_MN_CALC_LISTSEP (HID_BASE + 636)
-#define HID_MN_POP_OPS (HID_BASE + 637)
-#define HID_MN_POP_STATISTICS (HID_BASE + 638)
-#define HID_MN_POP_FUNC (HID_BASE + 639)
-#define HID_MN_RSC_END (HID_BASE + 640)
-#define HID_MN_CALC_ROUND (HID_BASE + 641)
+#define HID_MN_CALC_PHD (HID_BASE + 613)
+#define HID_MN_CALC_SQRT (HID_BASE + 614)
+#define HID_MN_CALC_OR (HID_BASE + 615)
+#define HID_MN_CALC_XOR (HID_BASE + 616)
+#define HID_MN_CALC_AND (HID_BASE + 617)
+#define HID_MN_CALC_NOT (HID_BASE + 618)
+#define HID_MN_CALC_EQ (HID_BASE + 619)
+#define HID_MN_CALC_NEQ (HID_BASE + 620)
+#define HID_MN_CALC_LEQ (HID_BASE + 621)
+#define HID_MN_CALC_GEQ (HID_BASE + 622)
+#define HID_MN_CALC_LES (HID_BASE + 623)
+#define HID_MN_CALC_GRE (HID_BASE + 624)
+#define HID_MN_CALC_SUM (HID_BASE + 625)
+#define HID_MN_CALC_MEAN (HID_BASE + 626)
+#define HID_MN_CALC_MIN (HID_BASE + 627)
+#define HID_MN_CALC_MAX (HID_BASE + 628)
+#define HID_MN_CALC_SIN (HID_BASE + 629)
+#define HID_MN_CALC_COS (HID_BASE + 630)
+#define HID_MN_CALC_TAN (HID_BASE + 631)
+#define HID_MN_CALC_ASIN (HID_BASE + 632)
+#define HID_MN_CALC_ACOS (HID_BASE + 633)
+#define HID_MN_CALC_ATAN (HID_BASE + 634)
+#define HID_MN_CALC_POW (HID_BASE + 635)
+#define HID_MN_CALC_LISTSEP (HID_BASE + 636)
+#define HID_MN_POP_OPS (HID_BASE + 637)
+#define HID_MN_POP_STATISTICS (HID_BASE + 638)
+#define HID_MN_POP_FUNC (HID_BASE + 639)
+#define HID_MN_RSC_END (HID_BASE + 640)
+#define HID_MN_CALC_ROUND (HID_BASE + 641)
#define HID_MN_SUB_MACRO (HID_BASE + 642)
#define HID_MN_READONLY_SAVEGRAPHIC (HID_BASE + 645)
@@ -409,7 +409,7 @@
#define HID_MN_READONLY_GRAPHICOFF (HID_BASE + 654)
#define HID_MN_READONLY_PLUGINOFF (HID_BASE + 655)
-#define HID_MD_GLOS_DEFINE (HID_BASE + 656)
+#define HID_MD_GLOS_DEFINE (HID_BASE + 656)
#define HID_MD_GLOS_REPLACE (HID_BASE + 657)
#define HID_MD_GLOS_RENAME (HID_BASE + 658)
#define HID_MD_GLOS_DELETE (HID_BASE + 659)
@@ -418,328 +418,328 @@
#define HID_LINGU_ADD_WORD (HID_BASE + 662)
#define HID_LINGU_IGNORE_WORD (HID_BASE + 663)
#define HID_LINGU_SPELLING_DLG (HID_BASE + 664)
-#define HID_LINGU_AUTOCORR (HID_BASE + 665)
+#define HID_LINGU_AUTOCORR (HID_BASE + 665)
#define HID_LINGU_REPLACE (HID_BASE + 666)
-#define HID_MD_GLOS_CATEGORY (HID_BASE + 667)
-#define HID_REGION_TREE (HID_BASE + 668)
-#define HID_LINGU_WORD_LANGUAGE (HID_BASE + 669)
-#define HID_LINGU_PARA_LANGUAGE (HID_BASE + 670)
-#define HID_MD_GLOS_DEFINE_TEXT (HID_BASE + 671)
-#define HID_DLG_PASSWD_SECTION (HID_BASE + 672)
-#define HID_MD_COPY_TO_CLIPBOARD (HID_BASE + 673)
+#define HID_MD_GLOS_CATEGORY (HID_BASE + 667)
+#define HID_REGION_TREE (HID_BASE + 668)
+#define HID_LINGU_WORD_LANGUAGE (HID_BASE + 669)
+#define HID_LINGU_PARA_LANGUAGE (HID_BASE + 670)
+#define HID_MD_GLOS_DEFINE_TEXT (HID_BASE + 671)
+#define HID_DLG_PASSWD_SECTION (HID_BASE + 672)
+#define HID_MD_COPY_TO_CLIPBOARD (HID_BASE + 673)
#define HID_MD_GLOS_IMPORT (HID_BASE + 674)
#define HID_SMARTTAG_MAIN (HID_BASE + 675) // SMARTTAGS
#define HID_LINGU_IGNORE_SELECTION (HID_BASE + 676) // grammar check context menu
// Weiter Help-IDs **********************************************************
-#define HID_CLOSE_FILE (HID_BASE + 1001)
-#define HID_LAUNCH_REGISTRY (HID_BASE + 1002)
-#define HID_MERGE_FILE (HID_BASE + 1003)
-#define HID_MERGE_FILE_DLG (HID_BASE + 1004)
-#define HID_NEW_FILE (HID_BASE + 1005)
-#define HID_OPEN_FILE (HID_BASE + 1007)
-#define HID_OPEN_LASTVERSION (HID_BASE + 1009)
-#define HID_PRINT_FILE (HID_BASE + 1010)
-#define HID_PRINT_FILE_OPTIONS (HID_BASE + 1011)
-#define HID_SAVE_FILE_AS (HID_BASE + 1012)
-#define HID_SAVE_FILE (HID_BASE + 1013)
-#define HID_SETUP_PRINTER_DLG (HID_BASE + 1015)
-#define HID_EXIT (HID_BASE + 1017)
-#define HID_CREATE_DOCUMENT (HID_BASE + 1019)
-#define HID_DOCSTAT_DLG (HID_BASE + 1020)
-#define HID_LOAD_TEMPLATE_DLG (HID_BASE + 1021)
-#define HID_SAVE_ALL (HID_BASE + 1023)
-#define HID_NEW_FILE_DEFAULT (HID_BASE + 1024)
-#define HID_PRINT_FILE_DEFAULT (HID_BASE + 1025)
-#define HID_FAX (HID_BASE + 1028)
-#define HID_SELECT_DATABASE (HID_BASE + 1030)
-#define HID_DOC_INFO_DLG (HID_BASE + 1031)
-#define HID_DOC_MGR_DLG (HID_BASE + 1032)
-#define HID_OPTCAPTION_CLB (HID_BASE + 1033)
-
-#define HID_COPY (HID_BASE + 1102)
-#define HID_CUT (HID_BASE + 1103)
-#define HID_EDIT_FIELD (HID_BASE + 1104)
-#define HID_EDIT_FILE_INFO_DLG (HID_BASE + 1107)
-#define HID_EDIT_LINK_DLG (HID_BASE + 1109)
-#define HID_EDIT_OBJECT (HID_BASE + 1110)
-#define HID_GOTO (HID_BASE + 1111)
-#define HID_SET_FIELD_VALUE (HID_BASE + 1112)
-#define HID_PASTE (HID_BASE + 1113)
-#define HID_REDO (HID_BASE + 1116)
-#define HID_SEARCH (HID_BASE + 1117)
-#define HID_REPLACE (HID_BASE + 1118)
-#define HID_SELECT_ALL (HID_BASE + 1119)
-#define HID_UNDO (HID_BASE + 1120)
-#define HID_REPEAT (HID_BASE + 1122)
-#define HID_BUFFER_UPDATE (HID_BASE + 1124)
-#define HID_UPDATE_FIELDS (HID_BASE + 1126)
-#define HID_EXECUTE_MACROFIELD (HID_BASE + 1127)
-#define HID_EDIT_FORMULA (HID_BASE + 1128)
-#define HID_CALC_TABLE (HID_BASE + 1129)
-#define HID_NUM_BULLET_DOWN (HID_BASE + 1130)
-#define HID_NUM_BULLET_UP (HID_BASE + 1131)
-#define HID_NUM_BULLET_PREV (HID_BASE + 1132)
-#define HID_NUM_BULLET_NEXT (HID_BASE + 1133)
-#define HID_NUM_BULLET_MOVEUP (HID_BASE + 1134)
-#define HID_NUM_BULLET_MOVEDOWN (HID_BASE + 1135)
-#define HID_NUM_BULLET_NONUM (HID_BASE + 1136)
-#define HID_NUM_BULLET_OFF (HID_BASE + 1137)
-#define HID_NUM_BULLET_ON (HID_BASE + 1138)
-#define HID_NUM_BULLET_OUTLINE_DOWN (HID_BASE + 1139)
-#define HID_NUM_BULLET_OUTLINE_UP (HID_BASE + 1140)
-#define HID_NUM_BULLET_OUTLINE_MOVEUP (HID_BASE + 1141)
-#define HID_NUM_BULLET_OUTLINE_MOVEDOWN (HID_BASE + 1142)
-#define HID_UPDATE_INPUTFIELDS (HID_BASE + 1143)
-#define HID_NUM_NUMBERING_ON (HID_BASE + 1144)
-#define HID_REPEAT_SEARCH (HID_BASE + 1150)
-#define HID_REPAGINATE (HID_BASE + 1161)
-
-#define HID_REFRESH_VIEW (HID_BASE + 1201)
-#define HID_RIBBON (HID_BASE + 1210)
-#define HID_RULER (HID_BASE + 1211)
-#define HID_STATUSBAR (HID_BASE + 1212)
-#define HID_TOOLBOX (HID_BASE + 1213)
-#define HID_VIEW_BOUNDS (HID_BASE + 1214)
-#define HID_VIEW_FIELDS (HID_BASE + 1215)
-#define HID_VLINEAL (HID_BASE + 1216)
-#define HID_VSCROLLBAR (HID_BASE + 1217)
-#define HID_HSCROLLBAR (HID_BASE + 1218)
-#define HID_VIEW_META_CHARS (HID_BASE + 1224)
-#define HID_VIEW_MARKS (HID_BASE + 1225)
-#define HID_VIEW_FIELDNAME (HID_BASE + 1226)
-#define HID_VIEW_TABLEGRID (HID_BASE + 1227)
-#define HID_ZOOM (HID_BASE + 1231)
-
-#define HID_DELETE_BOOKMARK (HID_BASE + 1301)
-#define HID_INSERT_BREAK (HID_BASE + 1303)
-#define HID_INSERT_COLUMN_BREAK (HID_BASE + 1305)
-#define HID_INSERT_FILE (HID_BASE + 1309)
-#define HID_INSERT_FOOTNOTE (HID_BASE + 1311)
-#define HID_INSERT_GRAFIC (HID_BASE + 1315)
-#define HID_INSERT_LINEBREAK (HID_BASE + 1318)
-#define HID_INSERT_MERGEFIELD_DLG (HID_BASE + 1320)
-#define HID_INSERT_OBJECT_DLG (HID_BASE + 1322)
-#define HID_INSERT_PAGEBREAK (HID_BASE + 1323)
-#define HID_INSERT_RECORD (HID_BASE + 1326)
-#define HID_MERGE_RECORD (HID_BASE + 1327)
-#define HID_INSERT_SYMBOL (HID_BASE + 1328)
-#define HID_INSERT_STRING (HID_BASE + 1331)
-#define HID_INSERT_COLS (HID_BASE + 1332)
-#define HID_INSERT_FRAME_INTERACT (HID_BASE + 1333)
-#define HID_INSERT_FRAME (HID_BASE + 1334)
-#define HID_INSERT_IDX_ENTRY (HID_BASE + 1340)
-#define HID_INSERT_USERIDX_ENTRY (HID_BASE + 1341)
-#define HID_INSERT_CNTNTIDX_ENTRY (HID_BASE + 1342)
-#define HID_INSERT_SOFT_HYPHEN (HID_BASE + 1350)
-#define HID_INSERT_HARD_SPACE (HID_BASE + 1351)
-
-#define HID_SET_FONT (HID_BASE + 1401)
-#define HID_SET_FONT_SIZE (HID_BASE + 1402)
-#define HID_GROW_FONT_SIZE (HID_BASE + 1403)
-#define HID_SHRINK_FONT_SIZE (HID_BASE + 1404)
-#define HID_SET_BOLD (HID_BASE + 1405)
-#define HID_SET_ITALIC (HID_BASE + 1406)
-#define HID_SET_SHADOW (HID_BASE + 1407)
-#define HID_SET_OUTLINE (HID_BASE + 1408)
-#define HID_SET_UNDERLINE (HID_BASE + 1409)
-#define HID_SET_STRIKEOUT (HID_BASE + 1410)
-#define HID_SET_SUPER_SCRIPT (HID_BASE + 1411)
-#define HID_SET_SUB_SCRIPT (HID_BASE + 1412)
-#define HID_SET_COLOR (HID_BASE + 1413)
-#define HID_SET_CASEMAP (HID_BASE + 1414)
-#define HID_SET_LANGUAGE (HID_BASE + 1415)
-#define HID_SET_KERNING (HID_BASE + 1416)
-#define HID_INDENT_TO_TABSTOP (HID_BASE + 1417)
-#define HID_SET_LEFT_PARA (HID_BASE + 1418)
-#define HID_SET_RIGHT_PARA (HID_BASE + 1419)
-#define HID_SET_CENTER_PARA (HID_BASE + 1420)
-#define HID_SET_JUSTIFY_PARA (HID_BASE + 1421)
-#define HID_SET_LINE_SPACE_1 (HID_BASE + 1422)
-#define HID_SET_LINE_SPACE_15 (HID_BASE + 1423)
-#define HID_SET_LINE_SPACE_2 (HID_BASE + 1424)
-#define HID_FLIP_HORZ_GRAFIC (HID_BASE + 1425)
-#define HID_FLIP_VERT_GRAFIC (HID_BASE + 1426)
-#define HID_SET_ADJUST (HID_BASE + 1428)
-#define HID_SET_LRMARGIN (HID_BASE + 1429)
-#define HID_SET_ULMARGIN (HID_BASE + 1430)
-#define HID_UNINDENT_TO_TABSTOP (HID_BASE + 1431)
-#define HID_SET_HYPHEN_ZONE (HID_BASE + 1432)
-#define HID_SET_PAGE_BREAK (HID_BASE + 1433)
-#define HID_SET_KEEP_TOGETHER (HID_BASE + 1434)
-#define HID_SET_WIDOW (HID_BASE + 1436)
-#define HID_SET_ORPHAN (HID_BASE + 1437)
-#define HID_FORMAT_SHADOW (HID_BASE + 1438)
-#define HID_FORMAT_BORDER (HID_BASE + 1439)
-#define HID_FORMAT_CHAR_DLG (HID_BASE + 1441)
-#define HID_FORMAT_PARA_DLG (HID_BASE + 1443)
-#define HID_FORMAT_TAB (HID_BASE + 1444)
-#define HID_FORMAT_TAB_DLG (HID_BASE + 1445)
-#define HID_FORMAT_BORDER_DLG (HID_BASE + 1447)
-#define HID_FORMAT_BACKGROUND (HID_BASE + 1448)
-#define HID_FORMAT_BACKGROUND_DLG (HID_BASE + 1450)
-#define HID_FORMAT_PAGE (HID_BASE + 1451)
-#define HID_FORMAT_PAGE_DLG (HID_BASE + 1452)
-#define HID_FORMAT_DROPCAPS (HID_BASE + 1454)
-#define HID_FORMAT_FRAME_DLG (HID_BASE + 1456)
-#define HID_FORMAT_GRAFIC_DLG (HID_BASE + 1458)
-#define HID_FORMAT_TABLE_DLG (HID_BASE + 1460)
-#define HID_NEW_STYLE_BY_EXAMPLE (HID_BASE + 1462)
-#define HID_UPDATE_STYLE_BY_EXAMPLE (HID_BASE + 1463)
-#define HID_STYLE_SHEET_FRAME_DLG (HID_BASE + 1464)
-#define HID_STYLE_SHEET_DOC_DLG (HID_BASE + 1465)
-#define HID_FORMAT_RESET (HID_BASE + 1469)
-#define HID_FRAME_TO_TOP (HID_BASE + 1470)
-#define HID_FRAME_TO_BOTTOM (HID_BASE + 1471)
-#define HID_FRAME_NOWRAP (HID_BASE + 1472)
-#define HID_FRAME_WRAP (HID_BASE + 1473)
-#define HID_FRAME_WRAPTHRU (HID_BASE + 1474)
-#define HID_FRAME_ALIGN_HORZ_LEFT (HID_BASE + 1475)
-#define HID_FRAME_ALIGN_HORZ_RIGHT (HID_BASE + 1476)
-#define HID_FRAME_ALIGN_HORZ_CENTER (HID_BASE + 1477)
-#define HID_FRAME_ALIGN_VERT_TOP (HID_BASE + 1478)
-#define HID_FRAME_ALIGN_VERT_BOTTOM (HID_BASE + 1479)
-#define HID_FRAME_ALIGN_VERT_CENTER (HID_BASE + 1480)
-#define HID_SET_FRM_SIZE (HID_BASE + 1481)
-#define HID_SET_FRM_POSITION (HID_BASE + 1482)
-#define HID_SET_FRM_ANCHOR (HID_BASE + 1483)
-#define HID_SET_FRM_WRAP (HID_BASE + 1484)
-#define HID_SET_FRM_DIST (HID_BASE + 1485)
-#define HID_SET_FRM_OPTIONS (HID_BASE + 1486)
-#define HID_SET_GRF_MIRROR (HID_BASE + 1488)
-#define HID_SET_TABLE_WIDTH (HID_BASE + 1489)
-#define HID_SET_TABLE_ALIGN (HID_BASE + 1490)
-#define HID_SET_CHAR_STYLE (HID_BASE + 1491)
-#define HID_SET_PARA_STYLE (HID_BASE + 1492)
-#define HID_SET_PAGE_STYLE (HID_BASE + 1493)
-#define HID_SET_FRM_MACRO (HID_BASE + 1494)
-#define HID_SET_FRM_COLUMNS (HID_BASE + 1495)
-#define HID_SET_FRM_COLUMN_WIDTH (HID_BASE + 1496)
-#define HID_UPDATE_STYLES_DIRECT (HID_BASE + 1497)
-
-#define HID_TABLE_INSERT_ROW (HID_BASE + 1501)
-#define HID_TABLE_DELETE_ROW (HID_BASE + 1503)
-#define HID_TABLE_DELETE_COL (HID_BASE + 1504)
-#define HID_TABLE_MERGE_CELLS (HID_BASE + 1506)
-#define HID_AUTOFMT_TABLE (HID_BASE + 1507)
-#define HID_SWDLG_STRINPUT (HID_BASE + 1508)
-#define HID_TABLE_SET_ULSPACE (HID_BASE + 1509)
-#define HID_TABLE_SET_GRID (HID_BASE + 1510)
-#define HID_TABLE_SET_SHADOW (HID_BASE + 1511)
-#define HID_TABLE_SELECT_ROW (HID_BASE + 1513)
-#define HID_TABLE_SELECT_COL (HID_BASE + 1514)
-#define HID_TABLE_SELECT_ALL (HID_BASE + 1515)
-#define HID_TABLE_SET_READ_ONLY_CELLS (HID_BASE + 1517)
-#define HID_TABLE_UNSET_READ_ONLY_CELLS (HID_BASE + 1519)
-#define HID_PAGE_STYLE_SET_COLS (HID_BASE + 1538)
-#define HID_SET_PROP_LINE_SPACE (HID_BASE + 1540)
-#define HID_SET_ABS_LINE_SPACE (HID_BASE + 1541)
-
-#define HID_SPELLING_DLG (HID_BASE + 1601)
-#define HID_THESAURUS_DLG (HID_BASE + 1604)
-#define HID_HYPHENATE_OPT_DLG (HID_BASE + 1607)
-#define HID_SORTING (HID_BASE + 1613)
-#define HID_SORTING_DLG (HID_BASE + 1614)
-#define HID_CALCULATE (HID_BASE + 1615)
-#define HID_RECORD_MACRO_DLG (HID_BASE + 1622)
-#define HID_PLAY_MACRO_DLG (HID_BASE + 1624)
-#define HID_CONFIG_DLG (HID_BASE + 1627)
-#define HID_EXPAND_GLOSSARY (HID_BASE + 1628)
-#define HID_RENAME_GLOSSARY (HID_BASE + 1629)
-#define HID_CONFIG_MENU (HID_BASE + 1630)
-#define HID_CONFIG_KEY (HID_BASE + 1631)
-#define HID_ASSIGN_LOCAL_MACRO_DLG (HID_BASE + 1632)
-#define HID_COMPILE_MACRO (HID_BASE + 1633)
-#define HID_CONFIG_VIEWOPTIONS (HID_BASE + 1635)
-#define HID_CONFIG_COLORS (HID_BASE + 1636)
-#define HID_INSERT_GLOSSARY (HID_BASE + 1640)
-#define HID_AUTO_CORRECT (HID_BASE + 1649)
-#define HID_AUTO_CORRECT_DLG (HID_BASE + 1650)
-#define HID_HELP_PI (HID_BASE + 1655)
-#define HID_NAVIGATION_PI (HID_BASE + 1656)
-#define HID_TEMPLATE_PI (HID_BASE + 1657)
-#define HID_ADDR_PI (HID_BASE + 1658)
-#define HID_NAVIGATION_PI_GOTO_PAGE (HID_BASE + 1659)
-#define HID_LETTER_WIZZARD (HID_BASE + 1660)
-#define HID_FAX_WIZZARD (HID_BASE + 1661)
-#define HID_MEMO_WIZZARD (HID_BASE + 1662)
-#define HID_AGENDA_WIZZARD (HID_BASE + 1663)
-
-#define HID_NEW_WINDOW (HID_BASE + 1701)
-#define HID_ARRANGE_ALL_WIN (HID_BASE + 1702)
-#define HID_ARRANGE_CASCADE_WIN (HID_BASE + 1703)
-#define HID_ARRANGE_HORZ_WIN (HID_BASE + 1704)
-#define HID_ARRANGE_VERT_WIN (HID_BASE + 1705)
-
-#define HID_SHOW_HELP_INDEX (HID_BASE + 1802)
-#define HID_SHOW_KEYBOARD_HELP (HID_BASE + 1803)
-#define HID_SHOW_HELP_MANUAL (HID_BASE + 1804)
-#define HID_SHOW_UPDATE_HELP (HID_BASE + 1805)
-
-#define HID_CHAR_LEFT (HID_BASE + 1901)
-#define HID_CHAR_RIGHT (HID_BASE + 1902)
-#define HID_LINE_UP (HID_BASE + 1903)
-#define HID_LINE_DOWN (HID_BASE + 1904)
-#define HID_START_OF_LINE (HID_BASE + 1905)
-#define HID_END_OF_LINE (HID_BASE + 1906)
-#define HID_START_OF_DOCUMENT (HID_BASE + 1907)
-#define HID_END_OF_DOCUMENT (HID_BASE + 1908)
-#define HID_START_OF_NEXT_PAGE (HID_BASE + 1909)
-#define HID_END_OF_NEXT_PAGE (HID_BASE + 1910)
-#define HID_START_OF_PREV_PAGE (HID_BASE + 1911)
-#define HID_END_OF_PREV_PAGE (HID_BASE + 1912)
-#define HID_START_OF_PAGE (HID_BASE + 1913)
-#define HID_END_OF_PAGE (HID_BASE + 1914)
-#define HID_START_OF_COLUMN (HID_BASE + 1917)
-#define HID_END_OF_COLUMN (HID_BASE + 1918)
-#define HID_START_OF_PARA (HID_BASE + 1919)
-#define HID_END_OF_PARA (HID_BASE + 1920)
-#define HID_NEXT_WORD (HID_BASE + 1921)
-#define HID_PREV_WORD (HID_BASE + 1922)
-#define HID_NEXT_SENT (HID_BASE + 1923)
-#define HID_PREV_SENT (HID_BASE + 1924)
-#define HID_DELETE (HID_BASE + 1925)
-#define HID_BACKSPACE (HID_BASE + 1926)
-#define HID_DELETE_SENT (HID_BASE + 1927)
-#define HID_DELETE_BACK_SENT (HID_BASE + 1928)
-#define HID_DELETE_WORD (HID_BASE + 1929)
-#define HID_DELETE_BACK_WORD (HID_BASE + 1930)
-#define HID_DELETE_LINE (HID_BASE + 1931)
-#define HID_DELETE_BACK_LINE (HID_BASE + 1932)
-#define HID_DELETE_PARA (HID_BASE + 1933)
-#define HID_DELETE_BACK_PARA (HID_BASE + 1934)
-#define HID_DELETE_WHOLE_LINE (HID_BASE + 1935)
-#define HID_SET_INS_MODE (HID_BASE + 1936)
-#define HID_PAGEUP (HID_BASE + 1937)
-#define HID_PAGEDOWN (HID_BASE + 1938)
-#define HID_SET_ADD_MODE (HID_BASE + 1939)
-#define HID_SET_EXT_MODE (HID_BASE + 1940)
-#define HID_ESCAPE (HID_BASE + 1941)
-#define HID_SELECT_WORD (HID_BASE + 1943)
-#define HID_START_TABLE (HID_BASE + 1947)
-#define HID_END_TABLE (HID_BASE + 1948)
-#define HID_NEXT_TABLE (HID_BASE + 1949)
-#define HID_PREV_TABLE (HID_BASE + 1950)
-#define HID_START_OF_NEXT_COLUMN (HID_BASE + 1951)
-#define HID_END_OF_NEXT_COLUMN (HID_BASE + 1952)
-#define HID_START_OF_PREV_COLUMN (HID_BASE + 1953)
-#define HID_END_OF_PREV_COLUMN (HID_BASE + 1954)
-#define HID_FOOTNOTE_TO_ANCHOR (HID_BASE + 1955)
-#define HID_NEXT_FOOTNOTE (HID_BASE + 1956)
-#define HID_PREV_FOOTNOTE (HID_BASE + 1957)
-#define HID_CNTNT_TO_NEXT_FRAME (HID_BASE + 1958)
-#define HID_FRAME_TO_ANCHOR (HID_BASE + 1959)
-#define HID_TO_HEADER (HID_BASE + 1960)
-#define HID_TO_FOOTER (HID_BASE + 1961)
-#define HID_IDX_MARK_TO_IDX (HID_BASE + 1962)
-
-#define HID_ENVELOP (HID_BASE + 2050)
-#define HID_LABEL (HID_BASE + 2051)
-#define HID_ENVELOP_PRINT (HID_BASE + 2052)
+#define HID_CLOSE_FILE (HID_BASE + 1001)
+#define HID_LAUNCH_REGISTRY (HID_BASE + 1002)
+#define HID_MERGE_FILE (HID_BASE + 1003)
+#define HID_MERGE_FILE_DLG (HID_BASE + 1004)
+#define HID_NEW_FILE (HID_BASE + 1005)
+#define HID_OPEN_FILE (HID_BASE + 1007)
+#define HID_OPEN_LASTVERSION (HID_BASE + 1009)
+#define HID_PRINT_FILE (HID_BASE + 1010)
+#define HID_PRINT_FILE_OPTIONS (HID_BASE + 1011)
+#define HID_SAVE_FILE_AS (HID_BASE + 1012)
+#define HID_SAVE_FILE (HID_BASE + 1013)
+#define HID_SETUP_PRINTER_DLG (HID_BASE + 1015)
+#define HID_EXIT (HID_BASE + 1017)
+#define HID_CREATE_DOCUMENT (HID_BASE + 1019)
+#define HID_DOCSTAT_DLG (HID_BASE + 1020)
+#define HID_LOAD_TEMPLATE_DLG (HID_BASE + 1021)
+#define HID_SAVE_ALL (HID_BASE + 1023)
+#define HID_NEW_FILE_DEFAULT (HID_BASE + 1024)
+#define HID_PRINT_FILE_DEFAULT (HID_BASE + 1025)
+#define HID_FAX (HID_BASE + 1028)
+#define HID_SELECT_DATABASE (HID_BASE + 1030)
+#define HID_DOC_INFO_DLG (HID_BASE + 1031)
+#define HID_DOC_MGR_DLG (HID_BASE + 1032)
+#define HID_OPTCAPTION_CLB (HID_BASE + 1033)
+
+#define HID_COPY (HID_BASE + 1102)
+#define HID_CUT (HID_BASE + 1103)
+#define HID_EDIT_FIELD (HID_BASE + 1104)
+#define HID_EDIT_FILE_INFO_DLG (HID_BASE + 1107)
+#define HID_EDIT_LINK_DLG (HID_BASE + 1109)
+#define HID_EDIT_OBJECT (HID_BASE + 1110)
+#define HID_GOTO (HID_BASE + 1111)
+#define HID_SET_FIELD_VALUE (HID_BASE + 1112)
+#define HID_PASTE (HID_BASE + 1113)
+#define HID_REDO (HID_BASE + 1116)
+#define HID_SEARCH (HID_BASE + 1117)
+#define HID_REPLACE (HID_BASE + 1118)
+#define HID_SELECT_ALL (HID_BASE + 1119)
+#define HID_UNDO (HID_BASE + 1120)
+#define HID_REPEAT (HID_BASE + 1122)
+#define HID_BUFFER_UPDATE (HID_BASE + 1124)
+#define HID_UPDATE_FIELDS (HID_BASE + 1126)
+#define HID_EXECUTE_MACROFIELD (HID_BASE + 1127)
+#define HID_EDIT_FORMULA (HID_BASE + 1128)
+#define HID_CALC_TABLE (HID_BASE + 1129)
+#define HID_NUM_BULLET_DOWN (HID_BASE + 1130)
+#define HID_NUM_BULLET_UP (HID_BASE + 1131)
+#define HID_NUM_BULLET_PREV (HID_BASE + 1132)
+#define HID_NUM_BULLET_NEXT (HID_BASE + 1133)
+#define HID_NUM_BULLET_MOVEUP (HID_BASE + 1134)
+#define HID_NUM_BULLET_MOVEDOWN (HID_BASE + 1135)
+#define HID_NUM_BULLET_NONUM (HID_BASE + 1136)
+#define HID_NUM_BULLET_OFF (HID_BASE + 1137)
+#define HID_NUM_BULLET_ON (HID_BASE + 1138)
+#define HID_NUM_BULLET_OUTLINE_DOWN (HID_BASE + 1139)
+#define HID_NUM_BULLET_OUTLINE_UP (HID_BASE + 1140)
+#define HID_NUM_BULLET_OUTLINE_MOVEUP (HID_BASE + 1141)
+#define HID_NUM_BULLET_OUTLINE_MOVEDOWN (HID_BASE + 1142)
+#define HID_UPDATE_INPUTFIELDS (HID_BASE + 1143)
+#define HID_NUM_NUMBERING_ON (HID_BASE + 1144)
+#define HID_REPEAT_SEARCH (HID_BASE + 1150)
+#define HID_REPAGINATE (HID_BASE + 1161)
+
+#define HID_REFRESH_VIEW (HID_BASE + 1201)
+#define HID_RIBBON (HID_BASE + 1210)
+#define HID_RULER (HID_BASE + 1211)
+#define HID_STATUSBAR (HID_BASE + 1212)
+#define HID_TOOLBOX (HID_BASE + 1213)
+#define HID_VIEW_BOUNDS (HID_BASE + 1214)
+#define HID_VIEW_FIELDS (HID_BASE + 1215)
+#define HID_VLINEAL (HID_BASE + 1216)
+#define HID_VSCROLLBAR (HID_BASE + 1217)
+#define HID_HSCROLLBAR (HID_BASE + 1218)
+#define HID_VIEW_META_CHARS (HID_BASE + 1224)
+#define HID_VIEW_MARKS (HID_BASE + 1225)
+#define HID_VIEW_FIELDNAME (HID_BASE + 1226)
+#define HID_VIEW_TABLEGRID (HID_BASE + 1227)
+#define HID_ZOOM (HID_BASE + 1231)
+
+#define HID_DELETE_BOOKMARK (HID_BASE + 1301)
+#define HID_INSERT_BREAK (HID_BASE + 1303)
+#define HID_INSERT_COLUMN_BREAK (HID_BASE + 1305)
+#define HID_INSERT_FILE (HID_BASE + 1309)
+#define HID_INSERT_FOOTNOTE (HID_BASE + 1311)
+#define HID_INSERT_GRAFIC (HID_BASE + 1315)
+#define HID_INSERT_LINEBREAK (HID_BASE + 1318)
+#define HID_INSERT_MERGEFIELD_DLG (HID_BASE + 1320)
+#define HID_INSERT_OBJECT_DLG (HID_BASE + 1322)
+#define HID_INSERT_PAGEBREAK (HID_BASE + 1323)
+#define HID_INSERT_RECORD (HID_BASE + 1326)
+#define HID_MERGE_RECORD (HID_BASE + 1327)
+#define HID_INSERT_SYMBOL (HID_BASE + 1328)
+#define HID_INSERT_STRING (HID_BASE + 1331)
+#define HID_INSERT_COLS (HID_BASE + 1332)
+#define HID_INSERT_FRAME_INTERACT (HID_BASE + 1333)
+#define HID_INSERT_FRAME (HID_BASE + 1334)
+#define HID_INSERT_IDX_ENTRY (HID_BASE + 1340)
+#define HID_INSERT_USERIDX_ENTRY (HID_BASE + 1341)
+#define HID_INSERT_CNTNTIDX_ENTRY (HID_BASE + 1342)
+#define HID_INSERT_SOFT_HYPHEN (HID_BASE + 1350)
+#define HID_INSERT_HARD_SPACE (HID_BASE + 1351)
+
+#define HID_SET_FONT (HID_BASE + 1401)
+#define HID_SET_FONT_SIZE (HID_BASE + 1402)
+#define HID_GROW_FONT_SIZE (HID_BASE + 1403)
+#define HID_SHRINK_FONT_SIZE (HID_BASE + 1404)
+#define HID_SET_BOLD (HID_BASE + 1405)
+#define HID_SET_ITALIC (HID_BASE + 1406)
+#define HID_SET_SHADOW (HID_BASE + 1407)
+#define HID_SET_OUTLINE (HID_BASE + 1408)
+#define HID_SET_UNDERLINE (HID_BASE + 1409)
+#define HID_SET_STRIKEOUT (HID_BASE + 1410)
+#define HID_SET_SUPER_SCRIPT (HID_BASE + 1411)
+#define HID_SET_SUB_SCRIPT (HID_BASE + 1412)
+#define HID_SET_COLOR (HID_BASE + 1413)
+#define HID_SET_CASEMAP (HID_BASE + 1414)
+#define HID_SET_LANGUAGE (HID_BASE + 1415)
+#define HID_SET_KERNING (HID_BASE + 1416)
+#define HID_INDENT_TO_TABSTOP (HID_BASE + 1417)
+#define HID_SET_LEFT_PARA (HID_BASE + 1418)
+#define HID_SET_RIGHT_PARA (HID_BASE + 1419)
+#define HID_SET_CENTER_PARA (HID_BASE + 1420)
+#define HID_SET_JUSTIFY_PARA (HID_BASE + 1421)
+#define HID_SET_LINE_SPACE_1 (HID_BASE + 1422)
+#define HID_SET_LINE_SPACE_15 (HID_BASE + 1423)
+#define HID_SET_LINE_SPACE_2 (HID_BASE + 1424)
+#define HID_FLIP_HORZ_GRAFIC (HID_BASE + 1425)
+#define HID_FLIP_VERT_GRAFIC (HID_BASE + 1426)
+#define HID_SET_ADJUST (HID_BASE + 1428)
+#define HID_SET_LRMARGIN (HID_BASE + 1429)
+#define HID_SET_ULMARGIN (HID_BASE + 1430)
+#define HID_UNINDENT_TO_TABSTOP (HID_BASE + 1431)
+#define HID_SET_HYPHEN_ZONE (HID_BASE + 1432)
+#define HID_SET_PAGE_BREAK (HID_BASE + 1433)
+#define HID_SET_KEEP_TOGETHER (HID_BASE + 1434)
+#define HID_SET_WIDOW (HID_BASE + 1436)
+#define HID_SET_ORPHAN (HID_BASE + 1437)
+#define HID_FORMAT_SHADOW (HID_BASE + 1438)
+#define HID_FORMAT_BORDER (HID_BASE + 1439)
+#define HID_FORMAT_CHAR_DLG (HID_BASE + 1441)
+#define HID_FORMAT_PARA_DLG (HID_BASE + 1443)
+#define HID_FORMAT_TAB (HID_BASE + 1444)
+#define HID_FORMAT_TAB_DLG (HID_BASE + 1445)
+#define HID_FORMAT_BORDER_DLG (HID_BASE + 1447)
+#define HID_FORMAT_BACKGROUND (HID_BASE + 1448)
+#define HID_FORMAT_BACKGROUND_DLG (HID_BASE + 1450)
+#define HID_FORMAT_PAGE (HID_BASE + 1451)
+#define HID_FORMAT_PAGE_DLG (HID_BASE + 1452)
+#define HID_FORMAT_DROPCAPS (HID_BASE + 1454)
+#define HID_FORMAT_FRAME_DLG (HID_BASE + 1456)
+#define HID_FORMAT_GRAFIC_DLG (HID_BASE + 1458)
+#define HID_FORMAT_TABLE_DLG (HID_BASE + 1460)
+#define HID_NEW_STYLE_BY_EXAMPLE (HID_BASE + 1462)
+#define HID_UPDATE_STYLE_BY_EXAMPLE (HID_BASE + 1463)
+#define HID_STYLE_SHEET_FRAME_DLG (HID_BASE + 1464)
+#define HID_STYLE_SHEET_DOC_DLG (HID_BASE + 1465)
+#define HID_FORMAT_RESET (HID_BASE + 1469)
+#define HID_FRAME_TO_TOP (HID_BASE + 1470)
+#define HID_FRAME_TO_BOTTOM (HID_BASE + 1471)
+#define HID_FRAME_NOWRAP (HID_BASE + 1472)
+#define HID_FRAME_WRAP (HID_BASE + 1473)
+#define HID_FRAME_WRAPTHRU (HID_BASE + 1474)
+#define HID_FRAME_ALIGN_HORZ_LEFT (HID_BASE + 1475)
+#define HID_FRAME_ALIGN_HORZ_RIGHT (HID_BASE + 1476)
+#define HID_FRAME_ALIGN_HORZ_CENTER (HID_BASE + 1477)
+#define HID_FRAME_ALIGN_VERT_TOP (HID_BASE + 1478)
+#define HID_FRAME_ALIGN_VERT_BOTTOM (HID_BASE + 1479)
+#define HID_FRAME_ALIGN_VERT_CENTER (HID_BASE + 1480)
+#define HID_SET_FRM_SIZE (HID_BASE + 1481)
+#define HID_SET_FRM_POSITION (HID_BASE + 1482)
+#define HID_SET_FRM_ANCHOR (HID_BASE + 1483)
+#define HID_SET_FRM_WRAP (HID_BASE + 1484)
+#define HID_SET_FRM_DIST (HID_BASE + 1485)
+#define HID_SET_FRM_OPTIONS (HID_BASE + 1486)
+#define HID_SET_GRF_MIRROR (HID_BASE + 1488)
+#define HID_SET_TABLE_WIDTH (HID_BASE + 1489)
+#define HID_SET_TABLE_ALIGN (HID_BASE + 1490)
+#define HID_SET_CHAR_STYLE (HID_BASE + 1491)
+#define HID_SET_PARA_STYLE (HID_BASE + 1492)
+#define HID_SET_PAGE_STYLE (HID_BASE + 1493)
+#define HID_SET_FRM_MACRO (HID_BASE + 1494)
+#define HID_SET_FRM_COLUMNS (HID_BASE + 1495)
+#define HID_SET_FRM_COLUMN_WIDTH (HID_BASE + 1496)
+#define HID_UPDATE_STYLES_DIRECT (HID_BASE + 1497)
+
+#define HID_TABLE_INSERT_ROW (HID_BASE + 1501)
+#define HID_TABLE_DELETE_ROW (HID_BASE + 1503)
+#define HID_TABLE_DELETE_COL (HID_BASE + 1504)
+#define HID_TABLE_MERGE_CELLS (HID_BASE + 1506)
+#define HID_AUTOFMT_TABLE (HID_BASE + 1507)
+#define HID_SWDLG_STRINPUT (HID_BASE + 1508)
+#define HID_TABLE_SET_ULSPACE (HID_BASE + 1509)
+#define HID_TABLE_SET_GRID (HID_BASE + 1510)
+#define HID_TABLE_SET_SHADOW (HID_BASE + 1511)
+#define HID_TABLE_SELECT_ROW (HID_BASE + 1513)
+#define HID_TABLE_SELECT_COL (HID_BASE + 1514)
+#define HID_TABLE_SELECT_ALL (HID_BASE + 1515)
+#define HID_TABLE_SET_READ_ONLY_CELLS (HID_BASE + 1517)
+#define HID_TABLE_UNSET_READ_ONLY_CELLS (HID_BASE + 1519)
+#define HID_PAGE_STYLE_SET_COLS (HID_BASE + 1538)
+#define HID_SET_PROP_LINE_SPACE (HID_BASE + 1540)
+#define HID_SET_ABS_LINE_SPACE (HID_BASE + 1541)
+
+#define HID_SPELLING_DLG (HID_BASE + 1601)
+#define HID_THESAURUS_DLG (HID_BASE + 1604)
+#define HID_HYPHENATE_OPT_DLG (HID_BASE + 1607)
+#define HID_SORTING (HID_BASE + 1613)
+#define HID_SORTING_DLG (HID_BASE + 1614)
+#define HID_CALCULATE (HID_BASE + 1615)
+#define HID_RECORD_MACRO_DLG (HID_BASE + 1622)
+#define HID_PLAY_MACRO_DLG (HID_BASE + 1624)
+#define HID_CONFIG_DLG (HID_BASE + 1627)
+#define HID_EXPAND_GLOSSARY (HID_BASE + 1628)
+#define HID_RENAME_GLOSSARY (HID_BASE + 1629)
+#define HID_CONFIG_MENU (HID_BASE + 1630)
+#define HID_CONFIG_KEY (HID_BASE + 1631)
+#define HID_ASSIGN_LOCAL_MACRO_DLG (HID_BASE + 1632)
+#define HID_COMPILE_MACRO (HID_BASE + 1633)
+#define HID_CONFIG_VIEWOPTIONS (HID_BASE + 1635)
+#define HID_CONFIG_COLORS (HID_BASE + 1636)
+#define HID_INSERT_GLOSSARY (HID_BASE + 1640)
+#define HID_AUTO_CORRECT (HID_BASE + 1649)
+#define HID_AUTO_CORRECT_DLG (HID_BASE + 1650)
+#define HID_HELP_PI (HID_BASE + 1655)
+#define HID_NAVIGATION_PI (HID_BASE + 1656)
+#define HID_TEMPLATE_PI (HID_BASE + 1657)
+#define HID_ADDR_PI (HID_BASE + 1658)
+#define HID_NAVIGATION_PI_GOTO_PAGE (HID_BASE + 1659)
+#define HID_LETTER_WIZZARD (HID_BASE + 1660)
+#define HID_FAX_WIZZARD (HID_BASE + 1661)
+#define HID_MEMO_WIZZARD (HID_BASE + 1662)
+#define HID_AGENDA_WIZZARD (HID_BASE + 1663)
+
+#define HID_NEW_WINDOW (HID_BASE + 1701)
+#define HID_ARRANGE_ALL_WIN (HID_BASE + 1702)
+#define HID_ARRANGE_CASCADE_WIN (HID_BASE + 1703)
+#define HID_ARRANGE_HORZ_WIN (HID_BASE + 1704)
+#define HID_ARRANGE_VERT_WIN (HID_BASE + 1705)
+
+#define HID_SHOW_HELP_INDEX (HID_BASE + 1802)
+#define HID_SHOW_KEYBOARD_HELP (HID_BASE + 1803)
+#define HID_SHOW_HELP_MANUAL (HID_BASE + 1804)
+#define HID_SHOW_UPDATE_HELP (HID_BASE + 1805)
+
+#define HID_CHAR_LEFT (HID_BASE + 1901)
+#define HID_CHAR_RIGHT (HID_BASE + 1902)
+#define HID_LINE_UP (HID_BASE + 1903)
+#define HID_LINE_DOWN (HID_BASE + 1904)
+#define HID_START_OF_LINE (HID_BASE + 1905)
+#define HID_END_OF_LINE (HID_BASE + 1906)
+#define HID_START_OF_DOCUMENT (HID_BASE + 1907)
+#define HID_END_OF_DOCUMENT (HID_BASE + 1908)
+#define HID_START_OF_NEXT_PAGE (HID_BASE + 1909)
+#define HID_END_OF_NEXT_PAGE (HID_BASE + 1910)
+#define HID_START_OF_PREV_PAGE (HID_BASE + 1911)
+#define HID_END_OF_PREV_PAGE (HID_BASE + 1912)
+#define HID_START_OF_PAGE (HID_BASE + 1913)
+#define HID_END_OF_PAGE (HID_BASE + 1914)
+#define HID_START_OF_COLUMN (HID_BASE + 1917)
+#define HID_END_OF_COLUMN (HID_BASE + 1918)
+#define HID_START_OF_PARA (HID_BASE + 1919)
+#define HID_END_OF_PARA (HID_BASE + 1920)
+#define HID_NEXT_WORD (HID_BASE + 1921)
+#define HID_PREV_WORD (HID_BASE + 1922)
+#define HID_NEXT_SENT (HID_BASE + 1923)
+#define HID_PREV_SENT (HID_BASE + 1924)
+#define HID_DELETE (HID_BASE + 1925)
+#define HID_BACKSPACE (HID_BASE + 1926)
+#define HID_DELETE_SENT (HID_BASE + 1927)
+#define HID_DELETE_BACK_SENT (HID_BASE + 1928)
+#define HID_DELETE_WORD (HID_BASE + 1929)
+#define HID_DELETE_BACK_WORD (HID_BASE + 1930)
+#define HID_DELETE_LINE (HID_BASE + 1931)
+#define HID_DELETE_BACK_LINE (HID_BASE + 1932)
+#define HID_DELETE_PARA (HID_BASE + 1933)
+#define HID_DELETE_BACK_PARA (HID_BASE + 1934)
+#define HID_DELETE_WHOLE_LINE (HID_BASE + 1935)
+#define HID_SET_INS_MODE (HID_BASE + 1936)
+#define HID_PAGEUP (HID_BASE + 1937)
+#define HID_PAGEDOWN (HID_BASE + 1938)
+#define HID_SET_ADD_MODE (HID_BASE + 1939)
+#define HID_SET_EXT_MODE (HID_BASE + 1940)
+#define HID_ESCAPE (HID_BASE + 1941)
+#define HID_SELECT_WORD (HID_BASE + 1943)
+#define HID_START_TABLE (HID_BASE + 1947)
+#define HID_END_TABLE (HID_BASE + 1948)
+#define HID_NEXT_TABLE (HID_BASE + 1949)
+#define HID_PREV_TABLE (HID_BASE + 1950)
+#define HID_START_OF_NEXT_COLUMN (HID_BASE + 1951)
+#define HID_END_OF_NEXT_COLUMN (HID_BASE + 1952)
+#define HID_START_OF_PREV_COLUMN (HID_BASE + 1953)
+#define HID_END_OF_PREV_COLUMN (HID_BASE + 1954)
+#define HID_FOOTNOTE_TO_ANCHOR (HID_BASE + 1955)
+#define HID_NEXT_FOOTNOTE (HID_BASE + 1956)
+#define HID_PREV_FOOTNOTE (HID_BASE + 1957)
+#define HID_CNTNT_TO_NEXT_FRAME (HID_BASE + 1958)
+#define HID_FRAME_TO_ANCHOR (HID_BASE + 1959)
+#define HID_TO_HEADER (HID_BASE + 1960)
+#define HID_TO_FOOTER (HID_BASE + 1961)
+#define HID_IDX_MARK_TO_IDX (HID_BASE + 1962)
+
+#define HID_ENVELOP (HID_BASE + 2050)
+#define HID_LABEL (HID_BASE + 2051)
+#define HID_ENVELOP_PRINT (HID_BASE + 2052)
#define HID_NAVIGATION_IMGBTN (HID_BASE + 2054)
-#define HID_ENVELOP_INSERT (HID_BASE + 2055)
+#define HID_ENVELOP_INSERT (HID_BASE + 2055)
#define HID_WEBTOOLS_TOOLBOX (HID_BASE + 2056)
#define HID_WEBTEXT_TOOLBOX (HID_BASE + 2057)
@@ -756,22 +756,22 @@
#define HID_TOOLS_TOOLBOX (HID_BASE + 2069)
#define HID_SRCVIEW_TOOLBOX (HID_BASE + 2070)
-#define HID_LABEL_INSERT (HID_BASE + 2071)
+#define HID_LABEL_INSERT (HID_BASE + 2071)
#define HID_CALC_TOOLBOX (HID_BASE + 2072)
#define HID_PVIEW_TOOLBOX (HID_BASE + 2073)
-#define HID_FIELD_INSERT (HID_BASE + 2074)
-#define HID_FIELD_CLOSE (HID_BASE + 2075)
+#define HID_FIELD_INSERT (HID_BASE + 2074)
+#define HID_FIELD_CLOSE (HID_BASE + 2075)
#define HID_COND_COLL_TABLIST (HID_BASE + 2076)
-#define HID_DB_SELECTION_TLB (HID_BASE + 2077)
-#define HID_FIELD_DINF_TYPE (HID_BASE + 2078)
+#define HID_DB_SELECTION_TLB (HID_BASE + 2077)
+#define HID_FIELD_DINF_TYPE (HID_BASE + 2078)
-#define HID_DRAWFORM_TOOLBOX (HID_BASE + 2079)
-#define HID_SELECT_TEMPLATE (HID_BASE + 2080)
+#define HID_DRAWFORM_TOOLBOX (HID_BASE + 2079)
+#define HID_SELECT_TEMPLATE (HID_BASE + 2080)
-#define HID_AP_INSERT_DB_SEL (HID_BASE + 2081)
+#define HID_AP_INSERT_DB_SEL (HID_BASE + 2081)
#define HID_WEBGRAPHIC_TOOLBOX (HID_BASE + 2082)
#define HID_OUTLINE_FORM (HID_BASE + 2083)
#define HID_NUM_RESET (HID_BASE + 2084)
@@ -781,31 +781,31 @@
#define HID_AUTOFORMAT_EDIT_CHG (HID_BASE + 2087)
//insert index/entries/Pattern buttons and edits
-#define HID_TOX_ENTRY_BUTTON (HID_BASE + 2088)
-#define HID_TOX_ENTRY_EDIT (HID_BASE + 2089)
+#define HID_TOX_ENTRY_BUTTON (HID_BASE + 2088)
+#define HID_TOX_ENTRY_EDIT (HID_BASE + 2089)
-#define HID_DLG_NEW_USER_IDX (HID_BASE + 2090)
+#define HID_DLG_NEW_USER_IDX (HID_BASE + 2090)
#define HID_INSERT_IDX_MRK_OK (HID_BASE + 2091)
#define HID_INSERT_IDX_MRK_CLOSE (HID_BASE + 2092)
#define HID_INSERT_AUTH_MRK_OK (HID_BASE + 2093)
#define HID_INSERT_AUTH_MRK_CLOSE (HID_BASE + 2094)
-#define HID_INSERT_IDX_MRK_DELETE (HID_BASE + 2095)
-#define HID_INSERT_IDX_MRK_NEW (HID_BASE + 2096)
-#define HID_INSERT_IDX_MRK_PREV (HID_BASE + 2097)
-#define HID_INSERT_IDX_MRK_PREV_SAME (HID_BASE + 2098)
-#define HID_INSERT_IDX_MRK_NEXT (HID_BASE + 2099)
-#define HID_INSERT_IDX_MRK_NEXT_SAME (HID_BASE + 2100)
-#define HID_INSERT_IDX_MRK_TYPE (HID_BASE + 2101)
-#define HID_INSERT_IDX_MRK_ENTRY (HID_BASE + 2102)
-#define HID_INSERT_IDX_MRK_PRIM_KEY (HID_BASE + 2103)
-#define HID_INSERT_IDX_MRK_SEC_KEY (HID_BASE + 2104)
-#define HID_INSERT_IDX_MRK_LEVEL (HID_BASE + 2105)
-#define HID_INSERT_IDX_MRK_MAIN_ENTRY (HID_BASE + 2106)
-#define HID_INSERT_IDX_MRK_APPLY_ALL (HID_BASE + 2107)
-#define HID_INSERT_AUTH_MRK_ENTRY (HID_BASE + 2108)
+#define HID_INSERT_IDX_MRK_DELETE (HID_BASE + 2095)
+#define HID_INSERT_IDX_MRK_NEW (HID_BASE + 2096)
+#define HID_INSERT_IDX_MRK_PREV (HID_BASE + 2097)
+#define HID_INSERT_IDX_MRK_PREV_SAME (HID_BASE + 2098)
+#define HID_INSERT_IDX_MRK_NEXT (HID_BASE + 2099)
+#define HID_INSERT_IDX_MRK_NEXT_SAME (HID_BASE + 2100)
+#define HID_INSERT_IDX_MRK_TYPE (HID_BASE + 2101)
+#define HID_INSERT_IDX_MRK_ENTRY (HID_BASE + 2102)
+#define HID_INSERT_IDX_MRK_PRIM_KEY (HID_BASE + 2103)
+#define HID_INSERT_IDX_MRK_SEC_KEY (HID_BASE + 2104)
+#define HID_INSERT_IDX_MRK_LEVEL (HID_BASE + 2105)
+#define HID_INSERT_IDX_MRK_MAIN_ENTRY (HID_BASE + 2106)
+#define HID_INSERT_IDX_MRK_APPLY_ALL (HID_BASE + 2107)
+#define HID_INSERT_AUTH_MRK_ENTRY (HID_BASE + 2108)
#define HID_INSERT_AUTH_MRK_CREATE_ENTRY (HID_BASE + 2109)
-#define HID_INSERT_AUTH_MRK_EDIT_ENTRY (HID_BASE + 2110)
-#define HID_TOKEN_WINDOW (HID_BASE + 2111)
+#define HID_INSERT_AUTH_MRK_EDIT_ENTRY (HID_BASE + 2110)
+#define HID_TOKEN_WINDOW (HID_BASE + 2111)
#define HID_AUTH_FIELD_IDENTIFIER (HID_BASE + 2112 )
#define HID_AUTH_FIELD_AUTHORITY_TYPE (HID_BASE + 2113 )
@@ -844,11 +844,11 @@
#define HID_AUTH_MARK_DLG_ID_LISTBOX (HID_BASE + 2145 )
#define HID_INSERT_INDEX_ENTRY_LEVEL_LB (HID_BASE + 2146 )
-#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE (HID_BASE + 2147 )
-#define HID_INSERT_IDX_MRK_SRCH_WORDONLY (HID_BASE + 2148 )
+#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE (HID_BASE + 2147 )
+#define HID_INSERT_IDX_MRK_SRCH_WORDONLY (HID_BASE + 2148 )
#define HID_DLG_CREATE_AUTOMARK (HID_BASE + 2149 )
#define HID_BUSINESS_CARD_CONTENT (HID_BASE + 2150 )
-#define HID_SAVE_LABEL_DLG (HID_BASE + 2151 )
+#define HID_SAVE_LABEL_DLG (HID_BASE + 2151 )
#define HID_BUSINESS_FMT_PAGE (HID_BASE + 2152 )
#define HID_BUSINESS_FMT_PAGE_CONT (HID_BASE + 2153 )
#define HID_BUSINESS_FMT_PAGE_SHEET (HID_BASE + 2154 )
@@ -883,7 +883,7 @@
#define HID_PRINT_AS_MERGE (HID_BASE + 2181 )
#define HID_MERGE_SOURCE_UNAVAILABLE (HID_BASE + 2182 )
#define HID_DATA_SOURCES_UNAVAILABLE (HID_BASE + 2183 )
-#define HID_MODULE_TOOLBOX (HID_BASE + 2184 )
+#define HID_MODULE_TOOLBOX (HID_BASE + 2184 )
#define HID_SECTION_INDENTS_PAGE (HID_BASE + 2185 )
#define HID_FLD_DROPDOWN (HID_BASE + 2186 )
@@ -982,6 +982,6 @@
#define HID_MM_HEADER_12 (HID_BASE + 2279)
#define HID_MM_HEADER_13 (HID_BASE + 2280)
-#define HID_TITLEPAGE (HID_BASE + 2281)
+#define HID_TITLEPAGE (HID_BASE + 2281)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 77b4b0abc6dd..b25e1839fec0 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index bcf7eae151eb..0d6ce3a3bf67 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ struct SwConversionArgs;
//////////////////////////////////////////////////////////////////////
-class SwHHCWrapper : public editeng::HangulHanjaConversion
+class SwHHCWrapper : public editeng::HangulHanjaConversion
{
SwView * pView;
Window* pWin;
@@ -48,7 +48,7 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
// to find of next convertible text portion
xub_StrLen nLastPos; // starting position of the last found text part
- // (needs to be sth that gets not moved like
+ // (needs to be sth that gets not moved like
// SwPaM or SwPosition by replace operations!)
sal_Int32 nUnitOffset;
@@ -65,7 +65,7 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
sal_Bool bStartDone;
sal_Bool bEndDone;
// sal_Bool bLastRet;
-
+
// from SvxSpellWrapper copied and modified
sal_Bool ConvNext_impl(); // former SpellNext
sal_Bool FindConvText_impl(); // former FindSpellError
@@ -76,7 +76,7 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
void ConvEnd_impl( SwConversionArgs *pConvArgs ); // former SpellEnd
sal_Bool ConvContinue_impl( SwConversionArgs *pConvArgs ); // former SpellContinue
- void SelectNewUnit_impl( const sal_Int32 nUnitStart,
+ void SelectNewUnit_impl( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
void ChangeText( const String &rNewText,
const ::rtl::OUString& rOrigText,
@@ -88,15 +88,15 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
inline void SetDrawObj( BOOL bNew ) { bIsDrawObj = bNew; }
protected:
- virtual void GetNextPortion( ::rtl::OUString& rNextPortion,
- LanguageType& rLangOfPortion,
+ virtual void GetNextPortion( ::rtl::OUString& rNextPortion,
+ LanguageType& rLangOfPortion,
sal_Bool bAllowImplicitChangesForNotConvertibleText );
- virtual void HandleNewUnit( const sal_Int32 nUnitStart,
+ virtual void HandleNewUnit( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
virtual void ReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
const ::rtl::OUString& rOrigText,
- const ::rtl::OUString& rReplaceWith,
+ const ::rtl::OUString& rReplaceWith,
const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets,
ReplacementAction eAction,
LanguageType *pNewUnitLanguage );
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index fe6ed9563db1..4ed2c337aa0a 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,7 +2,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
@@ -28,14 +28,14 @@
#ifndef _HINTIDS_HXX
#define _HINTIDS_HXX
-#include <tools/solar.h> // fuer __FAR_DATA
-#include <sal/types.h> // for sal_Unicode
+#include <tools/solar.h> // fuer __FAR_DATA
+#include <sal/types.h> // for sal_Unicode
#include "swdllapi.h"
// fuer SwTxtHints ohne Endindex wird folgendes Zeichen eingefuegt:
//JP 24.05.00: for the new UniCode Version:
-#define CH_TXTATR_BREAKWORD ((sal_Unicode)0x01)
-#define CH_TXTATR_INWORD ((sal_Unicode)0x02)
+#define CH_TXTATR_BREAKWORD ((sal_Unicode)0x01)
+#define CH_TXTATR_INWORD ((sal_Unicode)0x02)
#define CH_TXTATR_TAB ((sal_Unicode)'\t')
#define CH_TXTATR_NEWLINE ((sal_Unicode)'\n')
#define CH_TXT_ATR_FIELDSTART ((sal_Unicode)0x04)
@@ -48,56 +48,56 @@
* Hier kommen erst mal die enums fuer die Hints
*/
-#define HINT_BEGIN 1
+#define HINT_BEGIN 1
-#define POOLATTR_BEGIN HINT_BEGIN
-#define POOLATTR_END RES_UNKNOWNATR_END
+#define POOLATTR_BEGIN HINT_BEGIN
+#define POOLATTR_END RES_UNKNOWNATR_END
// Bereiche fuer die Id's der einzelnen Format-Attribute
// die Which-Werte fuer die Charakter-Format Attribute
enum RES_CHRATR
{
RES_CHRATR_BEGIN = HINT_BEGIN,
- RES_CHRATR_CASEMAP = RES_CHRATR_BEGIN, // 1
- RES_CHRATR_CHARSETCOLOR, // 2
- RES_CHRATR_COLOR, // 3
- RES_CHRATR_CONTOUR, // 4
- RES_CHRATR_CROSSEDOUT, // 5
- RES_CHRATR_ESCAPEMENT, // 6
- RES_CHRATR_FONT, // 7
- RES_CHRATR_FONTSIZE, // 8
- RES_CHRATR_KERNING, // 9
- RES_CHRATR_LANGUAGE, // 10
- RES_CHRATR_POSTURE, // 11
- RES_CHRATR_PROPORTIONALFONTSIZE, // 12
- RES_CHRATR_SHADOWED, // 13
- RES_CHRATR_UNDERLINE, // 14
- RES_CHRATR_WEIGHT, // 15
- RES_CHRATR_WORDLINEMODE, // 16
- RES_CHRATR_AUTOKERN, // 17
- RES_CHRATR_BLINK, // 18
- RES_CHRATR_NOHYPHEN, // 19
- RES_CHRATR_NOLINEBREAK, // 20
- RES_CHRATR_BACKGROUND, // 21
- RES_CHRATR_CJK_FONT, // 22
- RES_CHRATR_CJK_FONTSIZE, // 23
- RES_CHRATR_CJK_LANGUAGE, // 24
- RES_CHRATR_CJK_POSTURE, // 25
- RES_CHRATR_CJK_WEIGHT, // 26
- RES_CHRATR_CTL_FONT, // 27
- RES_CHRATR_CTL_FONTSIZE, // 28
- RES_CHRATR_CTL_LANGUAGE, // 29
- RES_CHRATR_CTL_POSTURE, // 30
- RES_CHRATR_CTL_WEIGHT, // 31
- RES_CHRATR_ROTATE, // 32
- RES_CHRATR_EMPHASIS_MARK, // 33
- RES_CHRATR_TWO_LINES, // 34
- RES_CHRATR_SCALEW, // 35
- RES_CHRATR_RELIEF, // 36
+ RES_CHRATR_CASEMAP = RES_CHRATR_BEGIN, // 1
+ RES_CHRATR_CHARSETCOLOR, // 2
+ RES_CHRATR_COLOR, // 3
+ RES_CHRATR_CONTOUR, // 4
+ RES_CHRATR_CROSSEDOUT, // 5
+ RES_CHRATR_ESCAPEMENT, // 6
+ RES_CHRATR_FONT, // 7
+ RES_CHRATR_FONTSIZE, // 8
+ RES_CHRATR_KERNING, // 9
+ RES_CHRATR_LANGUAGE, // 10
+ RES_CHRATR_POSTURE, // 11
+ RES_CHRATR_PROPORTIONALFONTSIZE, // 12
+ RES_CHRATR_SHADOWED, // 13
+ RES_CHRATR_UNDERLINE, // 14
+ RES_CHRATR_WEIGHT, // 15
+ RES_CHRATR_WORDLINEMODE, // 16
+ RES_CHRATR_AUTOKERN, // 17
+ RES_CHRATR_BLINK, // 18
+ RES_CHRATR_NOHYPHEN, // 19
+ RES_CHRATR_NOLINEBREAK, // 20
+ RES_CHRATR_BACKGROUND, // 21
+ RES_CHRATR_CJK_FONT, // 22
+ RES_CHRATR_CJK_FONTSIZE, // 23
+ RES_CHRATR_CJK_LANGUAGE, // 24
+ RES_CHRATR_CJK_POSTURE, // 25
+ RES_CHRATR_CJK_WEIGHT, // 26
+ RES_CHRATR_CTL_FONT, // 27
+ RES_CHRATR_CTL_FONTSIZE, // 28
+ RES_CHRATR_CTL_LANGUAGE, // 29
+ RES_CHRATR_CTL_POSTURE, // 30
+ RES_CHRATR_CTL_WEIGHT, // 31
+ RES_CHRATR_ROTATE, // 32
+ RES_CHRATR_EMPHASIS_MARK, // 33
+ RES_CHRATR_TWO_LINES, // 34
+ RES_CHRATR_SCALEW, // 35
+ RES_CHRATR_RELIEF, // 36
RES_CHRATR_HIDDEN, // 37
- RES_CHRATR_OVERLINE, // 38
- RES_CHRATR_DUMMY1, // 39
- RES_CHRATR_DUMMY2, // 40
+ RES_CHRATR_OVERLINE, // 38
+ RES_CHRATR_DUMMY1, // 39
+ RES_CHRATR_DUMMY2, // 40
RES_CHRATR_END
};
@@ -137,13 +137,13 @@ RES_TXTATR_WITHEND_END,
// alle TextAttribute ohne ein Ende
RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END,
- RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN, // 51
- RES_TXTATR_FLYCNT, // 52
- RES_TXTATR_FTN, // 53
+ RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN, // 51
+ RES_TXTATR_FLYCNT, // 52
+ RES_TXTATR_FTN, // 53
RES_TXTATR_DUMMY4, // 54
RES_TXTATR_DUMMY3, // 55
- RES_TXTATR_DUMMY1, // 56
- RES_TXTATR_DUMMY2, // 57
+ RES_TXTATR_DUMMY1, // 56
+ RES_TXTATR_DUMMY2, // 57
RES_TXTATR_NOEND_END,
RES_TXTATR_END = RES_TXTATR_NOEND_END
};
@@ -152,19 +152,19 @@ enum RES_PARATR
{
RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_LINESPACING = RES_PARATR_BEGIN, // 58
- RES_PARATR_ADJUST, // 59
- RES_PARATR_SPLIT, // 60
- RES_PARATR_ORPHANS, // 61
- RES_PARATR_WIDOWS, // 62
- RES_PARATR_TABSTOP, // 63
- RES_PARATR_HYPHENZONE, // 64
- RES_PARATR_DROP, // 65
- RES_PARATR_REGISTER, // 66
- RES_PARATR_NUMRULE, // 67
- RES_PARATR_SCRIPTSPACE, // 68
- RES_PARATR_HANGINGPUNCTUATION, // 69
- RES_PARATR_FORBIDDEN_RULES, // 70
- RES_PARATR_VERTALIGN, // 71
+ RES_PARATR_ADJUST, // 59
+ RES_PARATR_SPLIT, // 60
+ RES_PARATR_ORPHANS, // 61
+ RES_PARATR_WIDOWS, // 62
+ RES_PARATR_TABSTOP, // 63
+ RES_PARATR_HYPHENZONE, // 64
+ RES_PARATR_DROP, // 65
+ RES_PARATR_REGISTER, // 66
+ RES_PARATR_NUMRULE, // 67
+ RES_PARATR_SCRIPTSPACE, // 68
+ RES_PARATR_HANGINGPUNCTUATION, // 69
+ RES_PARATR_FORBIDDEN_RULES, // 70
+ RES_PARATR_VERTALIGN, // 71
RES_PARATR_SNAPTOGRID, // 72
RES_PARATR_CONNECT_BORDER, // 73
RES_PARATR_OUTLINELEVEL, // 74
@@ -441,7 +441,7 @@ struct SfxItemInfo;
typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ];
extern SwDfltAttrTab __FAR_DATA aAttrTab;
-extern SfxItemInfo __FAR_DATA aSlotTab[];
+extern SfxItemInfo __FAR_DATA aSlotTab[];
SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich );
@@ -449,8 +449,8 @@ SW_DLLPUBLIC USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript );
// return for the given TextAttribut without an end the correct character.
// This function returns
-// CH_TXTATR_BREAKWORD for Textattribut which breaks a word (default)
-// CH_TXTATR_INWORD for Textattribut which dont breaks a word
+// CH_TXTATR_BREAKWORD for Textattribut which breaks a word (default)
+// CH_TXTATR_INWORD for Textattribut which dont breaks a word
class SwTxtAttr;
sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 9381893d4de9..b37d722c80bf 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -2,7 +2,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
@@ -214,7 +214,7 @@ class SwVirtPageNumInfo: public SwMsgPoolItem
{
const SwPageFrm *pPage;
const SwPageFrm *pOrigPage;
- const SwFrm *pFrm;
+ const SwFrm *pFrm;
// Multiple attributes can be attached to a single paragraph / table
// The frame, in the end, has to decide which attribute takes effect and which physical page it involves
public:
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 70e30c4a5128..69bcf152b062 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <editeng/svxenum.hxx>
#include "swtypes.hxx"
-#include "node.hxx" // Fuer SwStartNode
+#include "node.hxx" // Fuer SwStartNode
class SwTableBox;
@@ -47,11 +47,11 @@ class SwFrmFmt;
class SwHTMLTableLayoutCnts
{
- SwHTMLTableLayoutCnts *pNext; // der naechste Inhalt
+ SwHTMLTableLayoutCnts *pNext; // der naechste Inhalt
// von den beiden naechsten Pointern darf nur einer gesetzt sein!
- SwTableBox *pBox; // ein Box
- SwHTMLTableLayout *pTable; // eine "Tabelle in der Tabelle"
+ SwTableBox *pBox; // ein Box
+ SwHTMLTableLayout *pTable; // eine "Tabelle in der Tabelle"
// Beim ersten Durchlauf gibt es noch keine Boxen. Es wird dann
// pStartNode anstelle von pBox verwendet.
@@ -61,10 +61,10 @@ class SwHTMLTableLayoutCnts
// Inhalt durchgefuehrt wurde. Dazu werden sie mit einer Soll-Vorgabe
// verglichen. Wird 255 erreicht laufen sie bei 0 weiter. So wird
// eine Reinitialisierung bei jedem Resize vermieden.
- BYTE nPass1Done; // Wieoft wurde Pass 1 aufgerufen?
- BYTE nWidthSet; // Wieoft wurde die Breite gesetzt?
+ BYTE nPass1Done; // Wieoft wurde Pass 1 aufgerufen?
+ BYTE nWidthSet; // Wieoft wurde die Breite gesetzt?
- BOOL bNoBreakTag; // <NOBR>-Tag ueber gesamten Inhalt
+ BOOL bNoBreakTag; // <NOBR>-Tag ueber gesamten Inhalt
public:
@@ -96,14 +96,14 @@ public:
class SwHTMLTableLayoutCell
{
- SwHTMLTableLayoutCnts *pContents; // der Inhalt der Zelle
+ SwHTMLTableLayoutCnts *pContents; // der Inhalt der Zelle
- USHORT nRowSpan; // ROWSPAN der Zelle
- USHORT nColSpan; // COLSPAN der Zelle
+ USHORT nRowSpan; // ROWSPAN der Zelle
+ USHORT nColSpan; // COLSPAN der Zelle
USHORT nWidthOption;// angegebene Breite der Zelle in Twip oder %
BOOL bPrcWidthOption : 1;// nWidth ist %-Angabe
- BOOL bNoWrapOption : 1; // NOWRAP-Option
+ BOOL bNoWrapOption : 1; // NOWRAP-Option
public:
@@ -142,10 +142,10 @@ class SwHTMLTableLayoutColumn
ULONG nMin, nMax;
// Ergibnisse von Pass 2
- USHORT nAbsColWidth; // in Twips
- USHORT nRelColWidth; // in Twips bzw. relativ zu USHRT_MAX
+ USHORT nAbsColWidth; // in Twips
+ USHORT nRelColWidth; // in Twips bzw. relativ zu USHRT_MAX
- USHORT nWidthOption; // Optionen von <COL> oder <TD>/<TH>
+ USHORT nWidthOption; // Optionen von <COL> oder <TD>/<TH>
BOOL bRelWidthOption : 1;
BOOL bLeftBorder : 1;
@@ -189,36 +189,36 @@ public:
class SwHTMLTableLayout
{
- Timer aResizeTimer; // Timer fuer DelayedResize
+ Timer aResizeTimer; // Timer fuer DelayedResize
SwHTMLTableLayoutColumn **aColumns;
SwHTMLTableLayoutCell **aCells;
- const SwTable *pSwTable; // die SwTable (nur Top-Table)
- SwTableBox *pLeftFillerBox; // linke Filler-Zelle (nur Tab in Tab)
- SwTableBox *pRightFillerBox; // rechte Filler-Zelle (nur Tab-in Tab)
+ const SwTable *pSwTable; // die SwTable (nur Top-Table)
+ SwTableBox *pLeftFillerBox; // linke Filler-Zelle (nur Tab in Tab)
+ SwTableBox *pRightFillerBox; // rechte Filler-Zelle (nur Tab-in Tab)
- ULONG nMin; // minimale Breite der Tabelle (Twips)
- ULONG nMax; // maximale Breite der Tabelle (Twips)
+ ULONG nMin; // minimale Breite der Tabelle (Twips)
+ ULONG nMax; // maximale Breite der Tabelle (Twips)
- USHORT nRows; // Anzahl Zeilen
- USHORT nCols; // Anzahl Spalten
+ USHORT nRows; // Anzahl Zeilen
+ USHORT nCols; // Anzahl Spalten
- USHORT nLeftMargin; // Abstand zum linken Rand (aus Absatz)
- USHORT nRightMargin; // Abstand zum rechten Rand (aus Absatz)
+ USHORT nLeftMargin; // Abstand zum linken Rand (aus Absatz)
+ USHORT nRightMargin; // Abstand zum rechten Rand (aus Absatz)
- USHORT nInhAbsLeftSpace; // von umgebender Zelle geerbter Abstand,
- USHORT nInhAbsRightSpace; // der Zellen zugeschlagen wurde
+ USHORT nInhAbsLeftSpace; // von umgebender Zelle geerbter Abstand,
+ USHORT nInhAbsRightSpace; // der Zellen zugeschlagen wurde
- USHORT nRelLeftFill; // relative Breiten der Zellen zur
- USHORT nRelRightFill; // Ausrichtung von Tabellen in Tabellen
+ USHORT nRelLeftFill; // relative Breiten der Zellen zur
+ USHORT nRelRightFill; // Ausrichtung von Tabellen in Tabellen
- USHORT nRelTabWidth; // Die relative Breite der Tabelle
+ USHORT nRelTabWidth; // Die relative Breite der Tabelle
- USHORT nWidthOption; // die Breite der Tabelle (in Twip oder %)
- USHORT nCellPadding; // Abstand zum Inhalt (in Twip)
- USHORT nCellSpacing; // Absatnd zwischen Zellen (in Twip)
- USHORT nBorder; // Dicke der ausseren Umrandung bzw.
+ USHORT nWidthOption; // die Breite der Tabelle (in Twip oder %)
+ USHORT nCellPadding; // Abstand zum Inhalt (in Twip)
+ USHORT nCellSpacing; // Absatnd zwischen Zellen (in Twip)
+ USHORT nBorder; // Dicke der ausseren Umrandung bzw.
// Platz, den Netscape hierfuer einrechnet.
USHORT nLeftBorderWidth;
@@ -227,31 +227,31 @@ class SwHTMLTableLayout
USHORT nInhRightBorderWidth;
USHORT nBorderWidth;
- USHORT nDelayedResizeAbsAvail; // Param fuer's verzoegerte Resize
+ USHORT nDelayedResizeAbsAvail; // Param fuer's verzoegerte Resize
USHORT nLastResizeAbsAvail;
- BYTE nPass1Done; // Vorgabe-Werte fuer die einzelen
- BYTE nWidthSet; // Schleifen-Durchlauefe
+ BYTE nPass1Done; // Vorgabe-Werte fuer die einzelen
+ BYTE nWidthSet; // Schleifen-Durchlauefe
- SvxAdjust eTableAdjust; // Die Ausrichtung der Tabelle
+ SvxAdjust eTableAdjust; // Die Ausrichtung der Tabelle
- BOOL bColsOption : 1; // Tabelle besitzt eine COLS-Option
- BOOL bColTags : 1; // Tabelle besitzt COL/COLGRP-Tags
- BOOL bPrcWidthOption : 1; // Breite ist eine %-Angabe
- BOOL bUseRelWidth : 1; // SwTable bekommt relative Breite
+ BOOL bColsOption : 1; // Tabelle besitzt eine COLS-Option
+ BOOL bColTags : 1; // Tabelle besitzt COL/COLGRP-Tags
+ BOOL bPrcWidthOption : 1; // Breite ist eine %-Angabe
+ BOOL bUseRelWidth : 1; // SwTable bekommt relative Breite
- BOOL bMustResize : 1; // Tabelle muss in der Breite ang. werden
- BOOL bExportable : 1; // Layout kann zum Export genutzt werden
- BOOL bBordersChanged : 1; // Umrandung wurde geaendert
- BOOL bMayBeInFlyFrame : 1; // Die Tabelle koennte im Rahmen sein
+ BOOL bMustResize : 1; // Tabelle muss in der Breite ang. werden
+ BOOL bExportable : 1; // Layout kann zum Export genutzt werden
+ BOOL bBordersChanged : 1; // Umrandung wurde geaendert
+ BOOL bMayBeInFlyFrame : 1; // Die Tabelle koennte im Rahmen sein
- BOOL bDelayedResizeRecalc : 1; // Param fuer's verzoegerte Resize
- BOOL bMustNotResize : 1; // Die Tabelle darf nicht reseized werden
- BOOL bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst
+ BOOL bDelayedResizeRecalc : 1; // Param fuer's verzoegerte Resize
+ BOOL bMustNotResize : 1; // Die Tabelle darf nicht reseized werden
+ BOOL bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst
// werden
-// USHORT GetLeftBorderWidth( USHORT nCol ) const;
-// USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const;
+// USHORT GetLeftBorderWidth( USHORT nCol ) const;
+// USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const;
void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin,
USHORT nCol, USHORT nColSpan,
@@ -339,7 +339,7 @@ public:
// ignoriert, die Verzeogerung wird aber ggf. uebernommen.
// - Wenn nDelay==HTMLTABLE_RESIZE_NOW ist, wird sofort Resized und
// eventuell noch asstehende Resize-Aufrufe werden nicht mehr
- // ausgefuehrt.
+ // ausgefuehrt.
// - Der Rueckgabewert gibt an, ob sich die Tabelle geaendert hat.
BOOL Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE, BOOL bForce=FALSE,
ULONG nDelay=0 );
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index badc0278b137..235277402a0f 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -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
@@ -34,24 +34,24 @@
#include "rcid.hrc"
-#define DLG_FORMEDT (RC_INDEX_BEGIN + 0)
-#define DLG_IDX (RC_INDEX_BEGIN + 1)
+#define DLG_FORMEDT (RC_INDEX_BEGIN + 0)
+#define DLG_IDX (RC_INDEX_BEGIN + 1)
#define DLG_USRIDX (RC_INDEX_BEGIN + 2)
#define DLG_INSIDXMARK (RC_INDEX_BEGIN + 3)
#define DLG_CNTTABLE (RC_INDEX_BEGIN + 4)
#define DLG_MULTMRK (RC_INDEX_BEGIN + 5)
-#define STR_TITLE (RC_INDEX_BEGIN + 6)
-#define STR_ALPHA (RC_INDEX_BEGIN + 7)
-#define STR_LEVEL (RC_INDEX_BEGIN + 8)
+#define STR_TITLE (RC_INDEX_BEGIN + 6)
+#define STR_ALPHA (RC_INDEX_BEGIN + 7)
+#define STR_LEVEL (RC_INDEX_BEGIN + 8)
#define DLG_INSAUTHMARK (RC_INDEX_BEGIN + 9)
#define DLG_CREATE_AUTH_ENTRY (RC_INDEX_BEGIN + 10)
-#define DLG_EDIT_IDXMARK (RC_INDEX_BEGIN + 11)
+#define DLG_EDIT_IDXMARK (RC_INDEX_BEGIN + 11)
#define DLG_EDIT_AUTHMARK (RC_INDEX_BEGIN + 12)
-#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
-#define STR_IDXMRK_EDIT (RC_INDEX_BEGIN + 14)
+#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
+#define STR_IDXMRK_EDIT (RC_INDEX_BEGIN + 14)
#define STR_AUTHMRK_EDIT (RC_INDEX_BEGIN + 15)
#define STR_AUTHMRK_INSERT (RC_INDEX_BEGIN + 16)
@@ -63,4 +63,4 @@
#define DLG_EDIT_IDXMARK_CJK (RC_INDEX_BEGIN + 21)
#define DLG_INSIDXMARK_CJK (RC_INDEX_BEGIN + 22)
-#endif // _INDEX_HRC
+#endif // _INDEX_HRC
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 8a18d2d09996..41f9a2d30f66 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -2,7 +2,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
@@ -30,8 +30,8 @@
#include <limits.h>
#include <tools/solar.h>
-#include <tools/rtti.hxx> // for RTTI of SwIndexReg
-#include <tools/string.hxx> // for xub_StrLen
+#include <tools/rtti.hxx> // for RTTI of SwIndexReg
+#include <tools/string.hxx> // for xub_StrLen
#include <swdllapi.h>
#define INVALID_INDEX STRING_NOTFOUND
@@ -56,12 +56,12 @@ class SW_DLLPUBLIC SwIndex
int MySerial;
#endif
- xub_StrLen nIndex;
- SwIndexReg* pArray;
+ xub_StrLen nIndex;
+ SwIndexReg* pArray;
SwIndex *pNext, *pPrev;
SwIndex& ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue );
- void Remove(); // Ausketten
+ void Remove(); // Ausketten
public:
explicit SwIndex(SwIndexReg *const pReg, xub_StrLen const nIdx = 0);
@@ -91,7 +91,7 @@ public:
BOOL operator!=( const SwIndex& rSwIndex ) const
{ return (nIndex != rSwIndex.nIndex) || (pArray != rSwIndex.pArray); }
- BOOL operator<( xub_StrLen nWert ) const { return nIndex < nWert; }
+ BOOL operator<( xub_StrLen nWert ) const { return nIndex < nWert; }
BOOL operator<=( xub_StrLen nWert ) const { return nIndex <= nWert; }
BOOL operator>( xub_StrLen nWert ) const { return nIndex > nWert; }
BOOL operator>=( xub_StrLen nWert ) const { return nIndex >= nWert; }
@@ -102,7 +102,7 @@ public:
SwIndex& operator=( const SwIndex & );
// gebe den Wert vom Index als xub_StrLen zurueck
- xub_StrLen GetIndex() const { return nIndex; }
+ xub_StrLen GetIndex() const { return nIndex; }
// ermoeglicht Zuweisungen ohne Erzeugen eines temporaeren
// Objektes
diff --git a/sw/inc/inetfld.hxx b/sw/inc/inetfld.hxx
index 19b5666fa648..ef1ebbfe71a8 100644
--- a/sw/inc/inetfld.hxx
+++ b/sw/inc/inetfld.hxx
@@ -2,7 +2,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
@@ -52,9 +52,9 @@ public:
virtual SwFieldType* Copy() const;
- SwCharFmt* GetCharFmt( const SwINetField& rFld );
+ SwCharFmt* GetCharFmt( const SwINetField& rFld );
- SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() const { return pDoc; }
};
/*--------------------------------------------------------------------
@@ -65,7 +65,7 @@ class SwINetField : public SwField
{
friend class SwINetFieldType;
- String sTargetFrameName; // in diesen Frame soll die URL
+ String sTargetFrameName; // in diesen Frame soll die URL
String sURL;
String sText;
SvxMacroTableDtor* pMacroTbl;
@@ -74,31 +74,31 @@ public:
// Direkte Eingabe alten Wert loeschen
SwINetField( SwINetFieldType* pTyp, USHORT nFmt,
const String& rURL, const String& rText );
- virtual ~SwINetField();
+ virtual ~SwINetField();
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual String Expand() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
virtual SwField* Copy() const;
// URL
virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
// HinweisText
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
// das ist das akt. Zeichenformat
SwCharFmt* GetCharFmt();
const SwCharFmt* GetCharFmt() const
{ return ((SwINetField*)this)->GetCharFmt(); }
- const String& GetTargetFrameName() const { return sTargetFrameName; }
- void SetTargetFrameName( const String& rNm ) { sTargetFrameName = rNm; }
+ const String& GetTargetFrameName() const { return sTargetFrameName; }
+ void SetTargetFrameName( const String& rNm ) { sTargetFrameName = rNm; }
// setze eine neue oder loesche die akt. MakroTabelle
void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
- const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; }
+ const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; }
// setze / erfrage ein Makro
void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index 42f540615c9c..f268b01366e8 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.hxx
@@ -2,7 +2,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
@@ -30,10 +30,10 @@
class ViewShell;
-void _InitCore(); // bastyp/init.cxx
+void _InitCore(); // bastyp/init.cxx
void _FinitCore();
-void _InitFilter(); // basflt/fltini.cxx
+void _InitFilter(); // basflt/fltini.cxx
void _FinitFilter();
// layout/newfrm.cxx
diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx
index 7db22fc9de19..37b08252dce2 100644
--- a/sw/inc/io.hxx
+++ b/sw/inc/io.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 1fbf9b82262c..3a94d5a63fb6 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <osl/endian.h>
-#include <errhdl.hxx> // for ASSERT
+#include <errhdl.hxx> // for ASSERT
#include <tools/string.hxx>
#include <swdllapi.h>
@@ -116,7 +116,7 @@ public:
static BOOL IsValidStgFilter( SotStorage& , const SfxFilter& );
static BOOL IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
- static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen,
+ static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen,
CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
// static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index 491bc239d635..24a049bf5316 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index 919e296593ef..d0489ddbd1dd 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 3aaca94d8b35..ae12939040a9 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -2,7 +2,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
@@ -46,17 +46,17 @@ enum LineNumberPosition
class SW_DLLPUBLIC SwLineNumberInfo : public SwClient //purpose of derivation from SwClient:
//character style for displaying the numbers.
{
- SvxNumberType aType; //e.g. roman linenumbers
- String aDivider; //String for aditional interval (vert. lines user defined)
- USHORT nPosFromLeft; //Position for paint
- USHORT nCountBy; //Paint only for every n line
- USHORT nDividerCountBy; //Interval for display of an user defined
+ SvxNumberType aType; //e.g. roman linenumbers
+ String aDivider; //String for aditional interval (vert. lines user defined)
+ USHORT nPosFromLeft; //Position for paint
+ USHORT nCountBy; //Paint only for every n line
+ USHORT nDividerCountBy; //Interval for display of an user defined
//string every n lines
- LineNumberPosition ePos; //Where should the display occur (number and divicer)
- BOOL bPaintLineNumbers; //Should anything be displayed?
- BOOL bCountBlankLines; //Count empty lines?
- BOOL bCountInFlys; //Count also within FlyFrames?
- BOOL bRestartEachPage; //Restart counting at the first paragraph of each page
+ LineNumberPosition ePos; //Where should the display occur (number and divicer)
+ BOOL bPaintLineNumbers; //Should anything be displayed?
+ BOOL bCountBlankLines; //Count empty lines?
+ BOOL bCountInFlys; //Count also within FlyFrames?
+ BOOL bRestartEachPage; //Restart counting at the first paragraph of each page
//(even on follows when paragraphs are splitted)
public:
@@ -69,36 +69,36 @@ public:
SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const;
void SetCharFmt( SwCharFmt* );
- const SvxNumberType &GetNumType() const { return aType; }
- void SetNumType( SvxNumberType aNew ){ aType = aNew; }
+ const SvxNumberType &GetNumType() const { return aType; }
+ void SetNumType( SvxNumberType aNew ){ aType = aNew; }
- const String &GetDivider() const { return aDivider; }
- void SetDivider( const String &r ) { aDivider = r; }
- USHORT GetDividerCountBy() const { return nDividerCountBy; }
- void SetDividerCountBy( USHORT n ) { nDividerCountBy = n; }
+ const String &GetDivider() const { return aDivider; }
+ void SetDivider( const String &r ) { aDivider = r; }
+ USHORT GetDividerCountBy() const { return nDividerCountBy; }
+ void SetDividerCountBy( USHORT n ) { nDividerCountBy = n; }
- USHORT GetPosFromLeft() const { return nPosFromLeft; }
- void SetPosFromLeft( USHORT n) { nPosFromLeft = n; }
+ USHORT GetPosFromLeft() const { return nPosFromLeft; }
+ void SetPosFromLeft( USHORT n) { nPosFromLeft = n; }
- USHORT GetCountBy() const { return nCountBy; }
- void SetCountBy( USHORT n) { nCountBy = n; }
+ USHORT GetCountBy() const { return nCountBy; }
+ void SetCountBy( USHORT n) { nCountBy = n; }
- LineNumberPosition GetPos() const { return ePos; }
+ LineNumberPosition GetPos() const { return ePos; }
void SetPos( LineNumberPosition eP ){ ePos = eP; }
- BOOL IsPaintLineNumbers() const { return bPaintLineNumbers; }
- void SetPaintLineNumbers( BOOL b ){ bPaintLineNumbers = b; }
+ BOOL IsPaintLineNumbers() const { return bPaintLineNumbers; }
+ void SetPaintLineNumbers( BOOL b ){ bPaintLineNumbers = b; }
- BOOL IsCountBlankLines() const { return bCountBlankLines; }
- void SetCountBlankLines( BOOL b ) { bCountBlankLines = b; }
+ BOOL IsCountBlankLines() const { return bCountBlankLines; }
+ void SetCountBlankLines( BOOL b ) { bCountBlankLines = b; }
- BOOL IsCountInFlys() const { return bCountInFlys; }
- void SetCountInFlys( BOOL b ) { bCountInFlys = b; }
+ BOOL IsCountInFlys() const { return bCountInFlys; }
+ void SetCountInFlys( BOOL b ) { bCountInFlys = b; }
- BOOL IsRestartEachPage() const { return bRestartEachPage; }
- void SetRestartEachPage( BOOL b ) { bRestartEachPage = b; }
+ BOOL IsRestartEachPage() const { return bRestartEachPage; }
+ void SetRestartEachPage( BOOL b ) { bRestartEachPage = b; }
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
};
diff --git a/sw/inc/linkenum.hxx b/sw/inc/linkenum.hxx
index 7f832368a539..0c196ec26d26 100644
--- a/sw/inc/linkenum.hxx
+++ b/sw/inc/linkenum.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 4bfc4d3ca1c7..bcd9e0b90cda 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/listfunc.hxx b/sw/inc/listfunc.hxx
index fc883875b3fd..50678d9345fb 100644
--- a/sw/inc/listfunc.hxx
+++ b/sw/inc/listfunc.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 42464463fed3..18bac3b8591e 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -2,7 +2,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
@@ -54,8 +54,8 @@ extern void PageNumNotify( ViewShell* pVwSh,
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
-SW_DLLPUBLIC void StartProgress ( USHORT nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 );
-SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 );
+SW_DLLPUBLIC void StartProgress ( USHORT nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 );
+SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 );
SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell );
void SetProgressText ( USHORT nMessId, SwDocShell *pDocShell );
void RescheduleProgress( SwDocShell *pDocShell );
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 6018065b23a4..3c2218d44616 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -2,7 +2,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
@@ -61,24 +61,24 @@ class SwRevisionConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
- AuthorCharAttr aInsertAttr; //Revision/TextDisplay/Insert/Attribute // Redlining: Author-Zeichenattribute
+ AuthorCharAttr aInsertAttr; //Revision/TextDisplay/Insert/Attribute // Redlining: Author-Zeichenattribute
//Revision/TextDisplay/Insert/Color
- AuthorCharAttr aDeletedAttr; //Revision/TextDisplay/Delete/Attribute
+ AuthorCharAttr aDeletedAttr; //Revision/TextDisplay/Delete/Attribute
//Revision/TextDisplay/Delete/Color
- AuthorCharAttr aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute
+ AuthorCharAttr aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute
//Revision/TextDisplay/ChangeAttribute/Color
- USHORT nMarkAlign; //Revision/LinesChanged/Mark
- Color aMarkColor; //Revision/LinesChanged/Color
+ USHORT nMarkAlign; //Revision/LinesChanged/Mark
+ Color aMarkColor; //Revision/LinesChanged/Color
const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
public:
SwRevisionConfig();
~SwRevisionConfig();
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
/* -----------------------------11.10.00 09:00--------------------------------
@@ -87,29 +87,29 @@ class SwInsertConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
- InsCaptionOptArr* pCapOptions;
- InsCaptionOpt* pOLEMiscOpt;
+ InsCaptionOptArr* pCapOptions;
+ InsCaptionOpt* pOLEMiscOpt;
- SvGlobalName aGlobalNames[5];
+ SvGlobalName aGlobalNames[5];
- sal_Bool bInsWithCaption; //Insert/Caption/Automatic // Objekte beschriftet einfuegen
+ sal_Bool bInsWithCaption; //Insert/Caption/Automatic // Objekte beschriftet einfuegen
sal_Bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
-// sal_uInt16 nInsTblFlags; //Insert/Table/Header // Flags fuer Tabellen einfuegen
+// sal_uInt16 nInsTblFlags; //Insert/Table/Header // Flags fuer Tabellen einfuegen
//Insert/Table/RepeatHeader
//Insert/Table/Split
//Insert/Table/Border
- SwInsertTableOptions aInsTblOpts;
- sal_Bool bIsWeb;
+ SwInsertTableOptions aInsTblOpts;
+ sal_Bool bIsWeb;
const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
public:
SwInsertConfig(sal_Bool bWeb);
~SwInsertConfig();
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
/* -----------------------------11.10.00 09:00--------------------------------
@@ -118,25 +118,25 @@ class SwTableConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
- USHORT nTblHMove; //int Table/Shift/Row
- USHORT nTblVMove; //int Table/Shift/Column
- USHORT nTblHInsert; //int Table/Insert/Row
- USHORT nTblVInsert; //int Table/Insert/Column
- TblChgMode eTblChgMode; //int Table/Change/Effect
+ USHORT nTblHMove; //int Table/Shift/Row
+ USHORT nTblVMove; //int Table/Shift/Column
+ USHORT nTblHInsert; //int Table/Insert/Row
+ USHORT nTblVInsert; //int Table/Insert/Column
+ TblChgMode eTblChgMode; //int Table/Change/Effect
- sal_Bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatische Zahlenerkennung
- sal_Bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatische Zahlenformaterkennung
- sal_Bool bInsTblAlignNum; // Table/Input/Alignment // Zahlen ausrichten
+ sal_Bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatische Zahlenerkennung
+ sal_Bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatische Zahlenformaterkennung
+ sal_Bool bInsTblAlignNum; // Table/Input/Alignment // Zahlen ausrichten
const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
public:
SwTableConfig(sal_Bool bWeb);
~SwTableConfig();
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
/* -----------------------------18.01.01 16:57--------------------------------
@@ -145,28 +145,28 @@ class SwMiscConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
- String sWordDelimiter; // Statistics/WordNumber/Delimiter
- BOOL bDefaultFontsInCurrDocOnly; // DefaultFont/Document
- BOOL bShowIndexPreview ; // Index/ShowPreview
- BOOL bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink
- BOOL bNumAlignSize; // Numbering/Graphic/KeepRatio
- BOOL bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs
- BOOL bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation
+ String sWordDelimiter; // Statistics/WordNumber/Delimiter
+ BOOL bDefaultFontsInCurrDocOnly; // DefaultFont/Document
+ BOOL bShowIndexPreview ; // Index/ShowPreview
+ BOOL bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink
+ BOOL bNumAlignSize; // Numbering/Graphic/KeepRatio
+ BOOL bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs
+ BOOL bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation
BOOL bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged'
- sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats
- String sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
- String sMailingPath; // FormLetter/FileOutput/Path
- String sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!)
+ sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats
+ String sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
+ String sMailingPath; // FormLetter/FileOutput/Path
+ String sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!)
const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
public:
SwMiscConfig();
~SwMiscConfig();
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
/* ---------------------------------------------------------------------------
@@ -174,171 +174,171 @@ class SwMiscConfig : public utl::ConfigItem
---------------------------------------------------------------------------*/
class SW_DLLPUBLIC SwModuleOptions
{
- SwRevisionConfig aRevisionConfig;
- SwInsertConfig aInsertConfig;
- SwInsertConfig aWebInsertConfig;
+ SwRevisionConfig aRevisionConfig;
+ SwInsertConfig aInsertConfig;
+ SwInsertConfig aWebInsertConfig;
- SwTableConfig aTableConfig;
- SwTableConfig aWebTableConfig;
+ SwTableConfig aTableConfig;
+ SwTableConfig aWebTableConfig;
- SwMiscConfig aMiscConfig;
+ SwMiscConfig aMiscConfig;
//fiscus: don't show tips of text fields - it's not part of the configuration!
- BOOL bHideFieldTips : 1;
+ BOOL bHideFieldTips : 1;
public:
SwModuleOptions();
- TblChgMode GetTblMode() const { return aTableConfig.eTblChgMode;}
- void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet;
+ TblChgMode GetTblMode() const { return aTableConfig.eTblChgMode;}
+ void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet;
aTableConfig.SetModified();}
- USHORT GetTblHMove() const { return aTableConfig.nTblHMove;}
- void SetTblHMove( USHORT nSet ) { aTableConfig.nTblHMove = nSet;
+ USHORT GetTblHMove() const { return aTableConfig.nTblHMove;}
+ void SetTblHMove( USHORT nSet ) { aTableConfig.nTblHMove = nSet;
aTableConfig.SetModified();}
- USHORT GetTblVMove() const { return aTableConfig.nTblVMove;}
- void SetTblVMove( USHORT nSet ) { aTableConfig.nTblVMove = nSet;
+ USHORT GetTblVMove() const { return aTableConfig.nTblVMove;}
+ void SetTblVMove( USHORT nSet ) { aTableConfig.nTblVMove = nSet;
aTableConfig.SetModified();}
- USHORT GetTblHInsert() const {return aTableConfig.nTblHInsert;}
- void SetTblHInsert( USHORT nSet ) { aTableConfig.nTblHInsert = nSet;
+ USHORT GetTblHInsert() const {return aTableConfig.nTblHInsert;}
+ void SetTblHInsert( USHORT nSet ) { aTableConfig.nTblHInsert = nSet;
aTableConfig.SetModified();}
- USHORT GetTblVInsert() const {return aTableConfig.nTblVInsert;}
- void SetTblVInsert( USHORT nSet ) { aTableConfig.nTblVInsert = nSet;
+ USHORT GetTblVInsert() const {return aTableConfig.nTblVInsert;}
+ void SetTblVInsert( USHORT nSet ) { aTableConfig.nTblVInsert = nSet;
aTableConfig.SetModified();}
- const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; }
- void SetInsertAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aInsertAttr = rAttr;
+ const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; }
+ void SetInsertAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aInsertAttr = rAttr;
aRevisionConfig.SetModified();}
- const AuthorCharAttr &GetDeletedAuthorAttr() const { return aRevisionConfig.aDeletedAttr; }
- void SetDeletedAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aDeletedAttr = rAttr;
+ const AuthorCharAttr &GetDeletedAuthorAttr() const { return aRevisionConfig.aDeletedAttr; }
+ void SetDeletedAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aDeletedAttr = rAttr;
aRevisionConfig.SetModified();}
- const AuthorCharAttr &GetFormatAuthorAttr() const { return aRevisionConfig.aFormatAttr; }
- void SetFormatAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aFormatAttr = rAttr;
+ const AuthorCharAttr &GetFormatAuthorAttr() const { return aRevisionConfig.aFormatAttr; }
+ void SetFormatAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aFormatAttr = rAttr;
aRevisionConfig.SetModified();}
- USHORT GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; }
- void SetMarkAlignMode(USHORT nMode) { aRevisionConfig.nMarkAlign = nMode;
+ USHORT GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; }
+ void SetMarkAlignMode(USHORT nMode) { aRevisionConfig.nMarkAlign = nMode;
aRevisionConfig.SetModified();}
- const Color& GetMarkAlignColor() const { return aRevisionConfig.aMarkColor; }
- void SetMarkAlignColor(const Color &rColor) { aRevisionConfig.aMarkColor = rColor;
+ const Color& GetMarkAlignColor() const { return aRevisionConfig.aMarkColor; }
+ void SetMarkAlignColor(const Color &rColor) { aRevisionConfig.aMarkColor = rColor;
aRevisionConfig.SetModified();}
- BOOL IsInsWithCaption(BOOL bHTML) const
+ BOOL IsInsWithCaption(BOOL bHTML) const
{ return bHTML ? FALSE : aInsertConfig.bInsWithCaption; }
- void SetInsWithCaption( BOOL bHTML, BOOL b )
- { if(!bHTML)
+ void SetInsWithCaption( BOOL bHTML, BOOL b )
+ { if(!bHTML)
aInsertConfig.bInsWithCaption = b;
aInsertConfig.SetModified();}
sal_Bool IsCaptionOrderNumberingFirst() const { return aInsertConfig.bCaptionOrderNumberingFirst; }
- void SetCaptionOrderNumberingFirst( sal_Bool bSet )
- {
+ void SetCaptionOrderNumberingFirst( sal_Bool bSet )
+ {
if(aInsertConfig.bCaptionOrderNumberingFirst != bSet)
{
- aInsertConfig.bCaptionOrderNumberingFirst = bSet;
+ aInsertConfig.bCaptionOrderNumberingFirst = bSet;
aInsertConfig.SetModified();
}
}
- BOOL IsInsTblFormatNum(BOOL bHTML) const
+ BOOL IsInsTblFormatNum(BOOL bHTML) const
{ return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; }
- void SetInsTblFormatNum( BOOL bHTML, BOOL b )
+ void SetInsTblFormatNum( BOOL bHTML, BOOL b )
{ bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
- BOOL IsInsTblChangeNumFormat(BOOL bHTML) const
+ BOOL IsInsTblChangeNumFormat(BOOL bHTML) const
{ return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; }
- void SetInsTblChangeNumFormat( BOOL bHTML, BOOL b )
+ void SetInsTblChangeNumFormat( BOOL bHTML, BOOL b )
{ bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
- BOOL IsInsTblAlignNum(BOOL bHTML) const
+ BOOL IsInsTblAlignNum(BOOL bHTML) const
{ return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; }
- void SetInsTblAlignNum( BOOL bHTML, BOOL b )
+ void SetInsTblAlignNum( BOOL bHTML, BOOL b )
{ bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();;}
SwInsertTableOptions GetInsTblFlags(BOOL bHTML) const
{ return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;}
- void SetInsTblFlags( BOOL bHTML, const SwInsertTableOptions& rOpts ) {
+ void SetInsTblFlags( BOOL bHTML, const SwInsertTableOptions& rOpts ) {
bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts);
bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();}
const InsCaptionOpt* GetCapOption(BOOL bHTML, const SwCapObjType eType, const SvGlobalName *pOleId);
- BOOL SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt);
+ BOOL SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt);
- BOOL IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; }
- void SetGrfToGalleryAsLnk( BOOL b ) { aMiscConfig.bGrfToGalleryAsLnk = b;
+ BOOL IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; }
+ void SetGrfToGalleryAsLnk( BOOL b ) { aMiscConfig.bGrfToGalleryAsLnk = b;
aMiscConfig.SetModified();}
- sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;}
- void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet;
+ sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;}
+ void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet;
aMiscConfig.SetModified();}
- BOOL IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; }
- void SetSinglePrintJob( BOOL b ) { aMiscConfig.bSinglePrintJob = b;
+ BOOL IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; }
+ void SetSinglePrintJob( BOOL b ) { aMiscConfig.bSinglePrintJob = b;
aMiscConfig.SetModified();}
- BOOL IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; }
- void SetNumAlignSize( BOOL b ) { aMiscConfig.bNumAlignSize = b;
+ BOOL IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; }
+ void SetNumAlignSize( BOOL b ) { aMiscConfig.bNumAlignSize = b;
aMiscConfig.SetModified();}
- BOOL IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; }
- void SetIsNameFromColumn( BOOL bSet )
- {
+ BOOL IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; }
+ void SetIsNameFromColumn( BOOL bSet )
+ {
aMiscConfig.SetModified();
aMiscConfig.bIsNameFromColumn = bSet;
}
BOOL IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;}
- void SetAskForMailMerge(BOOL bSet)
- {
+ void SetAskForMailMerge(BOOL bSet)
+ {
aMiscConfig.SetModified();
aMiscConfig.bAskForMailMergeInPrint = bSet;
}
+
-
- const String& GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; }
- void SetNameFromColumn( const String& rSet ) { aMiscConfig.sNameFromColumn = rSet;
+ const String& GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; }
+ void SetNameFromColumn( const String& rSet ) { aMiscConfig.sNameFromColumn = rSet;
aMiscConfig.SetModified();}
- String GetMailingPath() const { return aMiscConfig.sMailingPath; }
- void SetMailingPath(const String& sPath) { aMiscConfig.sMailingPath = sPath;
+ String GetMailingPath() const { return aMiscConfig.sMailingPath; }
+ void SetMailingPath(const String& sPath) { aMiscConfig.sMailingPath = sPath;
aMiscConfig.SetModified();}
- String GetMailName() const { return aMiscConfig.sMailName; }
- void SetMailName(const String& sName){ aMiscConfig.sMailName = sName;
+ String GetMailName() const { return aMiscConfig.sMailName; }
+ void SetMailName(const String& sName){ aMiscConfig.sMailName = sName;
aMiscConfig.SetModified();}
- const String &GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; }
- void SetWordDelimiter(const String& sDelim) { aMiscConfig.sWordDelimiter = sDelim;
+ const String &GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; }
+ void SetWordDelimiter(const String& sDelim) { aMiscConfig.sWordDelimiter = sDelim;
aMiscConfig.SetModified();}
//convert word delimiter from or to user interface
static String ConvertWordDelimiter(const String& rDelim, BOOL bFromUI);
- BOOL IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;}
- void SetShowIndexPreview(BOOL bSet)
+ BOOL IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;}
+ void SetShowIndexPreview(BOOL bSet)
{aMiscConfig.bShowIndexPreview = bSet;
aMiscConfig.SetModified();}
- BOOL IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;}
- void SetDefaultFontInCurrDocOnly(BOOL bSet)
+ BOOL IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;}
+ void SetDefaultFontInCurrDocOnly(BOOL bSet)
{
aMiscConfig.bDefaultFontsInCurrDocOnly = bSet;
aMiscConfig.SetModified();
}
- BOOL IsHideFieldTips() const {return bHideFieldTips;}
- void SetHideFieldTips(BOOL bSet) {bHideFieldTips = bSet;}
+ BOOL IsHideFieldTips() const {return bHideFieldTips;}
+ void SetHideFieldTips(BOOL bSet) {bHideFieldTips = bSet;}
};
#endif
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index cf09567ef7f0..1d8bcb0649b8 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index f9f524bae7b5..b3847d89c85d 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -2,7 +2,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
@@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
friend class SwNode;
friend class SwNodeIndex;
- SwNodeIndex* pRoot; // Liste aller Indizies auf Nodes
+ SwNodeIndex* pRoot; // Liste aller Indizies auf Nodes
// --> OD 2008-05-14 #refactorlists# - removed <bSyncNumberAndNumRule>
void InsertNode( const SwNodePtr pNode,
@@ -99,18 +99,18 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
// <--
- SwDoc* pMyDoc; // in diesem Doc ist das Nodes-Array
+ SwDoc* pMyDoc; // in diesem Doc ist das Nodes-Array
- SwNode *pEndOfPostIts, *pEndOfInserts, // das sind die festen Bereiche
+ SwNode *pEndOfPostIts, *pEndOfInserts, // das sind die festen Bereiche
*pEndOfAutotext, *pEndOfRedlines,
*pEndOfContent;
- mutable SwOutlineNodes* pOutlineNds; // Array aller GliederiungsNodes
+ mutable SwOutlineNodes* pOutlineNds; // Array aller GliederiungsNodes
- BOOL bInNodesDel : 1; // falls rekursiv aufgerufen wird
+ BOOL bInNodesDel : 1; // falls rekursiv aufgerufen wird
// Num/Outline nicht aktualisierem
- BOOL bInDelUpdOutl : 1; // Flags fuers aktualisieren von Outl.
- BOOL bInDelUpdNum : 1; // Flags fuers aktualisieren von Outl.
+ BOOL bInDelUpdOutl : 1; // Flags fuers aktualisieren von Outl.
+ BOOL bInDelUpdNum : 1; // Flags fuers aktualisieren von Outl.
// fuer dier Verwaltung der Indizies
void RegisterIndex( SwNodeIndex& rIdx );
@@ -124,7 +124,7 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
void ChgNode( SwNodeIndex& rDelPos, ULONG nSize,
SwNodeIndex& rInsPos, BOOL bNewFrms );
- void UpdtOutlineIdx( const SwNode& ); // Update ab Node alle OutlineNodes
+ void UpdtOutlineIdx( const SwNode& ); // Update ab Node alle OutlineNodes
void _CopyNodes( const SwNodeRange&, const SwNodeIndex&,
BOOL bNewFrms = TRUE, BOOL bTblInsDummyNode = FALSE ) const;
@@ -138,12 +138,12 @@ public:
typedef ::std::vector<SwNodeRange> NodeRanges_t;
typedef ::std::vector<NodeRanges_t> TableRanges_t;
-
+
SwNodePtr operator[]( ULONG n ) const
{ return (SwNodePtr)BigPtrArray::operator[] ( n ); }
//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-// neue Schnittstelle angepasst werden
+// neue Schnittstelle angepasst werden
inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const;
ULONG Count() const { return BigPtrArray::Count(); }
@@ -160,18 +160,18 @@ public:
FnForEach_SwNodes fnForEach, void* pArgs = 0 );
// eine noch leere Section
- SwNode& GetEndOfPostIts() const { return *pEndOfPostIts; }
+ SwNode& GetEndOfPostIts() const { return *pEndOfPostIts; }
// Section fuer alle Fussnoten
- SwNode& GetEndOfInserts() const { return *pEndOfInserts; }
+ SwNode& GetEndOfInserts() const { return *pEndOfInserts; }
// Section fuer alle Flys/Header/Footers
- SwNode& GetEndOfAutotext() const { return *pEndOfAutotext; }
+ SwNode& GetEndOfAutotext() const { return *pEndOfAutotext; }
// Section fuer alle Redlines
- SwNode& GetEndOfRedlines() const { return *pEndOfRedlines; }
+ SwNode& GetEndOfRedlines() const { return *pEndOfRedlines; }
// das ist der letzte EndNode einer SonderSection. Hier nach kommt nur
// noch die normale ContentSection (also der BodyText)
- SwNode& GetEndOfExtras() const { return *pEndOfRedlines; }
+ SwNode& GetEndOfExtras() const { return *pEndOfRedlines; }
// die normale ContentSection (also der BodyText)
- SwNode& GetEndOfContent() const { return *pEndOfContent; }
+ SwNode& GetEndOfContent() const { return *pEndOfContent; }
// ist das NodesArray das normale vom Doc? (nicht das UndoNds, .. )
// Implementierung steht im doc.hxx (weil man dazu Doc kennen muss) !
@@ -220,7 +220,7 @@ public:
// die Impl. von "Make...Node" stehen in den angegebenen .ccx-Files
SwTxtNode *MakeTxtNode( const SwNodeIndex & rWhere,
SwTxtFmtColl *pColl,
- SwAttrSet* pAutoAttr = 0 ); // in ndtxt.cxx
+ SwAttrSet* pAutoAttr = 0 ); // in ndtxt.cxx
SwStartNode* MakeTextSection( const SwNodeIndex & rWhere,
SwStartNodeType eSttNdTyp,
SwTxtFmtColl *pColl,
@@ -232,29 +232,29 @@ public:
const Graphic* pGraphic,
SwGrfFmtColl *pColl,
SwAttrSet* pAutoAttr = 0,
- BOOL bDelayed = FALSE ); // in ndgrf.cxx
+ BOOL bDelayed = FALSE ); // in ndgrf.cxx
SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
const GraphicObject& rGrfObj,
SwGrfFmtColl *pColl,
- SwAttrSet* pAutoAttr = 0 ); // in ndgrf.cxx
+ SwAttrSet* pAutoAttr = 0 ); // in ndgrf.cxx
SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
const svt::EmbeddedObjectRef&,
SwGrfFmtColl *pColl,
- SwAttrSet* pAutoAttr = 0 ); // in ndole.cxx
+ SwAttrSet* pAutoAttr = 0 ); // in ndole.cxx
SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
const String &rName,
sal_Int64 nAspect,
SwGrfFmtColl *pColl,
- SwAttrSet* pAutoAttr ); // in ndole.cxx
+ SwAttrSet* pAutoAttr ); // in ndole.cxx
// Array aller GliederiungsNodes;
const SwOutlineNodes& GetOutLineNds() const;
//void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );//#outline level,removed by zhaojianwei
// alle Nodes Updaten - Rule/Format-Aenderung
- void UpdateOutlineNode(SwNode & rNd);
+ void UpdateOutlineNode(SwNode & rNd);
// fuege die Nodes fuer die Tabelle ein
// wenn Lines angegeben, erzeuge die Matrix aus Lines & Boxen
@@ -280,11 +280,11 @@ public:
SwTableBoxFmt* pBoxFmt,
SwTxtFmtColl* pTxtColl,
SwUndoTxtToTbl* pUndo = 0 );
-
+
SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
-
+
//create a table from a vector of NodeRanges - API support
- SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
+ SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
SwTableFmt* pTblFmt,
SwTableLineFmt* pLineFmt,
SwTableBoxFmt* pBoxFmt,
@@ -327,8 +327,8 @@ public:
bool const bCreateFrms = true);
// in welchem Doc steht das Nodes-Array ?
- SwDoc* GetDoc() { return pMyDoc; }
- const SwDoc* GetDoc() const { return pMyDoc; }
+ SwDoc* GetDoc() { return pMyDoc; }
+ const SwDoc* GetDoc() const { return pMyDoc; }
// suche den vorhergehenden [/nachfolgenden ] ContentNode oder
// TabellenNode mit Frames. Wird kein Ende angeben, dann wird mit
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d98c30fde1f1..5b99917e7df2 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -2,7 +2,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
@@ -53,21 +53,21 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
GraphicObject aGrfObj;
::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
Size nGrfSize;
-// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
- String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
+// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
+ String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
// name or package url)
- String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis
- // die normale (HighRes) geladen ist.
- BOOL bTransparentFlagValid :1;
- BOOL bInSwapIn :1;
-
- BOOL bGrafikArrived :1;
- BOOL bChgTwipSize :1;
- BOOL bChgTwipSizeFromPixel :1;
- BOOL bLoadLowResGrf :1;
- BOOL bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber
+ String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis
+ // die normale (HighRes) geladen ist.
+ BOOL bTransparentFlagValid :1;
+ BOOL bInSwapIn :1;
+
+ BOOL bGrafikArrived :1;
+ BOOL bChgTwipSize :1;
+ BOOL bChgTwipSizeFromPixel :1;
+ BOOL bLoadLowResGrf :1;
+ BOOL bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber
//SwapIn zu verhindern.
- BOOL bScaleImageMap :1; //Image-Map in SetTwipSize skalieren
+ BOOL bScaleImageMap :1; //Image-Map in SetTwipSize skalieren
// --> OD 2007-01-19 #i73788#
boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
@@ -148,9 +148,9 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
public:
virtual ~SwGrfNode();
- const Graphic& GetGrf() const { return aGrfObj.GetGraphic(); }
- const GraphicObject& GetGrfObj() const { return aGrfObj; }
- GraphicObject& GetGrfObj() { return aGrfObj; }
+ const Graphic& GetGrf() const { return aGrfObj.GetGraphic(); }
+ const GraphicObject& GetGrfObj() const { return aGrfObj; }
+ GraphicObject& GetGrfObj() { return aGrfObj; }
virtual SwCntntNode *SplitCntntNode( const SwPosition & );
@@ -160,20 +160,20 @@ public:
BOOL IsTransparent() const;
- inline BOOL IsAnimated() const { return aGrfObj.IsAnimated(); }
+ inline BOOL IsAnimated() const { return aGrfObj.IsAnimated(); }
- inline BOOL IsChgTwipSize() const { return bChgTwipSize; }
- inline BOOL IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
- inline void SetChgTwipSize( BOOL b, BOOL bFromPx=FALSE ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; }
+ inline BOOL IsChgTwipSize() const { return bChgTwipSize; }
+ inline BOOL IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
+ inline void SetChgTwipSize( BOOL b, BOOL bFromPx=FALSE ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; }
- inline BOOL IsGrafikArrived() const { return bGrafikArrived; }
- inline void SetGrafikArrived( BOOL b ) { bGrafikArrived = b; }
+ inline BOOL IsGrafikArrived() const { return bGrafikArrived; }
+ inline void SetGrafikArrived( BOOL b ) { bGrafikArrived = b; }
- inline BOOL IsFrameInPaint() const { return bFrameInPaint; }
- inline void SetFrameInPaint( BOOL b ) { bFrameInPaint = b; }
+ inline BOOL IsFrameInPaint() const { return bFrameInPaint; }
+ inline void SetFrameInPaint( BOOL b ) { bFrameInPaint = b; }
- inline BOOL IsScaleImageMap() const { return bScaleImageMap; }
- inline void SetScaleImageMap( BOOL b ) { bScaleImageMap = b; }
+ inline BOOL IsScaleImageMap() const { return bScaleImageMap; }
+ inline void SetScaleImageMap( BOOL b ) { bScaleImageMap = b; }
#endif
// steht in ndcopy.cxx
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
@@ -202,7 +202,7 @@ public:
#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
// Abfrage der Link-Daten
- BOOL IsGrfLink() const { return refLink.Is(); }
+ BOOL IsGrfLink() const { return refLink.Is(); }
inline BOOL IsLinkedFile() const;
inline BOOL IsLinkedDDE() const;
::sfx2::SvBaseLinkRef GetLink() const { return refLink; }
@@ -234,7 +234,7 @@ public:
// ----------------------------------------------------------------------
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-inline SwGrfNode *SwNode::GetGrfNode()
+inline SwGrfNode *SwNode::GetGrfNode()
{
return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0;
}
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 29e8c13bd214..92bfda7b2a01 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 51444abf210c..af3f8bc29a38 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@ class SW_DLLPUBLIC SwNodeIndex
SwNode* pNd;
SwNodeIndex *pNext, *pPrev;
- void Remove(); // Ausketten
+ void Remove(); // Ausketten
// diese sind nicht erlaubt!
SwNodeIndex( SwNodes& rNds, USHORT nIdx );
@@ -102,7 +102,7 @@ public:
// Herausgabe des Pointers auf das NodesArray,
inline const SwNodes& GetNodes() const;
- inline SwNodes& GetNodes();
+ inline SwNodes& GetNodes();
SwNode& GetNode() const { return *pNd; }
};
@@ -243,7 +243,7 @@ inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert )
//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-// neue Schnittstelle angepasst werden
+// neue Schnittstelle angepasst werden
inline SwNode* SwNodes::operator[]( const SwNodeIndex& rIdx ) const
{
return &rIdx.GetNode();
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 2fd16508dc7b..8d403b72d9c2 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -2,7 +2,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
@@ -43,19 +43,19 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
// String aAlternateText; // alternativer Text (HTML)
- PolyPolygon *pContour; // Polygon fuer Konturumlauf
+ PolyPolygon *pContour; // Polygon fuer Konturumlauf
BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated
BOOL bContourMapModeValid : 1; // contour map mode is not the graphics's
// prefered map mode, but either
// MM100 or or pixel
- BOOL bPixelContour : 1; // contour map mode is invalid and pixel.
+ BOOL bPixelContour : 1; // contour map mode is invalid and pixel.
// erzeugt fuer alle Ableitungen einen AttrSet mit Bereichen
// fuer Frame- und Grafik-Attributen (wird nur vom SwCntntNode gerufen)
virtual void NewAttrSet( SwAttrPool& );
- SwNoTxtNode( const SwNoTxtNode& ); //nicht erlaubt
- SwNoTxtNode &operator=( const SwNoTxtNode& ); //nicht erlaubt
+ SwNoTxtNode( const SwNoTxtNode& ); //nicht erlaubt
+ SwNoTxtNode &operator=( const SwNoTxtNode& ); //nicht erlaubt
protected:
SwNoTxtNode( const SwNodeIndex &rWhere, const BYTE nNdType,
@@ -87,20 +87,20 @@ public:
void SetContour( const PolyPolygon *pPoly,
BOOL bAutomatic = FALSE );
const PolyPolygon *HasContour() const;
- BOOL _HasContour() const { return pContour!=0; };
- void GetContour( PolyPolygon &rPoly ) const;
- void CreateContour();
+ BOOL _HasContour() const { return pContour!=0; };
+ void GetContour( PolyPolygon &rPoly ) const;
+ void CreateContour();
- void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; }
+ void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; }
BOOL HasAutomaticContour() const { return bAutomaticContour; }
// set either a MM100 or pixel contour
void SetContourAPI( const PolyPolygon *pPoly );
// get either a MM100 or pixel contour, return FALSE if no contour is set.
- BOOL GetContourAPI( PolyPolygon &rPoly ) const;
+ BOOL GetContourAPI( PolyPolygon &rPoly ) const;
- void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; }
+ void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; }
BOOL IsPixelContour() const;
BOOL IsContourMapModeValid() const { return bContourMapModeValid; }
@@ -119,6 +119,6 @@ inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0;
}
-#endif // _NDNOTXT_HXX
+#endif // _NDNOTXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index ef9adde86338..c4046d197e96 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -2,7 +2,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
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwOLEObj
svt::EmbeddedObjectRef xOLERef;
String aName;
- SwOLEObj( const SwOLEObj& rObj ); //nicht erlaubt.
+ SwOLEObj( const SwOLEObj& rObj ); //nicht erlaubt.
SwOLEObj();
void SetNode( SwOLENode* pNode );
@@ -71,7 +71,7 @@ public:
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef();
svt::EmbeddedObjectRef& GetObject();
const String& GetCurrentPersistName() const { return aName; }
- BOOL IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss.
+ BOOL IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss.
#endif
};
@@ -85,20 +85,20 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
friend class SwNodes;
mutable SwOLEObj aOLEObj;
Graphic* pGraphic;
- String sChartTblName; // bei Chart Objecten: Name der ref. Tabelle
- BOOL bOLESizeInvalid; //Soll beim SwDoc::PrtOLENotify beruecksichtig
+ String sChartTblName; // bei Chart Objecten: Name der ref. Tabelle
+ BOOL bOLESizeInvalid; //Soll beim SwDoc::PrtOLENotify beruecksichtig
//werden (zum Beispiel kopiert). Ist nicht
//Persistent.
- SwEmbedObjectLink* mpObjectLink;
+ SwEmbedObjectLink* mpObjectLink;
String maLinkURL;
- SwOLENode( const SwNodeIndex &rWhere,
+ SwOLENode( const SwNodeIndex &rWhere,
const svt::EmbeddedObjectRef&,
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
- SwOLENode( const SwNodeIndex &rWhere,
+ SwOLENode( const SwNodeIndex &rWhere,
const String &rName,
sal_Int64 nAspect,
SwGrfFmtColl *pGrfColl,
@@ -111,7 +111,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
public:
const SwOLEObj& GetOLEObj() const { return aOLEObj; }
- SwOLEObj& GetOLEObj() { return aOLEObj; }
+ SwOLEObj& GetOLEObj() { return aOLEObj; }
~SwOLENode();
virtual SwCntntNode *SplitCntntNode( const SwPosition & );
@@ -131,7 +131,7 @@ public:
BOOL IsInGlobalDocSection() const;
BOOL IsOLEObjectDeleted() const;
- BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; }
+ BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; }
void SetOLESizeInvalid( BOOL b ){ bOLESizeInvalid = b; }
sal_Int64 GetAspect() const { return aOLEObj.GetObject().GetViewAspect(); }
@@ -152,8 +152,8 @@ public:
// <--
#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
- const String& GetChartTblName() const { return sChartTblName; }
- void SetChartTblName( const String& rNm ) { sChartTblName = rNm; }
+ const String& GetChartTblName() const { return sChartTblName; }
+ void SetChartTblName( const String& rNm ) { sChartTblName = rNm; }
#endif
};
@@ -168,6 +168,6 @@ inline const SwOLENode *SwNode::GetOLENode() const
return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
}
-#endif // _NDOLE_HXX
+#endif // _NDOLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 2127e389e99e..713a30bbe8a2 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ namespace utl {
class SwTxtFmtColl;
class SwCntntFrm;
-class SwTxtFld; // Fuer GetTxtFld()
+class SwTxtFld; // Fuer GetTxtFld()
class SfxItemSet;
class SwUndoTransliterate;
@@ -92,7 +92,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
{
// fuer das Erzeugen des ersten TextNode
- friend class SwDoc; // CTOR und AppendTxtNode()
+ friend class SwDoc; // CTOR und AppendTxtNode()
friend class SwNodes;
friend class SwTxtFrm;
friend class SwScriptInfo;
@@ -286,12 +286,12 @@ public:
refmarks, toxmarks, and metas will be ignored unless this is true
ATTENTION: setting bInclRefToxMark is only allowed from UNDO!
*/
- void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich = 0,
+ void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich = 0,
const SfxItemSet* pSet = 0, BOOL bInclRefToxMark = FALSE );
- void GCAttr();
+ void GCAttr();
// loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
- void DestroyAttr( SwTxtAttr* pAttr );
+ void DestroyAttr( SwTxtAttr* pAttr );
// loesche alle Attribute aus dem SwpHintsArray.
void ClearSwpHintsArr( bool bDelFields );
@@ -719,7 +719,7 @@ public:
USHORT nScript = 0 ) const;
// steht in ndcopy.cxx
- BOOL IsSymbol( const xub_StrLen nBegin ) const; // steht in itratr.cxx
+ BOOL IsSymbol( const xub_StrLen nBegin ) const; // steht in itratr.cxx
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
// interaktive Trennung: wir finden den TxtFrm und rufen sein CalcHyph
@@ -795,7 +795,7 @@ public:
bool IsHidden() const;
// <--
- TYPEINFO(); // fuer rtti
+ TYPEINFO(); // fuer rtti
// fuers Umhaengen der TxtFmtCollections (Outline-Nummerierung!!)
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index 1baf94439dfa..bad03aea74fc 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -2,7 +2,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
@@ -33,15 +33,15 @@
// Ids fuer die verschiedenden Nodes; in der Basisklasse steht der Member,
// der angibt, um was fuer einen es sich handelt
-const BYTE ND_ENDNODE = 0x01;
-const BYTE ND_STARTNODE = 0x02;
-const BYTE ND_TABLENODE = 0x06;
-const BYTE ND_TEXTNODE = 0x08;
-const BYTE ND_GRFNODE = 0x10;
-const BYTE ND_OLENODE = 0x20;
+const BYTE ND_ENDNODE = 0x01;
+const BYTE ND_STARTNODE = 0x02;
+const BYTE ND_TABLENODE = 0x06;
+const BYTE ND_TEXTNODE = 0x08;
+const BYTE ND_GRFNODE = 0x10;
+const BYTE ND_OLENODE = 0x20;
-const BYTE ND_CONTENTNODE = 0x38; // ContentNode (eines von den 3 Bits)
-const BYTE ND_NOTXTNODE = 0x30; // NoTxtNode (eines von den 2 Bits)
+const BYTE ND_CONTENTNODE = 0x38; // ContentNode (eines von den 3 Bits)
+const BYTE ND_NOTXTNODE = 0x30; // NoTxtNode (eines von den 2 Bits)
const BYTE ND_SECTIONNODE = 0x42;
// nur fuer internen Gebrauch!!
diff --git a/sw/inc/newhdl.hxx b/sw/inc/newhdl.hxx
index fe096a67e18d..0a411d88228c 100644
--- a/sw/inc/newhdl.hxx
+++ b/sw/inc/newhdl.hxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#include <tools/link.hxx>
-#include "errhdl.hxx" // hier kommt auch swtypes rein, was ich brauche
+#include "errhdl.hxx" // hier kommt auch swtypes rein, was ich brauche
// ----------------------------------------------------------------------------
@@ -40,25 +40,25 @@ class SwNewHdl
{
friend void SW_NEW_HDL();
private:
- char* pWarnMem;
- char* pExceptMem;
- Link aWarnLnk;
- Link aErrLnk;
+ char* pWarnMem;
+ char* pExceptMem;
+ Link aWarnLnk;
+ Link aErrLnk;
public:
- void SetWarnLnk( const Link &rLink );
- void SetErrLnk( const Link &rLink );
+ void SetWarnLnk( const Link &rLink );
+ void SetErrLnk( const Link &rLink );
- BOOL TryWarnMem();
+ BOOL TryWarnMem();
- BOOL Flush_WarnMem();
- BOOL Flush_ExceptMem();
+ BOOL Flush_WarnMem();
+ BOOL Flush_ExceptMem();
SwNewHdl();
~SwNewHdl();
};
/******************************************************************************
- * INLINE
+ * INLINE
******************************************************************************/
inline void SwNewHdl::SetWarnLnk( const Link &rLink )
{
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 723c9efbd8a7..1500d3ba7ad1 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -2,7 +2,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
@@ -102,10 +102,10 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry
// JP 28.03.96
// fuer Textnodes: Stufungslevel der Autoformatierung. Ist erstmal hier
- // gelandet, weil noch Bits frei sind
+ // gelandet, weil noch Bits frei sind
BYTE nAFmtNumLvl : 3;
- BOOL bSetNumLSpace : 1; // fuer Numerierung: TRUE Einzug setzen
- BOOL bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag
+ BOOL bSetNumLSpace : 1; // fuer Numerierung: TRUE Einzug setzen
+ BOOL bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag
protected:
SwStartNode* pStartOfSection;
@@ -141,7 +141,7 @@ public:
inline BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; }
inline void SetIgnoreDontExpand( BOOL bNew ) { bIgnoreDontExpand = bNew; }
- BYTE GetNodeType() const { return nNodeType; }
+ BYTE GetNodeType() const { return nNodeType; }
inline SwStartNode *GetStartNode();
inline const SwStartNode *GetStartNode() const;
@@ -149,12 +149,12 @@ public:
inline const SwCntntNode *GetCntntNode() const;
inline SwEndNode *GetEndNode();
inline const SwEndNode *GetEndNode() const;
-#ifndef ICC
+#ifndef ICC
inline
#endif
SwTxtNode *GetTxtNode();
-#ifndef ICC
+#ifndef ICC
inline
#endif
const SwTxtNode *GetTxtNode() const;
@@ -282,7 +282,7 @@ public:
BOOL IsInProtectSect() const;
// befindet sich der Node in irgendetwas geschuetzten ?
// (Bereich/Rahmen/Tabellenzellen/... incl. des Ankers bei
- // Rahmen/Fussnoten/..)
+ // Rahmen/Fussnoten/..)
BOOL IsProtect() const;
// suche den PageDesc, mit dem dieser Node formatiert ist. Wenn das
// Layout vorhanden ist wird ueber das gesucht, ansonsten gibt es nur
@@ -317,7 +317,7 @@ class SwStartNode: public SwNode
{
friend class SwNode;
friend class SwNodes;
- friend class SwEndNode; // um theEndOfSection zu setzen !!
+ friend class SwEndNode; // um theEndOfSection zu setzen !!
SwEndNode* pEndOfSection;
SwStartNodeType eSttNdTyp;
@@ -332,7 +332,7 @@ protected:
public:
DECL_FIXEDMEMPOOL_NEWDEL(SwStartNode)
- SwStartNodeType GetStartNodeType() const { return eSttNdTyp; }
+ SwStartNodeType GetStartNodeType() const { return eSttNdTyp; }
// an alle ContentNodes der Section das ChkCondColl rufen
void CheckSectionCondColl() const;
@@ -350,8 +350,8 @@ private:
class SwEndNode : public SwNode
{
friend class SwNodes;
- friend class SwTableNode; // um seinen EndNode anlegen zukoennen
- friend class SwSectionNode; // um seinen EndNode anlegen zukoennen
+ friend class SwTableNode; // um seinen EndNode anlegen zukoennen
+ friend class SwSectionNode; // um seinen EndNode anlegen zukoennen
// fuer den initialen StartNode
SwEndNode( SwNodes& rNodes, ULONG nPos, SwStartNode& rSttNd );
@@ -388,7 +388,7 @@ protected:
virtual ~SwCntntNode();
// Attribut-Set fuer alle AUTO-Attribute eines CntntNodes
- // ( z.B: TxtNode oder NoTxtNode
+ // ( z.B: TxtNode oder NoTxtNode
boost::shared_ptr<const SfxItemSet> mpAttrSet;
// lasse von den entsprechenden Nodes die spz. AttrSets anlegen
@@ -399,7 +399,7 @@ protected:
USHORT ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds );
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
@@ -412,8 +412,8 @@ public:
int CanJoinNext( SwNodeIndex* pIdx =0 ) const;
int CanJoinPrev( SwNodeIndex* pIdx =0 ) const;
- void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); }
- void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); }
+ void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); }
+ void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); }
BOOL GoNext(SwIndex *, USHORT nMode ) const;
BOOL GoPrevious(SwIndex *, USHORT nMode ) const;
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 90433b0753a1..aa354f2f0361 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -2,7 +2,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
@@ -36,8 +36,8 @@
#include "swdllapi.h"
#include <swtypes.hxx>
#include <calbck.hxx>
-#include <errhdl.hxx> // Fuer die inline ASSERT
-#include <error.h> // Fuer die inline ASSERT
+#include <errhdl.hxx> // Fuer die inline ASSERT
+#include <error.h> // Fuer die inline ASSERT
#include <hints.hxx>
#include <hash_map>
#include <stringhash.hxx>
@@ -61,7 +61,7 @@ class SwDoc;
class SwFmtVertOrient;
class SwTxtNode;
-const sal_Unicode cBulletChar = 0x2022; // Charakter fuer Aufzaehlungen
+const sal_Unicode cBulletChar = 0x2022; // Charakter fuer Aufzaehlungen
class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
{
@@ -89,8 +89,8 @@ public:
void SetCharFmt( SwCharFmt* );
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
- virtual void SetCharFmtName(const String& rSet);
- virtual const String& GetCharFmtName()const;
+ virtual void SetCharFmtName(const String& rSet);
+ virtual const String& GetCharFmtName()const;
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
@@ -152,13 +152,13 @@ private:
String sName;
SwNumRuleType eRuleType;
- USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte NumRules
- USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage
- BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen
+ USHORT nPoolFmtId; // Id-fuer "automatich" erzeugte NumRules
+ USHORT nPoolHelpId; // HelpId fuer diese Pool-Vorlage
+ BYTE nPoolHlpFileId; // FilePos ans Doc auf die Vorlagen-Hilfen
BOOL bAutoRuleFlag : 1;
BOOL bInvalidRuleFlag : 1;
- BOOL bContinusNum : 1; // Fortlaufende Numerierung - ohne Ebenen
- BOOL bAbsSpaces : 1; // die Ebenen repraesentieren absol. Einzuege
+ BOOL bContinusNum : 1; // Fortlaufende Numerierung - ohne Ebenen
+ BOOL bAbsSpaces : 1; // die Ebenen repraesentieren absol. Einzuege
bool mbCountPhantoms;
// --> OD 2008-02-11 #newlistlevelattrs#
@@ -253,8 +253,8 @@ public:
static USHORT GetNumIndent( BYTE nLvl );
static USHORT GetBullIndent( BYTE nLvl );
- SwNumRuleType GetRuleType() const { return eRuleType; }
- void SetRuleType( SwNumRuleType eNew ) { eRuleType = eNew;
+ SwNumRuleType GetRuleType() const { return eRuleType; }
+ void SetRuleType( SwNumRuleType eNew ) { eRuleType = eNew;
bInvalidRuleFlag = TRUE; }
// eine Art Copy-Constructor, damit die Num-Formate auch an den
@@ -272,17 +272,17 @@ public:
IDocumentListsAccess& rDocListAccess ); // #i36749#
// <--
- BOOL IsAutoRule() const { return bAutoRuleFlag; }
- void SetAutoRule( BOOL bFlag ) { bAutoRuleFlag = bFlag; }
+ BOOL IsAutoRule() const { return bAutoRuleFlag; }
+ void SetAutoRule( BOOL bFlag ) { bAutoRuleFlag = bFlag; }
- BOOL IsInvalidRule() const { return bInvalidRuleFlag; }
+ BOOL IsInvalidRule() const { return bInvalidRuleFlag; }
void SetInvalidRule( BOOL bFlag );
- BOOL IsContinusNum() const { return bContinusNum; }
- void SetContinusNum( BOOL bFlag ) { bContinusNum = bFlag; }
+ BOOL IsContinusNum() const { return bContinusNum; }
+ void SetContinusNum( BOOL bFlag ) { bContinusNum = bFlag; }
- BOOL IsAbsSpaces() const { return bAbsSpaces; }
- void SetAbsSpaces( BOOL bFlag ) { bAbsSpaces = bFlag; }
+ BOOL IsAbsSpaces() const { return bAbsSpaces; }
+ void SetAbsSpaces( BOOL bFlag ) { bAbsSpaces = bFlag; }
// #115901#
BOOL IsOutlineRule() const { return eRuleType == OUTLINE_RULE; }
@@ -291,17 +291,17 @@ public:
void SetCountPhantoms(bool bCountPhantoms);
// erfragen und setzen der Poolvorlagen-Id's
- USHORT GetPoolFmtId() const { return nPoolFmtId; }
- void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; }
+ USHORT GetPoolFmtId() const { return nPoolFmtId; }
+ void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; }
// erfragen und setzen der Hilfe-Id's fuer die Document-Vorlagen
- USHORT GetPoolHelpId() const { return nPoolHelpId; }
- void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; }
- BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; }
- void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; }
+ USHORT GetPoolHelpId() const { return nPoolHelpId; }
+ void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; }
+ BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; }
+ void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; }
- void SetSvxRule(const SvxNumRule&, SwDoc* pDoc);
- SvxNumRule MakeSvxNumRule() const;
+ void SetSvxRule(const SvxNumRule&, SwDoc* pDoc);
+ SvxNumRule MakeSvxNumRule() const;
// #i23726#, #i23725#
// --> OD 2008-06-09 #i90078#
@@ -372,6 +372,6 @@ namespace numfunc
SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode();
}
-#endif // _NUMRULE_HXX
+#endif // _NUMRULE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 173e299a6f00..e587a3d045b1 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include <tools/color.hxx>
#include <tools/string.hxx>
#include "swdllapi.h"
-#include <swtypes.hxx> //fuer SwTwips
+#include <swtypes.hxx> //fuer SwTwips
#include <frmfmt.hxx>
#include <editeng/numitem.hxx>
@@ -51,30 +51,30 @@ enum SwFtnAdj
//footnote information
class SW_DLLPUBLIC SwPageFtnInfo
{
- SwTwips nMaxHeight; //maximum height of the footnote area.
- ULONG nLineWidth; //width of separator line
- Color aLineColor; //color of the separator line
- Fraction aWidth; //percentage width of the separator line.
- SwFtnAdj eAdj; //line adjustment.
- SwTwips nTopDist; //distance between body and separator.
- SwTwips nBottomDist; //distance between separator and first footnote
+ SwTwips nMaxHeight; //maximum height of the footnote area.
+ ULONG nLineWidth; //width of separator line
+ Color aLineColor; //color of the separator line
+ Fraction aWidth; //percentage width of the separator line.
+ SwFtnAdj eAdj; //line adjustment.
+ SwTwips nTopDist; //distance between body and separator.
+ SwTwips nBottomDist; //distance between separator and first footnote
public:
- SwTwips GetHeight() const { return nMaxHeight; }
- ULONG GetLineWidth() const { return nLineWidth; }
- const Color& GetLineColor() const { return aLineColor;}
- const Fraction& GetWidth() const { return aWidth; }
- SwFtnAdj GetAdj() const { return eAdj; }
- SwTwips GetTopDist()const { return nTopDist; }
- SwTwips GetBottomDist() const { return nBottomDist; }
-
- void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; }
- void SetLineWidth(ULONG nSet ) { nLineWidth = nSet; }
+ SwTwips GetHeight() const { return nMaxHeight; }
+ ULONG GetLineWidth() const { return nLineWidth; }
+ const Color& GetLineColor() const { return aLineColor;}
+ const Fraction& GetWidth() const { return aWidth; }
+ SwFtnAdj GetAdj() const { return eAdj; }
+ SwTwips GetTopDist()const { return nTopDist; }
+ SwTwips GetBottomDist() const { return nBottomDist; }
+
+ void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; }
+ void SetLineWidth(ULONG nSet ) { nLineWidth = nSet; }
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetWidth( const Fraction &rNew){ aWidth = rNew; }
- void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; }
- void SetTopDist ( SwTwips nNew ) { nTopDist = nNew; }
- void SetBottomDist( SwTwips nNew ) { nBottomDist = nNew; }
+ void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; }
+ void SetTopDist ( SwTwips nNew ) { nTopDist = nNew; }
+ void SetBottomDist( SwTwips nNew ) { nBottomDist = nNew; }
SwPageFtnInfo();
SwPageFtnInfo( const SwPageFtnInfo& );
@@ -86,13 +86,13 @@ public:
/*
* Verwendung des UseOnPage (eUse) und der FrmFmt'e
*
- * RIGHT - aMaster nur fuer rechte Seiten, linke Seiten immer leer.
- * LEFT - aLeft fuer linke Seiten, rechte Seiten immer leer.
- * aLeft ist eine Kopie des Master.
- * ALL - aMaster fuer rechte Seiten, aLeft fuer Linke Seiten.
- * aLeft ist eine Kopie des Master.
- * MIRROR - aMaster fuer rechte Seiten, aLeft fuer linke Seiten.
- * aLeft ist eine Kopie des Master, Raender sind gespiegelt.
+ * RIGHT - aMaster nur fuer rechte Seiten, linke Seiten immer leer.
+ * LEFT - aLeft fuer linke Seiten, rechte Seiten immer leer.
+ * aLeft ist eine Kopie des Master.
+ * ALL - aMaster fuer rechte Seiten, aLeft fuer Linke Seiten.
+ * aLeft ist eine Kopie des Master.
+ * MIRROR - aMaster fuer rechte Seiten, aLeft fuer linke Seiten.
+ * aLeft ist eine Kopie des Master, Raender sind gespiegelt.
*
* UI dreht auschliesslich am Master! aLeft wird beim Chg am Dokument
* enstprechend dem eUse eingestellt.
@@ -136,16 +136,16 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
friend class SwDoc;
friend class SwUndoPageDescExt;
- String aDescName;
- SvxNumberType aNumType;
- SwFrmFmt aMaster;
- SwFrmFmt aLeft;
- SwDepend aDepend; // wg. Registerhaltigkeit
+ String aDescName;
+ SvxNumberType aNumType;
+ SwFrmFmt aMaster;
+ SwFrmFmt aLeft;
+ SwDepend aDepend; // wg. Registerhaltigkeit
SwPageDesc *pFollow;
- USHORT nRegHeight; // Zeilenabstand und Fontascent der Vorlage
- USHORT nRegAscent; // fuer die Registerhaltigkeit
- UseOnPage eUse;
- BOOL bLandscape;
+ USHORT nRegHeight; // Zeilenabstand und Fontascent der Vorlage
+ USHORT nRegAscent; // fuer die Registerhaltigkeit
+ UseOnPage eUse;
+ BOOL bLandscape;
//Fussnoteninformationen
SwPageFtnInfo aFtnInfo;
@@ -160,16 +160,16 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
public:
const String &GetName() const { return aDescName; }
- void SetName( const String& rNewName ) { aDescName = rNewName; }
+ void SetName( const String& rNewName ) { aDescName = rNewName; }
BOOL GetLandscape() const { return bLandscape; }
void SetLandscape( BOOL bNew ) { bLandscape = bNew; }
const SvxNumberType &GetNumType() const { return aNumType; }
- void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; }
+ void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; }
const SwPageFtnInfo &GetFtnInfo() const { return aFtnInfo; }
- SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; }
+ SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; }
void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; }
inline BOOL IsHeaderShared() const;
@@ -177,10 +177,10 @@ public:
inline void ChgHeaderShare( BOOL bNew );
inline void ChgFooterShare( BOOL bNew );
- inline void SetUseOn( UseOnPage eNew );
+ inline void SetUseOn( UseOnPage eNew );
inline UseOnPage GetUseOn() const;
- void WriteUseOn( UseOnPage eNew ) { eUse = eNew; }
+ void WriteUseOn( UseOnPage eNew ) { eUse = eNew; }
UseOnPage ReadUseOn () const { return eUse; }
SwFrmFmt &GetMaster() { return aMaster; }
@@ -215,12 +215,12 @@ public:
void RegisterChange();
// erfragen und setzen der PoolFormat-Id
- USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); }
- void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); }
- USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); }
- void SetPoolHelpId( USHORT nId ) { aMaster.SetPoolHelpId( nId ); }
- BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); }
- void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); }
+ USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); }
+ void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); }
+ USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); }
+ void SetPoolHelpId( USHORT nId ) { aMaster.SetPoolHelpId( nId ); }
+ BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); }
+ void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); }
// erfrage vom Client Informationen
virtual BOOL GetInfo( SfxPoolItem& ) const;
@@ -269,7 +269,7 @@ inline void SwPageDesc::ChgFooterShare( BOOL bNew )
eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFOOTERSHARE);
// (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE;
}
-inline void SwPageDesc::SetUseOn( UseOnPage eNew )
+inline void SwPageDesc::SetUseOn( UseOnPage eNew )
{
UseOnPage eTmp = nsUseOnPage::PD_NONE;
if ( eUse & nsUseOnPage::PD_HEADERSHARE )
@@ -342,6 +342,6 @@ public:
SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName);
-#endif //_PAGEDESC_HXX
+#endif //_PAGEDESC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pageiter.hxx b/sw/inc/pageiter.hxx
index 86b4c8e6cfd1..af4dca447e47 100644
--- a/sw/inc/pageiter.hxx
+++ b/sw/inc/pageiter.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 68b15fc92521..1f1e9c9da371 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -2,7 +2,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
@@ -28,13 +28,13 @@
#ifndef _PAM_HXX
#define _PAM_HXX
-#include <stddef.h> // fuer MemPool
+#include <stddef.h> // fuer MemPool
#include <tools/gen.hxx>
#include <tools/mempool.hxx>
-#include <cshtyp.hxx> // fuer die Funktions-Definitionen
-#include <ring.hxx> // Superklasse
-#include <index.hxx> // fuer SwIndex
-#include <ndindex.hxx> // fuer SwNodeIndex
+#include <cshtyp.hxx> // fuer die Funktions-Definitionen
+#include <ring.hxx> // Superklasse
+#include <index.hxx> // fuer SwIndex
+#include <ndindex.hxx> // fuer SwNodeIndex
#include "swdllapi.h"
class SwFmt;
@@ -75,7 +75,7 @@ struct SW_DLLPUBLIC SwPosition
SwDoc * GetDoc() const;
BOOL operator < (const SwPosition &) const;
- BOOL operator > (const SwPosition &) const;
+ BOOL operator > (const SwPosition &) const;
BOOL operator <=(const SwPosition &) const;
BOOL operator >=(const SwPosition &) const;
BOOL operator ==(const SwPosition &) const;
@@ -85,15 +85,15 @@ struct SW_DLLPUBLIC SwPosition
// das Ergebnis eines Positions Vergleiches
enum SwComparePosition {
- POS_BEFORE, // Pos1 liegt vor Pos2
- POS_BEHIND, // Pos1 liegt hinter Pos2
- POS_INSIDE, // Pos1 liegt vollstaendig in Pos2
- POS_OUTSIDE, // Pos2 liegt vollstaendig in Pos1
- POS_EQUAL, // Pos1 ist genauso gross wie Pos2
- POS_OVERLAP_BEFORE, // Pos1 ueberlappt Pos2 am Anfang
- POS_OVERLAP_BEHIND, // Pos1 ueberlappt Pos2 am Ende
- POS_COLLIDE_START, // Pos1 Start stoesst an Pos2 Ende
- POS_COLLIDE_END // Pos1 End stoesst an Pos2 Start
+ POS_BEFORE, // Pos1 liegt vor Pos2
+ POS_BEHIND, // Pos1 liegt hinter Pos2
+ POS_INSIDE, // Pos1 liegt vollstaendig in Pos2
+ POS_OUTSIDE, // Pos2 liegt vollstaendig in Pos1
+ POS_EQUAL, // Pos1 ist genauso gross wie Pos2
+ POS_OVERLAP_BEFORE, // Pos1 ueberlappt Pos2 am Anfang
+ POS_OVERLAP_BEHIND, // Pos1 ueberlappt Pos2 am Ende
+ POS_COLLIDE_START, // Pos1 Start stoesst an Pos2 Ende
+ POS_COLLIDE_END // Pos1 End stoesst an Pos2 Start
};
SwComparePosition ComparePosition(
const SwPosition& rStt1, const SwPosition& rEnd1,
@@ -138,9 +138,9 @@ public:
long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
SwPaM( const SwNode& rMk, const SwNode& rPt,
long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
- SwPaM( const SwNodeIndex& rMk, xub_StrLen nMkCntnt,
+ SwPaM( const SwNodeIndex& rMk, xub_StrLen nMkCntnt,
const SwNodeIndex& rPt, xub_StrLen nPtCntnt, SwPaM* pRing = 0 );
- SwPaM( const SwNode& rMk, xub_StrLen nMkCntnt,
+ SwPaM( const SwNode& rMk, xub_StrLen nMkCntnt,
const SwNode& rPt, xub_StrLen nPtCntnt, SwPaM* pRing = 0 );
SwPaM( const SwNode& rNd, xub_StrLen nCntnt = 0, SwPaM* pRing = 0 );
SwPaM( const SwNodeIndex& rNd, xub_StrLen nCntnt = 0, SwPaM* pRing = 0 );
@@ -156,18 +156,18 @@ public:
SwGoInDoc fnGo = fnGoCntnt );
// Suchen
- BYTE Find( const com::sun::star::util::SearchOptions& rSearchOpt,
+ BYTE Find( const com::sun::star::util::SearchOptions& rSearchOpt,
BOOL bSearchInNotes,
utl::TextSearch& rSTxt,
SwMoveFn fnMove = fnMoveForward,
const SwPaM *pPam =0, BOOL bInReadOnly = FALSE);
- BOOL Find( const SwFmt& rFmt,
+ BOOL Find( const SwFmt& rFmt,
SwMoveFn fnMove = fnMoveForward,
const SwPaM *pPam =0, BOOL bInReadOnly = FALSE);
- BOOL Find( const SfxPoolItem& rAttr, BOOL bValue = TRUE,
+ BOOL Find( const SfxPoolItem& rAttr, BOOL bValue = TRUE,
SwMoveFn fnMove = fnMoveForward,
const SwPaM *pPam =0, BOOL bInReadOnly = FALSE );
- BOOL Find( const SfxItemSet& rAttr, BOOL bNoColls,
+ BOOL Find( const SfxItemSet& rAttr, BOOL bNoColls,
SwMoveFn fnMove,
const SwPaM *pPam, BOOL bInReadOnly, BOOL bMoveFirst );
@@ -264,7 +264,7 @@ public:
{ return *Start() <= rPos && rPos <= *End(); }
static BOOL Overlap(const SwPaM & a, const SwPaM & b);
-
+
static BOOL LessThan(const SwPaM & a, const SwPaM & b);
DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
@@ -278,6 +278,6 @@ BOOL CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, BOOL );
BOOL GoInCntnt( SwPaM & rPam, SwMoveFn fnMove );
-#endif // _PAM_HXX
+#endif // _PAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 5355e440a6a3..67b7121aada7 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ class SwCharFmt;
class IntlWrapper;
/*************************************************************************
-|* class SwFmtDrop
+|* class SwFmtDrop
*************************************************************************/
#define DROP_WHOLEWORD ((USHORT)0x0001)
@@ -52,13 +52,13 @@ class IntlWrapper;
//SwFmtDrop an die Absatze propagiert.
class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
{
- SwModify* pDefinedIn; // Modify-Object, in dem der DropCaps steht
+ SwModify* pDefinedIn; // Modify-Object, in dem der DropCaps steht
// kann nur TxtFmtCollection/TxtNode sein
USHORT nDistance; // Abstand zum Textbeginn
- USHORT nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!)
- BYTE nLines; // Anzahl der Zeilen
- BYTE nChars; // Anzahl der Zeichen
- BOOL bWholeWord; // Erstes Wort als Initialen
+ USHORT nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!)
+ BYTE nLines; // Anzahl der Zeilen
+ BYTE nChars; // Anzahl der Zeichen
+ BOOL bWholeWord; // Erstes Wort als Initialen
public:
TYPEINFO(); //Bereits in der Basisklasse SwClient
@@ -74,14 +74,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
inline BYTE GetLines() const { return nLines; }
inline BYTE &GetLines() { return nLines; }
@@ -119,7 +119,7 @@ public:
inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
// "pure virtual Methoden" vom SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -159,15 +159,15 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
};
class SwParaConnectBorderItem : public SfxBoolItem
@@ -203,48 +203,48 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=(
/******************************************************************************
- * Implementierung der Paragraph-Attribut Methoden vom SwAttrSet
+ * Implementierung der Paragraph-Attribut Methoden vom SwAttrSet
******************************************************************************/
inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(BOOL bInP) const
- { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); }
+ { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); }
inline const SvxAdjustItem &SwAttrSet::GetAdjust(BOOL bInP) const
- { return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); }
+ { return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); }
inline const SvxFmtSplitItem &SwAttrSet::GetSplit(BOOL bInP) const
- { return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); }
+ { return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); }
inline const SwRegisterItem &SwAttrSet::GetRegister(BOOL bInP) const
- { return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); }
+ { return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); }
inline const SvxWidowsItem &SwAttrSet::GetWidows(BOOL bInP) const
- { return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); }
+ { return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); }
inline const SvxOrphansItem &SwAttrSet::GetOrphans(BOOL bInP) const
- { return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); }
+ { return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); }
inline const SvxTabStopItem &SwAttrSet::GetTabStops(BOOL bInP) const
- { return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); }
+ { return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); }
inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(BOOL bInP) const
- { return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); }
+ { return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); }
inline const SwFmtDrop &SwAttrSet::GetDrop(BOOL bInP) const
- { return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); }
+ { return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); }
inline const SwNumRuleItem &SwAttrSet::GetNumRule(BOOL bInP) const
- { return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); }
+ { return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); }
inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(BOOL bInP) const
- { return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); }
+ { return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); }
inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(BOOL bInP) const
- { return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); }
+ { return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); }
inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(BOOL bInP) const
- { return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
+ { return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(BOOL bInP) const
- { return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); }
+ { return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); }
inline const SvxParaGridItem &SwAttrSet::GetParaGrid(BOOL bInP) const
{ return (const SvxParaGridItem&)Get( RES_PARATR_SNAPTOGRID, bInP ); }
inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(BOOL bInP) const
{ return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); }
/******************************************************************************
- * Implementierung der Paragraph-Attribut Methoden vom SwFmt
+ * Implementierung der Paragraph-Attribut Methoden vom SwFmt
******************************************************************************/
inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(BOOL bInP) const
- { return aSet.GetLineSpacing(bInP); }
+ { return aSet.GetLineSpacing(bInP); }
inline const SvxAdjustItem &SwFmt::GetAdjust(BOOL bInP) const
{ return aSet.GetAdjust(bInP); }
inline const SvxFmtSplitItem &SwFmt::GetSplit(BOOL bInP) const
@@ -256,13 +256,13 @@ inline const SvxWidowsItem &SwFmt::GetWidows(BOOL bInP) const
inline const SvxOrphansItem &SwFmt::GetOrphans(BOOL bInP) const
{ return aSet.GetOrphans(bInP); }
inline const SvxTabStopItem &SwFmt::GetTabStops(BOOL bInP) const
- { return aSet.GetTabStops(bInP); }
+ { return aSet.GetTabStops(bInP); }
inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(BOOL bInP) const
{ return aSet.GetHyphenZone(bInP); }
inline const SwFmtDrop &SwFmt::GetDrop(BOOL bInP) const
- { return aSet.GetDrop(bInP); }
+ { return aSet.GetDrop(bInP); }
inline const SwNumRuleItem &SwFmt::GetNumRule(BOOL bInP) const
- { return aSet.GetNumRule(bInP); }
+ { return aSet.GetNumRule(bInP); }
inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(BOOL bInP) const
{ return aSet.GetScriptSpace(bInP) ; }
inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(BOOL bInP) const
diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx
index 62d2c91a33f3..d87a79938c29 100644
--- a/sw/inc/pausethreadstarting.hxx
+++ b/sw/inc/pausethreadstarting.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/pch/precompiled_sw.cxx b/sw/inc/pch/precompiled_sw.cxx
index e5e35c1cf17f..5dc3a1dc39cc 100644
--- a/sw/inc/pch/precompiled_sw.cxx
+++ b/sw/inc/pch/precompiled_sw.cxx
@@ -2,7 +2,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
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index bfb8696617f1..6784017294ad 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index f191f0fac78c..c73baa70ec61 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -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
@@ -34,248 +34,248 @@
// ---------------
// Zeichenvorlagen:
-#define STR_POOLCHR_FOOTNOTE (RC_POOLCHRFMT_BEGIN+ 0)
-#define STR_POOLCHR_PAGENO (RC_POOLCHRFMT_BEGIN+ 1)
-#define STR_POOLCHR_LABEL (RC_POOLCHRFMT_BEGIN+ 2)
-#define STR_POOLCHR_DROPCAPS (RC_POOLCHRFMT_BEGIN+ 3)
-#define STR_POOLCHR_NUM_LEVEL (RC_POOLCHRFMT_BEGIN+ 4)
-#define STR_POOLCHR_BUL_LEVEL (RC_POOLCHRFMT_BEGIN+ 5)
-#define STR_POOLCHR_INET_NORMAL (RC_POOLCHRFMT_BEGIN+ 6)
-#define STR_POOLCHR_INET_VISIT (RC_POOLCHRFMT_BEGIN+ 7)
-#define STR_POOLCHR_JUMPEDIT (RC_POOLCHRFMT_BEGIN+ 8)
-#define STR_POOLCHR_TOXJUMP (RC_POOLCHRFMT_BEGIN+ 9)
-#define STR_POOLCHR_ENDNOTE (RC_POOLCHRFMT_BEGIN+ 10)
-#define STR_POOLCHR_LINENUM (RC_POOLCHRFMT_BEGIN+ 11)
+#define STR_POOLCHR_FOOTNOTE (RC_POOLCHRFMT_BEGIN+ 0)
+#define STR_POOLCHR_PAGENO (RC_POOLCHRFMT_BEGIN+ 1)
+#define STR_POOLCHR_LABEL (RC_POOLCHRFMT_BEGIN+ 2)
+#define STR_POOLCHR_DROPCAPS (RC_POOLCHRFMT_BEGIN+ 3)
+#define STR_POOLCHR_NUM_LEVEL (RC_POOLCHRFMT_BEGIN+ 4)
+#define STR_POOLCHR_BUL_LEVEL (RC_POOLCHRFMT_BEGIN+ 5)
+#define STR_POOLCHR_INET_NORMAL (RC_POOLCHRFMT_BEGIN+ 6)
+#define STR_POOLCHR_INET_VISIT (RC_POOLCHRFMT_BEGIN+ 7)
+#define STR_POOLCHR_JUMPEDIT (RC_POOLCHRFMT_BEGIN+ 8)
+#define STR_POOLCHR_TOXJUMP (RC_POOLCHRFMT_BEGIN+ 9)
+#define STR_POOLCHR_ENDNOTE (RC_POOLCHRFMT_BEGIN+ 10)
+#define STR_POOLCHR_LINENUM (RC_POOLCHRFMT_BEGIN+ 11)
#define STR_POOLCHR_IDX_MAIN_ENTRY (RC_POOLCHRFMT_BEGIN+ 12)
#define STR_POOLCHR_FOOTNOTE_ANCHOR (RC_POOLCHRFMT_BEGIN+ 13)
#define STR_POOLCHR_ENDNOTE_ANCHOR (RC_POOLCHRFMT_BEGIN+ 14)
-#define STR_POOLCHR_RUBYTEXT (RC_POOLCHRFMT_BEGIN+ 15)
+#define STR_POOLCHR_RUBYTEXT (RC_POOLCHRFMT_BEGIN+ 15)
#define STR_POOLCHR_VERT_NUM (RC_POOLCHRFMT_BEGIN+ 16)
-#define STR_POOLCHR_HTML_EMPHASIS (RC_POOLCHRFMT_HTML_BEGIN+ 0)
-#define STR_POOLCHR_HTML_CITIATION (RC_POOLCHRFMT_HTML_BEGIN+ 1)
-#define STR_POOLCHR_HTML_STRONG (RC_POOLCHRFMT_HTML_BEGIN+ 2)
-#define STR_POOLCHR_HTML_CODE (RC_POOLCHRFMT_HTML_BEGIN+ 3)
-#define STR_POOLCHR_HTML_SAMPLE (RC_POOLCHRFMT_HTML_BEGIN+ 4)
-#define STR_POOLCHR_HTML_KEYBOARD (RC_POOLCHRFMT_HTML_BEGIN+ 5)
-#define STR_POOLCHR_HTML_VARIABLE (RC_POOLCHRFMT_HTML_BEGIN+ 6)
-#define STR_POOLCHR_HTML_DEFINSTANCE (RC_POOLCHRFMT_HTML_BEGIN+ 7)
-#define STR_POOLCHR_HTML_TELETYPE (RC_POOLCHRFMT_HTML_BEGIN+ 8)
+#define STR_POOLCHR_HTML_EMPHASIS (RC_POOLCHRFMT_HTML_BEGIN+ 0)
+#define STR_POOLCHR_HTML_CITIATION (RC_POOLCHRFMT_HTML_BEGIN+ 1)
+#define STR_POOLCHR_HTML_STRONG (RC_POOLCHRFMT_HTML_BEGIN+ 2)
+#define STR_POOLCHR_HTML_CODE (RC_POOLCHRFMT_HTML_BEGIN+ 3)
+#define STR_POOLCHR_HTML_SAMPLE (RC_POOLCHRFMT_HTML_BEGIN+ 4)
+#define STR_POOLCHR_HTML_KEYBOARD (RC_POOLCHRFMT_HTML_BEGIN+ 5)
+#define STR_POOLCHR_HTML_VARIABLE (RC_POOLCHRFMT_HTML_BEGIN+ 6)
+#define STR_POOLCHR_HTML_DEFINSTANCE (RC_POOLCHRFMT_HTML_BEGIN+ 7)
+#define STR_POOLCHR_HTML_TELETYPE (RC_POOLCHRFMT_HTML_BEGIN+ 8)
// Rahmen-Vorlagen:
-#define STR_POOLFRM_FRAME (RC_POOLFRMFMT_BEGIN+ 0)
-#define STR_POOLFRM_GRAPHIC (RC_POOLFRMFMT_BEGIN+ 1)
-#define STR_POOLFRM_OLE (RC_POOLFRMFMT_BEGIN+ 2)
-#define STR_POOLFRM_FORMEL (RC_POOLFRMFMT_BEGIN+ 3)
-#define STR_POOLFRM_MARGINAL (RC_POOLFRMFMT_BEGIN+ 4)
-#define STR_POOLFRM_WATERSIGN (RC_POOLFRMFMT_BEGIN+ 5)
-#define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6)
+#define STR_POOLFRM_FRAME (RC_POOLFRMFMT_BEGIN+ 0)
+#define STR_POOLFRM_GRAPHIC (RC_POOLFRMFMT_BEGIN+ 1)
+#define STR_POOLFRM_OLE (RC_POOLFRMFMT_BEGIN+ 2)
+#define STR_POOLFRM_FORMEL (RC_POOLFRMFMT_BEGIN+ 3)
+#define STR_POOLFRM_MARGINAL (RC_POOLFRMFMT_BEGIN+ 4)
+#define STR_POOLFRM_WATERSIGN (RC_POOLFRMFMT_BEGIN+ 5)
+#define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6)
// ---------------
// die Vorlagen
// ---------------
// Gruppe Text
-#define STR_POOLCOLL_STANDARD (RC_POOLCOLL_TEXT_BEGIN+ 0)
-#define STR_POOLCOLL_TEXT (RC_POOLCOLL_TEXT_BEGIN+ 1)
-#define STR_POOLCOLL_TEXT_IDENT (RC_POOLCOLL_TEXT_BEGIN+ 2)
-#define STR_POOLCOLL_TEXT_NEGIDENT (RC_POOLCOLL_TEXT_BEGIN+ 3)
-#define STR_POOLCOLL_TEXT_MOVE (RC_POOLCOLL_TEXT_BEGIN+ 4)
-#define STR_POOLCOLL_GREETING (RC_POOLCOLL_TEXT_BEGIN+ 5)
-#define STR_POOLCOLL_SIGNATURE (RC_POOLCOLL_TEXT_BEGIN+ 6)
-#define STR_POOLCOLL_CONFRONTATION (RC_POOLCOLL_TEXT_BEGIN+ 7)
-#define STR_POOLCOLL_MARGINAL (RC_POOLCOLL_TEXT_BEGIN+ 8)
+#define STR_POOLCOLL_STANDARD (RC_POOLCOLL_TEXT_BEGIN+ 0)
+#define STR_POOLCOLL_TEXT (RC_POOLCOLL_TEXT_BEGIN+ 1)
+#define STR_POOLCOLL_TEXT_IDENT (RC_POOLCOLL_TEXT_BEGIN+ 2)
+#define STR_POOLCOLL_TEXT_NEGIDENT (RC_POOLCOLL_TEXT_BEGIN+ 3)
+#define STR_POOLCOLL_TEXT_MOVE (RC_POOLCOLL_TEXT_BEGIN+ 4)
+#define STR_POOLCOLL_GREETING (RC_POOLCOLL_TEXT_BEGIN+ 5)
+#define STR_POOLCOLL_SIGNATURE (RC_POOLCOLL_TEXT_BEGIN+ 6)
+#define STR_POOLCOLL_CONFRONTATION (RC_POOLCOLL_TEXT_BEGIN+ 7)
+#define STR_POOLCOLL_MARGINAL (RC_POOLCOLL_TEXT_BEGIN+ 8)
// Untergruppierung Ueberschriften
-#define STR_POOLCOLL_HEADLINE_BASE (RC_POOLCOLL_TEXT_BEGIN+ 9)
-#define STR_POOLCOLL_HEADLINE1 (RC_POOLCOLL_TEXT_BEGIN+ 10)
-#define STR_POOLCOLL_HEADLINE2 (RC_POOLCOLL_TEXT_BEGIN+ 11)
-#define STR_POOLCOLL_HEADLINE3 (RC_POOLCOLL_TEXT_BEGIN+ 12)
-#define STR_POOLCOLL_HEADLINE4 (RC_POOLCOLL_TEXT_BEGIN+ 13)
-#define STR_POOLCOLL_HEADLINE5 (RC_POOLCOLL_TEXT_BEGIN+ 14)
-#define STR_POOLCOLL_HEADLINE6 (RC_POOLCOLL_TEXT_BEGIN+ 15)
-#define STR_POOLCOLL_HEADLINE7 (RC_POOLCOLL_TEXT_BEGIN+ 16)
-#define STR_POOLCOLL_HEADLINE8 (RC_POOLCOLL_TEXT_BEGIN+ 17)
-#define STR_POOLCOLL_HEADLINE9 (RC_POOLCOLL_TEXT_BEGIN+ 18)
-#define STR_POOLCOLL_HEADLINE10 (RC_POOLCOLL_TEXT_BEGIN+ 19)
+#define STR_POOLCOLL_HEADLINE_BASE (RC_POOLCOLL_TEXT_BEGIN+ 9)
+#define STR_POOLCOLL_HEADLINE1 (RC_POOLCOLL_TEXT_BEGIN+ 10)
+#define STR_POOLCOLL_HEADLINE2 (RC_POOLCOLL_TEXT_BEGIN+ 11)
+#define STR_POOLCOLL_HEADLINE3 (RC_POOLCOLL_TEXT_BEGIN+ 12)
+#define STR_POOLCOLL_HEADLINE4 (RC_POOLCOLL_TEXT_BEGIN+ 13)
+#define STR_POOLCOLL_HEADLINE5 (RC_POOLCOLL_TEXT_BEGIN+ 14)
+#define STR_POOLCOLL_HEADLINE6 (RC_POOLCOLL_TEXT_BEGIN+ 15)
+#define STR_POOLCOLL_HEADLINE7 (RC_POOLCOLL_TEXT_BEGIN+ 16)
+#define STR_POOLCOLL_HEADLINE8 (RC_POOLCOLL_TEXT_BEGIN+ 17)
+#define STR_POOLCOLL_HEADLINE9 (RC_POOLCOLL_TEXT_BEGIN+ 18)
+#define STR_POOLCOLL_HEADLINE10 (RC_POOLCOLL_TEXT_BEGIN+ 19)
// Gruppe Listen
-#define STR_POOLCOLL_NUMBUL_BASE (RC_POOLCOLL_LISTS_BEGIN+ 0)
+#define STR_POOLCOLL_NUMBUL_BASE (RC_POOLCOLL_LISTS_BEGIN+ 0)
// Untergruppe Nummerierung
-#define STR_POOLCOLL_NUM_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 1)
-#define STR_POOLCOLL_NUM_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 2)
-#define STR_POOLCOLL_NUM_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 3)
-#define STR_POOLCOLL_NUM_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 4)
-#define STR_POOLCOLL_NUM_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 5)
-#define STR_POOLCOLL_NUM_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 6)
-#define STR_POOLCOLL_NUM_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 7)
-#define STR_POOLCOLL_NUM_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 8)
-#define STR_POOLCOLL_NUM_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 9)
-#define STR_POOLCOLL_NUM_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 10)
-#define STR_POOLCOLL_NUM_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 11)
-#define STR_POOLCOLL_NUM_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 12)
-#define STR_POOLCOLL_NUM_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 13)
-#define STR_POOLCOLL_NUM_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 14)
-#define STR_POOLCOLL_NUM_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 15)
-#define STR_POOLCOLL_NUM_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 16)
-#define STR_POOLCOLL_NUM_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 17)
-#define STR_POOLCOLL_NUM_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 18)
-#define STR_POOLCOLL_NUM_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 19)
-#define STR_POOLCOLL_NUM_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 20)
+#define STR_POOLCOLL_NUM_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 1)
+#define STR_POOLCOLL_NUM_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 2)
+#define STR_POOLCOLL_NUM_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 3)
+#define STR_POOLCOLL_NUM_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 4)
+#define STR_POOLCOLL_NUM_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 5)
+#define STR_POOLCOLL_NUM_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 6)
+#define STR_POOLCOLL_NUM_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 7)
+#define STR_POOLCOLL_NUM_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 8)
+#define STR_POOLCOLL_NUM_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 9)
+#define STR_POOLCOLL_NUM_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 10)
+#define STR_POOLCOLL_NUM_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 11)
+#define STR_POOLCOLL_NUM_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 12)
+#define STR_POOLCOLL_NUM_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 13)
+#define STR_POOLCOLL_NUM_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 14)
+#define STR_POOLCOLL_NUM_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 15)
+#define STR_POOLCOLL_NUM_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 16)
+#define STR_POOLCOLL_NUM_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 17)
+#define STR_POOLCOLL_NUM_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 18)
+#define STR_POOLCOLL_NUM_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 19)
+#define STR_POOLCOLL_NUM_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 20)
// Untergruppe Aufzaehlung
-#define STR_POOLCOLL_BUL_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 21)
-#define STR_POOLCOLL_BUL_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 22)
-#define STR_POOLCOLL_BUL_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 23)
-#define STR_POOLCOLL_BUL_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 24)
-#define STR_POOLCOLL_BUL_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 25)
-#define STR_POOLCOLL_BUL_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 26)
-#define STR_POOLCOLL_BUL_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 27)
-#define STR_POOLCOLL_BUL_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 28)
-#define STR_POOLCOLL_BUL_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 29)
-#define STR_POOLCOLL_BUL_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 30)
-#define STR_POOLCOLL_BUL_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 31)
-#define STR_POOLCOLL_BUL_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 32)
-#define STR_POOLCOLL_BUL_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 33)
-#define STR_POOLCOLL_BUL_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 34)
-#define STR_POOLCOLL_BUL_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 35)
-#define STR_POOLCOLL_BUL_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 36)
-#define STR_POOLCOLL_BUL_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 37)
-#define STR_POOLCOLL_BUL_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 38)
-#define STR_POOLCOLL_BUL_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 39)
-#define STR_POOLCOLL_BUL_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 40)
+#define STR_POOLCOLL_BUL_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 21)
+#define STR_POOLCOLL_BUL_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 22)
+#define STR_POOLCOLL_BUL_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 23)
+#define STR_POOLCOLL_BUL_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 24)
+#define STR_POOLCOLL_BUL_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 25)
+#define STR_POOLCOLL_BUL_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 26)
+#define STR_POOLCOLL_BUL_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 27)
+#define STR_POOLCOLL_BUL_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 28)
+#define STR_POOLCOLL_BUL_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 29)
+#define STR_POOLCOLL_BUL_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 30)
+#define STR_POOLCOLL_BUL_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 31)
+#define STR_POOLCOLL_BUL_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 32)
+#define STR_POOLCOLL_BUL_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 33)
+#define STR_POOLCOLL_BUL_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 34)
+#define STR_POOLCOLL_BUL_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 35)
+#define STR_POOLCOLL_BUL_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 36)
+#define STR_POOLCOLL_BUL_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 37)
+#define STR_POOLCOLL_BUL_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 38)
+#define STR_POOLCOLL_BUL_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 39)
+#define STR_POOLCOLL_BUL_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 40)
// Sonderbereiche
// Untergruppe Header
-#define STR_POOLCOLL_HEADER (RC_POOLCOLL_EXTRA_BEGIN+ 0)
-#define STR_POOLCOLL_HEADERL (RC_POOLCOLL_EXTRA_BEGIN+ 1)
-#define STR_POOLCOLL_HEADERR (RC_POOLCOLL_EXTRA_BEGIN+ 2)
+#define STR_POOLCOLL_HEADER (RC_POOLCOLL_EXTRA_BEGIN+ 0)
+#define STR_POOLCOLL_HEADERL (RC_POOLCOLL_EXTRA_BEGIN+ 1)
+#define STR_POOLCOLL_HEADERR (RC_POOLCOLL_EXTRA_BEGIN+ 2)
// Untergruppe Footer
-#define STR_POOLCOLL_FOOTER (RC_POOLCOLL_EXTRA_BEGIN+ 3)
-#define STR_POOLCOLL_FOOTERL (RC_POOLCOLL_EXTRA_BEGIN+ 4)
-#define STR_POOLCOLL_FOOTERR (RC_POOLCOLL_EXTRA_BEGIN+ 5)
+#define STR_POOLCOLL_FOOTER (RC_POOLCOLL_EXTRA_BEGIN+ 3)
+#define STR_POOLCOLL_FOOTERL (RC_POOLCOLL_EXTRA_BEGIN+ 4)
+#define STR_POOLCOLL_FOOTERR (RC_POOLCOLL_EXTRA_BEGIN+ 5)
// Untergruppe Tabelle
-#define STR_POOLCOLL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 6)
-#define STR_POOLCOLL_TABLE_HDLN (RC_POOLCOLL_EXTRA_BEGIN+ 7)
+#define STR_POOLCOLL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 6)
+#define STR_POOLCOLL_TABLE_HDLN (RC_POOLCOLL_EXTRA_BEGIN+ 7)
// Untergruppe Labels
-#define STR_POOLCOLL_LABEL (RC_POOLCOLL_EXTRA_BEGIN+ 8)
-#define STR_POOLCOLL_LABEL_ABB (RC_POOLCOLL_EXTRA_BEGIN+ 9)
-#define STR_POOLCOLL_LABEL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 10)
-#define STR_POOLCOLL_LABEL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 11)
+#define STR_POOLCOLL_LABEL (RC_POOLCOLL_EXTRA_BEGIN+ 8)
+#define STR_POOLCOLL_LABEL_ABB (RC_POOLCOLL_EXTRA_BEGIN+ 9)
+#define STR_POOLCOLL_LABEL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 10)
+#define STR_POOLCOLL_LABEL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 11)
// sonstiges
-#define STR_POOLCOLL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 12)
-#define STR_POOLCOLL_FOOTNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 13)
-#define STR_POOLCOLL_JAKETADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 14)
-#define STR_POOLCOLL_SENDADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 15)
-#define STR_POOLCOLL_ENDNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 16)
+#define STR_POOLCOLL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 12)
+#define STR_POOLCOLL_FOOTNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 13)
+#define STR_POOLCOLL_JAKETADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 14)
+#define STR_POOLCOLL_SENDADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 15)
+#define STR_POOLCOLL_ENDNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 16)
-#define STR_POOLCOLL_LABEL_DRAWING (RC_POOLCOLL_EXTRA_BEGIN+ 17)
+#define STR_POOLCOLL_LABEL_DRAWING (RC_POOLCOLL_EXTRA_BEGIN+ 17)
// Gruppe Verzeichnisse
-#define STR_POOLCOLL_REGISTER_BASE (RC_POOLCOLL_REGISTER_BEGIN+ 0)
+#define STR_POOLCOLL_REGISTER_BASE (RC_POOLCOLL_REGISTER_BEGIN+ 0)
// Untergruppe Index-Verzeichnisse
-#define STR_POOLCOLL_TOX_IDXH (RC_POOLCOLL_REGISTER_BEGIN+ 1)
-#define STR_POOLCOLL_TOX_IDX1 (RC_POOLCOLL_REGISTER_BEGIN+ 2)
-#define STR_POOLCOLL_TOX_IDX2 (RC_POOLCOLL_REGISTER_BEGIN+ 3)
-#define STR_POOLCOLL_TOX_IDX3 (RC_POOLCOLL_REGISTER_BEGIN+ 4)
-#define STR_POOLCOLL_TOX_IDXBREAK (RC_POOLCOLL_REGISTER_BEGIN+ 5)
+#define STR_POOLCOLL_TOX_IDXH (RC_POOLCOLL_REGISTER_BEGIN+ 1)
+#define STR_POOLCOLL_TOX_IDX1 (RC_POOLCOLL_REGISTER_BEGIN+ 2)
+#define STR_POOLCOLL_TOX_IDX2 (RC_POOLCOLL_REGISTER_BEGIN+ 3)
+#define STR_POOLCOLL_TOX_IDX3 (RC_POOLCOLL_REGISTER_BEGIN+ 4)
+#define STR_POOLCOLL_TOX_IDXBREAK (RC_POOLCOLL_REGISTER_BEGIN+ 5)
// Untergruppe Inhalts-Verzeichnisse
-#define STR_POOLCOLL_TOX_CNTNTH (RC_POOLCOLL_REGISTER_BEGIN+ 6)
-#define STR_POOLCOLL_TOX_CNTNT1 (RC_POOLCOLL_REGISTER_BEGIN+ 7)
-#define STR_POOLCOLL_TOX_CNTNT2 (RC_POOLCOLL_REGISTER_BEGIN+ 8)
-#define STR_POOLCOLL_TOX_CNTNT3 (RC_POOLCOLL_REGISTER_BEGIN+ 9)
-#define STR_POOLCOLL_TOX_CNTNT4 (RC_POOLCOLL_REGISTER_BEGIN+ 10)
-#define STR_POOLCOLL_TOX_CNTNT5 (RC_POOLCOLL_REGISTER_BEGIN+ 11)
+#define STR_POOLCOLL_TOX_CNTNTH (RC_POOLCOLL_REGISTER_BEGIN+ 6)
+#define STR_POOLCOLL_TOX_CNTNT1 (RC_POOLCOLL_REGISTER_BEGIN+ 7)
+#define STR_POOLCOLL_TOX_CNTNT2 (RC_POOLCOLL_REGISTER_BEGIN+ 8)
+#define STR_POOLCOLL_TOX_CNTNT3 (RC_POOLCOLL_REGISTER_BEGIN+ 9)
+#define STR_POOLCOLL_TOX_CNTNT4 (RC_POOLCOLL_REGISTER_BEGIN+ 10)
+#define STR_POOLCOLL_TOX_CNTNT5 (RC_POOLCOLL_REGISTER_BEGIN+ 11)
// Untergruppe Benutzer-Verzeichnisse:
-#define STR_POOLCOLL_TOX_USERH (RC_POOLCOLL_REGISTER_BEGIN+ 12)
-#define STR_POOLCOLL_TOX_USER1 (RC_POOLCOLL_REGISTER_BEGIN+ 13)
-#define STR_POOLCOLL_TOX_USER2 (RC_POOLCOLL_REGISTER_BEGIN+ 14)
-#define STR_POOLCOLL_TOX_USER3 (RC_POOLCOLL_REGISTER_BEGIN+ 15)
-#define STR_POOLCOLL_TOX_USER4 (RC_POOLCOLL_REGISTER_BEGIN+ 16)
-#define STR_POOLCOLL_TOX_USER5 (RC_POOLCOLL_REGISTER_BEGIN+ 17)
+#define STR_POOLCOLL_TOX_USERH (RC_POOLCOLL_REGISTER_BEGIN+ 12)
+#define STR_POOLCOLL_TOX_USER1 (RC_POOLCOLL_REGISTER_BEGIN+ 13)
+#define STR_POOLCOLL_TOX_USER2 (RC_POOLCOLL_REGISTER_BEGIN+ 14)
+#define STR_POOLCOLL_TOX_USER3 (RC_POOLCOLL_REGISTER_BEGIN+ 15)
+#define STR_POOLCOLL_TOX_USER4 (RC_POOLCOLL_REGISTER_BEGIN+ 16)
+#define STR_POOLCOLL_TOX_USER5 (RC_POOLCOLL_REGISTER_BEGIN+ 17)
// Untergruppe Inhalts-Verzeichnisse mehr Ebenen 5 - 10
-#define STR_POOLCOLL_TOX_CNTNT6 (RC_POOLCOLL_REGISTER_BEGIN+ 18)
-#define STR_POOLCOLL_TOX_CNTNT7 (RC_POOLCOLL_REGISTER_BEGIN+ 19)
-#define STR_POOLCOLL_TOX_CNTNT8 (RC_POOLCOLL_REGISTER_BEGIN+ 20)
-#define STR_POOLCOLL_TOX_CNTNT9 (RC_POOLCOLL_REGISTER_BEGIN+ 21)
-#define STR_POOLCOLL_TOX_CNTNT10 (RC_POOLCOLL_REGISTER_BEGIN+ 22)
+#define STR_POOLCOLL_TOX_CNTNT6 (RC_POOLCOLL_REGISTER_BEGIN+ 18)
+#define STR_POOLCOLL_TOX_CNTNT7 (RC_POOLCOLL_REGISTER_BEGIN+ 19)
+#define STR_POOLCOLL_TOX_CNTNT8 (RC_POOLCOLL_REGISTER_BEGIN+ 20)
+#define STR_POOLCOLL_TOX_CNTNT9 (RC_POOLCOLL_REGISTER_BEGIN+ 21)
+#define STR_POOLCOLL_TOX_CNTNT10 (RC_POOLCOLL_REGISTER_BEGIN+ 22)
// illustrations index
-#define STR_POOLCOLL_TOX_ILLUSH (RC_POOLCOLL_REGISTER_BEGIN+ 23)
+#define STR_POOLCOLL_TOX_ILLUSH (RC_POOLCOLL_REGISTER_BEGIN+ 23)
#define STR_POOLCOLL_TOX_ILLUS1 (RC_POOLCOLL_REGISTER_BEGIN+ 24)
-// object index
-#define STR_POOLCOLL_TOX_OBJECTH (RC_POOLCOLL_REGISTER_BEGIN+ 25)
+// object index
+#define STR_POOLCOLL_TOX_OBJECTH (RC_POOLCOLL_REGISTER_BEGIN+ 25)
#define STR_POOLCOLL_TOX_OBJECT1 (RC_POOLCOLL_REGISTER_BEGIN+ 26)
-// tables index
-#define STR_POOLCOLL_TOX_TABLESH (RC_POOLCOLL_REGISTER_BEGIN+ 27)
+// tables index
+#define STR_POOLCOLL_TOX_TABLESH (RC_POOLCOLL_REGISTER_BEGIN+ 27)
#define STR_POOLCOLL_TOX_TABLES1 (RC_POOLCOLL_REGISTER_BEGIN+ 28)
-// index of authorities
-#define STR_POOLCOLL_TOX_AUTHORITIESH (RC_POOLCOLL_REGISTER_BEGIN+ 29)
+// index of authorities
+#define STR_POOLCOLL_TOX_AUTHORITIESH (RC_POOLCOLL_REGISTER_BEGIN+ 29)
#define STR_POOLCOLL_TOX_AUTHORITIES1 (RC_POOLCOLL_REGISTER_BEGIN+ 30)
// Untergruppe Benutzer-Verzeichnisse mehr Ebenen 5 - 10
-#define STR_POOLCOLL_TOX_USER6 (RC_POOLCOLL_REGISTER_BEGIN+ 31)
-#define STR_POOLCOLL_TOX_USER7 (RC_POOLCOLL_REGISTER_BEGIN+ 32)
-#define STR_POOLCOLL_TOX_USER8 (RC_POOLCOLL_REGISTER_BEGIN+ 33)
-#define STR_POOLCOLL_TOX_USER9 (RC_POOLCOLL_REGISTER_BEGIN+ 34)
-#define STR_POOLCOLL_TOX_USER10 (RC_POOLCOLL_REGISTER_BEGIN+ 35)
+#define STR_POOLCOLL_TOX_USER6 (RC_POOLCOLL_REGISTER_BEGIN+ 31)
+#define STR_POOLCOLL_TOX_USER7 (RC_POOLCOLL_REGISTER_BEGIN+ 32)
+#define STR_POOLCOLL_TOX_USER8 (RC_POOLCOLL_REGISTER_BEGIN+ 33)
+#define STR_POOLCOLL_TOX_USER9 (RC_POOLCOLL_REGISTER_BEGIN+ 34)
+#define STR_POOLCOLL_TOX_USER10 (RC_POOLCOLL_REGISTER_BEGIN+ 35)
// Gruppe Kapitel/Dokument
-#define STR_POOLCOLL_DOC_TITEL (RC_POOLCOLL_DOC_BEGIN+ 0)
-#define STR_POOLCOLL_DOC_SUBTITEL (RC_POOLCOLL_DOC_BEGIN+ 1)
+#define STR_POOLCOLL_DOC_TITEL (RC_POOLCOLL_DOC_BEGIN+ 0)
+#define STR_POOLCOLL_DOC_SUBTITEL (RC_POOLCOLL_DOC_BEGIN+ 1)
// Gruppe HTML-Vorlagen
-#define STR_POOLCOLL_HTML_BLOCKQUOTE (RC_POOLCOLL_HTML_BEGIN+ 0)
-#define STR_POOLCOLL_HTML_PRE (RC_POOLCOLL_HTML_BEGIN+ 1)
-#define STR_POOLCOLL_HTML_HR (RC_POOLCOLL_HTML_BEGIN+ 2)
-#define STR_POOLCOLL_HTML_DD (RC_POOLCOLL_HTML_BEGIN+ 3)
-#define STR_POOLCOLL_HTML_DT (RC_POOLCOLL_HTML_BEGIN+ 4)
+#define STR_POOLCOLL_HTML_BLOCKQUOTE (RC_POOLCOLL_HTML_BEGIN+ 0)
+#define STR_POOLCOLL_HTML_PRE (RC_POOLCOLL_HTML_BEGIN+ 1)
+#define STR_POOLCOLL_HTML_HR (RC_POOLCOLL_HTML_BEGIN+ 2)
+#define STR_POOLCOLL_HTML_DD (RC_POOLCOLL_HTML_BEGIN+ 3)
+#define STR_POOLCOLL_HTML_DT (RC_POOLCOLL_HTML_BEGIN+ 4)
//-----------------
// Page styles
//-----------------
-#define STR_POOLPAGE_STANDARD (RC_POOLPAGEDESC_BEGIN+ 0)
-#define STR_POOLPAGE_FIRST (RC_POOLPAGEDESC_BEGIN+ 1)
-#define STR_POOLPAGE_LEFT (RC_POOLPAGEDESC_BEGIN+ 2)
-#define STR_POOLPAGE_RIGHT (RC_POOLPAGEDESC_BEGIN+ 3)
-#define STR_POOLPAGE_JAKET (RC_POOLPAGEDESC_BEGIN+ 4)
-#define STR_POOLPAGE_REGISTER (RC_POOLPAGEDESC_BEGIN+ 5)
-#define STR_POOLPAGE_HTML (RC_POOLPAGEDESC_BEGIN+ 6)
-#define STR_POOLPAGE_FOOTNOTE (RC_POOLPAGEDESC_BEGIN+ 7)
-#define STR_POOLPAGE_ENDNOTE (RC_POOLPAGEDESC_BEGIN+ 8)
+#define STR_POOLPAGE_STANDARD (RC_POOLPAGEDESC_BEGIN+ 0)
+#define STR_POOLPAGE_FIRST (RC_POOLPAGEDESC_BEGIN+ 1)
+#define STR_POOLPAGE_LEFT (RC_POOLPAGEDESC_BEGIN+ 2)
+#define STR_POOLPAGE_RIGHT (RC_POOLPAGEDESC_BEGIN+ 3)
+#define STR_POOLPAGE_JAKET (RC_POOLPAGEDESC_BEGIN+ 4)
+#define STR_POOLPAGE_REGISTER (RC_POOLPAGEDESC_BEGIN+ 5)
+#define STR_POOLPAGE_HTML (RC_POOLPAGEDESC_BEGIN+ 6)
+#define STR_POOLPAGE_FOOTNOTE (RC_POOLPAGEDESC_BEGIN+ 7)
+#define STR_POOLPAGE_ENDNOTE (RC_POOLPAGEDESC_BEGIN+ 8)
#define STR_POOLPAGE_LANDSCAPE (RC_POOLPAGEDESC_BEGIN+ 9)
//-----------------
// Numbering styles
//-----------------
-#define STR_POOLNUMRULE_NUM1 (RC_POOLNUMRULE_BEGIN+ 0)
-#define STR_POOLNUMRULE_NUM2 (RC_POOLNUMRULE_BEGIN+ 1)
-#define STR_POOLNUMRULE_NUM3 (RC_POOLNUMRULE_BEGIN+ 2)
-#define STR_POOLNUMRULE_NUM4 (RC_POOLNUMRULE_BEGIN+ 3)
-#define STR_POOLNUMRULE_NUM5 (RC_POOLNUMRULE_BEGIN+ 4)
-#define STR_POOLNUMRULE_BUL1 (RC_POOLNUMRULE_BEGIN+ 5)
-#define STR_POOLNUMRULE_BUL2 (RC_POOLNUMRULE_BEGIN+ 6)
-#define STR_POOLNUMRULE_BUL3 (RC_POOLNUMRULE_BEGIN+ 7)
-#define STR_POOLNUMRULE_BUL4 (RC_POOLNUMRULE_BEGIN+ 8)
-#define STR_POOLNUMRULE_BUL5 (RC_POOLNUMRULE_BEGIN+ 9)
+#define STR_POOLNUMRULE_NUM1 (RC_POOLNUMRULE_BEGIN+ 0)
+#define STR_POOLNUMRULE_NUM2 (RC_POOLNUMRULE_BEGIN+ 1)
+#define STR_POOLNUMRULE_NUM3 (RC_POOLNUMRULE_BEGIN+ 2)
+#define STR_POOLNUMRULE_NUM4 (RC_POOLNUMRULE_BEGIN+ 3)
+#define STR_POOLNUMRULE_NUM5 (RC_POOLNUMRULE_BEGIN+ 4)
+#define STR_POOLNUMRULE_BUL1 (RC_POOLNUMRULE_BEGIN+ 5)
+#define STR_POOLNUMRULE_BUL2 (RC_POOLNUMRULE_BEGIN+ 6)
+#define STR_POOLNUMRULE_BUL3 (RC_POOLNUMRULE_BEGIN+ 7)
+#define STR_POOLNUMRULE_BUL4 (RC_POOLNUMRULE_BEGIN+ 8)
+#define STR_POOLNUMRULE_BUL5 (RC_POOLNUMRULE_BEGIN+ 9)
//-----------------
// Paragraph styles
//-----------------
-#define STR_POOLPARSTYLE_HEAD1 (STR_POOLPARSTYLE_BEGIN+ 0)
-#define STR_POOLPARSTYLE_HEAD2 (STR_POOLPARSTYLE_BEGIN+ 1)
-#define STR_POOLPARSTYLE_HEAD3 (STR_POOLPARSTYLE_BEGIN+ 2)
-#define STR_POOLPARSTYLE_DEFAULT (STR_POOLPARSTYLE_BEGIN+ 3)
-#define STR_POOLPARSTYLE_TEXTBODY (STR_POOLPARSTYLE_BEGIN+ 4)
+#define STR_POOLPARSTYLE_HEAD1 (STR_POOLPARSTYLE_BEGIN+ 0)
+#define STR_POOLPARSTYLE_HEAD2 (STR_POOLPARSTYLE_BEGIN+ 1)
+#define STR_POOLPARSTYLE_HEAD3 (STR_POOLPARSTYLE_BEGIN+ 2)
+#define STR_POOLPARSTYLE_DEFAULT (STR_POOLPARSTYLE_BEGIN+ 3)
+#define STR_POOLPARSTYLE_TEXTBODY (STR_POOLPARSTYLE_BEGIN+ 4)
#endif
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 94553a44a48f..6bb4b8a45451 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -2,7 +2,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
@@ -37,61 +37,61 @@
// !User! Bereich ! 0 ! Offset !
// +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
//
-// Bereich: 1 - Text
-// 2 - Listen
-// 3 - Sonderbereiche
-// 4 - Verzeichnisse
-// 5 - Kapitel / Dokument
-// 6 - HTML-Vorlagen
+// Bereich: 1 - Text
+// 2 - Listen
+// 3 - Sonderbereiche
+// 4 - Verzeichnisse
+// 5 - Kapitel / Dokument
+// 6 - HTML-Vorlagen
// Andere IDs:
// +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
// !User! Bereich ! 1 ! Offset !
// +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-// Bereich: 0 - Zeichenvorlagen
-// 1 - Frame-Vorlagen
-// 2 - Seitenvorlagen
-// 3 - Absatzformate (?)
-// 4 - Grafikformate (?)
+// Bereich: 0 - Zeichenvorlagen
+// 1 - Frame-Vorlagen
+// 2 - Seitenvorlagen
+// 3 - Absatzformate (?)
+// 4 - Grafikformate (?)
// Fr alle IDs gilt:
-// Herkunft: 0 -Pool
-// 1 -Benutzer
-// Offset: innerhalb der Gruppe
+// Herkunft: 0 -Pool
+// 1 -Benutzer
+// Offset: innerhalb der Gruppe
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
-// ACHTUNG: neue ID's koennen nur noch am Ende der jeweiligen Gruppe
-// zugefuegt werden. Diese Id's werden vom Reader/Writer ge-
-// lesen und geschrieben. Diese kennen nur den Offset zum Start
+// ACHTUNG: neue ID's koennen nur noch am Ende der jeweiligen Gruppe
+// zugefuegt werden. Diese Id's werden vom Reader/Writer ge-
+// lesen und geschrieben. Diese kennen nur den Offset zum Start
//
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// Maske fuer Erkennung von COLLPOOL-Ids:
-const USHORT POOLGRP_NOCOLLID = (1 << 10);
+const USHORT POOLGRP_NOCOLLID = (1 << 10);
// POLLCOLL-Gruppen:
-const USHORT USER_FMT = (1 << 15);
-const USHORT POOL_FMT = (0 << 15);
+const USHORT USER_FMT = (1 << 15);
+const USHORT POOL_FMT = (0 << 15);
-const USHORT COLL_TEXT_BITS = (1 << 11);
-const USHORT COLL_LISTS_BITS = (2 << 11);
-const USHORT COLL_EXTRA_BITS = (3 << 11);
-const USHORT COLL_REGISTER_BITS = (4 << 11);
-const USHORT COLL_DOC_BITS = (5 << 11);
-const USHORT COLL_HTML_BITS = (6 << 11);
+const USHORT COLL_TEXT_BITS = (1 << 11);
+const USHORT COLL_LISTS_BITS = (2 << 11);
+const USHORT COLL_EXTRA_BITS = (3 << 11);
+const USHORT COLL_REGISTER_BITS = (4 << 11);
+const USHORT COLL_DOC_BITS = (5 << 11);
+const USHORT COLL_HTML_BITS = (6 << 11);
const USHORT COLL_GET_RANGE_BITS = (15 << 11);
// Sonstige Gruppen:
const USHORT POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID;
-const USHORT POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID;
-const USHORT POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID;
-const USHORT POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID;
-//const USHORT POOLGRP_GRFFMT = (4 << 11) + POOLGRP_NOCOLLID; // ?
+const USHORT POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID;
+const USHORT POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID;
+const USHORT POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID;
+//const USHORT POOLGRP_GRFFMT = (4 << 11) + POOLGRP_NOCOLLID; // ?
// fuer Erkennung ob Benutzer-Vorlage oder nicht:
const USHORT POOL_IDUSER_FMT =
@@ -108,14 +108,14 @@ inline BOOL IsPoolUserFmt( USHORT nId )
// ID-s fuer die Bereiche
enum RES_POOLFMT
{
-RES_POOLFMT_BEGIN = 1, // HIER GEHT'S LOS !!!
+RES_POOLFMT_BEGIN = 1, // HIER GEHT'S LOS !!!
RES_POOL_CHRFMT = RES_POOLFMT_BEGIN,
RES_POOL_FRMFMT,
RES_POOL_TXTCOLL,
RES_POOL_PAGEFMT,
-RES_POOL_PARFMT, // ???
-RES_POOL_GRFFMT, // ???
+RES_POOL_PARFMT, // ???
+RES_POOL_GRFFMT, // ???
RES_POOLFMT_END
};
@@ -127,28 +127,28 @@ enum RES_POOL_CHRFMT_TYPE
RES_POOLCHR_BEGIN = POOLGRP_CHARFMT,
RES_POOLCHR_NORMAL_BEGIN = POOLGRP_CHARFMT,
-RES_POOLCHR_FOOTNOTE = RES_POOLCHR_NORMAL_BEGIN, // Fussnote
-RES_POOLCHR_PAGENO, // Seiten/Feld
-RES_POOLCHR_LABEL, // Beschriftung
-RES_POOLCHR_DROPCAPS, // Initialienzeichen
-RES_POOLCHR_NUM_LEVEL, // Nummerierungszeichen
-RES_POOLCHR_BUL_LEVEL, // Aufzaehlungszeichen
-
-RES_POOLCHR_INET_NORMAL, // Internet normal
-RES_POOLCHR_INET_VISIT, // Internet besucht
-RES_POOLCHR_JUMPEDIT, // Platzhalter
-RES_POOLCHR_TOXJUMP, // Sprung aus Verzeichnis
+RES_POOLCHR_FOOTNOTE = RES_POOLCHR_NORMAL_BEGIN, // Fussnote
+RES_POOLCHR_PAGENO, // Seiten/Feld
+RES_POOLCHR_LABEL, // Beschriftung
+RES_POOLCHR_DROPCAPS, // Initialienzeichen
+RES_POOLCHR_NUM_LEVEL, // Nummerierungszeichen
+RES_POOLCHR_BUL_LEVEL, // Aufzaehlungszeichen
+
+RES_POOLCHR_INET_NORMAL, // Internet normal
+RES_POOLCHR_INET_VISIT, // Internet besucht
+RES_POOLCHR_JUMPEDIT, // Platzhalter
+RES_POOLCHR_TOXJUMP, // Sprung aus Verzeichnis
RES_POOLCHR_ENDNOTE, // Endnote
-RES_POOLCHR_LINENUM, // Zeilennummerierung
-RES_POOLCHR_IDX_MAIN_ENTRY, // main entry in indexes
-RES_POOLCHR_FOOTNOTE_ANCHOR, // Fussnotenanker
+RES_POOLCHR_LINENUM, // Zeilennummerierung
+RES_POOLCHR_IDX_MAIN_ENTRY, // main entry in indexes
+RES_POOLCHR_FOOTNOTE_ANCHOR, // Fussnotenanker
RES_POOLCHR_ENDNOTE_ANCHOR, // Endnotenanker
-RES_POOLCHR_RUBYTEXT, // Rubytext
+RES_POOLCHR_RUBYTEXT, // Rubytext
RES_POOLCHR_VERT_NUM, // Vertical numbering symbols
RES_POOLCHR_NORMAL_END,
-RES_POOLCHR_HTML_BEGIN = RES_POOLCHR_BEGIN + 50, // HTML-Vorlagen
+RES_POOLCHR_HTML_BEGIN = RES_POOLCHR_BEGIN + 50, // HTML-Vorlagen
RES_POOLCHR_HTML_EMPHASIS= RES_POOLCHR_HTML_BEGIN,
RES_POOLCHR_HTML_CITIATION,
RES_POOLCHR_HTML_STRONG,
@@ -169,13 +169,13 @@ enum RES_POOL_FRMFMT_TYPE
{
RES_POOLFRM_BEGIN = POOLGRP_FRAMEFMT,
-RES_POOLFRM_FRAME = RES_POOLFRM_BEGIN, // Rahmen
-RES_POOLFRM_GRAPHIC, // Graphic
-RES_POOLFRM_OLE, // OLE
-RES_POOLFRM_FORMEL, // Formeln
-RES_POOLFRM_MARGINAL, // Marginalen
-RES_POOLFRM_WATERSIGN, // Wasserzeichen
-RES_POOLFRM_LABEL, // Etikette
+RES_POOLFRM_FRAME = RES_POOLFRM_BEGIN, // Rahmen
+RES_POOLFRM_GRAPHIC, // Graphic
+RES_POOLFRM_OLE, // OLE
+RES_POOLFRM_FORMEL, // Formeln
+RES_POOLFRM_MARGINAL, // Marginalen
+RES_POOLFRM_WATERSIGN, // Wasserzeichen
+RES_POOLFRM_LABEL, // Etikette
RES_POOLFRM_END
};
@@ -185,15 +185,15 @@ enum RES_POOL_PAGEFMT_TYPE
{
RES_POOLPAGE_BEGIN = POOLGRP_PAGEDESC,
-RES_POOLPAGE_STANDARD = RES_POOLPAGE_BEGIN, // Standard-Seite
-RES_POOLPAGE_FIRST, // Erste Seite
-RES_POOLPAGE_LEFT, // Linke Seite
-RES_POOLPAGE_RIGHT, // Rechte Seite
-RES_POOLPAGE_JAKET, // Umschlag
-RES_POOLPAGE_REGISTER, // Verzeichnis
-RES_POOLPAGE_HTML, // HTML
-RES_POOLPAGE_FOOTNOTE, // Fussnote bei Dokumentende
-RES_POOLPAGE_ENDNOTE, // Endnotensseite
+RES_POOLPAGE_STANDARD = RES_POOLPAGE_BEGIN, // Standard-Seite
+RES_POOLPAGE_FIRST, // Erste Seite
+RES_POOLPAGE_LEFT, // Linke Seite
+RES_POOLPAGE_RIGHT, // Rechte Seite
+RES_POOLPAGE_JAKET, // Umschlag
+RES_POOLPAGE_REGISTER, // Verzeichnis
+RES_POOLPAGE_HTML, // HTML
+RES_POOLPAGE_FOOTNOTE, // Fussnote bei Dokumentende
+RES_POOLPAGE_ENDNOTE, // Endnotensseite
RES_POOLPAGE_LANDSCAPE, // Landscape Page Style
RES_POOLPAGE_END
@@ -203,16 +203,16 @@ RES_POOLPAGE_END
enum RES_POOL_NUMRULE_TYPE
{
RES_POOLNUMRULE_BEGIN = POOLGRP_NUMRULE,
-RES_POOLNUMRULE_NUM1 = RES_POOLNUMRULE_BEGIN, // NumRule Numerierung 1
-RES_POOLNUMRULE_NUM2, // NumRule Numerierung 2
-RES_POOLNUMRULE_NUM3, // NumRule Numerierung 3
-RES_POOLNUMRULE_NUM4, // NumRule Numerierung 4
-RES_POOLNUMRULE_NUM5, // NumRule Numerierung 5
-RES_POOLNUMRULE_BUL1, // NumRule Bullets 1
-RES_POOLNUMRULE_BUL2, // NumRule Bullets 2
-RES_POOLNUMRULE_BUL3, // NumRule Bullets 3
-RES_POOLNUMRULE_BUL4, // NumRule Bullets 4
-RES_POOLNUMRULE_BUL5, // NumRule Bullets 5
+RES_POOLNUMRULE_NUM1 = RES_POOLNUMRULE_BEGIN, // NumRule Numerierung 1
+RES_POOLNUMRULE_NUM2, // NumRule Numerierung 2
+RES_POOLNUMRULE_NUM3, // NumRule Numerierung 3
+RES_POOLNUMRULE_NUM4, // NumRule Numerierung 4
+RES_POOLNUMRULE_NUM5, // NumRule Numerierung 5
+RES_POOLNUMRULE_BUL1, // NumRule Bullets 1
+RES_POOLNUMRULE_BUL2, // NumRule Bullets 2
+RES_POOLNUMRULE_BUL3, // NumRule Bullets 3
+RES_POOLNUMRULE_BUL4, // NumRule Bullets 4
+RES_POOLNUMRULE_BUL5, // NumRule Bullets 5
RES_POOLNUMRULE_END
};
@@ -222,28 +222,28 @@ enum RES_POOL_COLLFMT_TYPE
// Gruppe Text
RES_POOLCOLL_TEXT_BEGIN = COLL_TEXT_BITS,
-RES_POOLCOLL_STANDARD = RES_POOLCOLL_TEXT_BEGIN, // Standard
-RES_POOLCOLL_TEXT, // Textkoerper
-RES_POOLCOLL_TEXT_IDENT, // Textkoerper Einzug
-RES_POOLCOLL_TEXT_NEGIDENT, // Textkoerper neg. Einzug
-RES_POOLCOLL_TEXT_MOVE, // Textkoerper Einrueckung
-RES_POOLCOLL_GREETING, // Grussformel
-RES_POOLCOLL_SIGNATURE, // Unterschrift
-RES_POOLCOLL_CONFRONTATION, // Gegenueberstellung
-RES_POOLCOLL_MARGINAL, // Marginalie
+RES_POOLCOLL_STANDARD = RES_POOLCOLL_TEXT_BEGIN, // Standard
+RES_POOLCOLL_TEXT, // Textkoerper
+RES_POOLCOLL_TEXT_IDENT, // Textkoerper Einzug
+RES_POOLCOLL_TEXT_NEGIDENT, // Textkoerper neg. Einzug
+RES_POOLCOLL_TEXT_MOVE, // Textkoerper Einrueckung
+RES_POOLCOLL_GREETING, // Grussformel
+RES_POOLCOLL_SIGNATURE, // Unterschrift
+RES_POOLCOLL_CONFRONTATION, // Gegenueberstellung
+RES_POOLCOLL_MARGINAL, // Marginalie
// Untergruppierung Ueberschriften
-RES_POOLCOLL_HEADLINE_BASE, // Basis-Ueberschrift
-RES_POOLCOLL_HEADLINE1, // Ueberschrift 1
-RES_POOLCOLL_HEADLINE2, // Ueberschrift 2
-RES_POOLCOLL_HEADLINE3, // Ueberschrift 3
-RES_POOLCOLL_HEADLINE4, // Ueberschrift 4
-RES_POOLCOLL_HEADLINE5, // Ueberschrift 5
-RES_POOLCOLL_HEADLINE6, // Ueberschrift 6
-RES_POOLCOLL_HEADLINE7, // Ueberschrift 7
-RES_POOLCOLL_HEADLINE8, // Ueberschrift 8
-RES_POOLCOLL_HEADLINE9, // Ueberschrift 9
-RES_POOLCOLL_HEADLINE10, // Ueberschrift 10
+RES_POOLCOLL_HEADLINE_BASE, // Basis-Ueberschrift
+RES_POOLCOLL_HEADLINE1, // Ueberschrift 1
+RES_POOLCOLL_HEADLINE2, // Ueberschrift 2
+RES_POOLCOLL_HEADLINE3, // Ueberschrift 3
+RES_POOLCOLL_HEADLINE4, // Ueberschrift 4
+RES_POOLCOLL_HEADLINE5, // Ueberschrift 5
+RES_POOLCOLL_HEADLINE6, // Ueberschrift 6
+RES_POOLCOLL_HEADLINE7, // Ueberschrift 7
+RES_POOLCOLL_HEADLINE8, // Ueberschrift 8
+RES_POOLCOLL_HEADLINE9, // Ueberschrift 9
+RES_POOLCOLL_HEADLINE10, // Ueberschrift 10
RES_POOLCOLL_TEXT_END,
@@ -251,51 +251,51 @@ RES_POOLCOLL_TEXT_END,
// Gruppe Listen
RES_POOLCOLL_LISTS_BEGIN = COLL_LISTS_BITS,
-RES_POOLCOLL_NUMBUL_BASE = RES_POOLCOLL_LISTS_BEGIN, // Basis-Liste
+RES_POOLCOLL_NUMBUL_BASE = RES_POOLCOLL_LISTS_BEGIN, // Basis-Liste
// Untergruppe Nummerierung
-RES_POOLCOLL_NUM_LEVEL1S, // Start Level1
-RES_POOLCOLL_NUM_LEVEL1, // 1. Level
-RES_POOLCOLL_NUM_LEVEL1E, // Ende Level1
-RES_POOLCOLL_NUM_NONUM1, // keine Nummerierung
-RES_POOLCOLL_NUM_LEVEL2S, // Start 2. Level
-RES_POOLCOLL_NUM_LEVEL2, // 2. Level
-RES_POOLCOLL_NUM_LEVEL2E, // Ende 2. Level
-RES_POOLCOLL_NUM_NONUM2, // keine Nummerierung
-RES_POOLCOLL_NUM_LEVEL3S, // Start 3. Level
-RES_POOLCOLL_NUM_LEVEL3, // 3. Level
-RES_POOLCOLL_NUM_LEVEL3E, // Ende 3. Level
-RES_POOLCOLL_NUM_NONUM3, // keine Nummerierung
-RES_POOLCOLL_NUM_LEVEL4S, // Start 4. Level
-RES_POOLCOLL_NUM_LEVEL4, // 4. Level
-RES_POOLCOLL_NUM_LEVEL4E, // Ende 4. Level
-RES_POOLCOLL_NUM_NONUM4, // keine Nummerierung
-RES_POOLCOLL_NUM_LEVEL5S, // Start 5. Level
-RES_POOLCOLL_NUM_LEVEL5, // 5. Level
-RES_POOLCOLL_NUM_LEVEL5E, // Ende 5. Level
-RES_POOLCOLL_NUM_NONUM5, // keine Nummerierung
+RES_POOLCOLL_NUM_LEVEL1S, // Start Level1
+RES_POOLCOLL_NUM_LEVEL1, // 1. Level
+RES_POOLCOLL_NUM_LEVEL1E, // Ende Level1
+RES_POOLCOLL_NUM_NONUM1, // keine Nummerierung
+RES_POOLCOLL_NUM_LEVEL2S, // Start 2. Level
+RES_POOLCOLL_NUM_LEVEL2, // 2. Level
+RES_POOLCOLL_NUM_LEVEL2E, // Ende 2. Level
+RES_POOLCOLL_NUM_NONUM2, // keine Nummerierung
+RES_POOLCOLL_NUM_LEVEL3S, // Start 3. Level
+RES_POOLCOLL_NUM_LEVEL3, // 3. Level
+RES_POOLCOLL_NUM_LEVEL3E, // Ende 3. Level
+RES_POOLCOLL_NUM_NONUM3, // keine Nummerierung
+RES_POOLCOLL_NUM_LEVEL4S, // Start 4. Level
+RES_POOLCOLL_NUM_LEVEL4, // 4. Level
+RES_POOLCOLL_NUM_LEVEL4E, // Ende 4. Level
+RES_POOLCOLL_NUM_NONUM4, // keine Nummerierung
+RES_POOLCOLL_NUM_LEVEL5S, // Start 5. Level
+RES_POOLCOLL_NUM_LEVEL5, // 5. Level
+RES_POOLCOLL_NUM_LEVEL5E, // Ende 5. Level
+RES_POOLCOLL_NUM_NONUM5, // keine Nummerierung
// Untergruppe Aufzaehlung
-RES_POOLCOLL_BUL_LEVEL1S, // Start Level1
-RES_POOLCOLL_BUL_LEVEL1, // 1. Level
-RES_POOLCOLL_BUL_LEVEL1E, // Ende Level1
-RES_POOLCOLL_BUL_NONUM1, // keine Nummerierung
-RES_POOLCOLL_BUL_LEVEL2S, // Start 2. Level
-RES_POOLCOLL_BUL_LEVEL2, // 2. Level
-RES_POOLCOLL_BUL_LEVEL2E, // Ende 2. Level
-RES_POOLCOLL_BUL_NONUM2, // keine Nummerierung
-RES_POOLCOLL_BUL_LEVEL3S, // Start 3. Level
-RES_POOLCOLL_BUL_LEVEL3, // 3. Level
-RES_POOLCOLL_BUL_LEVEL3E, // Ende 3. Level
-RES_POOLCOLL_BUL_NONUM3, // keine Nummerierung
-RES_POOLCOLL_BUL_LEVEL4S, // Start 4. Level
-RES_POOLCOLL_BUL_LEVEL4, // 4. Level
-RES_POOLCOLL_BUL_LEVEL4E, // Ende 4. Level
-RES_POOLCOLL_BUL_NONUM4, // keine Nummerierung
-RES_POOLCOLL_BUL_LEVEL5S, // Start 5. Level
-RES_POOLCOLL_BUL_LEVEL5, // 5. Level
-RES_POOLCOLL_BUL_LEVEL5E, // Ende 5. Level
-RES_POOLCOLL_BUL_NONUM5, // keine Nummerierung
+RES_POOLCOLL_BUL_LEVEL1S, // Start Level1
+RES_POOLCOLL_BUL_LEVEL1, // 1. Level
+RES_POOLCOLL_BUL_LEVEL1E, // Ende Level1
+RES_POOLCOLL_BUL_NONUM1, // keine Nummerierung
+RES_POOLCOLL_BUL_LEVEL2S, // Start 2. Level
+RES_POOLCOLL_BUL_LEVEL2, // 2. Level
+RES_POOLCOLL_BUL_LEVEL2E, // Ende 2. Level
+RES_POOLCOLL_BUL_NONUM2, // keine Nummerierung
+RES_POOLCOLL_BUL_LEVEL3S, // Start 3. Level
+RES_POOLCOLL_BUL_LEVEL3, // 3. Level
+RES_POOLCOLL_BUL_LEVEL3E, // Ende 3. Level
+RES_POOLCOLL_BUL_NONUM3, // keine Nummerierung
+RES_POOLCOLL_BUL_LEVEL4S, // Start 4. Level
+RES_POOLCOLL_BUL_LEVEL4, // 4. Level
+RES_POOLCOLL_BUL_LEVEL4E, // Ende 4. Level
+RES_POOLCOLL_BUL_NONUM4, // keine Nummerierung
+RES_POOLCOLL_BUL_LEVEL5S, // Start 5. Level
+RES_POOLCOLL_BUL_LEVEL5, // 5. Level
+RES_POOLCOLL_BUL_LEVEL5E, // Ende 5. Level
+RES_POOLCOLL_BUL_NONUM5, // keine Nummerierung
RES_POOLCOLL_LISTS_END,
@@ -304,94 +304,94 @@ RES_POOLCOLL_LISTS_END,
RES_POOLCOLL_EXTRA_BEGIN = COLL_EXTRA_BITS,
// Untergruppe Header
-RES_POOLCOLL_HEADER = RES_POOLCOLL_EXTRA_BEGIN, // Header Left&Right
-RES_POOLCOLL_HEADERL, // Header Left
-RES_POOLCOLL_HEADERR, // Header Right
+RES_POOLCOLL_HEADER = RES_POOLCOLL_EXTRA_BEGIN, // Header Left&Right
+RES_POOLCOLL_HEADERL, // Header Left
+RES_POOLCOLL_HEADERR, // Header Right
// Untergruppe Footer
-RES_POOLCOLL_FOOTER, // Footer Left&Right
-RES_POOLCOLL_FOOTERL, // Footer Left
-RES_POOLCOLL_FOOTERR, // Footer Right
+RES_POOLCOLL_FOOTER, // Footer Left&Right
+RES_POOLCOLL_FOOTERL, // Footer Left
+RES_POOLCOLL_FOOTERR, // Footer Right
// Untergruppe Tabelle
-RES_POOLCOLL_TABLE, // Tabelle "Inhalt"
-RES_POOLCOLL_TABLE_HDLN, // Tabellen-Headline
+RES_POOLCOLL_TABLE, // Tabelle "Inhalt"
+RES_POOLCOLL_TABLE_HDLN, // Tabellen-Headline
// Untergruppe Beschriftung
-RES_POOLCOLL_LABEL, // Beschriftung-Basis
-RES_POOLCOLL_LABEL_ABB, // Beschriftung-Abbildung
-RES_POOLCOLL_LABEL_TABLE, // Beschriftung-Tabelle
-RES_POOLCOLL_LABEL_FRAME, // Beschriftung-Rahmen
+RES_POOLCOLL_LABEL, // Beschriftung-Basis
+RES_POOLCOLL_LABEL_ABB, // Beschriftung-Abbildung
+RES_POOLCOLL_LABEL_TABLE, // Beschriftung-Tabelle
+RES_POOLCOLL_LABEL_FRAME, // Beschriftung-Rahmen
// sonstiges
-RES_POOLCOLL_FRAME, // Rahmen
-RES_POOLCOLL_FOOTNOTE, // Fussnoten
-RES_POOLCOLL_JAKETADRESS, // UmschlagAdresse
-RES_POOLCOLL_SENDADRESS, // AbsenderAdresse
-RES_POOLCOLL_ENDNOTE, // Endnoten
+RES_POOLCOLL_FRAME, // Rahmen
+RES_POOLCOLL_FOOTNOTE, // Fussnoten
+RES_POOLCOLL_JAKETADRESS, // UmschlagAdresse
+RES_POOLCOLL_SENDADRESS, // AbsenderAdresse
+RES_POOLCOLL_ENDNOTE, // Endnoten
-RES_POOLCOLL_LABEL_DRAWING, // Beschriftung-Zeichen-Objekte
+RES_POOLCOLL_LABEL_DRAWING, // Beschriftung-Zeichen-Objekte
RES_POOLCOLL_EXTRA_END,
// Gruppe Verzeichnisse
RES_POOLCOLL_REGISTER_BEGIN = COLL_REGISTER_BITS,
-RES_POOLCOLL_REGISTER_BASE = RES_POOLCOLL_REGISTER_BEGIN, // Basis-Verzeichnis
+RES_POOLCOLL_REGISTER_BASE = RES_POOLCOLL_REGISTER_BEGIN, // Basis-Verzeichnis
// Untergruppe Index-Verzeichnisse
-RES_POOLCOLL_TOX_IDXH, // Header
-RES_POOLCOLL_TOX_IDX1, // 1. Ebene
-RES_POOLCOLL_TOX_IDX2, // 2. Ebene
-RES_POOLCOLL_TOX_IDX3, // 3. Ebene
-RES_POOLCOLL_TOX_IDXBREAK, // Trenner
+RES_POOLCOLL_TOX_IDXH, // Header
+RES_POOLCOLL_TOX_IDX1, // 1. Ebene
+RES_POOLCOLL_TOX_IDX2, // 2. Ebene
+RES_POOLCOLL_TOX_IDX3, // 3. Ebene
+RES_POOLCOLL_TOX_IDXBREAK, // Trenner
// Untergruppe Inhalts-Verzeichnisse
-RES_POOLCOLL_TOX_CNTNTH, // Header
-RES_POOLCOLL_TOX_CNTNT1, // 1. Ebene
-RES_POOLCOLL_TOX_CNTNT2, // 2. Ebene
-RES_POOLCOLL_TOX_CNTNT3, // 3. Ebene
-RES_POOLCOLL_TOX_CNTNT4, // 4. Ebene
-RES_POOLCOLL_TOX_CNTNT5, // 5. Ebene
+RES_POOLCOLL_TOX_CNTNTH, // Header
+RES_POOLCOLL_TOX_CNTNT1, // 1. Ebene
+RES_POOLCOLL_TOX_CNTNT2, // 2. Ebene
+RES_POOLCOLL_TOX_CNTNT3, // 3. Ebene
+RES_POOLCOLL_TOX_CNTNT4, // 4. Ebene
+RES_POOLCOLL_TOX_CNTNT5, // 5. Ebene
// Untergruppe Benutzer-Verzeichnisse:
-RES_POOLCOLL_TOX_USERH, // Header
-RES_POOLCOLL_TOX_USER1, // 1. Ebene
-RES_POOLCOLL_TOX_USER2, // 2. Ebene
-RES_POOLCOLL_TOX_USER3, // 3. Ebene
-RES_POOLCOLL_TOX_USER4, // 4. Ebene
-RES_POOLCOLL_TOX_USER5, // 5. Ebene
+RES_POOLCOLL_TOX_USERH, // Header
+RES_POOLCOLL_TOX_USER1, // 1. Ebene
+RES_POOLCOLL_TOX_USER2, // 2. Ebene
+RES_POOLCOLL_TOX_USER3, // 3. Ebene
+RES_POOLCOLL_TOX_USER4, // 4. Ebene
+RES_POOLCOLL_TOX_USER5, // 5. Ebene
-RES_POOLCOLL_TOX_CNTNT6, // Inhalt 6. Ebene
-RES_POOLCOLL_TOX_CNTNT7, // Inhalt 7. Ebene
-RES_POOLCOLL_TOX_CNTNT8, // Inhalt 8. Ebene
-RES_POOLCOLL_TOX_CNTNT9, // Inhalt 9. Ebene
-RES_POOLCOLL_TOX_CNTNT10, // Inhalt 10. Ebene
+RES_POOLCOLL_TOX_CNTNT6, // Inhalt 6. Ebene
+RES_POOLCOLL_TOX_CNTNT7, // Inhalt 7. Ebene
+RES_POOLCOLL_TOX_CNTNT8, // Inhalt 8. Ebene
+RES_POOLCOLL_TOX_CNTNT9, // Inhalt 9. Ebene
+RES_POOLCOLL_TOX_CNTNT10, // Inhalt 10. Ebene
// illustrations index
-RES_POOLCOLL_TOX_ILLUSH, // illustrations header
+RES_POOLCOLL_TOX_ILLUSH, // illustrations header
RES_POOLCOLL_TOX_ILLUS1, // illustrations all levels
-// object index
-RES_POOLCOLL_TOX_OBJECTH, // objects header
+// object index
+RES_POOLCOLL_TOX_OBJECTH, // objects header
RES_POOLCOLL_TOX_OBJECT1, // objects all levels
-// tables index
-RES_POOLCOLL_TOX_TABLESH, // tables header
+// tables index
+RES_POOLCOLL_TOX_TABLESH, // tables header
RES_POOLCOLL_TOX_TABLES1, // tables all levels
-// index of authorities
-RES_POOLCOLL_TOX_AUTHORITIESH, // authorities header
+// index of authorities
+RES_POOLCOLL_TOX_AUTHORITIESH, // authorities header
RES_POOLCOLL_TOX_AUTHORITIES1, // authorities all levels
// user index 6..10
-RES_POOLCOLL_TOX_USER6, // level 6
-RES_POOLCOLL_TOX_USER7, // level 7
-RES_POOLCOLL_TOX_USER8, // level 8
-RES_POOLCOLL_TOX_USER9, // level 9
-RES_POOLCOLL_TOX_USER10, // level 10
+RES_POOLCOLL_TOX_USER6, // level 6
+RES_POOLCOLL_TOX_USER7, // level 7
+RES_POOLCOLL_TOX_USER8, // level 8
+RES_POOLCOLL_TOX_USER9, // level 9
+RES_POOLCOLL_TOX_USER10, // level 10
RES_POOLCOLL_REGISTER_END,
@@ -399,8 +399,8 @@ RES_POOLCOLL_REGISTER_END,
// Gruppe Kapitel/Dokument
RES_POOLCOLL_DOC_BEGIN = COLL_DOC_BITS,
-RES_POOLCOLL_DOC_TITEL = RES_POOLCOLL_DOC_BEGIN, // Doc. Titel
-RES_POOLCOLL_DOC_SUBTITEL, // Doc. UnterTitel
+RES_POOLCOLL_DOC_TITEL = RES_POOLCOLL_DOC_BEGIN, // Doc. Titel
+RES_POOLCOLL_DOC_SUBTITEL, // Doc. UnterTitel
RES_POOLCOLL_DOC_END,
@@ -421,9 +421,9 @@ RES_POOLCOLL_HTML_END
// erfrage den definierten Parent zu einer POOL-Id
-// returnt: 0 -> Standard
-// USHRT_MAX -> kein Parent
-// sonst -> den Parent
+// returnt: 0 -> Standard
+// USHRT_MAX -> kein Parent
+// sonst -> den Parent
USHORT GetPoolParent( USHORT nId );
SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage);
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index f2170b0d4721..abe6d97f3215 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -2,7 +2,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
@@ -65,7 +65,7 @@ class SwPrintData
public:
sal_Bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground,
- bPrintBlackFont,
+ bPrintBlackFont,
//#i81434# - printing of hidden text
bPrintHiddenText, bPrintTextPlaceholder,
bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
@@ -93,7 +93,7 @@ public:
bPrintLeftPages =
bPrintRightPages =
bPrintPageBackground =
- bPrintEmptyPages =
+ bPrintEmptyPages =
bUpdateFieldsInPrinting = sal_True;
bPaperFromSetup =
@@ -102,8 +102,8 @@ public:
bPrintProspectRTL =
bPrintSingleJobs =
bModified =
- bPrintBlackFont =
- bPrintHiddenText =
+ bPrintBlackFont =
+ bPrintHiddenText =
bPrintTextPlaceholder = sal_False;
nPrintPostIts = 0;
@@ -134,7 +134,7 @@ public:
bPrintHiddenText == rData.bPrintHiddenText &&
bPrintTextPlaceholder == rData.bPrintTextPlaceholder;
}
-
+
// Note: in the context where this class ist used the pointers should always be valid
// during the lifetime of this object
const SwPrintUIOptions & GetPrintUIOptions() const { return *m_pPrintUIOptions; }
@@ -158,7 +158,7 @@ public:
sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
sal_Int16 GetPrintPostIts() const { return nPrintPostIts; }
const rtl::OUString GetFaxName() const { return sFaxName; }
- sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; }
+ sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; }
sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
void SetPrintGraphic( sal_Bool b ) { doSetModified(); bPrintGraphic = b; }
@@ -179,7 +179,7 @@ public:
void SetFaxName( const rtl::OUString& rSet ) { sFaxName = rSet; }
void SetPrintHiddenText( sal_Bool b ) { doSetModified(); bPrintHiddenText = b; }
void SetPrintTextPlaceholder( sal_Bool b ) { doSetModified(); bPrintTextPlaceholder = b; }
-
+
virtual void doSetModified () { bModified = sal_True;}
};
@@ -195,9 +195,9 @@ class SwPrintUIOptions : public vcl::PrinterOptionsHelper
public:
SwPrintUIOptions( bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const SwPrintData &rDefaultPrintData );
virtual ~SwPrintUIOptions();
-
+
bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp );
-
+
bool IsPrintFormControls() const { return getBoolValue( "PrintControls", m_rDefaultPrintData.bPrintControl ); }
bool IsPrintPageBackground() const { return getBoolValue( "PrintPageBackground", m_rDefaultPrintData.bPrintPageBackground ); }
bool IsPrintProspect() const { return getBoolValue( "PrintProspect", m_rDefaultPrintData.bPrintProspect ); }
@@ -225,7 +225,7 @@ public:
// and it is used in the 'render' function of that same interface
class SwRenderData
{
- // pages valid for printing (according to the current settings)
+ // pages valid for printing (according to the current settings)
// and their respective start frames (see getRendererCount in unotxdoc.cxx)
// This set of pages does NOT depend on the 'PageRange' that is used as a printing option!
std::set< sal_Int32 > m_aValidPages; // the set of possible pages (see StringRangeEnumerator::getRangesFromString )
@@ -246,11 +246,11 @@ class SwRenderData
rtl::OUString m_aPageRange;
- // the view options to be applied for printing
+ // the view options to be applied for printing
SwViewOptionAdjust_Impl * m_pViewOptionAdjust;
SwPrtOptions * m_pPrtOptions;
-
+
public:
// PostIt relevant data
@@ -293,13 +293,13 @@ public:
// a value of -1 for the tray means that there is no specific tray defined
std::map< sal_Int32, sal_Int32 >& GetPrinterPaperTrays() { return m_aPrinterPaperTrays; }
const std::map< sal_Int32, sal_Int32 >& GetPrinterPaperTrays() const { return m_aPrinterPaperTrays; }
-
+
// used for 'normal' printing
// A page value of 0 as entry indicates that this page is not from the document but
// from the post-it document. (See also GetPostItStartFrame below)
std::vector< sal_Int32 > & GetPagesToPrint() { return m_aPagesToPrint; }
const std::vector< sal_Int32 > & GetPagesToPrint() const { return m_aPagesToPrint; }
-
+
// used for 'normal' printing with post-its
// - if the map entry will be NULL then the respective page to be printed is from
// the document. In that case use the value from GetPagesToPrint at the same index to
@@ -316,7 +316,7 @@ public:
rtl::OUString GetPageRange() const { return m_aPageRange; }
void SetPageRange( const rtl::OUString &rRange ) { m_aPageRange = rRange; }
-};
+};
////////////////////////////////////////////////////////////
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index 8c1b2bb5f8bc..bb166b02d58a 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -2,7 +2,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
@@ -46,32 +46,32 @@ public:
bLandscape(0),bStretch(0)
{}
- ULONG GetLeftSpace() const { return nLeftSpace; }
- void SetLeftSpace( ULONG n ) { nLeftSpace = n; }
+ ULONG GetLeftSpace() const { return nLeftSpace; }
+ void SetLeftSpace( ULONG n ) { nLeftSpace = n; }
- ULONG GetRightSpace() const { return nRightSpace; }
- void SetRightSpace( ULONG n ) { nRightSpace = n; }
+ ULONG GetRightSpace() const { return nRightSpace; }
+ void SetRightSpace( ULONG n ) { nRightSpace = n; }
- ULONG GetTopSpace() const { return nTopSpace; }
- void SetTopSpace( ULONG n ) { nTopSpace = n; }
+ ULONG GetTopSpace() const { return nTopSpace; }
+ void SetTopSpace( ULONG n ) { nTopSpace = n; }
- ULONG GetBottomSpace() const { return nBottomSpace; }
- void SetBottomSpace( ULONG n ) { nBottomSpace = n; }
+ ULONG GetBottomSpace() const { return nBottomSpace; }
+ void SetBottomSpace( ULONG n ) { nBottomSpace = n; }
- ULONG GetHorzSpace() const { return nHorzSpace; }
- void SetHorzSpace( ULONG n ) { nHorzSpace = n; }
+ ULONG GetHorzSpace() const { return nHorzSpace; }
+ void SetHorzSpace( ULONG n ) { nHorzSpace = n; }
- ULONG GetVertSpace() const { return nVertSpace; }
- void SetVertSpace( ULONG n ) { nVertSpace = n; }
+ ULONG GetVertSpace() const { return nVertSpace; }
+ void SetVertSpace( ULONG n ) { nVertSpace = n; }
- BYTE GetRow() const { return nRow; }
- void SetRow(BYTE n ) { nRow = n; }
+ BYTE GetRow() const { return nRow; }
+ void SetRow(BYTE n ) { nRow = n; }
- BYTE GetCol() const { return nCol; }
- void SetCol( BYTE n ) { nCol = n; }
+ BYTE GetCol() const { return nCol; }
+ void SetCol( BYTE n ) { nCol = n; }
- BOOL GetLandscape() const { return bLandscape; }
- void SetLandscape( BOOL b ) { bLandscape = b; }
+ BOOL GetLandscape() const { return bLandscape; }
+ void SetLandscape( BOOL b ) { bLandscape = b; }
};
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index aeca0cf38d0f..f5fe0081d68c 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -36,44 +36,44 @@
// Bereiche fuer die UI-Verzeichnisse
// ----------------------------------------------------------------
-#define RC_BASE RID_SW_START // aus solar.hrc
+#define RC_BASE RID_SW_START // aus solar.hrc
-#define RC_APP RC_BASE
-#define RC_DIALOG (RC_BASE + 200)
-#define RC_DOCVW (RC_BASE + 300)
-#define RC_WEB (RC_BASE + 400)
+#define RC_APP RC_BASE
+#define RC_DIALOG (RC_BASE + 200)
+#define RC_DOCVW (RC_BASE + 300)
+#define RC_WEB (RC_BASE + 400)
#define RC_GLOBDOC (RC_BASE + 500)
-#define RC_VIEW (RC_BASE + 600)
-#define RC_CHRDLG (RC_BASE + 700)
-#define RC_RIBBAR (RC_BASE + 720)
-#define RC_GLOBALS (RC_BASE + 800)
-#define RC_FMTUI (RC_BASE + 920)
-#define RC_FRMDLG (RC_BASE + 1000)
-#define RC_FLDDLG (RC_BASE + 1100)
-#define RC_UTLUI (RC_BASE + 1250)
-#define RC_ATTR (RC_BASE + 1350)
-#define RC_TABLE (RC_BASE + 1450)
-#define RC_CONFIG (RC_BASE + 1550)
-#define RC_MISC (RC_BASE + 1650)
-#define RC_WRTSH (RC_BASE + 1750)
-#define RC_INDEX (RC_BASE + 1950)
-#define RC_DBUI (RC_BASE + 2050)
-#define RC_DOCHDL (RC_BASE + 2150)
-#define RC_POOLCHRFMT (RC_BASE + 2250)
-#define RC_POOLHTMLCHRFMT (RC_BASE + 2290)
-#define RC_POOLFRMFMT (RC_BASE + 2330)
-#define RC_POOLTXTCOLL (RC_BASE + 2360)
-#define RC_POOLPAGEDESC (RC_BASE + 2550)
-#define RC_POOLNUMRULE (RC_BASE + 2650)
-#define RC_ENVELP (RC_BASE + 2750)
-#define RC_STATLIN_STR (RC_BASE + 2850)
-#define RC_COMMON_CORE (RC_BASE + 2950)
-#define RC_WIZARD (RC_BASE + 3050)
+#define RC_VIEW (RC_BASE + 600)
+#define RC_CHRDLG (RC_BASE + 700)
+#define RC_RIBBAR (RC_BASE + 720)
+#define RC_GLOBALS (RC_BASE + 800)
+#define RC_FMTUI (RC_BASE + 920)
+#define RC_FRMDLG (RC_BASE + 1000)
+#define RC_FLDDLG (RC_BASE + 1100)
+#define RC_UTLUI (RC_BASE + 1250)
+#define RC_ATTR (RC_BASE + 1350)
+#define RC_TABLE (RC_BASE + 1450)
+#define RC_CONFIG (RC_BASE + 1550)
+#define RC_MISC (RC_BASE + 1650)
+#define RC_WRTSH (RC_BASE + 1750)
+#define RC_INDEX (RC_BASE + 1950)
+#define RC_DBUI (RC_BASE + 2050)
+#define RC_DOCHDL (RC_BASE + 2150)
+#define RC_POOLCHRFMT (RC_BASE + 2250)
+#define RC_POOLHTMLCHRFMT (RC_BASE + 2290)
+#define RC_POOLFRMFMT (RC_BASE + 2330)
+#define RC_POOLTXTCOLL (RC_BASE + 2360)
+#define RC_POOLPAGEDESC (RC_BASE + 2550)
+#define RC_POOLNUMRULE (RC_BASE + 2650)
+#define RC_ENVELP (RC_BASE + 2750)
+#define RC_STATLIN_STR (RC_BASE + 2850)
+#define RC_COMMON_CORE (RC_BASE + 2950)
+#define RC_WIZARD (RC_BASE + 3050)
#define RC_POPUPS (RC_BASE + 3150)
#define RC_SHELLS (RC_BASE + 3250)
#define RC_CFGITEMS (RC_BASE + 3350)
-#define RC_LINGU (RC_BASE + 3450)
-#define RC_ACCESS (RC_BASE + 3550)
+#define RC_LINGU (RC_BASE + 3450)
+#define RC_ACCESS (RC_BASE + 3550)
#define STR_POOLPARSTYLE (RC_BASE + 3650)
#define RC_UNDO (RC_BASE + 3750)
#define RC_SMARTTAG (RC_BASE + 3950) // SMARTTAGS
@@ -81,106 +81,106 @@
#define RC_ANNOTATION (RC_BASE + 4150)
/*--------------------------------------------------------------------
- Beschreibung: Bereiche ausspannen
+ Beschreibung: Bereiche ausspannen
--------------------------------------------------------------------*/
// App-Verzeichnis
-#define RC_APP_BEGIN RC_APP
-#define RC_APP_END (RC_APP_BEGIN + 199)
+#define RC_APP_BEGIN RC_APP
+#define RC_APP_END (RC_APP_BEGIN + 199)
// Dialog-Verzeichnis
-#define RC_DIALOG_BEGIN RC_DIALOG
-#define RC_DIALOG_END (RC_DIALOG_BEGIN + 99)
+#define RC_DIALOG_BEGIN RC_DIALOG
+#define RC_DIALOG_END (RC_DIALOG_BEGIN + 99)
// Editwin & Co
-#define RC_DOCVW_BEGIN RC_DOCVW
-#define RC_DOCVW_END (RC_DOCVW_BEGIN + 99)
+#define RC_DOCVW_BEGIN RC_DOCVW
+#define RC_DOCVW_END (RC_DOCVW_BEGIN + 99)
// Annotation
#define RC_ANNOTATION_BEGIN RC_ANNOTATION
#define RC_ANNOTATION_END (RC_ANNOTATION_BEGIN + 99)
// SW/Web
-#define RC_WEB_BEGIN RC_WEB
+#define RC_WEB_BEGIN RC_WEB
#define RC_WEB_END (RC_WEB_BEGIN + 199)
//Globaldocument
-#define RC_GLOBDOC_BEGIN RC_GLOBDOC
-#define RC_GLOBDOC_END (RC_GLOBDOC_BEGIN + 99)
+#define RC_GLOBDOC_BEGIN RC_GLOBDOC
+#define RC_GLOBDOC_END (RC_GLOBDOC_BEGIN + 99)
// UI-View
-#define RC_VIEW_BEGIN RC_VIEW
-#define RC_VIEW_END (RC_VIEW_BEGIN + 99)
+#define RC_VIEW_BEGIN RC_VIEW
+#define RC_VIEW_END (RC_VIEW_BEGIN + 99)
// Zeichen Absatz Tab-Dialog
-#define RC_CHRDLG_BEGIN RC_CHRDLG
+#define RC_CHRDLG_BEGIN RC_CHRDLG
#define RC_CHRDLG_END (RC_CHRDLG_BEGIN + 19)
// Unsere Shell
-#define RC_WRTSH_BEGIN RC_WRTSH
-#define RC_WRTSH_END (RC_WRTSH_BEGIN + 49)
+#define RC_WRTSH_BEGIN RC_WRTSH
+#define RC_WRTSH_END (RC_WRTSH_BEGIN + 49)
// Verzeichnisse
-#define RC_INDEX_BEGIN RC_INDEX
-#define RC_INDEX_END (RC_INDEX + 99)
+#define RC_INDEX_BEGIN RC_INDEX
+#define RC_INDEX_END (RC_INDEX + 99)
//
-#define RC_RIBBAR_BEGIN RC_RIBBAR
-#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79)
+#define RC_RIBBAR_BEGIN RC_RIBBAR
+#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79)
// globale Ressourcen
-#define RC_GLOBALS_BEGIN RC_GLOBALS
-#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
+#define RC_GLOBALS_BEGIN RC_GLOBALS
+#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
// Format-Vorlagen
-#define RC_FMTUI_BEGIN RC_FMTUI
-#define RC_FMTUI_END (RC_FMTUI_BEGIN + 69)
+#define RC_FMTUI_BEGIN RC_FMTUI
+#define RC_FMTUI_END (RC_FMTUI_BEGIN + 69)
// Grafik Dialoge
-#define RC_GRFDLG_BEGIN RC_GRFDLG
-#define RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99)
+#define RC_GRFDLG_BEGIN RC_GRFDLG
+#define RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99)
// ????
-#define RC_FSTDLG_BEGIN RC_FSTDLG
-#define RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99)
+#define RC_FSTDLG_BEGIN RC_FSTDLG
+#define RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99)
// Rahmen Dialoge
-#define RC_FRMDLG_BEGIN RC_FRMDLG
-#define RC_FRMDLG_END (RC_FRMDLG_BEGIN + 99)
+#define RC_FRMDLG_BEGIN RC_FRMDLG
+#define RC_FRMDLG_END (RC_FRMDLG_BEGIN + 99)
// Feld Dialoge
-#define RC_FLDDLG_BEGIN RC_FLDDLG
-#define RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149)
+#define RC_FLDDLG_BEGIN RC_FLDDLG
+#define RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149)
// Utilities UI
-#define RC_UTLUI_BEGIN RC_UTLUI
-#define RC_UTLUI_END (RC_UTLUI + 99)
+#define RC_UTLUI_BEGIN RC_UTLUI
+#define RC_UTLUI_END (RC_UTLUI + 99)
// Utilities UI-Attribute
-#define RC_ATTR_BEGIN RC_ATTR
-#define RC_ATTR_END (RC_ATTR + 99)
+#define RC_ATTR_BEGIN RC_ATTR
+#define RC_ATTR_END (RC_ATTR + 99)
// Tabellen
-#define RC_TABLE_BEGIN RC_TABLE
-#define RC_TABLE_END (RC_TABLE + 99)
+#define RC_TABLE_BEGIN RC_TABLE
+#define RC_TABLE_END (RC_TABLE + 99)
// Konfiguration
-#define RC_CONFIG_BEGIN RC_CONFIG
-#define RC_CONFIG_END (RC_CONFIG + 99)
+#define RC_CONFIG_BEGIN RC_CONFIG
+#define RC_CONFIG_END (RC_CONFIG + 99)
// Verschiedenes
-#define RC_MISC_BEGIN RC_MISC
-#define RC_MISC_END (RC_MISC + 99)
+#define RC_MISC_BEGIN RC_MISC
+#define RC_MISC_END (RC_MISC + 99)
// DBMgr
-#define RC_DBUI_BEGIN RC_DBUI
-#define RC_DBUI_END (RC_DBUI + 99)
+#define RC_DBUI_BEGIN RC_DBUI
+#define RC_DBUI_END (RC_DBUI + 99)
// Der Rest der Imp-Klassen
-#define RC_DOCHDL_BEGIN RC_DOCHDL
-#define RC_DOCHDL_END (RC_DOCHDL + 99)
+#define RC_DOCHDL_BEGIN RC_DOCHDL
+#define RC_DOCHDL_END (RC_DOCHDL + 99)
// Zeichenvorlagen
#define RC_POOLCHRFMT_BEGIN RC_POOLCHRFMT
@@ -206,8 +206,8 @@
#define RC_POOLCOLL_REGISTER_END (RC_POOLTXTCOLL + 119)
#define RC_POOLCOLL_DOC_BEGIN (RC_POOLTXTCOLL + 130)
#define RC_POOLCOLL_DOC_END (RC_POOLTXTCOLL + 139)
-#define RC_POOLCOLL_HTML_BEGIN (RC_POOLTXTCOLL + 140)
-#define RC_POOLCOLL_HTML_END (RC_POOLTXTCOLL + 169)
+#define RC_POOLCOLL_HTML_BEGIN (RC_POOLTXTCOLL + 140)
+#define RC_POOLCOLL_HTML_END (RC_POOLTXTCOLL + 169)
#define RC_POOLTXTCOLL_END RC_POOLCOLL_HTML_END
@@ -221,18 +221,18 @@
// Pooltemplate Paragraph
#define STR_POOLPARSTYLE_BEGIN STR_POOLPARSTYLE
-#define STR_POOLPARSTYLE_END (STR_POOLPARSTYLE + 9)
+#define STR_POOLPARSTYLE_END (STR_POOLPARSTYLE + 9)
// Envelp-Verzeichnis
#define RC_ENVELP_BEGIN (RC_ENVELP )
#define RC_ENVELP_END (RC_ENVELP + 99)
// Statuszeile mit Laufbalken
-#define RC_STATLIN_STR_BEGIN (RC_STATLIN_STR)
-#define RC_STATLIN_STR_END (RC_STATLIN_STR + 49)
+#define RC_STATLIN_STR_BEGIN (RC_STATLIN_STR)
+#define RC_STATLIN_STR_END (RC_STATLIN_STR + 49)
// Gemeinsame Core-Strings
-#define RC_COMCORE_BEGIN (RC_COMMON_CORE)
+#define RC_COMCORE_BEGIN (RC_COMMON_CORE)
#define RC_COMCORE_END (RC_COMMON_CORE + 59)
// Shell-Verzeichnis
@@ -240,19 +240,19 @@
#define RC_SHELLS_END (RC_SHELLS + 99)
// PopUpMenu's
-#define RC_POPUPS_BEGIN RC_POPUPS
-#define RC_POPUPS_END (RC_POPUPS + 99)
+#define RC_POPUPS_BEGIN RC_POPUPS
+#define RC_POPUPS_END (RC_POPUPS + 99)
// Strings fuer ConfigItems in div. Verzeichnissen
-#define RC_CFGITEMS_BEGIN RC_CFGITEMS
-#define RC_CFGITEMS_END (RC_CFGITEMS + 99)
+#define RC_CFGITEMS_BEGIN RC_CFGITEMS
+#define RC_CFGITEMS_END (RC_CFGITEMS + 99)
// Lingu
-#define RC_LINGU_BEGIN RC_LINGU
+#define RC_LINGU_BEGIN RC_LINGU
#define RC_LINGU_END (RC_LINGU + 99)
// Accessibility
-#define RC_ACCESS_BEGIN RC_ACCESS
+#define RC_ACCESS_BEGIN RC_ACCESS
#define RC_ACCESS_END (RC_ACCESS + 99)
// Undos
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 2a3f088dfe61..21dd0c22561b 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <svl/svstdarr.hxx>
#include <pam.hxx>
-#include <IDocumentRedlineAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
#include <svl/smplhint.hxx>
@@ -93,7 +93,7 @@ public:
class SW_DLLPUBLIC SwRedlineData
{
friend class SwRedline;
- SwRedlineData* pNext; // Verweis auf weitere Daten
+ SwRedlineData* pNext; // Verweis auf weitere Daten
SwRedlineExtraData* pExtraData;
String sComment;
@@ -124,19 +124,19 @@ public:
*pExtraData == *rCmp.pExtraData ));
}
int operator!=( const SwRedlineData& rCmp ) const
- { return !operator==( rCmp ); }
+ { return !operator==( rCmp ); }
RedlineType_t GetType() const
{ return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); }
RedlineType_t GetRealType() const { return eType; }
- USHORT GetAuthor() const { return nAuthor; }
- const String& GetComment() const { return sComment; }
- const DateTime& GetTimeStamp() const { return aStamp; }
- inline const SwRedlineData* Next() const{ return pNext; }
+ USHORT GetAuthor() const { return nAuthor; }
+ const String& GetComment() const { return sComment; }
+ const DateTime& GetTimeStamp() const { return aStamp; }
+ inline const SwRedlineData* Next() const{ return pNext; }
void SetComment( const String& rS ) { sComment = rS; }
void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
-
+
void SetAutoFmtFlag()
{ eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
int CanCombine( const SwRedlineData& rCmp ) const
@@ -161,8 +161,8 @@ public:
// fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur
// fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei,
// das es noch weitere geben kann!
- USHORT GetSeqNo() const { return nSeqNo; }
- void SetSeqNo( USHORT nNo ) { nSeqNo = nNo; }
+ USHORT GetSeqNo() const { return nSeqNo; }
+ void SetSeqNo( USHORT nNo ) { nSeqNo = nNo; }
String GetDescr() const;
};
@@ -221,7 +221,7 @@ public:
{ return *pRedlineData == rCmp; }
int operator!=( const SwRedlineData& rCmp ) const
{ return *pRedlineData != rCmp; }
- void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); }
+ void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); }
USHORT GetStackCount() const;
USHORT GetAuthor( USHORT nPos = 0) const;
@@ -244,12 +244,12 @@ public:
// fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur
// fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei,
// das es noch weitere geben kann!
- USHORT GetSeqNo() const { return pRedlineData->GetSeqNo(); }
- void SetSeqNo( USHORT nNo ) { pRedlineData->SetSeqNo( nNo ); }
+ USHORT GetSeqNo() const { return pRedlineData->GetSeqNo(); }
+ void SetSeqNo( USHORT nNo ) { pRedlineData->SetSeqNo( nNo ); }
// Beim Hide/ShowOriginal wird 2 mal ueber die Liste gelaufen, damit
- // die Del-Redlines per Copy und Delete versteckt werden. Beim Move
- // wird sonst die Attributierung falsch behandelt.
+ // die Del-Redlines per Copy und Delete versteckt werden. Beim Move
+ // wird sonst die Attributierung falsch behandelt.
// Alle anderen Aufrufer muessen immer 0 angeben.
void CallDisplayFunc( USHORT nLoop = 0 );
void Show( USHORT nLoop = 0 );
@@ -288,11 +288,11 @@ public:
class SW_DLLPUBLIC SwRedlineHint : public SfxHint
{
-#define SWREDLINE_INSERTED 1
-#define SWREDLINE_REMOVED 2
-#define SWREDLINE_FOCUS 3
-#define SWREDLINE_CHANGED 4
-#define SWREDLINE_LANGUAGE 5
+#define SWREDLINE_INSERTED 1
+#define SWREDLINE_REMOVED 2
+#define SWREDLINE_FOCUS 3
+#define SWREDLINE_CHANGED 4
+#define SWREDLINE_LANGUAGE 5
const SwRedline* pRedline;
sal_Int16 nWhich;
@@ -303,7 +303,7 @@ public:
: pRedline(p)
, nWhich(n)
, pView(pV)
- {}
+ {}
TYPEINFO();
const SwRedline* GetRedline() const { return pRedline; }
diff --git a/sw/inc/redlnaut.hxx b/sw/inc/redlnaut.hxx
index 7d07ca479be8..3dc8ff558b7a 100644
--- a/sw/inc/redlnaut.hxx
+++ b/sw/inc/redlnaut.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index e82fbf2b87c1..65ced1c7daec 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -2,7 +2,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
@@ -77,7 +77,7 @@ public:
SwGetRefFieldType(SwDoc* pDoc );
virtual SwFieldType* Copy() const;
- SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() const { return pDoc; }
// ueberlagert, um alle Ref-Felder zu updaten
virtual void Modify( SfxPoolItem *, SfxPoolItem * );
@@ -111,11 +111,11 @@ public:
virtual ~SwGetRefField();
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
- const String& GetSetRefName() const { return sSetRefName; }
+ const String& GetSetRefName() const { return sSetRefName; }
// --> OD 2007-09-06 #i81002#
// The <SwTxtFld> instance, which represents the text attribute for the
@@ -126,11 +126,11 @@ public:
// no update for these reference format types.
void UpdateField( const SwTxtFld* pFldTxtAttr );
// <--
- void SetExpand( const String& rStr ) { sTxt = rStr; }
+ void SetExpand( const String& rStr ) { sTxt = rStr; }
// SubType erfragen/setzen
- virtual USHORT GetSubType() const;
- virtual void SetSubType( USHORT n );
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType( USHORT n );
// --> OD 2007-11-09 #i81002#
bool IsRefToHeadingCrossRefBookmark() const;
@@ -142,14 +142,14 @@ public:
// <--
// SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant)
- USHORT GetSeqNo() const { return nSeqNo; }
- void SetSeqNo( USHORT n ) { nSeqNo = n; }
+ USHORT GetSeqNo() const { return nSeqNo; }
+ void SetSeqNo( USHORT n ) { nSeqNo = n; }
// Name der Referenz
virtual const String& GetPar1() const;
- virtual void SetPar1(const String& rStr);
+ virtual void SetPar1(const String& rStr);
- virtual String GetPar2() const;
+ virtual String GetPar2() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 8637f4d43cd3..238067c22972 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -2,7 +2,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
@@ -34,19 +34,19 @@
class SW_DLLPUBLIC Ring
{
Ring *pNext;
- Ring* pPrev; // zur Optimierung, damit das ein/ausketten schneller geht!
+ Ring* pPrev; // zur Optimierung, damit das ein/ausketten schneller geht!
protected:
- Ring() { pNext = this; pPrev = this; }
+ Ring() { pNext = this; pPrev = this; }
Ring( Ring * );
public:
virtual ~Ring();
void MoveTo( Ring *pDestRing );
void MoveRingTo( Ring *pDestRing );
- Ring* GetNext() const { return pNext; }
- Ring* GetPrev() const { return pPrev; }
-
+ Ring* GetNext() const { return pNext; }
+ Ring* GetPrev() const { return pPrev; }
+
sal_uInt32 numberOf() const;
};
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 1623972b0d6e..642fdbe885b5 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index baf5faf6cdbf..1341f147eed6 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -2,7 +2,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
@@ -40,18 +40,18 @@ public:
SwRubyListEntry() : aRubyAttr( aEmptyStr ) {}
~SwRubyListEntry();
- const String& GetText() const { return sText; }
- void SetText( const String& rStr ) { sText = rStr; }
+ const String& GetText() const { return sText; }
+ void SetText( const String& rStr ) { sText = rStr; }
- const SwFmtRuby& GetRubyAttr() const { return aRubyAttr; }
- SwFmtRuby& GetRubyAttr() { return aRubyAttr; }
- void SetRubyAttr( const SwFmtRuby& rAttr ) { aRubyAttr = rAttr; }
+ const SwFmtRuby& GetRubyAttr() const { return aRubyAttr; }
+ SwFmtRuby& GetRubyAttr() { return aRubyAttr; }
+ void SetRubyAttr( const SwFmtRuby& rAttr ) { aRubyAttr = rAttr; }
};
typedef SwRubyListEntry* SwRubyListEntryPtr;
SV_DECL_PTRARR_DEL( SwRubyList, SwRubyListEntryPtr, 0, 32 )
-#endif //_RUBYLIST_HXX
+#endif //_RUBYLIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 23c4ed535e75..94ea860956df 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -2,7 +2,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
@@ -63,21 +63,21 @@ SV_DECL_PTRARR( SwSections, SwSection*, 0, 4 )
enum SectionType { CONTENT_SECTION,
TOX_HEADER_SECTION,
TOX_CONTENT_SECTION,
- DDE_LINK_SECTION = OBJECT_CLIENT_DDE,
- FILE_LINK_SECTION = OBJECT_CLIENT_FILE
+ DDE_LINK_SECTION = OBJECT_CLIENT_DDE,
+ FILE_LINK_SECTION = OBJECT_CLIENT_FILE
/*
// verbleiben noch:
- OBJECT_CLIENT_SO = 0x80,
- OBJECT_CLIENT_OLE = 0x82,
- OBJECT_CLIENT_OLE_CACHE = 0x83,
+ OBJECT_CLIENT_SO = 0x80,
+ OBJECT_CLIENT_OLE = 0x82,
+ OBJECT_CLIENT_OLE_CACHE = 0x83,
*/
};
enum LinkCreateType
{
- CREATE_NONE, // nichts weiter tun
- CREATE_CONNECT, // Link gleich connecten
- CREATE_UPDATE // Link connecten und updaten
+ CREATE_NONE, // nichts weiter tun
+ CREATE_CONNECT, // Link gleich connecten
+ CREATE_UPDATE // Link connecten und updaten
};
class SW_DLLPUBLIC SwSectionData
@@ -179,7 +179,7 @@ private:
bool const bHidden, bool const bCondition);
public:
- TYPEINFO(); // rtti
+ TYPEINFO(); // rtti
SwSection(SectionType const eType, String const& rName,
SwSectionFmt & rFormat);
@@ -194,8 +194,8 @@ public:
SectionType GetType() const { return m_Data.GetType(); }
void SetType(SectionType const eType) { return m_Data.SetType(eType); }
- SwSectionFmt* GetFmt() { return (SwSectionFmt*)pRegisteredIn; }
- SwSectionFmt* GetFmt() const { return (SwSectionFmt*)pRegisteredIn; }
+ SwSectionFmt* GetFmt() { return (SwSectionFmt*)pRegisteredIn; }
+ SwSectionFmt* GetFmt() const { return (SwSectionFmt*)pRegisteredIn; }
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
@@ -297,13 +297,13 @@ class SW_DLLPUBLIC SwSectionFmt
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextSection> m_wXTextSection;
- SW_DLLPRIVATE void UpdateParent(); // Parent wurde veraendert
+ SW_DLLPRIVATE void UpdateParent(); // Parent wurde veraendert
protected:
SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc );
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
~SwSectionFmt();
//Vernichtet alle Frms in aDepend (Frms werden per PTR_CAST erkannt).
@@ -321,7 +321,7 @@ public:
inline SwSection* GetParentSection() const;
// alle Sections, die von dieser abgeleitet sind
- // - sortiert nach : Name oder Position oder unsortiert
+ // - sortiert nach : Name oder Position oder unsortiert
// - alle oder nur die, die sich im normalten Nodes-Array befinden
USHORT GetChildSections( SwSections& rArr,
SectionSort eSort = SORTSECT_NOT,
diff --git a/sw/inc/shellid.hxx b/sw/inc/shellid.hxx
index 16ba7ae00321..2316f0e481e3 100644
--- a/sw/inc/shellid.hxx
+++ b/sw/inc/shellid.hxx
@@ -2,7 +2,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
@@ -31,45 +31,45 @@
#include <sfx2/shell.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Mapping fuer UI-Parameter
+ Beschreibung: Mapping fuer UI-Parameter
--------------------------------------------------------------------*/
-#define SW_BASESHELL (SFX_INTERFACE_SW_START + 1)
-#define SW_TEXTSHELL (SFX_INTERFACE_SW_START + 2)
-#define SW_LISTSHELL (SFX_INTERFACE_SW_START + 3)
-#define SW_TABSHELL (SFX_INTERFACE_SW_START + 4)
-#define SW_FRAMESHELL (SFX_INTERFACE_SW_START + 5)
-#define SW_GRFSHELL (SFX_INTERFACE_SW_START + 6)
-#define SW_OLESHELL (SFX_INTERFACE_SW_START + 7)
-#define SW_DRAWSHELL (SFX_INTERFACE_SW_START + 8)
-#define SW_DRWTXTSHELL (SFX_INTERFACE_SW_START + 9)
+#define SW_BASESHELL (SFX_INTERFACE_SW_START + 1)
+#define SW_TEXTSHELL (SFX_INTERFACE_SW_START + 2)
+#define SW_LISTSHELL (SFX_INTERFACE_SW_START + 3)
+#define SW_TABSHELL (SFX_INTERFACE_SW_START + 4)
+#define SW_FRAMESHELL (SFX_INTERFACE_SW_START + 5)
+#define SW_GRFSHELL (SFX_INTERFACE_SW_START + 6)
+#define SW_OLESHELL (SFX_INTERFACE_SW_START + 7)
+#define SW_DRAWSHELL (SFX_INTERFACE_SW_START + 8)
+#define SW_DRWTXTSHELL (SFX_INTERFACE_SW_START + 9)
-#define SW_INTERFACE_MODULE (SFX_INTERFACE_SW_START + 10)
-#define SW_DOCSHELL (SFX_INTERFACE_SW_START + 11)
-#define SW_VIEWSHELL (SFX_INTERFACE_SW_START + 12)
-#define SW_PAGEPREVIEW (SFX_INTERFACE_SW_START + 13)
-#define SW_GLOSDOCSHELL (SFX_INTERFACE_SW_START + 14)
-#define SW_SRC_VIEWSHELL (SFX_INTERFACE_SW_START + 15)
+#define SW_INTERFACE_MODULE (SFX_INTERFACE_SW_START + 10)
+#define SW_DOCSHELL (SFX_INTERFACE_SW_START + 11)
+#define SW_VIEWSHELL (SFX_INTERFACE_SW_START + 12)
+#define SW_PAGEPREVIEW (SFX_INTERFACE_SW_START + 13)
+#define SW_GLOSDOCSHELL (SFX_INTERFACE_SW_START + 14)
+#define SW_SRC_VIEWSHELL (SFX_INTERFACE_SW_START + 15)
-#define SW_BEZIERSHELL (SFX_INTERFACE_SW_START + 16)
-#define SW_DRAWBASESHELL (SFX_INTERFACE_SW_START + 17)
-#define SW_DRAWFORMSHELL (SFX_INTERFACE_SW_START + 18)
+#define SW_BEZIERSHELL (SFX_INTERFACE_SW_START + 16)
+#define SW_DRAWBASESHELL (SFX_INTERFACE_SW_START + 17)
+#define SW_DRAWFORMSHELL (SFX_INTERFACE_SW_START + 18)
-#define SW_WEBDOCSHELL (SFX_INTERFACE_SW_START + 19)
-#define SW_WEBVIEWSHELL (SFX_INTERFACE_SW_START + 20)
-#define SW_WEBBASESHELL (SFX_INTERFACE_SW_START + 21)
-#define SW_WEBTEXTSHELL (SFX_INTERFACE_SW_START + 22)
-#define SW_WEBFRAMESHELL (SFX_INTERFACE_SW_START + 23)
-#define SW_WEBGLOSDOCSHELL (SFX_INTERFACE_SW_START + 24)
-#define SW_WEBLISTSHELL (SFX_INTERFACE_SW_START + 25)
-#define SW_WEBTABSHELL (SFX_INTERFACE_SW_START + 26)
-#define SW_WEBGRFSHELL (SFX_INTERFACE_SW_START + 27)
-#define SW_WEBOLESHELL (SFX_INTERFACE_SW_START + 28)
-#define SW_WEBDRAWBASESHELL (SFX_INTERFACE_SW_START + 29)
-#define SW_WEBDRAWFORMSHELL (SFX_INTERFACE_SW_START + 30)
+#define SW_WEBDOCSHELL (SFX_INTERFACE_SW_START + 19)
+#define SW_WEBVIEWSHELL (SFX_INTERFACE_SW_START + 20)
+#define SW_WEBBASESHELL (SFX_INTERFACE_SW_START + 21)
+#define SW_WEBTEXTSHELL (SFX_INTERFACE_SW_START + 22)
+#define SW_WEBFRAMESHELL (SFX_INTERFACE_SW_START + 23)
+#define SW_WEBGLOSDOCSHELL (SFX_INTERFACE_SW_START + 24)
+#define SW_WEBLISTSHELL (SFX_INTERFACE_SW_START + 25)
+#define SW_WEBTABSHELL (SFX_INTERFACE_SW_START + 26)
+#define SW_WEBGRFSHELL (SFX_INTERFACE_SW_START + 27)
+#define SW_WEBOLESHELL (SFX_INTERFACE_SW_START + 28)
+#define SW_WEBDRAWBASESHELL (SFX_INTERFACE_SW_START + 29)
+#define SW_WEBDRAWFORMSHELL (SFX_INTERFACE_SW_START + 30)
-#define SW_MEDIASHELL (SFX_INTERFACE_SW_START + 31)
-#define SW_ANNOTATIONSHELL (SFX_INTERFACE_SW_START + 32)
+#define SW_MEDIASHELL (SFX_INTERFACE_SW_START + 31)
+#define SW_ANNOTATIONSHELL (SFX_INTERFACE_SW_START + 32)
#endif // _UIPARAM_HXX
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 125f7cadfb7d..c26e2834edc2 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -46,7 +46,7 @@
#include <tools/urlobj.hxx>
#include <swdllapi.h>
#include <swtypes.hxx>
-#include <docfac.hxx> // SwDocFac
+#include <docfac.hxx> // SwDocFac
#include <errhdl.hxx>
#include <iodetect.hxx>
@@ -158,7 +158,7 @@ public:
void ResetASCIIOpts() { aASCIIOpts.Reset(); }
SwgReaderOption()
- { ResetAllFmtsOnly(); aASCIIOpts.Reset(); }
+ { ResetAllFmtsOnly(); aASCIIOpts.Reset(); }
};
class SwReader: public SwDocFac
@@ -166,7 +166,7 @@ class SwReader: public SwDocFac
SvStream* pStrm;
SotStorageRef pStg;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
- SfxMedium* pMedium; // wer ein Medium haben will (W4W)
+ SfxMedium* pMedium; // wer ein Medium haben will (W4W)
SwPaM* pCrsr;
String aFileName;
@@ -176,7 +176,7 @@ public:
/*
* Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
* JP 25.04.95: oder falls es mitgegeben wird, in dieses.
- * Sonderfall fuer Load mit Sw3Reader
+ * Sonderfall fuer Load mit Sw3Reader
*/
//SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
//SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
@@ -213,8 +213,8 @@ protected:
/**************** SPEZIELLE Reader ************************/
// spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
-#define SW_STREAM_READER 1
-#define SW_STORAGE_READER 2
+#define SW_STREAM_READER 1
+#define SW_STORAGE_READER 2
class SW_DLLPUBLIC Reader
{
@@ -231,12 +231,12 @@ protected:
SvStream* pStrm;
SotStorageRef pStg;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
- SfxMedium* pMedium; // wer ein Medium haben will (W4W)
+ SfxMedium* pMedium; // wer ein Medium haben will (W4W)
SwgReaderOption aOpt;
BOOL bInsertMode : 1;
BOOL bTmplBrowseMode : 1;
- BOOL bReadUTF8: 1; // Stream als UTF-8 interpretieren
+ BOOL bReadUTF8: 1; // Stream als UTF-8 interpretieren
BOOL bBlockMode: 1;
BOOL bOrganizerMode : 1;
BOOL bHasAskTemplateName : 1;
@@ -354,7 +354,7 @@ class SW_DLLPUBLIC SwTextBlocks
// friend class Sw2TextBlocks;
// friend class Sw3IoImp;
SwImpBlocks* pImp;
- ULONG nErr;
+ ULONG nErr;
public:
SwTextBlocks( const String& );
@@ -363,7 +363,7 @@ public:
void Flush(){}
SwDoc* GetDoc();
- void ClearDoc(); // Doc-Inhalt loeschen
+ void ClearDoc(); // Doc-Inhalt loeschen
const String& GetName();
void SetName( const String& );
ULONG GetError() const { return nErr; }
@@ -372,32 +372,32 @@ public:
void SetBaseURL( const String& rURL );
BOOL IsOld() const;
- ULONG ConvertToNew(); // Textbausteine konvertieren
+ ULONG ConvertToNew(); // Textbausteine konvertieren
- USHORT GetCount() const; // Anzahl Textbausteine ermitteln
- USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln
- USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln
- const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck
- const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck
+ USHORT GetCount() const; // Anzahl Textbausteine ermitteln
+ USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln
+ USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln
+ const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck
+ const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck
- BOOL Delete( USHORT ); // Loeschen
+ BOOL Delete( USHORT ); // Loeschen
USHORT Rename( USHORT, const String*, const String* ); // Umbenennen
ULONG CopyBlock( SwTextBlocks& rSource, String& rSrcShort,
const String& rLong ); // Block kopieren
- BOOL BeginGetDoc( USHORT ); // Textbaustein einlesen
- void EndGetDoc(); // Textbaustein wieder loslassen
+ BOOL BeginGetDoc( USHORT ); // Textbaustein einlesen
+ void EndGetDoc(); // Textbaustein wieder loslassen
BOOL BeginPutDoc( const String&, const String& ); // Speichern Beginn
- USHORT PutDoc(); // Speichern Ende
+ USHORT PutDoc(); // Speichern Ende
USHORT PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text)
BOOL IsOnlyTextBlock( USHORT ) const;
BOOL IsOnlyTextBlock( const String& rShort ) const;
- const String& GetFileName() const; // Dateiname von pImp
- BOOL IsReadOnly() const; // ReadOnly-Flag von pImp
+ const String& GetFileName() const; // Dateiname von pImp
+ BOOL IsReadOnly() const; // ReadOnly-Flag von pImp
BOOL GetMacroTable( USHORT nIdx, SvxMacroTableDtor& rMacroTbl );
BOOL SetMacroTable( USHORT nIdx, const SvxMacroTableDtor& rMacroTbl );
@@ -449,7 +449,7 @@ class SW_DLLPUBLIC Writer
protected:
- SwPaM* pOrigPam; // der letze zu bearbeitende Pam
+ SwPaM* pOrigPam; // der letze zu bearbeitende Pam
const String* pOrigFileName;
void ResetWriter();
@@ -499,7 +499,7 @@ public:
void SetShowProgress( BOOL bFlag = FALSE ) { bShowProgress = bFlag; }
- const String* GetOrigFileName() const { return pOrigFileName; }
+ const String* GetOrigFileName() const { return pOrigFileName; }
const SwAsciiOptions& GetAsciiOptions() const { return aAscOpts; }
void SetAsciiOptions( const SwAsciiOptions& rOpt ) { aAscOpts = rOpt; }
@@ -538,7 +538,7 @@ public:
inline SvStream& OutHex( USHORT nHex, BYTE nLen = 2 ) { return OutHex( Strm(), nHex, nLen ); }
inline SvStream& OutHex4( USHORT nHex ) { return OutHex( Strm(), nHex, 4 ); }
inline SvStream& OutLong( long nVal ) { return OutLong( Strm(), nVal ); }
- inline SvStream& OutULong( ULONG nVal ) { return OutULong( Strm(), nVal ); }
+ inline SvStream& OutULong( ULONG nVal ) { return OutULong( Strm(), nVal ); }
void SetStream(SvStream *const pStream);
SvStream& Strm();
@@ -625,7 +625,7 @@ public:
SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE );
SwWriter( SfxMedium&, SwDoc & );
-// SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE );
+// SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE );
//const String& GetBaseURL() const { return sBaseURL;}
};
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 443ec8f800d3..d40f53fb0dff 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -2,7 +2,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
@@ -40,20 +40,20 @@
struct SW_DLLPUBLIC ShellResource : public Resource
{
- String aPostItAuthor;
- String aPostItPage;
- String aPostItLine;
+ String aPostItAuthor;
+ String aPostItPage;
+ String aPostItLine;
// Calc Fehlerstrings
- String aCalc_Syntax;
- String aCalc_ZeroDiv;
- String aCalc_Brack;
- String aCalc_Pow;
- String aCalc_VarNFnd;
- String aCalc_Overflow;
- String aCalc_WrongTime;
- String aCalc_Default;
- String aCalc_Error;
+ String aCalc_Syntax;
+ String aCalc_ZeroDiv;
+ String aCalc_Brack;
+ String aCalc_Pow;
+ String aCalc_VarNFnd;
+ String aCalc_Overflow;
+ String aCalc_WrongTime;
+ String aCalc_Default;
+ String aCalc_Error;
// fuers GetRefFeld - oben/unten
String aGetRefFld_Up;
@@ -63,16 +63,16 @@ struct SW_DLLPUBLIC ShellResource : public Resource
String aGetRefFld_RefItemNotFound;
// <--
// fuer dynamisches Menu - String "alle"
- String aStrAllPageHeadFoot;
+ String aStrAllPageHeadFoot;
// fuer einige Listboxen - String "keine"
- String aStrNone;
+ String aStrNone;
// fuer Felder, die Fixiert sind
- String aFixedStr;
+ String aFixedStr;
// custom fields of type css::util::Duration
String sDurationFormat;
//names of TOXs
- String aTOXIndexName;
+ String aTOXIndexName;
String aTOXUserName;
String aTOXContentName;
String aTOXIllustrationsName;
@@ -82,14 +82,14 @@ struct SW_DLLPUBLIC ShellResource : public Resource
String aHyperlinkClick;
- SvStringsDtor aDocInfoLst;
+ SvStringsDtor aDocInfoLst;
// Fly-Anker Bmps
-// Bitmap aAnchorBmp;
-// Bitmap aDragAnchorBmp;
+// Bitmap aAnchorBmp;
+// Bitmap aDragAnchorBmp;
// die AutoFormat-Redline-Kommentare
- inline const SvStringsDtor& GetAutoFmtNameLst() const;
+ inline const SvStringsDtor& GetAutoFmtNameLst() const;
// returns for the specific filter the new names of pagedescs
// This method is for the old code of the specific filters with
@@ -102,7 +102,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
private:
void _GetAutoFmtNameLst() const;
- SvStringsDtor *pAutoFmtNameLst;
+ SvStringsDtor *pAutoFmtNameLst;
String sPageDescFirstName;
String sPageDescFollowName;
String sPageDescName;
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 5355f9dccaaf..9e9a0a66eb96 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -2,7 +2,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
@@ -33,8 +33,8 @@
#include <tools/string.hxx>
#include "swdllapi.h"
-enum SwSortOrder { SRT_ASCENDING, SRT_DESCENDING };
-enum SwSortDirection { SRT_COLUMNS, SRT_ROWS };
+enum SwSortOrder { SRT_ASCENDING, SRT_DESCENDING };
+enum SwSortDirection { SRT_COLUMNS, SRT_ROWS };
/*--------------------------------------------------------------------
Beschreibung: SortierSchluessel
@@ -45,10 +45,10 @@ struct SW_DLLPUBLIC SwSortKey
SwSortKey( USHORT nId, const String& rSrtType, SwSortOrder eOrder );
SwSortKey( const SwSortKey& rOld );
- String sSortType;
- SwSortOrder eSortOrder;
- USHORT nColumnId;
- BOOL bIsNumeric;
+ String sSortType;
+ SwSortOrder eSortOrder;
+ USHORT nColumnId;
+ BOOL bIsNumeric;
};
SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3, 1)
@@ -59,14 +59,14 @@ struct SW_DLLPUBLIC SwSortOptions
~SwSortOptions();
SwSortOptions(const SwSortOptions& rOpt);
- SwSortKeys aKeys;
- SwSortDirection eDirection;
- sal_Unicode cDeli;
- USHORT nLanguage;
- BOOL bTable;
- BOOL bIgnoreCase;
+ SwSortKeys aKeys;
+ SwSortDirection eDirection;
+ sal_Unicode cDeli;
+ USHORT nLanguage;
+ BOOL bTable;
+ BOOL bIgnoreCase;
};
-#endif // _SORTOPT_HXX
+#endif // _SORTOPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index a2c370a8b12f..0b7f6b2de606 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -2,7 +2,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
@@ -108,17 +108,17 @@ struct SwConversionArgs : SwArgsBase
struct SwSpellArgs : SwArgsBase
{
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller;
+ ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller;
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt;
+ ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt;
bool bIsGrammarCheck;
SwSpellArgs(::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk,
SwTxtNode* pStart, SwIndex& rStart,
- SwTxtNode* pEnd, SwIndex& rEnd,
+ SwTxtNode* pEnd, SwIndex& rEnd,
bool bGrammar )
: SwArgsBase( pStart, rStart, pEnd, rEnd ),
xSpeller( rxSplChk ),
@@ -127,22 +127,22 @@ struct SwSpellArgs : SwArgsBase
};
/*************************************************************************
- * class SwInterHyphInfo
+ * class SwInterHyphInfo
*************************************************************************/
// Parameter-Klasse fuer Hyphenate
-// docedt.cxx: SwDoc::Hyphenate()
-// txtedt.cxx: SwTxtNode::Hyphenate()
+// docedt.cxx: SwDoc::Hyphenate()
+// txtedt.cxx: SwTxtNode::Hyphenate()
// txthyph.cxx: SwTxtFrm::Hyphenate()
class SwInterHyphInfo
{
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
- const Point aCrsrPos;
- sal_Bool bAuto : 1;
- sal_Bool bNoLang : 1;
- sal_Bool bCheck : 1;
+ ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
+ const Point aCrsrPos;
+ sal_Bool bAuto : 1;
+ sal_Bool bNoLang : 1;
+ sal_Bool bCheck : 1;
public:
xub_StrLen nStart;
xub_StrLen nLen;
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
index 0c611051ba01..84e58fa5820f 100644
--- a/sw/inc/statstr.hrc
+++ b/sw/inc/statstr.hrc
@@ -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
@@ -33,19 +33,19 @@
#define STR_STATSTR_W4WWRITE (RC_STATLIN_STR + 1)
#define STR_STATSTR_SWGREAD (RC_STATLIN_STR + 2)
#define STR_STATSTR_SWGWRITE (RC_STATLIN_STR + 3)
-#define STR_STATSTR_REFORMAT (RC_STATLIN_STR + 4)
-#define STR_STATSTR_AUTOFORMAT (RC_STATLIN_STR + 5)
+#define STR_STATSTR_REFORMAT (RC_STATLIN_STR + 4)
+#define STR_STATSTR_AUTOFORMAT (RC_STATLIN_STR + 5)
#define STR_STATSTR_IMPGRF (RC_STATLIN_STR + 6)
-#define STR_STATSTR_SEARCH (RC_STATLIN_STR + 7)
-#define STR_STATSTR_FORMAT (RC_STATLIN_STR + 8)
-#define STR_STATSTR_PRINT (RC_STATLIN_STR + 9)
-#define STR_STATSTR_LAYOUTINIT (RC_STATLIN_STR + 10)
-#define STR_STATSTR_LETTER (RC_STATLIN_STR + 11)
-#define STR_STATSTR_SPELL (RC_STATLIN_STR + 12)
-#define STR_STATSTR_HYPHEN (RC_STATLIN_STR + 13)
-#define STR_STATSTR_TOX_INSERT (RC_STATLIN_STR + 14)
-#define STR_STATSTR_TOX_UPDATE (RC_STATLIN_STR + 15)
-#define STR_STATSTR_SUMMARY (RC_STATLIN_STR + 16)
+#define STR_STATSTR_SEARCH (RC_STATLIN_STR + 7)
+#define STR_STATSTR_FORMAT (RC_STATLIN_STR + 8)
+#define STR_STATSTR_PRINT (RC_STATLIN_STR + 9)
+#define STR_STATSTR_LAYOUTINIT (RC_STATLIN_STR + 10)
+#define STR_STATSTR_LETTER (RC_STATLIN_STR + 11)
+#define STR_STATSTR_SPELL (RC_STATLIN_STR + 12)
+#define STR_STATSTR_HYPHEN (RC_STATLIN_STR + 13)
+#define STR_STATSTR_TOX_INSERT (RC_STATLIN_STR + 14)
+#define STR_STATSTR_TOX_UPDATE (RC_STATLIN_STR + 15)
+#define STR_STATSTR_SUMMARY (RC_STATLIN_STR + 16)
#define STR_STATSTR_SWGPRTOLENOTIFY (RC_STATLIN_STR + 17)
#endif
diff --git a/sw/inc/stringhash.hxx b/sw/inc/stringhash.hxx
index 27a3b26327bc..fcdc1d609423 100644
--- a/sw/inc/stringhash.hxx
+++ b/sw/inc/stringhash.hxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@ struct StringHash
{
size_t operator() ( const String *rString) const
{
- sal_Int32 h, nLen;
+ sal_Int32 h, nLen;
h = nLen = rString->Len();
const sal_Unicode *pStr = rString->GetBuffer();
@@ -95,11 +95,11 @@ struct StringHash
struct StringHashRef
{
- size_t operator () (const String &rStr) const
- {
+ size_t operator () (const String &rStr) const
+ {
StringHash aStrHash;
- return aStrHash(&rStr);
+ return aStrHash(&rStr);
}
};
#endif // _STRINGHASH_HXX
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 6573370ec6e8..57609db55b52 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -2,7 +2,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
@@ -99,16 +99,16 @@ namespace com{namespace sun{namespace star{
}
}}}
-typedef void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, const SwLabItem& rItem);
+typedef void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, const SwLabItem& rItem);
-typedef String (*GlossaryGetCurrGroup)();
-typedef void (*GlossarySetActGroup)(const String& rNewGroup);
+typedef String (*GlossaryGetCurrGroup)();
+typedef void (*GlossarySetActGroup)(const String& rNewGroup);
class AbstractGlossaryDlg : public VclAbstractDialog //add for SwGlossaryDlg
{
public:
- virtual String GetCurrGrpName() const = 0;
- virtual String GetCurrShortName() const = 0;
+ virtual String GetCurrGrpName() const = 0;
+ virtual String GetCurrShortName() const = 0;
};
class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg
@@ -133,15 +133,15 @@ public:
class AbstractInsertGrfRulerDlg : public VclAbstractDialog //add for SwInsertGrfRulerDlg
{
public:
- virtual String GetGraphicName() = 0;
- virtual BOOL IsSimpleLine() = 0;
- virtual BOOL HasImages() const = 0;
+ virtual String GetGraphicName() = 0;
+ virtual BOOL IsSimpleLine() = 0;
+ virtual BOOL HasImages() const = 0;
};
class AbstractInsTableDlg : public VclAbstractDialog //add for SwInsTableDlg
{
public:
- virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol,
+ virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol,
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt ) = 0;
};
@@ -159,7 +159,7 @@ public:
class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
{
public:
- virtual USHORT GetMergeType() = 0;
+ virtual USHORT GetMergeType() = 0;
virtual const ::rtl::OUString& GetSaveFilter() const = 0;
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0;
@@ -178,11 +178,11 @@ public:
class AbstractMultiTOXTabDialog : public VclAbstractDialog //add for SwMultiTOXTabDialog
{
public:
- virtual SwForm* GetForm(CurTOXType eType) = 0;
- virtual CurTOXType GetCurrentTOXType() const = 0;
- virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) = 0;
+ virtual SwForm* GetForm(CurTOXType eType) = 0;
+ virtual CurTOXType GetCurrentTOXType() const = 0;
+ virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) = 0;
//from SfxTabDialog
- virtual const SfxItemSet* GetOutputItemSet() const = 0;
+ virtual const SfxItemSet* GetOutputItemSet() const = 0;
};
class AbstractEditRegionDlg : public VclAbstractDialog //add for SwEditRegionDlg
@@ -205,8 +205,8 @@ public:
class AbstractSwInsertAbstractDlg : public VclAbstractDialog // add for SwInsertAbstractDlg
{
public:
- virtual BYTE GetLevel() const = 0;
- virtual BYTE GetPara() const = 0;
+ virtual BYTE GetLevel() const = 0;
+ virtual BYTE GetPara() const = 0;
};
class AbstractSwAsciiFilterDlg : public VclAbstractDialog // add for SwAsciiFilterDlg
@@ -225,7 +225,7 @@ public:
};
-class AbstractSplitTableDialog : public VclAbstractDialog // add for
+class AbstractSplitTableDialog : public VclAbstractDialog // add for
{
public:
virtual sal_uInt16 GetSplitMode() = 0;
@@ -266,9 +266,9 @@ public:
class AbstarctSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossaryDlg
{
public:
- virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline
- virtual USHORT GetSelectedIdx() const = 0; // inline
- virtual void SelectEntryPos(USHORT nIdx) = 0; // inline
+ virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline
+ virtual USHORT GetSelectedIdx() const = 0; // inline
+ virtual void SelectEntryPos(USHORT nIdx) = 0; // inline
};
class AbstractSwSplitTableDlg :public VclAbstractDialog //add for SwSplitTableDlg
@@ -288,18 +288,18 @@ public:
class AbstractSwFldDlg : public SfxAbstractTabDialog //add for SwFldDlg
{
public:
- virtual void Start( BOOL bShow = TRUE ) = 0; //this method from sfxtabdialog
- virtual void Initialize(SfxChildWinInfo *pInfo) = 0;
- virtual void ReInitDlg() = 0;
+ virtual void Start( BOOL bShow = TRUE ) = 0; //this method from sfxtabdialog
+ virtual void Initialize(SfxChildWinInfo *pInfo) = 0;
+ virtual void ReInitDlg() = 0;
virtual void ActivateDatabasePage() = 0;
- virtual void ShowPage( USHORT nId ) = 0;// this method from SfxTabDialog
- virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
+ virtual void ShowPage( USHORT nId ) = 0;// this method from SfxTabDialog
+ virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
};
class AbstractSwRenameXNamedDlg : public VclAbstractDialog //add for SwRenameXNamedDlg
{
public:
- virtual void SetForbiddenChars( const String& rSet ) = 0;
+ virtual void SetForbiddenChars( const String& rSet ) = 0;
virtual void SetAlternativeAccess(
STAR_REFERENCE( container::XNameAccess ) & xSecond,
STAR_REFERENCE( container::XNameAccess ) & xThird ) = 0;
@@ -308,14 +308,14 @@ public:
class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg
{
public:
- virtual void AcceptAll( BOOL bAccept ) = 0;
+ virtual void AcceptAll( BOOL bAccept ) = 0;
};
class AbstractMarkFloatDlg : public VclAbstractDialog //add for SwIndexMarkFloatDlg & SwAuthMarkFloatDlg
{
public:
virtual void ReInitDlg(SwWrtShell& rWrtShell) = 0;
- virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
+ virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer
};
#define RET_LOAD_DOC 100
@@ -341,9 +341,9 @@ public:
class SwAbstractDialogFactory
{
public:
- static SwAbstractDialogFactory* Create();
+ static SwAbstractDialogFactory* Create();
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
@@ -354,8 +354,8 @@ public:
SvStream* pStream, int nResId ) = 0;// add for SwAsciiFilterDlg
virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg
- virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent, SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg
- virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ) = 0; //add for SwChangeDBDlg
+ virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent, SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg
+ virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ) = 0; //add for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg
const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE) = 0;
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView , int nResId, bool bToTable) = 0; //add for SwConvertTableDlg
@@ -388,7 +388,7 @@ public:
virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ) = 0; //add for SwSelGlossaryDlg
- virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0; //add for SwTableHeightDlg SwSortDlg
+ virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0; //add for SwTableHeightDlg SwSortDlg
virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0; //add for SwSplitTblDlg
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
@@ -403,7 +403,7 @@ public:
const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) = 0; //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
+ virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
STAR_REFERENCE( container::XNamed ) & xNamed,
STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0;
@@ -413,86 +413,86 @@ public:
virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bNewFrm = TRUE,
- USHORT nResType = DLG_FRM_STD,
- BOOL bFmt = FALSE,
- UINT16 nDefPage = 0,
- const String* pFmtStr = 0) = 0; //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ BOOL bNewFrm = TRUE,
+ USHORT nResType = DLG_FRM_STD,
+ BOOL bFmt = FALSE,
+ UINT16 nDefPage = 0,
+ const String* pFmtStr = 0) = 0; //add for SwFrmDlg
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
USHORT nRegion,
- BOOL bColumn = FALSE,
- SwWrtShell* pActShell = 0,
- BOOL bNew = FALSE ) = 0; //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ BOOL bColumn = FALSE,
+ SwWrtShell* pActShell = 0,
+ BOOL bNew = FALSE ) = 0; //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
- virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
+ virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
Window *pParent, SwWrtShell &rSh,
SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
- virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
+ virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Window * pParent ) = 0; //add for SwInsertGrfRulerDlg
- virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId,
+ virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId,
SwView& rView ) = 0; //add for SwInsTableDlg
- virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
+ virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ) = 0; //add for SwJavaEditDialog
- virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
+ virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell& rSh,
const String& rSourceName,
const String& rTblName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; //add for SwMailMergeDlg
- virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId,
+ virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId,
Window* pParent ) = 0; //add for SwMailMergeCreateFromDlg
- virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId,
+ virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId,
Window* pParent ) = 0; //add for SwMailMergeFieldConnectionsDlg
- virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
+ virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
Window* pParent, SwTOXMgr &rTOXMgr ) = 0; //add for SwMultiTOXMarkDlg
- virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
+ virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
SwWrtShell &) = 0; //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
- virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId,
+ virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX,
BOOL bGlobal = FALSE) = 0; //add for SwMultiTOXTabDialog
- virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId,
+ virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId,
Window* pParent, SwWrtShell& rWrtSh ) = 0; //add for SwEditRegionDlg
- virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId,
+ virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh ) = 0; //add for SwInsertSectionTabDialog
- virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True) = 0; //add for SwIndexMarkFloatDlg
- virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True) = 0; //add for SwAuthMarkFloatDlg
- virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId,
+ virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId,
Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) = 0; //add for SwIndexMarkModalDlg
virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0;
//add for static func in SwGlossaryDlg
- virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ) = 0;
- virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ) = 0;
+ virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ) = 0;
+ virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ) = 0;
// for tabpage
- virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0;
- virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0;
+ virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0;
+ virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0;
};
#endif
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index a3b29bfc39e6..9e0f287f8d3b 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -2,7 +2,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
@@ -38,13 +38,13 @@ class SwAutoCorrect : public SvxAutoCorrect
using SvxAutoCorrect::PutText;
protected:
- // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
- // koennen aus der Wortliste herausgeholt werden!)
- // rShort ist der Stream-Name - gecryptet!
+ // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
+ // koennen aus der Wortliste herausgeholt werden!)
+ // rShort ist der Stream-Name - gecryptet!
virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& , const String& rFileName, const String& rShort, String& rLong );
-
- // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
- // rShort ist der Stream-Name - gecryptet!
+
+ // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
+ // rShort ist der Stream-Name - gecryptet!
virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFileName, const String& rShort, SfxObjectShell& ,
String& );
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index abad91650b66..db67948986d0 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,7 +2,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
@@ -145,7 +145,7 @@ class SwTblBoxValue;
class SwAttrPool : public SfxItemPool
{
- friend void _InitCore(); // fuers anlegen/zerstoeren der
+ friend void _InitCore(); // fuers anlegen/zerstoeren der
friend void _FinitCore(); // Versionsmaps
static USHORT* pVersionMap1;
static USHORT* pVersionMap2;
@@ -164,8 +164,8 @@ protected:
virtual ~SwAttrPool();
public:
- SwDoc* GetDoc() { return pDoc; }
- const SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() { return pDoc; }
+ const SwDoc* GetDoc() const { return pDoc; }
static USHORT* GetVersionMap1() { return pVersionMap1; }
static USHORT* GetVersionMap2() { return pVersionMap2; }
@@ -201,9 +201,9 @@ public:
int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew );
void GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const;
+ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const;
- SwAttrPool* GetPool() const { return (SwAttrPool*)SfxItemSet::GetPool(); }
+ SwAttrPool* GetPool() const { return (SwAttrPool*)SfxItemSet::GetPool(); }
// kopiere die Attribute ggfs. ueber Dokumentgrenzen
void CopyToModify( SwModify& rMod ) const;
@@ -211,8 +211,8 @@ public:
// ----------------------------------------------------------------
// Sonderbehandlung fuer einige Attribute
// Setze den Modify-Pointer (alten pDefinedIn) bei folgenden Attributen:
- // - SwFmtDropCaps
- // - SwFmtPageDesc
+ // - SwFmtDropCaps
+ // - SwFmtPageDesc
// (Wird beim Einfuegen in Formate/Nodes gerufen)
// Second version is for the SwAttrSet handles of SwCntntNode.
bool SetModifyAtAttr( const SwModify* pModify );
@@ -220,12 +220,12 @@ public:
// Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
// im Zugriff.
const SwDoc *GetDoc() const { return GetPool()->GetDoc(); }
- SwDoc *GetDoc() { return GetPool()->GetDoc(); }
+ SwDoc *GetDoc() { return GetPool()->GetDoc(); }
// GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in
- // den Parents gesucht werden soll. Wird nichts gefunden,
- // wird das deflt. Attribut returnt.
- // Charakter-Attribute - impl. steht im charatr.hxx
+ // den Parents gesucht werden soll. Wird nichts gefunden,
+ // wird das deflt. Attribut returnt.
+ // Charakter-Attribute - impl. steht im charatr.hxx
// AMA 12.10.94: Umstellung von SwFmt... auf Svx...
inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const;
inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const;
@@ -266,7 +266,7 @@ public:
inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const;
inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const;
- // Frame-Attribute - impl. steht im frmatr.hxx
+ // Frame-Attribute - impl. steht im frmatr.hxx
inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const;
inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const;
inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const;
@@ -307,7 +307,7 @@ public:
// OD 2004-05-05 #i28701#
inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
- // Grafik-Attribute - impl. steht im grfatr.hxx
+ // Grafik-Attribute - impl. steht im grfatr.hxx
inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const;
inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const;
inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const;
@@ -321,7 +321,7 @@ public:
inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const;
inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const;
- // Paragraph-Attribute - impl. steht im paratr.hxx
+ // Paragraph-Attribute - impl. steht im paratr.hxx
inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const;
inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const;
inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const;
@@ -339,7 +339,7 @@ public:
inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const;
inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
- // TabellenBox-Attribute - impl. steht im cellatr.hxx
+ // TabellenBox-Attribute - impl. steht im cellatr.hxx
inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const;
inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const;
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index b3d5258863ee..de76532d2703 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -2,7 +2,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
@@ -80,15 +80,15 @@ public:
BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
// nur fuer Grafik-Links ( zum Umschalten zwischen DDE / Grf-Link)
- void SetObjType( USHORT nType ) { SvBaseLink::SetObjType( nType ); }
+ void SetObjType( USHORT nType ) { SvBaseLink::SetObjType( nType ); }
BOOL IsRecursion( const SwBaseLink* pChkLnk ) const;
virtual BOOL IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt = 0,
xub_StrLen nEnd = STRING_NOTFOUND ) const;
- void SetNoDataFlag() { bNoDataFlag = TRUE; }
- BOOL ChkNoDataFlag() { BOOL bRet = bNoDataFlag; bNoDataFlag = FALSE; return bRet; }
- BOOL IsNoDataFlag() const { return bNoDataFlag; }
+ void SetNoDataFlag() { bNoDataFlag = TRUE; }
+ BOOL ChkNoDataFlag() { BOOL bRet = bNoDataFlag; bNoDataFlag = FALSE; return bRet; }
+ BOOL IsNoDataFlag() const { return bNoDataFlag; }
};
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index d6df4e36f512..f24e8fe07e65 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index 130f74125e3e..c4aa873af56d 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -2,7 +2,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
@@ -49,9 +49,9 @@ class SwOleClient : public SfxInPlaceClient
public:
SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& );
- void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; }
+ void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; }
- BOOL IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; }
+ BOOL IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; }
};
#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 14878734d615..feea603d0a82 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -2,7 +2,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
@@ -44,9 +44,9 @@ namespace com { namespace sun { namespace star { namespace util {
// ein Basis-Struktur fuer die Parameter der Find-Methoden
// return - Werte vom Found-Aufruf.
-const int FIND_NOT_FOUND = 0;
-const int FIND_FOUND = 1;
-const int FIND_NO_RING = 2;
+const int FIND_NOT_FOUND = 0;
+const int FIND_FOUND = 1;
+const int FIND_NO_RING = 2;
struct SwFindParas
{
@@ -113,7 +113,7 @@ public:
SwPaM* ) const;
- ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
+ ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
BOOL bSearchInNotes,
SwDocPositions nStart, SwDocPositions nEnde,
BOOL& bCancel,
@@ -180,7 +180,7 @@ public:
BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden )
{ return LeftRight( FALSE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); }
BOOL GoNextCell( USHORT nCnt = 1 ) { return GoPrevNextCell( TRUE, nCnt ); }
- BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); }
+ BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); }
virtual BOOL GotoTable( const String& rName );
BOOL GotoTblBox( const String& rName );
BOOL GotoRegion( const String& rName );
@@ -207,7 +207,7 @@ public:
BOOL bChgCrsr = TRUE );
BOOL IsNoCntnt() const;
- void RestoreSavePos(); // Point auf die SavePos setzen
+ void RestoreSavePos(); // Point auf die SavePos setzen
// TRUE: an die Position kann der Cursor gesetzt werden
virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
@@ -265,7 +265,7 @@ protected:
xub_StrLen nTblPtCnt, nTblMkCnt;
SwSelBoxes aSelBoxes;
BOOL bChg : 1;
- BOOL bParked : 1; // Tabellen-Cursor wurde geparkt
+ BOOL bParked : 1; // Tabellen-Cursor wurde geparkt
virtual bool IsSelOvrCheck(int eFlags);
@@ -294,7 +294,7 @@ public:
// wurde der TabelleCursor veraendert ?
BOOL IsCrsrMoved() const
{
- return nTblMkNd != GetMark()->nNode.GetIndex() ||
+ return nTblMkNd != GetMark()->nNode.GetIndex() ||
nTblPtNd != GetPoint()->nNode.GetIndex() ||
nTblMkCnt != GetMark()->nContent.GetIndex() ||
nTblPtCnt != GetPoint()->nContent.GetIndex();
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 5b270b76837b..e9ff9f420929 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -2,7 +2,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
@@ -34,8 +34,8 @@
// contains the description of a data source
struct SwDBData
{
- ::rtl::OUString sDataSource;
- ::rtl::OUString sCommand; //table, query or statement
+ ::rtl::OUString sDataSource;
+ ::rtl::OUString sCommand; //table, query or statement
sal_Int32 nCommandType; //com::sun::star::sdb::CommandType
SwDBData() :
nCommandType(0){}
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index ee4d59651f9f..f2e436984c35 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@ -2,7 +2,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
@@ -39,14 +39,14 @@
class SW_DLLPUBLIC SwDbtoolsClient
{
private:
- ::rtl::Reference< ::connectivity::simple::IDataAccessTools > m_xDataAccessTools;
- ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > m_xAccessTypeConversion;
- ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
+ ::rtl::Reference< ::connectivity::simple::IDataAccessTools > m_xDataAccessTools;
+ ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > m_xAccessTypeConversion;
+ ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
SW_DLLPRIVATE static void registerClient();
SW_DLLPRIVATE static void revokeClient();
SW_DLLPRIVATE void getFactory();
-
+
SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTools > getDataAccessTools();
SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > getAccessTypeConversion();
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 6d1a11ec0044..1b2e7f804088 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ public:
TYPEINFO();
// Constructor movet alle Lines/Boxen aus der SwTable zu sich.
// Die SwTable ist danach Leer und muss geloescht werden.
- SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
+ SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
BOOL bUpdate = TRUE );
~SwDDETable();
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index a6b06c5ed50c..39e5b2d2ab0a 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ class StatusBar;
class SwDLL
-/* [Description]
+/* [Description]
This class is a wrapper for a Load-On-Demand-DLL. One instance
per SfxApplication will be created for the runtime of
@@ -58,8 +58,8 @@ public:
SwDLL();
~SwDLL();
- static void Init(); // called directly after loading the DLL
- static void Exit(); // called directly befor unloading the DLL
+ static void Init(); // called directly after loading the DLL
+ static void Exit(); // called directly befor unloading the DLL
};
//-------------------------------------------------------------------------
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index 81a1309c91fb..cb11a5162a91 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -2,7 +2,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
@@ -31,49 +31,49 @@
#include <tools/errcode.hxx>
-#define ERROR_SW_BASE (ERRCODE_AREA_SW)
-#define ERROR_SW_READ_BASE (ERROR_SW_BASE | ERRCODE_CLASS_READ)
-#define ERROR_SW_WRITE_BASE (ERROR_SW_BASE | ERRCODE_CLASS_WRITE)
+#define ERROR_SW_BASE (ERRCODE_AREA_SW)
+#define ERROR_SW_READ_BASE (ERROR_SW_BASE | ERRCODE_CLASS_READ)
+#define ERROR_SW_WRITE_BASE (ERROR_SW_BASE | ERRCODE_CLASS_WRITE)
-#define WARN_SW_BASE (ERRCODE_AREA_SW | ERRCODE_WARNING_MASK)
-#define WARN_SW_READ_BASE (WARN_SW_BASE | ERRCODE_CLASS_READ )
-#define WARN_SW_WRITE_BASE (WARN_SW_BASE | ERRCODE_CLASS_WRITE )
+#define WARN_SW_BASE (ERRCODE_AREA_SW | ERRCODE_WARNING_MASK)
+#define WARN_SW_READ_BASE (WARN_SW_BASE | ERRCODE_CLASS_READ )
+#define WARN_SW_WRITE_BASE (WARN_SW_BASE | ERRCODE_CLASS_WRITE )
// Import Fehler
#define ERR_SWG_FILE_FORMAT_ERROR (ERROR_SW_READ_BASE | 1 )
#define ERR_SWG_READ_ERROR (ERROR_SW_READ_BASE | 2 )
-#define ERR_SW6_INPUT_FILE (ERROR_SW_READ_BASE | 4 )
-#define ERR_SW6_NOWRITER_FILE (ERROR_SW_READ_BASE | 5 )
-#define ERR_SW6_UNEXPECTED_EOF (ERROR_SW_READ_BASE | 6 )
-#define ERR_SW6_PASSWD (ERROR_SW_READ_BASE | 7 )
+#define ERR_SW6_INPUT_FILE (ERROR_SW_READ_BASE | 4 )
+#define ERR_SW6_NOWRITER_FILE (ERROR_SW_READ_BASE | 5 )
+#define ERR_SW6_UNEXPECTED_EOF (ERROR_SW_READ_BASE | 6 )
+#define ERR_SW6_PASSWD (ERROR_SW_READ_BASE | 7 )
-#define ERR_WW6_NO_WW6_FILE_ERR (ERROR_SW_READ_BASE | 8 )
+#define ERR_WW6_NO_WW6_FILE_ERR (ERROR_SW_READ_BASE | 8 )
#define ERR_WW6_FASTSAVE_ERR (ERROR_SW_READ_BASE | 9 )
#define ERR_FORMAT_ROWCOL (ERROR_SW_READ_BASE | 12)
-#define ERR_SWG_NEW_VERSION (ERROR_SW_READ_BASE | 13)
-#define ERR_WW8_NO_WW8_FILE_ERR (ERROR_SW_READ_BASE | 14)
+#define ERR_SWG_NEW_VERSION (ERROR_SW_READ_BASE | 13)
+#define ERR_WW8_NO_WW8_FILE_ERR (ERROR_SW_READ_BASE | 14)
#define ERR_FORMAT_FILE_ROWCOL (ERROR_SW_READ_BASE | 15)
// Export Fehler
#define ERR_SWG_WRITE_ERROR (ERROR_SW_WRITE_BASE | 30 )
#define ERR_SWG_OLD_GLOSSARY (ERROR_SW_WRITE_BASE | 31 )
-#define ERR_WRITE_ERROR_FILE (ERROR_SW_WRITE_BASE | 35 )
+#define ERR_WRITE_ERROR_FILE (ERROR_SW_WRITE_BASE | 35 )
// Import/Export Fehler
#define ERR_SWG_INTERNAL_ERROR (ERROR_SW_BASE | 50 )
-#define ERR_TXTBLOCK_NEWFILE_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_LOCKING | 55 )
+#define ERR_TXTBLOCK_NEWFILE_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_LOCKING | 55 )
// weitere Fehler und Fehlerklassen
-#define ERR_AUTOPATH_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_PATH | 55 )
-#define ERR_TBLSPLIT_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 56 )
-#define ERR_TBLINSCOL_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 57 )
-#define ERR_TBLDDECHG_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 58 )
+#define ERR_AUTOPATH_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_PATH | 55 )
+#define ERR_TBLSPLIT_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 56 )
+#define ERR_TBLINSCOL_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 57 )
+#define ERR_TBLDDECHG_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 58 )
// ----- Warnings ---------------------------
@@ -85,11 +85,11 @@
// Import & Export - Warnings
#define WARN_SWG_FEATURES_LOST (WARN_SW_BASE | 72 )
#define WARN_SWG_OLE (WARN_SW_BASE | 73 )
-#define WARN_SWG_POOR_LOAD (WARN_SW_BASE | 74 )
+#define WARN_SWG_POOR_LOAD (WARN_SW_BASE | 74 )
// Export warnings
-#define WARN_SWG_HTML_NO_MACROS (WARN_SW_WRITE_BASE |75)
-#define WARN_WRITE_ERROR_FILE (WARN_SW_WRITE_BASE |76)
+#define WARN_SWG_HTML_NO_MACROS (WARN_SW_WRITE_BASE |75)
+#define WARN_WRITE_ERROR_FILE (WARN_SW_WRITE_BASE |76)
// More Import & Export - Warnings
#define WARN_FORMAT_FILE_ROWCOL (WARN_SW_READ_BASE | 77)
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 8d8f69309e67..98f24e51ab8b 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -2,7 +2,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
@@ -40,11 +40,11 @@
#define SW_EVENT_FRM_KEYINPUT_NOALPHA ( EVENT_APP_START + 5 )
#define SW_EVENT_FRM_RESIZE ( EVENT_APP_START + 6 )
#define SW_EVENT_FRM_MOVE ( EVENT_APP_START + 7 )
-#define SW_EVENT_PAGE_COUNT ( EVENT_APP_START + 8 )
-#define SW_EVENT_MAIL_MERGE_END ( EVENT_APP_START + 9 )
+#define SW_EVENT_PAGE_COUNT ( EVENT_APP_START + 8 )
+#define SW_EVENT_MAIL_MERGE_END ( EVENT_APP_START + 9 )
#define SW_EVENT_FIELD_MERGE ( EVENT_APP_START + 10 )
#define SW_EVENT_FIELD_MERGE_FINISHED ( EVENT_APP_START + 11 )
-#define SW_EVENT_LAYOUT_FINISHED ( EVENT_APP_START + 12 )
+#define SW_EVENT_LAYOUT_FINISHED ( EVENT_APP_START + 12 )
#define STR_SW_EVENT_PAGE_COUNT 0
#define STR_SW_EVENT_MAIL_MERGE 1
@@ -67,7 +67,7 @@ class IMapObject;
// enum fuer Objecte die Events ins Basic oder in JavaScript Callen
enum SwCallEventObjectType
{
- EVENT_OBJECT_NONE = 0, // Null ist garnichts
+ EVENT_OBJECT_NONE = 0, // Null ist garnichts
EVENT_OBJECT_IMAGE,
EVENT_OBJECT_INETATTR,
EVENT_OBJECT_URLITEM,
@@ -115,7 +115,7 @@ struct SwCallMouseEvent
PTR.IMAP.pIMapObj == rEvent.PTR.IMAP.pIMapObj;
}
int operator!=( const SwCallMouseEvent& rEvent ) const
- { return !( *this == rEvent ); }
+ { return !( *this == rEvent ); }
void Clear()
{ eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 8049260f4a02..d9f35def68e0 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/swgstr.hxx b/sw/inc/swgstr.hxx
index 9191e121e0f7..89c17fa6d0a2 100644
--- a/sw/inc/swgstr.hxx
+++ b/sw/inc/swgstr.hxx
@@ -2,7 +2,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
@@ -30,10 +30,10 @@
#include <tools/stream.hxx>
-typedef long long3; // Zur Dokumentation: 3-byte-Longs
+typedef long long3; // Zur Dokumentation: 3-byte-Longs
-#define MAX_BEGIN 64 // Maximale Blockschachtelung
-#define PASSWDLEN 16 // Maximale Passwortlaenge
+#define MAX_BEGIN 64 // Maximale Blockschachtelung
+#define PASSWDLEN 16 // Maximale Passwortlaenge
// Neue Version mit SvStreams
@@ -41,13 +41,13 @@ typedef long long3; // Zur Dokumentation: 3-byte-Longs
class swcrypter {
protected:
- sal_Char cPasswd[ PASSWDLEN ]; // Passwort-Puffer
- BOOL bPasswd; // TRUE wenn mit Passwort
- void encode( sal_Char*, USHORT ); // Puffer codieren/decodieren
+ sal_Char cPasswd[ PASSWDLEN ]; // Passwort-Puffer
+ BOOL bPasswd; // TRUE wenn mit Passwort
+ void encode( sal_Char*, USHORT ); // Puffer codieren/decodieren
public:
swcrypter();
- BOOL setpasswd( const String& ); // Passwort setzen
- void copypasswd( const sal_Char* ); // Passwort direkt setzen
+ BOOL setpasswd( const String& ); // Passwort setzen
+ void copypasswd( const sal_Char* ); // Passwort direkt setzen
const sal_Char* getpasswd() { return cPasswd; }
};
@@ -56,12 +56,12 @@ public:
class swstreambase : public swcrypter {
protected:
- SvStream* pStrm; // eigentlicher Stream
- sal_Char* pBuf; // Zwischenpuffer
- USHORT nBuflen; // Laenge des Zwischenpuffers
- short nLong; // Long-Laenge (3 oder 4)
- BOOL bTempStrm; // TRUE: Stream loeschen
- void checkbuf( USHORT ); // Testen der Pufferlaenge
+ SvStream* pStrm; // eigentlicher Stream
+ sal_Char* pBuf; // Zwischenpuffer
+ USHORT nBuflen; // Laenge des Zwischenpuffers
+ short nLong; // Long-Laenge (3 oder 4)
+ BOOL bTempStrm; // TRUE: Stream loeschen
+ void checkbuf( USHORT ); // Testen der Pufferlaenge
swstreambase( SvStream& );
@@ -69,19 +69,19 @@ protected:
int operator=( const swstreambase& );
public:
~swstreambase();
- SvStream& Strm() { return *pStrm; }
- void clear(); // Puffer loeschen
+ SvStream& Strm() { return *pStrm; }
+ void clear(); // Puffer loeschen
// Zusatzfunktionen zur I/O von LONGs als 3-Byte-Zahlen
- void long3() { nLong = 3; }
- void long4() { nLong = 4; }
+ void long3() { nLong = 3; }
+ void long4() { nLong = 4; }
// Alias- und Hilfsfunktionen
- void seek( long nPos ) { pStrm->Seek( nPos ); }
- long tell() { return pStrm->Tell(); }
- long filesize(); // Dateigroesse
+ void seek( long nPos ) { pStrm->Seek( nPos ); }
+ long tell() { return pStrm->Tell(); }
+ long filesize(); // Dateigroesse
void setbad();
int good() { return ( pStrm->GetError() == SVSTREAM_OK ); }
@@ -89,7 +89,7 @@ public:
int eof() { return pStrm->IsEof(); }
BYTE get();
- void get( void* p, USHORT n ) { pStrm->Read( (sal_Char*) p, n ); }
+ void get( void* p, USHORT n ) { pStrm->Read( (sal_Char*) p, n ); }
inline swstreambase& operator>>( sal_Char& );
inline swstreambase& operator>>( BYTE& );
@@ -125,20 +125,20 @@ inline swstreambase& swstreambase::operator>>( ULONG& c )
}
class swistream : public swstreambase {
- BYTE cType; // Record-Typ
- ULONG nOffset; // Record-Offset-Portion
+ BYTE cType; // Record-Typ
+ ULONG nOffset; // Record-Offset-Portion
public:
swistream( SvStream& );
- BYTE peek(); // 1 Byte testen
- BYTE next(); // Blockstart
- BYTE cur() { return cType; } // aktueller Block
- BYTE skipnext(); // Record ueberspringen
- void undonext(); // next() rueckgaengig machen
- long getskip() { return nOffset; }
- void skip( long = -1L ); // Block ueberspringen
- sal_Char* text(); // Textstring lesen (nach BEGIN)
- long size(); // aktuelle Record-Laenge
+ BYTE peek(); // 1 Byte testen
+ BYTE next(); // Blockstart
+ BYTE cur() { return cType; } // aktueller Block
+ BYTE skipnext(); // Record ueberspringen
+ void undonext(); // next() rueckgaengig machen
+ long getskip() { return nOffset; }
+ void skip( long = -1L ); // Block ueberspringen
+ sal_Char* text(); // Textstring lesen (nach BEGIN)
+ long size(); // aktuelle Record-Laenge
private:
swistream( const swistream& );
diff --git a/sw/inc/swhints.hxx b/sw/inc/swhints.hxx
index 47dda0d67fd1..b97a7941fcc0 100644
--- a/sw/inc/swhints.hxx
+++ b/sw/inc/swhints.hxx
@@ -2,7 +2,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
@@ -30,8 +30,8 @@
#include <svl/smplhint.hxx>
-#define SW_BROADCASTID_START SFX_HINT_USER00
-#define SW_BROADCAST_DRAWVIEWS_CREATED SW_BROADCASTID_START
+#define SW_BROADCASTID_START SFX_HINT_USER00
+#define SW_BROADCAST_DRAWVIEWS_CREATED SW_BROADCASTID_START
#endif
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 420a9d2d9aa5..38f3c3a35962 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -2,7 +2,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
@@ -67,10 +67,10 @@ class SvtUserOptions;
class SvtUndoOptions;
struct SwDBData;
-#define VIEWOPT_DEST_VIEW 0
-#define VIEWOPT_DEST_TEXT 1
-#define VIEWOPT_DEST_WEB 2
-#define VIEWOPT_DEST_VIEW_ONLY 3 //ViewOptions werden nur an der ::com::sun::star::sdbcx::View, nicht an der Appl. gesetzt
+#define VIEWOPT_DEST_VIEW 0
+#define VIEWOPT_DEST_TEXT 1
+#define VIEWOPT_DEST_WEB 2
+#define VIEWOPT_DEST_VIEW_ONLY 3 //ViewOptions werden nur an der ::com::sun::star::sdbcx::View, nicht an der Appl. gesetzt
namespace com{ namespace sun{ namespace star{ namespace scanner{
class XScannerManager;
@@ -78,59 +78,59 @@ namespace com{ namespace sun{ namespace star{ namespace scanner{
class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::ConfigurationListener
{
- String sActAuthor;
+ String sActAuthor;
// ConfigItems
SwModuleOptions* pModuleConfig;
- SwMasterUsrPref* pUsrPref;
- SwMasterUsrPref* pWebUsrPref;
- SwPrintOptions* pPrtOpt;
- SwPrintOptions* pWebPrtOpt;
- SwChapterNumRules* pChapterNumRules;
- SwStdFontConfig* pStdFontConfig;
- SwNavigationConfig* pNavigationConfig;
- SwToolbarConfigItem*pToolbarConfig; //fuer gestackte Toolbars, welche
- SwToolbarConfigItem*pWebToolbarConfig; //war sichtbar?
- SwDBConfig* pDBConfig;
+ SwMasterUsrPref* pUsrPref;
+ SwMasterUsrPref* pWebUsrPref;
+ SwPrintOptions* pPrtOpt;
+ SwPrintOptions* pWebPrtOpt;
+ SwChapterNumRules* pChapterNumRules;
+ SwStdFontConfig* pStdFontConfig;
+ SwNavigationConfig* pNavigationConfig;
+ SwToolbarConfigItem*pToolbarConfig; //fuer gestackte Toolbars, welche
+ SwToolbarConfigItem*pWebToolbarConfig; //war sichtbar?
+ SwDBConfig* pDBConfig;
svtools::ColorConfig* pColorConfig;
SvtAccessibilityOptions* pAccessibilityOptions;
SvtCTLOptions* pCTLOptions;
SvtUserOptions* pUserOptions;
SvtUndoOptions* pUndoOptions;
- SfxErrorHandler* pErrorHdl;
+ SfxErrorHandler* pErrorHdl;
- SwAttrPool *pAttrPool;
+ SwAttrPool *pAttrPool;
// Die aktuelle View wird hier gehalten um nicht ueber
// GetActiveView arbeiten zu muessen
// Die View ist solange gueltig bis Sie im Activate
// zerstoert oder ausgetauscht wird
- SwView* pView;
+ SwView* pView;
// Liste aller Redline-Autoren
- SvStringsDtor* pAuthorNames;
+ SvStringsDtor* pAuthorNames;
// DictionaryList listener to trigger spellchecking or hyphenation
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener > xLngSvcEvtListener;
::com::sun::star::uno::Reference<
- ::com::sun::star::scanner::XScannerManager > m_xScannerManager;
+ ::com::sun::star::scanner::XScannerManager > m_xScannerManager;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser;
- sal_Bool bAuthorInitialised : 1;
- sal_Bool bEmbeddedLoadSave : 1;
+ sal_Bool bAuthorInitialised : 1;
+ sal_Bool bEmbeddedLoadSave : 1;
// Hint abfangen fuer DocInfo
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
protected:
// Briefumschlaege, Etiketten
void InsertEnv(SfxRequest&);
- void InsertLab(SfxRequest&, sal_Bool bLabel);
+ void InsertLab(SfxRequest&, sal_Bool bLabel);
public:
// public Data - used for internal Clipboard / Drag & Drop / XSelection
@@ -149,18 +149,18 @@ public:
// View setzen nur fuer internen Gebrauch,
// aus techn. Gruenden public
//
- inline void SetView(SwView* pVw) { pView = pVw; }
- inline SwView* GetView() { return pView; }
+ inline void SetView(SwView* pVw) { pView = pVw; }
+ inline SwView* GetView() { return pView; }
//Die Handler fuer die Slots
- void StateOther(SfxItemSet &); // andere
+ void StateOther(SfxItemSet &); // andere
void ExecOther(SfxRequest &); // Felder, Formel ..
// Benutzereinstellungen modifizieren
const SwMasterUsrPref *GetUsrPref(sal_Bool bWeb) const;
- const SwViewOption* GetViewOption(sal_Bool bWeb);
- void ApplyUsrPref(const SwViewOption &, SwView*,
+ const SwViewOption* GetViewOption(sal_Bool bWeb);
+ void ApplyUsrPref(const SwViewOption &, SwView*,
sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
void ApplyUserMetric( FieldUnit eMetric, BOOL bWeb );
void ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb );
@@ -173,14 +173,14 @@ public:
void ApplyUserCharUnit(BOOL bApplyChar, BOOL bWeb); // apply_char_unit
// ConfigItems erzeugen
- SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
- SwPrintOptions* GetPrtOptions(sal_Bool bWeb);
- SwChapterNumRules* GetChapterNumRules();
- SwStdFontConfig* GetStdFontConfig() { return pStdFontConfig; }
+ SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
+ SwPrintOptions* GetPrtOptions(sal_Bool bWeb);
+ SwChapterNumRules* GetChapterNumRules();
+ SwStdFontConfig* GetStdFontConfig() { return pStdFontConfig; }
SwNavigationConfig* GetNavigationConfig();
- SwToolbarConfigItem*GetToolbarConfig() { return pToolbarConfig; }
+ SwToolbarConfigItem*GetToolbarConfig() { return pToolbarConfig; }
SwToolbarConfigItem*GetWebToolbarConfig() { return pWebToolbarConfig; }
- SwDBConfig* GetDBConfig();
+ SwDBConfig* GetDBConfig();
svtools::ColorConfig& GetColorConfig();
SvtAccessibilityOptions& GetAccessibilityOptions();
SvtCTLOptions& GetCTLOptions();
@@ -188,33 +188,33 @@ public:
SvtUndoOptions& GetUndoOptions();
// Ueber Sichten iterieren
- static SwView* GetFirstView();
- static SwView* GetNextView(SwView*);
+ static SwView* GetFirstView();
+ static SwView* GetNextView(SwView*);
- sal_Bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; }
- void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; }
+ sal_Bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; }
+ void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; }
void ShowDBObj( SwView& rView, const SwDBData& rData, BOOL bOnlyIfAvailable = FALSE);
// Tabellenmodi
- sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const;
- sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const;
- sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const;
+ sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const;
+ sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const;
+ sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const;
// Redlining
- sal_uInt16 GetRedlineAuthor();
- const String& GetRedlineAuthor(sal_uInt16 nPos);
- sal_uInt16 InsertRedlineAuthor(const String& rAuthor);
+ sal_uInt16 GetRedlineAuthor();
+ const String& GetRedlineAuthor(sal_uInt16 nPos);
+ sal_uInt16 InsertRedlineAuthor(const String& rAuthor);
- void GetInsertAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
- void GetDeletedAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
- void GetFormatAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
+ void GetInsertAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
+ void GetDeletedAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
+ void GetFormatAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet);
- sal_uInt16 GetRedlineMarkPos();
- const Color& GetRedlineMarkColor();
+ sal_uInt16 GetRedlineMarkPos();
+ const Color& GetRedlineMarkColor();
// returne den definierten DocStat - WordDelimiter
- const String& GetDocStatWordDelim() const;
+ const String& GetDocStatWordDelim() const;
// Durchreichen der Metric von der ModuleConfig (fuer HTML-Export)
sal_uInt16 GetMetric( sal_Bool bWeb ) const;
@@ -224,17 +224,17 @@ public:
SwFldUpdateFlags GetFldUpdateFlags( sal_Bool bWeb ) const;
//virtuelle Methoden fuer den Optionendialog
- virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
- virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
- virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
+ virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
+ virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
+ virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
//hier wird der Pool angelegt und an der SfxShell gesetzt
- void InitAttrPool();
+ void InitAttrPool();
//Pool loeschen bevor es zu spaet ist
- void RemoveAttrPool();
+ void RemoveAttrPool();
// Invalidiert ggf. OnlineSpell-WrongListen
- void CheckSpellChanges( sal_Bool bOnlineSpelling,
+ void CheckSpellChanges( sal_Bool bOnlineSpelling,
sal_Bool bIsSpellWrongAgain, sal_Bool bIsSpellAllAgain, sal_Bool bSmartTags );
inline ::com::sun::star::uno::Reference<
@@ -275,7 +275,7 @@ inline void SwModule::SetLngSvcEvtListener(
#define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER))
-SW_DLLPUBLIC SwView* GetActiveView();
+SW_DLLPUBLIC SwView* GetActiveView();
SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell();
#endif
diff --git a/sw/inc/swprtopt.hxx b/sw/inc/swprtopt.hxx
index 7cb8ccf6ecfc..180b1b781977 100644
--- a/sw/inc/swprtopt.hxx
+++ b/sw/inc/swprtopt.hxx
@@ -2,7 +2,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
@@ -37,9 +37,9 @@
#include <vector>
#include <utility>
-#define POSTITS_NONE 0
-#define POSTITS_ONLY 1
-#define POSTITS_ENDDOC 2
+#define POSTITS_NONE 0
+#define POSTITS_ONLY 1
+#define POSTITS_ENDDOC 2
#define POSTITS_ENDPAGE 3
@@ -77,12 +77,12 @@ public:
bJobStartet(FALSE)
{}
- const String& MakeNextJobName(); // steht in vprint.cxx
- const String& GetJobName() const { return sJobName; }
+ const String& MakeNextJobName(); // steht in vprint.cxx
+ const String& GetJobName() const { return sJobName; }
#if defined(TCPP)
// seit neuestem (SV 223) kann der keinen mehr generieren
- inline SwPrtOptions(const SwPrtOptions& rNew) {*this = rNew;}
+ inline SwPrtOptions(const SwPrtOptions& rNew) {*this = rNew;}
#endif
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index e398e4f1baab..2d210dfc7a56 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -2,7 +2,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
@@ -68,7 +68,7 @@ public:
inline long Height() const;
inline long Left() const;
inline long Right() const;
- inline long Top() const;
+ inline long Top() const;
inline long Bottom() const;
//Damit Layoutseitig per Memberpointer auf die Member von Pos und SSize
@@ -109,8 +109,8 @@ public:
inline Rectangle SVRect() const;
//Zortech wuerde hier fehlerhaften Code erzeugen.
-// inline operator SRectangle() const;
-// inline operator Rectangle() const { return Rectangle( aPos, aSize ); }
+// inline operator SRectangle() const;
+// inline operator Rectangle() const { return Rectangle( aPos, aSize ); }
// Ausgabeoperator fuer die Debugging-Gemeinde
friend SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
@@ -255,7 +255,7 @@ inline long SwRect::Right() const
{
return m_Size.getWidth() ? m_Point.getX() + m_Size.getWidth() - 1 : m_Point.getX();
}
-inline long SwRect::Top() const
+inline long SwRect::Top() const
{
return m_Point.Y();
}
@@ -363,6 +363,6 @@ inline SwRect::SwRect( long X, long Y, long W, long H ) :
}
-#endif //_SWRECT_HXX
+#endif //_SWRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index df15d51d8225..811aa0d5e27e 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ SV_DECL_VARARR( SwRects, SwRect, 20, 8 )
class SwRegionRects : public SwRects
{
- SwRect aOrigin; // die Kopie des StartRects
+ SwRect aOrigin; // die Kopie des StartRects
inline void InsertRect( const SwRect &rRect, const USHORT nPos, BOOL &rDel);
@@ -55,6 +55,6 @@ public:
inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; }
};
-#endif //_SWREGION_HXX
+#endif //_SWREGION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 2e9c64083271..9a264a5cabcf 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/swstyle.h b/sw/inc/swstyle.h
index b93510c9abf0..d909b6454c5d 100644
--- a/sw/inc/swstyle.h
+++ b/sw/inc/swstyle.h
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#define SWSTYLEBIT_LIST 0x0004
#define SWSTYLEBIT_IDX 0x0008
#define SWSTYLEBIT_EXTRA 0x0010
-#define SWSTYLEBIT_HTML 0x0020
+#define SWSTYLEBIT_HTML 0x0020
#define SWSTYLEBIT_CONDCOLL 0x0040
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 0dad43843d84..f4cedacda69d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ class SwStartNode;
#include <memory>
#include <boost/noncopyable.hpp>
#else
-#include <node.hxx> // fuer StartNode->GetMyIndex
+#include <node.hxx> // fuer StartNode->GetMyIndex
#endif
class Color;
@@ -84,14 +84,14 @@ typedef SwTableBox* SwTableBoxPtr;
SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 )
typedef SwTableLine* SwTableLinePtr;
-class SW_DLLPUBLIC SwTable: public SwClient //Client vom FrmFmt
+class SW_DLLPUBLIC SwTable: public SwClient //Client vom FrmFmt
{
using SwClient::IsModifyLocked;
protected:
SwTableLines aLines;
SwTableSortBoxes aSortCntBoxes;
- SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
+ SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
SwHTMLTableLayout *pHTMLLayout;
@@ -102,13 +102,13 @@ protected:
SwTableNode* pTableNode;
//SOLL das fuer jede Tabelle einstellbar sein?
- TblChgMode eTblChgMode;
+ TblChgMode eTblChgMode;
- USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import
+ USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import
// noch ein Resize der Tbl. anstossen
USHORT nRowsToRepeat; // number of rows to repeat on every page
- BOOL bModifyLocked :1;
+ BOOL bModifyLocked :1;
BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
#if OSL_DEBUG_LEVEL > 1
bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change
@@ -120,7 +120,7 @@ public:
enum SearchType
{
SEARCH_NONE, // Default: expand to rectangle
- SEARCH_ROW, // row selection
+ SEARCH_ROW, // row selection
SEARCH_COL // column selection
};
@@ -131,7 +131,7 @@ public:
virtual ~SwTable();
// @@@ public copy ctor, but no copy assignment?
- SwTable( const SwTable& rTable ); // kein Copy der Lines !!
+ SwTable( const SwTable& rTable ); // kein Copy der Lines !!
private:
// @@@ public copy ctor, but no copy assignment?
SwTable & operator= (const SwTable &);
@@ -144,7 +144,7 @@ private:
BOOL NewSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL );
SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
void InsertSpannedRow( SwDoc* pDoc, USHORT nIdx, USHORT nCnt );
- BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind );
+ BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind );
BOOL NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL );
void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* );
void AdjustWidths( const long nOld, const long nNew );
@@ -155,13 +155,13 @@ public:
SwHTMLTableLayout *GetHTMLTableLayout() { return pHTMLLayout; }
const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; }
- void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang!
+ void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang!
USHORT IncGrfsThatResize() { return ++nGrfsThatResize; }
USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; }
- void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig
- void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden!
+ void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig
+ void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden!
void SetTableModel( BOOL bNew ){ bNewModel = bNew; }
BOOL IsNewModel() const { return bNewModel; }
@@ -175,8 +175,8 @@ public:
SwTableLines &GetTabLines() { return aLines; }
const SwTableLines &GetTabLines() const { return aLines; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
@@ -245,7 +245,7 @@ public:
{ _FindSuperfluousRows( rBoxes, 0, 0 ); }
void CheckRowSpan( SwTableLinePtr &rpLine, bool bUp ) const;
- SwTableSortBoxes& GetTabSortBoxes() { return aSortCntBoxes; }
+ SwTableSortBoxes& GetTabSortBoxes() { return aSortCntBoxes; }
const SwTableSortBoxes& GetTabSortBoxes() const { return aSortCntBoxes; }
// lese die 1. Nummer und loesche sie aus dem String
@@ -279,7 +279,7 @@ public:
// erfrage die Box, dessen Start-Index auf nBoxStt steht
SwTableBox* GetTblBox( ULONG nSttIdx );
const SwTableBox* GetTblBox( ULONG nSttIdx ) const
- { return ((SwTable*)this)->GetTblBox( nSttIdx ); }
+ { return ((SwTable*)this)->GetTblBox( nSttIdx ); }
// returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden
BOOL IsTblComplex() const;
@@ -291,7 +291,7 @@ public:
// suche alle Inhaltstragenden-Boxen der Grundline in der diese Box
// steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
//JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline,
- // FALSE-> sonst nur die Line der Box
+ // FALSE-> sonst nur die Line der Box
SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
SwSelBoxes& rBoxes, BOOL bToTop = TRUE ) const;
// erfrage vom Client Informationen
@@ -315,8 +315,8 @@ public:
//Daten fuer das Chart fuellen.
void UpdateCharts() const;
- TblChgMode GetTblChgMode() const { return eTblChgMode; }
- void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
+ TblChgMode GetTblChgMode() const { return eTblChgMode; }
+ void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
BOOL SetColWidth( SwTableBox& rAktBox, USHORT eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
@@ -327,7 +327,7 @@ public:
#endif
};
-class SW_DLLPUBLIC SwTableLine: public SwClient // Client vom FrmFmt
+class SW_DLLPUBLIC SwTableLine: public SwClient // Client vom FrmFmt
{
SwTableBoxes aBoxes;
SwTableBox *pUpper;
@@ -348,8 +348,8 @@ public:
void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
//Macht ein eingenes FrmFmt wenn noch mehr Lines von ihm abhaengen.
SwFrmFmt* ClaimFrmFmt();
@@ -366,15 +366,15 @@ public:
bool hasSoftPageBreak() const;
};
-class SW_DLLPUBLIC SwTableBox: public SwClient //Client vom FrmFmt
+class SW_DLLPUBLIC SwTableBox: public SwClient //Client vom FrmFmt
{
- friend class SwNodes; // um den Index umzusetzen !
+ friend class SwNodes; // um den Index umzusetzen !
friend void DelBoxNode(SwTableSortBoxes&); // um den StartNode* zu loeschen !
friend class SwXMLTableContext;
//nicht (mehr) implementiert.
SwTableBox( const SwTableBox & );
- SwTableBox &operator=( const SwTableBox &); //gibts nicht.
+ SwTableBox &operator=( const SwTableBox &); //gibts nicht.
SwTableLines aLines;
const SwStartNode * pSttNd;
@@ -402,8 +402,8 @@ public:
const SwTableLine *GetUpper() const { return pUpper; }
void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
//Macht ein eingenes FrmFmt wenn noch mehr Boxen von ihm abhaengen.
SwFrmFmt* ClaimFrmFmt();
@@ -449,7 +449,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBox)
// zugriff auf interne Daten - z.Z. benutzt fuer den NumFormatter
- inline const Color* GetSaveUserColor() const;
+ inline const Color* GetSaveUserColor() const;
inline const Color* GetSaveNumFmtColor() const;
inline void SetSaveUserColor(const Color* p );
inline void SetSaveNumFmtColor( const Color* p );
@@ -487,6 +487,6 @@ public:
const SwTableBox * getTableBox() const;
};
-#endif //_SWTABLE_HXX
+#endif //_SWTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index fb7a63efb9b4..6f53714d3700 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ protected:
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
};
@@ -68,7 +68,7 @@ protected:
{}
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
};
@@ -88,7 +88,7 @@ protected:
{}
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
// zum Erkennen von Veraenderungen (haupts. TableBoxAttribute)
virtual void Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue );
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 23d3a2b0cd78..849fa9f6b0e6 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -2,7 +2,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
@@ -31,7 +31,7 @@
#include <SwGetPoolIdFromName.hxx>
#ifndef INCLUDED_LIMITS_H
-#include <limits.h> //fuer LONG_MAX
+#include <limits.h> //fuer LONG_MAX
#define INCLUDED_LIMITS_H
#endif
@@ -71,15 +71,15 @@ class LocaleDataWrapper;
class CollatorWrapper;
typedef long SwTwips;
-#define INVALID_TWIPS LONG_MAX
-#define TWIPS_MAX (LONG_MAX - 1)
+#define INVALID_TWIPS LONG_MAX
+#define TWIPS_MAX (LONG_MAX - 1)
-#define MM50 283 // 1/2 cm in TWIPS
+#define MM50 283 // 1/2 cm in TWIPS
// --> OD 2004-06-18 #i19922# - constant for minimal page header/footer height of 1mm
const SwTwips cMinHdFtHeight = 56;
-#define MINFLY 23 //Minimalgroesse fuer FlyFrms
-#define MINLAY 23 //Minimalgroesse anderer Frms
+#define MINFLY 23 //Minimalgroesse fuer FlyFrms
+#define MINLAY 23 //Minimalgroesse anderer Frms
// Default-Spaltenabstand zweier Textspalten entspricht 0.3 cm
#define DEF_GUTTER_WIDTH (MM50 / 5 * 3)
@@ -101,31 +101,31 @@ const SwTwips lMinBorder = 1134;
#define UNDO_ACTION_COUNT 20
// Konstante Strings
-SW_DLLPUBLIC extern UniString aEmptyStr; // ""
-extern ByteString aEmptyByteStr; // ""
-SW_DLLPUBLIC extern UniString aDotStr; // '.'
+SW_DLLPUBLIC extern UniString aEmptyStr; // ""
+extern ByteString aEmptyByteStr; // ""
+SW_DLLPUBLIC extern UniString aDotStr; // '.'
//Zum Einfuegen von Beschriftungen (wie bzw. wo soll eingefuegt werden).
//Hier weil ein eigenes hxx nicht lohnt und es sonst nirgendwo so recht
//hinpasst.
enum SwLabelType
{
- LTYPE_TABLE, //Beschriftung einer Tabelle
- LTYPE_OBJECT, //Beschriftung von Grafik oder OLE
- LTYPE_FLY, //Beschriftung eines (Text-)Rahmens
- LTYPE_DRAW //Beschriftung eines Zeichen-Objektes
+ LTYPE_TABLE, //Beschriftung einer Tabelle
+ LTYPE_OBJECT, //Beschriftung von Grafik oder OLE
+ LTYPE_FLY, //Beschriftung eines (Text-)Rahmens
+ LTYPE_DRAW //Beschriftung eines Zeichen-Objektes
};
const BYTE OLD_MAXLEVEL = 5;
-const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx
-const BYTE NO_NUM = 200; //Ehemals numrule.hxx
-//const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei
-//const BYTE NO_INIT = 202; //Ehemals numrule.hxx
+const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx
+const BYTE NO_NUM = 200; //Ehemals numrule.hxx
+//const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei
+//const BYTE NO_INIT = 202; //Ehemals numrule.hxx
// fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln
// DAMIT entfaellt das NO_NUM !!!!
-const BYTE NO_NUMLEVEL = 0x20; // wird mit den Levels verodert
+const BYTE NO_NUMLEVEL = 0x20; // wird mit den Levels verodert
/*
@@ -143,7 +143,7 @@ extern SwPathFinder *pPathFinder;
// Werte fuer die Einzuege an der Nummerierung und BulletListe
// (fuer die weiteren Ebenen sind die Werte mit den Ebenen+1 zu
-// multiplizieren; Ebenen 0..4 !!!)
+// multiplizieren; Ebenen 0..4 !!!)
// -> #i30312#
const USHORT lBullIndent = 1440/4;
@@ -154,10 +154,10 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
// <- #i30312#
// Anzahl der SystemField-Types vom SwDoc
-#define INIT_FLDTYPES 32
+#define INIT_FLDTYPES 32
// Anzahl der vordefinierten Seq-Feldtypen. Es handelt sich dabei
// immer um die letzen Felder vor INIT_FLDTYPES
-#define INIT_SEQ_FLDTYPES 4
+#define INIT_SEQ_FLDTYPES 4
//Die ehemaligen Rendevouz-Ids leben weiter:
//Es gibt Ids fuer die Anker (SwFmtAnchor) und ein paar weitere die nur fuer
@@ -177,22 +177,22 @@ enum RndStdIds
RND_STD_FOOTERL,
RND_STD_FOOTERR,
- RND_DRAW_OBJECT // ein Draw-Object !! nur fuer die SwDoc-Schnittstelle!
+ RND_DRAW_OBJECT // ein Draw-Object !! nur fuer die SwDoc-Schnittstelle!
};
-extern ResMgr* pSwResMgr; // steht in swapp0.cxx
-#define SW_RES(i) ResId(i,*pSwResMgr)
-#define SW_RESSTR(i) UniString(ResId(i,*pSwResMgr))
+extern ResMgr* pSwResMgr; // steht in swapp0.cxx
+#define SW_RES(i) ResId(i,*pSwResMgr)
+#define SW_RESSTR(i) UniString(ResId(i,*pSwResMgr))
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker();
+ ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker();
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenator > GetHyphenator();
+ ::com::sun::star::linguistic2::XHyphenator > GetHyphenator();
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XThesaurus > GetThesaurus();
+ ::com::sun::star::linguistic2::XThesaurus > GetThesaurus();
::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > GetLinguPropertySet();
+ ::com::sun::star::beans::XPropertySet > GetLinguPropertySet();
// reutns the twip size of this graphic
SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev );
@@ -200,7 +200,7 @@ SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev );
// Seperator fuer Sprunge im Dokument auf verschiedene Inhalttype
const sal_Unicode cMarkSeperator = '|';
-extern const sal_Char* __FAR_DATA pMarkToTable; // Strings stehen
+extern const sal_Char* __FAR_DATA pMarkToTable; // Strings stehen
extern const sal_Char* __FAR_DATA pMarkToFrame; // im Init.cxx
extern const sal_Char* __FAR_DATA pMarkToRegion;
SW_DLLPUBLIC extern const sal_Char* __FAR_DATA pMarkToOutline;
@@ -208,8 +208,8 @@ extern const sal_Char* __FAR_DATA pMarkToText;
extern const sal_Char* __FAR_DATA pMarkToGraphic;
extern const sal_Char* __FAR_DATA pMarkToOLE;
-#ifndef DB_DELIM // Ist in OFA definiert!!!
-#define DB_DELIM ((sal_Unicode)0xff) // Datenbank <-> Tabellen-Trenner
+#ifndef DB_DELIM // Ist in OFA definiert!!!
+#define DB_DELIM ((sal_Unicode)0xff) // Datenbank <-> Tabellen-Trenner
#endif
@@ -217,15 +217,15 @@ typedef USHORT SetAttrMode;
namespace nsSetAttrMode
{
- const SetAttrMode SETATTR_DEFAULT = 0x0000; // default
- const SetAttrMode SETATTR_DONTEXPAND = 0x0001; // TextAttribute nicht weiter expand.
- const SetAttrMode SETATTR_DONTREPLACE = 0x0002; // kein anderes TextAttrib verdraengen
-
- const SetAttrMode SETATTR_NOTXTATRCHR = 0x0004; // bei Attr ohne Ende kein 0xFF einfuegen
- const SetAttrMode SETATTR_NOHINTADJUST = 0x0008; // keine Zusammenfassung von Bereichen.
- const SetAttrMode SETATTR_NOFORMATATTR = 0x0010; // nicht zum FormatAttribut umwandeln
- const SetAttrMode SETATTR_DONTCHGNUMRULE = 0x0020; // nicht die NumRule veraendern
- const SetAttrMode SETATTR_APICALL = 0x0040; // called from API (all UI related
+ const SetAttrMode SETATTR_DEFAULT = 0x0000; // default
+ const SetAttrMode SETATTR_DONTEXPAND = 0x0001; // TextAttribute nicht weiter expand.
+ const SetAttrMode SETATTR_DONTREPLACE = 0x0002; // kein anderes TextAttrib verdraengen
+
+ const SetAttrMode SETATTR_NOTXTATRCHR = 0x0004; // bei Attr ohne Ende kein 0xFF einfuegen
+ const SetAttrMode SETATTR_NOHINTADJUST = 0x0008; // keine Zusammenfassung von Bereichen.
+ const SetAttrMode SETATTR_NOFORMATATTR = 0x0010; // nicht zum FormatAttribut umwandeln
+ const SetAttrMode SETATTR_DONTCHGNUMRULE = 0x0020; // nicht die NumRule veraendern
+ const SetAttrMode SETATTR_APICALL = 0x0040; // called from API (all UI related
// functionality will be disabled)
/// force hint expand (only matters for hints with CH_TXTATR)
const SetAttrMode SETATTR_FORCEHINTEXPAND= 0x0080;
@@ -233,8 +233,8 @@ namespace nsSetAttrMode
//Umrechnung Twip<-> 1/100 mm fuer UNO
-#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
-#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
+#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
+#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
#define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L))
#define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L))
@@ -248,9 +248,9 @@ namespace nsSetAttrMode
#endif
-#define CHAR_HARDBLANK ((sal_Unicode)0x00A0)
-#define CHAR_HARDHYPHEN ((sal_Unicode)0x2011)
-#define CHAR_SOFTHYPHEN ((sal_Unicode)0x00AD)
+#define CHAR_HARDBLANK ((sal_Unicode)0x00A0)
+#define CHAR_HARDHYPHEN ((sal_Unicode)0x2011)
+#define CHAR_SOFTHYPHEN ((sal_Unicode)0x00AD)
#define CHAR_RLM ((sal_Unicode)0x200F)
#define CHAR_LRM ((sal_Unicode)0x200E)
#define CHAR_ZWSP ((sal_Unicode)0x200B)
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index f8d00a182f81..d4acc40d7190 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -2,7 +2,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
@@ -35,12 +35,12 @@ enum SwUndoId
{
UNDO_EMPTY = 0,
UNDO_STD_BEGIN = 1,
- UNDO_START = UNDO_STD_BEGIN, // 1
+ UNDO_START = UNDO_STD_BEGIN, // 1
UNDO_END, // 2
- REPEAT_START, // alle UndoIds zwischen REPEAT_START und
+ REPEAT_START, // alle UndoIds zwischen REPEAT_START und
// REPEAT_END sind Repeat-Faehig !!
- UNDO_DELETE = REPEAT_START, // 3
- UNDO_INSERT, // 4
+ UNDO_DELETE = REPEAT_START, // 3
+ UNDO_INSERT, // 4
UNDO_OVERWRITE, // 5
UNDO_SPLITNODE, // 6
UNDO_INSATTR, // 7
@@ -73,8 +73,8 @@ enum SwUndoId
UNDO_REJECT_REDLINE, // 34
UNDO_SPLIT_TABLE, // 35
UNDO_DONTEXPAND, // 36
- UNDO_AUTOCORRECT, // 37
- UNDO_MERGE_TABLE, // 38
+ UNDO_AUTOCORRECT, // 37
+ UNDO_MERGE_TABLE, // 38
UNDO_TRANSLITERATE, // 39
// -> #111827#
@@ -126,7 +126,7 @@ enum SwUndoId
UNDO_ENDNOTEINFO, // 82
UNDO_COMPAREDOC, // 83
UNDO_SETFLYFRMFMT, // 84
- UNDO_SETRUBYATTR, // 85
+ UNDO_SETRUBYATTR, // 85
UNDO_TMPAUTOCORR, // 86 #102505#
UNDO_TOXCHANGE, // 87
@@ -193,7 +193,7 @@ public:
~SwUndoIdAndName();
SwUndoId GetUndoId() const { return eUndoId; }
- const String* GetUndoStr() const { return pUndoStr; }
+ const String* GetUndoStr() const { return pUndoStr; }
};
typedef SwUndoIdAndName* SwUndoIdAndNamePtr;
SV_DECL_PTRARR_DEL( SwUndoIds, SwUndoIdAndNamePtr, INIT_UNDOIDS, GROW_UNDOIDS )
diff --git a/sw/inc/swunodef.hxx b/sw/inc/swunodef.hxx
index 011abcd95a06..842de9aa8a06 100644
--- a/sw/inc/swunodef.hxx
+++ b/sw/inc/swunodef.hxx
@@ -2,7 +2,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
@@ -28,11 +28,11 @@
#ifndef _SWUNODEF_HXX
#define _SWUNODEF_HXX
-#define STAR_NMSPC ::com::sun::star
-#define UNO_NMSPC STAR_NMSPC::uno
-#define CLIP_NMSPC STAR_NMSPC::datatransfer::clipboard
+#define STAR_NMSPC ::com::sun::star
+#define UNO_NMSPC STAR_NMSPC::uno
+#define CLIP_NMSPC STAR_NMSPC::datatransfer::clipboard
-#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< STAR_NMSPC::aType >
+#define STAR_REFERENCE(aType) UNO_NMSPC::Reference< STAR_NMSPC::aType >
#endif
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index 0551ccfb8c87..8727eea1745d 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
class String;
class SvStrings;
class SvPtrarr;
-
+
namespace SWUnoHelper {
// calls over the compherl the getEnumAsInt32 function and handle the
@@ -65,7 +65,7 @@ SW_DLLPUBLIC BOOL UCB_IsReadOnlyFileName( const String& rURL );
// get a list of files from the folder of the URL
// options: pExtension = 0 -> all, else this specific extension
- // pDateTime != 0 -> returns also the modified date/time of
+ // pDateTime != 0 -> returns also the modified date/time of
// the files in a SvPtrarr -->
// !! objects must be deleted from the caller!!
BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList,
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 73c1ce94029f..a17fdca0bd5f 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -2,7 +2,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
@@ -34,8 +34,8 @@
class UniString;
class ViewShell;
-#define URLLOAD_NOFILTER 0x0000
-#define URLLOAD_NEWVIEW 0x8000
+#define URLLOAD_NOFILTER 0x0000
+#define URLLOAD_NEWVIEW 0x8000
void LoadURL( const UniString& rName, ViewShell* pSh,
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index ad54933e9c7d..35940703cabb 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ class SwDocShell;
class SW_DLLPUBLIC SwWait
{
SwDocShell &rDoc;
- BOOL bLock;
+ BOOL bLock;
public:
SwWait( SwDocShell &rDocShell, BOOL bLockDispatcher );
~SwWait();
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index e7176f6cfac2..b7c47f4289e7 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -2,7 +2,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
@@ -56,12 +56,12 @@ typedef std::vector< SwTabColsEntry > SwTabColsEntries;
class SW_DLLPUBLIC SwTabCols
{
- long nLeftMin, //Linker aeusserer Rand (Bezugspunkt) in
+ long nLeftMin, //Linker aeusserer Rand (Bezugspunkt) in
//Dokumentkordinaten.
//Alle anderen Werte relativ zu diesem Punkt!
- nLeft, //Linker Rand der Tabelle.
- nRight, //Rechter Rand der Tabelle.
- nRightMax; //Maximaler rechter Rand der Tabelle.
+ nLeft, //Linker Rand der Tabelle.
+ nRight, //Rechter Rand der Tabelle.
+ nRightMax; //Maximaler rechter Rand der Tabelle.
bool bLastRowAllowedToChange; // if the last row of the table frame
// is split across pages, it may not
@@ -92,19 +92,19 @@ public:
SwTabColsEntry& GetEntry( USHORT nPos ) { return aData[nPos]; }
long GetLeftMin() const { return nLeftMin; }
- long GetLeft() const { return nLeft; }
- long GetRight() const { return nRight; }
+ long GetLeft() const { return nLeft; }
+ long GetRight() const { return nRight; }
long GetRightMax()const { return nRightMax;}
- void SetLeftMin ( long nNew ) { nLeftMin = nNew; }
- void SetLeft ( long nNew ) { nLeft = nNew; }
- void SetRight ( long nNew ) { nRight = nNew; }
- void SetRightMax( long nNew ) { nRightMax = nNew;}
+ void SetLeftMin ( long nNew ) { nLeftMin = nNew; }
+ void SetLeft ( long nNew ) { nLeft = nNew; }
+ void SetRight ( long nNew ) { nRight = nNew; }
+ void SetRightMax( long nNew ) { nRightMax = nNew;}
bool IsLastRowAllowedToChange() const { return bLastRowAllowedToChange; }
void SetLastRowAllowedToChange( bool bNew ) { bLastRowAllowedToChange = bNew; }
};
-#endif //_TABCOL_HXX
+#endif //_TABCOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index f391cb862d5a..b3ffb668868f 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ JP 20.07.95:
**************************************************************************/
#include <svl/svarray.hxx>
-#include "hintids.hxx" //_immmer_ vor den solar-items!
+#include "hintids.hxx" //_immmer_ vor den solar-items!
#include <svx/algitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
@@ -89,32 +89,32 @@ class SwBoxAutoFmt
SvxWeightItem aCTLWeight;
SvxPostureItem aCTLPosture;
- SvxUnderlineItem aUnderline;
- SvxOverlineItem aOverline;
- SvxCrossedOutItem aCrossedOut;
- SvxContourItem aContour;
- SvxShadowedItem aShadowed;
- SvxColorItem aColor;
- SvxBoxItem aBox;
+ SvxUnderlineItem aUnderline;
+ SvxOverlineItem aOverline;
+ SvxCrossedOutItem aCrossedOut;
+ SvxContourItem aContour;
+ SvxShadowedItem aShadowed;
+ SvxColorItem aColor;
+ SvxBoxItem aBox;
SvxLineItem aTLBR;
SvxLineItem aBLTR;
- SvxBrushItem aBackground;
+ SvxBrushItem aBackground;
// Writer specific
- SvxAdjustItem aAdjust;
+ SvxAdjustItem aAdjust;
// Calc specific
- SvxHorJustifyItem aHorJustify;
- SvxVerJustifyItem aVerJustify;
+ SvxHorJustifyItem aHorJustify;
+ SvxVerJustifyItem aVerJustify;
SfxBoolItem aStacked;
- SvxMarginItem aMargin;
- SfxBoolItem aLinebreak;
- SfxInt32Item aRotateAngle;
- SvxRotateModeItem aRotateMode;
+ SvxMarginItem aMargin;
+ SfxBoolItem aLinebreak;
+ SfxInt32Item aRotateAngle;
+ SvxRotateModeItem aRotateMode;
// number format
- String sNumFmtString;
- LanguageType eSysLanguage, eNumFmtLanguage;
+ String sNumFmtString;
+ LanguageType eSysLanguage, eNumFmtLanguage;
public:
SwBoxAutoFmt();
@@ -125,10 +125,10 @@ public:
SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew );
// die Get-Methoden
- const SvxFontItem &GetFont() const { return aFont; }
- const SvxFontHeightItem &GetHeight() const { return aHeight; }
- const SvxWeightItem &GetWeight() const { return aWeight; }
- const SvxPostureItem &GetPosture() const { return aPosture; }
+ const SvxFontItem &GetFont() const { return aFont; }
+ const SvxFontHeightItem &GetHeight() const { return aHeight; }
+ const SvxWeightItem &GetWeight() const { return aWeight; }
+ const SvxPostureItem &GetPosture() const { return aPosture; }
const SvxFontItem &GetCJKFont() const { return aCJKFont; }
const SvxFontHeightItem &GetCJKHeight() const { return aCJKHeight; }
const SvxWeightItem &GetCJKWeight() const { return aCJKWeight; }
@@ -137,25 +137,25 @@ public:
const SvxFontHeightItem &GetCTLHeight() const { return aCTLHeight; }
const SvxWeightItem &GetCTLWeight() const { return aCTLWeight; }
const SvxPostureItem &GetCTLPosture() const { return aCTLPosture; }
- const SvxUnderlineItem &GetUnderline() const { return aUnderline; }
- const SvxOverlineItem &GetOverline() const { return aOverline; }
- const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; }
- const SvxContourItem &GetContour() const { return aContour; }
- const SvxShadowedItem &GetShadowed() const { return aShadowed; }
- const SvxColorItem &GetColor() const { return aColor; }
- const SvxAdjustItem &GetAdjust() const { return aAdjust; }
- const SvxBoxItem &GetBox() const { return aBox; }
+ const SvxUnderlineItem &GetUnderline() const { return aUnderline; }
+ const SvxOverlineItem &GetOverline() const { return aOverline; }
+ const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; }
+ const SvxContourItem &GetContour() const { return aContour; }
+ const SvxShadowedItem &GetShadowed() const { return aShadowed; }
+ const SvxColorItem &GetColor() const { return aColor; }
+ const SvxAdjustItem &GetAdjust() const { return aAdjust; }
+ const SvxBoxItem &GetBox() const { return aBox; }
const SvxLineItem &GetTLBR() const { return aTLBR; }
const SvxLineItem &GetBLTR() const { return aBLTR; }
- const SvxBrushItem &GetBackground() const { return aBackground; }
+ const SvxBrushItem &GetBackground() const { return aBackground; }
void GetValueFormat( String& rFmt, LanguageType& rLng, LanguageType& rSys ) const
{ rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
// die SetMethoden
- void SetFont( const SvxFontItem& rNew ) { aFont = rNew; }
- void SetHeight( const SvxFontHeightItem& rNew ) { aHeight = rNew; }
- void SetWeight( const SvxWeightItem& rNew ) { aWeight = rNew; }
- void SetPosture( const SvxPostureItem& rNew ) { aPosture = rNew; }
+ void SetFont( const SvxFontItem& rNew ) { aFont = rNew; }
+ void SetHeight( const SvxFontHeightItem& rNew ) { aHeight = rNew; }
+ void SetWeight( const SvxWeightItem& rNew ) { aWeight = rNew; }
+ void SetPosture( const SvxPostureItem& rNew ) { aPosture = rNew; }
void SetCJKFont( const SvxFontItem& rNew ) { aCJKFont = rNew; }
void SetCJKHeight( const SvxFontHeightItem& rNew ) { aCJKHeight = rNew; }
void SetCJKWeight( const SvxWeightItem& rNew ) { aCJKWeight = rNew; }
@@ -164,19 +164,19 @@ public:
void SetCTLHeight( const SvxFontHeightItem& rNew ) { aCTLHeight = rNew; }
void SetCTLWeight( const SvxWeightItem& rNew ) { aCTLWeight = rNew; }
void SetCTLPosture( const SvxPostureItem& rNew ) { aCTLPosture = rNew; }
- void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline = rNew; }
- void SetOverline( const SvxOverlineItem& rNew ) { aOverline = rNew; }
- void SetCrossedOut( const SvxCrossedOutItem& rNew ) { aCrossedOut = rNew; }
- void SetContour( const SvxContourItem& rNew ) { aContour = rNew; }
- void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed = rNew; }
- void SetColor( const SvxColorItem& rNew ) { aColor = rNew; }
+ void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline = rNew; }
+ void SetOverline( const SvxOverlineItem& rNew ) { aOverline = rNew; }
+ void SetCrossedOut( const SvxCrossedOutItem& rNew ) { aCrossedOut = rNew; }
+ void SetContour( const SvxContourItem& rNew ) { aContour = rNew; }
+ void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed = rNew; }
+ void SetColor( const SvxColorItem& rNew ) { aColor = rNew; }
void SetAdjust( const SvxAdjustItem& rNew )
{
aAdjust.SetAdjust( rNew.GetAdjust() );
aAdjust.SetOneWord( rNew.GetOneWord() );
aAdjust.SetLastBlock( rNew.GetLastBlock() );
}
- void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; }
+ void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; }
void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; }
void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType eSys )
{ sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; }
@@ -193,7 +193,7 @@ public:
class SW_DLLPUBLIC SwTableAutoFmt
{
- friend void _FinitCore(); // zum Zerstoeren des dflt. Pointers
+ friend void _FinitCore(); // zum Zerstoeren des dflt. Pointers
static SwBoxAutoFmt* pDfltBoxAutoFmt;
String aName;
@@ -230,18 +230,18 @@ public:
void UpdateToSet( BYTE nPos, SfxItemSet& rSet, UpdateFlags eFlags,
SvNumberFormatter* ) const ;
- BOOL IsFont() const { return bInclFont; }
- BOOL IsJustify() const { return bInclJustify; }
- BOOL IsFrame() const { return bInclFrame; }
- BOOL IsBackground() const { return bInclBackground; }
- BOOL IsValueFormat() const { return bInclValueFormat; }
-
- void SetFont( const BOOL bNew ) { bInclFont = bNew; }
- void SetJustify( const BOOL bNew ) { bInclJustify = bNew; }
- void SetFrame( const BOOL bNew ) { bInclFrame = bNew; }
- void SetBackground( const BOOL bNew ) { bInclBackground = bNew; }
- void SetValueFormat( const BOOL bNew ) { bInclValueFormat = bNew; }
- void SetWidthHeight( const BOOL bNew ) { bInclWidthHeight = bNew; }
+ BOOL IsFont() const { return bInclFont; }
+ BOOL IsJustify() const { return bInclJustify; }
+ BOOL IsFrame() const { return bInclFrame; }
+ BOOL IsBackground() const { return bInclBackground; }
+ BOOL IsValueFormat() const { return bInclValueFormat; }
+
+ void SetFont( const BOOL bNew ) { bInclFont = bNew; }
+ void SetJustify( const BOOL bNew ) { bInclJustify = bNew; }
+ void SetFrame( const BOOL bNew ) { bInclFrame = bNew; }
+ void SetBackground( const BOOL bNew ) { bInclBackground = bNew; }
+ void SetValueFormat( const BOOL bNew ) { bInclValueFormat = bNew; }
+ void SetWidthHeight( const BOOL bNew ) { bInclWidthHeight = bNew; }
BOOL Load( SvStream& rStream, const SwAfVersions& );
BOOL Save( SvStream& rStream ) const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index 030857b2f1fe..9f731a75688c 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -2,7 +2,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
@@ -44,28 +44,28 @@ namespace nsTblChgWidthHeightType
// folgende koennen hinein verodert werden
- const TblChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-Modus: das Bigger-Flag
+ const TblChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-Modus: das Bigger-Flag
// besagt was passiert:
// bBigger -> Box wird entfernt
// !bBigger-> Box wird eingefuegt
- const TblChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box wird groesser -> sonst kleiner
+ const TblChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box wird groesser -> sonst kleiner
}
enum TblChgMode
{
- TBLFIX_CHGABS, // Tabelle feste Breite, den Nachbar andern
- TBLFIX_CHGPROP, // Tabelle feste Breite, alle Nachbarn aendern
- TBLVAR_CHGABS // Tabelle variable, alle Nachbarn aendern
+ TBLFIX_CHGABS, // Tabelle feste Breite, den Nachbar andern
+ TBLFIX_CHGPROP, // Tabelle feste Breite, alle Nachbarn aendern
+ TBLVAR_CHGABS // Tabelle variable, alle Nachbarn aendern
};
enum SplitTbl_HeadlineOption
{
- HEADLINE_NONE = 0, // lasse alles wie es ist
- HEADLINE_BORDERCOPY, // von der davor obere Line der vorhergehen Line
- HEADLINE_CNTNTCOPY, // kopiere die 1. Line komplett mit Inhalt
- HEADLINE_BOXATTRCOPY, // kopiere von der 1. Line die Box Attribute
- HEADLINE_BOXATRCOLLCOPY // kopiere von der 1. Line die Box Attribute
+ HEADLINE_NONE = 0, // lasse alles wie es ist
+ HEADLINE_BORDERCOPY, // von der davor obere Line der vorhergehen Line
+ HEADLINE_CNTNTCOPY, // kopiere die 1. Line komplett mit Inhalt
+ HEADLINE_BOXATTRCOPY, // kopiere von der 1. Line die Box Attribute
+ HEADLINE_BOXATRCOLLCOPY // kopiere von der 1. Line die Box Attribute
// und die Absatzvorlagen
};
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 9c17d1cb0987..6d21f5b2c124 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -2,7 +2,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
@@ -60,11 +60,11 @@ typedef USHORT SwTblSearchType;
namespace nsSwTblSearchType
{
const SwTblSearchType TBLSEARCH_NONE = 0x1; // keine Erweiterung
- const SwTblSearchType TBLSEARCH_ROW = 0x2; // erweiter auf Zeilen
+ const SwTblSearchType TBLSEARCH_ROW = 0x2; // erweiter auf Zeilen
const SwTblSearchType TBLSEARCH_COL = 0x3; // erweiter auf Spalten
// als Flag zu den anderen Werten!!
- const SwTblSearchType TBLSEARCH_PROTECT = 0x8; // auch geschuetzte Boxen einsammeln
+ const SwTblSearchType TBLSEARCH_PROTECT = 0x8; // auch geschuetzte Boxen einsammeln
const SwTblSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // die zusammenges. Union nicht korrigieren
}
@@ -126,17 +126,17 @@ BOOL CheckSplitCells( const SwCursor& rCrsr, USHORT nDiv,
//Fuer das Arbeiten auf TabSelektion auch fuer aufgespaltene Tabellen.
class SwSelUnion
{
- SwRect aUnion; //Das die Sel umschliessende Rechteck.
- SwTabFrm *pTable; //Die (Follow-)Table zu der Union.
+ SwRect aUnion; //Das die Sel umschliessende Rechteck.
+ SwTabFrm *pTable; //Die (Follow-)Table zu der Union.
public:
SwSelUnion( const SwRect &rRect, SwTabFrm *pTab ) :
aUnion( rRect ), pTable( pTab ) {}
- const SwRect& GetUnion() const { return aUnion; }
- SwRect& GetUnion() { return aUnion; }
+ const SwRect& GetUnion() const { return aUnion; }
+ SwRect& GetUnion() { return aUnion; }
const SwTabFrm *GetTable() const { return pTable; }
- SwTabFrm *GetTable() { return pTable; }
+ SwTabFrm *GetTable() { return pTable; }
};
SV_DECL_PTRARR_DEL( SwSelUnions, SwSelUnion*, 10, 20 )
@@ -166,19 +166,19 @@ class _FndBox
_FndLines aLines;
_FndLine* pUpper;
- SwTableLine *pLineBefore; //Zum Loeschen/Restaurieren des Layouts.
+ SwTableLine *pLineBefore; //Zum Loeschen/Restaurieren des Layouts.
SwTableLine *pLineBehind;
public:
_FndBox( SwTableBox* pB, _FndLine* pFL ) :
pBox(pB), pUpper(pFL), pLineBefore( 0 ), pLineBehind( 0 ) {}
- const _FndLines& GetLines() const { return aLines; }
- _FndLines& GetLines() { return aLines; }
- const SwTableBox* GetBox() const { return pBox; }
- SwTableBox* GetBox() { return pBox; }
- const _FndLine* GetUpper() const { return pUpper; }
- _FndLine* GetUpper() { return pUpper; }
+ const _FndLines& GetLines() const { return aLines; }
+ _FndLines& GetLines() { return aLines; }
+ const SwTableBox* GetBox() const { return pBox; }
+ SwTableBox* GetBox() { return pBox; }
+ const _FndLine* GetUpper() const { return pUpper; }
+ _FndLine* GetUpper() { return pUpper; }
void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable );
void SetTableLines( const SwTable &rTable );
@@ -199,12 +199,12 @@ class _FndLine
_FndBox* pUpper;
public:
_FndLine(SwTableLine* pL, _FndBox* pFB=0) : pLine(pL), pUpper(pFB) {}
- const _FndBoxes& GetBoxes() const { return aBoxes; }
- _FndBoxes& GetBoxes() { return aBoxes; }
- const SwTableLine* GetLine() const { return pLine; }
- SwTableLine* GetLine() { return pLine; }
- const _FndBox* GetUpper() const { return pUpper; }
- _FndBox* GetUpper() { return pUpper; }
+ const _FndBoxes& GetBoxes() const { return aBoxes; }
+ _FndBoxes& GetBoxes() { return aBoxes; }
+ const SwTableLine* GetLine() const { return pLine; }
+ SwTableLine* GetLine() { return pLine; }
+ const _FndBox* GetUpper() const { return pUpper; }
+ _FndBox* GetUpper() { return pUpper; }
void SetUpper( _FndBox* pUp ) { pUpper = pUp; }
};
@@ -228,6 +228,6 @@ BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara );
SW_DLLPUBLIC BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara );
-#endif // _TBLSEL_HXX
+#endif // _TBLSEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index a00aa747a9ff..99a000905125 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -2,7 +2,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
@@ -58,19 +58,19 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
SwTextGridItem& operator=( const SwTextGridItem& );
const Color& GetColor() const { return aColor; }
- void SetColor( const Color& rCol ) { aColor = rCol; }
+ void SetColor( const Color& rCol ) { aColor = rCol; }
sal_uInt16 GetLines() const { return nLines; }
void SetLines( sal_uInt16 nNew ) { nLines = nNew; }
@@ -95,20 +95,20 @@ public:
BOOL IsDisplayGrid() const { return bDisplayGrid; }
BOOL GetDisplayGrid() const { return bDisplayGrid; }
void SetDisplayGrid( BOOL bNew ) { bDisplayGrid = bNew; }
-
+
//for textgrid enhancement
sal_uInt16 GetBaseWidth() const { return nBaseWidth;}
void SetBaseWidth( sal_uInt16 nNew ) { nBaseWidth = nNew; }
-
+
BOOL IsSnapToChars() const { return bSnapToChars; }
BOOL GetSnapToChars() const { return bSnapToChars; }
void SetSnapToChars( BOOL bNew ) { bSnapToChars = bNew; }
-
+
BOOL IsSquaredMode() const { return bSquaredMode; }
BOOL GetSquaredMode() const { return bSquaredMode; }
void SetSquaredMode( BOOL bNew ) { bSquaredMode = bNew; }
void SwitchPaperMode(BOOL bNew );
-
+
void Init();
};
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index ac4a490fef11..ce31eca2231f 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -2,7 +2,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
@@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwTOXMark
friend void _InitCore();
friend class SwTxtTOXMark;
- String aAltText; // Der Text des Eintrages ist unterschiedlich
+ String aAltText; // Der Text des Eintrages ist unterschiedlich
String aPrimaryKey, aSecondaryKey;
// three more strings for phonetic sorting
@@ -84,9 +84,9 @@ class SW_DLLPUBLIC SwTOXMark
SwTxtTOXMark* pTxtAttr;
- USHORT nLevel;
- BOOL bAutoGenerated : 1; // generated using a concordance file
- BOOL bMainEntry : 1; // main entry emphasized by character style
+ USHORT nLevel;
+ BOOL bAutoGenerated : 1; // generated using a concordance file
+ BOOL bMainEntry : 1; // main entry emphasized by character style
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark;
@@ -104,48 +104,48 @@ public:
SwTOXMark& operator=( const SwTOXMark& rCopy );
// "pure virtual methods" of SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
// SwClient
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
void InvalidateTOXMark();
- String GetText() const;
+ String GetText() const;
- inline BOOL IsAlternativeText() const;
- inline const String& GetAlternativeText() const;
+ inline BOOL IsAlternativeText() const;
+ inline const String& GetAlternativeText() const;
- inline void SetAlternativeText( const String& rAlt );
+ inline void SetAlternativeText( const String& rAlt );
// content or user defined index
inline void SetLevel(USHORT nLevel);
- inline USHORT GetLevel() const;
+ inline USHORT GetLevel() const;
// for alphabetical index only
- inline void SetPrimaryKey(const String& rStr );
- inline void SetSecondaryKey(const String& rStr);
+ inline void SetPrimaryKey(const String& rStr );
+ inline void SetSecondaryKey(const String& rStr);
inline void SetTextReading(const String& rStr);
inline void SetPrimaryKeyReading(const String& rStr );
inline void SetSecondaryKeyReading(const String& rStr);
inline const String& GetPrimaryKey() const;
- inline const String& GetSecondaryKey() const;
+ inline const String& GetSecondaryKey() const;
inline const String& GetTextReading() const;
inline const String& GetPrimaryKeyReading() const;
inline const String& GetSecondaryKeyReading() const;
- BOOL IsAutoGenerated() const {return bAutoGenerated;}
- void SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;}
+ BOOL IsAutoGenerated() const {return bAutoGenerated;}
+ void SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;}
- BOOL IsMainEntry() const {return bMainEntry;}
- void SetMainEntry(BOOL bSet) { bMainEntry = bSet;}
+ BOOL IsMainEntry() const {return bMainEntry;}
+ void SetMainEntry(BOOL bSet) { bMainEntry = bSet;}
inline const SwTOXType* GetTOXType() const;
- const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; }
- SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; }
+ const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; }
+ SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; }
SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
@@ -168,12 +168,12 @@ public:
// @@@ public copy ctor, but no copy assignment?
SwTOXType(const SwTOXType& rCopy);
- inline const String& GetTypeName() const;
+ inline const String& GetTypeName() const;
inline TOXTypes GetType() const;
private:
- String aName;
- TOXTypes eType;
+ String aName;
+ TOXTypes eType;
// @@@ public copy ctor, but no copy assignment?
SwTOXType & operator= (const SwTOXType &);
@@ -183,25 +183,25 @@ private:
Description: Structure of the index lines
--------------------------------------------------------------------*/
-#define FORM_TITLE 0
-#define FORM_ALPHA_DELIMITTER 1
-#define FORM_PRIMARY_KEY 2
-#define FORM_SECONDARY_KEY 3
-#define FORM_ENTRY 4
+#define FORM_TITLE 0
+#define FORM_ALPHA_DELIMITTER 1
+#define FORM_PRIMARY_KEY 2
+#define FORM_SECONDARY_KEY 3
+#define FORM_ENTRY 4
/*
Pattern structure
- <E#> - entry number <E# CharStyleName,PoolId>
- <ET> - entry text <ET CharStyleName,PoolId>
+ <E#> - entry number <E# CharStyleName,PoolId>
+ <ET> - entry text <ET CharStyleName,PoolId>
<E> - entry text and number <E CharStyleName,PoolId>
<T> - tab stop <T,,Position,Adjust>
<C> - chapter info n = {0, 1, 2, 3, 4 } values of SwChapterFormat <C CharStyleName,PoolId>
- <TX> - text token <X CharStyleName,PoolId, TOX_STYLE_DELIMITERTextContentTOX_STYLE_DELIMITER>
+ <TX> - text token <X CharStyleName,PoolId, TOX_STYLE_DELIMITERTextContentTOX_STYLE_DELIMITER>
<#> - Page number <# CharStyleName,PoolId>
<LS> - Link start <LS>
<LE> - Link end <LE>
- <A00> - Authority entry field <A02 CharStyleName, PoolId>
+ <A00> - Authority entry field <A02 CharStyleName, PoolId>
*/
// These enum values are stored and must not be changed!
@@ -222,16 +222,16 @@ enum FormTokenType
struct SW_DLLPUBLIC SwFormToken
{
- String sText;
- String sCharStyleName;
- SwTwips nTabStopPosition;
- FormTokenType eTokenType;
- USHORT nPoolId;
+ String sText;
+ String sCharStyleName;
+ SwTwips nTabStopPosition;
+ FormTokenType eTokenType;
+ USHORT nPoolId;
SvxTabAdjust eTabAlign;
- USHORT nChapterFormat; //SwChapterFormat;
+ USHORT nChapterFormat; //SwChapterFormat;
USHORT nOutlineLevel;//the maximum permitted outline level in numbering
- USHORT nAuthorityField; //enum ToxAuthorityField
- sal_Unicode cTabFillChar;
+ USHORT nAuthorityField; //enum ToxAuthorityField
+ sal_Unicode cTabFillChar;
sal_Bool bWithTab; // TRUE: do generate tab
// character only the tab stop
// #i21237#
@@ -359,67 +359,67 @@ public:
class SW_DLLPUBLIC SwForm
{
- SwFormTokens aPattern[ AUTH_TYPE_END + 1 ]; // #i21237#
- String aTemplate[ AUTH_TYPE_END + 1 ];
+ SwFormTokens aPattern[ AUTH_TYPE_END + 1 ]; // #i21237#
+ String aTemplate[ AUTH_TYPE_END + 1 ];
TOXTypes eType;
USHORT nFormMaxLevel;
- //USHORT nFirstTabPos; -> Value in tab token
-// BOOL bHasFirstTabPos : 1;
- BOOL bGenerateTabPos : 1;
- BOOL bIsRelTabPos : 1;
- BOOL bCommaSeparated : 1;
+ //USHORT nFirstTabPos; -> Value in tab token
+// BOOL bHasFirstTabPos : 1;
+ BOOL bGenerateTabPos : 1;
+ BOOL bIsRelTabPos : 1;
+ BOOL bCommaSeparated : 1;
public:
SwForm( TOXTypes eTOXType = TOX_CONTENT );
SwForm( const SwForm& rForm );
- SwForm& operator=( const SwForm& rForm );
+ SwForm& operator=( const SwForm& rForm );
- inline void SetTemplate(USHORT nLevel, const String& rName);
- inline const String& GetTemplate(USHORT nLevel) const;
+ inline void SetTemplate(USHORT nLevel, const String& rName);
+ inline const String& GetTemplate(USHORT nLevel) const;
// #i21237#
- void SetPattern(USHORT nLevel, const SwFormTokens& rName);
- void SetPattern(USHORT nLevel, const String& rStr);
- const SwFormTokens& GetPattern(USHORT nLevel) const;
+ void SetPattern(USHORT nLevel, const SwFormTokens& rName);
+ void SetPattern(USHORT nLevel, const String& rStr);
+ const SwFormTokens& GetPattern(USHORT nLevel) const;
// fill tab stop positions from template to pattern
// #i21237#
- void AdjustTabStops(SwDoc& rDoc,
+ void AdjustTabStops(SwDoc& rDoc,
BOOL bInsertNewTabStops = FALSE);
inline TOXTypes GetTOXType() const;
- inline USHORT GetFormMax() const;
+ inline USHORT GetFormMax() const;
BOOL IsRelTabPos() const { return bIsRelTabPos; }
- void SetRelTabPos( BOOL b ) { bIsRelTabPos = b; }
+ void SetRelTabPos( BOOL b ) { bIsRelTabPos = b; }
- BOOL IsCommaSeparated() const { return bCommaSeparated;}
- void SetCommaSeparated( BOOL b) { bCommaSeparated = b;}
+ BOOL IsCommaSeparated() const { return bCommaSeparated;}
+ void SetCommaSeparated( BOOL b) { bCommaSeparated = b;}
static USHORT GetFormMaxLevel( TOXTypes eType );
- static const sal_Char* aFormEntry; // <E>
+ static const sal_Char* aFormEntry; // <E>
static BYTE nFormEntryLen; // 3 characters
- static const sal_Char* aFormTab; // <T>
+ static const sal_Char* aFormTab; // <T>
static BYTE nFormTabLen; // 3 characters
- static const sal_Char* aFormPageNums; // <P>
+ static const sal_Char* aFormPageNums; // <P>
static BYTE nFormPageNumsLen; // 3 characters
- static const sal_Char* aFormLinkStt; // <LS>
+ static const sal_Char* aFormLinkStt; // <LS>
static BYTE nFormLinkSttLen; // 4 characters
- static const sal_Char* aFormLinkEnd; // <LE>
+ static const sal_Char* aFormLinkEnd; // <LE>
static BYTE nFormLinkEndLen; // 4 characters
- static const sal_Char* aFormEntryNum; // <E#>
+ static const sal_Char* aFormEntryNum; // <E#>
static BYTE nFormEntryNumLen; // 4 characters
- static const sal_Char* aFormEntryTxt; // <ET>
+ static const sal_Char* aFormEntryTxt; // <ET>
static BYTE nFormEntryTxtLen; // 4 characters
- static const sal_Char* aFormChapterMark; // <C>
+ static const sal_Char* aFormChapterMark; // <C>
static BYTE nFormChapterMarkLen; // 3 characters
- static const sal_Char* aFormText; // <TX>
+ static const sal_Char* aFormText; // <TX>
static BYTE nFormTextLen; // 4 characters
- static const sal_Char* aFormAuth; // <Axx> xx - decimal enum value
+ static const sal_Char* aFormAuth; // <Axx> xx - decimal enum value
static BYTE nFormAuthLen; // 3 characters
};
@@ -471,7 +471,7 @@ namespace nsSwTOOElements
const SwTOOElements TOO_OTHER = 0x80;
}
-#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) //JP 19.07.00: use a control char
+#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) //JP 19.07.00: use a control char
/*--------------------------------------------------------------------
Description: Class for all indexes
@@ -480,13 +480,13 @@ namespace nsSwTOOElements
class SW_DLLPUBLIC SwTOXBase : public SwClient
{
SwForm aForm; // description of the lines
- String aName; // unique name
+ String aName; // unique name
String aTitle; // title
- String sMainEntryCharStyle; // name of the character style applied to main index entries
+ String sMainEntryCharStyle; // name of the character style applied to main index entries
- String aStyleNames[MAXLEVEL]; // (additional) style names TOX_CONTENT, TOX_USER
- String sSequenceName; // FieldTypeName of a caption sequence
+ String aStyleNames[MAXLEVEL]; // (additional) style names TOX_CONTENT, TOX_USER
+ String sSequenceName; // FieldTypeName of a caption sequence
LanguageType eLanguage;
String sSortAlgorithm;
@@ -497,13 +497,13 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient
} aData;
USHORT nCreateType; // sources to create the index from
- USHORT nOLEOptions; // OLE sources
- SwCaptionDisplay eCaptionDisplay; //
- BOOL bProtected : 1; // index protected ?
- BOOL bFromChapter : 1; // create from chapter or document
- BOOL bFromObjectNames : 1; // create a table or object index
+ USHORT nOLEOptions; // OLE sources
+ SwCaptionDisplay eCaptionDisplay; //
+ BOOL bProtected : 1; // index protected ?
+ BOOL bFromChapter : 1; // create from chapter or document
+ BOOL bFromObjectNames : 1; // create a table or object index
// from the names rather than the caption
- BOOL bLevelFromChapter : 1; // User index: get the level from the source chapter
+ BOOL bLevelFromChapter : 1; // User index: get the level from the source chapter
public:
SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm,
USHORT nCreaType, const String& rTitle );
@@ -516,75 +516,75 @@ public:
// If not, so create it an copy all other used things. The return is this
SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& );
- const SwTOXType* GetTOXType() const; //
+ const SwTOXType* GetTOXType() const; //
USHORT GetCreateType() const; // creation types
- const String& GetTOXName() const {return aName;}
- void SetTOXName(const String& rSet) {aName = rSet;}
+ const String& GetTOXName() const {return aName;}
+ void SetTOXName(const String& rSet) {aName = rSet;}
const String& GetTitle() const; // Title
const String& GetTypeName() const; // Name
const SwForm& GetTOXForm() const; // description of the lines
- void SetCreate(USHORT);
- void SetTitle(const String& rTitle);
- void SetTOXForm(const SwForm& rForm);
+ void SetCreate(USHORT);
+ void SetTitle(const String& rTitle);
+ void SetTOXForm(const SwForm& rForm);
- TOXTypes GetType() const;
+ TOXTypes GetType() const;
- const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;}
- void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;}
+ const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;}
+ void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;}
// content index only
inline void SetLevel(USHORT); // consider outline level
- inline USHORT GetLevel() const;
+ inline USHORT GetLevel() const;
// alphabetical index only
inline USHORT GetOptions() const; // alphabetical index options
- inline void SetOptions(USHORT nOpt);
+ inline void SetOptions(USHORT nOpt);
// index of objects
- USHORT GetOLEOptions() const {return nOLEOptions;}
- void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
+ USHORT GetOLEOptions() const {return nOLEOptions;}
+ void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
// index of objects
// user defined index only
- inline void SetTemplateName(const String& rName); // Absatzlayout beachten
+ inline void SetTemplateName(const String& rName); // Absatzlayout beachten
- const String& GetStyleNames(USHORT nLevel) const
+ const String& GetStyleNames(USHORT nLevel) const
{
DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
return aStyleNames[nLevel];
}
- void SetStyleNames(const String& rSet, USHORT nLevel)
+ void SetStyleNames(const String& rSet, USHORT nLevel)
{
DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
aStyleNames[nLevel] = rSet;
}
- BOOL IsFromChapter() const { return bFromChapter;}
- void SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
+ BOOL IsFromChapter() const { return bFromChapter;}
+ void SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
- BOOL IsFromObjectNames() const {return bFromObjectNames;}
- void SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;}
+ BOOL IsFromObjectNames() const {return bFromObjectNames;}
+ void SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;}
- BOOL IsLevelFromChapter() const {return bLevelFromChapter;}
- void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
+ BOOL IsLevelFromChapter() const {return bLevelFromChapter;}
+ void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
- BOOL IsProtected() const { return bProtected; }
- void SetProtected(BOOL bSet) { bProtected = bSet; }
+ BOOL IsProtected() const { return bProtected; }
+ void SetProtected(BOOL bSet) { bProtected = bSet; }
- const String& GetSequenceName() const {return sSequenceName;}
- void SetSequenceName(const String& rSet) {sSequenceName = rSet;}
+ const String& GetSequenceName() const {return sSequenceName;}
+ void SetSequenceName(const String& rSet) {sSequenceName = rSet;}
- SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;}
- void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
+ SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;}
+ void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
- BOOL IsTOXBaseInReadonly() const;
+ BOOL IsTOXBaseInReadonly() const;
- const SfxItemSet* GetAttrSet() const;
- void SetAttrSet( const SfxItemSet& );
+ const SfxItemSet* GetAttrSet() const;
+ void SetAttrSet( const SfxItemSet& );
LanguageType GetLanguage() const {return eLanguage;}
void SetLanguage(LanguageType nLang) {eLanguage = nLang;}
@@ -593,7 +593,7 @@ public:
void SetSortAlgorithm(const String& rSet) {sSortAlgorithm = rSet;}
// #i21237#
void AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop);
- SwTOXBase& operator=(const SwTOXBase& rSource);
+ SwTOXBase& operator=(const SwTOXBase& rSource);
};
@@ -605,7 +605,7 @@ public:
//SwTOXMark
//
inline const String& SwTOXMark::GetAlternativeText() const
- { return aAltText; }
+ { return aAltText; }
inline const SwTOXType* SwTOXMark::GetTOXType() const
{ return (SwTOXType*)GetRegisteredIn(); }
@@ -720,10 +720,10 @@ inline USHORT SwForm::GetFormMax() const
//SwTOXType
//
inline const String& SwTOXType::GetTypeName() const
- { return aName; }
+ { return aName; }
inline TOXTypes SwTOXType::GetType() const
- { return eType; }
+ { return eType; }
//
// SwTOXBase
@@ -741,7 +741,7 @@ inline const String& SwTOXBase::GetTypeName() const
{ return GetTOXType()->GetTypeName(); }
inline const SwForm& SwTOXBase::GetTOXForm() const
- { return aForm; }
+ { return aForm; }
inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop)
{
@@ -751,7 +751,7 @@ inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop)
inline void SwTOXBase::SetCreate(USHORT nCreate)
{ nCreateType = nCreate; }
-inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
+inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
{ aForm = rForm; }
inline TOXTypes SwTOXBase::GetType() const
@@ -773,7 +773,7 @@ inline void SwTOXBase::SetTemplateName(const String& rName)
{
// OSL_ENSURE(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
// OSL_ENSURE(aData.pTemplateName, "pTemplateName == 0");
-// (*aData.pTemplateName) = rName;
+// (*aData.pTemplateName) = rName;
DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
aStyleNames[0] = rName;
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index 2fee68929875..d2c790b00328 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.hxx
@@ -2,7 +2,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
@@ -98,7 +98,7 @@ enum ToxAuthorityField
AUTH_FIELD_HOWPUBLISHED,
AUTH_FIELD_INSTITUTION,
AUTH_FIELD_JOURNAL,
-// AUTH_FIELD_KEY, // BiBTeX - Field
+// AUTH_FIELD_KEY, // BiBTeX - Field
AUTH_FIELD_MONTH,
AUTH_FIELD_NOTE,
AUTH_FIELD_NUMBER,
diff --git a/sw/inc/toxinit.hxx b/sw/inc/toxinit.hxx
index 4c7fdbf2601d..44e981cb6307 100644
--- a/sw/inc/toxinit.hxx
+++ b/sw/inc/toxinit.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index facead6132b1..43f05cc82c83 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 53851003620d..062dfaa17fdc 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -2,7 +2,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
@@ -88,7 +88,7 @@ public:
const xub_StrLen* GetStart() const { return & m_nStart; }
/// end position
- virtual xub_StrLen* GetEnd();
+ virtual xub_StrLen* GetEnd();
inline const xub_StrLen* GetEnd() const;
/// end (if available), else start
inline const xub_StrLen* GetAnyEnd() const;
@@ -109,17 +109,17 @@ public:
inline SfxPoolItem& GetAttr();
inline USHORT Which() const { return GetAttr().Which(); }
- virtual int operator==( const SwTxtAttr& ) const;
+ virtual int operator==( const SwTxtAttr& ) const;
- inline const SwFmtCharFmt &GetCharFmt() const;
+ inline const SwFmtCharFmt &GetCharFmt() const;
inline const SwFmtAutoFmt &GetAutoFmt() const;
- inline const SwFmtFld &GetFld() const;
- inline const SwFmtFtn &GetFtn() const;
- inline const SwFmtFlyCnt &GetFlyCnt() const;
- inline const SwTOXMark &GetTOXMark() const;
- inline const SwFmtRefMark &GetRefMark() const;
- inline const SwFmtINetFmt &GetINetFmt() const;
- inline const SwFmtRuby &GetRuby() const;
+ inline const SwFmtFld &GetFld() const;
+ inline const SwFmtFtn &GetFtn() const;
+ inline const SwFmtFlyCnt &GetFlyCnt() const;
+ inline const SwTOXMark &GetTOXMark() const;
+ inline const SwFmtRefMark &GetRefMark() const;
+ inline const SwFmtINetFmt &GetINetFmt() const;
+ inline const SwFmtRuby &GetRuby() const;
inline const SwFmtMeta &GetMeta() const;
};
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 13af67950275..79e998c540dd 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -2,7 +2,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
@@ -53,9 +53,9 @@ public:
sal_Bool Next();
- sal_uInt16 GetCurrScript() const { return nCurScript; }
- xub_StrLen GetScriptChgPos() const { return nChgPos; }
- const String& GetText() const { return rText; }
+ sal_uInt16 GetCurrScript() const { return nCurScript; }
+ xub_StrLen GetScriptChgPos() const { return nChgPos; }
+ const String& GetText() const { return rText; }
};
@@ -78,8 +78,8 @@ public:
sal_Bool Next();
- const SfxPoolItem& GetAttr() const { return *pCurItem; }
- xub_StrLen GetChgPos() const { return nChgPos; }
+ const SfxPoolItem& GetAttr() const { return *pCurItem; }
+ xub_StrLen GetChgPos() const { return nChgPos; }
};
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 2e14cf50377e..aa346e0e1d1c 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include <calbck.hxx>
-class SwTxtNode; // fuer SwTxtFld
+class SwTxtNode; // fuer SwTxtFld
class SwCharFmt;
// ATT_CHARFMT *********************************************
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index f4fb06a8e2f0..b8c9543d685d 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -2,7 +2,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
@@ -46,9 +46,9 @@ public:
SwTxtFlyCnt( SwFmtFlyCnt& rAttr, xub_StrLen nStart );
// Setzt den Anker im pFmt und
- void SetAnchor( const SwTxtNode *pNode );
+ void SetAnchor( const SwTxtNode *pNode );
- inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm );
+ inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm );
inline const SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ) const;
// erzeugt sich ein neues FlyFrameFormat
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index a155da15b9fa..d1cdf28e9585 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 55eaa777b3c7..873ac6b8856f 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 48096c4f5cb3..66790f4da23b 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index c7507798be87..ac941843407d 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index e70c28305082..ac2738bb30ef 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 4811404a7517..f2eb3ea34c1f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -2,7 +2,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
@@ -214,8 +214,8 @@ protected:
// Inhalte in das UndoNodesArray verschoben. Diese Methoden fuegen
// am Ende eines TextNodes ein Trenner fuer die Attribute. Damit werden
// Attribute nicht expandiert.
- // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray
- // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray
+ // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray
+ // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray
void MoveToUndoNds( SwPaM& rPam,
SwNodeIndex* pNodeIdx = 0, SwIndex* pCntIdx = 0,
ULONG* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 );
@@ -246,7 +246,7 @@ class SwUndoSaveSection : private SwUndoSaveCntnt
{
SwNodeIndex *pMvStt;
SwRedlineSaveDatas* pRedlSaveData;
- ULONG nMvLen; // Index ins UndoNodes-Array
+ ULONG nMvLen; // Index ins UndoNodes-Array
ULONG nStartPos;
protected:
@@ -263,7 +263,7 @@ public:
void RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos );
const SwHistory* GetHistory() const { return pHistory; }
- SwHistory* GetHistory() { return pHistory; }
+ SwHistory* GetHistory() { return pHistory; }
};
@@ -347,7 +347,7 @@ public:
class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
{
- SwPosition *pPos; // Inhalt fuers Redo
+ SwPosition *pPos; // Inhalt fuers Redo
String *pTxt, *pUndoTxt;
SwRedlineData* pRedlData;
ULONG nNode;
@@ -357,7 +357,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
const IDocumentContentOperations::InsertFlags m_nInsertFlags;
- friend class SwDoc; // eigentlich nur SwDoc::Insert( String )
+ friend class SwDoc; // eigentlich nur SwDoc::Insert( String )
BOOL CanGrouping( sal_Unicode cIns );
BOOL CanGrouping( const SwPosition& rPos );
@@ -398,7 +398,7 @@ public:
class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt
{
- SwNodeIndex* pMvStt; // Position der Nodes im UndoNodes-Array
+ SwNodeIndex* pMvStt; // Position der Nodes im UndoNodes-Array
String *pSttStr, *pEndStr;
SwRedlineData* pRedlData;
SwRedlineSaveDatas* pRedlSaveData;
@@ -408,18 +408,18 @@ class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt
String sTableName;
ULONG nNode;
- ULONG nNdDiff; // Differenz von Nodes vor-nach Delete
- ULONG nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes
+ ULONG nNdDiff; // Differenz von Nodes vor-nach Delete
+ ULONG nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes
ULONG nReplaceDummy; // Diff. to a temporary dummy object
USHORT nSetPos;
- BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !!
- BOOL bBackSp : 1; // TRUE: wenn Gruppierung und der Inhalt davor geloescht wird
- BOOL bJoinNext: 1; // TRUE: wenn der Bereich von Oben nach unten geht
- BOOL bTblDelLastNd : 1; // TRUE: TextNode hinter der Tabelle einf./loeschen
- BOOL bDelFullPara : 1; // TRUE: gesamte Nodes wurden geloescht
- BOOL bResetPgDesc : 1; // TRUE: am nachfolgenden Node das PgDsc zuruecksetzen
- BOOL bResetPgBrk : 1; // TRUE: am nachfolgenden Node das PgBreak zuruecksetzen
+ BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !!
+ BOOL bBackSp : 1; // TRUE: wenn Gruppierung und der Inhalt davor geloescht wird
+ BOOL bJoinNext: 1; // TRUE: wenn der Bereich von Oben nach unten geht
+ BOOL bTblDelLastNd : 1; // TRUE: TextNode hinter der Tabelle einf./loeschen
+ BOOL bDelFullPara : 1; // TRUE: gesamte Nodes wurden geloescht
+ BOOL bResetPgDesc : 1; // TRUE: am nachfolgenden Node das PgDsc zuruecksetzen
+ BOOL bResetPgBrk : 1; // TRUE: am nachfolgenden Node das PgBreak zuruecksetzen
BOOL bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
BOOL SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
@@ -447,7 +447,7 @@ public:
BOOL CanGrouping( SwDoc*, const SwPaM& );
- void SetTblDelLastNd() { bTblDelLastNd = TRUE; }
+ void SetTblDelLastNd() { bTblDelLastNd = TRUE; }
// fuer die PageDesc/PageBreak Attribute einer Tabelle
void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc )
@@ -470,9 +470,9 @@ class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
SwRedlineSaveDatas* pRedlSaveData;
ULONG nSttNode;
xub_StrLen nSttCntnt;
- BOOL bInsChar : 1; // kein Overwrite mehr; sondern Insert
- BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in
- // CanGrouping() ausgwertet !!
+ BOOL bInsChar : 1; // kein Overwrite mehr; sondern Insert
+ BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in
+ // CanGrouping() ausgwertet !!
public:
SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns );
virtual ~SwUndoOverwrite();
@@ -512,7 +512,7 @@ public:
virtual void Undo( SwUndoIter& );
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- void SetTblFlag() { bTblFlag = TRUE; }
+ void SetTblFlag() { bTblFlag = TRUE; }
};
@@ -524,7 +524,7 @@ class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
ULONG nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode;
xub_StrLen nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt;
- USHORT nFtnStt; // StartPos der Fussnoten in der History
+ USHORT nFtnStt; // StartPos der Fussnoten in der History
BOOL bJoinNext : 1,
bJoinPrev : 1,
@@ -543,10 +543,10 @@ public:
void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd,
const SwNodeIndex& rInsPos );
- BOOL IsMoveRange() const { return bMoveRange; }
- ULONG GetEndNode() const { return nEndNode; }
- ULONG GetDestSttNode() const { return nDestSttNode; }
- xub_StrLen GetDestSttCntnt() const { return nDestSttCntnt; }
+ BOOL IsMoveRange() const { return bMoveRange; }
+ ULONG GetEndNode() const { return nEndNode; }
+ ULONG GetDestSttNode() const { return nDestSttNode; }
+ xub_StrLen GetDestSttCntnt() const { return nDestSttCntnt; }
void SetMoveRedlines( bool b ) { bMoveRedlines = b; }
@@ -765,8 +765,8 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt
BOOL bSttWasTxtNd;
protected:
ULONG nNdDiff;
- SwPosition *pPos; // Inhalt fuers Redo
- USHORT nSetPos; // Start in der History-Liste
+ SwPosition *pPos; // Inhalt fuers Redo
+ USHORT nSetPos; // Start in der History-Liste
SwUndoInserts( SwUndoId nUndoId, const SwPaM& );
public:
@@ -798,7 +798,7 @@ class SwUndoInsTbl : public SwUndo
SwInsertTableOptions aInsTblOpts;
SwDDEFieldType* pDDEFldType;
SvUShorts* pColWidth;
- SwRedlineData* pRedlData;
+ SwRedlineData* pRedlData;
SwTableAutoFmt* pAutoFmt;
ULONG nSttNode;
USHORT nRows, nCols;
@@ -838,7 +838,7 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- SwHistory& GetHistory(); // wird ggfs. angelegt
+ SwHistory& GetHistory(); // wird ggfs. angelegt
void AddFillBox( const SwTableBox& rBox );
};
@@ -905,7 +905,7 @@ class SwUndoTblNdsChg : public SwUndo
SvULongs* pNewSttNds;
SwUndoSaveSections* pDelSects;
} Ptrs;
- SvBools aMvBoxes; // fuers SplitRow (aufgeteilte Nodes einer Box)
+ SvBools aMvBoxes; // fuers SplitRow (aufgeteilte Nodes einer Box)
long nMin, nMax; // for redo of delete column
ULONG nSttNode, nCurrBox;
USHORT nCount, nRelDiff, nAbsDiff, nSetColType;
@@ -1031,7 +1031,7 @@ public:
virtual void Undo( SwUndoIter& );
virtual void Redo( SwUndoIter& );
- void SetTableSttIdx( ULONG nIdx ) { nTblNode = nIdx; }
+ void SetTableSttIdx( ULONG nIdx ) { nTblNode = nIdx; }
};
class SwUndoSplitTbl : public SwUndo
@@ -1049,8 +1049,8 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- void SetTblNodeOffset( ULONG nIdx ) { nOffset = nIdx - nTblNode; }
- SwHistory* GetHistory() { return pHistory; }
+ void SetTblNodeOffset( ULONG nIdx ) { nOffset = nIdx - nTblNode; }
+ SwHistory* GetHistory() { return pHistory; }
void SaveFormula( SwHistory& rHistory );
};
@@ -1148,11 +1148,11 @@ SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10,30)
class SwUndoSort : public SwUndo, private SwUndRng
{
- SwSortOptions* pSortOpt; // die Optionen mit den Sortier-Kriterien
- SwSortList aSortList;
- SwUndoAttrTbl* pUndoTblAttr;
- SwRedlineData* pRedlData;
- ULONG nTblNd;
+ SwSortOptions* pSortOpt; // die Optionen mit den Sortier-Kriterien
+ SwSortList aSortList;
+ SwUndoAttrTbl* pUndoTblAttr;
+ SwRedlineData* pRedlData;
+ ULONG nTblNd;
void RemoveIdx( SwPaM& rPam );
public:
@@ -1177,11 +1177,11 @@ public:
class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
{
protected:
- SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat
+ SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat
ULONG nNdPgPos;
- xub_StrLen nCntPos; // Seite/am Absatz/im Absatz
+ xub_StrLen nCntPos; // Seite/am Absatz/im Absatz
USHORT nRndId;
- BOOL bDelFmt; // loesche das gespeicherte Format
+ BOOL bDelFmt; // loesche das gespeicherte Format
void InsFly( SwUndoIter&, BOOL bShowSel = TRUE );
void DelFly( SwDoc* );
@@ -1223,7 +1223,7 @@ public:
virtual void Undo( SwUndoIter& );
virtual void Redo( SwUndoIter& );
- void Redo(); // Schnittstelle fuers Rollback
+ void Redo(); // Schnittstelle fuers Rollback
void ChgShowSel( BOOL bNew ) { bShowSelFrm = bNew; }
@@ -1234,10 +1234,10 @@ public:
class SwUndoSetFlyFmt : public SwUndo, public SwClient
{
- SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat
- SwFrmFmt* pOldFmt; // die alte Fly Vorlage
- SwFrmFmt* pNewFmt; // die neue Fly Vorlage
- SfxItemSet* pItemSet; // die zurueck-/ gesetzten Attribute
+ SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat
+ SwFrmFmt* pOldFmt; // die alte Fly Vorlage
+ SwFrmFmt* pNewFmt; // die neue Fly Vorlage
+ SfxItemSet* pItemSet; // die zurueck-/ gesetzten Attribute
ULONG nOldNode, nNewNode;
xub_StrLen nOldCntnt, nNewCntnt;
USHORT nOldAnchorTyp, nNewAnchorTyp;
@@ -1267,7 +1267,7 @@ class SwUndoReplace : public SwUndo
friend class SwDoc;
BOOL bOldIterFlag; // Status vom Undo-Iter vorm 1. Aufruf
- USHORT nAktPos; // fuer GetUndoRange und Undo/Redo
+ USHORT nAktPos; // fuer GetUndoRange und Undo/Redo
_UnReplaceDatas aArr;
SwRedlineData* pRedlData;
@@ -1375,7 +1375,7 @@ public:
class SwUndoDefaultAttr : public SwUndo
{
- ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes
+ ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes
::std::auto_ptr<SvxTabStopItem> m_pTabStop;
public:
@@ -1409,7 +1409,7 @@ public:
virtual void Repeat( SwUndoIter& );
virtual SwRewriter GetRewriter() const;
- SwHistory* GetHistory(); // wird ggfs. neu angelegt!
+ SwHistory* GetHistory(); // wird ggfs. neu angelegt!
void SetSttNum( ULONG nNdIdx ) { nSttSet = nNdIdx; }
void SaveOldNumRule( const SwNumRule& rOld );
@@ -1490,7 +1490,7 @@ public:
class SwSdrUndo : public SwUndo
{
SdrUndoAction* pSdrUndo;
- SdrMarkList* pMarkList; // MarkList for all selected SdrObjects
+ SdrMarkList* pMarkList; // MarkList for all selected SdrObjects
public:
SwSdrUndo( SdrUndoAction* , const SdrMarkList* pMarkList );
virtual ~SwSdrUndo();
@@ -1564,7 +1564,7 @@ class SwUndoDrawUnGroupConnectToLayout : public SwUndo
class SwUndoDrawDelete : public SwUndo
{
SwUndoGroupObjImpl* pObjArr;
- SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects
+ SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects
USHORT nSize;
BOOL bDelFmt;
@@ -1623,10 +1623,10 @@ class SwUndoInsertLabel : public SwUndo
// OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
USHORT nFldId;
SwLabelType eType;
- BYTE nLayerId; // fuer Zeichen-Objekte
- BOOL bBefore :1;
- BOOL bUndoKeep :1;
- BOOL bCpyBrd :1;
+ BYTE nLayerId; // fuer Zeichen-Objekte
+ BOOL bBefore :1;
+ BOOL bUndoKeep :1;
+ BOOL bCpyBrd :1;
public:
SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
@@ -1661,7 +1661,7 @@ public:
void SetNodePos( ULONG nNd )
{ if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
- void SetUndoKeep() { bUndoKeep = TRUE; }
+ void SetUndoKeep() { bUndoKeep = TRUE; }
void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly );
void SetDrawObj( BYTE nLayerId );
};
@@ -1832,7 +1832,7 @@ public:
class SwUndoIter
{
- friend class SwDoc; // um im SwDoc::Undo bWeiter zu stezen
+ friend class SwDoc; // um im SwDoc::Undo bWeiter zu stezen
friend void SwUndoEnd::Undo( SwUndoIter& );
friend void SwUndoStart::Undo( SwUndoIter& );
friend void SwUndoEnd::Redo( SwUndoIter& );
@@ -1845,25 +1845,25 @@ class SwUndoIter
SwUndoId nUndoId;
USHORT nEndCnt;
BOOL bWeiter : 1;
- BOOL bUpdateAttr : 1; // Setze das GCAttr an der CursorShell
+ BOOL bUpdateAttr : 1; // Setze das GCAttr an der CursorShell
public:
- SwPaM * pAktPam; // Member fuer das Undo
- SwUndo* pLastUndoObj; // fuers Redo, das vorherige UndoObj.
- SwFrmFmt* pSelFmt; // ggfs. das Format Rahmen/Object-Selektionen
- SdrMarkList* pMarkList; // MarkList for all selected SdrObjects
+ SwPaM * pAktPam; // Member fuer das Undo
+ SwUndo* pLastUndoObj; // fuers Redo, das vorherige UndoObj.
+ SwFrmFmt* pSelFmt; // ggfs. das Format Rahmen/Object-Selektionen
+ SdrMarkList* pMarkList; // MarkList for all selected SdrObjects
SwUndoIter( SwPaM * pPam, SwUndoId nId = UNDO_EMPTY );
- BOOL IsNextUndo() const { return bWeiter; }
- BOOL IsUpdateAttr() const { return bUpdateAttr; }
- void SetUpdateAttr( BOOL bNew ) { bUpdateAttr = bNew; }
+ BOOL IsNextUndo() const { return bWeiter; }
+ BOOL IsUpdateAttr() const { return bUpdateAttr; }
+ void SetUpdateAttr( BOOL bNew ) { bUpdateAttr = bNew; }
inline SwDoc& GetDoc() const;
SwUndoId GetId() const { return nUndoId; }
SwUndoId GetLastUndoId() const
{ return pLastUndoObj ? pLastUndoObj->GetId() : UNDO_EMPTY ; }
- void ClearSelections() { pSelFmt = 0; pMarkList = 0; }
+ void ClearSelections() { pSelFmt = 0; pMarkList = 0; }
};
diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx
index 4e23effa5072..735678089781 100644
--- a/sw/inc/unoatxt.hxx
+++ b/sw/inc/unoatxt.hxx
@@ -2,7 +2,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
@@ -41,10 +41,10 @@
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <cppuhelper/implbase6.hxx> // helper for implementations
#include <svtools/unoevent.hxx>
class SwTextBlocks;
class SwGlossaries;
@@ -76,7 +76,7 @@ class SwXAutoTextContainer : public cppu::WeakImplHelper3
SwGlossaries *pGlossaries;
protected:
- virtual ~SwXAutoTextContainer(); // ref-counted objects are not to be deleted from outside -> protected dtor
+ virtual ~SwXAutoTextContainer(); // ref-counted objects are not to be deleted from outside -> protected dtor
public:
SwXAutoTextContainer();
@@ -119,15 +119,15 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper6
>
{
const SfxItemPropertySet* pPropSet;
- SwGlossaries* pGlossaries;
- rtl::OUString sName;
- String m_sGroupName; // prefix m_ to disambiguate from some local vars in the implementation
+ SwGlossaries* pGlossaries;
+ rtl::OUString sName;
+ String m_sGroupName; // prefix m_ to disambiguate from some local vars in the implementation
protected:
- virtual ~SwXAutoTextGroup(); // ref-counted objects are not to be deleted from outside -> protected dtor
+ virtual ~SwXAutoTextGroup(); // ref-counted objects are not to be deleted from outside -> protected dtor
public:
- SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss/*SwTextBlocks* pGroup*/);
+ SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss/*SwTextBlocks* pGroup*/);
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -173,7 +173,7 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//
- void Invalidate();
+ void Invalidate();
};
/* -----------------17.06.98 12:03-------------------
@@ -190,11 +190,11 @@ class SwXAutoTextEntry
::com::sun::star::document::XEventsSupplier
>
{
- SwGlossaries* pGlossaries;
- String sGroupName;
- String sEntryName;
- SwDocShellRef xDocSh;
- SwXBodyText* pBodyText;
+ SwGlossaries* pGlossaries;
+ String sGroupName;
+ String sEntryName;
+ SwDocShellRef xDocSh;
+ SwXBodyText* pBodyText;
com::sun::star::uno::Reference < com::sun::star::lang::XServiceInfo> xBodyText;
void EnsureBodyText ()
@@ -216,13 +216,13 @@ protected:
(in-memory) copy to disk.</p>
*/
- void implFlushDocument( bool _bCloseDoc = false );
+ void implFlushDocument( bool _bCloseDoc = false );
// SfxListener overridables
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
protected:
- virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor
+ virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor
public:
SwXAutoTextEntry(SwGlossaries* , const String& rGroupName, const String& rEntryName);
@@ -248,7 +248,7 @@ public:
virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
//XAutoTextEntry
- virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -258,10 +258,10 @@ public:
// XEventsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException );
- void Invalidate() {pGlossaries = 0;}
+ void Invalidate() {pGlossaries = 0;}
const SwGlossaries* GetGlossaries() { return pGlossaries; }
- const String& GetGroupName() {return sGroupName;}
- const String& GetEntryName() {return sEntryName;}
+ const String& GetGroupName() {return sGroupName;}
+ const String& GetEntryName() {return sEntryName;}
};
@@ -276,30 +276,30 @@ class SwAutoTextEventDescriptor : public SvBaseEventDescriptor
using SvBaseEventDescriptor::getByName;
public:
- SwAutoTextEventDescriptor( SwXAutoTextEntry& rAutoText );
+ SwAutoTextEventDescriptor( SwXAutoTextEntry& rAutoText );
~SwAutoTextEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
- virtual void replaceByName(
- const USHORT nEvent, /// item ID of event
- const SvxMacro& rMacro) /// event (will be copied)
+ virtual void replaceByName(
+ const USHORT nEvent, /// item ID of event
+ const SvxMacro& rMacro) /// event (will be copied)
throw(
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::container::NoSuchElementException,
+ ::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void getByName(
- SvxMacro& rMacro, /// macro to be filled
- const USHORT nEvent ) /// item ID of event
+ virtual void getByName(
+ SvxMacro& rMacro, /// macro to be filled
+ const USHORT nEvent ) /// item ID of event
throw(
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::container::NoSuchElementException,
+ ::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 28ea05d5a3cf..2821e277e7bf 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -2,7 +2,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
@@ -98,7 +98,7 @@ class UnoActionRemoveContext
::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
-/// helper function for implementing SwClient::Modify
+/// helper function for implementing SwClient::Modify
void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
diff --git a/sw/inc/unobookmark.hxx b/sw/inc/unobookmark.hxx
index 3fb7ea005f48..f21928631cea 100644
--- a/sw/inc/unobookmark.hxx
+++ b/sw/inc/unobookmark.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 86c2df6bad22..ac28d85fcab2 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -2,7 +2,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
@@ -169,7 +169,7 @@ class SwChartDataProvider :
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const ::rtl::OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
+
rtl::OUString GetBrokenCellRangeForExport( const rtl::OUString &rCellRangeRepresentation );
public:
@@ -283,7 +283,7 @@ class SwChartDataSequence :
SwChartDataProvider * pDataProvider;
SwUnoCrsr* pTblCrsr; // cursor spanned over cells to use
- SwDepend aCursorDepend; //the cursor is removed after the doc has been removed
+ SwDepend aCursorDepend; //the cursor is removed after the doc has been removed
const SfxItemPropertySet* _pPropSet;
@@ -391,7 +391,7 @@ class SwChartLabeledDataSequence :
SwChartLabeledDataSequence( const SwChartLabeledDataSequence & );
SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & );
- void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource );
+ void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource );
public:
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 8ac484dfe59d..230c0f335e39 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -2,7 +2,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
@@ -36,9 +36,9 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
#include <IMark.hxx>
#include <unobaseclass.hxx>
#include "swdllapi.h"
@@ -68,72 +68,72 @@ class SwXBookmark;
--------------------------------------------------*/
class SwUnoCollection
{
- SwDoc* pDoc;
- sal_Bool bObjectValid;
+ SwDoc* pDoc;
+ sal_Bool bObjectValid;
public:
SwUnoCollection(SwDoc* p) :
pDoc(p),
bObjectValid(sal_True){}
- virtual void Invalidate();
- sal_Bool IsValid() const {return bObjectValid;}
+ virtual void Invalidate();
+ sal_Bool IsValid() const {return bObjectValid;}
- SwDoc* GetDoc() const {return pDoc;}
+ SwDoc* GetDoc() const {return pDoc;}
};
/******************************************************************************
*
******************************************************************************/
-#define SW_SERVICE_TYPE_TEXTTABLE 0
-#define SW_SERVICE_TYPE_TEXTFRAME 1
-#define SW_SERVICE_TYPE_GRAPHIC 2
-#define SW_SERVICE_TYPE_OLE 3
-#define SW_SERVICE_TYPE_BOOKMARK 4
-#define SW_SERVICE_TYPE_FOOTNOTE 5
-#define SW_SERVICE_TYPE_ENDNOTE 6
-#define SW_SERVICE_TYPE_INDEXMARK 7
-#define SW_SERVICE_TYPE_INDEX 8
-#define SW_SERVICE_REFERENCE_MARK 9
-#define SW_SERVICE_STYLE_CHARACTER_STYLE 10
-#define SW_SERVICE_STYLE_PARAGRAPH_STYLE 11
-#define SW_SERVICE_STYLE_FRAME_STYLE 12
-#define SW_SERVICE_STYLE_PAGE_STYLE 13
-#define SW_SERVICE_STYLE_NUMBERING_STYLE 14
-#define SW_SERVICE_CONTENT_INDEX_MARK 15
-#define SW_SERVICE_CONTENT_INDEX 16
-#define SW_SERVICE_USER_INDEX_MARK 17
-#define SW_SERVICE_USER_INDEX 18
-#define SW_SERVICE_TEXT_SECTION 19
-#define SW_SERVICE_FIELDTYPE_DATETIME 20
-#define SW_SERVICE_FIELDTYPE_USER 21
-#define SW_SERVICE_FIELDTYPE_SET_EXP 22
-#define SW_SERVICE_FIELDTYPE_GET_EXP 23
-#define SW_SERVICE_FIELDTYPE_FILE_NAME 24
-#define SW_SERVICE_FIELDTYPE_PAGE_NUM 25
-#define SW_SERVICE_FIELDTYPE_AUTHOR 26
-#define SW_SERVICE_FIELDTYPE_CHAPTER 27
-#define SW_SERVICE_FIELDTYPE_DUMMY_0 28
-#define SW_SERVICE_FIELDTYPE_GET_REFERENCE 29
-#define SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT 30
-#define SW_SERVICE_FIELDTYPE_ANNOTATION 31
-#define SW_SERVICE_FIELDTYPE_INPUT 32
-#define SW_SERVICE_FIELDTYPE_MACRO 33
-#define SW_SERVICE_FIELDTYPE_DDE 34
-#define SW_SERVICE_FIELDTYPE_HIDDEN_PARA 35
-#define SW_SERVICE_FIELDTYPE_DOC_INFO 36
-#define SW_SERVICE_FIELDTYPE_TEMPLATE_NAME 37
-#define SW_SERVICE_FIELDTYPE_USER_EXT 38
-#define SW_SERVICE_FIELDTYPE_REF_PAGE_SET 39
-#define SW_SERVICE_FIELDTYPE_REF_PAGE_GET 40
-#define SW_SERVICE_FIELDTYPE_JUMP_EDIT 41
-#define SW_SERVICE_FIELDTYPE_SCRIPT 42
-#define SW_SERVICE_FIELDTYPE_DATABASE_NEXT_SET 43
-#define SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET 44
-#define SW_SERVICE_FIELDTYPE_DATABASE_SET_NUM 45
-#define SW_SERVICE_FIELDTYPE_DATABASE 46
-#define SW_SERVICE_FIELDTYPE_DATABASE_NAME 47
+#define SW_SERVICE_TYPE_TEXTTABLE 0
+#define SW_SERVICE_TYPE_TEXTFRAME 1
+#define SW_SERVICE_TYPE_GRAPHIC 2
+#define SW_SERVICE_TYPE_OLE 3
+#define SW_SERVICE_TYPE_BOOKMARK 4
+#define SW_SERVICE_TYPE_FOOTNOTE 5
+#define SW_SERVICE_TYPE_ENDNOTE 6
+#define SW_SERVICE_TYPE_INDEXMARK 7
+#define SW_SERVICE_TYPE_INDEX 8
+#define SW_SERVICE_REFERENCE_MARK 9
+#define SW_SERVICE_STYLE_CHARACTER_STYLE 10
+#define SW_SERVICE_STYLE_PARAGRAPH_STYLE 11
+#define SW_SERVICE_STYLE_FRAME_STYLE 12
+#define SW_SERVICE_STYLE_PAGE_STYLE 13
+#define SW_SERVICE_STYLE_NUMBERING_STYLE 14
+#define SW_SERVICE_CONTENT_INDEX_MARK 15
+#define SW_SERVICE_CONTENT_INDEX 16
+#define SW_SERVICE_USER_INDEX_MARK 17
+#define SW_SERVICE_USER_INDEX 18
+#define SW_SERVICE_TEXT_SECTION 19
+#define SW_SERVICE_FIELDTYPE_DATETIME 20
+#define SW_SERVICE_FIELDTYPE_USER 21
+#define SW_SERVICE_FIELDTYPE_SET_EXP 22
+#define SW_SERVICE_FIELDTYPE_GET_EXP 23
+#define SW_SERVICE_FIELDTYPE_FILE_NAME 24
+#define SW_SERVICE_FIELDTYPE_PAGE_NUM 25
+#define SW_SERVICE_FIELDTYPE_AUTHOR 26
+#define SW_SERVICE_FIELDTYPE_CHAPTER 27
+#define SW_SERVICE_FIELDTYPE_DUMMY_0 28
+#define SW_SERVICE_FIELDTYPE_GET_REFERENCE 29
+#define SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT 30
+#define SW_SERVICE_FIELDTYPE_ANNOTATION 31
+#define SW_SERVICE_FIELDTYPE_INPUT 32
+#define SW_SERVICE_FIELDTYPE_MACRO 33
+#define SW_SERVICE_FIELDTYPE_DDE 34
+#define SW_SERVICE_FIELDTYPE_HIDDEN_PARA 35
+#define SW_SERVICE_FIELDTYPE_DOC_INFO 36
+#define SW_SERVICE_FIELDTYPE_TEMPLATE_NAME 37
+#define SW_SERVICE_FIELDTYPE_USER_EXT 38
+#define SW_SERVICE_FIELDTYPE_REF_PAGE_SET 39
+#define SW_SERVICE_FIELDTYPE_REF_PAGE_GET 40
+#define SW_SERVICE_FIELDTYPE_JUMP_EDIT 41
+#define SW_SERVICE_FIELDTYPE_SCRIPT 42
+#define SW_SERVICE_FIELDTYPE_DATABASE_NEXT_SET 43
+#define SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET 44
+#define SW_SERVICE_FIELDTYPE_DATABASE_SET_NUM 45
+#define SW_SERVICE_FIELDTYPE_DATABASE 46
+#define SW_SERVICE_FIELDTYPE_DATABASE_NAME 47
#define SW_SERVICE_FIELDTYPE_TABLE_FORMULA 48
#define SW_SERVICE_FIELDTYPE_PAGE_COUNT 49
#define SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT 50
@@ -167,7 +167,7 @@ class SwUnoCollection
#define SW_SERVICE_FIELDTYPE_DUMMY_5 78
#define SW_SERVICE_FIELDTYPE_DUMMY_6 79
#define SW_SERVICE_FIELDTYPE_DUMMY_7 80
-#define SW_SERVICE_FIELDMASTER_USER 81
+#define SW_SERVICE_FIELDMASTER_USER 81
#define SW_SERVICE_FIELDMASTER_DDE 82
#define SW_SERVICE_FIELDMASTER_SET_EXP 83
#define SW_SERVICE_FIELDMASTER_DATABASE 84
@@ -176,18 +176,18 @@ class SwUnoCollection
#define SW_SERVICE_FIELDMASTER_DUMMY3 87
#define SW_SERVICE_FIELDMASTER_DUMMY4 88
#define SW_SERVICE_FIELDMASTER_DUMMY5 89
-#define SW_SERVICE_INDEX_ILLUSTRATIONS 90
+#define SW_SERVICE_INDEX_ILLUSTRATIONS 90
#define SW_SERVICE_INDEX_OBJECTS 91
#define SW_SERVICE_INDEX_TABLES 92
#define SW_SERVICE_INDEX_BIBLIOGRAPHY 93
-#define SW_SERVICE_PARAGRAPH 94
-#define SW_SERVICE_FIELDTYPE_INPUT_USER 95
-#define SW_SERVICE_FIELDTYPE_HIDDEN_TEXT 96
-#define SW_SERVICE_STYLE_CONDITIONAL_PARAGRAPH_STYLE 97
-#define SW_SERVICE_NUMBERING_RULES 98
-#define SW_SERVICE_TEXT_COLUMNS 99
-#define SW_SERVICE_INDEX_HEADER_SECTION 100
-#define SW_SERVICE_DEFAULTS 101
+#define SW_SERVICE_PARAGRAPH 94
+#define SW_SERVICE_FIELDTYPE_INPUT_USER 95
+#define SW_SERVICE_FIELDTYPE_HIDDEN_TEXT 96
+#define SW_SERVICE_STYLE_CONDITIONAL_PARAGRAPH_STYLE 97
+#define SW_SERVICE_NUMBERING_RULES 98
+#define SW_SERVICE_TEXT_COLUMNS 99
+#define SW_SERVICE_INDEX_HEADER_SECTION 100
+#define SW_SERVICE_DEFAULTS 101
#define SW_SERVICE_IMAP_RECTANGLE 102
#define SW_SERVICE_IMAP_CIRCLE 103
#define SW_SERVICE_IMAP_POLYGON 104
@@ -203,7 +203,7 @@ class SwUnoCollection
#define SW_SERVICE_LAST SW_SERVICE_VBAGLOBALS
-#define SW_SERVICE_INVALID USHRT_MAX
+#define SW_SERVICE_INVALID USHRT_MAX
//
// case-corrected versions of service-names (see #i67811)
@@ -270,10 +270,10 @@ class SwUnoCollection
class SwXServiceProvider
{
public:
- static rtl::OUString GetProviderName(sal_uInt16 nObjectType);
- static sal_uInt16 GetProviderType(const rtl::OUString& rServiceName);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc);
- static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames();
+ static rtl::OUString GetProviderName(sal_uInt16 nObjectType);
+ static sal_uInt16 GetProviderType(const rtl::OUString& rServiceName);
+ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc);
+ static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames();
};
/*-----------------11.12.97 09:38-------------------
@@ -314,7 +314,7 @@ virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::st
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt );
+ static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt );
};
typedef
@@ -329,7 +329,7 @@ cppu::WeakImplHelper4
class SwXFrames : public SwXFramesBaseClass,
public SwUnoCollection
{
- const FlyCntType eType;
+ const FlyCntType eType;
protected:
virtual ~SwXFrames();
public:
@@ -357,7 +357,7 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
FlyCntType GetType()const{return eType;}
- static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType );
+ static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType );
};
@@ -372,7 +372,7 @@ public:
SwXTextFrames(SwDoc* pDoc);
-// SMART_UNO_DECLARATION( SwXTextFrames, UsrObject );
+// SMART_UNO_DECLARATION( SwXTextFrames, UsrObject );
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -392,7 +392,7 @@ public:
SwXTextGraphicObjects(SwDoc* pDoc);
-// SMART_UNO_DECLARATION( SwXTextGraphicObjects, UsrObject );
+// SMART_UNO_DECLARATION( SwXTextGraphicObjects, UsrObject );
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -412,7 +412,7 @@ public:
SwXTextEmbeddedObjects(SwDoc* pDoc);
-// SMART_UNO_DECLARATION( SwXTextEmbeddedObjects, UsrObject );
+// SMART_UNO_DECLARATION( SwXTextEmbeddedObjects, UsrObject );
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/unocore.hrc b/sw/inc/unocore.hrc
index 428229d88968..67ef961aa3e7 100644
--- a/sw/inc/unocore.hrc
+++ b/sw/inc/unocore.hrc
@@ -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
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index c0fc440ca5dd..a286ace5c998 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ protected:
public:
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
+// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
@@ -67,8 +67,8 @@ public:
virtual bool IsReadOnlyAvailable() const;
- BOOL IsRemainInSection() const { return bRemainInSection; }
- void SetRemainInSection( BOOL bFlag ) { bRemainInSection = bFlag; }
+ BOOL IsRemainInSection() const { return bRemainInSection; }
+ void SetRemainInSection( BOOL bFlag ) { bRemainInSection = bFlag; }
virtual BOOL IsSkipOverProtectSections() const
{ return bSkipOverProtectSections; }
@@ -101,7 +101,7 @@ public:
SwUnoTableCrsr( const SwPosition& rPos );
virtual ~SwUnoTableCrsr();
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
+// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
@@ -114,8 +114,8 @@ public:
void MakeBoxSels();
- SwCursor& GetSelRing() { return aTblSel; }
- const SwCursor& GetSelRing() const { return aTblSel; }
+ SwCursor& GetSelRing() { return aTblSel; }
+ const SwCursor& GetSelRing() const { return aTblSel; }
};
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 982f11834ff6..5e186ce782b7 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -2,7 +2,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
@@ -98,38 +98,38 @@ namespace SwUnoCursorHelper
, com::sun::star::beans::PropertyState& eState
, const SwTxtNode* pNode = 0 );
- void GetCurPageStyle(SwPaM& rPaM, String &rString);
+ void GetCurPageStyle(SwPaM& rPaM, String &rString);
- inline sal_Bool IsStartOfPara(SwPaM& rUnoCrsr)
+ inline sal_Bool IsStartOfPara(SwPaM& rUnoCrsr)
{ return rUnoCrsr.GetPoint()->nContent == 0;}
- inline sal_Bool IsEndOfPara(SwPaM& rUnoCrsr)
+ inline sal_Bool IsEndOfPara(SwPaM& rUnoCrsr)
{ return rUnoCrsr.GetCntntNode() &&
rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();}
void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
- void InsertFile(SwUnoCrsr* pUnoCrsr,
+ void InsertFile(SwUnoCrsr* pUnoCrsr,
const String& rURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rOptions
) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException );
- void getNumberingProperty(
+ void getNumberingProperty(
SwPaM& rPam,
com::sun::star::beans::PropertyState& eState,
com::sun::star::uno::Any *pAny );
- void setNumberingProperty(
+ void setNumberingProperty(
const com::sun::star::uno::Any& rValue,
SwPaM& rPam);
- sal_Int16 IsNodeNumStart(
+ sal_Int16 IsNodeNumStart(
SwPaM& rPam,
com::sun::star::beans::PropertyState& eState);
sal_Bool DocInsertStringSplitCR( SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints );
- void makeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
+ void makeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 5dcaf6605b43..57b90c7a9e4f 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ class SwDoc;
******************************************************************************/
class SwFmDrawPage : public SvxFmDrawPage
{
- SdrPageView* pPageView;
+ SdrPageView* pPageView;
protected:
// Erzeugen eines SdrObjects anhand einer Description. Kann von
@@ -68,14 +68,14 @@ public:
SwFmDrawPage( SdrPage* pPage );
virtual ~SwFmDrawPage() throw ();
- const SdrMarkList& PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes);
- void PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup);
-// void PostGroup(); ?? wird es noch gebraucht ??
+ const SdrMarkList& PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes);
+ void PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup);
+// void PostGroup(); ?? wird es noch gebraucht ??
- SdrView* GetDrawView() {return mpView;}
- SdrPageView* GetPageView();
- void RemovePageView();
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj );
+ SdrView* GetDrawView() {return mpView;}
+ SdrPageView* GetPageView();
+ void RemovePageView();
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj );
// Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt
// werden soll. abgeleitete Klassen koennen hier eine Ableitung oder
@@ -93,8 +93,8 @@ typedef cppu::WeakAggImplHelper4
SwXDrawPageBaseClass;
class SwXDrawPage : public SwXDrawPageBaseClass
{
- SwDoc* pDoc;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xPageAgg;
+ SwDoc* pDoc;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xPageAgg;
SwFmDrawPage* pDrawPage;
public:
SwXDrawPage(SwDoc* pDoc);
@@ -127,9 +127,9 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- SwFmDrawPage* GetSvxPage();
+ SwFmDrawPage* GetSvxPage();
// renamed and outlined to detect where it's called
- void InvalidateSwDoc(); // {pDoc = 0;}
+ void InvalidateSwDoc(); // {pDoc = 0;}
};
/* -----------------22.01.99 10:20-------------------
*
@@ -167,13 +167,13 @@ class SwXShape : public SwXShapeBaseClass,
const SfxItemPropertyMapEntry* m_pPropertyMapEntries;
com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId;
- SwShapeDescriptor_Impl* pImpl;
+ SwShapeDescriptor_Impl* pImpl;
- sal_Bool m_bDescriptor;
+ sal_Bool m_bDescriptor;
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
- SvxShape* GetSvxShape();
+ SvxShape* GetSvxShape();
/** method to determine top group object
@@ -314,8 +314,8 @@ public:
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
- SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;}
+ SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;}
// helper
static void AddExistingShapeToFmt( SdrObject& _rObj );
diff --git a/sw/inc/unoevent.hxx b/sw/inc/unoevent.hxx
index d99b926a646b..10f574307516 100644
--- a/sw/inc/unoevent.hxx
+++ b/sw/inc/unoevent.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
const ::rtl::OUString sImplName;
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
virtual ~SwHyperlinkEventDescriptor();
@@ -56,7 +56,7 @@ public:
SwHyperlinkEventDescriptor();
-
+
void copyMacrosFromINetFmt(const SwFmtINetFmt& aFmt);
void copyMacrosIntoINetFmt(SwFmtINetFmt& aFmt);
@@ -68,7 +68,7 @@ public:
-// SwEventDescriptor for
+// SwEventDescriptor for
// 1) SwXTextFrame
// 2) SwXGraphicObject
// 3) SwXEmbeddedObject
@@ -86,7 +86,7 @@ public:
~SwFrameEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
@@ -106,7 +106,7 @@ public:
~SwFrameStyleEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx
index c66568dbee53..2ca329e04202 100644
--- a/sw/inc/unoevtlstnr.hxx
+++ b/sw/inc/unoevtlstnr.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ namespace com{namespace sun{namespace star{
}
}}}
/* -----------------22.04.99 11:18-------------------
- * Verwaltung der EventListener
+ * Verwaltung der EventListener
* --------------------------------------------------*/
typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr;
SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4)
@@ -46,15 +46,15 @@ SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4)
class SwEventListenerContainer
{
protected:
- SwEvtLstnrArray* pListenerArr;
- ::com::sun::star::uno::XInterface* pxParent;
+ SwEvtLstnrArray* pListenerArr;
+ ::com::sun::star::uno::XInterface* pxParent;
public:
SwEventListenerContainer( ::com::sun::star::uno::XInterface* pxParent);
~SwEventListenerContainer();
- void AddListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener);
- BOOL RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener);
- void Disposing();
+ void AddListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener);
+ BOOL RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener);
+ void Disposing();
};
#endif
diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx
index f5adfba99cbf..b1ae9386cb74 100644
--- a/sw/inc/unofield.hxx
+++ b/sw/inc/unofield.hxx
@@ -2,7 +2,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
@@ -59,21 +59,21 @@ class SwXFieldMaster : public cppu::WeakImplHelper4
>,
public SwClient
{
- SwEventListenerContainer aLstnrCntnr;
+ SwEventListenerContainer aLstnrCntnr;
sal_uInt16 nResTypeId;
- SwDoc* m_pDoc;
+ SwDoc* m_pDoc;
sal_Bool m_bIsDescriptor;
- String sParam1; //Content / Database / NumberingSeparator
- String sParam2; // - /DataTablename
- String sParam3; // - /DataFieldName
+ String sParam1; //Content / Database / NumberingSeparator
+ String sParam2; // - /DataTablename
+ String sParam3; // - /DataFieldName
String sParam4;
String sParam5; // - /DataBaseURL
String sParam6; // - /DataBaseResource
- double fParam1; // Value / -
- sal_Int8 nParam1; // ChapterNumberingLevel
- sal_Bool bParam1; // IsExpression
+ double fParam1; // Value / -
+ sal_Int8 nParam1; // ChapterNumberingLevel
+ sal_Bool bParam1; // IsExpression
sal_Int32 nParam2;
protected:
@@ -82,7 +82,7 @@ public:
SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId);
SwXFieldMaster(SwFieldType& rType, SwDoc* pDoc);
-
+
TYPEINFO();
@@ -117,10 +117,10 @@ public:
static rtl::OUString LocalizeFormula(const SwSetExpField& rFld, const rtl::OUString& rFormula, sal_Bool bQuery);
SwFieldType* GetFldType(sal_Bool bDontCreate = sal_False) const;
- SwDoc* GetDoc() {return m_pDoc;}
+ SwDoc* GetDoc() {return m_pDoc;}
- sal_Bool IsDescriptor()const {return m_bIsDescriptor;}
- sal_uInt16 GetResId() const {return nResTypeId;}
+ sal_Bool IsDescriptor()const {return m_bIsDescriptor;}
+ sal_uInt16 GetResId() const {return nResTypeId;}
};
/* -----------------04.12.98 12:49-------------------
@@ -137,27 +137,27 @@ class SwXTextField : public cppu::WeakImplHelper5
>,
public SwClient
{
- SwEventListenerContainer aLstnrCntnr;
- const SwFmtFld* pFmtFld;
- SwDoc* m_pDoc;
- SwTextAPIObject* m_pTextObject;
+ SwEventListenerContainer aLstnrCntnr;
+ const SwFmtFld* pFmtFld;
+ SwDoc* m_pDoc;
+ SwTextAPIObject* m_pTextObject;
- sal_Bool m_bIsDescriptor;
+ sal_Bool m_bIsDescriptor;
SwClient m_aFieldTypeClient; // required to access field master of not yet inserted fields
sal_Bool m_bCallUpdate;
sal_uInt16 m_nServiceId;
- SwFieldProperties_Impl* m_pProps;
- String m_sTypeName;
+ SwFieldProperties_Impl* m_pProps;
+ String m_sTypeName;
//SwFieldType* GetFldType() const { return (SwFieldType*)GetRegisteredIn(); }
- SwDoc* GetDoc() {return m_pDoc;}
+ SwDoc* GetDoc() {return m_pDoc;}
protected:
virtual ~SwXTextField();
public:
SwXTextField(sal_uInt16 nServiceId, SwDoc* pDoc=0);
SwXTextField(const SwFmtFld& rFmt, SwDoc* pDoc);
-
+
TYPEINFO();
@@ -204,8 +204,8 @@ public:
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- const SwField* GetField() const;
- const SwFmtFld* GetFldFmt(){return GetField() ? pFmtFld : 0; };
+ const SwField* GetField() const;
+ const SwFmtFld* GetFldFmt(){return GetField() ? pFmtFld : 0; };
void Invalidate();
};
@@ -231,7 +231,7 @@ protected:
virtual ~SwXTextFieldMasters();
public:
SwXTextFieldMasters(SwDoc* pDoc);
-
+
//XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
@@ -270,7 +270,7 @@ protected:
virtual ~SwXTextFieldTypes();
public:
SwXTextFieldTypes(SwDoc* pDoc);
-
+
//XEnumerationAccess
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -323,7 +323,7 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//SwClient
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
};
#endif
diff --git a/sw/inc/unoflatpara.hxx b/sw/inc/unoflatpara.hxx
index ff18c5c3b543..b67c8a4a6ce5 100644
--- a/sw/inc/unoflatpara.hxx
+++ b/sw/inc/unoflatpara.hxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@ public:
SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper::ConversionMap* pConversionMap );
virtual ~SwXFlatParagraph();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
virtual void SAL_CALL release( ) throw();
diff --git a/sw/inc/unofootnote.hxx b/sw/inc/unofootnote.hxx
index 63032d13807c..4f5c047e52a0 100644
--- a/sw/inc/unofootnote.hxx
+++ b/sw/inc/unofootnote.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 59dd1d161b5d..4fa35369bb5d 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -2,7 +2,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
@@ -72,22 +72,22 @@ class SwXFrame : public cppu::WeakImplHelper6
>,
public SwClient
{
- SwEventListenerContainer aLstnrCntnr;
+ SwEventListenerContainer aLstnrCntnr;
const SfxItemPropertySet* m_pPropSet;
SwDoc* m_pDoc;
- const FlyCntType eType;
+ const FlyCntType eType;
// Descriptor-interface
- BaseFrameProperties_Impl* pProps;
- sal_Bool bIsDescriptor;
- String sName;
+ BaseFrameProperties_Impl* pProps;
+ sal_Bool bIsDescriptor;
+ String sName;
SwPaM* m_pCopySource;
protected:
- com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
- com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
+ com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
+ com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
virtual ~SwXFrame();
public:
@@ -96,7 +96,7 @@ public:
SwDoc *pDoc ); //Descriptor-If
SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet,
const SfxItemPropertySet* pPropSet);
-
+
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -147,22 +147,22 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//SwClient
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- SwFrmFmt* GetFrmFmt() const
+ SwFrmFmt* GetFrmFmt() const
{
return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
}
- FlyCntType GetFlyCntType()const {return eType;}
+ FlyCntType GetFlyCntType()const {return eType;}
- sal_Bool IsDescriptor() const {return bIsDescriptor;}
- void ResetDescriptor();
+ sal_Bool IsDescriptor() const {return bIsDescriptor;}
+ void ResetDescriptor();
//copy text from a given source PaM
void SetSelection(SwPaM& rCopySource);
- static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
+ static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
};
/*-----------------20.02.98 11:28-------------------
@@ -262,7 +262,7 @@ protected:
public:
SwXTextGraphicObject( SwDoc *pDoc );
SwXTextGraphicObject(SwFrmFmt& rFmt);
-
+
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
@@ -311,7 +311,7 @@ protected:
public:
SwXTextEmbeddedObject( SwDoc *pDoc );
SwXTextEmbeddedObject(SwFrmFmt& rFmt);
-
+
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 8d5a5b7c52bb..a9d215abb07d 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index 6539fcefec4c..27b85fd973f1 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index e87954c16180..4f6e736d1b45 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -2,7 +2,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
@@ -32,92 +32,92 @@
#define PROPERTY_NONE 0
-#define PROPERTY_MAP_TEXT_CURSOR 0
-#define PROPERTY_MAP_CHAR_STYLE 1
-#define PROPERTY_MAP_PARA_STYLE 2
-#define PROPERTY_MAP_FRAME_STYLE 3
-#define PROPERTY_MAP_PAGE_STYLE 4
-#define PROPERTY_MAP_NUM_STYLE 5
-#define PROPERTY_MAP_SECTION 6
-#define PROPERTY_MAP_TEXT_TABLE 7
-#define PROPERTY_MAP_TABLE_CELL 8
-#define PROPERTY_MAP_TABLE_RANGE 9
-#define PROPERTY_MAP_TEXT_SEARCH 10
-#define PROPERTY_MAP_TEXT_FRAME 11
-#define PROPERTY_MAP_TEXT_GRAPHIC 12
-#define PROPERTY_MAP_TEXT_SHAPE 13
-#define PROPERTY_MAP_INDEX_USER 14
-#define PROPERTY_MAP_INDEX_CNTNT 15
-#define PROPERTY_MAP_INDEX_IDX 16
-#define PROPERTY_MAP_USER_MARK 17
-#define PROPERTY_MAP_CNTIDX_MARK 18
-#define PROPERTY_MAP_INDEX_MARK 19
-#define PROPERTY_MAP_TEXT_TABLE_ROW 20
-#define PROPERTY_MAP_TEXT_SHAPE_DESCRIPTOR 21
-#define PROPERTY_MAP_TEXT_TABLE_CURSOR 22
+#define PROPERTY_MAP_TEXT_CURSOR 0
+#define PROPERTY_MAP_CHAR_STYLE 1
+#define PROPERTY_MAP_PARA_STYLE 2
+#define PROPERTY_MAP_FRAME_STYLE 3
+#define PROPERTY_MAP_PAGE_STYLE 4
+#define PROPERTY_MAP_NUM_STYLE 5
+#define PROPERTY_MAP_SECTION 6
+#define PROPERTY_MAP_TEXT_TABLE 7
+#define PROPERTY_MAP_TABLE_CELL 8
+#define PROPERTY_MAP_TABLE_RANGE 9
+#define PROPERTY_MAP_TEXT_SEARCH 10
+#define PROPERTY_MAP_TEXT_FRAME 11
+#define PROPERTY_MAP_TEXT_GRAPHIC 12
+#define PROPERTY_MAP_TEXT_SHAPE 13
+#define PROPERTY_MAP_INDEX_USER 14
+#define PROPERTY_MAP_INDEX_CNTNT 15
+#define PROPERTY_MAP_INDEX_IDX 16
+#define PROPERTY_MAP_USER_MARK 17
+#define PROPERTY_MAP_CNTIDX_MARK 18
+#define PROPERTY_MAP_INDEX_MARK 19
+#define PROPERTY_MAP_TEXT_TABLE_ROW 20
+#define PROPERTY_MAP_TEXT_SHAPE_DESCRIPTOR 21
+#define PROPERTY_MAP_TEXT_TABLE_CURSOR 22
#define PROPERTY_MAP_BOOKMARK 23
#define PROPERTY_MAP_PARAGRAPH_EXTENSIONS 24
#define PROPERTY_MAP_INDEX_ILLUSTRATIONS 25
#define PROPERTY_MAP_INDEX_OBJECTS 26
#define PROPERTY_MAP_INDEX_TABLES 27
#define PROPERTY_MAP_BIBLIOGRAPHY 28
-#define PROPERTY_MAP_TEXT_DOCUMENT 29
+#define PROPERTY_MAP_TEXT_DOCUMENT 29
#define PROPERTY_MAP_LINK_TARGET 30
-#define PROPERTY_MAP_AUTO_TEXT_GROUP 31
+#define PROPERTY_MAP_AUTO_TEXT_GROUP 31
#define PROPERTY_MAP_TEXTPORTION_EXTENSIONS 34
-#define PROPERTY_MAP_FOOTNOTE 35
-#define PROPERTY_MAP_TEXT_COLUMS 36
-#define PROPERTY_MAP_PARAGRAPH 37
+#define PROPERTY_MAP_FOOTNOTE 35
+#define PROPERTY_MAP_TEXT_COLUMS 36
+#define PROPERTY_MAP_PARAGRAPH 37
#define PROPERTY_MAP_EMBEDDED_OBJECT 38
#define PROPERTY_MAP_REDLINE 39
#define PROPERTY_MAP_TEXT_DEFAULT 40
-#define PROPERTY_MAP_FLDTYP_DATETIME 41
-#define PROPERTY_MAP_FLDTYP_USER 42
-#define PROPERTY_MAP_FLDTYP_SET_EXP 43
-#define PROPERTY_MAP_FLDTYP_GET_EXP 44
-#define PROPERTY_MAP_FLDTYP_FILE_NAME 45
-#define PROPERTY_MAP_FLDTYP_PAGE_NUM 46
-#define PROPERTY_MAP_FLDTYP_AUTHOR 47
-#define PROPERTY_MAP_FLDTYP_CHAPTER 48
-#define PROPERTY_MAP_FLDTYP_GET_REFERENCE 49
-#define PROPERTY_MAP_FLDTYP_CONDITIONED_TEXT 50
-#define PROPERTY_MAP_FLDTYP_HIDDEN_TEXT 51
-#define PROPERTY_MAP_FLDTYP_ANNOTATION 52
-#define PROPERTY_MAP_FLDTYP_INPUT 53
-#define PROPERTY_MAP_FLDTYP_MACRO 54
-#define PROPERTY_MAP_FLDTYP_DDE 55
-#define PROPERTY_MAP_FLDTYP_HIDDEN_PARA 56
-#define PROPERTY_MAP_FLDTYP_DOC_INFO 57
-#define PROPERTY_MAP_FLDTYP_TEMPLATE_NAME 58
-#define PROPERTY_MAP_FLDTYP_USER_EXT 59
-#define PROPERTY_MAP_FLDTYP_REF_PAGE_SET 60
-#define PROPERTY_MAP_FLDTYP_REF_PAGE_GET 61
-#define PROPERTY_MAP_FLDTYP_JUMP_EDIT 62
-#define PROPERTY_MAP_FLDTYP_SCRIPT 63
-#define PROPERTY_MAP_FLDTYP_DATABASE_NEXT_SET 64
-#define PROPERTY_MAP_FLDTYP_DATABASE_NUM_SET 65
-#define PROPERTY_MAP_FLDTYP_DATABASE_SET_NUM 66
-#define PROPERTY_MAP_FLDTYP_DATABASE 67
-#define PROPERTY_MAP_FLDTYP_DATABASE_NAME 68
-#define PROPERTY_MAP_FLDTYP_DOCSTAT 69
-#define PROPERTY_MAP_FLDTYP_DOCINFO_AUTHOR 70
-#define PROPERTY_MAP_FLDTYP_DOCINFO_DATE_TIME 71
-#define PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME 72
-#define PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_DATE_TIME 73
-#define PROPERTY_MAP_FLDTYP_DOCINFO_EDIT_TIME 74
-#define PROPERTY_MAP_FLDTYP_DOCINFO_MISC 75
-#define PROPERTY_MAP_FLDTYP_DOCINFO_REVISION 76
-#define PROPERTY_MAP_FLDTYP_COMBINED_CHARACTERS 77
-#define PROPERTY_MAP_FLDTYP_DUMMY_0 78
-#define PROPERTY_MAP_FLDTYP_TABLE_FORMULA 79
-#define PROPERTY_MAP_FLDMSTR_USER 80
-#define PROPERTY_MAP_FLDMSTR_DDE 81
-#define PROPERTY_MAP_FLDMSTR_SET_EXP 82
-#define PROPERTY_MAP_FLDMSTR_DATABASE 83
-#define PROPERTY_MAP_FLDMSTR_DUMMY0 84
-#define PROPERTY_MAP_FLDTYP_BIBLIOGRAPHY 85
-#define PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY 86
+#define PROPERTY_MAP_FLDTYP_DATETIME 41
+#define PROPERTY_MAP_FLDTYP_USER 42
+#define PROPERTY_MAP_FLDTYP_SET_EXP 43
+#define PROPERTY_MAP_FLDTYP_GET_EXP 44
+#define PROPERTY_MAP_FLDTYP_FILE_NAME 45
+#define PROPERTY_MAP_FLDTYP_PAGE_NUM 46
+#define PROPERTY_MAP_FLDTYP_AUTHOR 47
+#define PROPERTY_MAP_FLDTYP_CHAPTER 48
+#define PROPERTY_MAP_FLDTYP_GET_REFERENCE 49
+#define PROPERTY_MAP_FLDTYP_CONDITIONED_TEXT 50
+#define PROPERTY_MAP_FLDTYP_HIDDEN_TEXT 51
+#define PROPERTY_MAP_FLDTYP_ANNOTATION 52
+#define PROPERTY_MAP_FLDTYP_INPUT 53
+#define PROPERTY_MAP_FLDTYP_MACRO 54
+#define PROPERTY_MAP_FLDTYP_DDE 55
+#define PROPERTY_MAP_FLDTYP_HIDDEN_PARA 56
+#define PROPERTY_MAP_FLDTYP_DOC_INFO 57
+#define PROPERTY_MAP_FLDTYP_TEMPLATE_NAME 58
+#define PROPERTY_MAP_FLDTYP_USER_EXT 59
+#define PROPERTY_MAP_FLDTYP_REF_PAGE_SET 60
+#define PROPERTY_MAP_FLDTYP_REF_PAGE_GET 61
+#define PROPERTY_MAP_FLDTYP_JUMP_EDIT 62
+#define PROPERTY_MAP_FLDTYP_SCRIPT 63
+#define PROPERTY_MAP_FLDTYP_DATABASE_NEXT_SET 64
+#define PROPERTY_MAP_FLDTYP_DATABASE_NUM_SET 65
+#define PROPERTY_MAP_FLDTYP_DATABASE_SET_NUM 66
+#define PROPERTY_MAP_FLDTYP_DATABASE 67
+#define PROPERTY_MAP_FLDTYP_DATABASE_NAME 68
+#define PROPERTY_MAP_FLDTYP_DOCSTAT 69
+#define PROPERTY_MAP_FLDTYP_DOCINFO_AUTHOR 70
+#define PROPERTY_MAP_FLDTYP_DOCINFO_DATE_TIME 71
+#define PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME 72
+#define PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_DATE_TIME 73
+#define PROPERTY_MAP_FLDTYP_DOCINFO_EDIT_TIME 74
+#define PROPERTY_MAP_FLDTYP_DOCINFO_MISC 75
+#define PROPERTY_MAP_FLDTYP_DOCINFO_REVISION 76
+#define PROPERTY_MAP_FLDTYP_COMBINED_CHARACTERS 77
+#define PROPERTY_MAP_FLDTYP_DUMMY_0 78
+#define PROPERTY_MAP_FLDTYP_TABLE_FORMULA 79
+#define PROPERTY_MAP_FLDMSTR_USER 80
+#define PROPERTY_MAP_FLDMSTR_DDE 81
+#define PROPERTY_MAP_FLDMSTR_SET_EXP 82
+#define PROPERTY_MAP_FLDMSTR_DATABASE 83
+#define PROPERTY_MAP_FLDMSTR_DUMMY0 84
+#define PROPERTY_MAP_FLDTYP_BIBLIOGRAPHY 85
+#define PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY 86
#define PROPERTY_MAP_TEXT 87
#define PROPERTY_MAP_REDLINE_PORTION 88
#define PROPERTY_MAP_MAILMERGE 89
@@ -128,13 +128,13 @@
#define PROPERTY_MAP_CHAR_AUTO_STYLE 94
#define PROPERTY_MAP_RUBY_AUTO_STYLE 95
#define PROPERTY_MAP_PARA_AUTO_STYLE 96
-#define PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM 97
+#define PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM 97
#define PROPERTY_MAP_METAFIELD 98
#define PROPERTY_MAP_END 99
//S&E
-#define WID_WORDS 0
+#define WID_WORDS 0
#define WID_BACKWARDS 1
#define WID_REGULAR_EXPRESSION 2
#define WID_CASE_SENSITIVE 3
@@ -145,34 +145,34 @@
#define WID_SIMILARITY_EXCHANGE 8
#define WID_SIMILARITY_ADD 9
#define WID_SIMILARITY_REMOVE 10
-#define WID_SEARCH_ALL 11
+#define WID_SEARCH_ALL 11
//Sections
-#define WID_SECT_CONDITION 8000
+#define WID_SECT_CONDITION 8000
#define WID_SECT_DDE_TYPE 8001
#define WID_SECT_DDE_FILE 8002
#define WID_SECT_DDE_ELEMENT 8003
#define WID_SECT_LINK 8004
#define WID_SECT_VISIBLE 8005
#define WID_SECT_PROTECTED 8006
-#define WID_SECT_REGION 8007
-#define WID_SECT_DDE_AUTOUPDATE 8008
+#define WID_SECT_REGION 8007
+#define WID_SECT_DDE_AUTOUPDATE 8008
#define WID_SECT_DOCUMENT_INDEX 8009
#define WID_SECT_IS_GLOBAL_DOC_SECTION 8010
-#define WID_SECT_PASSWORD 8011
+#define WID_SECT_PASSWORD 8011
#define WID_SECT_CURRENTLY_VISIBLE 8012
#define WID_SECT_EDIT_IN_READONLY 8013
//Verzeichnisse
-#define WID_PRIMARY_KEY 1000
-#define WID_SECONDARY_KEY 1001
-#define WID_ALT_TEXT 1002
-#define WID_IDX_TITLE 1003
+#define WID_PRIMARY_KEY 1000
+#define WID_SECONDARY_KEY 1001
+#define WID_ALT_TEXT 1002
+#define WID_IDX_TITLE 1003
#define WID_LEVEL 1004
#define WID_CREATE_FROM_MARKS 1005
#define WID_CREATE_FROM_OUTLINE 1006
-#define WID_MAIN_ENTRY 1007
+#define WID_MAIN_ENTRY 1007
#define WID_CREATE_FROM_CHAPTER 1008
#define WID_CREATE_FROM_LABELS 1009
#define WID_USE_ALPHABETICAL_SEPARATORS 1010
@@ -202,7 +202,7 @@
#define WID_CREATE_FROM_STAR_CALC 1033
#define WID_CREATE_FROM_STAR_DRAW 1034
#define WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS 1035
-#define WID_USER_IDX_NAME 1036
+#define WID_USER_IDX_NAME 1036
#define WID_PARA_HEAD 1037
#define WID_PARA_SEP 1038
#define WID_PARA_LEV1 1039
@@ -217,39 +217,39 @@
#define WID_PARA_LEV10 1048
#define WID_IS_COMMA_SEPARATED 1049
#define WID_INDEX_MARKS 1050
-#define WID_IS_RELATIVE_TABSTOPS 1051
-#define WID_CREATE_FROM_PARAGRAPH_STYLES 1052
-#define WID_IDX_CONTENT_SECTION 1053
+#define WID_IS_RELATIVE_TABSTOPS 1051
+#define WID_CREATE_FROM_PARAGRAPH_STYLES 1052
+#define WID_IDX_CONTENT_SECTION 1053
#define WID_IDX_HEADER_SECTION 1054
#define WID_IDX_LOCALE 1055
#define WID_IDX_SORT_ALGORITHM 1056
-#define WID_IDX_NAME 1057
+#define WID_IDX_NAME 1057
#define WID_TEXT_READING 1058
#define WID_PRIMARY_KEY_READING 1059
#define WID_SECONDARY_KEY_READING 1060
//text document
-#define WID_DOC_CHAR_COUNT 1000
-#define WID_DOC_PARA_COUNT 1001
-#define WID_DOC_WORD_COUNT 1002
-#define WID_DOC_WORD_SEPARATOR 1003
-#define WID_DOC_CHANGES_SHOW 1004
-#define WID_DOC_CHANGES_RECORD 1005
-#define WID_DOC_AUTO_MARK_URL 1006
-#define WID_DOC_HIDE_TIPS 1007
-#define WID_DOC_REDLINE_DISPLAY 1008
+#define WID_DOC_CHAR_COUNT 1000
+#define WID_DOC_PARA_COUNT 1001
+#define WID_DOC_WORD_COUNT 1002
+#define WID_DOC_WORD_SEPARATOR 1003
+#define WID_DOC_CHANGES_SHOW 1004
+#define WID_DOC_CHANGES_RECORD 1005
+#define WID_DOC_AUTO_MARK_URL 1006
+#define WID_DOC_HIDE_TIPS 1007
+#define WID_DOC_REDLINE_DISPLAY 1008
#define WID_DOC_FORBIDDEN_CHARS 1009
#define WID_DOC_CHANGES_PASSWORD 1010
#define WID_DOC_TWO_DIGIT_YEAR 1011
-#define WID_DOC_AUTOMATIC_CONTROL_FOCUS 1012
-#define WID_DOC_APPLY_FORM_DESIGN_MODE 1013
+#define WID_DOC_AUTOMATIC_CONTROL_FOCUS 1012
+#define WID_DOC_APPLY_FORM_DESIGN_MODE 1013
#define WID_DOC_BASIC_LIBRARIES 1014
#define WID_DOC_RUNTIME_UID 1015
#define WID_DOC_LOCK_UPDATES 1016
#define WID_DOC_HAS_VALID_SIGNATURES 1017
-#define WID_DOC_BUILDID 1024
-#define WID_DOC_ISTEMPLATEID 1025
+#define WID_DOC_BUILDID 1024
+#define WID_DOC_ISTEMPLATEID 1025
// --> OD 2006-03-21 #b6375613#
#define WID_APPLY_WORKAROUND_FOR_B6375613 1070
// <--
@@ -298,19 +298,19 @@
//AutoText
-#define WID_GROUP_PATH 0
-#define WID_GROUP_TITLE 1
+#define WID_GROUP_PATH 0
+#define WID_GROUP_TITLE 1
//NumberingRules
-#define WID_IS_AUTOMATIC 0
-#define WID_CONTINUOUS 1
-#define WID_RULE_NAME 2
-#define WID_IS_ABS_MARGINS 3
+#define WID_IS_AUTOMATIC 0
+#define WID_CONTINUOUS 1
+#define WID_RULE_NAME 2
+#define WID_IS_ABS_MARGINS 3
#define WID_IS_OUTLINE 4
#define WID_DEFAULT_LIST_ID 5
//TextColumns
-#define WID_TXTCOL_LINE_WIDTH 0
+#define WID_TXTCOL_LINE_WIDTH 0
#define WID_TXTCOL_LINE_COLOR 1
#define WID_TXTCOL_LINE_REL_HGT 2
#define WID_TXTCOL_LINE_ALIGN 3
@@ -324,7 +324,7 @@
class SwItemPropertySet : public SfxItemPropertySet
{
protected:
- virtual sal_Bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, sal_Bool bGetProperty) const;
+ virtual sal_Bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, sal_Bool bGetProperty) const;
public:
SwItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
SfxItemPropertySet( pMap ){}
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 7533de2526ef..0fe5dcb26a8e 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -2,7 +2,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
@@ -31,55 +31,55 @@
#define C2S(cChar) String::CreateFromAscii( cChar )
#define C2U(cChar) rtl::OUString::createFromAscii( cChar )
-#define MID_MIRROR_VERT 0
-#define MID_MIRROR_HORZ_EVEN_PAGES 1
-#define MID_MIRROR_HORZ_ODD_PAGES 2
+#define MID_MIRROR_VERT 0
+#define MID_MIRROR_HORZ_EVEN_PAGES 1
+#define MID_MIRROR_HORZ_ODD_PAGES 2
-#define MID_PAGEDESC_PAGEDESCNAME 0
-#define MID_PAGEDESC_PAGENUMOFFSET 1
+#define MID_PAGEDESC_PAGEDESCNAME 0
+#define MID_PAGEDESC_PAGENUMOFFSET 1
-#define MID_SURROUND_SURROUNDTYPE 0
-#define MID_SURROUND_ANCHORONLY 1
-#define MID_SURROUND_CONTOUR 2
-#define MID_SURROUND_CONTOUROUTSIDE 3
+#define MID_SURROUND_SURROUNDTYPE 0
+#define MID_SURROUND_ANCHORONLY 1
+#define MID_SURROUND_CONTOUR 2
+#define MID_SURROUND_CONTOUROUTSIDE 3
-#define MID_VERTORIENT_ORIENT 0
-#define MID_VERTORIENT_RELATION 1
-#define MID_VERTORIENT_POSITION 2
+#define MID_VERTORIENT_ORIENT 0
+#define MID_VERTORIENT_RELATION 1
+#define MID_VERTORIENT_POSITION 2
-#define MID_HORIORIENT_ORIENT 0
-#define MID_HORIORIENT_RELATION 1
-#define MID_HORIORIENT_POSITION 2
-#define MID_HORIORIENT_PAGETOGGLE 3
+#define MID_HORIORIENT_ORIENT 0
+#define MID_HORIORIENT_RELATION 1
+#define MID_HORIORIENT_POSITION 2
+#define MID_HORIORIENT_PAGETOGGLE 3
-#define MID_ANCHOR_ANCHORTYPE 0
-#define MID_ANCHOR_PAGENUM 1
+#define MID_ANCHOR_ANCHORTYPE 0
+#define MID_ANCHOR_PAGENUM 1
#define MID_ANCHOR_ANCHORFRAME 2
-#define MID_URL_HYPERLINKFORMAT 0
-#define MID_URL_HYPERLINKNAME 1
-#define MID_URL_CLIENTMAP 2
-#define MID_URL_SERVERMAP 3
-#define MID_URL_URL 4
-#define MID_URL_TARGET 5
-#define MID_URL_VISITED_FMT 6
-#define MID_URL_UNVISITED_FMT 7
-#define MID_URL_HYPERLINKEVENTS 8
+#define MID_URL_HYPERLINKFORMAT 0
+#define MID_URL_HYPERLINKNAME 1
+#define MID_URL_CLIENTMAP 2
+#define MID_URL_SERVERMAP 3
+#define MID_URL_URL 4
+#define MID_URL_TARGET 5
+#define MID_URL_VISITED_FMT 6
+#define MID_URL_UNVISITED_FMT 7
+#define MID_URL_HYPERLINKEVENTS 8
-#define MID_CHAIN_PREVNAME 0
-#define MID_CHAIN_NEXTNAME 1
+#define MID_CHAIN_PREVNAME 0
+#define MID_CHAIN_NEXTNAME 1
-#define MID_LINENUMBER_COUNT 0
-#define MID_LINENUMBER_STARTVALUE 1
+#define MID_LINENUMBER_COUNT 0
+#define MID_LINENUMBER_STARTVALUE 1
#define MID_DROPCAP_FORMAT 0
#define MID_DROPCAP_WHOLE_WORD 1
-#define MID_DROPCAP_CHAR_STYLE_NAME 2
+#define MID_DROPCAP_CHAR_STYLE_NAME 2
#define MID_DROPCAP_LINES 3
#define MID_DROPCAP_COUNT 4
#define MID_DROPCAP_DISTANCE 5
-#define MID_FRMSIZE_SIZE 0
+#define MID_FRMSIZE_SIZE 0
#define MID_FRMSIZE_REL_HEIGHT 1
#define MID_FRMSIZE_REL_WIDTH 2
@@ -90,18 +90,18 @@
/* XML only */
#define MID_FRMSIZE_MIN_HEIGHT 8
#define MID_FRMSIZE_FIX_HEIGHT 9
-#define MID_FRMSIZE_COL_WIDTH 10
-#define MID_FRMSIZE_REL_COL_WIDTH 11
+#define MID_FRMSIZE_COL_WIDTH 10
+#define MID_FRMSIZE_REL_COL_WIDTH 11
/* UNO */
#define MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT 12
#define MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH 13
#define MID_FRMSIZE_WIDTH_TYPE 14
-#define MID_COLUMNS 0
-#define MID_COLUMN_SEPARATOR_LINE 1
+#define MID_COLUMNS 0
+#define MID_COLUMN_SEPARATOR_LINE 1
//SwFmtFtnAtTxtEnd
-#define MID_COLLECT 0
+#define MID_COLLECT 0
#define MID_RESTART_NUM 1
#define MID_NUM_START_AT 2
#define MID_OWN_NUM 3
@@ -110,7 +110,7 @@
#define MID_SUFFIX 6
//page style footnote
-#define MID_FTN_HEIGHT 0
+#define MID_FTN_HEIGHT 0
#define MID_LINE_WEIGHT 1
#define MID_LINE_COLOR 2
#define MID_LINE_RELWIDTH 3
@@ -119,7 +119,7 @@
#define MID_LINE_FOOTNOTE_DIST 6
//SwFmtRuby
-#define MID_RUBY_TEXT 0
+#define MID_RUBY_TEXT 0
#define MID_RUBY_ADJUST 1
#define MID_RUBY_CHARSTYLE 2
#define MID_RUBY_ABOVE 3
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index deae3934d03d..a3bebda7f6eb 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -2,7 +2,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
@@ -34,9 +34,9 @@
#include <com/sun/star/view/XViewSettingsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
#include <comphelper/ChainablePropertySet.hxx>
#include <comphelper/SettingsHelper.hxx>
#include <usrpref.hxx>
@@ -64,29 +64,29 @@ class SwXModule : public cppu::WeakImplHelper4
>
{
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxPrintSettings;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxPrintSettings;
protected:
virtual ~SwXModule();
public:
SwXModule();
-
+
//XViewSettings
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void)
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void)
throw( ::com::sun::star::uno::RuntimeException );
//XPrintSettings
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings(void)
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings(void)
throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+ virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
};
@@ -107,14 +107,14 @@ protected:
virtual void _preSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
- virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+ virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _preGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
- virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+ virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
@@ -123,14 +123,14 @@ protected:
throw();
public:
SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL );
-
+
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual rtl::OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+ virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
};
/*-----------------15.03.98 13:21-------------------
@@ -141,10 +141,10 @@ class SwXViewSettings : public comphelper::ChainableHelperNoState
friend class SwXDocumentSettings;
protected:
- SwView* pView;
- SwViewOption* mpViewOption;
- const SwViewOption* mpConstViewOption;
- sal_Bool bObjectValid:1, bWeb:1, mbApplyZoom;
+ SwView* pView;
+ SwViewOption* mpViewOption;
+ const SwViewOption* mpConstViewOption;
+ sal_Bool bObjectValid:1, bWeb:1, mbApplyZoom;
sal_Int32 eHRulerUnit;
sal_Bool mbApplyHRulerMetric;
@@ -153,14 +153,14 @@ protected:
virtual void _preSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
- virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+ virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _preGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
- virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+ virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
virtual void _postGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
@@ -168,16 +168,16 @@ protected:
virtual ~SwXViewSettings()
throw();
public:
- SwXViewSettings(sal_Bool bWeb, SwView* pView);
-
+ SwXViewSettings(sal_Bool bWeb, SwView* pView);
+
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- sal_Bool IsValid() const {return bObjectValid;}
- void Invalidate() {bObjectValid = sal_False;}
+ sal_Bool IsValid() const {return bObjectValid;}
+ void Invalidate() {bObjectValid = sal_False;}
};
/* -----------------24.09.98 10:47-------------------
*
@@ -191,12 +191,12 @@ public:
SMART_UNO_DECLARATION( SwXTerminateListener, UsrObject );
- virtual UString getClassName();
+ virtual UString getClassName();
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual ::com::sun::star::uno::XInterface * queryInterface( ::com::sun::star::uno::Uik aUik);
+// virtual ::com::sun::star::uno::XInterface * queryInterface( ::com::sun::star::uno::Uik aUik);
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void);
+// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void);
//XTerminateListener
diff --git a/sw/inc/unoparaframeenum.hxx b/sw/inc/unoparaframeenum.hxx
index a49efeb1fc56..052ed48331e0 100644
--- a/sw/inc/unoparaframeenum.hxx
+++ b/sw/inc/unoparaframeenum.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 629de6e54fb7..e17517414e14 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index 7498b353f8b6..50020b37ac10 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -2,7 +2,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
@@ -71,7 +71,7 @@ enum SwTextPortionType
PORTION_FIELD,
PORTION_FRAME,
PORTION_FOOTNOTE,
-// obsolete! PORTION_CONTROL_CHAR,
+// obsolete! PORTION_CONTROL_CHAR,
PORTION_REFMARK_START,
PORTION_REFMARK_END,
PORTION_TOXMARK_START,
@@ -138,12 +138,12 @@ protected:
//SfxItemPropertySet& GetPropSet() { return aPropSet; }
- void SAL_CALL SetPropertyValues_Impl(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+ void SAL_CALL SetPropertyValues_Impl(
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl(
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// ::com::sun::star::uno::Any GetPropertyValue( const SfxItemPropertyMap *pEntry,
@@ -163,7 +163,7 @@ protected:
virtual ~SwXTextPortion();
public:
- SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType );
+ SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType );
SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwFrmFmt& rFmt );
// for Ruby
@@ -231,7 +231,7 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException );
//SwClient
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
void SetRefMark( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > xMark)
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index d9cf68de8d29..44bb65af8bf8 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,7 +2,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
@@ -35,625 +35,625 @@
enum SwPropNameIds
{
-/* 0001 */ SW_PROPNAME_BEGIN = 1,
+/* 0001 */ SW_PROPNAME_BEGIN = 1,
-/* 0001 */ UNO_NAME_FOLLOW_STYLE = SW_PROPNAME_BEGIN,
-/* 0002 */ UNO_NAME_IS_PHYSICAL,
-/* 0003 */ UNO_NAME_IS_AUTO_UPDATE,
-/* 0004 */ UNO_NAME_DISPLAY_NAME,
-/* 0005 */ UNO_NAME_PARA_GRAPHIC_URL,
-/* 0006 */ UNO_NAME_PARA_GRAPHIC_FILTER,
-/* 0007 */ UNO_NAME_HEADER_GRAPHIC_URL,
-/* 0008 */ UNO_NAME_HEADER_GRAPHIC_FILTER,
-/* 0009 */ UNO_NAME_FOOTER_GRAPHIC_URL,
-/* 0010 */ UNO_NAME_FOOTER_GRAPHIC_FILTER,
-/* 0011 */ UNO_NAME_BACK_GRAPHIC_URL,
-/* 0012 */ UNO_NAME_BACK_GRAPHIC_FILTER,
-/* 0013 */ UNO_NAME_BACK_GRAPHIC_LOCATION,
-/* 0014 */ UNO_NAME_BACK_GRAPHIC_BITMAP,
-/* 0015 */ UNO_NAME_GRAPHIC_URL,
-/* 0016 */ UNO_NAME_GRAPHIC_FILTER,
-/* 0017 */ UNO_NAME_GRAPHIC_LOCATION,
-/* 0018 */ UNO_NAME_GRAPHIC_SIZE,
-/* 0019 */ UNO_NAME_GRAPHIC_BITMAP,
-/* 0020 */ UNO_NAME_BULLET_FONT,
-/* 0021 */ UNO_NAME_PARA_GRAPHIC_LOCATION,
-/* 0022 */ UNO_NAME_HEADER_GRAPHIC_LOCATION,
-/* 0023 */ UNO_NAME_FOOTER_GRAPHIC_LOCATION,
-/* 0024 */ UNO_NAME_PARA_LEFT_PARA_MARGIN,
-/* 0025 */ UNO_NAME_PARA_RIGHT_PARA_MARGIN,
-/* 0026 */ UNO_NAME_PARA_LEFT_MARGIN,
-/* 0027 */ UNO_NAME_PARA_RIGHT_MARGIN,
-/* 0028 */ UNO_NAME_PARA_LEFT_MARGIN_RELATIVE,
-/* 0029 */ UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE,
-/* 0030 */ UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT,
-/* 0031 */ UNO_NAME_PARA_FIRST_LINE_INDENT,
-/* 0032 */ UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE,
-/* 0033 */ UNO_NAME_PARA_IS_HYPHENATION,
-/* 0034 */ UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS,
-/* 0035 */ UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS,
-/* 0036 */ UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS,
-/* 0037 */ UNO_NAME_LEFT_MARGIN,
-/* 0038 */ UNO_NAME_RIGHT_MARGIN,
-/* 0039 */ UNO_NAME_HEADER_LEFT_MARGIN,
-/* 0040 */ UNO_NAME_HEADER_RIGHT_MARGIN,
-/* 0041 */ UNO_NAME_FOOTER_LEFT_MARGIN,
-/* 0042 */ UNO_NAME_FOOTER_RIGHT_MARGIN,
-/* 0043 */ UNO_NAME_TEXT_RANGE,
-/* 0044 */ UNO_NAME_NAME,
-/* 0045 */ UNO_NAME_NUMBERING_ALIGNMENT,
-/* 0046 */ UNO_NAME_BULLET_FONT_NAME,
-/* 0047 */ UNO_NAME_BULLET_ID,
-/* 0048 */ UNO_NAME_CHAR_STYLE_NAME,
-/* 0049 */ UNO_NAME_ANCHOR_CHAR_STYLE_NAME,
-/* 0050 */ UNO_NAME_SUFFIX,
-/* 0051 */ UNO_NAME_PREFIX,
-/* 0052 */ UNO_NAME_PARENT_NUMBERING,
-/* 0053 */ UNO_NAME_START_WITH,
-/* 0054 */ UNO_NAME_CHAR_FONT_NAME,
-/* 0055 */ UNO_NAME_CHAR_FONT_STYLE_NAME,
-/* 0056 */ UNO_NAME_CHAR_FONT_FAMILY,
-/* 0057 */ UNO_NAME_CHAR_FONT_CHAR_SET,
-/* 0058 */ UNO_NAME_CHAR_FONT_PITCH,
-/* 0059 */ UNO_NAME_CHAR_POSTURE,
-/* 0060 */ UNO_NAME_CHAR_WEIGHT,
-/* 0061 */ UNO_NAME_CHAR_HEIGHT,
-/* 0062 */ UNO_NAME_CHAR_LOCALE,
-/* 0063 */ UNO_NAME_CHAR_FONT_NAME_ASIAN,
-/* 0064 */ UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN,
-/* 0065 */ UNO_NAME_CHAR_FONT_FAMILY_ASIAN,
-/* 0066 */ UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN,
-/* 0067 */ UNO_NAME_CHAR_FONT_PITCH_ASIAN,
-/* 0068 */ UNO_NAME_CHAR_POSTURE_ASIAN,
-/* 0069 */ UNO_NAME_CHAR_WEIGHT_ASIAN,
-/* 0070 */ UNO_NAME_CHAR_HEIGHT_ASIAN,
-/* 0071 */ UNO_NAME_CHAR_LOCALE_ASIAN,
-/* 0072 */ UNO_NAME_CHAR_FONT_NAME_COMPLEX,
-/* 0073 */ UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX,
-/* 0074 */ UNO_NAME_CHAR_FONT_FAMILY_COMPLEX,
-/* 0075 */ UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX,
-/* 0076 */ UNO_NAME_CHAR_FONT_PITCH_COMPLEX,
-/* 0077 */ UNO_NAME_CHAR_POSTURE_COMPLEX,
-/* 0078 */ UNO_NAME_CHAR_WEIGHT_COMPLEX,
-/* 0079 */ UNO_NAME_CHAR_HEIGHT_COMPLEX,
-/* 0080 */ UNO_NAME_CHAR_LOCALE_COMPLEX,
-/* 0081 */ UNO_NAME_CHAR_AUTO_KERNING,
-/* 0082 */ UNO_NAME_CHAR_UNDERLINE,
-/* 0083 */ UNO_NAME_CHAR_UNDERLINE_COLOR,
-/* 0084 */ UNO_NAME_CHAR_UNDERLINE_HAS_COLOR,
-/* 0085 */ UNO_NAME_CHAR_ESCAPEMENT,
-/* 0086 */ UNO_NAME_CHAR_CASE_MAP,
-/* 0087 */ UNO_NAME_CHAR_SHADOWED,
-/* 0088 */ UNO_NAME_CHAR_STRIKEOUT,
-/* 0089 */ UNO_NAME_CHAR_CROSSED_OUT,
-/* 0090 */ UNO_NAME_CHAR_NO_HYPHENATION,
-/* 0091 */ UNO_NAME_CHAR_AUTO_ESCAPEMENT,
-/* 0092 */ UNO_NAME_CHAR_PROP_HEIGHT,
-/* 0093 */ UNO_NAME_CHAR_DIFF_HEIGHT,
-/* 0094 */ UNO_NAME_CHAR_PROP_HEIGHT_ASIAN,
-/* 0095 */ UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN,
-/* 0096 */ UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX,
-/* 0097 */ UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX,
-/* 0098 */ UNO_NAME_CHAR_ESCAPEMENT_HEIGHT,
-/* 0099 */ UNO_NAME_CHAR_COLOR,
+/* 0001 */ UNO_NAME_FOLLOW_STYLE = SW_PROPNAME_BEGIN,
+/* 0002 */ UNO_NAME_IS_PHYSICAL,
+/* 0003 */ UNO_NAME_IS_AUTO_UPDATE,
+/* 0004 */ UNO_NAME_DISPLAY_NAME,
+/* 0005 */ UNO_NAME_PARA_GRAPHIC_URL,
+/* 0006 */ UNO_NAME_PARA_GRAPHIC_FILTER,
+/* 0007 */ UNO_NAME_HEADER_GRAPHIC_URL,
+/* 0008 */ UNO_NAME_HEADER_GRAPHIC_FILTER,
+/* 0009 */ UNO_NAME_FOOTER_GRAPHIC_URL,
+/* 0010 */ UNO_NAME_FOOTER_GRAPHIC_FILTER,
+/* 0011 */ UNO_NAME_BACK_GRAPHIC_URL,
+/* 0012 */ UNO_NAME_BACK_GRAPHIC_FILTER,
+/* 0013 */ UNO_NAME_BACK_GRAPHIC_LOCATION,
+/* 0014 */ UNO_NAME_BACK_GRAPHIC_BITMAP,
+/* 0015 */ UNO_NAME_GRAPHIC_URL,
+/* 0016 */ UNO_NAME_GRAPHIC_FILTER,
+/* 0017 */ UNO_NAME_GRAPHIC_LOCATION,
+/* 0018 */ UNO_NAME_GRAPHIC_SIZE,
+/* 0019 */ UNO_NAME_GRAPHIC_BITMAP,
+/* 0020 */ UNO_NAME_BULLET_FONT,
+/* 0021 */ UNO_NAME_PARA_GRAPHIC_LOCATION,
+/* 0022 */ UNO_NAME_HEADER_GRAPHIC_LOCATION,
+/* 0023 */ UNO_NAME_FOOTER_GRAPHIC_LOCATION,
+/* 0024 */ UNO_NAME_PARA_LEFT_PARA_MARGIN,
+/* 0025 */ UNO_NAME_PARA_RIGHT_PARA_MARGIN,
+/* 0026 */ UNO_NAME_PARA_LEFT_MARGIN,
+/* 0027 */ UNO_NAME_PARA_RIGHT_MARGIN,
+/* 0028 */ UNO_NAME_PARA_LEFT_MARGIN_RELATIVE,
+/* 0029 */ UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE,
+/* 0030 */ UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT,
+/* 0031 */ UNO_NAME_PARA_FIRST_LINE_INDENT,
+/* 0032 */ UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE,
+/* 0033 */ UNO_NAME_PARA_IS_HYPHENATION,
+/* 0034 */ UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS,
+/* 0035 */ UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS,
+/* 0036 */ UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS,
+/* 0037 */ UNO_NAME_LEFT_MARGIN,
+/* 0038 */ UNO_NAME_RIGHT_MARGIN,
+/* 0039 */ UNO_NAME_HEADER_LEFT_MARGIN,
+/* 0040 */ UNO_NAME_HEADER_RIGHT_MARGIN,
+/* 0041 */ UNO_NAME_FOOTER_LEFT_MARGIN,
+/* 0042 */ UNO_NAME_FOOTER_RIGHT_MARGIN,
+/* 0043 */ UNO_NAME_TEXT_RANGE,
+/* 0044 */ UNO_NAME_NAME,
+/* 0045 */ UNO_NAME_NUMBERING_ALIGNMENT,
+/* 0046 */ UNO_NAME_BULLET_FONT_NAME,
+/* 0047 */ UNO_NAME_BULLET_ID,
+/* 0048 */ UNO_NAME_CHAR_STYLE_NAME,
+/* 0049 */ UNO_NAME_ANCHOR_CHAR_STYLE_NAME,
+/* 0050 */ UNO_NAME_SUFFIX,
+/* 0051 */ UNO_NAME_PREFIX,
+/* 0052 */ UNO_NAME_PARENT_NUMBERING,
+/* 0053 */ UNO_NAME_START_WITH,
+/* 0054 */ UNO_NAME_CHAR_FONT_NAME,
+/* 0055 */ UNO_NAME_CHAR_FONT_STYLE_NAME,
+/* 0056 */ UNO_NAME_CHAR_FONT_FAMILY,
+/* 0057 */ UNO_NAME_CHAR_FONT_CHAR_SET,
+/* 0058 */ UNO_NAME_CHAR_FONT_PITCH,
+/* 0059 */ UNO_NAME_CHAR_POSTURE,
+/* 0060 */ UNO_NAME_CHAR_WEIGHT,
+/* 0061 */ UNO_NAME_CHAR_HEIGHT,
+/* 0062 */ UNO_NAME_CHAR_LOCALE,
+/* 0063 */ UNO_NAME_CHAR_FONT_NAME_ASIAN,
+/* 0064 */ UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN,
+/* 0065 */ UNO_NAME_CHAR_FONT_FAMILY_ASIAN,
+/* 0066 */ UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN,
+/* 0067 */ UNO_NAME_CHAR_FONT_PITCH_ASIAN,
+/* 0068 */ UNO_NAME_CHAR_POSTURE_ASIAN,
+/* 0069 */ UNO_NAME_CHAR_WEIGHT_ASIAN,
+/* 0070 */ UNO_NAME_CHAR_HEIGHT_ASIAN,
+/* 0071 */ UNO_NAME_CHAR_LOCALE_ASIAN,
+/* 0072 */ UNO_NAME_CHAR_FONT_NAME_COMPLEX,
+/* 0073 */ UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX,
+/* 0074 */ UNO_NAME_CHAR_FONT_FAMILY_COMPLEX,
+/* 0075 */ UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX,
+/* 0076 */ UNO_NAME_CHAR_FONT_PITCH_COMPLEX,
+/* 0077 */ UNO_NAME_CHAR_POSTURE_COMPLEX,
+/* 0078 */ UNO_NAME_CHAR_WEIGHT_COMPLEX,
+/* 0079 */ UNO_NAME_CHAR_HEIGHT_COMPLEX,
+/* 0080 */ UNO_NAME_CHAR_LOCALE_COMPLEX,
+/* 0081 */ UNO_NAME_CHAR_AUTO_KERNING,
+/* 0082 */ UNO_NAME_CHAR_UNDERLINE,
+/* 0083 */ UNO_NAME_CHAR_UNDERLINE_COLOR,
+/* 0084 */ UNO_NAME_CHAR_UNDERLINE_HAS_COLOR,
+/* 0085 */ UNO_NAME_CHAR_ESCAPEMENT,
+/* 0086 */ UNO_NAME_CHAR_CASE_MAP,
+/* 0087 */ UNO_NAME_CHAR_SHADOWED,
+/* 0088 */ UNO_NAME_CHAR_STRIKEOUT,
+/* 0089 */ UNO_NAME_CHAR_CROSSED_OUT,
+/* 0090 */ UNO_NAME_CHAR_NO_HYPHENATION,
+/* 0091 */ UNO_NAME_CHAR_AUTO_ESCAPEMENT,
+/* 0092 */ UNO_NAME_CHAR_PROP_HEIGHT,
+/* 0093 */ UNO_NAME_CHAR_DIFF_HEIGHT,
+/* 0094 */ UNO_NAME_CHAR_PROP_HEIGHT_ASIAN,
+/* 0095 */ UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN,
+/* 0096 */ UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX,
+/* 0097 */ UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX,
+/* 0098 */ UNO_NAME_CHAR_ESCAPEMENT_HEIGHT,
+/* 0099 */ UNO_NAME_CHAR_COLOR,
-/* 0100 */ UNO_NAME_CHAR_FLASH,
-/* 0101 */ UNO_NAME_CHAR_KERNING,
-/* 0102 */ UNO_NAME_CHAR_BACK_COLOR,
-/* 0103 */ UNO_NAME_CHAR_BACK_TRANSPARENT,
-/* 0104 */ UNO_NAME_CHAR_COMBINE_IS_ON,
-/* 0105 */ UNO_NAME_CHAR_COMBINE_PREFIX,
-/* 0106 */ UNO_NAME_CHAR_COMBINE_SUFFIX,
-/* 0107 */ UNO_NAME_CHAR_EMPHASIS,
-/* 0108 */ UNO_NAME_PARA_LINE_SPACING,
-/* 0109 */ UNO_NAME_PARA_TOP_MARGIN,
-/* 0110 */ UNO_NAME_PARA_BOTTOM_MARGIN,
-/* 0111 */ UNO_NAME_PARA_TOP_MARGIN_RELATIVE,
-/* 0112 */ UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE,
-/* 0113 */ UNO_NAME_PARA_EXPAND_SINGLE_WORD,
-/* 0114 */ UNO_NAME_END_NOTICE,
-/* 0115 */ UNO_NAME_EMBEDDED_OBJECTS,
-/* 0116 */ UNO_NAME_ALPHABETICAL_SEPARATORS,
-/* 0117 */ UNO_NAME_BACKGROUND_COLOR,
-/* 0118 */ UNO_NAME_BEGIN_NOTICE,
-/* 0119 */ UNO_NAME_CASE_SENSITIVE,
-/* 0120 */ UNO_NAME_FRAME_STYLE_NAME,
-/* 0121 */ UNO_NAME_NUMBERING_STYLE_NAME,
-/* 0122 */ UNO_NAME_NUMBERING_LEVEL,
-/* 0123 */ UNO_NAME_NUMBERING_START_VALUE,
-/* 0124 */ UNO_NAME_NUMBERING_IS_NUMBER,
-/* 0125 */ UNO_NAME_COMBINE_ENTRIES,
-/* 0126 */ UNO_NAME_COUNT_LINES_IN_FRAMES,
-/* 0127 */ UNO_NAME_DDE_COMMAND_TYPE,
-/* 0128 */ UNO_NAME_DDE_COMMAND_FILE,
-/* 0129 */ UNO_NAME_DDE_COMMAND_ELEMENT,
-/* 0130 */ UNO_NAME_IS_AUTOMATIC_UPDATE,
-/* 0131 */ UNO_NAME_DEFAULT_TABSTOP_DISTANCE,
-/* 0132 */ UNO_NAME_DISTANCE,
-/* 0133 */ UNO_NAME_DROP_CAP_FORMAT,
-/* 0134 */ UNO_NAME_DROP_CAP_WHOLE_WORD,
-/* 0135 */ UNO_NAME_DROP_CAP_CHAR_STYLE_NAME,
-/* 0136 */ UNO_NAME_FILE_LINK,
-/* 0137 */ UNO_NAME_GRAPHIC,
-/* 0138 */ UNO_NAME_GRAPHICS,
-/* 0139 */ UNO_NAME_IS_PROTECTED,
-/* 0140 */ UNO_NAME_KEY_AS_ENTRY,
-/* 0141 */ UNO_NAME_PARA_KEEP_TOGETHER,
-/* 0142 */ UNO_NAME_KEEP_TOGETHER,
-/* 0143 */ UNO_NAME_IS_LANDSCAPE,
-/* 0144 */ UNO_NAME_SEPARATOR_TEXT,
-/* 0145 */ UNO_NAME_MARKS,
-/* 0146 */ UNO_NAME_NUMBER_POSITION,
-/* 0147 */ UNO_NAME_OUTLINES,
-/* 0148 */ UNO_NAME_PAGE_STYLE_NAME,
-/* 0149 */ UNO_NAME_PAGE_STYLE_LAYOUT,
-/* 0150 */ UNO_NAME_PARA_STYLES,
-/* 0151 */ UNO_NAME_PARA_ADJUST,
-/* 0152 */ UNO_NAME_PARA_REGISTER_MODE_ACTIVE,
-/* 0153 */ UNO_NAME_PARA_STYLE_NAME,
-/* 0154 */ UNO_NAME_PARA_LAST_LINE_ADJUST,
-/* 0155 */ UNO_NAME_PARA_LINE_NUMBER_COUNT,
-/* 0156 */ UNO_NAME_PARA_LINE_NUMBER_START_VALUE,
-/* 0157 */ UNO_NAME_BACK_COLOR,
-/* 0158 */ UNO_NAME_PARA_BACK_COLOR,
-/* 0159 */ UNO_NAME_PARA_WIDOWS,
-/* 0160 */ UNO_NAME_PARA_ORPHANS,
-/* 0161 */ UNO_NAME_PARA_BACK_TRANSPARENT,
-/* 0162 */ UNO_NAME_POSITION_END_OF_DOC,
-/* 0163 */ UNO_NAME_POSITION_PROTECTED,
+/* 0100 */ UNO_NAME_CHAR_FLASH,
+/* 0101 */ UNO_NAME_CHAR_KERNING,
+/* 0102 */ UNO_NAME_CHAR_BACK_COLOR,
+/* 0103 */ UNO_NAME_CHAR_BACK_TRANSPARENT,
+/* 0104 */ UNO_NAME_CHAR_COMBINE_IS_ON,
+/* 0105 */ UNO_NAME_CHAR_COMBINE_PREFIX,
+/* 0106 */ UNO_NAME_CHAR_COMBINE_SUFFIX,
+/* 0107 */ UNO_NAME_CHAR_EMPHASIS,
+/* 0108 */ UNO_NAME_PARA_LINE_SPACING,
+/* 0109 */ UNO_NAME_PARA_TOP_MARGIN,
+/* 0110 */ UNO_NAME_PARA_BOTTOM_MARGIN,
+/* 0111 */ UNO_NAME_PARA_TOP_MARGIN_RELATIVE,
+/* 0112 */ UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE,
+/* 0113 */ UNO_NAME_PARA_EXPAND_SINGLE_WORD,
+/* 0114 */ UNO_NAME_END_NOTICE,
+/* 0115 */ UNO_NAME_EMBEDDED_OBJECTS,
+/* 0116 */ UNO_NAME_ALPHABETICAL_SEPARATORS,
+/* 0117 */ UNO_NAME_BACKGROUND_COLOR,
+/* 0118 */ UNO_NAME_BEGIN_NOTICE,
+/* 0119 */ UNO_NAME_CASE_SENSITIVE,
+/* 0120 */ UNO_NAME_FRAME_STYLE_NAME,
+/* 0121 */ UNO_NAME_NUMBERING_STYLE_NAME,
+/* 0122 */ UNO_NAME_NUMBERING_LEVEL,
+/* 0123 */ UNO_NAME_NUMBERING_START_VALUE,
+/* 0124 */ UNO_NAME_NUMBERING_IS_NUMBER,
+/* 0125 */ UNO_NAME_COMBINE_ENTRIES,
+/* 0126 */ UNO_NAME_COUNT_LINES_IN_FRAMES,
+/* 0127 */ UNO_NAME_DDE_COMMAND_TYPE,
+/* 0128 */ UNO_NAME_DDE_COMMAND_FILE,
+/* 0129 */ UNO_NAME_DDE_COMMAND_ELEMENT,
+/* 0130 */ UNO_NAME_IS_AUTOMATIC_UPDATE,
+/* 0131 */ UNO_NAME_DEFAULT_TABSTOP_DISTANCE,
+/* 0132 */ UNO_NAME_DISTANCE,
+/* 0133 */ UNO_NAME_DROP_CAP_FORMAT,
+/* 0134 */ UNO_NAME_DROP_CAP_WHOLE_WORD,
+/* 0135 */ UNO_NAME_DROP_CAP_CHAR_STYLE_NAME,
+/* 0136 */ UNO_NAME_FILE_LINK,
+/* 0137 */ UNO_NAME_GRAPHIC,
+/* 0138 */ UNO_NAME_GRAPHICS,
+/* 0139 */ UNO_NAME_IS_PROTECTED,
+/* 0140 */ UNO_NAME_KEY_AS_ENTRY,
+/* 0141 */ UNO_NAME_PARA_KEEP_TOGETHER,
+/* 0142 */ UNO_NAME_KEEP_TOGETHER,
+/* 0143 */ UNO_NAME_IS_LANDSCAPE,
+/* 0144 */ UNO_NAME_SEPARATOR_TEXT,
+/* 0145 */ UNO_NAME_MARKS,
+/* 0146 */ UNO_NAME_NUMBER_POSITION,
+/* 0147 */ UNO_NAME_OUTLINES,
+/* 0148 */ UNO_NAME_PAGE_STYLE_NAME,
+/* 0149 */ UNO_NAME_PAGE_STYLE_LAYOUT,
+/* 0150 */ UNO_NAME_PARA_STYLES,
+/* 0151 */ UNO_NAME_PARA_ADJUST,
+/* 0152 */ UNO_NAME_PARA_REGISTER_MODE_ACTIVE,
+/* 0153 */ UNO_NAME_PARA_STYLE_NAME,
+/* 0154 */ UNO_NAME_PARA_LAST_LINE_ADJUST,
+/* 0155 */ UNO_NAME_PARA_LINE_NUMBER_COUNT,
+/* 0156 */ UNO_NAME_PARA_LINE_NUMBER_START_VALUE,
+/* 0157 */ UNO_NAME_BACK_COLOR,
+/* 0158 */ UNO_NAME_PARA_BACK_COLOR,
+/* 0159 */ UNO_NAME_PARA_WIDOWS,
+/* 0160 */ UNO_NAME_PARA_ORPHANS,
+/* 0161 */ UNO_NAME_PARA_BACK_TRANSPARENT,
+/* 0162 */ UNO_NAME_POSITION_END_OF_DOC,
+/* 0163 */ UNO_NAME_POSITION_PROTECTED,
/* 0164 */ UNO_NAME_ALTERNATIVE_TEXT,
-/* 0165 */ UNO_NAME_PRIMARY_KEY,
-/* 0166 */ UNO_NAME_PRINT_TABLES,
-/* 0167 */ UNO_NAME_PRINT_GRAPHICS,
-/* 0168 */ UNO_NAME_PRINT_REVERSED,
-/* 0169 */ UNO_NAME_PRINT_PROSPECT,
-/* 0170 */ UNO_NAME_PRINT_CONTROLS,
-/* 0171 */ UNO_NAME_PRINT_DRAWINGS,
-/* 0172 */ UNO_NAME_PRINT_RIGHT_PAGES,
-/* 0173 */ UNO_NAME_PRINT_LEFT_PAGES,
-/* 0174 */ UNO_NAME_PRINT_BLACK_FONTS,
-/* 0175 */ UNO_NAME_PRINTER_PAPER_TRAY,
-/* 0176 */ UNO_NAME_PRINT_PAGE_BACKGROUND,
-/* 0177 */ UNO_NAME_PRINT_ANNOTATION_MODE,
-/* 0178 */ UNO_NAME_PRINT_FAX_NAME,
-/* 0179 */ UNO_NAME_PRINT_PAPER_FROM_SETUP,
-/* 0180 */ UNO_NAME_REGISTER_MODE_ACTIVE,
-/* 0181 */ UNO_NAME_RELATIVE_WIDTH,
-/* 0182 */ UNO_NAME_RELATIVE_HEIGHT,
-/* 0183 */ UNO_NAME_REPEAT_HEADLINE,
-/* 0184 */ UNO_NAME_SEARCH_STYLES,
-/* 0185 */ UNO_NAME_SEARCH_BACKWARDS,
-/* 0186 */ UNO_NAME_SEARCH_SIMILARITY,
-/* 0187 */ UNO_NAME_SEARCH_IN_SELECTION,
-/* 0188 */ UNO_NAME_SEARCH_CASE_SENSITIVE,
-/* 0189 */ UNO_NAME_SEARCH_SIMILARITY_ADD,
-/* 0190 */ UNO_NAME_SEARCH_SIMILARITY_RELAX,
-/* 0191 */ UNO_NAME_SEARCH_SIMILARITY_REMOVE,
-/* 0192 */ UNO_NAME_SEARCH_REGULAR_EXPRESSION,
-/* 0193 */ UNO_NAME_SEARCH_SIMILARITY_EXCHANGE,
-/* 0194 */ UNO_NAME_SECONDARY_KEY,
-/* 0195 */ UNO_NAME_SEPARATOR_INTERVAL,
-/* 0196 */ UNO_NAME_SHOW_BREAKS,
-/* 0197 */ UNO_NAME_SHOW_SPACES,
-/* 0198 */ UNO_NAME_SHOW_TABLES,
-/* 0199 */ UNO_NAME_SHOW_GRAPHICS,
+/* 0165 */ UNO_NAME_PRIMARY_KEY,
+/* 0166 */ UNO_NAME_PRINT_TABLES,
+/* 0167 */ UNO_NAME_PRINT_GRAPHICS,
+/* 0168 */ UNO_NAME_PRINT_REVERSED,
+/* 0169 */ UNO_NAME_PRINT_PROSPECT,
+/* 0170 */ UNO_NAME_PRINT_CONTROLS,
+/* 0171 */ UNO_NAME_PRINT_DRAWINGS,
+/* 0172 */ UNO_NAME_PRINT_RIGHT_PAGES,
+/* 0173 */ UNO_NAME_PRINT_LEFT_PAGES,
+/* 0174 */ UNO_NAME_PRINT_BLACK_FONTS,
+/* 0175 */ UNO_NAME_PRINTER_PAPER_TRAY,
+/* 0176 */ UNO_NAME_PRINT_PAGE_BACKGROUND,
+/* 0177 */ UNO_NAME_PRINT_ANNOTATION_MODE,
+/* 0178 */ UNO_NAME_PRINT_FAX_NAME,
+/* 0179 */ UNO_NAME_PRINT_PAPER_FROM_SETUP,
+/* 0180 */ UNO_NAME_REGISTER_MODE_ACTIVE,
+/* 0181 */ UNO_NAME_RELATIVE_WIDTH,
+/* 0182 */ UNO_NAME_RELATIVE_HEIGHT,
+/* 0183 */ UNO_NAME_REPEAT_HEADLINE,
+/* 0184 */ UNO_NAME_SEARCH_STYLES,
+/* 0185 */ UNO_NAME_SEARCH_BACKWARDS,
+/* 0186 */ UNO_NAME_SEARCH_SIMILARITY,
+/* 0187 */ UNO_NAME_SEARCH_IN_SELECTION,
+/* 0188 */ UNO_NAME_SEARCH_CASE_SENSITIVE,
+/* 0189 */ UNO_NAME_SEARCH_SIMILARITY_ADD,
+/* 0190 */ UNO_NAME_SEARCH_SIMILARITY_RELAX,
+/* 0191 */ UNO_NAME_SEARCH_SIMILARITY_REMOVE,
+/* 0192 */ UNO_NAME_SEARCH_REGULAR_EXPRESSION,
+/* 0193 */ UNO_NAME_SEARCH_SIMILARITY_EXCHANGE,
+/* 0194 */ UNO_NAME_SECONDARY_KEY,
+/* 0195 */ UNO_NAME_SEPARATOR_INTERVAL,
+/* 0196 */ UNO_NAME_SHOW_BREAKS,
+/* 0197 */ UNO_NAME_SHOW_SPACES,
+/* 0198 */ UNO_NAME_SHOW_TABLES,
+/* 0199 */ UNO_NAME_SHOW_GRAPHICS,
-/* 0200 */ UNO_NAME_SHOW_DRAWINGS,
-/* 0201 */ UNO_NAME_SHOW_TABSTOPS,
-/* 0202 */ UNO_NAME_SHOW_VERT_RULER,
-/* 0203 */ UNO_NAME_SHOW_PARA_BREAKS,
-/* 0204 */ UNO_NAME_SHOW_HIDDEN_TEXT,
-/* 0205 */ UNO_NAME_SHOW_ANNOTATIONS,
-/* 0206 */ UNO_NAME_SHOW_SOFT_HYPHENS,
-/* 0207 */ UNO_NAME_SHOW_VERT_SCROLL_BAR,
-/* 0208 */ UNO_NAME_SHOW_HORI_SCROLL_BAR,
-/* 0209 */ UNO_NAME_SHOW_FIELD_COMMANDS,
-/* 0210 */ UNO_NAME_SHOW_TEXT_BOUNDARIES,
-/* 0211 */ UNO_NAME_SHOW_PROTECTED_SPACES,
-/* 0212 */ UNO_NAME_SHOW_TABLE_BOUNDARIES,
-/* 0213 */ UNO_NAME_SHOW_HIDDEN_PARAGRAPHS,
-/* 0214 */ UNO_NAME_SHOW_INDEX_MARK_BACKGROUND,
-/* 0215 */ UNO_NAME_SHOW_FOOTNOTE_BACKGROUND,
-/* 0216 */ UNO_NAME_SHOW_TEXT_FIELD_BACKGROUND,
-/* 0217 */ UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT,
-/* 0218 */ UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH,
-/* 0219 */ UNO_NAME_SIZE_PROTECTED,
-/* 0220 */ UNO_NAME_SMOOTH_SCROLLING,
-/* 0221 */ UNO_NAME_SOLID_MARK_HANDLES,
-/* 0222 */ UNO_NAME_TABLES,
-/* 0223 */ UNO_NAME_TEXT_FRAMES,
-/* 0224 */ UNO_NAME_TEXT_COLUMNS,
-/* 0225 */ UNO_NAME_BACK_TRANSPARENT,
-/* 0226 */ UNO_NAME_USE_PP,
-/* 0227 */ UNO_NAME_USER_METRIC,
-/* 0228 */ UNO_NAME_ANCHOR_TYPE,
-/* 0229 */ UNO_NAME_ANCHOR_TYPES,
-/* 0230 */ UNO_NAME_ANCHOR_PAGE_NO,
-/* 0231 */ UNO_NAME_ANCHOR_FRAME,
-/* 0232 */ UNO_NAME_AUTHOR,
-/* 0233 */ UNO_NAME_BREAK_TYPE,
-/* 0234 */ UNO_NAME_CHAIN_NEXT_NAME,
-/* 0235 */ UNO_NAME_CHAIN_PREV_NAME,
-/* 0236 */ UNO_NAME_CHAPTER_FORMAT,
-/* 0237 */ UNO_NAME_CLIENT_MAP,
-/* 0238 */ UNO_NAME_CONDITION,
-/* 0239 */ UNO_NAME_CONTENT,
-/* 0240 */ UNO_NAME_CHAR_CONTOURED,
-/* 0241 */ UNO_NAME_CONTOUR_OUTSIDE,
-/* 0242 */ UNO_NAME_CONTENT_PROTECTED,
-/* 0243 */ UNO_NAME_COUNT_EMPTY_LINES,
-/* 0244 */ UNO_NAME_RESTART_AT_EACH_PAGE,
-/* 0245 */ UNO_NAME_DATA_BASE_NAME,
-/* 0246 */ UNO_NAME_DATA_TABLE_NAME,
-/* 0247 */ UNO_NAME_DATA_COMMAND_TYPE,
-/* 0248 */ UNO_NAME_DATA_COLUMN_NAME,
-/* 0249 */ UNO_NAME_IS_DATA_BASE_FORMAT,
-/* 0250 */ UNO_NAME_DATE,
-/* 0251 */ UNO_NAME_IS_DATE,
-/* 0252 */ UNO_NAME_EDIT_IN_READONLY,
-/* 0253 */ UNO_NAME_FALSE_CONTENT,
-/* 0254 */ UNO_NAME_FILE_FORMAT,
-/* 0255 */ UNO_NAME_IS_FIXED,
-/* 0256 */ UNO_NAME_FOOTNOTE_COUNTING,
-/* 0257 */ UNO_NAME_FORMULA,
-/* 0258 */ UNO_NAME_FRAME_NAME,
-/* 0259 */ UNO_NAME_GRAPHIC_NAME,
-/* 0260 */ UNO_NAME_FULL_NAME,
-/* 0261 */ UNO_NAME_HEIGHT,
-/* 0262 */ UNO_NAME_IS_AUTO_HEIGHT,
-/* 0263 */ UNO_NAME_SIZE_TYPE,
-/* 0264 */ UNO_NAME_HINT,
-/* 0265 */ UNO_NAME_HORI_ORIENT,
-/* 0266 */ UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES,
-/* 0267 */ UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES,
-/* 0268 */ UNO_NAME_HORI_ORIENT_RELATION,
-/* 0269 */ UNO_NAME_HORI_ORIENT_POSITION,
-/* 0270 */ UNO_NAME_HYPER_LINK_U_R_L,
-/* 0271 */ UNO_NAME_HYPER_LINK_TARGET,
-/* 0272 */ UNO_NAME_HYPER_LINK_NAME,
-/* 0273 */ UNO_NAME_HYPER_LINK_EVENTS,
-/* 0274 */ UNO_NAME_INFO_TYPE,
-/* 0275 */ UNO_NAME_INFO_FORMAT,
-/* 0276 */ UNO_NAME_IS_INPUT,
-/* 0277 */ UNO_NAME_LEVEL,
-/* 0278 */ UNO_NAME_INTERVAL,
-/* 0279 */ UNO_NAME_LINK_REGION,
-/* 0280 */ UNO_NAME_MACRO_NAME,
-/* 0281 */ UNO_NAME_SPLIT,
-/* 0282 */ UNO_NAME_PARA_SPLIT,
-/* 0283 */ UNO_NAME_NUMBER_FORMAT,
-/* 0284 */ UNO_NAME_NUMBERING_TYPE,
-/* 0285 */ UNO_NAME_NUMBERING_RULES,
-/* 0286 */ UNO_NAME_OFFSET,
-/* 0287 */ UNO_NAME_ON,
-/* 0288 */ UNO_NAME_OPAQUE,
-/* 0289 */ UNO_NAME_PAGE_TOGGLE,
-/* 0290 */ UNO_NAME_PAGE_DESC_NAME,
-/* 0291 */ UNO_NAME_PAGE_NUMBER_OFFSET,
-/* 0292 */ UNO_NAME_PLACEHOLDER,
-/* 0293 */ UNO_NAME_PLACEHOLDER_TYPE,
-/* 0294 */ UNO_NAME_PRINT,
-/* 0295 */ UNO_NAME_REFERENCE_FIELD_PART,
-/* 0296 */ UNO_NAME_REFERENCE_FIELD_SOURCE,
-/* 0297 */ UNO_NAME_REGISTER_PARAGRAPH_STYLE,
-/* 0298 */ UNO_NAME_SCRIPT_TYPE,
-/* 0299 */ UNO_NAME_SEARCH_ALL,
+/* 0200 */ UNO_NAME_SHOW_DRAWINGS,
+/* 0201 */ UNO_NAME_SHOW_TABSTOPS,
+/* 0202 */ UNO_NAME_SHOW_VERT_RULER,
+/* 0203 */ UNO_NAME_SHOW_PARA_BREAKS,
+/* 0204 */ UNO_NAME_SHOW_HIDDEN_TEXT,
+/* 0205 */ UNO_NAME_SHOW_ANNOTATIONS,
+/* 0206 */ UNO_NAME_SHOW_SOFT_HYPHENS,
+/* 0207 */ UNO_NAME_SHOW_VERT_SCROLL_BAR,
+/* 0208 */ UNO_NAME_SHOW_HORI_SCROLL_BAR,
+/* 0209 */ UNO_NAME_SHOW_FIELD_COMMANDS,
+/* 0210 */ UNO_NAME_SHOW_TEXT_BOUNDARIES,
+/* 0211 */ UNO_NAME_SHOW_PROTECTED_SPACES,
+/* 0212 */ UNO_NAME_SHOW_TABLE_BOUNDARIES,
+/* 0213 */ UNO_NAME_SHOW_HIDDEN_PARAGRAPHS,
+/* 0214 */ UNO_NAME_SHOW_INDEX_MARK_BACKGROUND,
+/* 0215 */ UNO_NAME_SHOW_FOOTNOTE_BACKGROUND,
+/* 0216 */ UNO_NAME_SHOW_TEXT_FIELD_BACKGROUND,
+/* 0217 */ UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT,
+/* 0218 */ UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH,
+/* 0219 */ UNO_NAME_SIZE_PROTECTED,
+/* 0220 */ UNO_NAME_SMOOTH_SCROLLING,
+/* 0221 */ UNO_NAME_SOLID_MARK_HANDLES,
+/* 0222 */ UNO_NAME_TABLES,
+/* 0223 */ UNO_NAME_TEXT_FRAMES,
+/* 0224 */ UNO_NAME_TEXT_COLUMNS,
+/* 0225 */ UNO_NAME_BACK_TRANSPARENT,
+/* 0226 */ UNO_NAME_USE_PP,
+/* 0227 */ UNO_NAME_USER_METRIC,
+/* 0228 */ UNO_NAME_ANCHOR_TYPE,
+/* 0229 */ UNO_NAME_ANCHOR_TYPES,
+/* 0230 */ UNO_NAME_ANCHOR_PAGE_NO,
+/* 0231 */ UNO_NAME_ANCHOR_FRAME,
+/* 0232 */ UNO_NAME_AUTHOR,
+/* 0233 */ UNO_NAME_BREAK_TYPE,
+/* 0234 */ UNO_NAME_CHAIN_NEXT_NAME,
+/* 0235 */ UNO_NAME_CHAIN_PREV_NAME,
+/* 0236 */ UNO_NAME_CHAPTER_FORMAT,
+/* 0237 */ UNO_NAME_CLIENT_MAP,
+/* 0238 */ UNO_NAME_CONDITION,
+/* 0239 */ UNO_NAME_CONTENT,
+/* 0240 */ UNO_NAME_CHAR_CONTOURED,
+/* 0241 */ UNO_NAME_CONTOUR_OUTSIDE,
+/* 0242 */ UNO_NAME_CONTENT_PROTECTED,
+/* 0243 */ UNO_NAME_COUNT_EMPTY_LINES,
+/* 0244 */ UNO_NAME_RESTART_AT_EACH_PAGE,
+/* 0245 */ UNO_NAME_DATA_BASE_NAME,
+/* 0246 */ UNO_NAME_DATA_TABLE_NAME,
+/* 0247 */ UNO_NAME_DATA_COMMAND_TYPE,
+/* 0248 */ UNO_NAME_DATA_COLUMN_NAME,
+/* 0249 */ UNO_NAME_IS_DATA_BASE_FORMAT,
+/* 0250 */ UNO_NAME_DATE,
+/* 0251 */ UNO_NAME_IS_DATE,
+/* 0252 */ UNO_NAME_EDIT_IN_READONLY,
+/* 0253 */ UNO_NAME_FALSE_CONTENT,
+/* 0254 */ UNO_NAME_FILE_FORMAT,
+/* 0255 */ UNO_NAME_IS_FIXED,
+/* 0256 */ UNO_NAME_FOOTNOTE_COUNTING,
+/* 0257 */ UNO_NAME_FORMULA,
+/* 0258 */ UNO_NAME_FRAME_NAME,
+/* 0259 */ UNO_NAME_GRAPHIC_NAME,
+/* 0260 */ UNO_NAME_FULL_NAME,
+/* 0261 */ UNO_NAME_HEIGHT,
+/* 0262 */ UNO_NAME_IS_AUTO_HEIGHT,
+/* 0263 */ UNO_NAME_SIZE_TYPE,
+/* 0264 */ UNO_NAME_HINT,
+/* 0265 */ UNO_NAME_HORI_ORIENT,
+/* 0266 */ UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES,
+/* 0267 */ UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES,
+/* 0268 */ UNO_NAME_HORI_ORIENT_RELATION,
+/* 0269 */ UNO_NAME_HORI_ORIENT_POSITION,
+/* 0270 */ UNO_NAME_HYPER_LINK_U_R_L,
+/* 0271 */ UNO_NAME_HYPER_LINK_TARGET,
+/* 0272 */ UNO_NAME_HYPER_LINK_NAME,
+/* 0273 */ UNO_NAME_HYPER_LINK_EVENTS,
+/* 0274 */ UNO_NAME_INFO_TYPE,
+/* 0275 */ UNO_NAME_INFO_FORMAT,
+/* 0276 */ UNO_NAME_IS_INPUT,
+/* 0277 */ UNO_NAME_LEVEL,
+/* 0278 */ UNO_NAME_INTERVAL,
+/* 0279 */ UNO_NAME_LINK_REGION,
+/* 0280 */ UNO_NAME_MACRO_NAME,
+/* 0281 */ UNO_NAME_SPLIT,
+/* 0282 */ UNO_NAME_PARA_SPLIT,
+/* 0283 */ UNO_NAME_NUMBER_FORMAT,
+/* 0284 */ UNO_NAME_NUMBERING_TYPE,
+/* 0285 */ UNO_NAME_NUMBERING_RULES,
+/* 0286 */ UNO_NAME_OFFSET,
+/* 0287 */ UNO_NAME_ON,
+/* 0288 */ UNO_NAME_OPAQUE,
+/* 0289 */ UNO_NAME_PAGE_TOGGLE,
+/* 0290 */ UNO_NAME_PAGE_DESC_NAME,
+/* 0291 */ UNO_NAME_PAGE_NUMBER_OFFSET,
+/* 0292 */ UNO_NAME_PLACEHOLDER,
+/* 0293 */ UNO_NAME_PLACEHOLDER_TYPE,
+/* 0294 */ UNO_NAME_PRINT,
+/* 0295 */ UNO_NAME_REFERENCE_FIELD_PART,
+/* 0296 */ UNO_NAME_REFERENCE_FIELD_SOURCE,
+/* 0297 */ UNO_NAME_REGISTER_PARAGRAPH_STYLE,
+/* 0298 */ UNO_NAME_SCRIPT_TYPE,
+/* 0299 */ UNO_NAME_SEARCH_ALL,
-/* 0300 */ UNO_NAME_SEARCH_WORDS,
-/* 0301 */ UNO_NAME_SEQUENCE_VALUE,
-/* 0302 */ UNO_NAME_SERVER_MAP,
-/* 0303 */ UNO_NAME_IMAGE_MAP,
-/* 0304 */ UNO_NAME_SET_NUMBER,
-/* 0305 */ UNO_NAME_SHADOW_FORMAT,
-/* 0306 */ UNO_NAME_SHOW_HORI_RULER,
-/* 0307 */ UNO_NAME_SIZE,
-/* 0308 */ UNO_NAME_ACTUAL_SIZE,
-/* 0309 */ UNO_NAME_SOURCE_NAME,
-/* 0310 */ UNO_NAME_START_AT,
-/* 0311 */ UNO_NAME_STATISTIC_TYPE_ID,
-/* 0312 */ UNO_NAME_SUB_TYPE,
-/* 0313 */ UNO_NAME_SURROUND,
-/* 0314 */ UNO_NAME_IS_EXPRESSION,
-/* 0315 */ UNO_NAME_IS_SHOW_FORMULA,
-/* 0316 */ UNO_NAME_TEXT_WRAP,
-/* 0317 */ UNO_NAME_SURROUND_CONTOUR,
-/* 0318 */ UNO_NAME_SURROUND_ANCHORONLY,
-/* 0319 */ UNO_NAME_TABLE_NAME,
-/* 0320 */ UNO_NAME_TABSTOPS,
-/* 0321 */ UNO_NAME_TITLE,
-/* 0322 */ UNO_NAME_TOP_MARGIN,
-/* 0323 */ UNO_NAME_BOTTOM_MARGIN,
-/* 0324 */ UNO_NAME_TRUE_CONTENT,
-/* 0325 */ UNO_NAME_URL_CONTENT,
-/* 0326 */ UNO_NAME_USERTEXT,
-/* 0327 */ UNO_NAME_USER_DATA_TYPE,
-/* 0328 */ UNO_NAME_VALUE,
-/* 0329 */ UNO_NAME_VARIABLE_NAME,
-/* 0330 */ UNO_NAME_VARIABLE_SUBTYPE,
+/* 0300 */ UNO_NAME_SEARCH_WORDS,
+/* 0301 */ UNO_NAME_SEQUENCE_VALUE,
+/* 0302 */ UNO_NAME_SERVER_MAP,
+/* 0303 */ UNO_NAME_IMAGE_MAP,
+/* 0304 */ UNO_NAME_SET_NUMBER,
+/* 0305 */ UNO_NAME_SHADOW_FORMAT,
+/* 0306 */ UNO_NAME_SHOW_HORI_RULER,
+/* 0307 */ UNO_NAME_SIZE,
+/* 0308 */ UNO_NAME_ACTUAL_SIZE,
+/* 0309 */ UNO_NAME_SOURCE_NAME,
+/* 0310 */ UNO_NAME_START_AT,
+/* 0311 */ UNO_NAME_STATISTIC_TYPE_ID,
+/* 0312 */ UNO_NAME_SUB_TYPE,
+/* 0313 */ UNO_NAME_SURROUND,
+/* 0314 */ UNO_NAME_IS_EXPRESSION,
+/* 0315 */ UNO_NAME_IS_SHOW_FORMULA,
+/* 0316 */ UNO_NAME_TEXT_WRAP,
+/* 0317 */ UNO_NAME_SURROUND_CONTOUR,
+/* 0318 */ UNO_NAME_SURROUND_ANCHORONLY,
+/* 0319 */ UNO_NAME_TABLE_NAME,
+/* 0320 */ UNO_NAME_TABSTOPS,
+/* 0321 */ UNO_NAME_TITLE,
+/* 0322 */ UNO_NAME_TOP_MARGIN,
+/* 0323 */ UNO_NAME_BOTTOM_MARGIN,
+/* 0324 */ UNO_NAME_TRUE_CONTENT,
+/* 0325 */ UNO_NAME_URL_CONTENT,
+/* 0326 */ UNO_NAME_USERTEXT,
+/* 0327 */ UNO_NAME_USER_DATA_TYPE,
+/* 0328 */ UNO_NAME_VALUE,
+/* 0329 */ UNO_NAME_VARIABLE_NAME,
+/* 0330 */ UNO_NAME_VARIABLE_SUBTYPE,
/* 0331 */ UNO_NAME_VERT_ORIENT,
-/* 0332 */ UNO_NAME_VERT_MIRRORED,
-/* 0333 */ UNO_NAME_VERT_ORIENT_POSITION,
-/* 0334 */ UNO_NAME_VERT_ORIENT_RELATION,
-/* 0335 */ UNO_NAME_IS_VISIBLE,
-/* 0336 */ UNO_NAME_WIDTH,
-/* 0337 */ UNO_NAME_CHAR_WORD_MODE,
-/* 0338 */ UNO_NAME_GRAPHIC_CROP,
-/* 0339 */ UNO_NAME_CHARACTER_FORMAT_NONE,
-/* 0340 */ UNO_NAME_TEXT_POSITION,
-/* 0341 */ UNO_NAME_DOCUMENT_INDEX_MARK,
-/* 0342 */ UNO_NAME_DOCUMENT_INDEX,
-/* 0343 */ UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION,
-/* 0344 */ UNO_NAME_TEXT_FIELD,
-/* 0345 */ UNO_NAME_BOOKMARK,
-/* 0346 */ UNO_NAME_TEXT_TABLE,
-/* 0347 */ UNO_NAME_CELL,
-/* 0348 */ UNO_NAME_TEXT_FRAME,
-/* 0349 */ UNO_NAME_REFERENCE_MARK,
-/* 0350 */ UNO_NAME_TEXT_SECTION,
-/* 0351 */ UNO_NAME_FOOTNOTE,
-/* 0352 */ UNO_NAME_ENDNOTE,
-/* 0353 */ UNO_NAME_CHART_ROW_AS_LABEL,
-/* 0354 */ UNO_NAME_CHART_COLUMN_AS_LABEL,
-/* 0355 */ UNO_NAME_TABLE_COLUMS,
-/* 0356 */ UNO_NAME_LEFT_BORDER,
-/* 0357 */ UNO_NAME_RIGHT_BORDER,
-/* 0358 */ UNO_NAME_TOP_BORDER,
-/* 0359 */ UNO_NAME_BOTTOM_BORDER,
-/* 0360 */ UNO_NAME_BORDER_DISTANCE,
-/* 0361 */ UNO_NAME_LEFT_BORDER_DISTANCE,
-/* 0362 */ UNO_NAME_RIGHT_BORDER_DISTANCE,
-/* 0363 */ UNO_NAME_TOP_BORDER_DISTANCE,
-/* 0364 */ UNO_NAME_BOTTOM_BORDER_DISTANCE,
-/* 0365 */ UNO_NAME_TABLE_BORDER,
-/* 0366 */ UNO_NAME_TABLE_COLUMN_SEPARATORS,
-/* 0367 */ UNO_NAME_TABLE_COLUMN_RELATIVE_SUM,
-/* 0368 */ UNO_NAME_HEADER_TEXT,
-/* 0369 */ UNO_NAME_HEADER_TEXT_LEFT,
-/* 0370 */ UNO_NAME_HEADER_TEXT_RIGHT,
-/* 0371 */ UNO_NAME_FOOTER_TEXT,
-/* 0372 */ UNO_NAME_FOOTER_TEXT_LEFT,
-/* 0373 */ UNO_NAME_FOOTER_TEXT_RIGHT,
-/* 0374 */ UNO_NAME_HEADER_BACK_COLOR,
-/* 0375 */ UNO_NAME_HEADER_GRAPHIC,
-/* 0376 */ UNO_NAME_HEADER_BACK_TRANSPARENT,
-/* 0377 */ UNO_NAME_HEADER_LEFT_BORDER,
-/* 0378 */ UNO_NAME_HEADER_RIGHT_BORDER,
-/* 0379 */ UNO_NAME_HEADER_TOP_BORDER,
-/* 0380 */ UNO_NAME_HEADER_BOTTOM_BORDER,
-/* 0381 */ UNO_NAME_HEADER_BORDER_DISTANCE,
-/* 0382 */ UNO_NAME_HEADER_SHADOW_FORMAT,
-/* 0383 */ UNO_NAME_HEADER_BODY_DISTANCE,
-/* 0384 */ UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT,
-/* 0385 */ UNO_NAME_HEADER_IS_SHARED,
-/* 0386 */ UNO_NAME_HEADER_HEIGHT,
-/* 0387 */ UNO_NAME_HEADER_IS_ON,
-/* 0388 */ UNO_NAME_FOOTER_BACK_COLOR,
-/* 0389 */ UNO_NAME_FOOTER_GRAPHIC,
-/* 0390 */ UNO_NAME_FOOTER_BACK_TRANSPARENT,
-/* 0391 */ UNO_NAME_FOOTER_LEFT_BORDER,
-/* 0392 */ UNO_NAME_FOOTER_RIGHT_BORDER,
-/* 0393 */ UNO_NAME_FOOTER_TOP_BORDER,
-/* 0394 */ UNO_NAME_FOOTER_BOTTOM_BORDER,
-/* 0395 */ UNO_NAME_FOOTER_BORDER_DISTANCE,
-/* 0396 */ UNO_NAME_FOOTER_SHADOW_FORMAT,
-/* 0397 */ UNO_NAME_FOOTER_BODY_DISTANCE,
-/* 0398 */ UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT,
-/* 0399 */ UNO_NAME_FOOTER_IS_SHARED,
+/* 0332 */ UNO_NAME_VERT_MIRRORED,
+/* 0333 */ UNO_NAME_VERT_ORIENT_POSITION,
+/* 0334 */ UNO_NAME_VERT_ORIENT_RELATION,
+/* 0335 */ UNO_NAME_IS_VISIBLE,
+/* 0336 */ UNO_NAME_WIDTH,
+/* 0337 */ UNO_NAME_CHAR_WORD_MODE,
+/* 0338 */ UNO_NAME_GRAPHIC_CROP,
+/* 0339 */ UNO_NAME_CHARACTER_FORMAT_NONE,
+/* 0340 */ UNO_NAME_TEXT_POSITION,
+/* 0341 */ UNO_NAME_DOCUMENT_INDEX_MARK,
+/* 0342 */ UNO_NAME_DOCUMENT_INDEX,
+/* 0343 */ UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION,
+/* 0344 */ UNO_NAME_TEXT_FIELD,
+/* 0345 */ UNO_NAME_BOOKMARK,
+/* 0346 */ UNO_NAME_TEXT_TABLE,
+/* 0347 */ UNO_NAME_CELL,
+/* 0348 */ UNO_NAME_TEXT_FRAME,
+/* 0349 */ UNO_NAME_REFERENCE_MARK,
+/* 0350 */ UNO_NAME_TEXT_SECTION,
+/* 0351 */ UNO_NAME_FOOTNOTE,
+/* 0352 */ UNO_NAME_ENDNOTE,
+/* 0353 */ UNO_NAME_CHART_ROW_AS_LABEL,
+/* 0354 */ UNO_NAME_CHART_COLUMN_AS_LABEL,
+/* 0355 */ UNO_NAME_TABLE_COLUMS,
+/* 0356 */ UNO_NAME_LEFT_BORDER,
+/* 0357 */ UNO_NAME_RIGHT_BORDER,
+/* 0358 */ UNO_NAME_TOP_BORDER,
+/* 0359 */ UNO_NAME_BOTTOM_BORDER,
+/* 0360 */ UNO_NAME_BORDER_DISTANCE,
+/* 0361 */ UNO_NAME_LEFT_BORDER_DISTANCE,
+/* 0362 */ UNO_NAME_RIGHT_BORDER_DISTANCE,
+/* 0363 */ UNO_NAME_TOP_BORDER_DISTANCE,
+/* 0364 */ UNO_NAME_BOTTOM_BORDER_DISTANCE,
+/* 0365 */ UNO_NAME_TABLE_BORDER,
+/* 0366 */ UNO_NAME_TABLE_COLUMN_SEPARATORS,
+/* 0367 */ UNO_NAME_TABLE_COLUMN_RELATIVE_SUM,
+/* 0368 */ UNO_NAME_HEADER_TEXT,
+/* 0369 */ UNO_NAME_HEADER_TEXT_LEFT,
+/* 0370 */ UNO_NAME_HEADER_TEXT_RIGHT,
+/* 0371 */ UNO_NAME_FOOTER_TEXT,
+/* 0372 */ UNO_NAME_FOOTER_TEXT_LEFT,
+/* 0373 */ UNO_NAME_FOOTER_TEXT_RIGHT,
+/* 0374 */ UNO_NAME_HEADER_BACK_COLOR,
+/* 0375 */ UNO_NAME_HEADER_GRAPHIC,
+/* 0376 */ UNO_NAME_HEADER_BACK_TRANSPARENT,
+/* 0377 */ UNO_NAME_HEADER_LEFT_BORDER,
+/* 0378 */ UNO_NAME_HEADER_RIGHT_BORDER,
+/* 0379 */ UNO_NAME_HEADER_TOP_BORDER,
+/* 0380 */ UNO_NAME_HEADER_BOTTOM_BORDER,
+/* 0381 */ UNO_NAME_HEADER_BORDER_DISTANCE,
+/* 0382 */ UNO_NAME_HEADER_SHADOW_FORMAT,
+/* 0383 */ UNO_NAME_HEADER_BODY_DISTANCE,
+/* 0384 */ UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT,
+/* 0385 */ UNO_NAME_HEADER_IS_SHARED,
+/* 0386 */ UNO_NAME_HEADER_HEIGHT,
+/* 0387 */ UNO_NAME_HEADER_IS_ON,
+/* 0388 */ UNO_NAME_FOOTER_BACK_COLOR,
+/* 0389 */ UNO_NAME_FOOTER_GRAPHIC,
+/* 0390 */ UNO_NAME_FOOTER_BACK_TRANSPARENT,
+/* 0391 */ UNO_NAME_FOOTER_LEFT_BORDER,
+/* 0392 */ UNO_NAME_FOOTER_RIGHT_BORDER,
+/* 0393 */ UNO_NAME_FOOTER_TOP_BORDER,
+/* 0394 */ UNO_NAME_FOOTER_BOTTOM_BORDER,
+/* 0395 */ UNO_NAME_FOOTER_BORDER_DISTANCE,
+/* 0396 */ UNO_NAME_FOOTER_SHADOW_FORMAT,
+/* 0397 */ UNO_NAME_FOOTER_BODY_DISTANCE,
+/* 0398 */ UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT,
+/* 0399 */ UNO_NAME_FOOTER_IS_SHARED,
-/* 0400 */ UNO_NAME_FOOTER_HEIGHT,
-/* 0401 */ UNO_NAME_FOOTER_IS_ON,
-/* 0402 */ UNO_NAME_OVERWRITE_STYLES,
-/* 0403 */ UNO_NAME_LOAD_NUMBERING_STYLES,
-/* 0404 */ UNO_NAME_LOAD_PAGE_STYLES,
-/* 0405 */ UNO_NAME_LOAD_FRAME_STYLES,
-/* 0406 */ UNO_NAME_LOAD_TEXT_STYLES,
-/* 0407 */ UNO_NAME_FILE_NAME,
-/* 0408 */ UNO_NAME_FILTER_NAME,
-/* 0409 */ UNO_NAME_FILTER_OPTION,
-/* 0410 */ UNO_NAME_PASSWORD,
-/* 0411 */ UNO_NAME_COPY_COUNT,
-/* 0412 */ UNO_NAME_COLLATE,
-/* 0413 */ UNO_NAME_SORT,
-/* 0414 */ UNO_NAME_PAGES,
-/* 0415 */ UNO_NAME_FIRST_LINE_OFFSET,
-/* 0416 */ UNO_NAME_SYMBOL_TEXT_DISTANCE,
-/* 0417 */ UNO_NAME_USER_INDEX_NAME,
-/* 0418 */ UNO_NAME_REVISION,
-/* 0419 */ UNO_NAME_UNVISITED_CHAR_STYLE_NAME,
-/* 0420 */ UNO_NAME_VISITED_CHAR_STYLE_NAME,
-/* 0421 */ UNO_NAME_PARAGRAPH_COUNT,
-/* 0422 */ UNO_NAME_WORD_COUNT,
-/* 0423 */ UNO_NAME_WORD_SEPARATOR,
-/* 0424 */ UNO_NAME_CHARACTER_COUNT,
-/* 0425 */ UNO_NAME_ZOOM_VALUE,
-/* 0426 */ UNO_NAME_ZOOM_TYPE,
-/* 0427 */ UNO_NAME_CREATE_FROM_MARKS,
-/* 0428 */ UNO_NAME_CREATE_FROM_OUTLINE,
-/* 0429 */ UNO_NAME_PARAGRAPH_STYLE_NAMES,
-/* 0430 */ UNO_NAME_CREATE_FROM_CHAPTER,
-/* 0431 */ UNO_NAME_CREATE_FROM_LABELS,
-/* 0432 */ UNO_NAME_USE_ALPHABETICAL_SEPARATORS,
-/* 0433 */ UNO_NAME_USE_KEY_AS_ENTRY,
-/* 0434 */ UNO_NAME_USE_COMBINED_ENTRIES,
-/* 0435 */ UNO_NAME_IS_CASE_SENSITIVE,
-/* 0436 */ UNO_NAME_USE_P_P,
-/* 0437 */ UNO_NAME_USE_DASH,
-/* 0438 */ UNO_NAME_USE_UPPER_CASE,
-/* 0439 */ UNO_NAME_LABEL_CATEGORY,
-/* 0440 */ UNO_NAME_LABEL_DISPLAY_TYPE,
-/* 0441 */ UNO_NAME_USE_LEVEL_FROM_SOURCE,
-/* 0442 */ UNO_NAME_LEVEL_FORMAT,
-/* 0443 */ UNO_NAME_LEVEL_PARAGRAPH_STYLES,
-/* 0444 */ UNO_NAME_RECALC_TAB_STOPS,
-/* 0445 */ UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME,
-/* 0446 */ UNO_NAME_CREATE_FROM_TABLES,
-/* 0447 */ UNO_NAME_CREATE_FROM_TEXT_FRAMES,
-/* 0448 */ UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS,
-/* 0449 */ UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS,
-/* 0450 */ UNO_NAME_CREATE_FROM_STAR_MATH,
-/* 0451 */ UNO_NAME_CREATE_FROM_STAR_CHART,
-/* 0452 */ UNO_NAME_CREATE_FROM_STAR_CALC,
-/* 0453 */ UNO_NAME_CREATE_FROM_STAR_DRAW,
-/* 0454 */ UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS,
-/* 0455 */ UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L,
-/* 0456 */ UNO_NAME_IS_COMMA_SEPARATED,
-/* 0457 */ UNO_NAME_IS_RELATIVE_TABSTOPS,
-/* 0458 */ UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES,
-/* 0459 */ UNO_NAME_SHOW_CHANGES,
-/* 0460 */ UNO_NAME_RECORD_CHANGES,
-/* 0461 */ UNO_LINK_DISPLAY_NAME,
-/* 0462 */ UNO_LINK_DISPLAY_BITMAP,
-/* 0463 */ UNO_NAME_HEADING_STYLE_NAME,
-/* 0464 */ UNO_NAME_SHOW_ONLINE_LAYOUT,
-/* 0465 */ UNO_NAME_USER_DEFINED_ATTRIBUTES,
-/* 0466 */ UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES,
-/* 0467 */ UNO_NAME_FILE_PATH,
-/* 0468 */ UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL,
-/* 0469 */ UNO_NAME_PARA_CONDITIONAL_STYLE_NAME,
-/* 0470 */ UNO_NAME_CHAPTER_NUMBERING_LEVEL,
-/* 0471 */ UNO_NAME_NUMBERING_SEPARATOR,
-/* 0472 */ UNO_NAME_IS_CONTINUOUS_NUMBERING,
-/* 0473 */ UNO_NAME_IS_AUTOMATIC,
-/* 0474 */ UNO_NAME_IS_ABSOLUTE_MARGINS,
-/* 0475 */ UNO_NAME_CATEGORY,
-/* 0476 */ UNO_NAME_DEPENDENT_TEXT_FIELDS,
-/* 0477 */ UNO_NAME_CURRENT_PRESENTATION,
-/* 0478 */ UNO_NAME_ADJUST,
-/* 0479 */ UNO_NAME_INSTANCE_NAME,
-/* 0480 */ UNO_NAME_TEXT_PORTION_TYPE,
-/* 0481 */ UNO_NAME_CONTROL_CHARACTER,
-/* 0482 */ UNO_NAME_IS_COLLAPSED,
-/* 0483 */ UNO_NAME_IS_START,
-/* 0484 */ UNO_NAME_SEQUENCE_NUMBER,
-/* 0485 */ UNO_NAME_REFERENCE_ID,
-/* 0486 */ UNO_NAME_HEADER_LEFT_BORDER_DISTANCE,
-/* 0487 */ UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE,
-/* 0488 */ UNO_NAME_HEADER_TOP_BORDER_DISTANCE,
-/* 0489 */ UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE,
-/* 0490 */ UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE,
-/* 0491 */ UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE,
-/* 0492 */ UNO_NAME_FOOTER_TOP_BORDER_DISTANCE,
-/* 0493 */ UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE,
-/* 0494 */ UNO_NAME_PARA_IS_NUMBERING_RESTART,
-/* 0495 */ UNO_NAME_HIDE_FIELD_TIPS,
-/* 0496 */ UNO_NAME_HEADER_USER_DEFINED_ATTRIBUTES,
-/* 0497 */ UNO_NAME_FOOTER_USER_DEFINED_ATTRIBUTES,
-/* 0498 */ UNO_NAME_PARA_SHADOW_FORMAT,
-/* 0499 */ UNO_NAME_CONTOUR_POLY_POLYGON,
+/* 0400 */ UNO_NAME_FOOTER_HEIGHT,
+/* 0401 */ UNO_NAME_FOOTER_IS_ON,
+/* 0402 */ UNO_NAME_OVERWRITE_STYLES,
+/* 0403 */ UNO_NAME_LOAD_NUMBERING_STYLES,
+/* 0404 */ UNO_NAME_LOAD_PAGE_STYLES,
+/* 0405 */ UNO_NAME_LOAD_FRAME_STYLES,
+/* 0406 */ UNO_NAME_LOAD_TEXT_STYLES,
+/* 0407 */ UNO_NAME_FILE_NAME,
+/* 0408 */ UNO_NAME_FILTER_NAME,
+/* 0409 */ UNO_NAME_FILTER_OPTION,
+/* 0410 */ UNO_NAME_PASSWORD,
+/* 0411 */ UNO_NAME_COPY_COUNT,
+/* 0412 */ UNO_NAME_COLLATE,
+/* 0413 */ UNO_NAME_SORT,
+/* 0414 */ UNO_NAME_PAGES,
+/* 0415 */ UNO_NAME_FIRST_LINE_OFFSET,
+/* 0416 */ UNO_NAME_SYMBOL_TEXT_DISTANCE,
+/* 0417 */ UNO_NAME_USER_INDEX_NAME,
+/* 0418 */ UNO_NAME_REVISION,
+/* 0419 */ UNO_NAME_UNVISITED_CHAR_STYLE_NAME,
+/* 0420 */ UNO_NAME_VISITED_CHAR_STYLE_NAME,
+/* 0421 */ UNO_NAME_PARAGRAPH_COUNT,
+/* 0422 */ UNO_NAME_WORD_COUNT,
+/* 0423 */ UNO_NAME_WORD_SEPARATOR,
+/* 0424 */ UNO_NAME_CHARACTER_COUNT,
+/* 0425 */ UNO_NAME_ZOOM_VALUE,
+/* 0426 */ UNO_NAME_ZOOM_TYPE,
+/* 0427 */ UNO_NAME_CREATE_FROM_MARKS,
+/* 0428 */ UNO_NAME_CREATE_FROM_OUTLINE,
+/* 0429 */ UNO_NAME_PARAGRAPH_STYLE_NAMES,
+/* 0430 */ UNO_NAME_CREATE_FROM_CHAPTER,
+/* 0431 */ UNO_NAME_CREATE_FROM_LABELS,
+/* 0432 */ UNO_NAME_USE_ALPHABETICAL_SEPARATORS,
+/* 0433 */ UNO_NAME_USE_KEY_AS_ENTRY,
+/* 0434 */ UNO_NAME_USE_COMBINED_ENTRIES,
+/* 0435 */ UNO_NAME_IS_CASE_SENSITIVE,
+/* 0436 */ UNO_NAME_USE_P_P,
+/* 0437 */ UNO_NAME_USE_DASH,
+/* 0438 */ UNO_NAME_USE_UPPER_CASE,
+/* 0439 */ UNO_NAME_LABEL_CATEGORY,
+/* 0440 */ UNO_NAME_LABEL_DISPLAY_TYPE,
+/* 0441 */ UNO_NAME_USE_LEVEL_FROM_SOURCE,
+/* 0442 */ UNO_NAME_LEVEL_FORMAT,
+/* 0443 */ UNO_NAME_LEVEL_PARAGRAPH_STYLES,
+/* 0444 */ UNO_NAME_RECALC_TAB_STOPS,
+/* 0445 */ UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME,
+/* 0446 */ UNO_NAME_CREATE_FROM_TABLES,
+/* 0447 */ UNO_NAME_CREATE_FROM_TEXT_FRAMES,
+/* 0448 */ UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS,
+/* 0449 */ UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS,
+/* 0450 */ UNO_NAME_CREATE_FROM_STAR_MATH,
+/* 0451 */ UNO_NAME_CREATE_FROM_STAR_CHART,
+/* 0452 */ UNO_NAME_CREATE_FROM_STAR_CALC,
+/* 0453 */ UNO_NAME_CREATE_FROM_STAR_DRAW,
+/* 0454 */ UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS,
+/* 0455 */ UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L,
+/* 0456 */ UNO_NAME_IS_COMMA_SEPARATED,
+/* 0457 */ UNO_NAME_IS_RELATIVE_TABSTOPS,
+/* 0458 */ UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES,
+/* 0459 */ UNO_NAME_SHOW_CHANGES,
+/* 0460 */ UNO_NAME_RECORD_CHANGES,
+/* 0461 */ UNO_LINK_DISPLAY_NAME,
+/* 0462 */ UNO_LINK_DISPLAY_BITMAP,
+/* 0463 */ UNO_NAME_HEADING_STYLE_NAME,
+/* 0464 */ UNO_NAME_SHOW_ONLINE_LAYOUT,
+/* 0465 */ UNO_NAME_USER_DEFINED_ATTRIBUTES,
+/* 0466 */ UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES,
+/* 0467 */ UNO_NAME_FILE_PATH,
+/* 0468 */ UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL,
+/* 0469 */ UNO_NAME_PARA_CONDITIONAL_STYLE_NAME,
+/* 0470 */ UNO_NAME_CHAPTER_NUMBERING_LEVEL,
+/* 0471 */ UNO_NAME_NUMBERING_SEPARATOR,
+/* 0472 */ UNO_NAME_IS_CONTINUOUS_NUMBERING,
+/* 0473 */ UNO_NAME_IS_AUTOMATIC,
+/* 0474 */ UNO_NAME_IS_ABSOLUTE_MARGINS,
+/* 0475 */ UNO_NAME_CATEGORY,
+/* 0476 */ UNO_NAME_DEPENDENT_TEXT_FIELDS,
+/* 0477 */ UNO_NAME_CURRENT_PRESENTATION,
+/* 0478 */ UNO_NAME_ADJUST,
+/* 0479 */ UNO_NAME_INSTANCE_NAME,
+/* 0480 */ UNO_NAME_TEXT_PORTION_TYPE,
+/* 0481 */ UNO_NAME_CONTROL_CHARACTER,
+/* 0482 */ UNO_NAME_IS_COLLAPSED,
+/* 0483 */ UNO_NAME_IS_START,
+/* 0484 */ UNO_NAME_SEQUENCE_NUMBER,
+/* 0485 */ UNO_NAME_REFERENCE_ID,
+/* 0486 */ UNO_NAME_HEADER_LEFT_BORDER_DISTANCE,
+/* 0487 */ UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE,
+/* 0488 */ UNO_NAME_HEADER_TOP_BORDER_DISTANCE,
+/* 0489 */ UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE,
+/* 0490 */ UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE,
+/* 0491 */ UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE,
+/* 0492 */ UNO_NAME_FOOTER_TOP_BORDER_DISTANCE,
+/* 0493 */ UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE,
+/* 0494 */ UNO_NAME_PARA_IS_NUMBERING_RESTART,
+/* 0495 */ UNO_NAME_HIDE_FIELD_TIPS,
+/* 0496 */ UNO_NAME_HEADER_USER_DEFINED_ATTRIBUTES,
+/* 0497 */ UNO_NAME_FOOTER_USER_DEFINED_ATTRIBUTES,
+/* 0498 */ UNO_NAME_PARA_SHADOW_FORMAT,
+/* 0499 */ UNO_NAME_CONTOUR_POLY_POLYGON,
-/* 0500 */ UNO_NAME_IS_PIXEL_CONTOUR,
-/* 0501 */ UNO_NAME_IS_AUTOMATIC_CONTOUR,
-/* 0502 */ UNO_NAME_SEPARATOR_LINE_WIDTH,
-/* 0503 */ UNO_NAME_SEPARATOR_LINE_COLOR,
-/* 0504 */ UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT,
-/* 0505 */ UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT,
-/* 0506 */ UNO_NAME_SEPARATOR_LINE_IS_ON,
-/* 0507 */ UNO_NAME_IS_SKIP_HIDDEN_TEXT,
-/* 0508 */ UNO_NAME_IS_SKIP_PROTECTED_TEXT,
-/* 0509 */ UNO_NAME_DOCUMENT_INDEX_MARKS,
-/* 0510 */ UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END,
-/* 0511 */ UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING,
-/* 0512 */ UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT,
-/* 0513 */ UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING,
-/* 0514 */ UNO_NAME_FOOTNOTE_NUMBERING_TYPE,
-/* 0515 */ UNO_NAME_FOOTNOTE_NUMBERING_PREFIX,
-/* 0516 */ UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX,
-/* 0517 */ UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END,
-/* 0518 */ UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING,
-/* 0519 */ UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT,
-/* 0520 */ UNO_NAME_ENDNOTE_IS_OWN_NUMBERING,
-/* 0521 */ UNO_NAME_ENDNOTE_NUMBERING_TYPE,
-/* 0522 */ UNO_NAME_ENDNOTE_NUMBERING_PREFIX,
-/* 0523 */ UNO_NAME_ENDNOTE_NUMBERING_SUFFIX,
-/* 0524 */ UNO_NAME_BRACKET_BEFORE,
-/* 0525 */ UNO_NAME_BRACKET_AFTER,
-/* 0526 */ UNO_NAME_IS_NUMBER_ENTRIES,
-/* 0527 */ UNO_NAME_IS_SORT_BY_POSITION,
-/* 0528 */ UNO_NAME_SORT_KEYS,
-/* 0529 */ UNO_NAME_IS_SORT_ASCENDING,
-/* 0530 */ UNO_NAME_SORT_KEY,
-/* 0531 */ UNO_NAME_FIELDS,
-/* 0532 */ UNO_NAME_DATE_TIME_VALUE,
-/* 0533 */ UNO_NAME_IS_ON,
-/* 0534 */ UNO_NAME_Z_ORDER,
-/* 0535 */ UNO_NAME_CONTENT_SECTION,
-/* 0536 */ UNO_NAME_HEADER_SECTION,
-/* 0537 */ UNO_NAME_PARA_IS_HANGING_PUNCTUATION,
-/* 0538 */ UNO_NAME_PARA_IS_CHARACTER_DISTANCE,
-/* 0539 */ UNO_NAME_PARA_IS_FORBIDDEN_RULES,
-/* 0540 */ UNO_NAME_PARA_VERT_ALIGNMENT,
-/* 0541 */ UNO_NAME_IS_MAIN_ENTRY,
-/* 0542 */ UNO_NAME_GRAPHIC_ROTATION,
-/* 0543 */ UNO_NAME_ADJUST_LUMINANCE,
-/* 0544 */ UNO_NAME_ADJUST_CONTRAST,
-/* 0545 */ UNO_NAME_ADJUST_RED,
-/* 0546 */ UNO_NAME_ADJUST_GREEN,
-/* 0547 */ UNO_NAME_ADJUST_BLUE,
-/* 0548 */ UNO_NAME_GAMMA,
-/* 0549 */ UNO_NAME_GRAPHIC_IS_INVERTED,
-/* 0550 */ UNO_NAME_TRANSPARENCY,
-/* 0551 */ UNO_NAME_GRAPHIC_COLOR_MODE,
-/* 0552 */ UNO_NAME_REDLINE_AUTHOR,
-/* 0553 */ UNO_NAME_REDLINE_DATE_TIME,
-/* 0554 */ UNO_NAME_REDLINE_COMMENT,
-/* 0555 */ UNO_NAME_REDLINE_TYPE,
-/* 0556 */ UNO_NAME_REDLINE_SUCCESSOR_DATA,
-/* 0557 */ UNO_NAME_REDLINE_IDENTIFIER,
-/* 0558 */ UNO_NAME_IS_IN_HEADER_FOOTER,
-/* 0559 */ UNO_NAME_START_REDLINE,
-/* 0560 */ UNO_NAME_END_REDLINE,
-/* 0561 */ UNO_NAME_REDLINE_START,
-/* 0562 */ UNO_NAME_REDLINE_END,
-/* 0563 */ UNO_NAME_REDLINE_TEXT,
-/* 0564 */ UNO_NAME_REDLINE_DISPLAY_TYPE,
-/* 0565 */ UNO_NAME_FORBIDDEN_CHARACTERS,
-/* 0566 */ UNO_NAME_RUBY_BASE_TEXT,
-/* 0567 */ UNO_NAME_RUBY_TEXT,
-/* 0568 */ UNO_NAME_RUBY_ADJUST,
-/* 0569 */ UNO_NAME_RUBY_CHAR_STYLE_NAME,
-/* 0570 */ UNO_NAME_RUBY_IS_ABOVE,
-/* 0571 */ UNO_NAME_FOOTNOTE_HEIGHT,
-/* 0572 */ UNO_NAME_FOOTNOTE_LINE_WEIGHT,
-/* 0573 */ UNO_NAME_FOOTNOTE_LINE_COLOR,
-/* 0574 */ UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH,
-/* 0575 */ UNO_NAME_FOOTNOTE_LINE_ADJUST,
-/* 0576 */ UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE,
-/* 0577 */ UNO_NAME_FOOTNOTE_LINE_DISTANCE,
-/* 0578 */ UNO_NAME_CHAR_ROTATION,
-/* 0579 */ UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE,
-/* 0580 */ UNO_NAME_CHAR_SCALE_WIDTH,
-/* 0581 */ UNO_NAME_TAB_STOP_DISTANCE,
-/* 0582 */ UNO_NAME_IS_WIDTH_RELATIVE,
-/* 0583 */ UNO_NAME_CHAR_RELIEF,
-/* 0584 */ UNO_NAME_IS_HIDDEN,
-/* 0585 */ UNO_NAME_IS_CONDITION_TRUE,
-/* 0586 */ UNO_NAME_TWO_DIGIT_YEAR,
-/* 0587 */ UNO_NAME_PROTECTION_KEY,
-/* 0588 */ UNO_NAME_REDLINE_PROTECTION_KEY,
-/* 0589 */ UNO_NAME_AUTOMATIC_DISTANCE,
-/* 0590 */ UNO_NAME_AUTOMATIC_CONTROL_FOCUS,
-/* 0591 */ UNO_NAME_APPLY_FORM_DESIGN_MODE,
-/* 0592 */ UNO_NAME_LOCALE,
-/* 0593 */ UNO_NAME_SORT_ALGORITHM,
-/* 0594 */ UNO_NAME_FRAME_HEIGHT_ABSOLUTE,
-/* 0596 */ UNO_NAME_FRAME_HEIGHT_PERCENT,
-/* 0597 */ UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT,
-/* 0598 */ UNO_NAME_FRAME_WIDTH_ABSOLUTE,
-/* 0599 */ UNO_NAME_FRAME_WIDTH_PERCENT,
-/* 0600 */ UNO_NAME_PARA_STYLEHEADING,
-/* 0601 */ UNO_NAME_PARA_STYLELEVEL1,
-/* 0602 */ UNO_NAME_PARA_STYLELEVEL10,
-/* 0603 */ UNO_NAME_PARA_STYLELEVEL2,
-/* 0604 */ UNO_NAME_PARA_STYLELEVEL3,
-/* 0605 */ UNO_NAME_PARA_STYLELEVEL4,
-/* 0606 */ UNO_NAME_PARA_STYLELEVEL5,
-/* 0607 */ UNO_NAME_PARA_STYLELEVEL6,
-/* 0608 */ UNO_NAME_PARA_STYLELEVEL7,
-/* 0609 */ UNO_NAME_PARA_STYLELEVEL8,
-/* 0610 */ UNO_NAME_PARA_STYLELEVEL9,
-/* 0611 */ UNO_NAME_PARA_STYLESEPARATOR,
-/* 0612 */ UNO_NAME_MACRO_LIBRARY,
-/* 0613 */ UNO_NAME_CELL_NAME,
+/* 0500 */ UNO_NAME_IS_PIXEL_CONTOUR,
+/* 0501 */ UNO_NAME_IS_AUTOMATIC_CONTOUR,
+/* 0502 */ UNO_NAME_SEPARATOR_LINE_WIDTH,
+/* 0503 */ UNO_NAME_SEPARATOR_LINE_COLOR,
+/* 0504 */ UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT,
+/* 0505 */ UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT,
+/* 0506 */ UNO_NAME_SEPARATOR_LINE_IS_ON,
+/* 0507 */ UNO_NAME_IS_SKIP_HIDDEN_TEXT,
+/* 0508 */ UNO_NAME_IS_SKIP_PROTECTED_TEXT,
+/* 0509 */ UNO_NAME_DOCUMENT_INDEX_MARKS,
+/* 0510 */ UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END,
+/* 0511 */ UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING,
+/* 0512 */ UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT,
+/* 0513 */ UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING,
+/* 0514 */ UNO_NAME_FOOTNOTE_NUMBERING_TYPE,
+/* 0515 */ UNO_NAME_FOOTNOTE_NUMBERING_PREFIX,
+/* 0516 */ UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX,
+/* 0517 */ UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END,
+/* 0518 */ UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING,
+/* 0519 */ UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT,
+/* 0520 */ UNO_NAME_ENDNOTE_IS_OWN_NUMBERING,
+/* 0521 */ UNO_NAME_ENDNOTE_NUMBERING_TYPE,
+/* 0522 */ UNO_NAME_ENDNOTE_NUMBERING_PREFIX,
+/* 0523 */ UNO_NAME_ENDNOTE_NUMBERING_SUFFIX,
+/* 0524 */ UNO_NAME_BRACKET_BEFORE,
+/* 0525 */ UNO_NAME_BRACKET_AFTER,
+/* 0526 */ UNO_NAME_IS_NUMBER_ENTRIES,
+/* 0527 */ UNO_NAME_IS_SORT_BY_POSITION,
+/* 0528 */ UNO_NAME_SORT_KEYS,
+/* 0529 */ UNO_NAME_IS_SORT_ASCENDING,
+/* 0530 */ UNO_NAME_SORT_KEY,
+/* 0531 */ UNO_NAME_FIELDS,
+/* 0532 */ UNO_NAME_DATE_TIME_VALUE,
+/* 0533 */ UNO_NAME_IS_ON,
+/* 0534 */ UNO_NAME_Z_ORDER,
+/* 0535 */ UNO_NAME_CONTENT_SECTION,
+/* 0536 */ UNO_NAME_HEADER_SECTION,
+/* 0537 */ UNO_NAME_PARA_IS_HANGING_PUNCTUATION,
+/* 0538 */ UNO_NAME_PARA_IS_CHARACTER_DISTANCE,
+/* 0539 */ UNO_NAME_PARA_IS_FORBIDDEN_RULES,
+/* 0540 */ UNO_NAME_PARA_VERT_ALIGNMENT,
+/* 0541 */ UNO_NAME_IS_MAIN_ENTRY,
+/* 0542 */ UNO_NAME_GRAPHIC_ROTATION,
+/* 0543 */ UNO_NAME_ADJUST_LUMINANCE,
+/* 0544 */ UNO_NAME_ADJUST_CONTRAST,
+/* 0545 */ UNO_NAME_ADJUST_RED,
+/* 0546 */ UNO_NAME_ADJUST_GREEN,
+/* 0547 */ UNO_NAME_ADJUST_BLUE,
+/* 0548 */ UNO_NAME_GAMMA,
+/* 0549 */ UNO_NAME_GRAPHIC_IS_INVERTED,
+/* 0550 */ UNO_NAME_TRANSPARENCY,
+/* 0551 */ UNO_NAME_GRAPHIC_COLOR_MODE,
+/* 0552 */ UNO_NAME_REDLINE_AUTHOR,
+/* 0553 */ UNO_NAME_REDLINE_DATE_TIME,
+/* 0554 */ UNO_NAME_REDLINE_COMMENT,
+/* 0555 */ UNO_NAME_REDLINE_TYPE,
+/* 0556 */ UNO_NAME_REDLINE_SUCCESSOR_DATA,
+/* 0557 */ UNO_NAME_REDLINE_IDENTIFIER,
+/* 0558 */ UNO_NAME_IS_IN_HEADER_FOOTER,
+/* 0559 */ UNO_NAME_START_REDLINE,
+/* 0560 */ UNO_NAME_END_REDLINE,
+/* 0561 */ UNO_NAME_REDLINE_START,
+/* 0562 */ UNO_NAME_REDLINE_END,
+/* 0563 */ UNO_NAME_REDLINE_TEXT,
+/* 0564 */ UNO_NAME_REDLINE_DISPLAY_TYPE,
+/* 0565 */ UNO_NAME_FORBIDDEN_CHARACTERS,
+/* 0566 */ UNO_NAME_RUBY_BASE_TEXT,
+/* 0567 */ UNO_NAME_RUBY_TEXT,
+/* 0568 */ UNO_NAME_RUBY_ADJUST,
+/* 0569 */ UNO_NAME_RUBY_CHAR_STYLE_NAME,
+/* 0570 */ UNO_NAME_RUBY_IS_ABOVE,
+/* 0571 */ UNO_NAME_FOOTNOTE_HEIGHT,
+/* 0572 */ UNO_NAME_FOOTNOTE_LINE_WEIGHT,
+/* 0573 */ UNO_NAME_FOOTNOTE_LINE_COLOR,
+/* 0574 */ UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH,
+/* 0575 */ UNO_NAME_FOOTNOTE_LINE_ADJUST,
+/* 0576 */ UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE,
+/* 0577 */ UNO_NAME_FOOTNOTE_LINE_DISTANCE,
+/* 0578 */ UNO_NAME_CHAR_ROTATION,
+/* 0579 */ UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE,
+/* 0580 */ UNO_NAME_CHAR_SCALE_WIDTH,
+/* 0581 */ UNO_NAME_TAB_STOP_DISTANCE,
+/* 0582 */ UNO_NAME_IS_WIDTH_RELATIVE,
+/* 0583 */ UNO_NAME_CHAR_RELIEF,
+/* 0584 */ UNO_NAME_IS_HIDDEN,
+/* 0585 */ UNO_NAME_IS_CONDITION_TRUE,
+/* 0586 */ UNO_NAME_TWO_DIGIT_YEAR,
+/* 0587 */ UNO_NAME_PROTECTION_KEY,
+/* 0588 */ UNO_NAME_REDLINE_PROTECTION_KEY,
+/* 0589 */ UNO_NAME_AUTOMATIC_DISTANCE,
+/* 0590 */ UNO_NAME_AUTOMATIC_CONTROL_FOCUS,
+/* 0591 */ UNO_NAME_APPLY_FORM_DESIGN_MODE,
+/* 0592 */ UNO_NAME_LOCALE,
+/* 0593 */ UNO_NAME_SORT_ALGORITHM,
+/* 0594 */ UNO_NAME_FRAME_HEIGHT_ABSOLUTE,
+/* 0596 */ UNO_NAME_FRAME_HEIGHT_PERCENT,
+/* 0597 */ UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT,
+/* 0598 */ UNO_NAME_FRAME_WIDTH_ABSOLUTE,
+/* 0599 */ UNO_NAME_FRAME_WIDTH_PERCENT,
+/* 0600 */ UNO_NAME_PARA_STYLEHEADING,
+/* 0601 */ UNO_NAME_PARA_STYLELEVEL1,
+/* 0602 */ UNO_NAME_PARA_STYLELEVEL10,
+/* 0603 */ UNO_NAME_PARA_STYLELEVEL2,
+/* 0604 */ UNO_NAME_PARA_STYLELEVEL3,
+/* 0605 */ UNO_NAME_PARA_STYLELEVEL4,
+/* 0606 */ UNO_NAME_PARA_STYLELEVEL5,
+/* 0607 */ UNO_NAME_PARA_STYLELEVEL6,
+/* 0608 */ UNO_NAME_PARA_STYLELEVEL7,
+/* 0609 */ UNO_NAME_PARA_STYLELEVEL8,
+/* 0610 */ UNO_NAME_PARA_STYLELEVEL9,
+/* 0611 */ UNO_NAME_PARA_STYLESEPARATOR,
+/* 0612 */ UNO_NAME_MACRO_LIBRARY,
+/* 0613 */ UNO_NAME_CELL_NAME,
/* 0614 */ UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES,
/* 0615 */ UNO_NAME_MERGE_LAST_PARA,
/* 0616 */ UNO_NAME_WRITING_MODE,
@@ -694,7 +694,7 @@ enum SwPropNameIds
/* 0651 */ UNO_NAME_FILE_NAME_FROM_COLUMN,
/* 0652 */ UNO_NAME_FILE_NAME_PREFIX,
/* 0653 */ UNO_NAME_CHAR_STYLE_NAMES,
-/* 0654 */ UNO_NAME_DAD_COMMAND, /* DAD = DataAccessDescriptor (see com.sun.star.sdb.DataAccessDescriptor) */
+/* 0654 */ UNO_NAME_DAD_COMMAND, /* DAD = DataAccessDescriptor (see com.sun.star.sdb.DataAccessDescriptor) */
/* 0655 */ UNO_NAME_DAD_COMMAND_TYPE,
/* 0656 */ UNO_NAME_CLSID,
/* 0657 */ UNO_NAME_COMPONENT,
@@ -720,7 +720,7 @@ enum SwPropNameIds
/* 0674 */ UNO_NAME_POSITION_LAYOUT_DIR,
// <--
/* 0675 */ UNO_NAME_NUMBERING_IS_OUTLINE,
-///* 0676 */ UNO_NAME_DEFAULT_OUTLINE_LEVEL, //#outline level, removed by zhaojianwei
+///* 0676 */ UNO_NAME_DEFAULT_OUTLINE_LEVEL, //#outline level, removed by zhaojianwei
// --> OD 2004-10-28 #i36248#
/* 0677 */ UNO_NAME_STARTPOSITION_IN_HORI_L2R,
/* 0678 */ UNO_NAME_ENDPOSITION_IN_HORI_L2R,
@@ -752,7 +752,7 @@ enum SwPropNameIds
// <--
/* 0700 */ UNO_NAME_IS_FIELD_USED,
/* 0701 */ UNO_NAME_IS_FIELD_DISPLAYED,
-/* 0702 */ UNO_NAME_BUILDID,
+/* 0702 */ UNO_NAME_BUILDID,
/* 0703 */ UNO_NAME_PARA_STYLE_CONDITIONS,
// --> FME 2005-12-13 #b6354161# Print empty pages
/* 0704 */ UNO_NAME_PRINT_EMPTY_PAGES,
@@ -816,7 +816,7 @@ enum SwPropNameIds
struct SwPropNameLen
{
const char* pName;
- USHORT nNameLen;
+ USHORT nNameLen;
operator const char*() const { return pName; }
};
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index c3b6ae51f648..4b8c338f0f73 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -2,7 +2,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
@@ -54,7 +54,7 @@ class SwXRedlineText :
public:
SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex);
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw(){OWeakObject::acquire();}
virtual void SAL_CALL release( ) throw(){OWeakObject::release();}
@@ -77,14 +77,14 @@ public:
---------------------------------------------------------------------------*/
class SwXRedlinePortion : public SwXTextPortion
{
- const SwRedline* pRedline;
+ const SwRedline* pRedline;
void Validate() throw( ::com::sun::star::uno::RuntimeException );
using SwXTextPortion::GetPropertyValue;
public:
- SwXRedlinePortion( const SwRedline* pRed,
+ SwXRedlinePortion( const SwRedline* pRed,
const SwUnoCrsr* pPortionCrsr,
::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParent,
BOOL bIsStart);
@@ -114,15 +114,15 @@ class SwXRedline :
public SwXText,
public SwClient
{
- SwDoc* pDoc;
- SwRedline* pRedline;
+ SwDoc* pDoc;
+ SwRedline* pRedline;
public:
SwXRedline(SwRedline& rRedline, SwDoc& rDoc);
~SwXRedline();
TYPEINFO();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw(){OWeakObject::acquire();}
virtual void SAL_CALL release( ) throw(){OWeakObject::release();}
@@ -150,9 +150,9 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
//SwClient
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
- const SwRedline* GetRedline() const {return pRedline;}
+ const SwRedline* GetRedline() const {return pRedline;}
};
#endif
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 37763f1a028f..ff5eaf7b4925 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@ protected:
virtual ~SwXRedlines();
public:
SwXRedlines(SwDoc* pDoc);
-
+
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException);
@@ -71,7 +71,7 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::com::sun::star::beans::XPropertySet* GetObject( SwRedline& rRedline, SwDoc& rDoc );
+ static ::com::sun::star::beans::XPropertySet* GetObject( SwRedline& rRedline, SwDoc& rDoc );
};
/* -----------------------------12.01.01 14:58--------------------------------
@@ -86,7 +86,7 @@ protected:
virtual ~SwXRedlineEnumeration();
public:
SwXRedlineEnumeration(SwDoc& rDoc);
-
+
//XEnumeration
virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -98,7 +98,7 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//SwClient
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
};
diff --git a/sw/inc/unorefmark.hxx b/sw/inc/unorefmark.hxx
index 900f561c2424..0343f841a061 100644
--- a/sw/inc/unorefmark.hxx
+++ b/sw/inc/unorefmark.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unosection.hxx b/sw/inc/unosection.hxx
index 4cf88ce54773..17727dd96313 100644
--- a/sw/inc/unosection.hxx
+++ b/sw/inc/unosection.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index e04b2e17d80e..76ae89a3a817 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -2,7 +2,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
@@ -60,13 +60,13 @@ class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
::com::sun::star::lang::XServiceInfo
>
{
- SwDoc* pDoc;
+ SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
virtual ~SwXFootnoteProperties();
public:
SwXFootnoteProperties(SwDoc* pDoc);
-
+
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
@@ -82,7 +82,7 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- void Invalidate() {pDoc = 0;}
+ void Invalidate() {pDoc = 0;}
};
/* -----------------04.05.98 12:28-------------------
@@ -94,13 +94,13 @@ class SwXEndnoteProperties : public cppu::WeakAggImplHelper2
::com::sun::star::lang::XServiceInfo
>
{
- SwDoc* pDoc;
+ SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
virtual ~SwXEndnoteProperties();
public:
SwXEndnoteProperties(SwDoc* pDoc);
-
+
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
@@ -116,7 +116,7 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- void Invalidate() {pDoc = 0;}
+ void Invalidate() {pDoc = 0;}
};
/* -----------------04.05.98 12:28-------------------
@@ -128,13 +128,13 @@ class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2
::com::sun::star::lang::XServiceInfo
>
{
- SwDoc* pDoc;
+ SwDoc* pDoc;
const SfxItemPropertySet* m_pPropertySet;
protected:
virtual ~SwXLineNumberingProperties();
public:
SwXLineNumberingProperties(SwDoc* pDoc);
-
+
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
@@ -150,7 +150,7 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- void Invalidate() {pDoc = 0;}
+ void Invalidate() {pDoc = 0;}
};
/* -----------------25.05.98 08:21-------------------
@@ -166,22 +166,22 @@ class SwXNumberingRules : public cppu::WeakAggImplHelper5
>,
public SwClient
{
- String sNewCharStyleNames[MAXLEVEL];
- String sNewBulletFontNames[MAXLEVEL];
- String sCreatedNumRuleName; //connects to a numbering in SwDoc
- SwDoc* pDoc; // wird nur fuers anmelden gebraucht
- SwDocShell* pDocShell; //nur, wenn als ChapterNumbering verwendet
- SwNumRule* pNumRule;
+ String sNewCharStyleNames[MAXLEVEL];
+ String sNewBulletFontNames[MAXLEVEL];
+ String sCreatedNumRuleName; //connects to a numbering in SwDoc
+ SwDoc* pDoc; // wird nur fuers anmelden gebraucht
+ SwDocShell* pDocShell; //nur, wenn als ChapterNumbering verwendet
+ SwNumRule* pNumRule;
const SfxItemPropertySet* m_pPropertySet;
- sal_Bool bOwnNumRuleCreated;
- static String sInvalidStyle;
+ sal_Bool bOwnNumRuleCreated;
+ static String sInvalidStyle;
protected:
virtual ~SwXNumberingRules();
public:
- SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering
+ SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering
SwXNumberingRules(const SwNumRule& rRule); // NumRule for paragraphs, numbering styles
SwXNumberingRules(SwDoc& rDoc); //create a new instance
-
+
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -217,23 +217,23 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>
+ ::com::sun::star::uno::Sequence<
+ ::com::sun::star::beans::PropertyValue>
GetNumberingRuleByIndex(const SwNumRule& rNumRule, sal_Int32 nIndex)const;
- void SetNumberingRuleByIndex(SwNumRule& rNumRule,
+ void SetNumberingRuleByIndex(SwNumRule& rNumRule,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, sal_Int32 nIndex)
throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
- const String* GetNewCharStyleNames() const {return sNewCharStyleNames;}
- const String* GetBulletFontNames() const {return sNewBulletFontNames;}
- const SwNumRule* GetNumRule() {return pNumRule;}
+ const String* GetNewCharStyleNames() const {return sNewCharStyleNames;}
+ const String* GetBulletFontNames() const {return sNewBulletFontNames;}
+ const SwNumRule* GetNumRule() {return pNumRule;}
- static const String& GetInvalidStyle();
- void Invalidate() {pDocShell = 0;}
- const String& GetCreatedNumRuleName() const{return sCreatedNumRuleName; }
+ static const String& GetInvalidStyle();
+ void Invalidate() {pDocShell = 0;}
+ const String& GetCreatedNumRuleName() const{return sCreatedNumRuleName; }
};
/*-----------------12.02.98 08:27-------------------
@@ -244,9 +244,9 @@ protected:
virtual ~SwXChapterNumbering();
public:
SwXChapterNumbering(SwDocShell& rDocSh);
+
-
- void Invalidate() {SwXNumberingRules::Invalidate();}
+ void Invalidate() {SwXNumberingRules::Invalidate();}
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -267,25 +267,25 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4
::com::sun::star::lang::XServiceInfo
>
{
- sal_Int32 nReference;
- ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn> aTextColumns;
+ sal_Int32 nReference;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn> aTextColumns;
sal_Bool bIsAutomaticWidth;
sal_Int32 nAutoDistance;
const SfxItemPropertySet* m_pPropSet;
//separator line
- sal_Int32 nSepLineWidth;
- sal_Int32 nSepLineColor;
- sal_Int8 nSepLineHeightRelative;
- sal_Int8 nSepLineVertAlign;//style::VerticalAlignment
- sal_Bool bSepLineIsOn;
+ sal_Int32 nSepLineWidth;
+ sal_Int32 nSepLineColor;
+ sal_Int8 nSepLineHeightRelative;
+ sal_Int8 nSepLineVertAlign;//style::VerticalAlignment
+ sal_Bool bSepLineIsOn;
protected:
virtual ~SwXTextColumns();
public:
SwXTextColumns(sal_uInt16 nColCount);
SwXTextColumns(const SwFmtCol& rFmtCol);
-
+
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -314,11 +314,11 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- sal_Int32 GetSepLineWidth() const {return nSepLineWidth;}
- sal_Int32 GetSepLineColor() const {return nSepLineColor;}
- sal_Int8 GetSepLineHeightRelative() const {return nSepLineHeightRelative;}
- sal_Int8 GetSepLineVertAlign() const {return nSepLineVertAlign;}
- sal_Bool GetSepLineIsOn() const {return bSepLineIsOn;}
+ sal_Int32 GetSepLineWidth() const {return nSepLineWidth;}
+ sal_Int32 GetSepLineColor() const {return nSepLineColor;}
+ sal_Int8 GetSepLineHeightRelative() const {return nSepLineHeightRelative;}
+ sal_Int8 GetSepLineVertAlign() const {return nSepLineVertAlign;}
+ sal_Bool GetSepLineIsOn() const {return bSepLineIsOn;}
sal_Bool IsAutomaticWidth() const {return bIsAutomaticWidth;}
};
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index d298ae54b56f..6a2606649d03 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -2,7 +2,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
@@ -31,7 +31,7 @@
#include <com/sun/star/util/XPropertyReplace.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx> // helper for implementations
+#include <cppuhelper/implbase3.hxx> // helper for implementations
#include <tools/string.hxx>
/******************************************************************************
@@ -59,33 +59,33 @@ class SwXTextSearch : public cppu::WeakImplHelper3
{
friend class SwXTextDocument;
- String sSearchText;
- String sReplaceText;
+ String sSearchText;
+ String sReplaceText;
- SwSearchProperties_Impl* pSearchProperties;
- SwSearchProperties_Impl* pReplaceProperties;
+ SwSearchProperties_Impl* pSearchProperties;
+ SwSearchProperties_Impl* pReplaceProperties;
const SfxItemPropertySet* m_pPropSet;
- sal_Bool bAll : 1;
- sal_Bool bWord : 1;
- sal_Bool bBack : 1;
- sal_Bool bExpr : 1;
- sal_Bool bCase : 1;
-// sal_Bool bInSel: 1; // wie geht Suchen in Selektionen?
- sal_Bool bStyles:1;
- sal_Bool bSimilarity : 1;
- sal_Bool bLevRelax :1;
- sal_Int16 nLevExchange;
- sal_Int16 nLevAdd;
- sal_Int16 nLevRemove;
-
- sal_Bool bIsValueSearch :1;
+ sal_Bool bAll : 1;
+ sal_Bool bWord : 1;
+ sal_Bool bBack : 1;
+ sal_Bool bExpr : 1;
+ sal_Bool bCase : 1;
+// sal_Bool bInSel: 1; // wie geht Suchen in Selektionen?
+ sal_Bool bStyles:1;
+ sal_Bool bSimilarity : 1;
+ sal_Bool bLevRelax :1;
+ sal_Int16 nLevExchange;
+ sal_Int16 nLevAdd;
+ sal_Int16 nLevRemove;
+
+ sal_Bool bIsValueSearch :1;
protected:
virtual ~SwXTextSearch();
public:
SwXTextSearch();
-
+
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -123,13 +123,13 @@ public:
virtual BOOL SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- void FillSearchItemSet(SfxItemSet& rSet) const;
- void FillReplaceItemSet(SfxItemSet& rSet) const;
+ void FillSearchItemSet(SfxItemSet& rSet) const;
+ void FillReplaceItemSet(SfxItemSet& rSet) const;
- sal_Bool HasSearchAttributes() const;
- sal_Bool HasReplaceAttributes() const;
+ sal_Bool HasSearchAttributes() const;
+ sal_Bool HasReplaceAttributes() const;
- void FillSearchOptions( ::com::sun::star::util::SearchOptions&
+ void FillSearchOptions( ::com::sun::star::util::SearchOptions&
rSearchOpt ) const;
};
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 971f9881d2d4..ff4f08056c3e 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -2,7 +2,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
@@ -76,13 +76,13 @@ class SwXStyleFamilies : public cppu::WeakImplHelper4
>,
public SwUnoCollection
{
- SwDocShell* pDocShell;
+ SwDocShell* pDocShell;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxCharStyles;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxParaStyles;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxFrameStyles;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxPageStyles;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxNumberingStyles;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxCharStyles;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxParaStyles;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxFrameStyles;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxPageStyles;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > * pxNumberingStyles;
protected:
virtual ~SwXStyleFamilies();
public:
@@ -125,12 +125,12 @@ class SwXStyleFamily : public cppu::WeakImplHelper4
>,
public SfxListener
{
- SfxStyleFamily eFamily; // Familie
- SfxStyleSheetBasePool* pBasePool;
-// const SfxItemPropertyMap* _pPropMap;
- SwDocShell* pDocShell;
+ SfxStyleFamily eFamily; // Familie
+ SfxStyleSheetBasePool* pBasePool;
+// const SfxItemPropertyMap* _pPropMap;
+ SwDocShell* pDocShell;
- SwXStyle* _FindStyle(const String& rStyleName) const;
+ SwXStyle* _FindStyle(const String& rStyleName) const;
public:
SwXStyleFamily(SwDocShell* pDocShell, sal_uInt16 nFamily);
~SwXStyleFamily();
@@ -163,7 +163,7 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -187,27 +187,27 @@ class SwXStyle : public cppu::WeakImplHelper7
public SwClient
{
friend class SwXStyleFamily;
- SwDoc* m_pDoc;
- String sStyleName;
- SfxStyleSheetBasePool* pBasePool;
- SfxStyleFamily eFamily; // fuer Notify
+ SwDoc* m_pDoc;
+ String sStyleName;
+ SfxStyleSheetBasePool* pBasePool;
+ SfxStyleFamily eFamily; // fuer Notify
- sal_Bool bIsDescriptor : 1;
- sal_Bool bIsConditional : 1;
- String sParentStyleName;
- SwStyleProperties_Impl* pPropImpl;
+ sal_Bool bIsDescriptor : 1;
+ sal_Bool bIsConditional : 1;
+ String sParentStyleName;
+ SwStyleProperties_Impl* pPropImpl;
- void ApplyDescriptorProperties();
+ void ApplyDescriptorProperties();
protected:
- void Invalidate();
+ void Invalidate();
- const SfxStyleSheetBasePool* GetBasePool() const {return pBasePool;}
- SfxStyleSheetBasePool* GetBasePool() {return pBasePool;}
+ const SfxStyleSheetBasePool* GetBasePool() const {return pBasePool;}
+ SfxStyleSheetBasePool* GetBasePool() {return pBasePool;}
- void SetStyleName(const String& rSet){ sStyleName = rSet;}
+ void SetStyleName(const String& rSet){ sStyleName = rSet;}
SwStyleProperties_Impl* GetPropImpl(){return pPropImpl;}
- com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
- com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
+ com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
+ com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -215,7 +215,7 @@ protected:
public:
SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE);
SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
- SwDoc* pDoc,
+ SwDoc* pDoc,
const String& rStyleName);//,
//const SfxItemPropertyMap* _pMap);
~SwXStyle();
@@ -272,22 +272,22 @@ public:
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- const String& GetStyleName() const { return sStyleName;}
- SfxStyleFamily GetFamily() const {return eFamily;}
+ const String& GetStyleName() const { return sStyleName;}
+ SfxStyleFamily GetFamily() const {return eFamily;}
- sal_Bool IsDescriptor() const {return bIsDescriptor;}
- sal_Bool IsConditional() const { return bIsConditional;}
- const String& GetParentStyleName() const { return sParentStyleName;}
- void SetDoc(SwDoc* pDc, SfxStyleSheetBasePool* pPool)
+ sal_Bool IsDescriptor() const {return bIsDescriptor;}
+ sal_Bool IsConditional() const { return bIsConditional;}
+ const String& GetParentStyleName() const { return sParentStyleName;}
+ void SetDoc(SwDoc* pDc, SfxStyleSheetBasePool* pPool)
{
bIsDescriptor = sal_False; m_pDoc = pDc;
pBasePool = pPool;
StartListening(*pBasePool);
}
SwDoc* GetDoc() const { return m_pDoc; }
- virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+ virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
};
/* -----------------------------15.12.00 14:25--------------------------------
@@ -297,7 +297,7 @@ class SwXFrameStyle : public SwXStyle,
{
public:
SwXFrameStyle(SfxStyleSheetBasePool& rPool,
- SwDoc* pDoc,
+ SwDoc* pDoc,
const String& rStyleName) :
SwXStyle(rPool, SFX_STYLE_FAMILY_FRAME, pDoc, rStyleName){}
SwXFrameStyle( SwDoc *pDoc );
@@ -318,7 +318,7 @@ public:
* --------------------------------------------------*/
class SwXPageStyle : public SwXStyle
{
- SwDocShell* pDocShell;
+ SwDocShell* pDocShell;
protected:
void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 6cefbe95188e..b2ff5e85ac61 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ class SwXCell : public SwXCellBaseClass,
const SfxItemPropertySet* m_pPropSet;
SwTableBox* pBox; // only set in non-XML import
- const SwStartNode* pStartNode; // only set in XML import
+ const SwStartNode* pStartNode; // only set in XML import
// table position where pBox was found last
sal_uInt16 nFndPos;
@@ -115,7 +115,7 @@ protected:
bool IsValid() const;
virtual ~SwXCell();
-
+
public:
SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, sal_uInt16 nPos=USHRT_MAX );
SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface
@@ -174,8 +174,8 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
SwTableBox* GetTblBox()const {return pBox;}
- static SwXCell* CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 );
- SwTableBox* FindBox(SwTable* pTable, SwTableBox* pBox);
+ static SwXCell* CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 );
+ SwTableBox* FindBox(SwTable* pTable, SwTableBox* pBox);
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
};
@@ -190,7 +190,7 @@ class SwXTextTableRow : public cppu::WeakImplHelper2
public SwClient
{
const SfxItemPropertySet* m_pPropSet;
- SwTableLine* pLine;
+ SwTableLine* pLine;
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
protected:
@@ -218,7 +218,7 @@ public:
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
- const SwTableLine* GetTblRow() const {return pLine;}
+ const SwTableLine* GetTblRow() const {return pLine;}
static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
};
/* -----------------20.07.98 13:03-------------------
@@ -233,10 +233,10 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
,public SwClient
,public OTextCursorHelper
{
- SwDepend aCrsrDepend;
+ SwDepend aCrsrDepend;
const SfxItemPropertySet* m_pPropSet;
- // SwUnoCrsr* GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
+ // SwUnoCrsr* GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
protected:
virtual ~SwXTextTableCursor();
@@ -247,7 +247,7 @@ public:
DECLARE_XINTERFACE()
-
+
//XTextTableCursor
virtual ::rtl::OUString SAL_CALL getRangeName( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL gotoCellByName( const ::rtl::OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
@@ -278,14 +278,14 @@ public:
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
// ITextCursorHelper
- virtual const SwPaM* GetPaM() const;
- virtual SwPaM* GetPaM();
- virtual const SwDoc* GetDoc() const;
- virtual SwDoc* GetDoc();
-
- const SwUnoCrsr* GetCrsr() const;
- SwUnoCrsr* GetCrsr();
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+ virtual const SwPaM* GetPaM() const;
+ virtual SwPaM* GetPaM();
+ virtual const SwDoc* GetDoc() const;
+ virtual SwDoc* GetDoc();
+
+ const SwUnoCrsr* GetCrsr() const;
+ SwUnoCrsr* GetCrsr();
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
};
/*-----------------11.12.97 09:38-------------------
@@ -317,20 +317,20 @@ class SwXTextTable : public cppu::WeakImplHelper10
>,
public SwClient
{
- SwEventListenerContainer aLstnrCntnr;
- SwChartEventListenerContainer aChartLstnrCntnr;
+ SwEventListenerContainer aLstnrCntnr;
+ SwChartEventListenerContainer aChartLstnrCntnr;
const SfxItemPropertySet* m_pPropSet;
// Descriptor-interface
- SwTableProperties_Impl* pTableProps;
- String m_sTableName;
- sal_Bool bIsDescriptor;
- unsigned short nRows;
- unsigned short nColumns;
+ SwTableProperties_Impl* pTableProps;
+ String m_sTableName;
+ sal_Bool bIsDescriptor;
+ unsigned short nRows;
+ unsigned short nColumns;
- sal_Bool bFirstRowAsLabel :1;
- sal_Bool bFirstColumnAsLabel :1;
+ sal_Bool bFirstRowAsLabel :1;
+ sal_Bool bFirstColumnAsLabel :1;
protected:
virtual ~SwXTextTable();
public:
@@ -412,9 +412,9 @@ public:
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- sal_uInt16 getRowCount(void);
- sal_uInt16 getColumnCount(void);
- ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+ sal_uInt16 getRowCount(void);
+ sal_uInt16 getColumnCount(void);
+ ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
const String& sTLName, const String& sBRName,
SwRangeDescriptor& rDesc);
@@ -439,16 +439,16 @@ class SwXCellRange : public cppu::WeakImplHelper7
>,
public SwClient
{
- SwDepend aCursorDepend; //the cursor is removed after the doc has been removed
- SwChartEventListenerContainer aChartLstnrCntnr;
+ SwDepend aCursorDepend; //the cursor is removed after the doc has been removed
+ SwChartEventListenerContainer aChartLstnrCntnr;
- SwRangeDescriptor aRgDesc;
+ SwRangeDescriptor aRgDesc;
const SfxItemPropertySet* m_pPropSet;
- SwUnoCrsr* pTblCrsr;
+ SwUnoCrsr* pTblCrsr;
- sal_Bool bFirstRowAsLabel :1;
- sal_Bool bFirstColumnAsLabel :1;
+ sal_Bool bFirstRowAsLabel :1;
+ sal_Bool bFirstColumnAsLabel :1;
public:
SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc);
@@ -506,9 +506,9 @@ public:
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
- sal_uInt16 getRowCount(void);
- sal_uInt16 getColumnCount(void);
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+ sal_uInt16 getRowCount(void);
+ sal_uInt16 getColumnCount(void);
const SwUnoCrsr* GetTblCrsr() const;
@@ -518,7 +518,7 @@ public:
::com::sun::star::uno::Sequence< ::rtl::OUString > *pTxtSeq,
::com::sun::star::uno::Sequence< double > *pDblSeq,
sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException);
-
+
};
/* -----------------03.02.99 07:31-------------------
*
@@ -536,17 +536,17 @@ protected:
virtual ~SwXTableRows();
public:
SwXTableRows(SwFrmFmt& rFrmFmt);
-
+
TYPEINFO();
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
+// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut );
+// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut );
-// SMART_UNO_DECLARATION( SwXTableRows, UsrObject );
+// SMART_UNO_DECLARATION( SwXTableRows, UsrObject );
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -585,16 +585,16 @@ protected:
virtual ~SwXTableColumns();
public:
SwXTableColumns(SwFrmFmt& rFrmFmt);
-
+
TYPEINFO();
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
+// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut );
+// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut );
-// SMART_UNO_DECLARATION( SwXTableColumns, UsrObject );
+// SMART_UNO_DECLARATION( SwXTableColumns, UsrObject );
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index b1d17b187f88..0db4244c55f8 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -2,7 +2,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
@@ -337,8 +337,8 @@ public:
::com::sun::star::uno::RuntimeException);
// XTextCopy
- virtual void SAL_CALL copyText(
- const ::com::sun::star::uno::Reference<
+ virtual void SAL_CALL copyText(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCopy >& xSource )
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index e08b8eac4850..6be1408f2a56 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index 8d51aef6420b..a9a6264b3dac 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index a581814ea9de..9dabdf0b7dae 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -2,7 +2,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
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7b5ffaefbf71..e182c5fb20fd 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -2,7 +2,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
@@ -75,8 +75,8 @@
#include <svx/fmdmod.hxx>
#include <editeng/UnoForbiddenCharsTable.hxx>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase2.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
#include <RefreshListenerContainer.hxx>
#include <viewopt.hxx>
@@ -184,62 +184,62 @@ class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass,
public SvxFmMSFactory,
public SfxBaseModel
{
- ActionContextArr aActionArr;
- SwRefreshListenerContainer aRefreshCont;
+ ActionContextArr aActionArr;
+ SwRefreshListenerContainer aRefreshCont;
const SfxItemPropertySet* pPropSet;
- SwDocShell* pDocShell;
- sal_Bool bObjectValid;
+ SwDocShell* pDocShell;
+ sal_Bool bObjectValid;
- SwXDrawPage* pDrawPage;
- css::uno::Reference< css::drawing::XDrawPage > * pxXDrawPage;
+ SwXDrawPage* pDrawPage;
+ css::uno::Reference< css::drawing::XDrawPage > * pxXDrawPage;
- css::uno::Reference< css::text::XText > xBodyText;
- SwXBodyText* pBodyText;
- css::uno::Reference< css::uno::XAggregation > xNumFmtAgg;
+ css::uno::Reference< css::text::XText > xBodyText;
+ SwXBodyText* pBodyText;
+ css::uno::Reference< css::uno::XAggregation > xNumFmtAgg;
css::uno::Reference< css::container::XIndexAccess > * pxXNumberingRules;
css::uno::Reference< css::container::XIndexAccess > * pxXFootnotes;
css::uno::Reference< css::beans::XPropertySet > * pxXFootnoteSettings;
- css::uno::Reference< css::container::XIndexAccess > * pxXEndnotes;
+ css::uno::Reference< css::container::XIndexAccess > * pxXEndnotes;
css::uno::Reference< css::beans::XPropertySet > * pxXEndnoteSettings;
- css::uno::Reference< css::container::XNameAccess > * pxXReferenceMarks;
- css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
- css::uno::Reference< css::container::XNameAccess > * pxXTextFieldMasters;
- css::uno::Reference< css::container::XNameAccess > * pxXTextSections;
- css::uno::Reference< css::container::XNameAccess > * pxXBookmarks;
- css::uno::Reference< css::container::XNameAccess > * pxXTextTables;
- css::uno::Reference< css::container::XNameAccess > * pxXTextFrames;
- css::uno::Reference< css::container::XNameAccess > * pxXGraphicObjects;
- css::uno::Reference< css::container::XNameAccess > * pxXEmbeddedObjects;
- css::uno::Reference< css::container::XNameAccess > * pxXStyleFamilies;
+ css::uno::Reference< css::container::XNameAccess > * pxXReferenceMarks;
+ css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
+ css::uno::Reference< css::container::XNameAccess > * pxXTextFieldMasters;
+ css::uno::Reference< css::container::XNameAccess > * pxXTextSections;
+ css::uno::Reference< css::container::XNameAccess > * pxXBookmarks;
+ css::uno::Reference< css::container::XNameAccess > * pxXTextTables;
+ css::uno::Reference< css::container::XNameAccess > * pxXTextFrames;
+ css::uno::Reference< css::container::XNameAccess > * pxXGraphicObjects;
+ css::uno::Reference< css::container::XNameAccess > * pxXEmbeddedObjects;
+ css::uno::Reference< css::container::XNameAccess > * pxXStyleFamilies;
mutable css::uno::Reference< css::style::XAutoStyles > * pxXAutoStyles;
css::uno::Reference< css::container::XIndexReplace > * pxXChapterNumbering;
- css::uno::Reference< css::container::XIndexAccess > * pxXDocumentIndexes;
+ css::uno::Reference< css::container::XIndexAccess > * pxXDocumentIndexes;
- css::uno::Reference< css::beans::XPropertySet > * pxXLineNumberingProperties;
- css::uno::Reference< css::container::XNameAccess > * pxLinkTargetSupplier;
- css::uno::Reference< css::container::XEnumerationAccess >* pxXRedlines;
- css::uno::Reference< css::container::XNameContainer> xXFormsContainer;
+ css::uno::Reference< css::beans::XPropertySet > * pxXLineNumberingProperties;
+ css::uno::Reference< css::container::XNameAccess > * pxLinkTargetSupplier;
+ css::uno::Reference< css::container::XEnumerationAccess >* pxXRedlines;
+ css::uno::Reference< css::container::XNameContainer> xXFormsContainer;
//temporary frame to enable PDF export if no valid view is available
SfxViewFrame* m_pHiddenViewFrame;
css::uno::Reference< css::uno::XInterface> xPropertyHelper;
SwXDocumentPropertyHelper* pPropertyHelper;
-
+
SwPrintUIOptions * m_pPrintUIOptions;
SwRenderData * m_pRenderData;
- void GetBodyText();
- void GetNumberFormatter();
+ void GetBodyText();
+ void GetNumberFormatter();
// used for XRenderable implementation
SfxViewShell * GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() );
SwDoc * GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport );
SfxViewShell * GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport );
- rtl::OUString maBuildId;
+ rtl::OUString maBuildId;
using SfxBaseModel::addEventListener;
using SfxBaseModel::removeEventListener;
@@ -250,7 +250,7 @@ public:
SwXTextDocument(SwDocShell* pShell);
inline void notifyRefreshListeners() { aRefreshCont.Refreshed(); }
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
virtual void SAL_CALL release( ) throw();
@@ -331,7 +331,7 @@ public:
// css::text::XTextEmbeddedObjectsSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException );
-// // css::text::XTextShapesSupplier
+// // css::text::XTextShapesSupplier
// virtual css::uno::Reference< css::container::XIndexAccess > getShapes(void) throw( css::uno::RuntimeException );
// css::text::XBookmarksSupplier
@@ -420,26 +420,26 @@ public:
// ::com::sun::star::util::XCloneable
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException);
-
-
+
+
//
- void Invalidate();
- void Reactivate(SwDocShell* pNewDocShell);
+ void Invalidate();
+ void Reactivate(SwDocShell* pNewDocShell);
SwXDocumentPropertyHelper * GetPropertyHelper ();
- sal_Bool IsValid() const {return bObjectValid;}
+ sal_Bool IsValid() const {return bObjectValid;}
- void InitNewDoc();
+ void InitNewDoc();
- SwUnoCrsr* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr);
- SwUnoCrsr* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
+ SwUnoCrsr* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr);
+ SwUnoCrsr* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
css::uno::Reference< css::text::XTextCursor > & xCrsr, sal_Bool bAll,
sal_Int32& nResult,
css::uno::Reference< css::uno::XInterface > xLastResult);
- SwXDrawPage* GetDrawPage();
- SwDocShell* GetDocShell() {return pDocShell;}
-
+ SwXDrawPage* GetDrawPage();
+ SwDocShell* GetDocShell() {return pDocShell;}
+
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
@@ -481,7 +481,7 @@ public:
virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
//
- void Invalidate() {pxDoc = 0;}
+ void Invalidate() {pxDoc = 0;}
};
/* -----------------26.10.99 09:05-------------------
@@ -498,7 +498,7 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
const SfxItemPropertySet* pPropSet;
const String sLinkSuffix;
const String sLinkDisplayName;
- css::uno::Reference< css::text::XTextDocument > xDoc;
+ css::uno::Reference< css::text::XTextDocument > xDoc;
SwXTextDocument* pxDoc;
@@ -606,11 +606,11 @@ class SwViewOptionAdjust_Impl
public:
SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions );
~SwViewOptionAdjust_Impl();
-
+
void AdjustViewOptions( const SwPrtOptions *pPrtOptions );
-
+
bool checkShell( const SwWrtShell& rCompare ) const
- { return &rCompare == &m_rShell; }
+ { return &rCompare == &m_rShell; }
};
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 8ad0112ecd50..d341cfa65dad 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -2,7 +2,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
@@ -41,9 +41,9 @@ class SwDoc;
class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType
{
- BOOL bValidValue : 1;
- BOOL bDeleted : 1;
- double nValue;
+ BOOL bValidValue : 1;
+ BOOL bDeleted : 1;
+ double nValue;
String aName;
String aContent;
USHORT nType;
@@ -51,28 +51,28 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType
public:
SwUserFieldType( SwDoc* pDocPtr, const String& );
- virtual const String& GetName() const;
- virtual SwFieldType* Copy() const;
+ virtual const String& GetName() const;
+ virtual SwFieldType* Copy() const;
- String Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng);
+ String Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng);
- String GetContent( sal_uInt32 nFmt = 0 );
- void SetContent( const String& rStr, sal_uInt32 nFmt = 0 );
+ String GetContent( sal_uInt32 nFmt = 0 );
+ void SetContent( const String& rStr, sal_uInt32 nFmt = 0 );
- inline BOOL IsValid() const;
- inline void ChgValid( BOOL bNew );
+ inline BOOL IsValid() const;
+ inline void ChgValid( BOOL bNew );
- virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
+ virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
- double GetValue(SwCalc& rCalc); // Member nValue neu berrechnen
- inline double GetValue() const;
- inline void SetValue(const double nVal);
+ double GetValue(SwCalc& rCalc); // Member nValue neu berrechnen
+ inline double GetValue() const;
+ inline void SetValue(const double nVal);
- inline USHORT GetType() const;
- inline void SetType(USHORT);
+ inline USHORT GetType() const;
+ inline void SetType(USHORT);
- BOOL IsDeleted() const { return bDeleted; }
- void SetDeleted( BOOL b ) { bDeleted = b; }
+ BOOL IsDeleted() const { return bDeleted; }
+ void SetDeleted( BOOL b ) { bDeleted = b; }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
@@ -110,22 +110,22 @@ class SW_DLLPUBLIC SwUserField : public SwValueField
public:
SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual USHORT GetSubType() const;
+ virtual void SetSubType(USHORT nSub);
- virtual double GetValue() const;
- virtual void SetValue( const double& rVal );
+ virtual double GetValue() const;
+ virtual void SetValue( const double& rVal );
- virtual String Expand() const;
- virtual SwField* Copy() const;
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
+ virtual String GetCntnt(BOOL bName = FALSE) const;
// Name kann nicht geaendert werden
- virtual const String& GetPar1() const;
+ virtual const String& GetPar1() const;
// Inhalt
- virtual String GetPar2() const;
- virtual void SetPar2(const String& rStr);
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
};
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index fbf374b6d80b..cfd89da8e1ce 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -2,7 +2,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
@@ -46,54 +46,54 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_1_TAB 0x00000002L
#define VIEWOPT_1_BLANK 0x00000004L
#define VIEWOPT_1_HARDBLANK 0x00000008L
-#define VIEWOPT_1_PARAGRAPH 0x00000010L
-#define VIEWOPT_1_LINEBREAK 0x00000020L
-#define VIEWOPT_1_PAGEBREAK 0x00000040L
+#define VIEWOPT_1_PARAGRAPH 0x00000010L
+#define VIEWOPT_1_LINEBREAK 0x00000020L
+#define VIEWOPT_1_PAGEBREAK 0x00000040L
#define VIEWOPT_1_COLUMNBREAK 0x00000080L
#define VIEWOPT_1_SOFTHYPH 0x00000100L
-#define VIEWOPT_1_REF 0x00000400L
-#define VIEWOPT_1_FLDNAME 0x00000800L
+#define VIEWOPT_1_REF 0x00000400L
+#define VIEWOPT_1_FLDNAME 0x00000800L
//#define 0x00001000L
//#define 0x00002000L
-#define VIEWOPT_1_POSTITS 0x00004000L
+#define VIEWOPT_1_POSTITS 0x00004000L
#define VIEWOPT_1_FLD_HIDDEN 0x00008000L
#define VIEWOPT_1_CHAR_HIDDEN 0x00010000L
#define VIEWOPT_1_GRAPHIC 0x00020000L
-#define VIEWOPT_1_TABLE 0x00040000L
-#define VIEWOPT_1_DRAW 0x00080000L
-#define VIEWOPT_1_CONTROL 0x00100000L
+#define VIEWOPT_1_TABLE 0x00040000L
+#define VIEWOPT_1_DRAW 0x00080000L
+#define VIEWOPT_1_CONTROL 0x00100000L
//#define 0x00200000L
#define VIEWOPT_1_CROSSHAIR 0x00400000L
-#define VIEWOPT_1_SNAP 0x00800000L
-#define VIEWOPT_1_SYNCHRONIZE 0x01000000L
-#define VIEWOPT_1_GRIDVISIBLE 0x02000000L
+#define VIEWOPT_1_SNAP 0x00800000L
+#define VIEWOPT_1_SYNCHRONIZE 0x01000000L
+#define VIEWOPT_1_GRIDVISIBLE 0x02000000L
#define VIEWOPT_1_ONLINESPELL 0x04000000L
//#define VIEWOPT_1_HIDESPELL 0x08000000L /* removed #i91949 */
-#define VIEWOPT_1_RESERVED1 0x10000000L
+#define VIEWOPT_1_RESERVED1 0x10000000L
#define VIEWOPT_1_VIEWMETACHARS 0x20000000L
#define VIEWOPT_1_PAGEBACK 0x40000000L
#define VIEWOPT_1_SOLIDMARKHDL 0x80000000L
-#define VIEWOPT_CORE2_BLACKFONT 0x00000001L
-#define VIEWOPT_CORE2_HIDDENPARA 0x00000002L
-#define VIEWOPT_CORE2_SMOOTHSCROLL 0x00000004L
-#define VIEWOPT_CORE2_CRSR_IN_PROT 0x00000008L
+#define VIEWOPT_CORE2_BLACKFONT 0x00000001L
+#define VIEWOPT_CORE2_HIDDENPARA 0x00000002L
+#define VIEWOPT_CORE2_SMOOTHSCROLL 0x00000004L
+#define VIEWOPT_CORE2_CRSR_IN_PROT 0x00000008L
#define VIEWOPT_CORE2_PDF_EXPORT 0x00000010L
#define VIEWOPT_CORE2_PRINTING 0x00000020L
-#define VIEWOPT_CORE2_BIGMARKHDL 0x00000040L
+#define VIEWOPT_CORE2_BIGMARKHDL 0x00000040L
#define VIEWOPT_2_UNUSED1 0x00000100L
#define VIEWOPT_2_UNUSED2 0x00000200L
#define VIEWOPT_2_H_RULER 0x00000400L
-#define VIEWOPT_2_VSCROLLBAR 0x00000800L
-#define VIEWOPT_2_HSCROLLBAR 0x00001000L
-#define VIEWOPT_2_STATUSLINE 0x00002000L
+#define VIEWOPT_2_VSCROLLBAR 0x00000800L
+#define VIEWOPT_2_HSCROLLBAR 0x00001000L
+#define VIEWOPT_2_STATUSLINE 0x00002000L
#define VIEWOPT_2_V_RULER 0x00004000L
#define VIEWOPT_2_ANY_RULER 0x00008000L
-#define VIEWOPT_2_MODIFIED 0x00010000L
+#define VIEWOPT_2_MODIFIED 0x00010000L
#define VIEWOPT_2_KEEPASPECTRATIO 0x00020000L
-#define VIEWOPT_2_GRFKEEPZOOM 0x00040000L
+#define VIEWOPT_2_GRFKEEPZOOM 0x00040000L
#define VIEWOPT_2_PREVENT_TIPS 0x00100000L
#define VIEWOPT_2_RESERVED3 0x00200000L
#define VIEWOPT_2_RESERVED4 0x00400000L
@@ -102,9 +102,9 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_2_V_RULER_RIGHT 0x02000000L
//Tabellenhintergrund
-#define TBL_DEST_CELL 0
-#define TBL_DEST_ROW 1
-#define TBL_DEST_TBL 2
+#define TBL_DEST_CELL 0
+#define TBL_DEST_ROW 1
+#define TBL_DEST_TBL 2
//Appearance flags
#define VIEWOPT_DOC_BOUNDARIES 0x0001
@@ -141,22 +141,22 @@ class SwViewOption
static sal_Int32 nAppearanceFlags; //
protected:
- static USHORT nPixelTwips;// 1 Pixel == ? Twips
+ static USHORT nPixelTwips;// 1 Pixel == ? Twips
- String sSymbolFont; // Symbolzeichensatz
- UINT32 nCoreOptions; // Bits fuer die ViewShell
- UINT32 nCore2Options; // Bits fuer die ViewShell
- UINT32 nUIOptions; // UI-Bits
- Color aRetoucheColor; // DefaultBackground fuer BrowseView
+ String sSymbolFont; // Symbolzeichensatz
+ UINT32 nCoreOptions; // Bits fuer die ViewShell
+ UINT32 nCore2Options; // Bits fuer die ViewShell
+ UINT32 nUIOptions; // UI-Bits
+ Color aRetoucheColor; // DefaultBackground fuer BrowseView
Size aSnapSize; // Beschreibt hori. wie vert. Snap
USHORT mnViewLayoutColumns;// # columns for edit view
- short nDivisionX; // Rasterunterteilung
- short nDivisionY;
- BYTE nPagePrevRow; // Page Preview Row/Columns
- BYTE nPagePrevCol; // Page Preview Row/Columns
- BYTE nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr
- BOOL bReadonly : 1; // Readonly-Doc
- BOOL bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents)
+ short nDivisionX; // Rasterunterteilung
+ short nDivisionY;
+ BYTE nPagePrevRow; // Page Preview Row/Columns
+ BYTE nPagePrevCol; // Page Preview Row/Columns
+ BYTE nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr
+ BOOL bReadonly : 1; // Readonly-Doc
+ BOOL bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents)
BOOL bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings
BOOL bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents
// --> FME 2004-06-29 #114856# Formular view
@@ -168,35 +168,35 @@ protected:
mutable bool bIdle;
// Maszstab
- USHORT nZoom; // Angaben in Prozent
+ USHORT nZoom; // Angaben in Prozent
SvxZoomType eZoom; // 'enum' fuer Zoom
BYTE nTblDest; // Ziel fuer Tabellenhintergrund
#if OSL_DEBUG_LEVEL > 1
// korrespondieren zu den Angaben in ui/config/cfgvw.src
- BOOL bTest1 :1; // Test-Flag "Layout not loading"
- BOOL bTest2 :1; // Test-Flag "WYSIWYG++"
- BOOL bTest3 :1; // Test-Flag ""
- BOOL bTest4 :1; // Test-Flag "WYSIWYG debug"
- BOOL bTest5 :1; // Test-Flag "No idle format"
- BOOL bTest6 :1; // Test-Flag "No screen adj"
- BOOL bTest7 :1; // Test-Flag "win format"
- BOOL bTest8 :1; // Test-Flag ""
- static BOOL bTest9; // Test-Flag "DrawingLayerNotLoading"
- BOOL bTest10 :1; // Test-Flag "Format by Input"
+ BOOL bTest1 :1; // Test-Flag "Layout not loading"
+ BOOL bTest2 :1; // Test-Flag "WYSIWYG++"
+ BOOL bTest3 :1; // Test-Flag ""
+ BOOL bTest4 :1; // Test-Flag "WYSIWYG debug"
+ BOOL bTest5 :1; // Test-Flag "No idle format"
+ BOOL bTest6 :1; // Test-Flag "No screen adj"
+ BOOL bTest7 :1; // Test-Flag "win format"
+ BOOL bTest8 :1; // Test-Flag ""
+ static BOOL bTest9; // Test-Flag "DrawingLayerNotLoading"
+ BOOL bTest10 :1; // Test-Flag "Format by Input"
#endif
public:
- SwViewOption(); // CTOR
- SwViewOption(const SwViewOption&); //
- ~SwViewOption(); //
+ SwViewOption(); // CTOR
+ SwViewOption(const SwViewOption&); //
+ ~SwViewOption(); //
- void Init( Window *pWin ); // Initialisierung der statischen Daten
+ void Init( Window *pWin ); // Initialisierung der statischen Daten
USHORT GetPixelTwips() const { return nPixelTwips; }
- inline UINT32 GetCoreOptions() const {return nCoreOptions;}
+ inline UINT32 GetCoreOptions() const {return nCoreOptions;}
inline void SetUIOptions( const SwViewOption& );
/*---------------------------------------------------------------------------
@@ -217,7 +217,7 @@ public:
{ return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) &&
((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard)
? TRUE : FALSE; }
- inline void SetTab( BOOL b ) {
+ inline void SetTab( BOOL b ) {
(b != 0) ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); }
inline BOOL IsBlank(BOOL bHard = FALSE) const
@@ -257,7 +257,7 @@ public:
inline void SetSoftHyph( BOOL b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); }
- inline BOOL IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? TRUE : FALSE; }
+ inline BOOL IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? TRUE : FALSE; }
inline void SetFldName( BOOL b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); }
@@ -323,7 +323,7 @@ public:
inline void SetSnap( BOOL b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); }
- inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; }
+ inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; }
inline const Size &GetSnapSize() const { return aSnapSize; }
inline BOOL IsGridVisible() const
@@ -354,25 +354,25 @@ public:
/*---------------------------------------------------------------------------
Optionen aus nCore2Options
----------------------------------------------------------------------------*/
- inline BOOL IsBlackFont() const
+ inline BOOL IsBlackFont() const
{return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? TRUE : FALSE;}
inline void SetBlackFont(BOOL b)
{ (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);}
- inline BOOL IsShowHiddenPara() const
+ inline BOOL IsShowHiddenPara() const
{return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? TRUE : FALSE;}
inline void SetShowHiddenPara(BOOL b)
{ (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);}
- inline BOOL IsSmoothScroll() const
+ inline BOOL IsSmoothScroll() const
{return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? TRUE : FALSE;}
inline void SetSmoothScroll(BOOL b)
{ (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);}
- inline BOOL IsCursorInProtectedArea() const
+ inline BOOL IsCursorInProtectedArea() const
{return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? TRUE : FALSE;}
inline void SetCursorInProtectedArea(BOOL b)
@@ -395,17 +395,17 @@ public:
----------------------------------------------------------------------------*/
- inline short GetDivisionX() const { return nDivisionX; }
+ inline short GetDivisionX() const { return nDivisionX; }
inline void SetDivisionX( short n ){ nDivisionX = n; }
- inline short GetDivisionY() const { return nDivisionY; }
+ inline short GetDivisionY() const { return nDivisionY; }
inline void SetDivisionY( short n ){ nDivisionY = n; }
- inline BYTE GetPagePrevRow() const { return nPagePrevRow; }
+ inline BYTE GetPagePrevRow() const { return nPagePrevRow; }
inline void SetPagePrevRow( BYTE n ) { nPagePrevRow = n; }
- inline BYTE GetPagePrevCol() const { return nPagePrevCol; }
+ inline BYTE GetPagePrevCol() const { return nPagePrevCol; }
inline void SetPagePrevCol( BYTE n ) { nPagePrevCol = n; }
- BOOL IsReadonly() const { return bReadonly; }
- void SetReadonly(BOOL bSet) { bReadonly = bSet; }
+ BOOL IsReadonly() const { return bReadonly; }
+ void SetReadonly(BOOL bSet) { bReadonly = bSet; }
BOOL IsSelectionInReadonly() const {return bSelectionInReadonly;}
void SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;}
@@ -428,29 +428,29 @@ public:
#if OSL_DEBUG_LEVEL > 1
// korrespondieren zu den Angaben in ui/config/cfgvw.src
- inline BOOL IsTest1() const { return bTest1; }
- inline void SetTest1( BOOL b ) { bTest1 = b; }
- inline BOOL IsTest2() const { return bTest2; }
- inline void SetTest2( BOOL b ) { bTest2 = b; }
- inline BOOL IsTest3() const { return bTest3; }
- inline void SetTest3( BOOL b ) { bTest3 = b; }
- inline BOOL IsTest4() const { return bTest4; }
- inline void SetTest4( BOOL b ) { bTest4 = b; }
- inline BOOL IsTest5() const { return bTest5; }
- inline void SetTest5( BOOL b ) { bTest5 = b; }
- inline BOOL IsTest6() const { return bTest6; }
- inline void SetTest6( BOOL b ) { bTest6 = b; }
- inline BOOL IsTest7() const { return bTest7; }
- inline void SetTest7( BOOL b ) { bTest7 = b; }
- inline BOOL IsTest8() const { return bTest8; }
- inline void SetTest8( BOOL b ) { bTest8 = b; }
- static inline BOOL IsTest9() { return bTest9; }
- static inline void SetTest9( BOOL b ) { bTest9 = b; }
- inline BOOL IsTest10() const { return bTest10; }
- inline void SetTest10( BOOL b ) { bTest10 = b; }
+ inline BOOL IsTest1() const { return bTest1; }
+ inline void SetTest1( BOOL b ) { bTest1 = b; }
+ inline BOOL IsTest2() const { return bTest2; }
+ inline void SetTest2( BOOL b ) { bTest2 = b; }
+ inline BOOL IsTest3() const { return bTest3; }
+ inline void SetTest3( BOOL b ) { bTest3 = b; }
+ inline BOOL IsTest4() const { return bTest4; }
+ inline void SetTest4( BOOL b ) { bTest4 = b; }
+ inline BOOL IsTest5() const { return bTest5; }
+ inline void SetTest5( BOOL b ) { bTest5 = b; }
+ inline BOOL IsTest6() const { return bTest6; }
+ inline void SetTest6( BOOL b ) { bTest6 = b; }
+ inline BOOL IsTest7() const { return bTest7; }
+ inline void SetTest7( BOOL b ) { bTest7 = b; }
+ inline BOOL IsTest8() const { return bTest8; }
+ inline void SetTest8( BOOL b ) { bTest8 = b; }
+ static inline BOOL IsTest9() { return bTest9; }
+ static inline void SetTest9( BOOL b ) { bTest9 = b; }
+ inline BOOL IsTest10() const { return bTest10; }
+ inline void SetTest10( BOOL b ) { bTest10 = b; }
#endif
- inline USHORT GetZoom() const { return nZoom; }
+ inline USHORT GetZoom() const { return nZoom; }
inline void SetZoom( USHORT n ){ nZoom = n; }
void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ) const;
@@ -468,29 +468,29 @@ public:
----------------------------------------------------------------------------*/
BOOL IsViewVScrollBar() const
- { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? TRUE : FALSE; }
- BOOL IsViewHScrollBar() const
- { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? TRUE : FALSE; }
+ { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? TRUE : FALSE; }
+ BOOL IsViewHScrollBar() const
+ { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? TRUE : FALSE; }
BOOL IsKeepRatio() const
- { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? TRUE : FALSE; }
- BOOL IsGrfKeepZoom() const
- { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE; }
+ { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? TRUE : FALSE; }
+ BOOL IsGrfKeepZoom() const
+ { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE; }
BOOL IsPreventTips() const
{ return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? TRUE : FALSE; }
- BOOL IsPrtFormat() const
+ BOOL IsPrtFormat() const
{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; }
SvxZoomType GetZoomType() const { return eZoom; }
- BYTE GetTblDest() const { return nTblDest; }
+ BYTE GetTblDest() const { return nTblDest; }
void SetViewVScrollBar(BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); }
void SetViewHScrollBar(BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); }
- void SetKeepRatio (BOOL b)
+ void SetKeepRatio (BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); }
- void SetGrfKeepZoom (BOOL b)
+ void SetGrfKeepZoom (BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
void SetPreventTips( BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); }
@@ -498,13 +498,13 @@ public:
{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; }
- void SetTblDest( BYTE nNew ) { nTblDest = nNew; }
+ void SetTblDest( BYTE nNew ) { nTblDest = nNew; }
- const String& GetSymbolFont() const {return sSymbolFont;}
- void SetSymbolFont(const String& sSet) {sSymbolFont = sSet;}
+ const String& GetSymbolFont() const {return sSymbolFont;}
+ void SetSymbolFont(const String& sSet) {sSymbolFont = sSet;}
- const Color& GetRetoucheColor() const { return aRetoucheColor;}
- void SetRetoucheColor(const Color&r) { aRetoucheColor = r; }
+ const Color& GetRetoucheColor() const { return aRetoucheColor;}
+ void SetRetoucheColor(const Color&r) { aRetoucheColor = r; }
BOOL IsViewAnyRuler() const {return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);}
void SetViewAnyRuler(BOOL bSet)
@@ -537,7 +537,7 @@ public:
{ b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);}
// ShadowCursor ein schalten/abfragen/Farbe setzen/Modus setzen
- BOOL IsShadowCursor() const
+ BOOL IsShadowCursor() const
{ return nUIOptions & VIEWOPT_2_SHADOWCRSR ? TRUE : FALSE; }
void SetShadowCursor(BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); }
@@ -548,14 +548,14 @@ public:
void SetVRulerRight(BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); }
- BOOL IsStarOneSetting() const {return bStarOneSetting; }
- void SetStarOneSetting(BOOL bSet) {bStarOneSetting = bSet; }
+ BOOL IsStarOneSetting() const {return bStarOneSetting; }
+ void SetStarOneSetting(BOOL bSet) {bStarOneSetting = bSet; }
BOOL IsPagePreview() const {return bIsPagePreview; }
void SetPagePreview(BOOL bSet) { bIsPagePreview= bSet; }
- BYTE GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; }
- void SetShdwCrsrFillMode( BYTE nMode ) { nShdwCrsrFillMode = nMode; };
+ BYTE GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; }
+ void SetShdwCrsrFillMode( BYTE nMode ) { nShdwCrsrFillMode = nMode; };
sal_Bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; }
void SetShowPlaceHolderFields(sal_Bool bSet) { bShowPlaceHolderFields = bSet; }
@@ -610,7 +610,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
// Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten
-SW_DLLPUBLIC USHORT GetHtmlMode(const SwDocShell*);
+SW_DLLPUBLIC USHORT GetHtmlMode(const SwDocShell*);
#endif
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 9160c33917ba..1f35b865c410 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -2,7 +2,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
@@ -98,7 +98,7 @@ namespace vcl
// define fuer Flags, die im CTOR oder den darunter liegenden Schichten
// benoetigt werden.
// Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
-#define VSHELLFLAG_ISPREVIEW ((long)0x1)
+#define VSHELLFLAG_ISPREVIEW ((long)0x1)
class SW_DLLPUBLIC ViewShell : public Ring
@@ -122,18 +122,18 @@ class SW_DLLPUBLIC ViewShell : public Ring
static BitmapEx* pErrorBmp; // error display of missed images
// <--
- static sal_Bool bLstAct; // sal_True wenn Das EndAction der letzten Shell
+ static sal_Bool bLstAct; // sal_True wenn Das EndAction der letzten Shell
// laeuft; also die EndActions der
// anderen Shells auf das Dokument
// abgearbeitet sind.
- Point aPrtOffst; //Ofst fuer den Printer,
+ Point aPrtOffst; //Ofst fuer den Printer,
//nicht bedruckbarer Rand.
- Size aBrowseBorder; //Rand fuer Framedokumente
- SwRect aInvalidRect;
+ Size aBrowseBorder; //Rand fuer Framedokumente
+ SwRect aInvalidRect;
SfxViewShell *pSfxViewShell;
- SwViewImp *pImp; //Core-Interna der ViewShell.
+ SwViewImp *pImp; //Core-Interna der ViewShell.
//Der Pointer ist niemals 0.
Window *pWin; // = 0 during printing or pdf export
@@ -148,19 +148,19 @@ class SW_DLLPUBLIC ViewShell : public Ring
SwAccessibilityOptions* pAccOptions;
- sal_Bool bDocSizeChgd :1; //Fuer DocChgNotify(): Neue DocGroesse bei
+ sal_Bool bDocSizeChgd :1; //Fuer DocChgNotify(): Neue DocGroesse bei
//EndAction an das DocMDI melden.
- sal_Bool bPaintWorks :1; //Normal Painten wenn sal_True,
+ sal_Bool bPaintWorks :1; //Normal Painten wenn sal_True,
//Paint merken wenn sal_False
- sal_Bool bPaintInProgress :1; //Kein zweifaches Paint durchlassen.
- sal_Bool bViewLocked :1; //Lockt den sichtbaren Bereich,
+ sal_Bool bPaintInProgress :1; //Kein zweifaches Paint durchlassen.
+ sal_Bool bViewLocked :1; //Lockt den sichtbaren Bereich,
//MakeVisible laeuft dann in's leere.
- sal_Bool bInEndAction :1; //Fiese unstaende vermeiden, siehe viewsh.cxx
- sal_Bool bPreView :1; //Ist sal_True wenns eine PreView-ViewShell ist.
- sal_Bool bFrameView :1; //sal_True wenn es ein (HTML-)Frame ist.
- sal_Bool bEnableSmooth :1; //Disable des SmoothScroll z.B. fuer
+ sal_Bool bInEndAction :1; //Fiese unstaende vermeiden, siehe viewsh.cxx
+ sal_Bool bPreView :1; //Ist sal_True wenns eine PreView-ViewShell ist.
+ sal_Bool bFrameView :1; //sal_True wenn es ein (HTML-)Frame ist.
+ sal_Bool bEnableSmooth :1; //Disable des SmoothScroll z.B. fuer
//Drag der Scrollbars.
- sal_Bool bEndActionByVirDev:1; //Paints aus der EndAction immer ueber virtuelles
+ sal_Bool bEndActionByVirDev:1; //Paints aus der EndAction immer ueber virtuelles
//Device (etwa beim Browsen)
@@ -168,17 +168,17 @@ class SW_DLLPUBLIC ViewShell : public Ring
bool mbInConstructor:1;
// #i74769#
- SdrPaintWindow* mpTargetPaintWindow;
- OutputDevice* mpBufferedOut;
+ SdrPaintWindow* mpTargetPaintWindow;
+ OutputDevice* mpBufferedOut;
//Initialisierung, wird von den verschiedenen Konstruktoren gerufen.
SW_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
inline void ResetInvalidRect();
- SW_DLLPRIVATE void Reformat(); //Invalidert das ges. Layout (ApplyViewOption)
+ SW_DLLPRIVATE void Reformat(); //Invalidert das ges. Layout (ApplyViewOption)
- SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // sammeln der Werte fuers
+ SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // sammeln der Werte fuers
// Malen der Wiese und rufen
// PaintDesktop gesplittet, dieser Teil wird auch von PreViewPage benutzt
SW_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion );
@@ -191,14 +191,14 @@ class SW_DLLPUBLIC ViewShell : public Ring
SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
protected:
- static ShellResource* pShellRes; // Resourcen fuer die Shell
- static Window* pCareWindow; // diesem Fenster ausweichen
+ static ShellResource* pShellRes; // Resourcen fuer die Shell
+ static Window* pCareWindow; // diesem Fenster ausweichen
- SwRect aVisArea; //Die moderne Ausfuerung der VisArea
- SwDoc *pDoc; //Das Dokument, niemals 0
+ SwRect aVisArea; //Die moderne Ausfuerung der VisArea
+ SwDoc *pDoc; //Das Dokument, niemals 0
sal_uInt16 nStartAction; //ist != 0 wenn mindestens eine ::com::sun::star::chaos::Action laeuft
- sal_uInt16 nLockPaint; //ist != 0 wenn das Paint gelocked ist.
+ sal_uInt16 nLockPaint; //ist != 0 wenn das Paint gelocked ist.
public:
TYPEINFO();
@@ -220,13 +220,13 @@ public:
sal_Bool ActionPend() const { return nStartAction != 0; }
sal_Bool IsInEndAction() const { return bInEndAction; }
- void SetEndActionByVirDev( sal_Bool b ) { bEndActionByVirDev = b; }
+ void SetEndActionByVirDev( sal_Bool b ) { bEndActionByVirDev = b; }
sal_Bool IsEndActionByVirDev() { return bEndActionByVirDev; }
- // Per UNO wird am RootFrame fuer alle shells der ActionCount kurzfristig
+ // Per UNO wird am RootFrame fuer alle shells der ActionCount kurzfristig
// auf Null gesetzt und wieder restauriert
- void SetRestoreActions(sal_uInt16 nSet);
- sal_uInt16 GetRestoreActions() const;
+ void SetRestoreActions(sal_uInt16 nSet);
+ sal_uInt16 GetRestoreActions() const;
inline sal_Bool HasInvalidRect() const { return aInvalidRect.HasArea(); }
void ChgHyphenation() { Reformat(); }
@@ -239,9 +239,9 @@ public:
//////////////////////////////////////////////////////////////////////////////
// #i72754# set of Pre/PostPaints with lock counter and initial target OutDev
protected:
- sal_uInt32 mnPrePostPaintCount;
- OutputDevice* mpPrePostOutDev;
- MapMode maPrePostMapMode;
+ sal_uInt32 mnPrePostPaintCount;
+ OutputDevice* mpPrePostOutDev;
+ MapMode maPrePostMapMode;
public:
void PrePaint();
void DLPrePaint2(const Region& rRegion);
@@ -268,25 +268,25 @@ public:
//Bei naechster Gelegenheit die neue Dokuemntgroesse an das UI weiterreichen.
void SizeChgNotify();
- void UISizeNotify(); //Das weiterreichen der aktuellen groesse.
+ void UISizeNotify(); //Das weiterreichen der aktuellen groesse.
Point GetPagePos( sal_uInt16 nPageNum ) const;
- sal_uInt16 GetNumPages(); //Anzahl der aktuellen Seiten Layout erfragen.
+ sal_uInt16 GetNumPages(); //Anzahl der aktuellen Seiten Layout erfragen.
sal_Bool IsDummyPage( USHORT nPageNum ) const; // An empty page?
//Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring.
void SetFirstVisPageInvalid();
- SwRootFrm *GetLayout() const;
- sal_Bool IsNewLayout() const; //Wurde das Layout geladen oder neu
+ SwRootFrm *GetLayout() const;
+ sal_Bool IsNewLayout() const; //Wurde das Layout geladen oder neu
//erzeugt?
Size GetDocSize() const;// erfrage die Groesse des Dokuments
- void CalcLayout(); //Durchformatierung des Layouts erzwingen.
+ void CalcLayout(); //Durchformatierung des Layouts erzwingen.
- inline SwDoc *GetDoc() const { return pDoc; } //niemals 0.
+ inline SwDoc *GetDoc() const { return pDoc; } //niemals 0.
/** Provides access to the document setting interface
*/
@@ -446,7 +446,7 @@ public:
static void SetCareWin( Window* pNew );
static Window* GetCareWin(ViewShell& rVSh)
{ return pCareWindow ? pCareWindow : CareChildWin(rVSh); }
- static Window* CareChildWin(ViewShell& rVSh);
+ static Window* CareChildWin(ViewShell& rVSh);
inline SfxViewShell *GetSfxViewShell() { return pSfxViewShell; }
inline void SetSfxViewShell(SfxViewShell *pNew) { pSfxViewShell = pNew; }
@@ -471,7 +471,7 @@ public:
void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions );
sal_Bool IsViewLocked() const { return bViewLocked; }
- void LockView( sal_Bool b ) { bViewLocked = b; }
+ void LockView( sal_Bool b ) { bViewLocked = b; }
inline void LockPaint();
void ImplLockPaint();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index b9fbb6068b04..42213d27b991 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -2,7 +2,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
@@ -97,7 +97,7 @@ class SwSelPaintRects : public SwRects
virtual void FillRects() = 0;
// #i75172#
- sdr::overlay::OverlayObject* mpCursorOverlay;
+ sdr::overlay::OverlayObject* mpCursorOverlay;
// #i75172# access to mpCursorOverlay for swapContent
sdr::overlay::OverlayObject* getCursorOverlay() const { return mpCursorOverlay; }
@@ -127,9 +127,9 @@ class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects
{
// Dokument-Positionen der Start/End-Charakter einer SSelection
Point aMkPt, aPtPt;
- const SwPosition* pPt; // fuer Zuordung vom GetPoint() zum aPtPt
+ const SwPosition* pPt; // fuer Zuordung vom GetPoint() zum aPtPt
- virtual void FillRects(); // fuer Table- und normalen Crsr
+ virtual void FillRects(); // fuer Table- und normalen Crsr
using SwCursor::UpDown;
@@ -140,18 +140,18 @@ public:
SwShellCrsr( SwShellCrsr& );
virtual ~SwShellCrsr();
- void Show(); // Update und zeige alle Selektionen an
- void Hide(); // verstecke alle Selektionen
+ void Show(); // Update und zeige alle Selektionen an
+ void Hide(); // verstecke alle Selektionen
void Invalidate( const SwRect& rRect );
- const Point& GetPtPos() const { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); }
- Point& GetPtPos() { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); }
- const Point& GetMkPos() const { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); }
- Point& GetMkPos() { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); }
- const Point& GetSttPos() const { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); }
- Point& GetSttPos() { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); }
- const Point& GetEndPos() const { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); }
- Point& GetEndPos() { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); }
+ const Point& GetPtPos() const { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); }
+ Point& GetPtPos() { return( SwPaM::GetPoint() == pPt ? aPtPt : aMkPt ); }
+ const Point& GetMkPos() const { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); }
+ Point& GetMkPos() { return( SwPaM::GetMark() == pPt ? aPtPt : aMkPt ); }
+ const Point& GetSttPos() const { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); }
+ Point& GetSttPos() { return( SwPaM::Start() == pPt ? aPtPt : aMkPt ); }
+ const Point& GetEndPos() const { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); }
+ Point& GetEndPos() { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); }
virtual void SetMark();
@@ -167,7 +167,7 @@ public:
#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
+// am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -195,7 +195,7 @@ public:
const SwPosition &rPtPos, const Point& rPtPt );
virtual ~SwShellTableCrsr();
- virtual void FillRects(); // fuer Table- und normalen Crsr
+ virtual void FillRects(); // fuer Table- und normalen Crsr
// Pruefe, ob sich der SPoint innerhalb der Tabellen-SSelection befindet
BOOL IsInside( const Point& rPt ) const;
@@ -211,7 +211,7 @@ public:
#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
+// am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -221,6 +221,6 @@ public:
-#endif // _VISCRS_HXX
+#endif // _VISCRS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index 8b1e6a68cd60..41694193916e 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
class SW_DLLPUBLIC SwWebDocShell: public SwDocShell
{
- USHORT nSourcePara; // aktive Zeile in der SourceView
+ USHORT nSourcePara; // aktive Zeile in der SourceView
public:
@@ -47,14 +47,14 @@ public:
SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
~SwWebDocShell();
- virtual void FillClass( SvGlobalName * pClassName,
+ virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pClipFormat,
String * pAppName,
String * pLongUserName,
String * pUserName,
sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const;
- USHORT GetSourcePara()const
+ USHORT GetSourcePara()const
{return nSourcePara;}
void SetSourcePara(USHORT nSet) {nSourcePara = nSet;}
};
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index b7f45d25db2b..eb9b4fe31b8b 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -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
diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java b/sw/qa/complex/checkColor/CheckChangeColor.java
index 8a8c563c7eea..5fac27a99dcd 100644
--- a/sw/qa/complex/checkColor/CheckChangeColor.java
+++ b/sw/qa/complex/checkColor/CheckChangeColor.java
@@ -76,7 +76,7 @@ public class CheckChangeColor extends ComplexTestCase {
log.println("BackColor @ "+xPropertySet.getPropertyValue("BackColor").toString());
log.println("IsLandscape @ "+xPropertySet.getPropertyValue("IsLandscape").toString());
log.println("Size @ H:"+((Size)xPropertySet.getPropertyValue("Size")).Height+" W:"+((Size)xPropertySet.getPropertyValue("Size")).Width);
-
+
log.println("Set Landscape");
xPropertySet.setPropertyValue("IsLandscape",new Boolean(true) );
log.println("Set BackColor");
diff --git a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java
index 7c3bf14f2e01..c7c35e30bd17 100644
--- a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java
+++ b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java
@@ -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
diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java
index 0915db42e6ac..d50916f51a65 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -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
diff --git a/sw/qa/complex/writer/CheckFlies.java b/sw/qa/complex/writer/CheckFlies.java
index 50e94290c5b2..89a85b8e1ce9 100644
--- a/sw/qa/complex/writer/CheckFlies.java
+++ b/sw/qa/complex/writer/CheckFlies.java
@@ -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
diff --git a/sw/qa/complex/writer/CheckIndexedPropertyValues.java b/sw/qa/complex/writer/CheckIndexedPropertyValues.java
index aca4f68c7ec2..0f6f6a25f75b 100644
--- a/sw/qa/complex/writer/CheckIndexedPropertyValues.java
+++ b/sw/qa/complex/writer/CheckIndexedPropertyValues.java
@@ -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
diff --git a/sw/qa/complex/writer/CheckNamedPropertyValues.java b/sw/qa/complex/writer/CheckNamedPropertyValues.java
index 851381cf3c24..7eefc334bb5f 100644
--- a/sw/qa/complex/writer/CheckNamedPropertyValues.java
+++ b/sw/qa/complex/writer/CheckNamedPropertyValues.java
@@ -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
diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java
index 2eda02bfa518..b526b30e4e87 100644
--- a/sw/qa/complex/writer/TextPortionEnumerationTest.java
+++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java
@@ -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
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 831c750bd274..fa7cb2978016 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -2,7 +2,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
@@ -198,58 +198,58 @@ public:
printMethodName("test_insert_entries_in_the_middle\n");
RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_insert_entries_in_the_middle");
-
- BigPtrArray bparr;
-
- fillBigPtrArray(bparr, NUM_ENTRIES);
+
+ BigPtrArray bparr;
+
+ fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
ULONG oldCount = bparr.Count();
-
+
bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count() / 2);
RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_insert_entries_in_the_middle");
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_entries_in_the_middle failed",
(oldCount + 1 == bparr.Count() && static_cast<BigPtrEntryMock*>(bparr[bparr.Count() / 2])->getCount() == NUM_ENTRIES)
)
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_entries_in_the_middle failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
- dumpBigPtrArray(bparr);
+ dumpBigPtrArray(bparr);
}
-
+
void test_insert_at_already_used_index()
{
printMethodName("test_insert_at_already_used_index\n");
-
+
RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_insert_at_already_used_index");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
int oldCount = bparr.Count();
-
+
for (int i = 0, j = -5; i < 5; i++, j++)
bparr.Insert(new BigPtrEntryMock(j), i);
-
+
RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_insert_at_already_used_index");
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_at_already_used_index failed",
(oldCount + 5 == bparr.Count())
)
-
+
for (int i = 0, j = -5; i < bparr.Count(); i++, j++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -258,69 +258,69 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == j
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_at_already_used_index failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
-
+
void test_insert_at_end()
{
printMethodName("test_insert_at_end\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
ULONG oldCount = bparr.Count();
bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count());
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_at_end failed",
(oldCount + 1 == bparr.Count() && static_cast<BigPtrEntryMock*>(bparr[bparr.Count()-1])->getCount() == NUM_ENTRIES)
)
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_insert_at_end failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
-
+
void test_remove_at_front()
{
printMethodName("test_remove_at_front\n");
RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_remove_at_front");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = 0; i < NUM_ENTRIES; i++)
- {
+ {
ULONG oldCount = bparr.Count();
-
- delete bparr[0]; // release content
- bparr.Remove(0); // remove item from container
-
+
+ delete bparr[0]; // release content
+ bparr.Remove(0); // remove item from container
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_at_front failed (wrong count)",
(oldCount - 1 == bparr.Count())
)
-
+
for (int j = 0, k = i + 1; j < bparr.Count(); j++, k++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -329,40 +329,40 @@ public:
static_cast<BigPtrEntryMock*>(bparr[j])->getCount() == k
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_at_front failed",
checkElementPositions(bparr)
)
-
+
dumpBigPtrArray(bparr);
}
-
- RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_remove_at_front");
+
+ RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_remove_at_front");
}
-
+
void test_remove_at_back()
{
printMethodName("test_remove_at_back\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = NUM_ENTRIES - 1; i >= 0; i--)
{
ULONG oldCount = bparr.Count();
delete bparr[i];
bparr.Remove(i);
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_at_back failed (wrong count)",
(oldCount - 1 == bparr.Count())
)
-
+
for (int j = 0; j < bparr.Count(); j++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -371,42 +371,42 @@ public:
static_cast<BigPtrEntryMock*>(bparr[j])->getCount() == j
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_at_back failed",
checkElementPositions(bparr)
)
-
+
dumpBigPtrArray(bparr);
}
}
-
+
void test_remove_in_the_middle()
{
printMethodName("test_remove_in_the_middle\n");
RTL_LOGFILE_CONTEXT_TRACE(logFile, "START: test_remove_in_the_middle");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
while (bparr.Count())
{
ULONG oldCount = bparr.Count();
int oldElement = static_cast<BigPtrEntryMock*>(bparr[bparr.Count() / 2])->getCount();
-
+
delete bparr[bparr.Count() / 2];
bparr.Remove(bparr.Count() / 2);
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_in_the_middle failed (wrong count)",
(oldCount - 1 == bparr.Count())
)
-
+
for (int i = 0; i < bparr.Count(); i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -415,89 +415,89 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() != oldElement
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_in_the_middle failed",
checkElementPositions(bparr)
)
-
+
dumpBigPtrArray(bparr);
}
RTL_LOGFILE_CONTEXT_TRACE(logFile, "END: test_remove_in_the_middle");
}
-
+
void test_remove_multiple_elements_at_once()
{
printMethodName("test_remove_multiple_elements_at_once\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
while(bparr.Count())
{
ULONG nRemove = (bparr.Count() > 3) ? 3 : bparr.Count();
ULONG oldCount = bparr.Count();
-
+
for (int i = 0; i < nRemove; i++)
delete bparr[i];
-
- bparr.Remove(0, nRemove);
-
+
+ bparr.Remove(0, nRemove);
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_multiple_elements_at_once failed",
(oldCount - nRemove == bparr.Count())
)
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_multiple_elements_at_once failed",
checkElementPositions(bparr)
)
-
+
dumpBigPtrArray(bparr);
}
}
-
+
void test_remove_all_elements_at_once()
{
printMethodName("test_remove_all_elements_at_once\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
releaseBigPtrArrayContent(bparr);
bparr.Remove(0, bparr.Count());
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_remove_all_elements_at_once failed",
bparr.Count() == 0
)
-
+
dumpBigPtrArray(bparr);
}
-
+
void test_move_elements_from_lower_to_higher_pos()
{
printMethodName("test_move_elements_from_lower_to_higher_pos\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = 0; i < NUM_ENTRIES - 1; i++)
{
bparr.Move(i, i + 2);
dumpBigPtrArray(bparr);
- }
-
+ }
+
for (int i = 0; i < (NUM_ENTRIES - 1); i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -506,43 +506,43 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i + 1)
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_move_elements_from_lower_to_higher_pos failed",
static_cast<BigPtrEntryMock*>(bparr[NUM_ENTRIES -1])->getCount() == 0
)
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_move_elements_from_lower_to_higher_pos failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
}
-
+
void test_move_elements_from_higher_to_lower_pos()
{
printMethodName("test_move_elements_from_higher_to_lower_pos\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = NUM_ENTRIES - 1; i >= 1; i--)
{
bparr.Move(i, i - 1);
dumpBigPtrArray(bparr);
- }
-
+ }
+
CPPUNIT_ASSERT_MESSAGE
(
"test_move_elements_from_higher_to_lower_pos failed",
static_cast<BigPtrEntryMock*>(bparr[0])->getCount() == (NUM_ENTRIES - 1)
)
-
+
for (int i = 1; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -551,32 +551,32 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i - 1)
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_move_elements_from_higher_to_lower_pos failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
}
-
+
void test_move_to_same_position()
{
printMethodName("test_move_to_same_position\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = 0; i < NUM_ENTRIES; i++)
{
- bparr.Move(i, i);
- }
-
+ bparr.Move(i, i);
+ }
+
dumpBigPtrArray(bparr);
-
+
for (int i = 0; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -585,33 +585,33 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == i
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_move_to_same_position failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
-
+
void test_replace_elements()
{
printMethodName("test_replace_elements\n");
-
- BigPtrArray bparr;
-
+
+ BigPtrArray bparr;
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
for (int i = 0, j = NUM_ENTRIES - 1; i < NUM_ENTRIES; i++, j--)
{
delete bparr[i];
bparr.Replace(i, new BigPtrEntryMock(j));
dumpBigPtrArray(bparr);
}
-
+
for (int i = 0; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -620,28 +620,28 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (NUM_ENTRIES - i - 1)
)
}
-
+
CPPUNIT_ASSERT_MESSAGE
(
"test_replace_elements failed",
checkElementPositions(bparr)
)
-
+
releaseBigPtrArrayContent(bparr);
}
-
+
void test_for_each()
{
printMethodName("test_for_each\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
int addCount = 1;
- bparr.ForEach(AddToCount, &addCount);
-
+ bparr.ForEach(AddToCount, &addCount);
+
for (int i = 0; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -650,7 +650,7 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i+1)
)
}
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
@@ -658,15 +658,15 @@ public:
void test_for_some1()
{
printMethodName("test_for_some1\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
int addCount = 1;
- bparr.ForEach(0, NUM_ENTRIES / 2, AddToCount, &addCount);
-
+ bparr.ForEach(0, NUM_ENTRIES / 2, AddToCount, &addCount);
+
int i = 0;
for (/* */; i < NUM_ENTRIES / 2; i++)
{
@@ -676,7 +676,7 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i+1)
)
}
-
+
for (/* */; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -685,23 +685,23 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i)
)
}
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
-
+
void test_for_some2()
{
printMethodName("test_for_some2\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
int addCount = 1;
- bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount);
-
+ bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount);
+
int i = 0;
for (/* */; i < NUM_ENTRIES / 2; i++)
{
@@ -711,7 +711,7 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i)
)
}
-
+
for (/* */; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -720,23 +720,23 @@ public:
static_cast<BigPtrEntryMock*>(bparr[i])->getCount() == (i+1)
)
}
-
+
releaseBigPtrArrayContent(bparr);
dumpBigPtrArray(bparr);
}
-
+
void test_for_some3()
{
printMethodName("test_for_some3\n");
-
+
BigPtrArray bparr;
-
+
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
-
+
int addCount = 1;
- bparr.ForEach(0, 0, AddToCount, &addCount);
-
+ bparr.ForEach(0, 0, AddToCount, &addCount);
+
for (int i = 0; i < NUM_ENTRIES; i++)
{
CPPUNIT_ASSERT_MESSAGE
@@ -747,13 +747,13 @@ public:
}
releaseBigPtrArrayContent(bparr);
}
-
+
CPPUNIT_TEST_SUITE(BigPtrArrayUnittest);
- CPPUNIT_TEST(test_ctor);
+ CPPUNIT_TEST(test_ctor);
CPPUNIT_TEST(test_insert_entries_at_front);
- CPPUNIT_TEST(test_insert_entries_in_the_middle);
+ CPPUNIT_TEST(test_insert_entries_in_the_middle);
CPPUNIT_TEST(test_insert_at_already_used_index);
- CPPUNIT_TEST(test_insert_at_end);
+ CPPUNIT_TEST(test_insert_at_end);
CPPUNIT_TEST(test_remove_at_front);
CPPUNIT_TEST(test_remove_at_back);
CPPUNIT_TEST(test_remove_in_the_middle);
@@ -761,7 +761,7 @@ public:
CPPUNIT_TEST(test_remove_all_elements_at_once);
CPPUNIT_TEST(test_move_elements_from_lower_to_higher_pos);
CPPUNIT_TEST(test_move_elements_from_higher_to_lower_pos);
- CPPUNIT_TEST(test_replace_elements);
+ CPPUNIT_TEST(test_replace_elements);
CPPUNIT_TEST(test_for_each);
CPPUNIT_TEST(test_for_some1);
CPPUNIT_TEST(test_for_some2);
@@ -771,26 +771,26 @@ public:
const char* START = "START: ";
const char* END = "END: ";
-
+
class PerformanceTracer
{
-public:
-
+public:
+
public:
PerformanceTracer(const string& methodName) :
startString_(START),
endString_(END)
- {
+ {
startString_ += methodName;
endString_ += methodName;
- RTL_LOGFILE_CONTEXT_TRACE(logFile, startString_.c_str());
+ RTL_LOGFILE_CONTEXT_TRACE(logFile, startString_.c_str());
}
-
+
~PerformanceTracer()
- {
- RTL_LOGFILE_CONTEXT_TRACE(logFile, endString_.c_str());
+ {
+ RTL_LOGFILE_CONTEXT_TRACE(logFile, endString_.c_str());
}
-
+
private:
string startString_;
string endString_;
@@ -802,31 +802,31 @@ public:
BigPtrArrayPerformanceTest()
{
}
-
+
void test_insert_at_end_1000()
- { test_insert_at_end("1000"); }
-
+ { test_insert_at_end("1000"); }
+
void test_insert_at_end_10000()
{ test_insert_at_end("10000"); }
-
+
void test_insert_at_end_100000()
{ test_insert_at_end("100000"); }
-
+
void test_insert_at_end_1000000()
{ test_insert_at_end("1000000"); }
-
+
void test_insert_at_front_1000()
- { test_insert_at_front("1000"); }
-
+ { test_insert_at_front("1000"); }
+
void test_insert_at_front_10000()
{ test_insert_at_front("10000"); }
-
+
void test_insert_at_front_100000()
{ test_insert_at_front("100000"); }
-
+
void test_insert_at_front_1000000()
{ test_insert_at_front("1000000"); }
-
+
CPPUNIT_TEST_SUITE(BigPtrArrayPerformanceTest);
CPPUNIT_TEST(test_insert_at_end_1000);
CPPUNIT_TEST(test_insert_at_end_10000);
@@ -837,7 +837,7 @@ public:
CPPUNIT_TEST(test_insert_at_front_100000);
CPPUNIT_TEST(test_insert_at_front_1000000);
CPPUNIT_TEST_SUITE_END();
-
+
private:
void test_insert_at_end(const char* numElements)
{
@@ -849,10 +849,10 @@ private:
BigPtrArray bparr;
for (int i = 0; i < n; i++)
bparr.Insert(new BigPtrEntryMock(i), bparr.Count());
-
+
releaseBigPtrArrayContent(bparr);
}
-
+
void test_insert_at_front(const char* numElements)
{
char buff[100] = { 0 };
@@ -863,7 +863,7 @@ private:
BigPtrArray bparr;
for (int i = 0; i < n; i++)
bparr.Insert(new BigPtrEntryMock(i), 0);
-
+
releaseBigPtrArrayContent(bparr);
}
};
diff --git a/sw/qa/core/bigpointerarray-new.cxx b/sw/qa/core/bigpointerarray-new.cxx
index e376fb53003f..802a2226fae7 100644
--- a/sw/qa/core/bigpointerarray-new.cxx
+++ b/sw/qa/core/bigpointerarray-new.cxx
@@ -2,7 +2,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,26 +73,26 @@ ElementPtr BigPtrArray::operator[](ULONG pos) const
}
void BigPtrArray::Insert(const ElementPtr& rElem, ULONG pos)
-{
+{
DBG_ASSERT(pos <= container_.size(), "BigPtrArray::Insert precondition violation");
-
+
rElem->pBigPtrArray_ = this;
- rElem->pos_ = pos;
-
- if (pos == container_.size())
- container_.push_back(rElem);
+ rElem->pos_ = pos;
+
+ if (pos == container_.size())
+ container_.push_back(rElem);
else
- {
+ {
container_.insert(container_.begin() + pos, rElem);
- FixElementIndizes(container_.begin(), container_.end());
+ FixElementIndizes(container_.begin(), container_.end());
}
}
void BigPtrArray::Remove( ULONG pos, ULONG n )
{
- DBG_ASSERT((pos < container_.size()) && ((container_.begin() + pos + n) < container_.end()), "BigPtrArray.Remove precondition violation")
+ DBG_ASSERT((pos < container_.size()) && ((container_.begin() + pos + n) < container_.end()), "BigPtrArray.Remove precondition violation")
container_.erase(container_.begin() + pos, container_.begin() + pos + n);
- FixElementIndizes(container_.begin(), container_.end());
+ FixElementIndizes(container_.begin(), container_.end());
}
void BigPtrArray::Replace(ULONG pos, const ElementPtr& rElem)
@@ -104,7 +104,7 @@ void BigPtrArray::Replace(ULONG pos, const ElementPtr& rElem)
}
void BigPtrArray::FixElementIndizes(Container_t::const_iterator begin, Container_t::const_iterator end) const
-{
+{
Container_t::const_iterator iter = begin;
for (int i = 0; iter != end; ++iter, i++)
(*iter)->pos_ = i;
diff --git a/sw/qa/core/bigpointerarray-new.hxx b/sw/qa/core/bigpointerarray-new.hxx
index 13b6e3c3c3f9..410c9354bf44 100644
--- a/sw/qa/core/bigpointerarray-new.hxx
+++ b/sw/qa/core/bigpointerarray-new.hxx
@@ -2,7 +2,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
@@ -42,20 +42,20 @@ class BigPtrEntry
{
friend class BigPtrArray;
BigPtrArray* pBigPtrArray_;
- ULONG pos_;
-
+ ULONG pos_;
+
protected:
- BigPtrEntry() : pBigPtrArray_(0), pos_(0)
+ BigPtrEntry() : pBigPtrArray_(0), pos_(0)
{}
-
- virtual ~BigPtrEntry()
+
+ virtual ~BigPtrEntry()
{}
ULONG GetPos() const
{
return pos_;
}
-
+
BigPtrArray& GetArray() const
{
return *pBigPtrArray_;
@@ -69,14 +69,14 @@ typedef BOOL (*FnForEach)(const ElementPtr&, void* pArgs);
*/
class BigPtrArray
{
-public:
+public:
typedef std::deque<ElementPtr> Container_t;
-
+
public:
/**
*/
BigPtrArray();
-
+
/** Return the number of entries inserted
into the array
*/
@@ -84,75 +84,75 @@ public:
/** Insert an Element into the array at a certain
position
-
+
@param rElem
[in] the element
-
+
@param pos
[in] the position where to insert the element.
-
+
@pre (pos >= 0 && pos <= BigPtrArray.Count())
@post (((oldCount + 1) == BigPtrArray.Count()) && BigPtrArray[pos] == rElem)
*/
void Insert(const ElementPtr& rElem, ULONG pos);
-
+
/** Remove a specified number of elements starting at a certain position.
-
+
@param pos
[in] the position where to start removing elements
-
+
@param n
[in] the number of elements to remove
-
+
@pre (pos < BigPtrArray.Count() && n <= BigPtrArray.Count())
@post ((oldCount - n) == BigPtrArray.Count())
*/
void Remove(ULONG pos, ULONG n = 1);
-
+
/** Move an entry from a certain position to another on.
-
+
@param from
- [in]
-
+ [in]
+
@param to
- [in]
+ [in]
*/
void Move(ULONG fromPos, ULONG toPos);
-
+
/** Replace an entry at a certain position
-
+
@param pos
[in] the position of the entry
-
- @param rElem
+
+ @param rElem
[in] the new entry
-
+
@pre pos < BigPtrArray.Count()
- @post (oldCount == BigPtrArray.Count() && BigPtrArray[pos] == rElem)
+ @post (oldCount == BigPtrArray.Count() && BigPtrArray[pos] == rElem)
*/
void Replace(ULONG pos, const ElementPtr& rElem);
/** Get the entry at a certain index
-
+
@param pos
[in] the position of the entry
-
+
@pre pos < BigPtrArray.Count()
*/
ElementPtr operator[](ULONG pos) const;
- /**
+ /**
*/
void ForEach(FnForEach fn, void* pArgs = NULL);
-
+
/**
*/
void ForEach(ULONG fromPos, ULONG toPos, FnForEach fn, void* pArgs = NULL);
private:
-
+
void FixElementIndizes(Container_t::const_iterator begin, Container_t::const_iterator end) const;
-
+
private:
Container_t container_;
};
diff --git a/sw/qa/core/export.map b/sw/qa/core/export.map
index 7321bbca16ad..f313c44bd7ad 100644
--- a/sw/qa/core/export.map
+++ b/sw/qa/core/export.map
@@ -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
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 4725f53f3655..8b4fc8a502b9 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -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
@@ -209,14 +209,14 @@ interface _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_COLOR // api:
[
ExecMethod = Exec;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_WEIGHT // api:
[
ExecMethod = Exec ;
@@ -265,7 +265,7 @@ interface _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_LANGUAGE // status(final|play)
[
ExecMethod = Execute ;
@@ -388,4 +388,4 @@ interface _Annotation
ExecMethod = ExecSearch ;
Export = FALSE;
]
-}
+}
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 115029d3c5d1..9ee0c71e6061 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -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
@@ -296,7 +296,7 @@ interface BaseTextSelection
StateMethod = GetBorderState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_BORDER_REDUCED_MODE
[
StateMethod = GetBorderState ;
diff --git a/sw/sdi/_beziers.sdi b/sw/sdi/_beziers.sdi
index 37c95d20699c..a62eff5a5f7f 100644
--- a/sw/sdi/_beziers.sdi
+++ b/sw/sdi/_beziers.sdi
@@ -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
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index cd2d1f850090..4de71ca760f2 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -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
diff --git a/sw/sdi/_drwbase.sdi b/sw/sdi/_drwbase.sdi
index d43a2d64512a..513cd17ed5b7 100644
--- a/sw/sdi/_drwbase.sdi
+++ b/sw/sdi/_drwbase.sdi
@@ -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
diff --git a/sw/sdi/_formsh.sdi b/sw/sdi/_formsh.sdi
index 76497efed516..d72f46bad8bc 100644
--- a/sw/sdi/_formsh.sdi
+++ b/sw/sdi/_formsh.sdi
@@ -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
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index a83270a6d196..82d6afff7f32 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -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
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 3d7fd41af98d..161db94235b8 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -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
@@ -64,142 +64,142 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TWAIN_TRANSFER
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
FN_GRAPHIC_MIRROR_ON_EVEN_PAGES // status(final|play|rec)
[
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_LUMINANCE // status(final|play|rec)
+ SID_ATTR_GRAF_LUMINANCE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_CONTRAST // status(final|play|rec)
+ SID_ATTR_GRAF_CONTRAST // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_RED // status(final|play|rec)
+ SID_ATTR_GRAF_RED // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_GREEN // status(final|play|rec)
+ SID_ATTR_GRAF_GREEN // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_BLUE // status(final|play|rec)
+ SID_ATTR_GRAF_BLUE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_GAMMA // status(final|play|rec)
+ SID_ATTR_GRAF_GAMMA // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_TRANSPARENCE // status(final|play|rec)
+ SID_ATTR_GRAF_TRANSPARENCE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_INVERT // status(final|play|rec)
+ SID_ATTR_GRAF_INVERT // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_ATTR_GRAF_MODE // status(final|play|rec)
+ SID_ATTR_GRAF_MODE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER // status(final|play|rec)
+ SID_GRFFILTER // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_INVERT // status(final|play|rec)
+ SID_GRFFILTER_INVERT // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_SMOOTH // status(final|play|rec)
+ SID_GRFFILTER_SMOOTH // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_SHARPEN // status(final|play|rec)
+ SID_GRFFILTER_SHARPEN // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_REMOVENOISE // status(final|play|rec)
+ SID_GRFFILTER_REMOVENOISE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_SOBEL // status(final|play|rec)
+ SID_GRFFILTER_SOBEL // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_MOSAIC // status(final|play|rec)
+ SID_GRFFILTER_MOSAIC // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_EMBOSS // status(final|play|rec)
+ SID_GRFFILTER_EMBOSS // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_POSTER // status(final|play|rec)
+ SID_GRFFILTER_POSTER // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_POPART // status(final|play|rec)
+ SID_GRFFILTER_POPART // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_SEPIA // status(final|play|rec)
+ SID_GRFFILTER_SEPIA // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_GRFFILTER_SOLARIZE // status(final|play|rec)
+ SID_GRFFILTER_SOLARIZE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
StateMethod = GetAttrState ;
diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index eff1c5ee1c2d..526aa6ca2470 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -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
diff --git a/sw/sdi/_mediash.sdi b/sw/sdi/_mediash.sdi
index a2e2f5535dc8..a8d70179597d 100644
--- a/sw/sdi/_mediash.sdi
+++ b/sw/sdi/_mediash.sdi
@@ -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
@@ -42,7 +42,7 @@ interface BaseTextMedia
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- SID_AVMEDIA_TOOLBOX // status(final|play|rec)
+ SID_AVMEDIA_TOOLBOX // status(final|play|rec)
[
ExecMethod = ExecMedia;
StateMethod = GetMediaState ;
diff --git a/sw/sdi/_olesh.sdi b/sw/sdi/_olesh.sdi
index 947ec5b86941..6527479e4298 100644
--- a/sw/sdi/_olesh.sdi
+++ b/sw/sdi/_olesh.sdi
@@ -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
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 06eccd3d555e..87789266d2e7 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -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
@@ -144,7 +144,7 @@ interface BaseTextTable
StateMethod = NoState ;
]
- FN_START_TABLE // status(final|play)
+ FN_START_TABLE // status(final|play)
[
ExecMethod = Execute ;
StateMethod = NoState ;
@@ -199,7 +199,7 @@ interface BaseTextTable
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_TABLE_BALANCE_CELLS // status()
+ FN_TABLE_BALANCE_CELLS // status()
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index e264aec28c28..a895cc5307ac 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -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
@@ -101,7 +101,7 @@ interface BaseText
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- //#outline level,add by zhaojianwei
+ //#outline level,add by zhaojianwei
SID_ATTR_PARA_OUTLINE_LEVEL
[
ExecMethod = Execute ;
@@ -180,13 +180,13 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_INSERT_PAGEHEADER // status(final|play|rec)
+ FN_INSERT_PAGEHEADER // status(final|play|rec)
[
ExecMethod = Execute ;
StateMethod = GetState ;
Export = FALSE;
]
- FN_INSERT_PAGEFOOTER // status(final|play|rec)
+ FN_INSERT_PAGEFOOTER // status(final|play|rec)
[
ExecMethod = Execute ;
StateMethod = GetState ;
@@ -470,7 +470,7 @@ interface BaseText
StateMethod = NoState ;
]
//
- // Goto - Methoden
+ // Goto - Methoden
//
SID_FM_TOGGLECONTROLFOCUS
[
@@ -674,7 +674,7 @@ interface BaseText
]
//
- // Get - Properties
+ // Get - Properties
//
FN_AUTOFORMAT_AUTO // status(final|play)
[
@@ -1153,17 +1153,17 @@ interface BaseText
]
SID_ATTR_PARA_ADJUST // status(final|play)
[
- // (0=links, 1=rechts, 2=block, 3=zentriert, )"
+ // (0=links, 1=rechts, 2=block, 3=zentriert, )"
ExecMethod = ExecParaAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_PARA_LINESPACE // status(final|play)
[
- // SvxLineSpace LineSpace MID_LINESPACE;
- // UINT16 LineHeight MID_HEIGHT; // % or direct
- // SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE;
- // INT16 InterSpace MID_INTER_SPACE;
+ // SvxLineSpace LineSpace MID_LINESPACE;
+ // UINT16 LineHeight MID_HEIGHT; // % or direct
+ // SvxInterLineSpace InterLineSpace MID_INTER_LINESPACE;
+ // INT16 InterSpace MID_INTER_SPACE;
ExecMethod = ExecParaAttr ;
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index ee5fc431e165..b6f9a0e312b9 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -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
@@ -374,9 +374,9 @@ interface BaseTextEditView
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
/****************************************************/
- /* */
- /* Properties Seitenformat */
- /* */
+ /* */
+ /* Properties Seitenformat */
+ /* */
/****************************************************/
SID_ATTR_PAGE // status()
[
@@ -515,7 +515,7 @@ interface BaseTextEditView
FastCall , Cachable ;
]
- FN_SYNC_LABELS // status(play)
+ FN_SYNC_LABELS // status(play)
[
ExecMethod = Execute ;
]
@@ -623,7 +623,7 @@ interface BaseTextEditView
]
//Extra/Optionen/Ansicht
- //Wird zusammen zum Property ViewSettings
+ //Wird zusammen zum Property ViewSettings
FN_VIEW_HIDDEN_PARA
[
ExecMethod = ExecViewOptions ;
@@ -646,7 +646,7 @@ interface BaseTextEditView
Cachable;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
FN_VIEW_BOUNDS // status()
[
ExecMethod = ExecViewOptions ;
@@ -745,27 +745,27 @@ interface BaseTextEditView
}
interface GlobalContents
-[ uuid = "1FD80520-F517-11d0-AC9B-008029E867C6"; ]
+[ uuid = "1FD80520-F517-11d0-AC9B-008029E867C6"; ]
{
- UINT16 Type FN_COLL_TYPE
+ UINT16 Type FN_COLL_TYPE
(
- UINT16 Position FN_COLL_TYPE
+ UINT16 Position FN_COLL_TYPE
)
[
]
// Bereichsname, Index-Titel oder Leerstring
- String Title FN_COLL_TITLE
+ String Title FN_COLL_TITLE
(
- UINT16 Position FN_COLL_TITLE
+ UINT16 Position FN_COLL_TITLE
)
[
]
// ohne FileName wird ein TextBereich an der Position eingefuegt
- BOOL InsertDocument FN_COLL_ADD
+ BOOL InsertDocument FN_COLL_ADD
(
- UINT16 Position FN_COLL_ADD,
- UINT16 FileName FN_PARAM_1
+ UINT16 Position FN_COLL_ADD,
+ UINT16 FileName FN_PARAM_1
)
[
]
diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi
index 349e17b9d985..629a3713d8d8 100644
--- a/sw/sdi/annotsh.sdi
+++ b/sw/sdi/annotsh.sdi
@@ -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
@@ -57,22 +57,22 @@ interface Annotation : _Annotation
StateMethod = StateDisableItems ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TWAIN_SELECT
[
StateMethod = StateDisableItems ;
]
-
+
SID_TWAIN_TRANSFER
[
StateMethod = StateDisableItems ;
]
-
+
SID_INSERT_GRAPHIC
[
StateMethod = StateDisableItems ;
]
-
+
SID_AUTOSPELL_CHECK
[
ExecMethod = Exec;
@@ -95,42 +95,42 @@ interface Annotation : _Annotation
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
FN_INSERT_HARDHYPHEN // status()
[
ExecMethod = Exec ;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
FN_INSERT_HARD_SPACE // status(final|play)
[
ExecMethod = Exec ;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_INSERT_RLM
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_INSERT_LRM
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_INSERT_ZWSP
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_INSERT_ZWNBSP
[
ExecMethod = Exec ;
@@ -144,7 +144,7 @@ interface Annotation : _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_PARA_RIGHT_TO_LEFT
[
ExecMethod = Exec ;
@@ -158,20 +158,20 @@ interface Annotation : _Annotation
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TEXTDIRECTION_TOP_TO_BOTTOM
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_VERTICALTEXT_STATE
[
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_CTLFONT_STATE
[
StateMethod = GetState ;
@@ -184,98 +184,98 @@ interface Annotation : _Annotation
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_TITLE_CASE
[
ExecMethod = ExecTransliteration;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_TOGGLE_CASE
[
ExecMethod = ExecTransliteration;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_UPPER
[
ExecMethod = ExecTransliteration;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_LOWER
[
ExecMethod = ExecTransliteration;
StateMethod = NoState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_HALFWIDTH
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_FULLWIDTH
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_HIRAGANA
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_TRANSLITERATE_KATAGANA
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_RELIEF
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_LANGUAGE // status(final|play)
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_KERNING // status(final|play)
[
ExecMethod = Exec ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_AUTOKERN // // status(final|play)
[
ExecMethod = Exec ;
- StateMethod = GetState ;
+ StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
[
ExecMethod = Exec ;
@@ -293,22 +293,22 @@ interface Annotation : _Annotation
[
StateMethod = StateDisableItems ;
]
-
+
SID_STYLE_FAMILY2
[
StateMethod = StateDisableItems ;
]
-
+
SID_STYLE_FAMILY3
[
StateMethod = StateDisableItems ;
]
-
+
SID_STYLE_FAMILY4
[
StateMethod = StateDisableItems ;
]
-
+
SID_STYLE_FAMILY5
[
StateMethod = StateDisableItems ;
@@ -318,7 +318,7 @@ interface Annotation : _Annotation
[
StateMethod = StateDisableItems ;
]
-
+
SID_STYLE_UPDATE_BY_EXAMPLE // status()
[
StateMethod = StateDisableItems ;
@@ -352,12 +352,12 @@ interface Annotation : _Annotation
[
StateMethod = StateStatusLine ;
]
-
+
FN_STAT_TEMPLATE
[
StateMethod = StateStatusLine ;
]
-
+
SID_LANGUAGE_STATUS
[
ExecMethod = ExecLingu ;
diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 230d977b0cfc..f274b23fd635 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -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
diff --git a/sw/sdi/beziersh.sdi b/sw/sdi/beziersh.sdi
index 6a2c8289b628..7f429368acc5 100644
--- a/sw/sdi/beziersh.sdi
+++ b/sw/sdi/beziersh.sdi
@@ -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
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 5925edd7528c..9750d0b15d6d 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -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
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 303190e88f2d..d5bdc13314e8 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -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
@@ -51,7 +51,7 @@ interface TextDraw : TextDrawBase
StateMethod = GetDrawAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_DASH_LIST
[
StateMethod = GetDrawAttrState ;
@@ -71,12 +71,12 @@ interface TextDraw : TextDrawBase
[
StateMethod = GetDrawAttrState ;
]
-
+
SID_HATCH_LIST
[
StateMethod = GetDrawAttrState ;
]
-
+
SID_BITMAP_LIST
[
StateMethod = GetDrawAttrState ;
@@ -213,7 +213,7 @@ interface TextDraw : TextDrawBase
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_EXTRUSION_TOOGLE
[
ExecMethod = Execute ;
@@ -248,7 +248,7 @@ interface TextDraw : TextDrawBase
[
ExecMethod = Execute ;
StateMethod = GetState ;
- ]
+ ]
SID_EXTRUSION_DIRECTION_FLOATER
[
ExecMethod = Execute ;
@@ -343,7 +343,7 @@ interface TextDraw : TextDrawBase
[
ExecMethod = Execute ;
StateMethod = GetState ;
- ]
+ ]
SID_INSERT_GRAPHIC
[
StateMethod = StateDisableItems ;
@@ -352,7 +352,7 @@ interface TextDraw : TextDrawBase
[
StateMethod = StateDisableItems ;
]
-
+
SID_TWAIN_TRANSFER
[
StateMethod = StateDisableItems ;
@@ -452,12 +452,12 @@ shell SwDrawShell : SwDrawBaseShell
StateMethod = GetFormTextState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
FN_FORMAT_FOOTNOTE_DLG // status()
[
ExecMethod = Execute;
]
-
+
SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
[
ExecMethod = Execute ;
diff --git a/sw/sdi/drwbassh.sdi b/sw/sdi/drwbassh.sdi
index 7d2ec32f3a8e..693f6d0cd102 100644
--- a/sw/sdi/drwbassh.sdi
+++ b/sw/sdi/drwbassh.sdi
@@ -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
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index d98d368a9460..149344c606b2 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -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
@@ -532,7 +532,7 @@ interface TextDrawText
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
-
+
SID_LANGUAGE_STATUS
[
ExecMethod = Execute;
@@ -551,7 +551,7 @@ interface TextDrawText
[
ExecMethod = Execute ;
]
-
+
SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
[
ExecMethod = Execute ;
@@ -575,7 +575,7 @@ interface TextDrawText
[
StateMethod = StateDisableItems ;
]
-
+
SID_TWAIN_TRANSFER
[
StateMethod = StateDisableItems ;
diff --git a/sw/sdi/formsh.sdi b/sw/sdi/formsh.sdi
index e6058fb40ac0..eff53e4e56ad 100644
--- a/sw/sdi/formsh.sdi
+++ b/sw/sdi/formsh.sdi
@@ -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
diff --git a/sw/sdi/frmsh.sdi b/sw/sdi/frmsh.sdi
index ff0d951eb51f..e43ea0bedf13 100644
--- a/sw/sdi/frmsh.sdi
+++ b/sw/sdi/frmsh.sdi
@@ -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
diff --git a/sw/sdi/grfsh.sdi b/sw/sdi/grfsh.sdi
index 4e6a7675862f..5118a6aa3a0e 100644
--- a/sw/sdi/grfsh.sdi
+++ b/sw/sdi/grfsh.sdi
@@ -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
diff --git a/sw/sdi/listsh.sdi b/sw/sdi/listsh.sdi
index 1acb01fecab7..b2a25dd2de9d 100644
--- a/sw/sdi/listsh.sdi
+++ b/sw/sdi/listsh.sdi
@@ -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
diff --git a/sw/sdi/mediash.sdi b/sw/sdi/mediash.sdi
index 647a02434351..d7f30beca984 100644
--- a/sw/sdi/mediash.sdi
+++ b/sw/sdi/mediash.sdi
@@ -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
diff --git a/sw/sdi/olesh.sdi b/sw/sdi/olesh.sdi
index c10717b945a9..0135b5e1db07 100644
--- a/sw/sdi/olesh.sdi
+++ b/sw/sdi/olesh.sdi
@@ -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
diff --git a/sw/sdi/swinterf.c b/sw/sdi/swinterf.c
index 74eb8efdbdba..a9983a268db9 100644
--- a/sw/sdi/swinterf.c
+++ b/sw/sdi/swinterf.c
@@ -2,7 +2,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
@@ -88,7 +88,7 @@ short SwGotoNextTable (void *pHandle)
}
/* WRITER */
-short SwGotoPrevTable (void *pHandle)
+short SwGotoPrevTable (void *pHandle)
{
return 0;
}
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index f2595aa104df..10043b33f6ab 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -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
diff --git a/sw/sdi/swslots.hrc b/sw/sdi/swslots.hrc
index c4be8f9559fc..041b5319facc 100644
--- a/sw/sdi/swslots.hrc
+++ b/sw/sdi/swslots.hrc
@@ -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
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 0b59ebb0c211..eb43955b8fcb 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -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
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index 3e112a9ff11f..0cd70ec8ce82 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -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
diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi
index cd321d95d1bf..f91b3e562a76 100644
--- a/sw/sdi/textsh.sdi
+++ b/sw/sdi/textsh.sdi
@@ -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
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 1005c96040a1..bd72740b5e54 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -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
@@ -146,10 +146,10 @@ shell SwView
{
import TextEditView [Automation];
-// import TextPage "Page";
-// import SearchSettings;
-// import SearchAttributes;
-// import ReplaceAttributes;
+// import TextPage "Page";
+// import SearchSettings;
+// import SearchAttributes;
+// import ReplaceAttributes;
}
interface TextPrintPreview
diff --git a/sw/sdi/wbasesh.sdi b/sw/sdi/wbasesh.sdi
index 59328cb69dd7..ad6e51ac2808 100644
--- a/sw/sdi/wbasesh.sdi
+++ b/sw/sdi/wbasesh.sdi
@@ -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
diff --git a/sw/sdi/wbeziers.sdi b/sw/sdi/wbeziers.sdi
index 41eeadb6b9e0..7e1cd48fe163 100644
--- a/sw/sdi/wbeziers.sdi
+++ b/sw/sdi/wbeziers.sdi
@@ -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
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index df1b60ecbc62..da4748cbeb44 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -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
diff --git a/sw/sdi/wdrwbase.sdi b/sw/sdi/wdrwbase.sdi
index 990475298c0a..f1d96dd888b0 100644
--- a/sw/sdi/wdrwbase.sdi
+++ b/sw/sdi/wdrwbase.sdi
@@ -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
diff --git a/sw/sdi/wformsh.sdi b/sw/sdi/wformsh.sdi
index 497008033eba..da70c1957184 100644
--- a/sw/sdi/wformsh.sdi
+++ b/sw/sdi/wformsh.sdi
@@ -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
diff --git a/sw/sdi/wfrmsh.sdi b/sw/sdi/wfrmsh.sdi
index b5d87c8cfc4b..35f2e660edeb 100644
--- a/sw/sdi/wfrmsh.sdi
+++ b/sw/sdi/wfrmsh.sdi
@@ -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
diff --git a/sw/sdi/wgrfsh.sdi b/sw/sdi/wgrfsh.sdi
index 19384e7983e2..8be0befce1e3 100644
--- a/sw/sdi/wgrfsh.sdi
+++ b/sw/sdi/wgrfsh.sdi
@@ -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
diff --git a/sw/sdi/wlistsh.sdi b/sw/sdi/wlistsh.sdi
index a6777b9c01ee..5b707320cb92 100644
--- a/sw/sdi/wlistsh.sdi
+++ b/sw/sdi/wlistsh.sdi
@@ -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
diff --git a/sw/sdi/wolesh.sdi b/sw/sdi/wolesh.sdi
index 29497a61a407..27049790f63a 100644
--- a/sw/sdi/wolesh.sdi
+++ b/sw/sdi/wolesh.sdi
@@ -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
diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi
index 9786eb38daf1..515268d3ac2a 100644
--- a/sw/sdi/wrtapp.sdi
+++ b/sw/sdi/wrtapp.sdi
@@ -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
@@ -52,7 +52,7 @@ interface StarWriter
DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR";
]
- FN_XFORMS_INIT // #i31958#
+ FN_XFORMS_INIT // #i31958#
[
ExecMethod = ExecOther ;
StateMethod = StateOther ;
@@ -69,7 +69,7 @@ interface StarWriter
ExecMethod = ExecOther ;
StateMethod = StateOther ;
]
-
+
FN_MAILMERGE_WIZARD
[
ExecMethod = ExecOther ;
diff --git a/sw/sdi/wtabsh.sdi b/sw/sdi/wtabsh.sdi
index ee2ae7503e9f..f91a363131ff 100644
--- a/sw/sdi/wtabsh.sdi
+++ b/sw/sdi/wtabsh.sdi
@@ -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
diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi
index 42d6a9e69cdd..3345baa4c211 100644
--- a/sw/sdi/wtextsh.sdi
+++ b/sw/sdi/wtextsh.sdi
@@ -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
diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi
index 9d0ebde9c800..ac08b00ebd2f 100644
--- a/sw/sdi/wviewsh.sdi
+++ b/sw/sdi/wviewsh.sdi
@@ -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
@@ -63,10 +63,10 @@ interface WebEditView : BaseTextEditView
shell SwWebView
{
import WebEditView [Automation];
-// import SearchSettings;
-// import TextPage "Page";
-// import SearchAttributes;
-// import ReplaceAttributes;
+// import SearchSettings;
+// import TextPage "Page";
+// import SearchAttributes;
+// import ReplaceAttributes;
}
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index cad245d97bb8..73c19f2eaf87 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index b3a1d4381be4..8d28fbf9b49b 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 0983f8ccc4d1..05385a40dbac 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -34,13 +34,13 @@
class SwCellFrm;
class SwFrmFmt;
-class SwAccessibleCell : public SwAccessibleContext,
+class SwAccessibleCell : public SwAccessibleContext,
::com::sun::star::accessibility::XAccessibleValue
{
- sal_Bool bIsSelected; // protected by base class mutex
+ sal_Bool bIsSelected; // protected by base class mutex
- sal_Bool IsSelected();
+ sal_Bool IsSelected();
sal_Bool _InvalidateMyCursorPos();
sal_Bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
@@ -59,24 +59,24 @@ public:
SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor(); // required by map to remember that object
//===== XAccessibleContext ==============================================
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 979157ad0644..127820fe1ffa 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -2,7 +2,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
@@ -1550,7 +1550,7 @@ void lcl_SwAccessibleContext_DbgMsg( SwAccessibleContext *pThisAcc,
sal_Bool bConstrDestr )
{
static SvFileStream aStrm( String::CreateFromAscii("j:\\acc.log"),
- STREAM_WRITE|STREAM_TRUNC|STREAM_SHARE_DENYNONE );
+ STREAM_WRITE|STREAM_TRUNC|STREAM_SHARE_DENYNONE );
ByteString aName( String(pThisAcc->GetName()),
RTL_TEXTENCODING_ISO_8859_1 );
if( aName.Len() )
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 5bb7159e9066..43612ebaed2d 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -2,7 +2,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
@@ -75,17 +75,17 @@ protected:
private:
- ::rtl::OUString sName; // immutable outside constructor
+ ::rtl::OUString sName; // immutable outside constructor
// The parent if it has been retrieved. This is always an
// SwAccessibleContext. (protected by Mutex)
::com::sun::star::uno::WeakReference <
::com::sun::star::accessibility::XAccessible > xWeakParent;
- SwAccessibleMap *pMap; // must be protected by solar mutex
+ SwAccessibleMap *pMap; // must be protected by solar mutex
sal_uInt32 nClientId; // client id in the AccessibleEventNotifier queue
- sal_Int16 nRole; // immutable outside constructor
+ sal_Int16 nRole; // immutable outside constructor
// The current states (protected by mutex)
sal_Bool bIsShowingState : 1;
@@ -215,60 +215,60 @@ public:
//===== XAccessible =====================================================
- /// Return the XAccessibleContext.
+ /// Return the XAccessibleContext.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException);
//===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
- /// Return a reference to the parent.
+ /// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this objects index among the parents children.
- virtual sal_Int32 SAL_CALL
+ /// Return this objects index among the parents children.
+ virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's role.
+ /// Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return NULL to indicate that an empty relation set.
+ /// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return the parents locale or throw exception if this object has no
+ /** Return the parents locale or throw exception if this object has no
parent yet/anymore.
*/
virtual ::com::sun::star::lang::Locale SAL_CALL
@@ -321,13 +321,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
@@ -409,7 +409,7 @@ public:
const ::rtl::OUString& GetName() const { return sName; }
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor(); // required by map to remember that object
sal_Bool Select( SwPaM *pPaM, SdrObject *pObj, sal_Bool bAdd );
inline sal_Bool Select( SwPaM& rPaM )
@@ -432,29 +432,29 @@ public:
const sal_Char sDefunc[] = "object is defunctional";
const sal_Char sMissingWindow[] = "window is missing";
-#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \
- ::com::sun::star::uno::Reference < ifc > xThis( this ); \
+#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \
+ ::com::sun::star::uno::Reference < ifc > xThis( this ); \
::com::sun::star::uno::RuntimeException aExcept( \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(msg) ), xThis ); \
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(msg) ), xThis ); \
throw aExcept;
-#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
- if( !(GetFrm() && GetMap()) ) \
- { \
- ::com::sun::star::uno::Reference < ifc > xThis( ths ); \
- ::com::sun::star::lang::DisposedException aExcept( \
+#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
+ if( !(GetFrm() && GetMap()) ) \
+ { \
+ ::com::sun::star::uno::Reference < ifc > xThis( ths ); \
+ ::com::sun::star::lang::DisposedException aExcept( \
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(sDefunc) ), \
- xThis ); \
- throw aExcept; \
+ xThis ); \
+ throw aExcept; \
}
-#define CHECK_FOR_DEFUNC( ifc ) \
+#define CHECK_FOR_DEFUNC( ifc ) \
CHECK_FOR_DEFUNC_THIS( ifc, this )
-#define CHECK_FOR_WINDOW( i, w ) \
- if( !(w) ) \
- { \
- THROW_RUNTIME_EXCEPTION( i, sMissingWindow ); \
+#define CHECK_FOR_WINDOW( i, w ) \
+ if( !(w) ) \
+ { \
+ THROW_RUNTIME_EXCEPTION( i, sMissingWindow ); \
}
#endif
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 956198146914..e7b8e8b43141 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -432,7 +432,7 @@ uno::Any SwAccessibleDocument::queryInterface(
}
//====== XTypeProvider ====================================================
-uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
+uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
throw(uno::RuntimeException)
{
uno::Sequence< uno::Type > aTypes( SwAccessibleDocumentBase::getTypes() );
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 082ac329e480..05f061358f1f 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@ class VclSimpleEvent;
* base class for SwAccessibleDocument (in this same header file) and
* SwAccessiblePreview
*/
-class SwAccessibleDocumentBase : public SwAccessibleContext
+class SwAccessibleDocumentBase : public SwAccessibleContext
{
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> mxParent;
@@ -61,27 +61,27 @@ public:
//===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
- /// Return a reference to the parent.
+ /// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this objects index among the parents children.
- virtual sal_Int32 SAL_CALL
+ /// Return this objects index among the parents children.
+ virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
@@ -113,7 +113,7 @@ public:
/**
* access to an accessible Writer document
*/
-class SwAccessibleDocument : public SwAccessibleDocumentBase,
+class SwAccessibleDocument : public SwAccessibleDocumentBase,
public com::sun::star::accessibility::XAccessibleSelection
{
// Implementation for XAccessibleSelection interface
@@ -135,13 +135,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 5ccbc03f3339..18808e2e80a4 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 94f8e2d43c20..c1376afa909f 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -2,7 +2,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
@@ -43,13 +43,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 2efd6cf6d78f..6cfea848696c 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
SwAccessibleMap* pInitMap,
sal_Bool bIsEndnote,
sal_Int32 nFootEndNote,
- const SwFtnFrm *pFtnFrm ) :
+ const SwFtnFrm *pFtnFrm ) :
SwAccessibleContext( pInitMap,
bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
pFtnFrm )
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 521247685a16..eae0820dcbd2 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -52,20 +52,20 @@ public:
//===== XAccessibleContext ==============================================
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 5ab12b068678..f9c77e2a0e26 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index 4f0b17d0898e..780249f72b9e 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -37,9 +37,9 @@ class SwFlyFrm;
class SwAccessibleFrameBase : public SwAccessibleContext,
public SwClient
{
- sal_Bool bIsSelected; // protected by base class mutex
+ sal_Bool bIsSelected; // protected by base class mutex
- sal_Bool IsSelected();
+ sal_Bool IsSelected();
protected:
@@ -59,7 +59,7 @@ public:
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor(); // required by map to remember that object
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 4c389e2f85c1..d6ba4ee9ff6d 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 18c0f67b68dc..e9c9ef0c7a6c 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
#define _ACCGRAPHIC_HXX
#include "accnotextframe.hxx"
-class SwAccessibleGraphic : public SwAccessibleNoTextFrame
+class SwAccessibleGraphic : public SwAccessibleNoTextFrame
{
protected:
@@ -43,13 +43,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 6472f75e9fe5..c1e2697116b7 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 210657e7602a..4d72923c752d 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
class SwHeaderFrm;
class SwFooterFrm;
-class SwAccessibleHeaderFooter : public SwAccessibleContext
+class SwAccessibleHeaderFooter : public SwAccessibleContext
{
protected:
@@ -49,20 +49,20 @@ public:
//===== XAccessibleContext ==============================================
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 6b239b04e0e2..96fd0c70bf57 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -2,7 +2,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
@@ -70,13 +70,13 @@ const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
// XAccessibleAction
-sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount()
+sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount()
throw (uno::RuntimeException)
{
return isValid() ? 1 : 0;
}
-sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
+sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
}
OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
- sal_Int32 nIndex )
+ sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
OUString sDesc;
@@ -127,7 +127,7 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
}
uno::Reference< XAccessibleKeyBinding > SAL_CALL
- SwAccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex )
+ SwAccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
uno::Reference< XAccessibleKeyBinding > xKeyBinding;
@@ -151,32 +151,32 @@ uno::Reference< XAccessibleKeyBinding > SAL_CALL
// XAccessibleHyperlink
uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionAnchor(
- sal_Int32 /*nIndex*/ )
+ sal_Int32 /*nIndex*/ )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
return uno::Any();
}
-uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
- sal_Int32 /*nIndex*/ )
+uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
+ sal_Int32 /*nIndex*/ )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
return uno::Any();
}
-sal_Int32 SAL_CALL SwAccessibleHyperlink::getStartIndex()
+sal_Int32 SAL_CALL SwAccessibleHyperlink::getStartIndex()
throw (uno::RuntimeException)
{
return nStartIdx;
}
-sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex()
+sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex()
throw (uno::RuntimeException)
{
return nEndIdx;
}
-sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
+sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index ecbaff3ec383..2907f20c8f03 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ class SwAccessibleHyperlink :
SwAccessibleHyperlink( sal_uInt16 nHintPos,
SwAccessibleParagraph *p,
- sal_Int32 nStt, sal_Int32 nEnd );
+ sal_Int32 nStt, sal_Int32 nEnd );
const SwTxtAttr *GetTxtAttr() const;
void Invalidate();
diff --git a/sw/source/core/access/acchypertextdata.cxx b/sw/source/core/access/acchypertextdata.cxx
index 2e233522aa64..39ac794174e9 100644
--- a/sw/source/core/access/acchypertextdata.cxx
+++ b/sw/source/core/access/acchypertextdata.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index d3d49e4e211b..91ce303275ab 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
class SwTxtAttr;
namespace com { namespace sun { namespace star {
- namespace accessibility { class XAccessibleHyperlink; }
+ namespace accessibility { class XAccessibleHyperlink; }
} } }
typedef ::std::less< const SwTxtAttr * > SwTxtAttrPtrLess;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f8215eac6e9f..3c9a7d6794d9 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2,7 +2,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
@@ -124,7 +124,7 @@ public:
virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException);
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
void Dispose();
};
@@ -318,13 +318,13 @@ public:
INVALID_ATTR };
private:
- SwRect maOldBox; // the old bounds for CHILD_POS_CHANGED
+ SwRect maOldBox; // the old bounds for CHILD_POS_CHANGED
// and POS_CHANGED
- uno::WeakReference < XAccessible > mxAcc; // The object that fires the event
+ uno::WeakReference < XAccessible > mxAcc; // The object that fires the event
SwAccessibleChild maFrmOrObj; // the child for CHILD_POS_CHANGED and
// the same as xAcc for any other
// event type
- EventType meType; // The event type
+ EventType meType; // The event type
tAccessibleStates mnStates; // check states or update caret pos
SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& );
@@ -1583,7 +1583,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" );
if( pOldAccImpl->GetFrm() == pFrm )
{
- xOldAcc.clear(); // get an empty ref
+ xOldAcc.clear(); // get an empty ref
mxCursorContext = xOldAcc;
}
}
@@ -1954,7 +1954,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
osl::MutexGuard aGuard( maMutex );
xOldAcc = mxCursorContext;
- mxCursorContext = xAcc; // clear reference
+ mxCursorContext = xAcc; // clear reference
bOldShapeSelected = mbShapeSelected;
mbShapeSelected = bShapeSelected;
@@ -1985,9 +1985,9 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
AreInSameTable( xOldAcc, aFrmOrObj.GetSwFrm() ) )
{
if( xAcc.is() )
- xOldAcc = xAcc; // avoid extra invalidation
+ xOldAcc = xAcc; // avoid extra invalidation
else
- xAcc = xOldAcc; // make sure ate least one
+ xAcc = xOldAcc; // make sure ate least one
}
if( !xAcc.is() )
xAcc = GetContext( aFrmOrObj.GetSwFrm(), sal_True );
@@ -2402,7 +2402,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
const uno::Reference< drawing::XShape >& _rxShape,
const long /*_nIndex*/,
const ::accessibility::AccessibleShapeTreeInfo& /*_rShapeTreeInfo*/
- ) throw (uno::RuntimeException)
+ ) throw (uno::RuntimeException)
{
const SdrObject *pObj = 0;
{
@@ -2432,7 +2432,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
// hold it.
// Also get keep parent.
uno::Reference < XAccessible > xParent( pCurrentChild->getAccessibleParent() );
- pCurrentChild = 0; // well be realease by dispose
+ pCurrentChild = 0; // well be realease by dispose
Dispose( 0, pObj, 0 );
{
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 29652810c624..7b6e5864d892 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 275d96ed81d5..1ee13d61ce56 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -2,7 +2,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
@@ -33,10 +33,10 @@
class SwFlyFrm;
class SwNoTxtNode;
-class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
+class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
public ::com::sun::star::accessibility::XAccessibleImage
{
- SwDepend aDepend;
+ SwDepend aDepend;
// --> OD 2009-07-14 #i73249#
::rtl::OUString msTitle;
// <--
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 2b5886e026d2..cd1dc8a02ac4 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index ebb96cf8948f..690bf12acfe2 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -2,7 +2,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
@@ -40,9 +40,9 @@
*/
class SwAccessiblePage : public SwAccessibleContext
{
- sal_Bool bIsSelected; // protected by base class mutex
+ sal_Bool bIsSelected; // protected by base class mutex
- sal_Bool IsSelected();
+ sal_Bool IsSelected();
using SwAccessibleFrame::GetBounds;
@@ -91,7 +91,7 @@ public:
//===== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor(); // required by map to remember that object
};
#endif
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 05c2dce8011a..9b1038acc26f 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -2,7 +2,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
@@ -76,7 +76,7 @@ class SwAccessibleParagraph :
{
friend class SwAccessibleHyperlink;
- ::rtl::OUString sDesc; // protected by base classes mutex
+ ::rtl::OUString sDesc; // protected by base classes mutex
/// data for this paragraph's text portions; this contains the
/// mapping from the core 'model string' to the accessible text
@@ -86,11 +86,11 @@ class SwAccessibleParagraph :
SwAccessiblePortionData* pPortionData;
SwAccessibleHyperTextData *pHyperTextData;
- sal_Int32 nOldCaretPos; // The 'old' caret pos. It's only valid as long
+ sal_Int32 nOldCaretPos; // The 'old' caret pos. It's only valid as long
// as the cursor is inside this object (protected by
// mutex)
- sal_Bool bIsHeading; // protected by base classes mutex
+ sal_Bool bIsHeading; // protected by base classes mutex
// implementation for XAccessibleSelection
SwAccessibleSelectionHelper aSelectionHelper;
@@ -242,7 +242,7 @@ public:
inline operator ::com::sun::star::accessibility::XAccessibleText *();
- virtual sal_Bool HasCursor(); // required by map to remember that object
+ virtual sal_Bool HasCursor(); // required by map to remember that object
// --> OD 2010-02-19 #i108125#
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew);
@@ -250,12 +250,12 @@ public:
//===== XAccessibleContext ==============================================
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
- /** Return the parents locale or throw exception if this object has no
+ /** Return the parents locale or throw exception if this object has no
parent yet/anymore.
*/
virtual ::com::sun::star::lang::Locale SAL_CALL
@@ -286,13 +286,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 65119ef1710a..bf1d21407296 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index ec06580af634..1a58ae123e4b 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 20538d9ab97f..dd0ef1aab786 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index 589811e927c9..d976efefa114 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -2,7 +2,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
@@ -32,13 +32,13 @@
/**
* accessibility implementation for the page preview.
- * The children of the page preview are the pages that are visible in the
+ * The children of the page preview are the pages that are visible in the
* preview.
*
- * The vast majority of the implemention logic is inherited from
+ * The vast majority of the implemention logic is inherited from
* SwAccessibleDocumentBase.
*/
-class SwAccessiblePreview : public SwAccessibleDocumentBase
+class SwAccessiblePreview : public SwAccessibleDocumentBase
{
virtual ~SwAccessiblePreview();
@@ -50,13 +50,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 93753fdeb5d1..acb2bcd8427d 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -85,7 +85,7 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException()
Reference < XAccessibleSelection >xSelThis( xThis, UNO_QUERY );
lang::IndexOutOfBoundsException aExcept(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("index out of bounds") ),
- xSelThis ); \
+ xSelThis ); \
throw aExcept;
}
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 73c84703386f..502ec819e860 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 1454075df979..28e01cd65777 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -84,10 +84,10 @@ public:
class SwAccessibleTableData_Impl
{
SwAccessibleMap& mrAccMap;
- Int32Set_Impl maRows;
- Int32Set_Impl maColumns;
- Int32PairList_Impl maExtents; // cell extends for event processing only
- Point maTabFrmPos;
+ Int32Set_Impl maRows;
+ Int32Set_Impl maColumns;
+ Int32PairList_Impl maExtents; // cell extends for event processing only
+ Point maTabFrmPos;
const SwTabFrm *mpTabFrm;
sal_Bool mbIsInPagePreview;
bool mbOnlyTableColumnHeader;
@@ -226,7 +226,7 @@ void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
sal_Bool SwAccessibleTableData_Impl::FindCell(
const Point& rPos, const SwFrm *pFrm, sal_Bool bExact,
- const SwFrm *& rRet ) const
+ const SwFrm *& rRet ) const
{
sal_Bool bFound = sal_False;
@@ -302,7 +302,7 @@ void SwAccessibleTableData_Impl::GetSelection(
const_cast< SwTableBox *>( pCFrm->GetTabBox() ); //SVPtrArr!
if( !rSelBoxes.Seek_Entry( pBox ) )
{
- const Int32Set_Impl rRowsOrCols =
+ const Int32Set_Impl rRowsOrCols =
bColumns ? maColumns : maRows;
sal_Int32 nPos = bColumns ? (rBox.Left() - rTabPos.X())
@@ -1483,7 +1483,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
// SwPaM* pPaM = pCrsrShell->GetCrsr();
// pPaM->DeleteMark();
// *(pPaM->GetPoint()) = SwPosition( *pStartNode );
-// pPaM->Move( fnMoveForward, fnGoNode );
+// pPaM->Move( fnMoveForward, fnGoNode );
// // pCrsrShell->SelTblBox();
pCrsrShell->StartAction();
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 0ea33d1f69f0..7bff387b6092 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -47,8 +47,8 @@ class SwAccessibleTable :
public ::com::sun::star::accessibility::XAccessibleSelection,
public SwClient
{
- SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex
- ::rtl::OUString sDesc;
+ SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex
+ ::rtl::OUString sDesc;
const SwSelBoxes *GetSelBoxes() const;
void FireTableChangeEvent( const SwAccessibleTableData_Impl& rTableData );
@@ -118,7 +118,7 @@ public:
//===== XAccessibleContext ==============================================
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
@@ -195,13 +195,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 4383c1f7dfdc..8d520323eda2 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index 9462e0d04c58..e8d0bd47cc9e 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -2,7 +2,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
@@ -69,13 +69,13 @@ public:
//===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index c8e09da350db..e49054879a4e 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index e42e79041985..447959971f5d 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 246b7ecfda4b..6381df188ef1 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <hintids.hxx> // fuer RES_..
+#include <hintids.hxx> // fuer RES_..
#include <frame.hxx>
#include <hints.hxx>
#include <swcache.hxx>
@@ -42,14 +42,14 @@
static SwClientIter* pClientIters = 0;
-TYPEINIT0(SwClient); //rtti
+TYPEINIT0(SwClient); //rtti
/*************************************************************************
-|* SwClient::SwClient(SwModify *)
+|* SwClient::SwClient(SwModify *)
|*
-|* Beschreibung callback.doc V1.14
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung MA 20. Mar. 95
+|* Beschreibung callback.doc V1.14
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung MA 20. Mar. 95
*************************************************************************/
@@ -67,11 +67,11 @@ SwClient::SwClient(SwModify *pToRegisterIn)
}
/*************************************************************************
-|* SwClient::Modify()
+|* SwClient::Modify()
|*
-|* Beschreibung callback.doc V1.14
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung VB 20.03.91
+|* Beschreibung callback.doc V1.14
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung VB 20.03.91
*************************************************************************/
@@ -94,11 +94,11 @@ void SwClient::Modify( SfxPoolItem *pOld, SfxPoolItem * )
}
/*************************************************************************
-|* SwClient::~SwClient()
+|* SwClient::~SwClient()
|*
-|* Beschreibung callback.doc V1.14
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung MA 25. Jan. 94
+|* Beschreibung callback.doc V1.14
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung MA 25. Jan. 94
*************************************************************************/
@@ -114,15 +114,15 @@ SwClient::~SwClient()
// erfrage vom Client Informationen
BOOL SwClient::GetInfo( SfxPoolItem& ) const
{
- return TRUE; // und weiter
+ return TRUE; // und weiter
}
/*************************************************************************
-|* SwModify::SwModify( SwModify * )
+|* SwModify::SwModify( SwModify * )
|*
-|* Beschreibung Dokument 1.7
-|* Ersterstellung JP 20.11.90
-|* Letzte Aenderung VB 20.03.91
+|* Beschreibung Dokument 1.7
+|* Ersterstellung JP 20.11.90
+|* Letzte Aenderung VB 20.03.91
*************************************************************************/
@@ -139,11 +139,11 @@ SwModify::SwModify( const SwModify & )
}
/*************************************************************************
-|* SwModify::~SwModify()
+|* SwModify::~SwModify()
|*
-|* Beschreibung Dokument 1.7
-|* Ersterstellung JP 20.11.90
-|* Letzte Aenderung JP 15.04.94
+|* Beschreibung Dokument 1.7
+|* Ersterstellung JP 20.11.90
+|* Letzte Aenderung JP 15.04.94
*************************************************************************/
@@ -166,7 +166,7 @@ SwModify::~SwModify()
while( 0 != ( p = aIter++ ) )
p->pRegisteredIn = 0;
- p = aIter.GoRoot(); // wieder ab Root (==Start) anfangen
+ p = aIter.GoRoot(); // wieder ab Root (==Start) anfangen
do {
p->pRegisteredIn = 0;
} while( 0 != ( p = aIter-- ) );
@@ -186,11 +186,11 @@ SwModify::~SwModify()
}
/*************************************************************************
-|* SwModify::Modify( SwHint * pOldValue, SwHint * pNewValue )
+|* SwModify::Modify( SwHint * pOldValue, SwHint * pNewValue )
|*
-|* Beschreibung Dokument 1.7
-|* Ersterstellung JP 20.11.90
-|* Letzte Aenderung MA 20. Mar. 95
+|* Beschreibung Dokument 1.7
+|* Ersterstellung JP 20.11.90
+|* Letzte Aenderung MA 20. Mar. 95
*************************************************************************/
@@ -236,11 +236,11 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
SwClientIter aIter( *this );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do
{
pLast->Modify( pOldValue, pNewValue );
- if( !pRoot ) // Baum schon Weg ??
+ if( !pRoot ) // Baum schon Weg ??
break;
} while( 0 != ( pLast = aIter++ ));
@@ -252,7 +252,7 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
BOOL SwModify::GetInfo( SfxPoolItem& rInfo ) const
{
- BOOL bRet = TRUE; // bedeutet weiter zum naechsten
+ BOOL bRet = TRUE; // bedeutet weiter zum naechsten
if( pRoot )
{
@@ -265,15 +265,15 @@ BOOL SwModify::GetInfo( SfxPoolItem& rInfo ) const
;
}
- return bRet; // und weiter
+ return bRet; // und weiter
}
/*************************************************************************
-|* SwModify::Add( SwClient *pDepend )
+|* SwModify::Add( SwClient *pDepend )
|*
-|* Beschreibung Dokument 1.7
-|* Ersterstellung JP 20.11.90
-|* Letzte Aenderung JP 14.09.94
+|* Beschreibung Dokument 1.7
+|* Ersterstellung JP 20.11.90
+|* Letzte Aenderung JP 14.09.94
*************************************************************************/
@@ -319,11 +319,11 @@ void SwModify::Add(SwClient *pDepend)
}
/*************************************************************************
-|* SwModify::_Remove( SwClient *pDepend )
+|* SwModify::_Remove( SwClient *pDepend )
|*
-|* Beschreibung Dokument 1.7
-|* Ersterstellung JP 20.11.90
-|* Letzte Aenderung JP 14.09.94
+|* Beschreibung Dokument 1.7
+|* Ersterstellung JP 20.11.90
+|* Letzte Aenderung JP 14.09.94
*************************************************************************/
@@ -376,10 +376,10 @@ SwClient *SwModify::_Remove(SwClient * pDepend)
/*************************************************************************
-|* SwModify::CheckCaching( const USHORT nWhich )
+|* SwModify::CheckCaching( const USHORT nWhich )
|*
-|* Ersterstellung JP 25.06.95
-|* Letzte Aenderung JP 25.06.95
+|* Ersterstellung JP 25.06.95
+|* Letzte Aenderung JP 25.06.95
*************************************************************************/
@@ -420,11 +420,11 @@ void SwModify::CheckCaching( const USHORT nWhich )
// ----------
/*************************************************************************
-|* SwDepend::SwDepend(SwClient *pTellHim,SwModify *pDepend)
+|* SwDepend::SwDepend(SwClient *pTellHim,SwModify *pDepend)
|*
-|* Beschreibung callback.doc V1.14
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung VB 20.03.91
+|* Beschreibung callback.doc V1.14
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung VB 20.03.91
*************************************************************************/
@@ -436,11 +436,11 @@ SwDepend::SwDepend(SwClient *pTellHim, SwModify *pDepend)
/*************************************************************************
|*
-|* SwDepend::Modify(SwHint *, SwHint *)
+|* SwDepend::Modify(SwHint *, SwHint *)
|*
-|* Beschreibung callback.doc V1.14
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung VB 20.03.91
+|* Beschreibung callback.doc V1.14
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung VB 20.03.91
|*
*************************************************************************/
@@ -568,7 +568,7 @@ SwClient* SwClientIter::operator--()
}
-SwClient* SwClientIter::GoStart() // zum Anfang des Baums
+SwClient* SwClientIter::GoStart() // zum Anfang des Baums
{
pAkt = rRoot.pRoot;
if( pAkt )
@@ -579,7 +579,7 @@ SwClient* SwClientIter::GoStart() // zum Anfang des Baums
}
-SwClient* SwClientIter::GoEnd() // zum End des Baums
+SwClient* SwClientIter::GoEnd() // zum End des Baums
{
pAkt = pDelNext;
if( !pAkt )
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 4260cb2391ed..21a281a0a2a8 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <rtl/math.hxx>
-#include <hintids.hxx> // fuer RES_..
+#include <hintids.hxx> // fuer RES_..
#include <cellatr.hxx>
#include <calc.hxx>
#include <format.hxx>
@@ -45,7 +45,7 @@
-//TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
+//TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
/*************************************************************************
|*
@@ -105,8 +105,8 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
// suche den Node, in dem die Formel steht:
- // TextFeld -> TextNode,
- // BoxAttribut -> BoxStartNode
+ // TextFeld -> TextNode,
+ // BoxAttribut -> BoxStartNode
// !!! MUSS VON JEDER ABLEITUNG UEBERLADEN WERDEN !!!
const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
{
@@ -157,10 +157,10 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
case TBL_CALC:
// setze das Value-Flag zurueck
// JP 17.06.96: interne Darstellung auf alle Formeln
- // (Referenzen auf andere Tabellen!!!)
-// if( VF_CMD & pFld->GetFormat() )
-// pFld->PtrToBoxNm( pUpdtFld->pTbl );
-// else
+ // (Referenzen auf andere Tabellen!!!)
+// if( VF_CMD & pFld->GetFormat() )
+// pFld->PtrToBoxNm( pUpdtFld->pTbl );
+// else
ChgValid( FALSE );
break;
case TBL_BOXNAME:
@@ -172,7 +172,7 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
case TBL_BOXPTR:
// zur internen Darstellung
// JP 17.06.96: interne Darstellung auf alle Formeln
- // (Referenzen auf andere Tabellen!!!)
+ // (Referenzen auf andere Tabellen!!!)
BoxNmToPtr( &pTblNd->GetTable() );
break;
case TBL_RELBOXNAME:
@@ -219,7 +219,7 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
{
- if( !rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
+ if( !rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
{
// erzeuge aus den BoxNamen die Pointer
BoxNmToPtr( rCalcPara.pTbl );
@@ -228,7 +228,7 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
else
rValue = DBL_MAX;
- ChgValid( !rCalcPara.IsStackOverFlow() ); // der Wert ist wieder gueltig
+ ChgValid( !rCalcPara.IsStackOverFlow() ); // der Wert ist wieder gueltig
}
}
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index b51d15be5cc3..3f99644a7c2b 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index d7e50547f509..49de186fde4f 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index d9acc6b71bea..9b4aaceae402 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -2,7 +2,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
@@ -30,18 +30,18 @@
#include "precompiled_sw.hxx"
-#include <hintids.hxx> // fuer RES_..
-#include <frame.hxx> // fuer AttrCache
+#include <hintids.hxx> // fuer RES_..
+#include <frame.hxx> // fuer AttrCache
#include <format.hxx>
-#include <hints.hxx> // fuer SwFmtChg
+#include <hints.hxx> // fuer SwFmtChg
#include <doc.hxx>
-#include <paratr.hxx> // fuer SwParaFmt - SwHyphenBug
+#include <paratr.hxx> // fuer SwParaFmt - SwHyphenBug
#include <swcache.hxx>
// --> OD 2006-11-22 #i71574#
#include <fmtcolfunc.hxx>
// <--
-TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
+TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt
/*************************************************************************
|* SwFmt::SwFmt
@@ -109,7 +109,7 @@ SwFmt::SwFmt( const SwFmt& rFmt )
/*************************************************************************
|* SwFmt &SwFmt::operator=(const SwFmt& aFmt)
|*
-|* Beschreibung Dokument 1.14
+|* Beschreibung Dokument 1.14
|* Ersterstellung JP 22.11.90
|* Letzte Aenderung JP 05.08.94
*************************************************************************/
@@ -187,10 +187,10 @@ void SwFmt::SetName( const String& rNewName, sal_Bool bBroadcast )
* Basis-Klasse auf 0 defaultet ist.
*
* Zusatz: JP 8.4.1994
- * Wird ueber Dokumentgrenzen kopiert, so muss das neue Dokument
- * mit angeben werden, in dem this steht. Z.Z. ist das fuers
- * DropCaps wichtig, dieses haelt Daten, die tief kopiert werden
- * muessen !!
+ * Wird ueber Dokumentgrenzen kopiert, so muss das neue Dokument
+ * mit angeben werden, in dem this steht. Z.Z. ist das fuers
+ * DropCaps wichtig, dieses haelt Daten, die tief kopiert werden
+ * muessen !!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
@@ -208,9 +208,9 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, BOOL bReplace )
// Sonderbehandlung fuer einige Attribute
SwAttrSet* pChgSet = (SwAttrSet*)&rFmt.aSet;
- if( !bReplace ) // nur die neu, die nicht gesetzt sind ??
+ if( !bReplace ) // nur die neu, die nicht gesetzt sind ??
{
- if( pChgSet == (SwAttrSet*)&rFmt.aSet ) // Set hier kopieren
+ if( pChgSet == (SwAttrSet*)&rFmt.aSet ) // Set hier kopieren
pChgSet = new SwAttrSet( rFmt.aSet );
pChgSet->Differentiate( aSet );
}
@@ -230,18 +230,18 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, BOOL bReplace )
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
- if( pChgSet != (SwAttrSet*)&rFmt.aSet ) // Set hier angelegt ?
+ if( pChgSet != (SwAttrSet*)&rFmt.aSet ) // Set hier angelegt ?
delete pChgSet;
}
/*************************************************************************
|* SwFmt::~SwFmt()
|*
-|* Beschreibung Dokument 1.14
+|* Beschreibung Dokument 1.14
|* Ersterstellung JP 22.11.90
|* Letzte Aenderung JP 14.02.91
*************************************************************************/
@@ -258,7 +258,7 @@ SwFmt::~SwFmt()
bFmtInDTOR = TRUE;
SwFmt *pParentFmt = DerivedFrom();
- if (!pParentFmt) // see #112405#
+ if (!pParentFmt) // see #112405#
{
DBG_ERROR( "~SwFmt: parent format missing" );
}
@@ -280,7 +280,7 @@ SwFmt::~SwFmt()
/*************************************************************************
|* void SwFmt::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
|*
-|* Beschreibung Dokument 1.14
+|* Beschreibung Dokument 1.14
|* Ersterstellung JP 22.11.90
|* Letzte Aenderung JP 05.08.94
*************************************************************************/
@@ -288,13 +288,13 @@ SwFmt::~SwFmt()
void SwFmt::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
{
- BOOL bWeiter = TRUE; // TRUE = Propagierung an die Abhaengigen
+ BOOL bWeiter = TRUE; // TRUE = Propagierung an die Abhaengigen
USHORT nWhich = pOldValue ? pOldValue->Which() :
pNewValue ? pNewValue->Which() : 0 ;
switch( nWhich )
{
- case 0: break; // Which-Id von 0 ???
+ case 0: break; // Which-Id von 0 ???
case RES_OBJECTDYING :
{
@@ -477,7 +477,7 @@ BOOL SwFmt::SetFmtAttr(const SfxPoolItem& rAttr )
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
return bRet;
@@ -525,7 +525,7 @@ BOOL SwFmt::SetFmtAttr( const SfxItemSet& rSet )
aSet.SetModifyAtAttr( this );
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
return bRet;
@@ -540,7 +540,7 @@ BOOL SwFmt::ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 )
return FALSE;
if( !nWhich2 || nWhich2 < nWhich1 )
- nWhich2 = nWhich1; // dann setze auf 1. Id, nur dieses Item
+ nWhich2 = nWhich1; // dann setze auf 1. Id, nur dieses Item
if ( IsInCache() || IsInSwFntCache() )
{
@@ -562,7 +562,7 @@ BOOL SwFmt::ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 )
{
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
return bRet;
}
@@ -596,7 +596,7 @@ USHORT SwFmt::ResetAllFmtAttr()
{
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
return aNew.Count();
}
@@ -645,7 +645,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
{
SwAttrSetChg aChgOld( aSet, aOld );
SwAttrSetChg aChgNew( aSet, aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index fa2a95b1f654..f065413f4e27 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -2,7 +2,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
@@ -295,9 +295,9 @@ USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript )
nScript = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() );
switch( nScript)
{
- case ScriptType::COMPLEX: ++pM; // no break;
- case ScriptType::ASIAN: ++pM; // no break;
- default: nRet = *pM;
+ case ScriptType::COMPLEX: ++pM; // no break;
+ case ScriptType::ASIAN: ++pM; // no break;
+ default: nRet = *pM;
}
}
}
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index d2d8ba190205..c7bf78864064 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -2,7 +2,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
@@ -42,8 +42,8 @@
#include <charfmt.hxx>
#include <doc.hxx>
#include <node.hxx>
-#include <paratr.hxx> // fuer SetModifyAtAttr
-#include <cellatr.hxx> // fuer SetModifyAtAttr
+#include <paratr.hxx> // fuer SetModifyAtAttr
+#include <cellatr.hxx> // fuer SetModifyAtAttr
#include <cmdid.h>
#include <istyleaccess.hxx>
#include <numrule.hxx>
@@ -195,8 +195,8 @@ void SwAttrSet::Changed( const SfxPoolItem& rOld,
// ----------------------------------------------------------------
// Sonderbehandlung fuer einige Attribute
// Setze den Modify-Pointer (alten pDefinedIn) bei folgenden Attributen:
-// - SwFmtDropCaps
-// - SwFmtPageDesc
+// - SwFmtDropCaps
+// - SwFmtPageDesc
// (Wird beim Einfuegen in Formate/Nodes gerufen)
// ----------------------------------------------------------------
@@ -325,7 +325,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// <--
// JP 04.02.99: Task #61467# Seitenvorlagenwechsel mit kopieren
- // Gegenueber dem alten Verhalten, sie zu entfernen
+ // Gegenueber dem alten Verhalten, sie zu entfernen
const SwPageDesc* pPgDesc;
if( pSrcDoc != pDstDoc && SFX_ITEM_SET == GetItemState(
RES_PAGEDESC, FALSE, &pItem ) &&
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index d550ae2f9ee7..68e6308ba3a8 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -2,7 +2,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
@@ -64,10 +64,10 @@ SwSmartTagMgr::~SwSmartTagMgr()
void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeException )
{
SolarMutexGuard aGuard;
-
+
// Installed recognizers have changed. We remove all existing smart tags:
SW_MOD()->CheckSpellChanges( sal_False, sal_True, sal_True, sal_True );
-
+
SmartTagMgr::modified( rEO );
}
@@ -87,7 +87,7 @@ SmartTagMgr& SwSmartTagMgr::Get()
{
if ( !pSmartTagMgr )
pSmartTagMgr = new SmartTagMgr( SwDocShell::Factory().GetModuleName() );
-
+
return *pSmartTagMgr;
}
*/
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 4e448882ab9e..28a4daa767ae 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -2,7 +2,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
@@ -70,7 +70,7 @@ BigPtrArray::BigPtrArray()
{
nBlock = nCur = 0;
nSize = 0;
- nMaxBlock = nBlockGrowSize; // == 20 * 1000 Eintraege
+ nMaxBlock = nBlockGrowSize; // == 20 * 1000 Eintraege
ppInf = new BlockInfo* [ nMaxBlock ];
}
@@ -98,7 +98,7 @@ void BigPtrArray::Move( ULONG from, ULONG to )
USHORT cur = Index2Block( from );
BlockInfo* p = ppInf[ cur ];
ElementPtr pElem = p->pData[ from - p->nStart ];
- Insert( pElem, to ); // erst einfuegen, dann loeschen !!!!
+ Insert( pElem, to ); // erst einfuegen, dann loeschen !!!!
Remove( ( to < from ) ? ( from + 1 ) : from );
}
@@ -250,7 +250,7 @@ BlockInfo* BigPtrArray::InsBlock( USHORT pos )
p->nStart = p->nEnd = ppInf[ pos-1 ]->nEnd + 1;
else
p->nStart = p->nEnd = 0;
- p->nEnd--; // keine Elemente
+ p->nEnd--; // keine Elemente
p->nElem = 0;
p->pData = new ElementPtr [ MAXENTRY ];
p->pBigArr = this;
@@ -377,10 +377,10 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
{
CHECKIDX( ppInf, nBlock, nSize, nCur );
- USHORT nBlkdel = 0; // entfernte Bloecke
- USHORT cur = Index2Block( pos ); // aktuelle Blocknr
+ USHORT nBlkdel = 0; // entfernte Bloecke
+ USHORT cur = Index2Block( pos ); // aktuelle Blocknr
USHORT nBlk1 = cur; // 1. behandelter Block
- USHORT nBlk1del = USHRT_MAX; // 1. entfernter Block
+ USHORT nBlk1del = USHRT_MAX; // 1. entfernter Block
BlockInfo* p = ppInf[ cur ];
pos -= p->nStart;
ULONG nElem = n;
@@ -431,7 +431,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
( nBlock - nBlkdel - nBlk1del ) * sizeof( BlockInfo* ) );
// JP 19.07.95: nicht den ersten behandelten, sondern den davor!!
- // UpdateIdx updatet nur alle Nachfolgende!!
+ // UpdateIdx updatet nur alle Nachfolgende!!
if( !nBlk1 )
{
p = ppInf[ 0 ];
@@ -441,7 +441,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
else
--nBlk1;
}
- BlockDel( nBlkdel ); // es wurden Bloecke geloescht
+ BlockDel( nBlkdel ); // es wurden Bloecke geloescht
}
nSize -= n;
@@ -484,10 +484,10 @@ USHORT BigPtrArray::Compress( short nMax )
// benutzt; wobei pp das "alte" Array, qq das "neue" Array ist.
BlockInfo** pp = ppInf, **qq = pp;
BlockInfo* p;
- BlockInfo* pLast(0); // letzter nicht voller Block
- USHORT nLast = 0; // fehlende Elemente
- USHORT nBlkdel = 0; // Anzahl der geloeschte Bloecke
- USHORT nFirstChgPos = USHRT_MAX; // ab welcher Pos gab es die 1. Aenderung?
+ BlockInfo* pLast(0); // letzter nicht voller Block
+ USHORT nLast = 0; // fehlende Elemente
+ USHORT nBlkdel = 0; // Anzahl der geloeschte Bloecke
+ USHORT nFirstChgPos = USHRT_MAX; // ab welcher Pos gab es die 1. Aenderung?
// von Fuell-Prozenten auf uebrige Eintrage umrechnen
nMax = MAXENTRY - (long) MAXENTRY * nMax / 100;
@@ -548,9 +548,9 @@ USHORT BigPtrArray::Compress( short nMax )
}
}
- if( p ) // die Blockinfo wurde nicht geloescht
+ if( p ) // die Blockinfo wurde nicht geloescht
{
- *qq++ = p; // dann setze sie an die richtige neue Position
+ *qq++ = p; // dann setze sie an die richtige neue Position
// eventuell den letzten halbvollen Block festhalten
if( !nLast && p->nElem < MAXENTRY )
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 3805541242ab..b670b13058c9 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -2,7 +2,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
@@ -71,8 +71,8 @@ SwBreakIt::SwBreakIt(
//if ( m_xMSF.is() )
//{
// xBreak = uno::Reference< i18n::XBreakIterator >(
- // m_xMSF->createInstance(
- // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
+ // m_xMSF->createInstance(
+ // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
// uno::UNO_QUERY);
// xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index ce1d90e297c7..a40f06508f2d 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -2,7 +2,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
@@ -69,35 +69,35 @@ using namespace ::com::sun::star;
// tippt sich schneller
#define RESOURCE ViewShell::GetShellRes()
-const sal_Char __FAR_DATA sCalc_Add[] = "add";
-const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
-const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
-const sal_Char __FAR_DATA sCalc_Div[] = "div";
-const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
-const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
-const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
-const sal_Char __FAR_DATA sCalc_Or[] = "or";
-const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
-const sal_Char __FAR_DATA sCalc_And[] = "and";
-const sal_Char __FAR_DATA sCalc_Not[] = "not";
-const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
-const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
-const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
-const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
-const sal_Char __FAR_DATA sCalc_L[] = "l";
-const sal_Char __FAR_DATA sCalc_G[] = "g";
-const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
-const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
-const sal_Char __FAR_DATA sCalc_Min[] = "min";
-const sal_Char __FAR_DATA sCalc_Max[] = "max";
-const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
-const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
-const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
-const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
-const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
-const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
-const sal_Char __FAR_DATA sCalc_Round[] = "round";
-const sal_Char __FAR_DATA sCalc_Date[] = "date";
+const sal_Char __FAR_DATA sCalc_Add[] = "add";
+const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
+const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
+const sal_Char __FAR_DATA sCalc_Div[] = "div";
+const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
+const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
+const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
+const sal_Char __FAR_DATA sCalc_Or[] = "or";
+const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
+const sal_Char __FAR_DATA sCalc_And[] = "and";
+const sal_Char __FAR_DATA sCalc_Not[] = "not";
+const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
+const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
+const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
+const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
+const sal_Char __FAR_DATA sCalc_L[] = "l";
+const sal_Char __FAR_DATA sCalc_G[] = "g";
+const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
+const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
+const sal_Char __FAR_DATA sCalc_Min[] = "min";
+const sal_Char __FAR_DATA sCalc_Max[] = "max";
+const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
+const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
+const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
+const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
+const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
+const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
+const sal_Char __FAR_DATA sCalc_Round[] = "round";
+const sal_Char __FAR_DATA sCalc_Date[] = "date";
@@ -111,41 +111,41 @@ struct _CalcOp
SwCalcOper eOp;
};
-_CalcOp __READONLY_DATA aOpTable[] = {
+_CalcOp __READONLY_DATA aOpTable[] = {
/* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arcuscosinus
/* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition
-/* AND */ {{sCalc_And}, CALC_AND}, // log. und
+/* AND */ {{sCalc_And}, CALC_AND}, // log. und
/* ASIN */ {{sCalc_Asin}, CALC_ASIN}, // Arcussinus
/* ATAN */ {{sCalc_Atan}, CALC_ATAN}, // Arcustangens
-/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus
-/* DATE */ {{sCalc_Date}, CALC_DATE}, // Date
+/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus
+/* DATE */ {{sCalc_Date}, CALC_DATE}, // Date
/* DIV */ {{sCalc_Div}, CALC_DIV}, // Dividieren
-/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich
-/* G */ {{sCalc_G}, CALC_GRE}, // groesser
-/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich
-/* L */ {{sCalc_L}, CALC_LES}, // kleiner
-/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich
-/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert
+/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich
+/* G */ {{sCalc_G}, CALC_GRE}, // groesser
+/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich
+/* L */ {{sCalc_L}, CALC_LES}, // kleiner
+/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich
+/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert
/* MEAN */ {{sCalc_Mean}, CALC_MEAN}, // Mittelwert
-/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert
-/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren
-/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich
-/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht
-/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder
+/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert
+/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren
+/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich
+/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht
+/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder
/* PHD */ {{sCalc_Phd}, CALC_PHD}, // Prozent
-/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren
-/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden
-/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus
-/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel
-/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion
-/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe
-/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens
-/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder
+/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren
+/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden
+/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus
+/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel
+/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion
+/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe
+/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens
+/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder
};
double __READONLY_DATA nRoundVal[] = {
- 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6,
- 0.5e-7, 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,
+ 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6,
+ 0.5e-7, 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,
0.5e-15,0.5e-16
};
@@ -258,10 +258,10 @@ double lcl_ConvertToDateValue( SwDoc& rDoc, sal_Int32 nDate )
/******************************************************************************
|*
-|* SwCalc::SwCalc( SwDoc* pD ) :
+|* SwCalc::SwCalc( SwDoc* pD ) :
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -400,17 +400,17 @@ static ULONG SwDocStat::* __READONLY_DATA aDocStat2[ 4 ] =
// at time its better not to use "graph", because then the im-/export have
// to change in all formulas this name.
-// nVal.PutLong( rDocStat.*aDocStat1[ 1 ] );
-// VarTable[ aHashValue[ 26 ] ]->pNext = new SwCalcExp(
-// sNTypeTab[ 26 ], nVal, 0 );
+// nVal.PutLong( rDocStat.*aDocStat1[ 1 ] );
+// VarTable[ aHashValue[ 26 ] ]->pNext = new SwCalcExp(
+// sNTypeTab[ 26 ], nVal, 0 );
}
/******************************************************************************
|*
-|* SwCalc::~SwCalc()
+|* SwCalc::~SwCalc()
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -426,10 +426,10 @@ SwCalc::~SwCalc()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Calculate( const String& rStr )
+|* SwSbxValue SwCalc::Calculate( const String& rStr )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -442,7 +442,7 @@ SwSbxValue SwCalc::Calculate( const String& rStr )
return nResult;
nListPor = 0;
- eCurrListOper = CALC_PLUS; // defaulten auf Summe
+ eCurrListOper = CALC_PLUS; // defaulten auf Summe
sCommand = rStr;
nCommandPos = 0;
@@ -458,13 +458,13 @@ SwSbxValue SwCalc::Calculate( const String& rStr )
/******************************************************************************
|*
-|* String SwCalc::GetStrResult( SwSbxValue nValue, BOOL bRound = TRUE )
-|* Beschreibung Der Parameter bRound ist auf TRUE defaultet und darf
-|* nur beim errechnen von Tabellenzellen auf FALSE gesetzt
-|* werden, damit keine Rundungsfehler beim zusammenstellen
-|* der Formel entstehen.
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 19.02.98
+|* String SwCalc::GetStrResult( SwSbxValue nValue, BOOL bRound = TRUE )
+|* Beschreibung Der Parameter bRound ist auf TRUE defaultet und darf
+|* nur beim errechnen von Tabellenzellen auf FALSE gesetzt
+|* werden, damit keine Rundungsfehler beim zusammenstellen
+|* der Formel entstehen.
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 19.02.98
|*
|******************************************************************************/
@@ -482,18 +482,18 @@ String SwCalc::GetStrResult( double nValue, BOOL )
if( nValue >= DBL_MAX )
switch( eError )
{
- case CALC_SYNTAX : return RESOURCE->aCalc_Syntax;
- case CALC_ZERODIV : return RESOURCE->aCalc_ZeroDiv;
- case CALC_BRACK : return RESOURCE->aCalc_Brack;
- case CALC_POWERR : return RESOURCE->aCalc_Pow;
- case CALC_VARNFND : return RESOURCE->aCalc_VarNFnd;
- case CALC_OVERFLOW : return RESOURCE->aCalc_Overflow;
- case CALC_WRONGTIME : return RESOURCE->aCalc_WrongTime;
- default : return RESOURCE->aCalc_Default;
+ case CALC_SYNTAX : return RESOURCE->aCalc_Syntax;
+ case CALC_ZERODIV : return RESOURCE->aCalc_ZeroDiv;
+ case CALC_BRACK : return RESOURCE->aCalc_Brack;
+ case CALC_POWERR : return RESOURCE->aCalc_Pow;
+ case CALC_VARNFND : return RESOURCE->aCalc_VarNFnd;
+ case CALC_OVERFLOW : return RESOURCE->aCalc_Overflow;
+ case CALC_WRONGTIME : return RESOURCE->aCalc_WrongTime;
+ default : return RESOURCE->aCalc_Default;
}
- USHORT nDec = 15; //pLclData->getNumDigits();
- String aRetStr( ::rtl::math::doubleToUString( nValue,
+ USHORT nDec = 15; //pLclData->getNumDigits();
+ String aRetStr( ::rtl::math::doubleToUString( nValue,
rtl_math_StringFormat_Automatic,
nDec,
pLclData->getNumDecimalSep().GetChar(0),
@@ -504,10 +504,10 @@ String SwCalc::GetStrResult( double nValue, BOOL )
/******************************************************************************
|*
-|* SwCalcExp* SwCalc::VarLook( const String& )
+|* SwCalcExp* SwCalc::VarLook( const String& )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 15.11.99
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 15.11.99
|*
|******************************************************************************/
@@ -520,10 +520,10 @@ SwCalcExp* SwCalc::VarInsert( const String &rStr )
/******************************************************************************
|*
-|* SwCalcExp* SwCalc::VarLook( const String& , USHORT ins )
+|* SwCalcExp* SwCalc::VarLook( const String& , USHORT ins )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 15.11.99
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 15.11.99
|*
|******************************************************************************/
SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
@@ -564,22 +564,22 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
else if( !pUFld->IsValid() )
{
// Die aktuellen Werte sichern . . .
- USHORT nOld_ListPor = nListPor;
- SwSbxValue nOld_LastLeft = nLastLeft;
- SwSbxValue nOld_NumberValue = nNumberValue;
- xub_StrLen nOld_CommandPos = nCommandPos;
- SwCalcOper eOld_CurrOper = eCurrOper;
- SwCalcOper eOld_CurrListOper = eCurrListOper;
+ USHORT nOld_ListPor = nListPor;
+ SwSbxValue nOld_LastLeft = nLastLeft;
+ SwSbxValue nOld_NumberValue = nNumberValue;
+ xub_StrLen nOld_CommandPos = nCommandPos;
+ SwCalcOper eOld_CurrOper = eCurrOper;
+ SwCalcOper eOld_CurrListOper = eCurrListOper;
pFndExp->nValue.PutDouble( pUFld->GetValue( *this ) );
// . . . und zurueck damit.
- nListPor = nOld_ListPor;
- nLastLeft = nOld_LastLeft;
- nNumberValue = nOld_NumberValue;
- nCommandPos = nOld_CommandPos;
- eCurrOper = eOld_CurrOper;
- eCurrListOper = eOld_CurrListOper;
+ nListPor = nOld_ListPor;
+ nLastLeft = nOld_LastLeft;
+ nNumberValue = nOld_NumberValue;
+ nCommandPos = nOld_CommandPos;
+ eCurrOper = eOld_CurrOper;
+ eCurrListOper = eOld_CurrListOper;
}
else
pFndExp->nValue.PutDouble( pUFld->GetValue() );
@@ -677,10 +677,10 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
/******************************************************************************
|*
-|* BOOL SwCalc::VarChange( const String& rStr, const SwSbxValue nValue )
+|* BOOL SwCalc::VarChange( const String& rStr, const SwSbxValue nValue )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -710,10 +710,10 @@ void SwCalc::VarChange( const String& rStr, const SwSbxValue& rValue )
/******************************************************************************
|*
-|* BOOL SwCalc::Push( const void* pPtr )
+|* BOOL SwCalc::Push( const void* pPtr )
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung OK 12-02-93 11:05am
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung OK 12-02-93 11:05am
|*
|******************************************************************************/
@@ -728,10 +728,10 @@ BOOL SwCalc::Push( const VoidPtr pPtr )
/******************************************************************************
|*
-|* void SwCalc::Pop( const void* pPtr )
+|* void SwCalc::Pop( const void* pPtr )
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung OK 12-02-93 11:05am
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung OK 12-02-93 11:05am
|*
|******************************************************************************/
@@ -745,10 +745,10 @@ void SwCalc::Pop( const VoidPtr )
/******************************************************************************
|*
-|* SwCalcOper SwCalc::GetToken()
+|* SwCalcOper SwCalc::GetToken()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -756,7 +756,7 @@ SwCalcOper SwCalc::GetToken()
{
#if OSL_DEBUG_LEVEL > 1
//JP 25.01.2001: static for switch back to the "old" implementation of the
-// calculator, which don't use the I18N routines.
+// calculator, which don't use the I18N routines.
static int nUseOld = 0;
if( !nUseOld )
{
@@ -792,7 +792,7 @@ if( !nUseOld )
if( sLowerCaseName == sCurrSym )
{
nCommandPos = (xub_StrLen)aRes.EndPos;
- return GetToken(); // also nochmal aufrufen
+ return GetToken(); // also nochmal aufrufen
}
// Operations abfangen
@@ -855,7 +855,7 @@ if( !nUseOld )
case '+':
case '-':
case '(':
- case ')': eCurrOper = SwCalcOper(ch);
+ case ')': eCurrOper = SwCalcOper(ch);
break;
case '=':
@@ -962,7 +962,7 @@ if( !nUseOld )
#if OSL_DEBUG_LEVEL > 1
-#define NextCh( s, n ) (nCommandPos < sCommand.Len() ? sCommand.GetChar( nCommandPos++ ) : 0)
+#define NextCh( s, n ) (nCommandPos < sCommand.Len() ? sCommand.GetChar( nCommandPos++ ) : 0)
}
else
@@ -1003,7 +1003,7 @@ else
case '+':
case '-':
case '(':
- case ')': eCurrOper = SwCalcOper(ch);
+ case ')': eCurrOper = SwCalcOper(ch);
break;
case '=': if( '=' == sCommand.GetChar( nCommandPos ) )
@@ -1042,12 +1042,12 @@ else
eCurrOper = eCurrListOper;
break;
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
case ',':
- case '.': {
+ case '.': {
double nVal;
- --nCommandPos; // auf das 1. Zeichen zurueck
+ --nCommandPos; // auf das 1. Zeichen zurueck
if( Str2Double( sCommand, nCommandPos, nVal, pLclData ))
{
nNumberValue.PutDouble( nVal );
@@ -1062,7 +1062,7 @@ else
}
break;
- case '[': {
+ case '[': {
String aStr;
BOOL bIgnore = FALSE;
do {
@@ -1087,7 +1087,7 @@ else
}
break;
- case '"': {
+ case '"': {
xub_StrLen nStt = nCommandPos;
while( 0 != ( ch = NextCh( sCommand, nCommandPos ) )
&& '"' != ch )
@@ -1101,7 +1101,7 @@ else
}
break;
- default: if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
+ default: if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
|| '_' == ch )
{
xub_StrLen nStt = nCommandPos-1;
@@ -1120,7 +1120,7 @@ else
// Currency-Symbol abfangen
if( aStr == sCurrSym )
- return GetToken(); // also nochmal aufrufen
+ return GetToken(); // also nochmal aufrufen
// Operations abfangen
_CalcOp* pFnd = ::FindOperator( aStr );
@@ -1160,10 +1160,10 @@ else
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Term()
+|* SwSbxValue SwCalc::Term()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 16.01.96
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 16.01.96
|*
|******************************************************************************/
@@ -1178,22 +1178,22 @@ SwSbxValue SwCalc::Term()
switch( eCurrOper )
{
// wir haben kein Bitweises verodern, oder ?
-// case CALC_AND: eSbxOper = SbxAND; break;
-// case CALC_OR: eSbxOper = SbxOR; break;
-// case CALC_XOR: eSbxOper = SbxXOR; break;
- case CALC_AND: {
+// case CALC_AND: eSbxOper = SbxAND; break;
+// case CALC_OR: eSbxOper = SbxOR; break;
+// case CALC_XOR: eSbxOper = SbxXOR; break;
+ case CALC_AND: {
GetToken();
BOOL bB = Prim().GetBool();
left.PutBool( left.GetBool() && bB );
}
break;
- case CALC_OR: {
+ case CALC_OR: {
GetToken();
BOOL bB = Prim().GetBool();
left.PutBool( left.GetBool() || bB );
}
break;
- case CALC_XOR: {
+ case CALC_XOR: {
GetToken();
BOOL bR = Prim().GetBool();
BOOL bL = left.GetBool();
@@ -1201,15 +1201,15 @@ SwSbxValue SwCalc::Term()
}
break;
- case CALC_EQ: nSbxOper = SbxEQ; break;
- case CALC_NEQ: nSbxOper = SbxNE; break;
- case CALC_LEQ: nSbxOper = SbxLE; break;
- case CALC_GEQ: nSbxOper = SbxGE; break;
- case CALC_GRE: nSbxOper = SbxGT; break;
- case CALC_LES: nSbxOper = SbxLT; break;
+ case CALC_EQ: nSbxOper = SbxEQ; break;
+ case CALC_NEQ: nSbxOper = SbxNE; break;
+ case CALC_LEQ: nSbxOper = SbxLE; break;
+ case CALC_GEQ: nSbxOper = SbxGE; break;
+ case CALC_GRE: nSbxOper = SbxGT; break;
+ case CALC_LES: nSbxOper = SbxLT; break;
- case CALC_MUL: nSbxOper = SbxMUL; break;
- case CALC_DIV: nSbxOper = SbxDIV; break;
+ case CALC_MUL: nSbxOper = SbxMUL; break;
+ case CALC_DIV: nSbxOper = SbxDIV; break;
case CALC_MIN_IN:
{
@@ -1285,7 +1285,7 @@ SwSbxValue SwCalc::Term()
bSign = FALSE;
// runden
- double fNum = fVal; // find the exponent
+ double fNum = fVal; // find the exponent
int nExp = 0;
if( fNum > 0 )
{
@@ -1335,7 +1335,7 @@ SwSbxValue SwCalc::Term()
}
break;
*/
- default: return left;
+ default: return left;
}
if( USHRT_MAX != nSbxOper )
@@ -1363,10 +1363,10 @@ SwSbxValue SwCalc::Term()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Prim()
+|* SwSbxValue SwCalc::Prim()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -1382,14 +1382,14 @@ SwSbxValue SwCalc::Prim()
switch( eCurrOper )
{
- case CALC_SIN: pFnc = &sin; break;
- case CALC_COS: pFnc = &cos; break;
- case CALC_TAN: pFnc = &tan; break;
- case CALC_ATAN: pFnc = &atan; break;
- case CALC_ASIN: pFnc = &asin; bChkTrig = TRUE; break;
- case CALC_ACOS: pFnc = &acos; bChkTrig = TRUE; break;
-
- case CALC_NOT: {
+ case CALC_SIN: pFnc = &sin; break;
+ case CALC_COS: pFnc = &cos; break;
+ case CALC_TAN: pFnc = &tan; break;
+ case CALC_ATAN: pFnc = &atan; break;
+ case CALC_ASIN: pFnc = &asin; bChkTrig = TRUE; break;
+ case CALC_ACOS: pFnc = &acos; bChkTrig = TRUE; break;
+
+ case CALC_NOT: {
GetToken();
nErg = Prim();
if( SbxSTRING == nErg.GetType() )
@@ -1410,7 +1410,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_NUMBER: if( GetToken() == CALC_PHD )
+ case CALC_NUMBER: if( GetToken() == CALC_PHD )
{
double aTmp = nNumberValue.GetDouble();
aTmp *= 0.01;
@@ -1426,7 +1426,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_NAME: if( GetToken() == CALC_ASSIGN )
+ case CALC_NAME: if( GetToken() == CALC_ASSIGN )
{
SwCalcExp* n = VarInsert( aVarName );
GetToken();
@@ -1439,11 +1439,11 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_MINUS: GetToken();
+ case CALC_MINUS: GetToken();
nErg.PutDouble( -(Prim().GetDouble()) );
break;
- case CALC_LP: {
+ case CALC_LP: {
GetToken();
nErg = Expr();
if( eCurrOper != CALC_RP )
@@ -1456,7 +1456,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_MEAN: {
+ case CALC_MEAN: {
nListPor = 1;
GetToken();
nErg = Expr();
@@ -1466,7 +1466,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_SQRT: {
+ case CALC_SQRT: {
GetToken();
nErg = Prim();
if( nErg.GetDouble() < 0 )
@@ -1479,14 +1479,14 @@ SwSbxValue SwCalc::Prim()
case CALC_SUM:
case CALC_DATE:
case CALC_MIN:
- case CALC_MAX: GetToken();
+ case CALC_MAX: GetToken();
nErg = Expr();
break;
- case CALC_ENDCALC: nErg.Clear();
+ case CALC_ENDCALC: nErg.Clear();
break;
- default: eError = CALC_SYNTAX;
+ default: eError = CALC_SYNTAX;
break;
}
@@ -1526,7 +1526,7 @@ SwSbxValue SwCalc::Prim()
else
{
nErg.PutDouble( dleft );
-// GetToken();
+// GetToken();
}
}
}
@@ -1536,21 +1536,21 @@ SwSbxValue SwCalc::Prim()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Expr()
+|* SwSbxValue SwCalc::Expr()
|*
-|* Erstellung OK 12-02-93 11:06am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:06am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
-SwSbxValue SwCalc::Expr()
+SwSbxValue SwCalc::Expr()
{
SwSbxValue left = Term(), right;
nLastLeft = left;
for(;;)
switch(eCurrOper)
{
- case CALC_PLUS: GetToken();
+ case CALC_PLUS: GetToken();
// erzeuge zum addieren auf jedenfall einen
// Double-Wert
left.MakeDouble();
@@ -1559,7 +1559,7 @@ SwSbxValue SwCalc::Expr()
nListPor++;
break;
- case CALC_MINUS: GetToken();
+ case CALC_MINUS: GetToken();
// erzeuge zum addieren auf jedenfall einen
// Double-Wert
left.MakeDouble();
@@ -1567,7 +1567,7 @@ SwSbxValue SwCalc::Expr()
left.Compute( SbxMINUS, right );
break;
- default: return left;
+ default: return left;
}
}
@@ -1631,10 +1631,10 @@ lcl_Str2Double( const String& rCommand, xub_StrLen& rCommandPos, double& rVal,
}
/******************************************************************************
- * Methode : BOOL SwCalc::Str2Double( double& )
- * Beschreibung:
- * Erstellt : OK 07.06.94 12:56
- * Aenderung : JP 27.10.98
+ * Methode : BOOL SwCalc::Str2Double( double& )
+ * Beschreibung:
+ * Erstellt : OK 07.06.94 12:56
+ * Aenderung : JP 27.10.98
******************************************************************************/
bool SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
double& rVal, const LocaleDataWrapper* const pLclData )
@@ -1698,10 +1698,10 @@ BOOL SwCalc::IsValidVarName( const String& rStr,
/******************************************************************************
|*
-|* CTOR DTOR der SwHash classes
+|* CTOR DTOR der SwHash classes
|*
-|* Ersterstellung OK 25.06.93 12:20
-|* Letzte Aenderung OK 25.06.93 12:20
+|* Ersterstellung OK 25.06.93 12:20
+|* Letzte Aenderung OK 25.06.93 12:20
|*
******************************************************************************/
@@ -1775,18 +1775,18 @@ SwSbxValue& SwSbxValue::MakeDouble()
void main()
{
static sal_Char
- sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi",
- sNType3[] = "e", sNType4[] = "tables", sNType5[] = "graf",
- sNType6[] = "ole", sNType7[] = "page", sNType8[] = "para",
- sNType9[] = "word", sNType10[]= "char",
- sNType11[] = "user_company" , sNType12[] = "user_firstname" ,
- sNType13[] = "user_lastname" , sNType14[] = "user_initials",
+ sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi",
+ sNType3[] = "e", sNType4[] = "tables", sNType5[] = "graf",
+ sNType6[] = "ole", sNType7[] = "page", sNType8[] = "para",
+ sNType9[] = "word", sNType10[]= "char",
+ sNType11[] = "user_company" , sNType12[] = "user_firstname" ,
+ sNType13[] = "user_lastname" , sNType14[] = "user_initials",
sNType15[] = "user_street" , sNType16[] = "user_country" ,
sNType17[] = "user_zipcode" , sNType18[] = "user_city" ,
sNType19[] = "user_title" , sNType20[] = "user_position" ,
- sNType21[] = "user_tel_home", sNType22[] = "user_tel_work",
+ sNType21[] = "user_tel_home", sNType22[] = "user_tel_work",
sNType23[] = "user_fax" , sNType24[] = "user_email" ,
- sNType25[] = "user_state", sNType26[] = "graph"
+ sNType25[] = "user_state", sNType26[] = "graph"
;
static const sal_Char* sNTypeTab[ 27 ] =
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index ec4a3b8e8aed..148e0b6fff98 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index a249a21ec2a6..bff41705d68a 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -2,7 +2,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
@@ -30,19 +30,19 @@
#include "precompiled_sw.hxx"
-#include <stdlib.h> // fuer qsort
+#include <stdlib.h> // fuer qsort
#include <tools/solar.h>
-#include "errhdl.hxx" // fuers ASSERT
+#include "errhdl.hxx" // fuers ASSERT
#include "index.hxx"
-#include "error.h" // fuers ASSERT
+#include "error.h" // fuers ASSERT
#if OSL_DEBUG_LEVEL > 1
int SwIndex::nSerial = 0;
#endif
-TYPEINIT0(SwIndexReg); // rtti
+TYPEINIT0(SwIndexReg); // rtti
#ifdef CHK
@@ -76,12 +76,12 @@ void SwIndexReg::ChkArr()
}
}
-#else // CHK
+#else // CHK
#define IDX_CHK_ARRAY
#define ARR_CHK_ARRAY
-#endif // CHK
+#endif // CHK
@@ -91,7 +91,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
if( !pArray )
{
pArray = SwIndexReg::pEmptyIndexArray;
- nIndex = 0; // steht immer auf 0 !!!
+ nIndex = 0; // steht immer auf 0 !!!
}
if( !pArray->pFirst || !pArray->pLast ) // 1. Index ??
@@ -102,7 +102,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
ChgValue( *pArray->pFirst, nIdx );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -114,7 +114,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
ChgValue( rIdx, rIdx.nIndex + nIdx );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -125,7 +125,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
{
ChgValue( rIdx, rIdx.nIndex );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -134,7 +134,7 @@ IDX_CHK_ARRAY
SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue )
{
SwIndex* pFnd = (SwIndex*)&rIdx;
- if( rIdx.nIndex > nNewValue ) // nach vorne versuchen
+ if( rIdx.nIndex > nNewValue ) // nach vorne versuchen
{
SwIndex* pPrv;
while( 0 != ( pPrv = pFnd->pPrev ) && pPrv->nIndex > nNewValue )
@@ -208,7 +208,7 @@ SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue )
pNext = rIdx.pNext;
pPrev->pNext = this;
- if( !pNext ) // im IndexArray als letzes
+ if( !pNext ) // im IndexArray als letzes
pArray->pLast = this;
else
pNext->pPrev = this;
@@ -244,11 +244,11 @@ IDX_CHK_ARRAY
/*************************************************************************
|*
-|* SwIndex & SwIndex::operator=( const SwIndex & aSwIndex )
+|* SwIndex & SwIndex::operator=( const SwIndex & aSwIndex )
|*
-|* Beschreibung
-|* Ersterstellung JP 07.11.90
-|* Letzte Aenderung JP 07.03.94
+|* Beschreibung
+|* Ersterstellung JP 07.11.90
+|* Letzte Aenderung JP 07.03.94
|*
*************************************************************************/
@@ -256,7 +256,7 @@ IDX_CHK_ARRAY
SwIndex& SwIndex::operator=( const SwIndex& rIdx )
{
int bEqual;
- if( rIdx.pArray != pArray ) // im alten abmelden !!
+ if( rIdx.pArray != pArray ) // im alten abmelden !!
{
Remove();
pArray = rIdx.pArray;
@@ -273,11 +273,11 @@ SwIndex& SwIndex::operator=( const SwIndex& rIdx )
/*************************************************************************
|*
-|* SwIndex &SwIndex::Assign
+|* SwIndex &SwIndex::Assign
|*
-|* Beschreibung
-|* Ersterstellung VB 25.03.91
-|* Letzte Aenderung JP 07.03.94
+|* Beschreibung
+|* Ersterstellung VB 25.03.91
+|* Letzte Aenderung JP 07.03.94
|*
*************************************************************************/
@@ -287,10 +287,10 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, xub_StrLen nIdx )
if( !pArr )
{
pArr = SwIndexReg::pEmptyIndexArray;
- nIdx = 0; // steht immer auf 0 !!!
+ nIdx = 0; // steht immer auf 0 !!!
}
- if( pArr != pArray ) // im alten abmelden !!
+ if( pArr != pArray ) // im alten abmelden !!
{
Remove();
pArray = pArr;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 3c76b6effaf4..f94be22941af 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -2,7 +2,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
@@ -144,7 +144,7 @@ extern void _FrmFinit();
extern void ClearFEShellTabCols();
/*************************************************************************
-|* einige Bereiche fuer die Set in Collections / Nodes
+|* einige Bereiche fuer die Set in Collections / Nodes
|*************************************************************************/
// AttrSet-Range fuer die 2 Break-Attribute
USHORT __FAR_DATA aBreakSetRange[] = {
@@ -192,12 +192,12 @@ USHORT __FAR_DATA aNoTxtNodeSetRange[] = {
};
USHORT __FAR_DATA aTableSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_BREAK,
- RES_BACKGROUND, RES_SHADOW,
- RES_HORI_ORIENT, RES_HORI_ORIENT,
- RES_KEEP, RES_KEEP,
- RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_BREAK,
+ RES_BACKGROUND, RES_SHADOW,
+ RES_HORI_ORIENT, RES_HORI_ORIENT,
+ RES_KEEP, RES_KEEP,
+ RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
RES_FRAMEDIR, RES_FRAMEDIR,
// --> collapsing borders FME 2005-05-27 #i29550#
RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS,
@@ -207,22 +207,22 @@ USHORT __FAR_DATA aTableSetRange[] = {
};
USHORT __FAR_DATA aTableLineSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_UL_SPACE,
- RES_BACKGROUND, RES_SHADOW,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_UL_SPACE,
+ RES_BACKGROUND, RES_SHADOW,
RES_ROW_SPLIT, RES_ROW_SPLIT,
RES_PROTECT, RES_PROTECT,
- RES_VERT_ORIENT, RES_VERT_ORIENT,
+ RES_VERT_ORIENT, RES_VERT_ORIENT,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
USHORT __FAR_DATA aTableBoxSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_UL_SPACE,
- RES_BACKGROUND, RES_SHADOW,
- RES_PROTECT, RES_PROTECT,
- RES_VERT_ORIENT, RES_VERT_ORIENT,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_UL_SPACE,
+ RES_BACKGROUND, RES_SHADOW,
+ RES_PROTECT, RES_PROTECT,
+ RES_VERT_ORIENT, RES_VERT_ORIENT,
RES_FRAMEDIR, RES_FRAMEDIR,
RES_BOXATR_BEGIN, RES_BOXATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -266,46 +266,46 @@ SwDfltAttrTab __FAR_DATA aAttrTab;
SfxItemInfo __FAR_DATA aSlotTab[] =
{
- { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
- { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
- { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_COLOR
- { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CONTOUR
- { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CROSSEDOUT
- { SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE }, // RES_CHRATR_ESCAPEMENT
- { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONT
- { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONTSIZE
- { SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE }, // RES_CHRATR_KERNING
- { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_LANGUAGE
- { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_POSTURE
- { SID_ATTR_CHAR_PROPSIZE, SFX_ITEM_POOLABLE }, // RES_CHRATR_PROPORTIONALFONTSIZE
- { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // RES_CHRATR_SHADOWED
- { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_UNDERLINE
- { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_WEIGHT
- { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // RES_CHRATR_WORDLINEMODE
- { SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE }, // RES_CHRATR_AUTOKERN
- { SID_ATTR_FLASH, SFX_ITEM_POOLABLE }, // RES_CHRATR_BLINK
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOLINEBREAK
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOHYPHEN
- { SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE }, // RES_CHRATR_BACKGROUND
- { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_FONT
+ { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
+ { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
+ { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_COLOR
+ { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CONTOUR
+ { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CROSSEDOUT
+ { SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE }, // RES_CHRATR_ESCAPEMENT
+ { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONT
+ { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONTSIZE
+ { SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE }, // RES_CHRATR_KERNING
+ { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_LANGUAGE
+ { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_POSTURE
+ { SID_ATTR_CHAR_PROPSIZE, SFX_ITEM_POOLABLE }, // RES_CHRATR_PROPORTIONALFONTSIZE
+ { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // RES_CHRATR_SHADOWED
+ { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_UNDERLINE
+ { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_WEIGHT
+ { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // RES_CHRATR_WORDLINEMODE
+ { SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE }, // RES_CHRATR_AUTOKERN
+ { SID_ATTR_FLASH, SFX_ITEM_POOLABLE }, // RES_CHRATR_BLINK
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOLINEBREAK
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOHYPHEN
+ { SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE }, // RES_CHRATR_BACKGROUND
+ { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_FONT
{ SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE },// RES_CHRATR_CJK_FONTSIZE
- { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_LANGUAGE
- { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_POSTURE
- { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_WEIGHT
- { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_FONT
+ { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_LANGUAGE
+ { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_POSTURE
+ { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_WEIGHT
+ { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_FONT
{ SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE },// RES_CHRATR_CTL_FONTSIZE
- { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_LANGUAGE
- { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_POSTURE
- { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_WEIGHT
- { SID_ATTR_CHAR_ROTATED, SFX_ITEM_POOLABLE }, // RES_CHRATR_ROTATE
- { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // RES_CHRATR_EMPHASIS_MARK
- { SID_ATTR_CHAR_TWO_LINES, SFX_ITEM_POOLABLE }, // RES_CHRATR_TWO_LINES
- { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, // RES_CHRATR_SCALEW
- { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // RES_CHRATR_RELIEF
+ { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_LANGUAGE
+ { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_POSTURE
+ { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_WEIGHT
+ { SID_ATTR_CHAR_ROTATED, SFX_ITEM_POOLABLE }, // RES_CHRATR_ROTATE
+ { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // RES_CHRATR_EMPHASIS_MARK
+ { SID_ATTR_CHAR_TWO_LINES, SFX_ITEM_POOLABLE }, // RES_CHRATR_TWO_LINES
+ { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, // RES_CHRATR_SCALEW
+ { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // RES_CHRATR_RELIEF
{ SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE }, // RES_CHRATR_HIDDEN
- { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_OVERLINE
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY1
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY2
+ { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_OVERLINE
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY1
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY2
{ 0, 0 }, // RES_TXTATR_REFMARK
{ 0, 0 }, // RES_TXTATR_TOXMARK
@@ -318,28 +318,28 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_UNKNOWN_CONTAINER
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY5
- { 0, 0 }, // RES_TXTATR_FIELD
- { 0, 0 }, // RES_TXTATR_FLYCNT
- { 0, 0 }, // RES_TXTATR_FTN
+ { 0, 0 }, // RES_TXTATR_FIELD
+ { 0, 0 }, // RES_TXTATR_FLYCNT
+ { 0, 0 }, // RES_TXTATR_FTN
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY4
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY3
- { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY1
- { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY2
-
- { SID_ATTR_PARA_LINESPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_LINESPACING
- { SID_ATTR_PARA_ADJUST, SFX_ITEM_POOLABLE }, // RES_PARATR_ADJUST
- { SID_ATTR_PARA_SPLIT, SFX_ITEM_POOLABLE }, // RES_PARATR_SPLIT
- { SID_ATTR_PARA_ORPHANS, SFX_ITEM_POOLABLE }, // RES_PARATR_ORPHANS
- { SID_ATTR_PARA_WIDOWS, SFX_ITEM_POOLABLE }, // RES_PARATR_WIDOWS
- { SID_ATTR_TABSTOP, SFX_ITEM_POOLABLE }, // RES_PARATR_TABSTOP
- { SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
- { FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
- { SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
+ { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY1
+ { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY2
+
+ { SID_ATTR_PARA_LINESPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_LINESPACING
+ { SID_ATTR_PARA_ADJUST, SFX_ITEM_POOLABLE }, // RES_PARATR_ADJUST
+ { SID_ATTR_PARA_SPLIT, SFX_ITEM_POOLABLE }, // RES_PARATR_SPLIT
+ { SID_ATTR_PARA_ORPHANS, SFX_ITEM_POOLABLE }, // RES_PARATR_ORPHANS
+ { SID_ATTR_PARA_WIDOWS, SFX_ITEM_POOLABLE }, // RES_PARATR_WIDOWS
+ { SID_ATTR_TABSTOP, SFX_ITEM_POOLABLE }, // RES_PARATR_TABSTOP
+ { SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
+ { FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
+ { SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
// --> OD 2008-03-04 #refactorlists#
// RES_PARATR_NUMRULE is now poolable
{ SID_ATTR_PARA_NUMRULE, SFX_ITEM_POOLABLE }, // RES_PARATR_NUMRULE
// <--
- { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
+ { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
{ SID_ATTR_PARA_FORBIDDEN_RULES, SFX_ITEM_POOLABLE },// RES_PARATR_FORBIDDEN_RULES
@@ -357,41 +357,41 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISCOUNTED
// <--
- { 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
- { 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
- { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // RES_PAPER_BIN
- { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // RES_LR_SPACE
- { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // RES_UL_SPACE
- { 0, 0 }, // RES_PAGEDESC
- { SID_ATTR_PARA_PAGEBREAK, SFX_ITEM_POOLABLE }, // RES_BREAK
- { 0, 0 }, // RES_CNTNT
- { 0, SFX_ITEM_POOLABLE }, // RES_HEADER
- { 0, SFX_ITEM_POOLABLE }, // RES_FOOTER
- { 0, SFX_ITEM_POOLABLE }, // RES_PRINT
- { FN_OPAQUE, SFX_ITEM_POOLABLE }, // RES_OPAQUE
- { FN_SET_PROTECT, SFX_ITEM_POOLABLE }, // RES_PROTECT
- { FN_SURROUND, SFX_ITEM_POOLABLE }, // RES_SURROUND
- { FN_VERT_ORIENT, SFX_ITEM_POOLABLE }, // RES_VERT_ORIENT
- { FN_HORI_ORIENT, SFX_ITEM_POOLABLE }, // RES_HORI_ORIENT
- { 0, 0 }, // RES_ANCHOR
- { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // RES_BACKGROUND
- { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // RES_BOX
- { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // RES_SHADOW
- { SID_ATTR_MACROITEM, SFX_ITEM_POOLABLE }, // RES_FRMMACRO
- { FN_ATTR_COLUMNS, SFX_ITEM_POOLABLE }, // RES_COL
- { SID_ATTR_PARA_KEEP, SFX_ITEM_POOLABLE }, // RES_KEEP
- { 0, SFX_ITEM_POOLABLE }, // RES_URL
- { 0, SFX_ITEM_POOLABLE }, // RES_EDIT_IN_READONLY
-
- { 0, SFX_ITEM_POOLABLE }, // RES_LAYOUT_SPLIT
- { 0, 0 }, // RES_CHAIN
+ { 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
+ { 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
+ { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // RES_PAPER_BIN
+ { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // RES_LR_SPACE
+ { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // RES_UL_SPACE
+ { 0, 0 }, // RES_PAGEDESC
+ { SID_ATTR_PARA_PAGEBREAK, SFX_ITEM_POOLABLE }, // RES_BREAK
+ { 0, 0 }, // RES_CNTNT
+ { 0, SFX_ITEM_POOLABLE }, // RES_HEADER
+ { 0, SFX_ITEM_POOLABLE }, // RES_FOOTER
+ { 0, SFX_ITEM_POOLABLE }, // RES_PRINT
+ { FN_OPAQUE, SFX_ITEM_POOLABLE }, // RES_OPAQUE
+ { FN_SET_PROTECT, SFX_ITEM_POOLABLE }, // RES_PROTECT
+ { FN_SURROUND, SFX_ITEM_POOLABLE }, // RES_SURROUND
+ { FN_VERT_ORIENT, SFX_ITEM_POOLABLE }, // RES_VERT_ORIENT
+ { FN_HORI_ORIENT, SFX_ITEM_POOLABLE }, // RES_HORI_ORIENT
+ { 0, 0 }, // RES_ANCHOR
+ { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // RES_BACKGROUND
+ { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // RES_BOX
+ { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // RES_SHADOW
+ { SID_ATTR_MACROITEM, SFX_ITEM_POOLABLE }, // RES_FRMMACRO
+ { FN_ATTR_COLUMNS, SFX_ITEM_POOLABLE }, // RES_COL
+ { SID_ATTR_PARA_KEEP, SFX_ITEM_POOLABLE }, // RES_KEEP
+ { 0, SFX_ITEM_POOLABLE }, // RES_URL
+ { 0, SFX_ITEM_POOLABLE }, // RES_EDIT_IN_READONLY
+
+ { 0, SFX_ITEM_POOLABLE }, // RES_LAYOUT_SPLIT
+ { 0, 0 }, // RES_CHAIN
{ 0, SFX_ITEM_POOLABLE }, // RES_TEXTGRID
{ FN_FORMAT_LINENUMBER, SFX_ITEM_POOLABLE }, // RES_LINENUMBER
- { 0, SFX_ITEM_POOLABLE }, // RES_FTN_AT_TXTEND
- { 0, SFX_ITEM_POOLABLE }, // RES_END_AT_TXTEND
- { 0, SFX_ITEM_POOLABLE }, // RES_COLUMNBALANCE
+ { 0, SFX_ITEM_POOLABLE }, // RES_FTN_AT_TXTEND
+ { 0, SFX_ITEM_POOLABLE }, // RES_END_AT_TXTEND
+ { 0, SFX_ITEM_POOLABLE }, // RES_COLUMNBALANCE
- { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // RES_FRAMEDIR
+ { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // RES_FRAMEDIR
{ SID_ATTR_HDFT_DYNAMIC_SPACING, SFX_ITEM_POOLABLE }, // RES_HEADER_FOOTER_EAT_SPACING
{ FN_TABLE_ROW_SPLIT, SFX_ITEM_POOLABLE }, // RES_ROW_SPLIT
@@ -406,29 +406,29 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_STYLE_NAME
{ 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_CONDITIONAL_STYLE_NAME
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_MIRRORGRF
- { SID_ATTR_GRAF_CROP, SFX_ITEM_POOLABLE }, // RES_GRFATR_CROPGRF
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_ROTATION,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_LUMINANCE,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CONTRAST,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELR,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELG,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELB,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_GAMMA,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_INVERT,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_TRANSPARENCY,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY1,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY2,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY3,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY4,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY5,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY6,
-
- { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_FORMAT
- { 0, 0 }, // RES_BOXATR_FORMULA,
- { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_VALUE
-
- { 0, SFX_ITEM_POOLABLE } // RES_UNKNOWNATR_CONTAINER
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_MIRRORGRF
+ { SID_ATTR_GRAF_CROP, SFX_ITEM_POOLABLE }, // RES_GRFATR_CROPGRF
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_ROTATION,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_LUMINANCE,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CONTRAST,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELR,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELG,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELB,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_GAMMA,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_INVERT,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_TRANSPARENCY,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY1,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY2,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY3,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY4,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY5,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY6,
+
+ { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_FORMAT
+ { 0, 0 }, // RES_BOXATR_FORMULA,
+ { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_VALUE
+
+ { 0, SFX_ITEM_POOLABLE } // RES_UNKNOWNATR_CONTAINER
};
@@ -441,13 +441,13 @@ USHORT* SwAttrPool::pVersionMap5 = 0;
USHORT* SwAttrPool::pVersionMap6 = 0;
SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
-const sal_Char* __FAR_DATA pMarkToTable = "table";
-const sal_Char* __FAR_DATA pMarkToFrame = "frame";
-const sal_Char* __FAR_DATA pMarkToRegion = "region";
-const sal_Char* __FAR_DATA pMarkToText = "text";
-const sal_Char* __FAR_DATA pMarkToOutline = "outline";
-const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
-const sal_Char* __FAR_DATA pMarkToOLE = "ole";
+const sal_Char* __FAR_DATA pMarkToTable = "table";
+const sal_Char* __FAR_DATA pMarkToFrame = "frame";
+const sal_Char* __FAR_DATA pMarkToRegion = "region";
+const sal_Char* __FAR_DATA pMarkToText = "text";
+const sal_Char* __FAR_DATA pMarkToOutline = "outline";
+const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
+const sal_Char* __FAR_DATA pMarkToOLE = "ole";
SvPtrarr *pGlobalOLEExcludeList = 0;
@@ -460,7 +460,7 @@ CollatorWrapper* pCollator = 0, *pCaseCollator = 0;
::utl::TransliterationWrapper* pTransWrp = 0;
/******************************************************************************
- * void _InitCore()
+ * void _InitCore()
******************************************************************************/
salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper()
{
@@ -665,11 +665,11 @@ void _InitCore()
*(SvxFontItem*)aAttrTab[ RES_CHRATR_CTL_FONT - POOLATTR_BEGIN ] );
// 1. Version - neue Attribute:
- // - RES_CHRATR_BLINK
- // - RES_CHRATR_NOHYPHEN
- // - RES_CHRATR_NOLINEBREAK
- // - RES_PARATR_REGISTER
- // + 2 Dummies fuer die einzelnen "Bereiche"
+ // - RES_CHRATR_BLINK
+ // - RES_CHRATR_NOHYPHEN
+ // - RES_CHRATR_NOLINEBREAK
+ // - RES_PARATR_REGISTER
+ // + 2 Dummies fuer die einzelnen "Bereiche"
SwAttrPool::pVersionMap1 = new USHORT[ 60 ];
USHORT i;
for( i = 1; i <= 17; i++ )
@@ -684,7 +684,7 @@ void _InitCore()
SwAttrPool::pVersionMap1[ i-1 ] = i + 12;
// 2. Version - neue Attribute:
- // 10 Dummies fuer den Frame "Bereich"
+ // 10 Dummies fuer den Frame "Bereich"
SwAttrPool::pVersionMap2 = new USHORT[ 75 ];
for( i = 1; i <= 70; i++ )
SwAttrPool::pVersionMap2[ i-1 ] = i;
@@ -692,8 +692,8 @@ void _InitCore()
SwAttrPool::pVersionMap2[ i-1 ] = i + 10;
// 3. Version - neue Attribute:
- // neue Attribute und Dummies fuer die CJK-Version
- // und neue Grafik-Attribute
+ // neue Attribute und Dummies fuer die CJK-Version
+ // und neue Grafik-Attribute
SwAttrPool::pVersionMap3 = new USHORT[ 86 ];
for( i = 1; i <= 21; i++ )
SwAttrPool::pVersionMap3[ i-1 ] = i;
@@ -752,7 +752,7 @@ void _InitCore()
}
/******************************************************************************
- * void _FinitCore()
+ * void _FinitCore()
******************************************************************************/
diff --git a/sw/source/core/bastyp/ring.cxx b/sw/source/core/bastyp/ring.cxx
index 805a921248ab..be61374bb52b 100644
--- a/sw/source/core/bastyp/ring.cxx
+++ b/sw/source/core/bastyp/ring.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
|*
|* Ring::Ring()
|*
-|* Ersterstellung VB 02.07.91
+|* Ersterstellung VB 02.07.91
|* Letzte Aenderung JP 10.10.97
|*
*************************************************************************/
@@ -60,7 +60,7 @@ Ring::Ring( Ring *pObj )
|*
|* Ring::~Ring()
|*
-|* Ersterstellung VB 02.07.91
+|* Ersterstellung VB 02.07.91
|* Letzte Aenderung JP 10.10.97
|*
*************************************************************************/
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index d7a328df72f1..91ebbf5e16e1 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -2,7 +2,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
@@ -37,17 +37,17 @@
SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
#if OSL_DEBUG_LEVEL > 1
-#define INCREMENT( nVar ) ++nVar
+#define INCREMENT( nVar ) ++nVar
#else
#define INCREMENT( nVar )
#endif
/*************************************************************************
|*
-|* SwCache::Check()
+|* SwCache::Check()
|*
-|* Ersterstellung MA 23. Mar. 94
-|* Letzte Aenderung MA 23. Mar. 94
+|* Ersterstellung MA 23. Mar. 94
+|* Letzte Aenderung MA 23. Mar. 94
|*
|*************************************************************************/
@@ -96,10 +96,10 @@ void SwCache::Check()
/*************************************************************************
|*
-|* SwCache::SwCache(), ~SwCache()
+|* SwCache::SwCache(), ~SwCache()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -143,31 +143,31 @@ SwCache::~SwCache()
#if OSL_DEBUG_LEVEL > 1
{
ByteString sOut( aName ); sOut += '\n';
- (( sOut += "Anzahl neuer Eintraege: " )
+ (( sOut += "Anzahl neuer Eintraege: " )
+= ByteString::CreateFromInt32( nAppend ))+= '\n';
- (( sOut += "Anzahl Insert auf freie Plaetze: " )
+ (( sOut += "Anzahl Insert auf freie Plaetze: " )
+= ByteString::CreateFromInt32( nInsertFree ))+= '\n';
- (( sOut += "Anzahl Ersetzungen: " )
+ (( sOut += "Anzahl Ersetzungen: " )
+= ByteString::CreateFromInt32( nReplace ))+= '\n';
- (( sOut += "Anzahl Erfolgreicher Get's: " )
+ (( sOut += "Anzahl Erfolgreicher Get's: " )
+= ByteString::CreateFromInt32( nGetSuccess ))+= '\n';
- (( sOut += "Anzahl Fehlgeschlagener Get's: " )
+ (( sOut += "Anzahl Fehlgeschlagener Get's: " )
+= ByteString::CreateFromInt32( nGetFail ))+= '\n';
- (( sOut += "Anzahl Umsortierungen (LRU): " )
+ (( sOut += "Anzahl Umsortierungen (LRU): " )
+= ByteString::CreateFromInt32( nToTop ))+= '\n';
- (( sOut += "Anzahl Loeschungen: " )
+ (( sOut += "Anzahl Loeschungen: " )
+= ByteString::CreateFromInt32( nDelete ))+= '\n';
- (( sOut += "Anzahl Get's ohne Index: " )
+ (( sOut += "Anzahl Get's ohne Index: " )
+= ByteString::CreateFromInt32( nGetSeek ))+= '\n';
- (( sOut += "Anzahl Seek fuer Get ohne Index: " )
+ (( sOut += "Anzahl Seek fuer Get ohne Index: " )
+= ByteString::CreateFromInt32( nAverageSeekCnt ))+= '\n';
- (( sOut += "Anzahl Flush-Aufrufe: " )
+ (( sOut += "Anzahl Flush-Aufrufe: " )
+= ByteString::CreateFromInt32( nFlushCnt ))+= '\n';
- (( sOut += "Anzahl geflush'ter Objekte: " )
+ (( sOut += "Anzahl geflush'ter Objekte: " )
+= ByteString::CreateFromInt32( nFlushedObjects ))+= '\n';
- (( sOut += "Anzahl Cache-Erweiterungen: " )
+ (( sOut += "Anzahl Cache-Erweiterungen: " )
+= ByteString::CreateFromInt32( nIncreaseMax ))+= '\n';
- (( sOut += "Anzahl Cache-Verkleinerungen: " )
+ (( sOut += "Anzahl Cache-Verkleinerungen: " )
+= ByteString::CreateFromInt32( nDecreaseMax ))+= '\n';
DBG_ERROR( sOut.GetBuffer() );
@@ -179,10 +179,10 @@ SwCache::~SwCache()
/*************************************************************************
|*
-|* SwCache::Flush()
+|* SwCache::Flush()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -207,7 +207,7 @@ void SwCache::Flush( const BYTE )
pObj = pTmp;
}
else
- { pLast->SetNext( pObj );
+ { pLast->SetNext( pObj );
pObj->SetPrev( pLast );
pLast = pObj;
pTmp = pObj->GetNext();
@@ -230,10 +230,10 @@ void SwCache::Flush( const BYTE )
/*************************************************************************
|*
-|* SwCache::ToTop()
+|* SwCache::ToTop()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 24. Apr. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 24. Apr. 95
|*
|*************************************************************************/
@@ -243,13 +243,13 @@ void SwCache::ToTop( SwCacheObj *pObj )
INCREMENT( nToTop );
//Objekt aus der LRU-Kette ausschneiden und am Anfang einfuegen.
- if ( pRealFirst == pObj ) //pFirst wurde vom Aufrufer geprueft!
- { CHECK;
+ if ( pRealFirst == pObj ) //pFirst wurde vom Aufrufer geprueft!
+ { CHECK;
return;
}
if ( !pRealFirst )
- { //Der erste wird eingetragen.
+ { //Der erste wird eingetragen.
OSL_ENSURE( !pFirst && !pLast, "First not first." );
pRealFirst = pFirst = pLast = pObj;
CHECK;
@@ -300,10 +300,10 @@ void SwCache::ToTop( SwCacheObj *pObj )
/*************************************************************************
|*
-|* SwCache::Get()
+|* SwCache::Get()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
@@ -356,10 +356,10 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
/*************************************************************************
|*
-|* SwCache::Delete()
+|* SwCache::Delete()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -404,7 +404,7 @@ void SwCache::DeleteObj( SwCacheObj *pObj )
{
SwCacheObj *pTmpObj = operator[](i);
if ( !pTmpObj )
- { SwCacheObjArr::Remove( i, 1 );
+ { SwCacheObjArr::Remove( i, 1 );
--i;
}
else
@@ -440,10 +440,10 @@ void SwCache::Delete( const void *pOwner )
/*************************************************************************
|*
-|* SwCache::Insert()
+|* SwCache::Insert()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 20. Sep. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 20. Sep. 94
|*
|*************************************************************************/
@@ -503,11 +503,11 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
pNew->SetCachePos( nPos );
//Anstelle von ToTop, einfach als pFirst einfuegen.
-// ToTop( nPos );
+// ToTop( nPos );
if ( pFirst )
{
if ( pFirst->GetPrev() )
- { pFirst->GetPrev()->SetNext( pNew );
+ { pFirst->GetPrev()->SetNext( pNew );
pNew->SetPrev( pFirst->GetPrev() );
}
pFirst->SetPrev( pNew );
@@ -527,10 +527,10 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
/*************************************************************************
|*
-|* SwCache::SetLRUOfst()
+|* SwCache::SetLRUOfst()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -554,10 +554,10 @@ void SwCache::SetLRUOfst( const USHORT nOfst )
/*************************************************************************
|*
-|* SwCacheObj::SwCacheObj()
+|* SwCacheObj::SwCacheObj()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 24. Nov. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 24. Nov. 95
|*
|*************************************************************************/
@@ -579,10 +579,10 @@ SwCacheObj::~SwCacheObj()
/*************************************************************************
|*
-|* SwCacheObj::SetLock(), Unlock()
+|* SwCacheObj::SetLock(), Unlock()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -614,10 +614,10 @@ SwCacheAccess::~SwCacheAccess()
/*************************************************************************
|*
-|* SwCacheAccess::Get()
+|* SwCacheAccess::Get()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 04. Apr. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 04. Apr. 95
|*
|*************************************************************************/
@@ -638,10 +638,10 @@ void SwCacheAccess::_Get()
/*************************************************************************
|*
-|* SwCacheAccess::IsAvailable()
+|* SwCacheAccess::IsAvailable()
|*
-|* Ersterstellung MA 23. Mar. 94
-|* Letzte Aenderung MA 23. Mar. 94
+|* Ersterstellung MA 23. Mar. 94
+|* Letzte Aenderung MA 23. Mar. 94
|*
|*************************************************************************/
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 24a702c9971c..39a30e4d3222 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -2,7 +2,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
@@ -39,10 +39,10 @@
/*************************************************************************
|*
-|* SwRect::SwRect()
+|* SwRect::SwRect()
|*
-|* Ersterstellung MA 02. Feb. 93
-|* Letzte Aenderung MA 05. Sep. 93
+|* Ersterstellung MA 02. Feb. 93
+|* Letzte Aenderung MA 05. Sep. 93
|*
|*************************************************************************/
@@ -59,10 +59,10 @@ SwRect::SwRect( const Rectangle &rRect ) :
/*************************************************************************
|*
-|* SwRect::Center()
+|* SwRect::Center()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
Point SwRect::Center() const
@@ -80,10 +80,10 @@ Point SwRect::Center() const
/*************************************************************************
|*
-|* SwRect::Union()
+|* SwRect::Union()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
@@ -105,10 +105,10 @@ SwRect& SwRect::Union( const SwRect& rRect )
}
/*************************************************************************
|*
-|* SwRect::Intersection(), _Intersection()
+|* SwRect::Intersection(), _Intersection()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 05. Sep. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 05. Sep. 93
|*
|*************************************************************************/
@@ -160,10 +160,10 @@ SwRect& SwRect::_Intersection( const SwRect& rRect )
}
/*************************************************************************
|*
-|* SwRect::IsInside()
+|* SwRect::IsInside()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
@@ -176,9 +176,9 @@ BOOL SwRect::IsInside( const SwRect& rRect ) const
const long nrRight = rRect.Right();
const long nrBottom= rRect.Bottom();
return (Left() <= rRect.Left()) && (rRect.Left()<= nRight) &&
- (Left() <= nrRight) && (nrRight <= nRight) &&
- (Top() <= rRect.Top()) && (rRect.Top() <= nBottom) &&
- (Top() <= nrBottom) && (nrBottom <= nBottom);
+ (Left() <= nrRight) && (nrRight <= nRight) &&
+ (Top() <= rRect.Top()) && (rRect.Top() <= nBottom) &&
+ (Top() <= nrBottom) && (nrBottom <= nBottom);
}
@@ -204,10 +204,10 @@ BOOL SwRect::IsNear( const Point& rPoint, long nTolerance ) const
/*************************************************************************
|*
-|* SwRect::IsOver()
+|* SwRect::IsOver()
|*
-|* Ersterstellung MA 25. Feb. 94
-|* Letzte Aenderung MA 27. Jun. 96
+|* Ersterstellung MA 25. Feb. 94
+|* Letzte Aenderung MA 27. Jun. 96
|*
|*************************************************************************/
@@ -215,7 +215,7 @@ BOOL SwRect::IsNear( const Point& rPoint, long nTolerance ) const
BOOL SwRect::IsOver( const SwRect& rRect ) const
{
- return (Top() <= rRect.Bottom())
+ return (Top() <= rRect.Bottom())
&& (Left() <= rRect.Right())
&& (Right() >= rRect.Left())
&& (Bottom()>= rRect.Top()) ? TRUE : FALSE;
@@ -223,10 +223,10 @@ BOOL SwRect::IsOver( const SwRect& rRect ) const
/*************************************************************************
|*
-|* SwRect::Justify()
+|* SwRect::Justify()
|*
-|* Ersterstellung MA 10. Oct. 94
-|* Letzte Aenderung MA 23. Oct. 96
+|* Ersterstellung MA 10. Oct. 94
+|* Letzte Aenderung MA 23. Oct. 96
|*
|*************************************************************************/
@@ -319,7 +319,7 @@ void SwRect::SetLowerLeftCorner( const Point& rNew )
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * operator<<( ostream&, SwRect&)
+ * operator<<( ostream&, SwRect&)
*************************************************************************/
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index fea6620d1b45..b0b4931d0938 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -2,7 +2,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
@@ -42,10 +42,10 @@ SV_IMPL_VARARR( SwRects, SwRect );
/*************************************************************************
|*
-|* SwRegionRects::SwRegionRects()
+|* SwRegionRects::SwRegionRects()
|*
-|* Ersterstellung MA 28. Oct. 92
-|* Letzte Aenderung MA 01. Feb. 93
+|* Ersterstellung MA 28. Oct. 92
+|* Letzte Aenderung MA 01. Feb. 93
|*
|*************************************************************************/
@@ -58,7 +58,7 @@ SwRegionRects::SwRegionRects( const SwRect &rStartRect, USHORT nInit,
}
/*************************************************************************
- * inline InsertRect()
+ * inline InsertRect()
*
* InsertRect() wird nur von operator-=() gerufen.
* Wenn bDel == TRUE ist, dann wird das Rect an der Position nPos mit
@@ -80,15 +80,15 @@ inline void SwRegionRects::InsertRect( const SwRect &rRect, const USHORT nPos,
/*************************************************************************
|*
-|* SwRegionRects::operator-=()
+|* SwRegionRects::operator-=()
|*
-|* Beschreibung Alle Ueberschneidungen der Rechtecke, die sich
-|* gerade im Array befinden, mit dem uebergebenen Rechteck werden
-|* entfernt.
-|* Dazu muessen die vorhandenen Rechtecke entweder aufgeteilt oder
-|* geloescht werden.
-|* Ersterstellung MA 28. Oct. 92
-|* Letzte Aenderung MA 09. Sep. 93
+|* Beschreibung Alle Ueberschneidungen der Rechtecke, die sich
+|* gerade im Array befinden, mit dem uebergebenen Rechteck werden
+|* entfernt.
+|* Dazu muessen die vorhandenen Rechtecke entweder aufgeteilt oder
+|* geloescht werden.
+|* Ersterstellung MA 28. Oct. 92
+|* Letzte Aenderung MA 09. Sep. 93
|*
|*************************************************************************/
@@ -141,8 +141,8 @@ void SwRegionRects::operator-=( const SwRect &rRect )
if( bDel )
{
Remove( i );
- --i; //Damit wir keinen uebergehen.
- --nMax; //Damit wir keinen zuviel verarbeiten.
+ --i; //Damit wir keinen uebergehen.
+ --nMax; //Damit wir keinen zuviel verarbeiten.
}
}
}
@@ -150,7 +150,7 @@ void SwRegionRects::operator-=( const SwRect &rRect )
}
/*************************************************************************
- * SwRegionRects::Invert()
+ * SwRegionRects::Invert()
*
* Bezugspunkt ist aOrigin, das Original-SRectangle.
* Aus Loechern werden Flaechen, aus Flaechen werden Loecher.
@@ -193,11 +193,11 @@ void SwRegionRects::Invert()
}
/*************************************************************************
|*
-|* SwRegionRects::Compress()
+|* SwRegionRects::Compress()
|*
-|* Beschreibung Zusammenfassen von benachbarten Rechtecken.
-|* Ersterstellung MA 16. Apr. 93
-|* Letzte Aenderung MA 21. Apr. 93
+|* Beschreibung Zusammenfassen von benachbarten Rechtecken.
+|* Ersterstellung MA 16. Apr. 93
+|* Letzte Aenderung MA 21. Apr. 93
|*
|*************************************************************************/
inline SwTwips CalcArea( const SwRect &rRect )
@@ -235,7 +235,7 @@ void SwRegionRects::Compress( BOOL bFuzzy )
//moeglichst wenig einzelne Paints zu haben darf die Flaeche
//der Union ruhig ein bischen groesser sein
//( 9622 * 141.5 = 1361513 ~= ein virtel Zentimeter ueber die
- // Breite einer DINA4 Seite)
+ // Breite einer DINA4 Seite)
const long nFuzzy = bFuzzy ? 1361513 : 0;
SwRect aUnion( *(pData + i) );aUnion.Union( *(pData + j) );
SwRect aInter( *(pData + i) );aInter.Intersection( *(pData + j));
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 25c934b7a2f2..ce0a56d6d747 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -2,7 +2,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
@@ -57,9 +57,9 @@
using namespace com::sun::star;
-ByteString aEmptyByteStr; // Konstante Strings
-String aEmptyStr; // Konstante Strings
-String aDotStr('.'); // Konstante Strings
+ByteString aEmptyByteStr; // Konstante Strings
+String aEmptyStr; // Konstante Strings
+String aDotStr('.'); // Konstante Strings
IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet, 25, 25 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode, 20, 20 )
@@ -75,16 +75,16 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints, 25, 25 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs, 100, 100 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt, 10, 10 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt, 10, 10 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt, 50, 50 )
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index a7117d13ce56..b87ad1fe2fdd 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include "tabcol.hxx"
-#include <errhdl.hxx> // fuer Create-Methoden
+#include <errhdl.hxx> // fuer Create-Methoden
SwTabCols::SwTabCols( USHORT nSize ) :
@@ -73,8 +73,8 @@ SwTabCols::SwTabCols( const SwTabCols& rCpy ) :
SwTabCols &SwTabCols::operator=( const SwTabCols& rCpy )
{
nLeftMin = rCpy.GetLeftMin();
- nLeft = rCpy.GetLeft();
- nRight = rCpy.GetRight();
+ nLeft = rCpy.GetLeft();
+ nRight = rCpy.GetRight();
nRightMax= rCpy.GetRightMax();
bLastRowAllowedToChange = rCpy.IsLastRowAllowedToChange();
@@ -89,8 +89,8 @@ BOOL SwTabCols::operator==( const SwTabCols& rCmp ) const
USHORT i;
if ( !(nLeftMin == rCmp.GetLeftMin() &&
- nLeft == rCmp.GetLeft() &&
- nRight == rCmp.GetRight() &&
+ nLeft == rCmp.GetLeft() &&
+ nRight == rCmp.GetRight() &&
nRightMax== rCmp.GetRightMax()&&
bLastRowAllowedToChange== rCmp.IsLastRowAllowedToChange() &&
Count()== rCmp.Count()) )
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx
index 45e5c0c7291e..06b9f709ecbe 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/crsr/BlockCursor.hxx b/sw/source/core/crsr/BlockCursor.hxx
index aced7c582cd1..bce1ea912e30 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.hxx
@@ -2,7 +2,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
@@ -34,6 +34,6 @@ struct SwPosition;
IBlockCursor *createBlockCursor(const SwCrsrShell& rCrsrSh, const SwPosition &rPos);
-#endif //_BLOCKURSOR_HXX
+#endif //_BLOCKURSOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/IBlockCursor.hxx b/sw/source/core/crsr/IBlockCursor.hxx
index da3c3c3ef383..5ac4f4bbb358 100644
--- a/sw/source/core/crsr/IBlockCursor.hxx
+++ b/sw/source/core/crsr/IBlockCursor.hxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@ class Point;
/** Access to the block cursor
A block cursor contains a SwShellCrsr and additional information about
- the rectangle which has been created by pressing the mouse button and
+ the rectangle which has been created by pressing the mouse button and
moving the mouse.
This interface provides access to the SwShellCrsr and to start and end
point of the mouse movement.
@@ -51,7 +51,7 @@ class Point;
virtual SwShellCrsr& getShellCrsr() = 0;
/** Defines the starting vertex of the block selection
-
+
@param rPt
rPt should contain the document coordinates of the mouse cursor when
the block selection starts (MouseButtonDown)
@@ -59,7 +59,7 @@ class Point;
virtual void setStartPoint( const Point &rPt ) = 0;
/** Defines the ending vertex of the block selection
-
+
@param rPt
rPt should contain the document coordinates of the mouse cursor when
the block selection has started and the mouse has been moved (MouseMove)
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 33a7b1c43897..0641e96d27f3 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -2,7 +2,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
@@ -88,7 +88,7 @@ namespace
SwPaM aStartPaM(rStart);
SwPaM aEndPaM(rEnd);
io_pDoc->StartUndo(UNDO_UI_REPLACE, NULL);
- if( ( ch_start != aStartMark ) && ( rStart != rEnd ) )
+ if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
{
io_pDoc->InsertString(aStartPaM, aStartMark);
rStart.nContent--;
@@ -336,6 +336,14 @@ namespace sw { namespace mark
void CheckboxFieldmark::SetChecked(bool checked)
{
(*GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
+ bool bOld( IsChecked() );
+ if ( bOld != checked )
+ {
+ // mark document as modified
+ SwDoc *const pDoc( GetMarkPos().GetDoc() );
+ if ( pDoc )
+ pDoc->SetModified();
+ }
}
bool CheckboxFieldmark::IsChecked() const
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 1abc4fb46918..ea998febda1d 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -2,7 +2,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
@@ -91,7 +91,7 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
SwCallLink::~SwCallLink()
{
- if( !nNdTyp || !rShell.bCallChgLnk ) // siehe ctor
+ if( !nNdTyp || !rShell.bCallChgLnk ) // siehe ctor
return ;
// wird ueber Nodes getravellt, Formate ueberpruefen und im neuen
@@ -175,8 +175,8 @@ SwCallLink::~SwCallLink()
// und sich nicht der Frame geaendert hat (Spalten!)
if( nLeftFrmPos == SwCallLink::GetFrm( (SwTxtNode&)*pCNd, nAktCntnt,
!rShell.ActionPend() ) &&
- (( nCmp = nCntnt ) + 1 == nAktCntnt || // Right
- nCntnt -1 == ( nCmp = nAktCntnt )) ) // Left
+ (( nCmp = nCntnt ) + 1 == nAktCntnt || // Right
+ nCntnt -1 == ( nCmp = nAktCntnt )) ) // Left
{
if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & Sele
++nCmp;
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 24f6b3aa0bab..4d238b36649d 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -2,7 +2,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
@@ -54,6 +54,6 @@ public:
-#endif // _CALLNK_HXX
+#endif // _CALLNK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 33a2c686ebaa..b3fba00d7204 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@ namespace
}
}
- // returns true if the Cursor had been rolled back
+ // returns true if the Cursor had been rolled back
bool RollbackIfIllegal()
{
if(m_pCrsr->IsSelOvr(nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION
@@ -157,7 +157,7 @@ bool SwCrsrShell::GoNextBookmark()
back_inserter(vCandidates),
&lcl_IsInvisibleBookmark);
- // watch Crsr-Moves
+ // watch Crsr-Moves
CrsrStateHelper aCrsrSt(*this);
IDocumentMarkAccess::const_iterator_t ppMark = vCandidates.begin();
for(; ppMark!=vCandidates.end(); ++ppMark)
@@ -196,7 +196,7 @@ bool SwCrsrShell::GoPrevBookmark()
vCandidates.end(),
&lcl_ReverseMarkOrderingByEnd);
- // watch Crsr-Moves
+ // watch Crsr-Moves
CrsrStateHelper aCrsrSt(*this);
IDocumentMarkAccess::const_iterator_t ppMark = vCandidates.begin();
for(; ppMark!=vCandidates.end(); ++ppMark)
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index bdfbd404441d..97e093b36932 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b8179bb9f771..334e8188f5ff 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -61,7 +61,7 @@
#include <scriptinfo.hxx>
#include <globdoc.hxx>
#include <pamtyp.hxx>
-#include <mdiexp.hxx> // ...Percent()
+#include <mdiexp.hxx> // ...Percent()
#include <fmteiro.hxx>
#include <wrong.hxx> // SMARTTAGS
#include <unotextrange.hxx> // SMARTTAGS
@@ -150,7 +150,7 @@ SwPaM * SwCrsrShell::CreateCrsr()
pCurCrsr->DeleteMark();
UpdateCrsr( SwCrsrShell::SCROLLWIN );
-// return pCurCrsr;
+// return pCurCrsr;
return pNew;
}
@@ -265,11 +265,11 @@ if( GetWin() )
GetDoc()->UpdateNumRule();
// Task: 76923: dont show the cursor in the ViewShell::EndAction() - call.
- // Only the UpdateCrsr shows the cursor.
+ // Only the UpdateCrsr shows the cursor.
BOOL bSavSVCrsrVis = bSVCrsrVis;
bSVCrsrVis = FALSE;
- ViewShell::EndAction( bIdleEnd ); //der ViewShell den Vortritt lassen
+ ViewShell::EndAction( bIdleEnd ); //der ViewShell den Vortritt lassen
bSVCrsrVis = bSavSVCrsrVis;
@@ -284,9 +284,9 @@ if( GetWin() )
if( !BasicActionPend() )
{
//JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction
- // der Cursor geupdatet werden; um z.B. den
- // TabellenCursor zu erzeugen. Im UpdateCrsr wird
- // das jetzt beruecksichtigt!
+ // der Cursor geupdatet werden; um z.B. den
+ // TabellenCursor zu erzeugen. Im UpdateCrsr wird
+ // das jetzt beruecksichtigt!
UpdateCrsr( SwCrsrShell::CHKRANGE, bIdleEnd );
{
@@ -299,7 +299,7 @@ if( GetWin() )
if( bCallChgLnk && bChgCallFlag && aChgLnk.IsSet() )
{
aChgLnk.Call( this );
- bChgCallFlag = FALSE; // Flag zuruecksetzen
+ bChgCallFlag = FALSE; // Flag zuruecksetzen
}
}
return;
@@ -308,7 +308,7 @@ if( GetWin() )
USHORT nParm = SwCrsrShell::CHKRANGE;
if ( !bIdleEnd )
nParm |= SwCrsrShell::SCROLLWIN;
- UpdateCrsr( nParm, bIdleEnd ); // Cursor-Aenderungen anzeigen
+ UpdateCrsr( nParm, bIdleEnd ); // Cursor-Aenderungen anzeigen
{
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
@@ -325,7 +325,7 @@ if( GetWin() )
if( bCallChgLnk && bChgCallFlag && aChgLnk.IsSet() )
{
aChgLnk.Call( this );
- bChgCallFlag = FALSE; // Flag zuruecksetzen
+ bChgCallFlag = FALSE; // Flag zuruecksetzen
}
}
@@ -482,7 +482,7 @@ BOOL SwCrsrShell::UpDown( BOOL bUp, USHORT nCnt )
if( bRet )
{
- eMvState = MV_UPDOWN; // Status fuers Crsr-Travelling - GetCrsrOfst
+ eMvState = MV_UPDOWN; // Status fuers Crsr-Travelling - GetCrsrOfst
if( !ActionPend() )
{
CrsrFlag eUpdtMode = SwCrsrShell::SCROLLWIN;
@@ -500,7 +500,7 @@ BOOL SwCrsrShell::LRMargin( BOOL bLeft, BOOL bAPI)
{
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
SET_CURR_SHELL( this );
- eMvState = MV_LEFTMARGIN; // Status fuers Crsr-Travelling - GetCrsrOfst
+ eMvState = MV_LEFTMARGIN; // Status fuers Crsr-Travelling - GetCrsrOfst
const BOOL bTableMode = IsTableMode();
SwShellCrsr* pTmpCrsr = getShellCrsr( true );
@@ -547,7 +547,7 @@ BOOL SwCrsrShell::SttEndDoc( BOOL bStt )
if( bRet )
{
if( bStt )
- pTmpCrsr->GetPtPos().Y() = 0; // expl. 0 setzen (TabellenHeader)
+ pTmpCrsr->GetPtPos().Y() = 0; // expl. 0 setzen (TabellenHeader)
if( pBlockCrsr )
{
pBlockCrsr->clearPoints();
@@ -774,12 +774,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, BOOL bOnlyText, bool bBlock )
{
// es gibt keinen gueltigen Inhalt -> Cursor verstecken
pVisCrsr->Hide(); // sichtbaren Cursor immer verstecken
- eMvState = MV_NONE; // Status fuers Crsr-Travelling
+ eMvState = MV_NONE; // Status fuers Crsr-Travelling
bAllProtect = TRUE;
if( GetDoc()->GetDocShell() )
{
GetDoc()->GetDocShell()->SetReadOnlyUI( TRUE );
- CallChgLnk(); // UI bescheid sagen!
+ CallChgLnk(); // UI bescheid sagen!
}
}
}
@@ -841,8 +841,8 @@ void SwCrsrShell::ClearMark()
if( pCurCrsr->HasMark() )
{
// falls doch nicht alle Indizies richtig verschoben werden
- // (z.B.: Kopf-/Fusszeile loeschen) den Content-Anteil vom
- // Mark aufs Nodes-Array setzen
+ // (z.B.: Kopf-/Fusszeile loeschen) den Content-Anteil vom
+ // Mark aufs Nodes-Array setzen
SwPosition& rPos = *pCurCrsr->GetMark();
rPos.nNode.Assign( pDoc->GetNodes(), 0 );
rPos.nContent.Assign( 0, 0 );
@@ -859,8 +859,8 @@ void SwCrsrShell::ClearMark()
if( !pCurCrsr->HasMark() )
return;
// falls doch nicht alle Indizies richtig verschoben werden
- // (z.B.: Kopf-/Fusszeile loeschen) den Content-Anteil vom
- // Mark aufs Nodes-Array setzen
+ // (z.B.: Kopf-/Fusszeile loeschen) den Content-Anteil vom
+ // Mark aufs Nodes-Array setzen
SwPosition& rPos = *pCurCrsr->GetMark();
rPos.nNode.Assign( pDoc->GetNodes(), 0 );
rPos.nContent.Assign( 0, 0 );
@@ -916,8 +916,8 @@ BOOL SwCrsrShell::ChgCurrPam( const Point & rPt,
if( pCmp->HasMark() &&
*pCmp->Start() <= aPtPos && *pCmp->End() > aPtPos )
{
- if( bTstOnly || pCurCrsr == pCmp ) // ist der aktuelle.
- return TRUE; // return ohne Update
+ if( bTstOnly || pCurCrsr == pCmp ) // ist der aktuelle.
+ return TRUE; // return ohne Update
pCurCrsr = pCmp;
UpdateCrsr(); // Cursor steht schon richtig
@@ -1172,7 +1172,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
BOOL bVis = FALSE;
// ist Cursor sichtbar, dann verstecke den SV-Cursor
- if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) ) //JP 18.06.97: ???
+ if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) ) //JP 18.06.97: ???
{
bVis = TRUE;
pVisCrsr->Hide();
@@ -1184,7 +1184,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
if( bHasFocus && !bBasicHideCrsr )
{
SwShellCrsr* pAktCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
-// pAktCrsr->Invalidate( aRect );
+// pAktCrsr->Invalidate( aRect );
if( !ActionPend() )
{
// damit nicht rechts/unten die Raender abgeschnitten werden
@@ -1268,7 +1268,7 @@ void SwCrsrShell::UpdateCrsrPos()
}
// JP 30.04.99: Bug 65475 - falls Point/Mark in versteckten Bereichen
-// stehen, so mussen diese daraus verschoben werden
+// stehen, so mussen diese daraus verschoben werden
static void lcl_CheckHiddenSection( SwNodeIndex& rIdx )
{
const SwSectionNode* pSectNd = rIdx.GetNode().FindSectionNode();
@@ -1332,10 +1332,10 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
// erfrage den Count fuer die Start-/End-Actions und ob die Shell
// ueberhaupt den Focus hat
-// if( ActionPend() /*|| !bHasFocus*/ )
+// if( ActionPend() /*|| !bHasFocus*/ )
//JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction der
- // Cursor geupdatet werden; um z.B. den TabellenCursor zu
- // erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
+ // Cursor geupdatet werden; um z.B. den TabellenCursor zu
+ // erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
if( ActionPend() && BasicActionPend() )
{
if ( eFlags & SwCrsrShell::READONLY )
@@ -1353,8 +1353,8 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
eFlags |= SwCrsrShell::READONLY;
}
- if( eFlags & SwCrsrShell::CHKRANGE ) // alle Cursor-Bewegungen auf
- CheckRange( pCurCrsr ); // ueberlappende Bereiche testen
+ if( eFlags & SwCrsrShell::CHKRANGE ) // alle Cursor-Bewegungen auf
+ CheckRange( pCurCrsr ); // ueberlappende Bereiche testen
if( !bIdleEnd )
CheckTblBoxCntnt();
@@ -1374,7 +1374,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
SwPosition* pPos = pITmpCrsr->GetPoint();
// JP 30.04.99: Bug 65475 - falls Point/Mark in versteckten Bereichen
- // stehen, so mussen diese daraus verschoben werden
+ // stehen, so mussen diese daraus verschoben werden
lcl_CheckHiddenSection( pPos->nNode );
lcl_CheckHiddenSection( pITmpCrsr->GetMark()->nNode );
@@ -1506,7 +1506,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
-aCharRect.Width() : aCharRect.Height();
pVisCrsr->Show(); // wieder anzeigen
}
- eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst
+ eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst
if( pTblFrm && Imp()->IsAccessible() )
Imp()->InvalidateAccessibleCursorPosition( pTblFrm );
return;
@@ -1546,12 +1546,12 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
bChgState = FALSE;
else
{
- eMvState = MV_NONE; // Status fuers Crsr-Travelling
+ eMvState = MV_NONE; // Status fuers Crsr-Travelling
bAllProtect = TRUE;
if( GetDoc()->GetDocShell() )
{
GetDoc()->GetDocShell()->SetReadOnlyUI( TRUE );
- CallChgLnk(); // UI bescheid sagen!
+ CallChgLnk(); // UI bescheid sagen!
}
return;
}
@@ -1565,7 +1565,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
GetDoc()->GetDocShell()->IsReadOnlyUI() )
{
GetDoc()->GetDocShell()->SetReadOnlyUI( FALSE );
- CallChgLnk(); // UI bescheid sagen!
+ CallChgLnk(); // UI bescheid sagen!
}
}
}
@@ -1655,7 +1655,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
if( GetDoc()->GetDocShell() )
{
GetDoc()->GetDocShell()->SetReadOnlyUI( TRUE );
- CallChgLnk(); // UI bescheid sagen!
+ CallChgLnk(); // UI bescheid sagen!
}
return;
}
@@ -1669,7 +1669,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
GetDoc()->GetDocShell()->IsReadOnlyUI() )
{
GetDoc()->GetDocShell()->SetReadOnlyUI( FALSE );
- CallChgLnk(); // UI bescheid sagen!
+ CallChgLnk(); // UI bescheid sagen!
}
bAllProtect = FALSE;
bAgainst = TRUE; // nochmal den richigen Frm suchen
@@ -1699,7 +1699,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
rPt = aCharRect.Center();
pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
}
-// ALIGNRECT( aCharRect );
+// ALIGNRECT( aCharRect );
if( !pShellCrsr->HasMark() )
aCrsrHeight = aTmpState.aRealHeight;
@@ -1734,7 +1734,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
pShellCrsr->GetPtPos().X() = aCharRect.Left();
pShellCrsr->GetPtPos().Y() = aCharRect.Top();
- if( !(eFlags & SwCrsrShell::UPDOWN )) // alte Pos. von Up/Down loeschen
+ if( !(eFlags & SwCrsrShell::UPDOWN )) // alte Pos. von Up/Down loeschen
{
pFrm->Calc();
nUpDownX = pFrm->IsVertical() ?
@@ -1748,8 +1748,8 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
!IsCrsrReadonly() || GetViewOptions()->IsSelectionInReadonly()) )
{
//JP 30.04.99: damit das EndAction, beim evtuellen Scrollen, den
- // SV-Crsr nicht wieder sichtbar macht, wird hier das Flag
- // gesichert und zurueckgesetzt.
+ // SV-Crsr nicht wieder sichtbar macht, wird hier das Flag
+ // gesichert und zurueckgesetzt.
BOOL bSav = bSVCrsrVis; bSVCrsrVis = FALSE;
MakeSelVisible();
bSVCrsrVis = bSav;
@@ -1779,7 +1779,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
}
}
- eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst
+ eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst
if( pFrm && Imp()->IsAccessible() )
Imp()->InvalidateAccessibleCursorPosition( pFrm );
@@ -2188,12 +2188,12 @@ void SwCrsrShell::CallChgLnk()
// innerhalb von Start-/End-Action kein Call, sondern nur merken,
// das sich etwas geaendert hat. Wird bei EndAction beachtet.
if( BasicActionPend() )
- bChgCallFlag = TRUE; // das Change merken
+ bChgCallFlag = TRUE; // das Change merken
else if( aChgLnk.IsSet() )
{
if( bCallChgLnk )
aChgLnk.Call( this );
- bChgCallFlag = FALSE; // Flag zuruecksetzen
+ bChgCallFlag = FALSE; // Flag zuruecksetzen
}
}
@@ -2237,7 +2237,7 @@ String SwCrsrShell::GetText() const
// hole vom Start/Ende der akt. SSelection das nte Zeichen
sal_Unicode SwCrsrShell::GetChar( BOOL bEnd, long nOffset )
{
- if( IsTableMode() ) // im TabelleMode nicht moeglich
+ if( IsTableMode() ) // im TabelleMode nicht moeglich
return 0;
const SwPosition* pPos = !pCurCrsr->HasMark() ? pCurCrsr->GetPoint()
@@ -2262,7 +2262,7 @@ sal_Unicode SwCrsrShell::GetChar( BOOL bEnd, long nOffset )
BOOL SwCrsrShell::ExtendSelection( BOOL bEnd, xub_StrLen nCount )
{
if( !pCurCrsr->HasMark() || IsTableMode() )
- return FALSE; // keine Selektion
+ return FALSE; // keine Selektion
SwPosition* pPos = bEnd ? pCurCrsr->End() : pCurCrsr->Start();
SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
@@ -2274,14 +2274,14 @@ BOOL SwCrsrShell::ExtendSelection( BOOL bEnd, xub_StrLen nCount )
if( ( nPos + nCount ) <= pTxtNd->GetTxt().Len() )
nPos = nPos + nCount;
else
- return FALSE; // nicht mehr moeglich
+ return FALSE; // nicht mehr moeglich
}
else if( nPos >= nCount )
nPos = nPos - nCount;
else
- return FALSE; // nicht mehr moeglich
+ return FALSE; // nicht mehr moeglich
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
pPos->nContent = nPos;
UpdateCrsr();
@@ -2322,9 +2322,9 @@ BOOL SwCrsrShell::SetVisCrsr( const Point &rPt )
SwRect aTmp( aCharRect );
pFrm->GetCharRect( aCharRect, aPos, &aTmpState );
-// ALIGNRECT( aCharRect );
+// ALIGNRECT( aCharRect );
- if( aTmp == aCharRect && // BUG 10137: bleibt der Cursor auf der
+ if( aTmp == aCharRect && // BUG 10137: bleibt der Cursor auf der
pVisCrsr->IsVisible() ) // Position nicht hidden & showen
return TRUE;
@@ -2336,8 +2336,8 @@ BOOL SwCrsrShell::SetVisCrsr( const Point &rPt )
}
// Bug 29584: bei Rahmenselektion ist der Cursor versteckt, aber den
- // D&D-Cursor will man trotzdem haben
-// if( bSVCrsrVis )
+ // D&D-Cursor will man trotzdem haben
+// if( bSVCrsrVis )
{
if( aTmpState.bRealHeight )
aCrsrHeight = aTmpState.aRealHeight;
@@ -2430,12 +2430,12 @@ BOOL SwCrsrShell::ParkTblCrsr()
}
/***********************************************************************
-#* Class : SwCrsrShell
-#* Methode : ParkCrsr
-#* Beschreibung: Vernichtet Selektionen und zus. Crsr aller Shell der
-#* verbleibende Crsr der Shell wird geparkt.
-#* Datum : MA 05. Nov. 92
-#* Update : JP 19.09.97
+#* Class : SwCrsrShell
+#* Methode : ParkCrsr
+#* Beschreibung: Vernichtet Selektionen und zus. Crsr aller Shell der
+#* verbleibende Crsr der Shell wird geparkt.
+#* Datum : MA 05. Nov. 92
+#* Update : JP 19.09.97
#***********************************************************************/
void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
@@ -2468,7 +2468,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
pTmpDel = pTmp;
bGoNext = TRUE;
- if( pTmpDel ) // ist der Pam im Bereich ?? loesche ihn
+ if( pTmpDel ) // ist der Pam im Bereich ?? loesche ihn
{
BOOL bDelete = TRUE;
if( *ppDelRing == pTmpDel )
@@ -2482,11 +2482,11 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
}
}
else
- bDelete = FALSE; // StackCrsr nie loeschen !!
+ bDelete = FALSE; // StackCrsr nie loeschen !!
}
if( bDelete )
- delete pTmpDel; // hebe alten Bereich auf
+ delete pTmpDel; // hebe alten Bereich auf
else
{
pTmpDel->GetPoint()->nContent.Assign( 0, 0 );
@@ -2496,10 +2496,10 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
}
pTmpDel = 0;
}
- else if( !pTmp->HasMark() ) // sorge auf jedenfall dafuer, das
- { // nicht benutzte Indizies beachtet werden!
- pTmp->SetMark(); // SPoint liegt nicht im Bereich,
- pTmp->DeleteMark(); // aber vielleicht GetMark, also setzen
+ else if( !pTmp->HasMark() ) // sorge auf jedenfall dafuer, das
+ { // nicht benutzte Indizies beachtet werden!
+ pTmp->SetMark(); // SPoint liegt nicht im Bereich,
+ pTmp->DeleteMark(); // aber vielleicht GetMark, also setzen
}
if( bGoNext )
pTmp = (SwPaM*)pTmp->GetNext();
@@ -2520,7 +2520,7 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
// den Crsr auf dem Tabellen-Node (ausserhalb der Tabelle)
pNew->GetPoint()->nNode = *pNode->StartOfSectionNode();
}
- else // also auf dem StartNode selbst.
+ else // also auf dem StartNode selbst.
// Dann immer ueber seinen EndNode den StartNode erfragen !!!
// (StartOfSection vom StartNode ist der Parent !)
pNew->GetPoint()->nNode = *pNode->EndOfSectionNode()->StartOfSectionNode();
@@ -2589,7 +2589,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
bCallChgLnk = bHasFocus = bSVCrsrVis = bAutoUpdateCells = TRUE;
bSetCrsrInReadOnly = TRUE;
pVisCrsr = new SwVisCrsr( this );
-// UpdateCrsr( 0 );
+// UpdateCrsr( 0 );
// OD 11.02.2003 #100556#
mbMacroExecAllowed = rShell.IsMacroExecAllowed();
}
@@ -2633,7 +2633,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
bSetCrsrInReadOnly = TRUE;
pVisCrsr = new SwVisCrsr( this );
-// UpdateCrsr( 0 );
+// UpdateCrsr( 0 );
// OD 11.02.2003 #100556#
mbMacroExecAllowed = true;
}
@@ -2669,8 +2669,8 @@ SwCrsrShell::~SwCrsrShell()
}
// JP 27.07.98: Bug 54025 - ggfs. den HTML-Parser, der als Client in
- // der CursorShell haengt keine Chance geben, sich an den
- // TextNode zu haengen.
+ // der CursorShell haengt keine Chance geben, sich an den
+ // TextNode zu haengen.
if( GetRegisteredIn() )
pRegisteredIn->Remove( this );
}
@@ -2747,7 +2747,7 @@ void SwCrsrShell::MakeSelVisible()
// suche eine gueltige ContentPosition (nicht geschuetzt/nicht versteckt)
BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
{
- if( pTblCrsr ) // was soll ich jetzt machen ??
+ if( pTblCrsr ) // was soll ich jetzt machen ??
{
OSL_ENSURE( !this, "TabellenSelection nicht aufgehoben!" );
return FALSE;
@@ -2759,12 +2759,12 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
return TRUE;
// dann raus da!
- if( pCurCrsr->HasMark() )
+ if( pCurCrsr->HasMark() )
ClearMark();
// als erstes mal auf Rahmen abpruefen
SwNodeIndex& rNdIdx = pCurCrsr->GetPoint()->nNode;
- ULONG nNdIdx = rNdIdx.GetIndex(); // sichern
+ ULONG nNdIdx = rNdIdx.GetIndex(); // sichern
SwNodes& rNds = pDoc->GetNodes();
SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
const SwCntntFrm * pFrm;
@@ -2786,9 +2786,9 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
pCNd = ::GetNode( aPam, bFirst, fnMoveBackward, FALSE );
}
- if( !pCNd ) // sollte nie passieren !!!
+ if( !pCNd ) // sollte nie passieren !!!
{
- rNdIdx = nNdIdx; // alten Node zurueck
+ rNdIdx = nNdIdx; // alten Node zurueck
return FALSE;
}
*pCurCrsr->GetPoint() = *aPam.GetPoint();
@@ -2861,7 +2861,7 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
{
SwCallLink aTmp( *this );
SwCrsrSaveState aSaveState( *pCurCrsr );
- aTmp.nNdTyp = 0; // im DTOR nichts machen!
+ aTmp.nNdTyp = 0; // im DTOR nichts machen!
if( !pCurCrsr->IsInProtectTable( TRUE, TRUE ) )
{
const SwSectionNode* pSNd = pCNd->FindSectionNode();
@@ -2870,15 +2870,15 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
pSNd->GetSection().IsProtectFlag() ))
{
bOk = TRUE;
- break; // eine nicht geschuetzte Zelle gef.
+ break; // eine nicht geschuetzte Zelle gef.
}
- continue; // dann weiter suchen
+ continue; // dann weiter suchen
}
}
else
{
bOk = TRUE;
- break; // eine nicht geschuetzte Zelle gef.
+ break; // eine nicht geschuetzte Zelle gef.
}
}
@@ -2907,7 +2907,7 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
if( bOk )
{
pCNd = rNdIdx.GetNode().GetCntntNode();
-// USHORT nCntnt = Min( pCNd->Len(), pCurCrsr->GetPoint()->nContent.GetIndex() );
+// USHORT nCntnt = Min( pCNd->Len(), pCurCrsr->GetPoint()->nContent.GetIndex() );
xub_StrLen nCntnt = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
pCurCrsr->GetPoint()->nContent.Assign( pCNd, nCntnt );
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3ab506a9f209..d86eb0e02bf2 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <pam.hxx>
#include <ndtxt.hxx>
#include <fldbas.hxx>
-#include <swtable.hxx> // SwTxtFld
+#include <swtable.hxx> // SwTxtFld
#include <docary.hxx>
#include <txtfld.hxx>
#include <fmtfld.hxx>
@@ -316,8 +316,8 @@ BOOL SwCrsrShell::GotoNextTOXBase( const String* pName )
pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex() &&
( !pFnd || pFnd->GetIndex() > pSectNd->GetIndex() ) &&
// JP 10.12.96: solange wir nur 3 Typen kennen und UI-seitig keine anderen
-// einstellbar sind, muss ueber den Titel gesucht werden!
-// ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
+// einstellbar sind, muss ueber den Titel gesucht werden!
+// ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTOXName() )
)
{
@@ -366,8 +366,8 @@ BOOL SwCrsrShell::GotoPrevTOXBase( const String* pName )
pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex() &&
( !pFnd || pFnd->GetIndex() < pSectNd->GetIndex() ) &&
// JP 10.12.96: solange wir nur 3 Typen kennen und UI-seitig keine anderen
-// einstellbar sind, muss ueber den Titel gesucht werden!
-// ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
+// einstellbar sind, muss ueber den Titel gesucht werden!
+// ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTOXName() )
)
{
@@ -567,7 +567,7 @@ BOOL SwCrsrShell::GotoNxtPrvTOXMark( BOOL bNext )
0 != ( pCFrm = pTxtNd->GetFrm( &aPt, 0, FALSE )) &&
( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
{
- SwNodeIndex aNdIndex( *pTxtNd ); // UNIX benoetigt dieses Obj.
+ SwNodeIndex aNdIndex( *pTxtNd ); // UNIX benoetigt dieses Obj.
_SetGetExpFld aCmp( aNdIndex, *pTxtTOX, 0 );
aCmp.SetBodyPos( *pCFrm );
@@ -701,9 +701,9 @@ BOOL SwCrsrShell::MoveFldType( const SwFieldType* pFldType, BOOL bNext,
SwCursor* pCrsr = getShellCrsr( true );
{
// JP 19.08.98: es muss immer ueber das Feld gesucht werden, damit
- // auch immer das richtige gefunden wird, wenn welche in
- // Rahmen stehen, die in einem Absatz verankert sind,
- // in dem ein Feld steht - siehe auch Bug 55247
+ // auch immer das richtige gefunden wird, wenn welche in
+ // Rahmen stehen, die in einem Absatz verankert sind,
+ // in dem ein Feld steht - siehe auch Bug 55247
const SwPosition& rPos = *pCrsr->GetPoint();
SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
@@ -738,15 +738,15 @@ BOOL SwCrsrShell::MoveFldType( const SwFieldType* pFldType, BOOL bNext,
delete pTxtFld;
}
- if( bFound ) // stehe auf einem ?
+ if( bFound ) // stehe auf einem ?
{
if( bNext )
{
if( ++nPos >= aSrtLst.Count() )
- return FALSE; // schon am Ende
+ return FALSE; // schon am Ende
}
else if( !nPos-- )
- return FALSE; // weiter nach vorne geht nicht
+ return FALSE; // weiter nach vorne geht nicht
}
else if( bNext ? nPos >= aSrtLst.Count() : !nPos--)
return FALSE;
@@ -827,7 +827,7 @@ BOOL SwCrsrShell::GotoOutline( const String& rName )
-BOOL SwCrsrShell::GotoNextOutline() // naechster Node mit Outline-Num.
+BOOL SwCrsrShell::GotoNextOutline() // naechster Node mit Outline-Num.
{
SwCursor* pCrsr = getShellCrsr( true );
const SwNodes& rNds = GetDoc()->GetNodes();
@@ -855,7 +855,7 @@ BOOL SwCrsrShell::GotoNextOutline() // naechster Node mit Outline-Num.
}
-BOOL SwCrsrShell::GotoPrevOutline() // vorheriger Node mit Outline-Num.
+BOOL SwCrsrShell::GotoPrevOutline() // vorheriger Node mit Outline-Num.
{
SwCursor* pCrsr = getShellCrsr( true );
const SwNodes& rNds = GetDoc()->GetNodes();
@@ -867,7 +867,7 @@ BOOL SwCrsrShell::GotoPrevOutline() // vorheriger Node mit Outline-Num.
BOOL bRet = FALSE;
if( nPos )
{
- --nPos; // davor
+ --nPos; // davor
pNd = rNds.GetOutLineNds()[ nPos ];
if( pNd->GetIndex() > pCrsr->GetPoint()->nNode.GetIndex() )
@@ -897,9 +897,9 @@ USHORT SwCrsrShell::GetOutlinePos( BYTE nLevel )
SwNode* pNd = pCrsr->GetNode();
USHORT nPos;
if( rNds.GetOutLineNds().Seek_Entry( pNd, &nPos ))
- nPos++; // steht auf der Position, fuers while zum Naechsten
+ nPos++; // steht auf der Position, fuers while zum Naechsten
- while( nPos-- ) // immer den davor testen !
+ while( nPos-- ) // immer den davor testen !
{
pNd = rNds.GetOutLineNds()[ nPos ];
@@ -908,7 +908,7 @@ USHORT SwCrsrShell::GetOutlinePos( BYTE nLevel )
return nPos;
}
- return USHRT_MAX; // davor keiner mehr also Ende
+ return USHRT_MAX; // davor keiner mehr also Ende
}
@@ -917,13 +917,13 @@ BOOL SwCrsrShell::MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
{
const SwNodes& rNds = GetDoc()->GetNodes();
const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
- if( !rOutlNds.Count() ) // wie jetzt ???
+ if( !rOutlNds.Count() ) // wie jetzt ???
return FALSE;
SET_CURR_SHELL( this );
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
- if( nSttPos > nEndPos ) // sollte jemand das vertauscht haben?
+ if( nSttPos > nEndPos ) // sollte jemand das vertauscht haben?
{
OSL_ENSURE( !this, "Start- > Ende-Position im Array" );
USHORT nTmp = nSttPos;
@@ -944,14 +944,14 @@ BOOL SwCrsrShell::MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
//BYTE nNxtLevel = pEndNd->GetTxtNode()->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
const int nNxtLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;//<-end,zhaojianwei
if( nNxtLevel <= nLevel )
- break; // EndPos steht jetzt auf dem naechsten
+ break; // EndPos steht jetzt auf dem naechsten
}
}
// ohne Childs, dann aber zumindest auf den naechsten
else if( ++nEndPos < rOutlNds.Count() )
pEndNd = rOutlNds[ nEndPos ];
- if( nEndPos == rOutlNds.Count() ) // kein Ende gefunden
+ if( nEndPos == rOutlNds.Count() ) // kein Ende gefunden
pEndNd = &rNds.GetEndOfContent();
KillPams();
@@ -963,7 +963,7 @@ BOOL SwCrsrShell::MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetCntntNode(), 0 );
pCurCrsr->SetMark();
pCurCrsr->GetPoint()->nNode = *pEndNd;
- pCurCrsr->Move( fnMoveBackward, fnGoNode ); // ans Ende vom Vorgaenger
+ pCurCrsr->Move( fnMoveBackward, fnGoNode ); // ans Ende vom Vorgaenger
// und schon ist alles selektiert
BOOL bRet = !pCurCrsr->IsSelOvr();
@@ -1104,14 +1104,14 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
}
if( bRet )
{
-// rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
-// *pTxtAttr->GetStart(),
-// *pTxtAttr->GetEnd() - *pTxtAttr->GetStart(),
-// FALSE );
+// rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
+// *pTxtAttr->GetStart(),
+// *pTxtAttr->GetEnd() - *pTxtAttr->GetStart(),
+// FALSE );
-// rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+// rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_SMARTTAG;
-// rCntntAtPos.pFndTxtAttr = pTxtAttr;
+// rCntntAtPos.pFndTxtAttr = pTxtAttr;
if( pFldRect && 0 != ( pFrm = pTxtNd->GetFrm( &aPt ) ) )
pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
@@ -1159,7 +1159,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
// erzeuge aus der internen (fuer CORE)
// die externe (fuer UI) Formel
const SwTableNode* pTblNd = pTxtNd->FindTableNode();
- if( pTblNd ) // steht in einer Tabelle
+ if( pTblNd ) // steht in einer Tabelle
((SwTblField*)pFld)->PtrToBoxNm( &pTblNd->GetTable() );
}
}
@@ -1374,7 +1374,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
pSttNd->GetIndex() )) &&
#if OSL_DEBUG_LEVEL > 1
( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
- RES_BOXATR_FORMULA, FALSE, &pItem ) ||
+ RES_BOXATR_FORMULA, FALSE, &pItem ) ||
SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
RES_BOXATR_VALUE, FALSE, &pItem ))
#else
@@ -1401,7 +1401,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
else if( !pF )
pF = pFrm;
- if( pF ) // nur dann ist es gueltig!!
+ if( pF ) // nur dann ist es gueltig!!
{
// erzeuge aus der internen (fuer CORE)
// die externe (fuer UI) Formel
@@ -1452,7 +1452,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
{
const SwTxtAttr* pHt = pTxtNd->GetSwpHints()[i];
xub_StrLen nAttrStart = *pHt->GetStart();
- if( nAttrStart > n ) // ueber den Bereich hinaus
+ if( nAttrStart > n ) // ueber den Bereich hinaus
break;
if( 0 != pHt->GetEnd() && (
@@ -1785,7 +1785,7 @@ BOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
*pCurCrsr->GetPoint() = aPos;
GetDoc()->SetTxtFmtColl( *pCurCrsr, pNextFmt, false );
//JP 04.11.97: erstmal keine Folgevorlage der
- // Folgevorlage beachten
+ // Folgevorlage beachten
// pNextFmt = pNextFmt->GetNextTxtFmtColl();
}
if( n < aFPos.nColumnCnt )
@@ -2015,7 +2015,7 @@ const SwRedline* SwCrsrShell::GotoRedline( USHORT nArrPos, BOOL bSelect )
switch( ::ComparePosition( *pCStt, *pCEnd,
*pNStt, *pNEnd ))
{
- case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
+ case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
if( !pCur->HasMark() )
{
pCur->SetMark();
@@ -2026,16 +2026,16 @@ const SwRedline* SwCrsrShell::GotoRedline( USHORT nArrPos, BOOL bSelect )
*pCEnd = *pNEnd;
break;
- case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
- case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
+ case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
+ case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
break;
- case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
+ case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
if( !pCur->HasMark() )
pCur->SetMark();
*pCEnd = *pNEnd;
break;
- case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
+ case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
if( !pCur->HasMark() )
{
pCur->SetMark();
@@ -2201,7 +2201,7 @@ BOOL SwCrsrShell::SelectNxtPrvHyperlink( BOOL bNext )
MakeSelVisible();
bRet = TRUE;
}
- else // then is it a fly
+ else // then is it a fly
{
SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, FALSE );
if( pFly )
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index 9f9a8d474e9a..b9ca2512214c 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index c45028545a80..57bf8c494dfd 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -2,7 +2,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
@@ -91,9 +91,9 @@ const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, USHORT& rPos,
const SwTxtAttr *pTxtHt = rHtsArr.GetStart( rPos++ );
// der Start vom Attribut muss innerhalb des Bereiches liegen !!
if( *pTxtHt->GetStart() >= nCntntPos )
- return pTxtHt; // gueltiges TextAttribut
+ return pTxtHt; // gueltiges TextAttribut
}
- return 0; // kein gueltiges TextAttribut
+ return 0; // kein gueltiges TextAttribut
}
@@ -106,9 +106,9 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, USHORT& rPos,
const SwTxtAttr *pTxtHt = rHtsArr.GetStart( --rPos );
// der Start vom Attribut muss innerhalb des Bereiches liegen !!
if( *pTxtHt->GetStart() < nCntntPos )
- return pTxtHt; // gueltiges TextAttribut
+ return pTxtHt; // gueltiges TextAttribut
}
- return 0; // kein gueltiges TextAttribut
+ return 0; // kein gueltiges TextAttribut
}
@@ -124,7 +124,7 @@ void lcl_SetAttrPam( SwPaM & rPam, xub_StrLen nStart, const xub_StrLen* pEnde,
SwCntntNode* pCNd = rPam.GetCntntNode();
rPam.GetPoint()->nContent.Assign( pCNd, nStart );
- rPam.SetMark(); // Point == GetMark
+ rPam.SetMark(); // Point == GetMark
// Point zeigt auf das Ende vom SuchBereich oder Ende vom Attribut
if( pEnde )
@@ -195,8 +195,8 @@ public:
void SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam );
// wieviele Attribute ueberhaupt ??
- USHORT Count() const { return aCmpSet.Count(); }
- int Found() const { return nFound == aCmpSet.Count(); }
+ USHORT Count() const { return aCmpSet.Count(); }
+ int Found() const { return nFound == aCmpSet.Count(); }
int CheckStack();
xub_StrLen Start() const;
@@ -264,8 +264,8 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
return ;
const SfxItemSet& rSet = rTxtNd.GetSwAttrSet();
-// if( !rSet.Count() )
-// return;
+// if( !rSet.Count() )
+// return;
SfxItemIter aIter( aCmpSet );
const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -279,7 +279,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
{
nWhich = aCmpSet.GetWhichByPos( aIter.GetCurPos() );
if( RES_TXTATR_END <= nWhich )
- break; // Ende der TextAttribute
+ break; // Ende der TextAttribute
if( SFX_ITEM_SET == rSet.GetItemState( nWhich, !bNoColls, &pFndItem )
&& !CmpAttr( *pFndItem, rSet.GetPool()->GetDefaultItem( nWhich ) ))
@@ -292,11 +292,11 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
else
{
if( RES_TXTATR_END <= (nWhich = pItem->Which() ))
- break; // Ende der TextAttribute
+ break; // Ende der TextAttribute
//JP 27.02.95: wenn nach defaults gesucht wird, dann muss man bis zum Pool
-// runter
-// if( SFX_ITEM_SET == rSet.GetItemState( nWhich, !bNoColls, &pFndItem )
+// runter
+// if( SFX_ITEM_SET == rSet.GetItemState( nWhich, !bNoColls, &pFndItem )
// && *pFndItem == *pItem )
if( CmpAttr( rSet.Get( nWhich, !bNoColls ), *pItem ) )
{
@@ -363,7 +363,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
++n, ++pArrPtr )
if( pArrPtr->nWhich && pArrPtr->nEnd <= aTmp.nStt )
{
- pArrPtr->nWhich = 0; // geloescht
+ pArrPtr->nWhich = 0; // geloescht
nFound--;
}
@@ -379,7 +379,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
if( pArrPtr->nEnd <= aTmp.nStt )
{
- pArrPtr->nWhich = 0; // geloescht
+ pArrPtr->nWhich = 0; // geloescht
if( !--nStackCnt )
break;
}
@@ -387,7 +387,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
{
if( ( pCmp = &pFndArr[ n ])->nWhich )
{
- if( pCmp->nEnd < pArrPtr->nEnd ) // erweitern
+ if( pCmp->nEnd < pArrPtr->nEnd ) // erweitern
pCmp->nEnd = pArrPtr->nEnd;
}
else
@@ -412,10 +412,10 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
// suche das Attribut und erweiter es gegebenenfalls
if( !( pCmp = &pFndArr[ nWhch - nArrStart ])->nWhich )
{
- *pCmp = aTmp; // nicht gefunden, eintragen
+ *pCmp = aTmp; // nicht gefunden, eintragen
nFound++;
}
- else if( pCmp->nEnd < aTmp.nEnd ) // erweitern ?
+ else if( pCmp->nEnd < aTmp.nEnd ) // erweitern ?
pCmp->nEnd = aTmp.nEnd;
bContinue = TRUE;
@@ -440,7 +440,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
// ---------
// JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
- // pCmp->nStt = aTmp.nEnd;
+ // pCmp->nStt = aTmp.nEnd;
if( aTmp.nStt <= pCmp->nStt )
pCmp->nStt = aTmp.nEnd;
else
@@ -520,7 +520,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
for( pArrPtr = pFndArr, n = 0; n < nArrLen; ++n, ++pArrPtr )
if( pArrPtr->nWhich && pArrPtr->nStt >= aTmp.nEnd )
{
- pArrPtr->nWhich = 0; // geloescht
+ pArrPtr->nWhich = 0; // geloescht
nFound--;
}
@@ -536,7 +536,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
if( pArrPtr->nStt >= aTmp.nEnd )
{
- pArrPtr->nWhich = 0; // geloescht
+ pArrPtr->nWhich = 0; // geloescht
if( !--nStackCnt )
break;
}
@@ -544,7 +544,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
{
if( ( pCmp = &pFndArr[ n ])->nWhich )
{
- if( pCmp->nStt > pArrPtr->nStt ) // erweitern
+ if( pCmp->nStt > pArrPtr->nStt ) // erweitern
pCmp->nStt = pArrPtr->nStt;
}
else
@@ -568,10 +568,10 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
// suche das Attribut und erweiter es gegebenenfalls
if( !( pCmp = &pFndArr[ nWhch - nArrStart ])->nWhich )
{
- *pCmp = aTmp; // nicht gefunden, eintragen
+ *pCmp = aTmp; // nicht gefunden, eintragen
nFound++;
}
- else if( pCmp->nStt > aTmp.nStt ) // erweitern ?
+ else if( pCmp->nStt > aTmp.nStt ) // erweitern ?
pCmp->nStt = aTmp.nStt;
bContinue = TRUE;
@@ -596,7 +596,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
// ---------
// JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
-// pCmp->nEnd = aTmp.nStt;
+// pCmp->nEnd = aTmp.nStt;
if( aTmp.nEnd <= pCmp->nEnd )
pCmp->nEnd = aTmp.nStt;
else
@@ -665,7 +665,7 @@ int SwAttrCheckArr::CheckStack()
if( bForward ? pArrPtr->nEnd <= nSttPos : pArrPtr->nStt >= nEndPos )
{
- pArrPtr->nWhich = 0; // geloescht
+ pArrPtr->nWhich = 0; // geloescht
if( !--nStackCnt )
return nFound == aCmpSet.Count();
}
@@ -866,9 +866,9 @@ int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, BOOL bNoColl
{
nWhich = pItem->Which();
//JP 27.02.95: wenn nach defaults gesucht wird, dann muss man bis zum Pool
-// runter
-// if( SFX_ITEM_SET != rNdSet.GetItemState( nWhich, !bNoColls, &pNdItem )
-// || *pNdItem != *pItem )
+// runter
+// if( SFX_ITEM_SET != rNdSet.GetItemState( nWhich, !bNoColls, &pNdItem )
+// || *pNdItem != *pItem )
if( !CmpAttr( rNdSet.Get( nWhich, !bNoColls ), *pItem ))
return FALSE;
}
@@ -877,7 +877,7 @@ int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, BOOL bNoColl
break;
pItem = aIter.NextItem();
}
- return TRUE; // wurde gefunden
+ return TRUE; // wurde gefunden
}
@@ -939,7 +939,7 @@ BOOL SwPaM::Find( const SfxPoolItem& rAttr, BOOL bValue, SwMoveFn fnMove,
{
const SwFmt* pTmpFmt = pNode->GetFmtColl();
if( aFmtArr.Count() && aFmtArr.Seek_Entry( pTmpFmt ))
- continue; // die Collection wurde schon mal befragt
+ continue; // die Collection wurde schon mal befragt
aFmtArr.Insert( pTmpFmt );
}
@@ -947,7 +947,7 @@ BOOL SwPaM::Find( const SfxPoolItem& rAttr, BOOL bValue, SwMoveFn fnMove,
TRUE, &pItem ) && ( !bValue || *pItem == rAttr ) )
{
// FORWARD: Point an das Ende, GetMark zum Anfanf vom Node
- // BACKWARD: Point zum Anfang, GetMark an das Ende vom Node
+ // BACKWARD: Point zum Anfang, GetMark an das Ende vom Node
// und immer nach der Logik: inkl. Start, exkl. End !!!
*GetPoint() = *pPam->GetPoint();
SetMark();
@@ -983,7 +983,7 @@ BOOL SwPaM::Find( const SfxItemSet& rSet, BOOL bNoColls, SwMoveFn fnMove,
SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls );
SfxItemSet aOtherSet( GetDoc()->GetAttrPool(),
RES_PARATR_BEGIN, RES_GRFATR_END-1 );
- aOtherSet.Put( rSet, FALSE ); // alle Invalid-Items erhalten!
+ aOtherSet.Put( rSet, FALSE ); // alle Invalid-Items erhalten!
FnSearchAttr fnSearch = bSrchForward
? (&::lcl_SearchForward)
@@ -991,7 +991,7 @@ BOOL SwPaM::Find( const SfxItemSet& rSet, BOOL bNoColls, SwMoveFn fnMove,
// Wenn am Anfang/Ende, aus dem Node moven
// Wenn am Anfang/Ende, aus dem Node moven
- if( bMoveFirst &&
+ if( bMoveFirst &&
( bSrchForward
? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
: !pPam->GetPoint()->nContent.GetIndex() ) )
@@ -1025,7 +1025,7 @@ BOOL SwPaM::Find( const SfxItemSet& rSet, BOOL bNoColls, SwMoveFn fnMove,
bFound = TRUE;
break;
}
- continue; // TextAttribute
+ continue; // TextAttribute
}
if( !aOtherSet.Count() )
@@ -1037,14 +1037,14 @@ BOOL SwPaM::Find( const SfxItemSet& rSet, BOOL bNoColls, SwMoveFn fnMove,
{
const SwFmt* pTmpFmt = pNode->GetFmtColl();
if( aFmtArr.Count() && aFmtArr.Seek_Entry( pTmpFmt ))
- continue; // die Collection wurde schon mal befragt
+ continue; // die Collection wurde schon mal befragt
aFmtArr.Insert( pTmpFmt );
}
if( lcl_Search( *pNode, aOtherSet, bNoColls ))
{
// FORWARD: Point an das Ende, GetMark zum Anfanf vom Node
- // BACKWARD: Point zum Anfang, GetMark an das Ende vom Node
+ // BACKWARD: Point zum Anfang, GetMark an das Ende vom Node
// und immer nach der Logik: inkl. Start, exkl. End !!!
*GetPoint() = *pPam->GetPoint();
SetMark();
@@ -1090,7 +1090,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
BOOL bInReadOnly )
{
// String ersetzen ?? (nur wenn Text angegeben oder nicht attributiert
- // gesucht wird)
+ // gesucht wird)
BOOL bReplaceTxt = pSearchOpt && ( pSearchOpt->replaceString.getLength() ||
!pSet->Count() );
BOOL bReplaceAttr = pReplSet && pReplSet->Count();
@@ -1106,17 +1106,17 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
while( TRUE )
{
- if( pSet->Count() ) // gibts ueberhaupt Attributierung?
+ if( pSet->Count() ) // gibts ueberhaupt Attributierung?
{
// zuerst die Attributierung
if( !aSrchPam.Find( *pSet, bValue, fnMove, &aRegion, bInReadOnly, bMoveFirst ) )
//JP 17.11.95: was ist mit Attributen in leeren Absaetzen !!
-// || *pCrsr->GetMark() == *pCrsr->GetPoint() ) // kein Bereich ??
+// || *pCrsr->GetMark() == *pCrsr->GetPoint() ) // kein Bereich ??
return FIND_NOT_FOUND;
bMoveFirst = TRUE;
if( !pSearchOpt )
- break; // ok, nur Attribute, also gefunden
+ break; // ok, nur Attribute, also gefunden
pTextRegion = &aSrchPam;
}
@@ -1143,18 +1143,18 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
// Bug 24665: suche im richtigen Bereich weiter (pTextRegion!)
if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
*aSrchPam.GetMark() != *aSrchPam.GetPoint() ) // gefunden ?
- break; // also raus
+ break; // also raus
else if( !pSet->Count() )
- return FIND_NOT_FOUND; // nur Text und nicht gefunden
+ return FIND_NOT_FOUND; // nur Text und nicht gefunden
/* // --> FME 2007-4-12 #i74765 # Why should we move the position?
Moving the position results in bugs when there are two adjacent
portions which both have the requested attributes set. I suspect this
should be only be an optimization. Therefore I boldly remove it now!
-
+
// JP: und wieder neu aufsetzen, aber eine Position weiter
//JP 04.11.97: Bug 44897 - aber den Mark wieder aufheben, damit
- // weiterbewegt werden kann!
+ // weiterbewegt werden kann!
{
BOOL bCheckRegion = TRUE;
SwPosition* pPos = aSrchPam.GetPoint();
@@ -1175,7 +1175,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
bCheckRegion = FALSE;
}
if( !bCheckRegion || *aRegion.GetPoint() <= *pPos )
- return FIND_NOT_FOUND; // nicht gefunden
+ return FIND_NOT_FOUND; // nicht gefunden
}*/
*aRegion.GetMark() = *aSrchPam.GetPoint();
}
@@ -1230,7 +1230,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
pCrsr->GetDoc()->Insert( *pCrsr, *pReplSet, 0 );
#else
//JP 13.07.95: alle gesuchten Attribute werden, wenn nicht im
- // ReplaceSet angegeben, auf Default zurueck gesetzt
+ // ReplaceSet angegeben, auf Default zurueck gesetzt
if( !pSet->Count() )
{
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index f3b5cba3e2b3..8bc2246d8712 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index e9a4fe7485b5..bfca6bda94b4 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -2,7 +2,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
@@ -67,14 +67,14 @@ BOOL SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
// jedenfall um einen SwCntntNode !!
// FORWARD: SPoint an das Ende, GetMark zum Anfanf vom Node
- // BACKWARD: SPoint zum Anfang, GetMark an das Ende vom Node
+ // BACKWARD: SPoint zum Anfang, GetMark an das Ende vom Node
// und immer nach der Logik: inkl. Start, exkl. End !!!
*GetPoint() = *pPam->GetPoint();
SetMark();
pNode->MakeEndIndex( &GetPoint()->nContent );
GetMark()->nContent = 0;
- if( !bSrchForward ) // rueckwaerts Suche?
- Exchange(); // SPoint und GetMark tauschen
+ if( !bSrchForward ) // rueckwaerts Suche?
+ Exchange(); // SPoint und GetMark tauschen
break;
}
}
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 022714fe62d0..e62b15fddf1a 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -135,13 +135,13 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
case RES_TXTATR_METAFIELD:
{
// JP 06.05.98: mit Bug 50100 werden sie als Trenner erwuenscht und nicht
- // mehr zum Wort dazu gehoerend.
+ // mehr zum Wort dazu gehoerend.
// MA 23.06.98: mit Bug 51215 sollen sie konsequenterweise auch am
- // Satzanfang und -ende ignoriert werden wenn sie Leer sind.
- // Dazu werden sie schlicht entfernt. Fuer den Anfang entfernen
- // wir sie einfach.
- // Fuer das Ende merken wir uns die Ersetzungen und entferenen
- // hinterher alle am Stringende (koenten ja 'normale' 0x7f drinstehen
+ // Satzanfang und -ende ignoriert werden wenn sie Leer sind.
+ // Dazu werden sie schlicht entfernt. Fuer den Anfang entfernen
+ // wir sie einfach.
+ // Fuer das Ende merken wir uns die Ersetzungen und entferenen
+ // hinterher alle am Stringende (koenten ja 'normale' 0x7f drinstehen
BOOL bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
!(static_cast<SwTxtFld const*>(pHt)
->GetFld().GetFld()->ExpandField(
@@ -585,12 +585,12 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
BOOL bFnd = (BOOL)pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
- /* #i80135# if we found something in a note, Mark and Point is the same
+ /* #i80135# if we found something in a note, Mark and Point is the same
if( bFnd && *pCrsr->GetMark() == *pCrsr->GetPoint() )
return FIND_NOT_FOUND;
*/
- if( bFnd && bReplace ) // String ersetzen ??
+ if( bFnd && bReplace ) // String ersetzen ??
{
// Replace-Methode vom SwDoc benutzen
const bool bRegExp(SearchAlgorithms_REGEXP == rSearchOpt.algorithmType);
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 03d18929ace3..a765a6b65174 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -2,7 +2,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
@@ -838,7 +838,9 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
else
{
// Form protection case
- bRet = ( pA != pB );
+ bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint();
+ bool bAtStartB = pB != NULL && pB->GetMarkStart() == *GetMark();
+ bRet = ( pA != pB ) || bAtStartA || bAtStartB;
bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
if ( bProtectForm )
bRet |= ( pA == NULL || pB == NULL );
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index f423bdc335c0..7a235af5eced 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -2,7 +2,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
@@ -34,46 +34,46 @@
static SwMoveFnCollection aFwrd = {
- /* fnNd */ &GoNext,
- /* fnNds */ &GoNextNds,
- /* fnDoc */ &GoEndDoc,
- /* fnSections */ &GoEndSection,
- /* fnCmpOp */ &SwPosition::operator<,
- /* fnGetHint */ &GetFrwrdTxtHint,
- /* fnSearch */ &utl::TextSearch::SearchFrwrd,
- /* fnSection */ &SwNodes::GoStartOfSection
+ /* fnNd */ &GoNext,
+ /* fnNds */ &GoNextNds,
+ /* fnDoc */ &GoEndDoc,
+ /* fnSections */ &GoEndSection,
+ /* fnCmpOp */ &SwPosition::operator<,
+ /* fnGetHint */ &GetFrwrdTxtHint,
+ /* fnSearch */ &utl::TextSearch::SearchFrwrd,
+ /* fnSection */ &SwNodes::GoStartOfSection
};
static SwMoveFnCollection aBwrd = {
- /* fnNd */ &GoPrevious,
- /* fnNds */ &GoPreviousNds,
- /* fnDoc */ &GoStartDoc,
- /* fnSections */ &GoStartSection,
- /* fnCmpOp */ &SwPosition::operator>,
- /* fnGetHint */ &GetBkwrdTxtHint,
- /* fnSearch */ &utl::TextSearch::SearchBkwrd,
- /* fnSection */ &SwNodes::GoEndOfSection
+ /* fnNd */ &GoPrevious,
+ /* fnNds */ &GoPreviousNds,
+ /* fnDoc */ &GoStartDoc,
+ /* fnSections */ &GoStartSection,
+ /* fnCmpOp */ &SwPosition::operator>,
+ /* fnGetHint */ &GetBkwrdTxtHint,
+ /* fnSearch */ &utl::TextSearch::SearchBkwrd,
+ /* fnSection */ &SwNodes::GoEndOfSection
};
-SwGoInDoc fnGoDoc = &GoInDoc;
-SwGoInDoc fnGoSection = &GoInSection;
-SwGoInDoc fnGoNode = &GoInNode;
-SwGoInDoc fnGoCntnt = &GoInCntnt;
+SwGoInDoc fnGoDoc = &GoInDoc;
+SwGoInDoc fnGoSection = &GoInSection;
+SwGoInDoc fnGoNode = &GoInNode;
+SwGoInDoc fnGoCntnt = &GoInCntnt;
SwGoInDoc fnGoCntntCells = &GoInCntntCells;
SwGoInDoc fnGoCntntSkipHidden = &GoInCntntSkipHidden;
SwGoInDoc fnGoCntntCellsSkipHidden = &GoInCntntCellsSkipHidden;
-SwWhichPara fnParaPrev = &GoPrevPara;
-SwWhichPara fnParaCurr = &GoCurrPara;
-SwWhichPara fnParaNext = &GoNextPara;
-SwPosPara fnParaStart = &aFwrd;
-SwPosPara fnParaEnd = &aBwrd;
+SwWhichPara fnParaPrev = &GoPrevPara;
+SwWhichPara fnParaCurr = &GoCurrPara;
+SwWhichPara fnParaNext = &GoNextPara;
+SwPosPara fnParaStart = &aFwrd;
+SwPosPara fnParaEnd = &aBwrd;
-SwWhichSection fnSectionPrev = &GoPrevSection;
-SwWhichSection fnSectionCurr = &GoCurrSection;
-SwWhichSection fnSectionNext = &GoNextSection;
-SwPosSection fnSectionStart = &aFwrd;
-SwPosSection fnSectionEnd = &aBwrd;
+SwWhichSection fnSectionPrev = &GoPrevSection;
+SwWhichSection fnSectionCurr = &GoCurrSection;
+SwWhichSection fnSectionNext = &GoNextSection;
+SwPosSection fnSectionStart = &aFwrd;
+SwPosSection fnSectionEnd = &aBwrd;
// Travelling in Tabellen
BOOL GotoPrevTable( SwPaM&, SwPosTable, BOOL bInReadOnly );
@@ -99,8 +99,8 @@ SwWhichRegion fnRegionNext = &GotoNextRegion;
SwPosRegion fnRegionStart = &aFwrd;
SwPosRegion fnRegionEnd = &aBwrd;
-SwMoveFn fnMoveBackward = &aBwrd;
-SwMoveFn fnMoveForward = &aFwrd;
+SwMoveFn fnMoveBackward = &aBwrd;
+SwMoveFn fnMoveForward = &aFwrd;
SwWhichPara GetfnParaCurr()
{
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index da97862bd1a5..7071e2d4b8db 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2,7 +2,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
@@ -58,8 +58,8 @@
#include <breakit.hxx>
#include <crsskip.hxx>
#include <vcl/msgbox.hxx>
-#include <mdiexp.hxx> // ...Percent()
-#include <statstr.hrc> // ResId fuer Statusleiste
+#include <mdiexp.hxx> // ...Percent()
+#include <statstr.hrc> // ResId fuer Statusleiste
#include <redline.hxx> // SwRedline
@@ -109,7 +109,7 @@ struct _PercentHdl
::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd, pDSh );
}
- ~_PercentHdl() { ::EndProgress( pDSh ); }
+ ~_PercentHdl() { ::EndProgress( pDSh ); }
void NextPos( ULONG nPos ) const
{ ::SetProgressState( bBack ? nActPos - nPos : nPos, pDSh ); }
@@ -133,7 +133,7 @@ SwCursor::SwCursor( const SwPosition &rPos, SwPaM* pRing, bool bColumnSel )
// @@@ semantic: no copy ctor.
SwCursor::SwCursor( SwCursor& rCpy )
- : SwPaM( rCpy ), pSavePos( 0 ), mnRowSpanOffset( rCpy.mnRowSpanOffset ),
+ : SwPaM( rCpy ), pSavePos( 0 ), mnRowSpanOffset( rCpy.mnRowSpanOffset ),
nCursorBidiLevel( rCpy.nCursorBidiLevel ), mbColumnSelection( rCpy.mbColumnSelection )
{
}
@@ -358,7 +358,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
SwNodeIndex& rPtIdx = GetPoint()->nNode;
int bGoNxt = pSavePos->nNode < rPtIdx.GetIndex();
while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm()
- : pFrm->GetPrevCntntFrm() )) &&
+ : pFrm->GetPrevCntntFrm() )) &&
0 == pFrm->Frm().Height() )
;
@@ -368,7 +368,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
{
bGoNxt = !bGoNxt;
pFrm = ((SwCntntNode*)pNd)->GetFrm();
- while ( pFrm && 0 == pFrm->Frm().Height() )
+ while ( pFrm && 0 == pFrm->Frm().Height() )
{
pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
: pFrm->GetPrevCntntFrm();
@@ -397,7 +397,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
{
DeleteMark();
RestoreSavePos();
- return TRUE; // ohne Frames geht gar nichts!
+ return TRUE; // ohne Frames geht gar nichts!
}
}
@@ -413,12 +413,12 @@ BOOL SwCursor::IsSelOvr( int eFlags )
return FALSE;
//JP 19.08.98: teste mal auf ungueltige Selektion - sprich ueber
- // GrundSections:
+ // GrundSections:
if( !::CheckNodesRange( GetMark()->nNode, GetPoint()->nNode, TRUE ))
{
DeleteMark();
RestoreSavePos();
- return TRUE; // ohne Frames geht gar nichts!
+ return TRUE; // ohne Frames geht gar nichts!
}
const SwTableNode* pPtNd = pNd->FindTableNode();
@@ -428,7 +428,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
{
DeleteMark();
RestoreSavePos();
- return TRUE; // ohne Frames geht gar nichts!
+ return TRUE; // ohne Frames geht gar nichts!
}
const SwTableNode* pMrkNd = pNd->FindTableNode();
@@ -439,14 +439,14 @@ BOOL SwCursor::IsSelOvr( int eFlags )
// in unterschiedlichen Tabellen oder nur Mark in der Tabelle
if( ( pPtNd && pMrkNd ) || pMrkNd )
- { // dann lasse das nicht zu, alte Pos zurueck
+ { // dann lasse das nicht zu, alte Pos zurueck
RestoreSavePos();
// Crsr bleibt an der alten Position
return TRUE;
}
// ACHTUNG: dieses kann nicht im TableMode geschehen !!
- if( pPtNd ) // nur Point in Tabelle, dann gehe hinter/vor diese
+ if( pPtNd ) // nur Point in Tabelle, dann gehe hinter/vor diese
{
if( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags )
{
@@ -459,7 +459,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
ULONG nSEIdx = pPtNd->EndOfSectionIndex();
ULONG nSttEndTbl = nSEIdx + 1; // dflt. Sel. nach unten
- if( bSelTop ) // Sel. nach oben
+ if( bSelTop ) // Sel. nach oben
nSttEndTbl = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
GetPoint()->nNode = nSttEndTbl;
@@ -506,9 +506,9 @@ BOOL SwCursor::IsSelOvr( int eFlags )
// dann verbleibe auf der alten Position
RestoreSavePos();
- return TRUE; // Crsr bleibt an der alten Position
+ return TRUE; // Crsr bleibt an der alten Position
}
- return FALSE; // was bleibt noch ??
+ return FALSE; // was bleibt noch ??
}
#if defined( UNX )
@@ -560,7 +560,7 @@ BOOL SwCursor::IsInProtectTable( BOOL bMove, BOOL bChgCrsr )
if( bChgCrsr )
// restore the last save position
RestoreSavePos();
- return TRUE; // Crsr bleibt an der alten Position
+ return TRUE; // Crsr bleibt an der alten Position
}
// wir stehen in einer geschuetzten TabellenZelle
@@ -591,7 +591,7 @@ GoNextCell:
} while( bProt );
SetNextCrsr:
- if( !bProt ) // eine freie Zelle gefunden
+ if( !bProt ) // eine freie Zelle gefunden
{
GetPoint()->nNode = IDX;
#if defined( UNX )
@@ -623,7 +623,7 @@ SetNextCrsr:
else if( pNd->IsTableNode() && IDX++ )
goto GoNextCell;
- bProt = FALSE; // Index steht jetzt auf einem ContentNode
+ bProt = FALSE; // Index steht jetzt auf einem ContentNode
goto SetNextCrsr;
}
@@ -652,7 +652,7 @@ GoPrevCell:
} while( bProt );
SetPrevCrsr:
- if( !bProt ) // eine freie Zelle gefunden
+ if( !bProt ) // eine freie Zelle gefunden
{
GetPoint()->nNode = IDX;
#if defined( UNX )
@@ -683,7 +683,7 @@ SetPrevCrsr:
else if( pNd->StartOfSectionNode()->IsTableNode() && IDX-- )
goto GoPrevCell;
- bProt = FALSE; // Index steht jetzt auf einem ContentNode
+ bProt = FALSE; // Index steht jetzt auf einem ContentNode
goto SetPrevCrsr;
}
}
@@ -717,7 +717,7 @@ BOOL SwCursor::IsAtValidPos( BOOL bPoint ) const
return TRUE;
}
-void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
+void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
// setze den SRange fuer das Suchen im Dokument
SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
@@ -787,7 +787,7 @@ ULONG lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
if( !( FIND_NO_RING & nFndRet ))
{
// Bug 24084: Ring richtig herum aufbauen -> gleiche Mimik
- // wie beim CreateCrsr !!!!
+ // wie beim CreateCrsr !!!!
SwCursor* pNew = pCurCrsr->Create( pFndRing );
if( !pFndRing )
@@ -833,8 +833,8 @@ ULONG lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
// bewege pSttPos hinter den gefundenen Bereich
*pSttPos = *pCurCrsr->End();
- if( *pSttPos == *pEndPos ) // im Bereich, aber am Ende
- break; // fertig
+ if( *pSttPos == *pEndPos ) // im Bereich, aber am Ende
+ break; // fertig
if( !nCrsrCnt && pPHdl )
{
@@ -853,7 +853,7 @@ ULONG lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
} while( pTmpCrsr != pSaveCrsr );
- if( nFound && !pFndRing ) // falls kein Ring aufgebaut werden soll
+ if( nFound && !pFndRing ) // falls kein Ring aufgebaut werden soll
pFndRing = pCurCrsr->Create();
delete pPHdl;
@@ -881,7 +881,7 @@ int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
}
else if( rSttNd.GetIndex() > rPam.GetPoint()->nNode.GetIndex() ||
rPam.GetPoint()->nNode.GetIndex() >= rEndNd.GetIndex() )
- return FALSE; // steht nicht in dieser Section
+ return FALSE; // steht nicht in dieser Section
rPam.SetMark();
rPam.GetPoint()->nNode = rEndNd;
@@ -913,7 +913,7 @@ int lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
}
else if( rEndNd.GetIndex() > rPam.GetPoint()->nNode.GetIndex() ||
rPam.GetPoint()->nNode.GetIndex() >= rSttNd.GetIndex() )
- return FALSE; // steht nicht in dieser Section
+ return FALSE; // steht nicht in dieser Section
rPam.SetMark();
rPam.GetPoint()->nNode = rEndNd;
@@ -972,7 +972,7 @@ ULONG SwCursor::FindAll( SwFindParas& rParas,
{
// Cursor als Kopie vom akt. und in den Ring aufnehmen
// Verkettung zeigt immer auf den zuerst erzeugten, also vorwaerts
- SwCursor* pSav = Create( this ); // sicher den aktuellen Crsr
+ SwCursor* pSav = Create( this ); // sicher den aktuellen Crsr
// wenn schon ausserhalb vom Bodytext, suche von der Position,
// ansonsten beginne mit der 1. GrundSection
@@ -1030,7 +1030,7 @@ ULONG SwCursor::FindAll( SwFindParas& rParas,
}
else if( FND_IN_SELALL & eFndRngs )
{
- SwCursor* pSav = Create( this ); // sicher den aktuellen Crsr
+ SwCursor* pSav = Create( this ); // sicher den aktuellen Crsr
const SwNode* pSttNd = ( FND_IN_BODYONLY & eFndRngs )
? rNds.GetEndOfContent().StartOfSectionNode()
@@ -1120,7 +1120,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
bIsStart = FALSE;
break;
-// case DOCPOS_CURR:
+// case DOCPOS_CURR:
default:
rPos = *GetPoint();
}
@@ -1499,7 +1499,7 @@ BOOL SwCursor::GoSentence( SentenceMoveType eMoveType )
nPtPos, pBreakIt->GetLocale(
pTxtNd->GetLang( nPtPos ) ));
if (nPtPos == 0)
- return FALSE; // the previous sentence is not in this paragraph
+ return FALSE; // the previous sentence is not in this paragraph
if (nPtPos > 0)
nPtPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfSentence(
sNodeText,
@@ -1539,10 +1539,10 @@ BOOL SwCursor::ExpandToSentenceBorders()
xub_StrLen nEndPos = End()->nContent.GetIndex();
nStartPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfSentence(
- sStartText, nStartPos,
+ sStartText, nStartPos,
pBreakIt->GetLocale( pStartNd->GetLang( nStartPos ) ) );
nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfSentence(
- sEndText, nEndPos,
+ sEndText, nEndPos,
pBreakIt->GetLocale( pEndNd->GetLang( nEndPos ) ) );
// it is allowed to place the PaM just behind the last
@@ -2102,7 +2102,7 @@ BOOL SwCursor::MoveSection( SwWhichSection fnWhichSect,
BOOL MoveRegion( SwWhichRegion, SwPosRegion );
*/
-void SwCursor::RestoreSavePos() // Point auf die SavePos setzen
+void SwCursor::RestoreSavePos() // Point auf die SavePos setzen
{
if( pSavePos )
{
@@ -2156,7 +2156,7 @@ BOOL lcl_SeekEntry( const SwSelBoxes& rTmp, const SwStartNode* pSrch, USHORT& rF
SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
{
- if( bChg ) // ???
+ if( bChg ) // ???
{
if( bParked )
{
@@ -2224,7 +2224,7 @@ JP 20.07.98: der alte Code geht mit dem UNO-TableCrsr nicht
if( pAktCrsr->GetNext() == pAktCrsr )
{
pAktCrsr->DeleteMark();
- break; // es gibt nichts mehr zu loeschen!
+ break; // es gibt nichts mehr zu loeschen!
}
pAktCrsr = (SwCursor*)pDel->GetPrev();
}
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index 6dafd069c86c..02e71efbde65 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -2,7 +2,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
@@ -107,7 +107,7 @@ BOOL SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
SwCrsrSaveState aSaveState( *pCurCrsr );
- pCnt->Calc(); // ???
+ pCnt->Calc(); // ???
Point aPt( pCnt->Frm().Pos() + pCnt->Prt().Pos() );
if( fnPosCol == GetColumnEnd )
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 550717942c1f..eda5fd4710c0 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -2,7 +2,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
@@ -212,7 +212,7 @@ BOOL SwCursor::GotoNextFtnAnchor()
{
pTxtFtn = rFtnArr[ nPos ];
if( !CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
- break; // gefunden
+ break; // gefunden
pTxtFtn = 0;
}
}
@@ -226,9 +226,9 @@ BOOL SwCursor::GotoNextFtnAnchor()
if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
{
pTxtFtn = rFtnArr[ ++nPos ];
- break; // gefunden
+ break; // gefunden
}
-// pTxtFtn = 0;
+// pTxtFtn = 0;
}
}
}
@@ -284,7 +284,7 @@ BOOL SwCursor::GotoPrevFtnAnchor()
{
pTxtFtn = rFtnArr[ --nPos ];
if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
- break; // gefunden
+ break; // gefunden
pTxtFtn = 0;
}
}
@@ -328,7 +328,7 @@ BOOL SwCrsrShell::GotoFlyAnchor()
pFrm = pFrm->GetUpper();
} while( pFrm && !pFrm->IsFlyFrm() );
- if( !pFrm ) // ist kein FlyFrame
+ if( !pFrm ) // ist kein FlyFrame
return FALSE;
SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index a95194d53e34..19612cc70e89 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -2,7 +2,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
@@ -55,7 +55,7 @@ BOOL GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
0 == ( pNd = aIdx.GetNode().StartOfSectionNode()->GetSectionNode()) )
aIdx--;
- if( pNd ) // gibt einen weiteren SectionNode ?
+ if( pNd ) // gibt einen weiteren SectionNode ?
{
if( pNd->GetSection().IsHiddenFlag() ||
( !bInReadOnly &&
@@ -111,7 +111,7 @@ BOOL GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
0 == ( pNd = aIdx.GetNode().GetSectionNode()) )
aIdx++;
- if( pNd ) // gibt einen weiteren SectionNode ?
+ if( pNd ) // gibt einen weiteren SectionNode ?
{
if( pNd->GetSection().IsHiddenFlag() ||
( !bInReadOnly &&
@@ -199,7 +199,7 @@ BOOL GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
do {
SwCntntNode* pCNd;
- if( bMoveBackward ) // ans Ende vom Bereich
+ if( bMoveBackward ) // ans Ende vom Bereich
{
SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
pCNd = pNd->GetNodes().GoPrevSection( &aIdx, TRUE, !bInReadOnly );
@@ -245,7 +245,7 @@ BOOL SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion
BOOL SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
{
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
BOOL bRet = !pTblCrsr && pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
if( bRet )
UpdateCrsr();
@@ -280,7 +280,7 @@ BOOL SwCursor::GotoRegion( const String& rName )
BOOL SwCrsrShell::GotoRegion( const String& rName )
{
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
BOOL bRet = !pTblCrsr && pCurCrsr->GotoRegion( rName );
if( bRet )
UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 85452f10ae9f..f466c34e1ec1 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <crsrsh.hxx>
#include <doc.hxx>
#include <cntfrm.hxx>
-#include <editsh.hxx> //EndAllAction gibts nur an der EditShell
+#include <editsh.hxx> //EndAllAction gibts nur an der EditShell
#include <pam.hxx>
#include <swtable.hxx>
#include <docary.hxx>
@@ -60,7 +60,7 @@ BOOL SwCrsrShell::GoNextCell( BOOL bAppendLine )
if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
{
SwCursor* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
bRet = TRUE;
// Check if we have to move the cursor to a covered cell before
@@ -88,7 +88,7 @@ BOOL SwCrsrShell::GoNextCell( BOOL bAppendLine )
if( !aCellStt.GetNode().IsStartNode() )
{
- if( pCrsr->HasMark() || !bAppendLine )
+ if( pCrsr->HasMark() || !bAppendLine )
bRet = FALSE;
else
{
@@ -111,7 +111,7 @@ BOOL SwCrsrShell::GoNextCell( BOOL bAppendLine )
}
}
if( bRet && 0 != ( bRet = pCrsr->GoNextCell() ))
- UpdateCrsr(); // und den akt. Updaten
+ UpdateCrsr(); // und den akt. Updaten
}
return bRet;
}
@@ -124,10 +124,10 @@ BOOL SwCrsrShell::GoPrevCell()
if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
{
SwCursor* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
bRet = pCrsr->GoPrevCell();
if( bRet )
- UpdateCrsr(); // und den akt. Updaten
+ UpdateCrsr(); // und den akt. Updaten
}
return bRet;
}
@@ -258,7 +258,7 @@ BOOL SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
if ( !bRow )
pTblCrsr->GetPtPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
- UpdateCrsr(); // und den akt. Updaten
+ UpdateCrsr(); // und den akt. Updaten
return TRUE;
}
@@ -520,9 +520,9 @@ BOOL GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
0 == ( pTblNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
aIdx--;
- if( pTblNd ) // gibt einen weiteren TableNode ?
+ if( pTblNd ) // gibt einen weiteren TableNode ?
{
- if( fnPosTbl == fnMoveForward ) // an Anfang ?
+ if( fnPosTbl == fnMoveForward ) // an Anfang ?
{
aIdx = *aIdx.GetNode().StartOfSectionNode();
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
@@ -573,9 +573,9 @@ BOOL GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
while( aIdx.GetIndex() < nLastNd &&
0 == ( pTblNd = aIdx.GetNode().GetTableNode()) )
aIdx++;
- if( pTblNd ) // gibt einen weiteren TableNode ?
+ if( pTblNd ) // gibt einen weiteren TableNode ?
{
- if( fnPosTbl == fnMoveForward ) // an Anfang ?
+ if( fnPosTbl == fnMoveForward ) // an Anfang ?
{
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
{
@@ -620,7 +620,7 @@ BOOL GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
return FALSE;
SwTxtNode* pTxtNode = 0;
- if( fnPosTbl == fnMoveBackward ) // ans Ende der Tabelle
+ if( fnPosTbl == fnMoveBackward ) // ans Ende der Tabelle
{
SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
@@ -652,7 +652,7 @@ BOOL SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
BOOL bRet = FALSE;
SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
- if( pTblCrsr || !HasMark() ) // nur wenn kein Mark oder ein TblCrsr
+ if( pTblCrsr || !HasMark() ) // nur wenn kein Mark oder ein TblCrsr
{
SwCrsrSaveState aSaveState( *this );
bRet = (*fnWhichTbl)( *this, fnPosTbl, IsReadOnlyAvailable() ) &&
@@ -664,14 +664,14 @@ BOOL SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
BOOL SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
{
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen
SwShellCrsr* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
BOOL bCheckPos, bRet;
ULONG nPtNd = 0;
xub_StrLen nPtCnt = 0;
- if( !pTblCrsr && pCurCrsr->HasMark() ) // wenn Mark und kein TblCrsr,
+ if( !pTblCrsr && pCurCrsr->HasMark() ) // wenn Mark und kein TblCrsr,
{
// dann auf jedenfall in den Tabellen-Modus schalten
pTblCrsr = new SwShellTableCrsr( *this, *pCurCrsr->GetPoint() );
@@ -693,7 +693,7 @@ BOOL SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
if( bRet )
{
//JP 28.10.97: Bug 45028 - die "oberste" Position setzen fuer
- // wiederholte Kopfzeilen
+ // wiederholte Kopfzeilen
pCrsr->GetPtPos() = Point();
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
@@ -720,7 +720,7 @@ BOOL SwCrsrShell::IsTblComplexForChart()
{
BOOL bRet = FALSE;
- StartAction(); // IsTblComplexForChart() may trigger table formatting
+ StartAction(); // IsTblComplexForChart() may trigger table formatting
// we better do that inside an action
const SwTableNode* pTNd = pCurCrsr->GetPoint()->nNode.GetNode().FindTableNode();
@@ -787,7 +787,7 @@ String SwCrsrShell::GetBoxNms() const
BOOL SwCrsrShell::GotoTable( const String& rName )
{
- SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
+ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
BOOL bRet = !pTblCrsr && pCurCrsr->GotoTable( rName );
if( bRet )
{
@@ -882,7 +882,7 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
if( pSttNd && pBoxIdx )
{
if( pSttNd == &pBoxIdx->GetNode() )
- pSttNd = 0; // die haben wir schon
+ pSttNd = 0; // die haben wir schon
else
bCheckBox = TRUE;
}
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index f38221e689f3..32ca7779167c 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -2,7 +2,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
@@ -76,8 +76,8 @@ SwUnoCrsr::~SwUnoCrsr()
while( GetNext() != this )
{
Ring* pNxt = GetNext();
- pNxt->MoveTo( 0 ); // ausketten
- delete pNxt; // und loeschen
+ pNxt->MoveTo( 0 ); // ausketten
+ delete pNxt; // und loeschen
}
}
@@ -224,7 +224,7 @@ SwUnoTableCrsr::SwUnoTableCrsr(const SwPosition& rPos)
SwUnoTableCrsr::~SwUnoTableCrsr()
{
while( aTblSel.GetNext() != &aTblSel )
- delete aTblSel.GetNext(); // und loeschen
+ delete aTblSel.GetNext(); // und loeschen
}
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 4cafe1110970..4c9066f4fd04 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -2,7 +2,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
@@ -52,8 +52,8 @@
#include <extinput.hxx>
#include <ndtxt.hxx>
#include <scriptinfo.hxx>
-#include <mdiexp.hxx> // GetSearchDialog
-#include <comcore.hrc> // ResId fuer Abfrage wenn zu Search & Replaces
+#include <mdiexp.hxx> // GetSearchDialog
+#include <comcore.hrc> // ResId fuer Abfrage wenn zu Search & Replaces
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/sdrpaintwindow.hxx>
@@ -109,10 +109,10 @@ void SwRedlineRects::Paint( const Rectangle& rRect )
UINT8 nVal = 0xc8 - ( (nMode / 4) * 16 );
switch( nMode % 4 )
{
- case 0: aCol = RGB_COLORDATA( nVal, nVal, 0xFF ); break;
- case 1: aCol = RGB_COLORDATA( 0xFF, 0xc8, nVal ); break;
- case 2: aCol = RGB_COLORDATA( nVal, 0xFF, nVal ); break;
- case 3: aCol = RGB_COLORDATA( 0xFF, nVal, nVal ); break;
+ case 0: aCol = RGB_COLORDATA( nVal, nVal, 0xFF ); break;
+ case 1: aCol = RGB_COLORDATA( 0xFF, 0xc8, nVal ); break;
+ case 2: aCol = RGB_COLORDATA( nVal, 0xFF, nVal ); break;
+ case 3: aCol = RGB_COLORDATA( 0xFF, nVal, nVal ); break;
}
aCol = aCol.GetColor() ^ COL_WHITE;
@@ -186,7 +186,7 @@ void ShowRedlines( const SwCrsrShell* pSh, int nAction, const SwRect* pRect = 0
switch( nAction )
{
case 1: (*ppRedRect)->Show(); break;
- case 2: (*ppRedRect)->Hide(); break;
+ case 2: (*ppRedRect)->Hide(); break;
case 3: (*ppRedRect)->Invalidate( *pRect ); break;
}
@@ -197,8 +197,8 @@ void ShowRedlines( const SwCrsrShell* pSh, int nAction, const SwRect* pRect = 0
}
}
-#define SHOWREDLINES1( nAct ) ShowRedlines( GetShell(),nAct );
-#define SHOWREDLINES2( nAct, pRect ) ShowRedlines( GetShell(),nAct, pRect );
+#define SHOWREDLINES1( nAct ) ShowRedlines( GetShell(),nAct );
+#define SHOWREDLINES2( nAct, pRect ) ShowRedlines( GetShell(),nAct, pRect );
#else
@@ -238,7 +238,7 @@ SwVisCrsr::~SwVisCrsr()
{
#ifdef SW_CRSR_TIMER
if( bTimerOn )
- Stop(); // Timer stoppen
+ Stop(); // Timer stoppen
#endif
if( bIsVisible && aTxtCrsr.IsVisible() )
@@ -289,7 +289,7 @@ void SwVisCrsr::Hide()
Stop(); // Timer Stoppen
#endif
- if( aTxtCrsr.IsVisible() ) // sollten die Flags nicht gueltig sein?
+ if( aTxtCrsr.IsVisible() ) // sollten die Flags nicht gueltig sein?
aTxtCrsr.Hide();
}
}
@@ -319,7 +319,7 @@ BOOL SwVisCrsr::ChgTimerFlag( BOOL bFlag )
bOld = bTimerOn;
if( !bFlag && bIsVisible && IsActive() )
{
- Stop(); // Timer Stoppen
+ Stop(); // Timer Stoppen
_SetPosAndShow();
}
bTimerOn = bFlag;
@@ -421,7 +421,7 @@ void SwVisCrsr::_SetPosAndShow()
//////////////////////////////////////////////////////////////////////////////
SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
-: SwRects( 0 ),
+: SwRects( 0 ),
pCShell( &rCSh ),
mpCursorOverlay(0)
{
@@ -526,7 +526,7 @@ void SwSelPaintRects::Show()
// create correct selection
mpCursorOverlay = new sdr::overlay::OverlaySelection(
sdr::overlay::OVERLAY_TRANSPARENT,
- aHighlight,
+ aHighlight,
aNewRanges,
true);
@@ -645,7 +645,7 @@ void SwShellCrsr::FillRects()
GetPoint()->nNode.GetNode().GetCntntNode()->GetFrm() &&
(GetMark()->nNode == GetPoint()->nNode ||
(GetMark()->nNode.GetNode().IsCntntNode() &&
- GetMark()->nNode.GetNode().GetCntntNode()->GetFrm() ) ))
+ GetMark()->nNode.GetNode().GetCntntNode()->GetFrm() ) ))
GetDoc()->GetRootFrm()->CalcFrmRects( *this, GetShell()->IsTableMode() );
}
@@ -759,7 +759,7 @@ BOOL SwShellCrsr::UpDown( BOOL bUp, USHORT nCnt )
#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
+// am sichtbaren Cursor
BOOL SwShellCrsr::IsSelOvr( int eFlags )
{
@@ -801,7 +801,7 @@ SwShellTableCrsr::SwShellTableCrsr( const SwCrsrShell& rCrsrSh,
SwShellTableCrsr::~SwShellTableCrsr() {}
-void SwShellTableCrsr::SetMark() { SwShellCrsr::SetMark(); }
+void SwShellTableCrsr::SetMark() { SwShellCrsr::SetMark(); }
SwCursor* SwShellTableCrsr::Create( SwPaM* pRing ) const
{
@@ -898,7 +898,7 @@ BOOL SwShellTableCrsr::IsInside( const Point& rPt ) const
#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
+// am sichtbaren Cursor
BOOL SwShellTableCrsr::IsSelOvr( int eFlags )
{
return SwShellCrsr::IsSelOvr( eFlags );
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 79bddf6e5a61..d9698e5b817c 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@
#include <tools/debug.hxx>
extern ResMgr* pSwResMgr;
// Initialise UI names to 0
-SvStringsDtor *SwStyleNameMapper::pTextUINameArray = 0,
+SvStringsDtor *SwStyleNameMapper::pTextUINameArray = 0,
*SwStyleNameMapper::pListsUINameArray = 0,
*SwStyleNameMapper::pExtraUINameArray = 0,
*SwStyleNameMapper::pRegisterUINameArray = 0,
@@ -64,7 +64,7 @@ SvStringsDtor *SwStyleNameMapper::pTextUINameArray = 0,
*SwStyleNameMapper::pPageDescProgNameArray = 0,
*SwStyleNameMapper::pNumRuleProgNameArray = 0;
-NameToIdHash *SwStyleNameMapper::pParaUIMap = 0,
+NameToIdHash *SwStyleNameMapper::pParaUIMap = 0,
*SwStyleNameMapper::pCharUIMap = 0,
*SwStyleNameMapper::pPageUIMap = 0,
*SwStyleNameMapper::pFrameUIMap = 0,
@@ -1009,77 +1009,77 @@ SvStringsDtor* SwStyleNameMapper::NewProgNameArray( SvStringsDtor*& pProgNameArr
const SvStringsDtor& SwStyleNameMapper::GetTextProgNameArray()
{
return pTextProgNameArray ? *pTextProgNameArray :
- *NewProgNameArray( pTextProgNameArray, TextProgNameTable,
- sizeof ( TextProgNameTable ) / sizeof ( SwTableEntry ) );
+ *NewProgNameArray( pTextProgNameArray, TextProgNameTable,
+ sizeof ( TextProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetListsProgNameArray()
{
- return pListsProgNameArray ? *pListsProgNameArray :
- *NewProgNameArray( pListsProgNameArray, ListsProgNameTable,
+ return pListsProgNameArray ? *pListsProgNameArray :
+ *NewProgNameArray( pListsProgNameArray, ListsProgNameTable,
sizeof ( ListsProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetExtraProgNameArray()
{
- return pExtraProgNameArray ? *pExtraProgNameArray :
- *NewProgNameArray( pExtraProgNameArray, ExtraProgNameTable,
+ return pExtraProgNameArray ? *pExtraProgNameArray :
+ *NewProgNameArray( pExtraProgNameArray, ExtraProgNameTable,
sizeof ( ExtraProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetRegisterProgNameArray()
{
- return pRegisterProgNameArray ? *pRegisterProgNameArray :
- *NewProgNameArray( pRegisterProgNameArray, RegisterProgNameTable,
+ return pRegisterProgNameArray ? *pRegisterProgNameArray :
+ *NewProgNameArray( pRegisterProgNameArray, RegisterProgNameTable,
sizeof ( RegisterProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetDocProgNameArray()
{
- return pDocProgNameArray ? *pDocProgNameArray :
- *NewProgNameArray( pDocProgNameArray, DocProgNameTable,
+ return pDocProgNameArray ? *pDocProgNameArray :
+ *NewProgNameArray( pDocProgNameArray, DocProgNameTable,
sizeof ( DocProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetHTMLProgNameArray()
{
- return pHTMLProgNameArray ? *pHTMLProgNameArray :
- *NewProgNameArray( pHTMLProgNameArray, HTMLProgNameTable,
+ return pHTMLProgNameArray ? *pHTMLProgNameArray :
+ *NewProgNameArray( pHTMLProgNameArray, HTMLProgNameTable,
sizeof ( HTMLProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetFrmFmtProgNameArray()
{
- return pFrmFmtProgNameArray ? *pFrmFmtProgNameArray :
- *NewProgNameArray( pFrmFmtProgNameArray, FrmFmtProgNameTable,
+ return pFrmFmtProgNameArray ? *pFrmFmtProgNameArray :
+ *NewProgNameArray( pFrmFmtProgNameArray, FrmFmtProgNameTable,
sizeof ( FrmFmtProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetChrFmtProgNameArray()
{
- return pChrFmtProgNameArray ? *pChrFmtProgNameArray :
- *NewProgNameArray( pChrFmtProgNameArray, ChrFmtProgNameTable,
+ return pChrFmtProgNameArray ? *pChrFmtProgNameArray :
+ *NewProgNameArray( pChrFmtProgNameArray, ChrFmtProgNameTable,
sizeof ( ChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
{
- return pHTMLChrFmtProgNameArray ? *pHTMLChrFmtProgNameArray :
- *NewProgNameArray( pHTMLChrFmtProgNameArray, HTMLChrFmtProgNameTable,
+ return pHTMLChrFmtProgNameArray ? *pHTMLChrFmtProgNameArray :
+ *NewProgNameArray( pHTMLChrFmtProgNameArray, HTMLChrFmtProgNameTable,
sizeof ( HTMLChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetPageDescProgNameArray()
{
- return pPageDescProgNameArray ? *pPageDescProgNameArray :
- *NewProgNameArray( pPageDescProgNameArray, PageDescProgNameTable,
+ return pPageDescProgNameArray ? *pPageDescProgNameArray :
+ *NewProgNameArray( pPageDescProgNameArray, PageDescProgNameTable,
sizeof ( PageDescProgNameTable ) / sizeof ( SwTableEntry ) );
}
const SvStringsDtor& SwStyleNameMapper::GetNumRuleProgNameArray()
{
- return pNumRuleProgNameArray ? *pNumRuleProgNameArray :
- *NewProgNameArray( pNumRuleProgNameArray, NumRuleProgNameTable,
+ return pNumRuleProgNameArray ? *pNumRuleProgNameArray :
+ *NewProgNameArray( pNumRuleProgNameArray, NumRuleProgNameTable,
sizeof ( NumRuleProgNameTable ) / sizeof ( SwTableEntry ) );
}
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 13346087e1cd..12c56ca65076 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 8d1b4d1d5aa4..4d34e555e143 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -2,7 +2,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
@@ -678,11 +678,11 @@ String lcl_dbg_out(const SwNode & rNode)
else if (rNode.IsStartNode())
{
aTmpStr += String("<start end=\"", RTL_TEXTENCODING_ASCII_US);
-
+
const SwStartNode * pStartNode = dynamic_cast<const SwStartNode *> (&rNode);
- if (pStartNode != NULL)
+ if (pStartNode != NULL)
aTmpStr += String::CreateFromInt32(pStartNode->EndOfSectionNode()->GetIndex());
-
+
aTmpStr += String("\"/>", RTL_TEXTENCODING_ASCII_US);
}
else if (rNode.IsEndNode())
@@ -747,7 +747,7 @@ void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, ULONG & nIndex)
ULONG nStartIndex = nIndex;
bool bDone = false;
-
+
String aTag;
if (pNode->IsTableNode())
aTag += String("table", RTL_TEXTENCODING_ASCII_US);
@@ -755,13 +755,13 @@ void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, ULONG & nIndex)
aTag += String("section", RTL_TEXTENCODING_ASCII_US);
else
aTag += String("nodes", RTL_TEXTENCODING_ASCII_US);
-
+
aStr += String("<", RTL_TEXTENCODING_ASCII_US);
aStr += aTag;
aStr += String(">", RTL_TEXTENCODING_ASCII_US);
while (! bDone)
- {
+ {
if (pNode->IsStartNode() && nIndex != nStartIndex)
lcl_dbg_nodes_inner(aStr, rNodes, nIndex);
else
@@ -771,13 +771,13 @@ void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, ULONG & nIndex)
nIndex++;
}
-
+
if (pNode == pEndNode || nIndex >= nCount)
bDone = true;
else
- pNode = rNodes[nIndex];
+ pNode = rNodes[nIndex];
}
-
+
aStr += String("</", RTL_TEXTENCODING_ASCII_US);
aStr += aTag;
aStr += String(">\n", RTL_TEXTENCODING_ASCII_US);
@@ -786,15 +786,15 @@ void lcl_dbg_nodes_inner(String & aStr, SwNodes & rNodes, ULONG & nIndex)
String lcl_dbg_out(SwNodes & rNodes)
{
String aStr("<nodes-array>", RTL_TEXTENCODING_ASCII_US);
-
+
ULONG nIndex = 0;
ULONG nCount = rNodes.Count();
-
+
while (nIndex < nCount)
{
lcl_dbg_nodes_inner(aStr, rNodes, nIndex);
}
-
+
aStr += String("</nodes-array>\n", RTL_TEXTENCODING_ASCII_US);
return aStr;
@@ -1087,7 +1087,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens)
String lcl_dbg_out(const SwNodeRange & rRange)
{
String aStr("[", RTL_TEXTENCODING_ASCII_US);
-
+
aStr += lcl_dbg_out(SwPosition(rRange.aStart));
aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
aStr += lcl_dbg_out(SwPosition(rRange.aEnd));
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 63347cbede7a..7221f6afa385 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2,7 +2,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
@@ -80,21 +80,21 @@
#include <swtable.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <undobj.hxx>
-#include <pagedesc.hxx> //DTor
+#include <pagedesc.hxx> //DTor
#include <breakit.hxx>
#include <ndole.hxx>
#include <ndgrf.hxx>
-#include <rolbck.hxx> // Undo-Attr
-#include <doctxm.hxx> // fuer die Verzeichnisse
+#include <rolbck.hxx> // Undo-Attr
+#include <doctxm.hxx> // fuer die Verzeichnisse
#include <grfatr.hxx>
-#include <poolfmt.hxx> // PoolVorlagen-Id's
-#include <mvsave.hxx> // fuer Server-Funktionalitaet
+#include <poolfmt.hxx> // PoolVorlagen-Id's
+#include <mvsave.hxx> // fuer Server-Funktionalitaet
#include <SwGrammarMarkUp.hxx>
#include <scriptinfo.hxx>
-#include <acorrect.hxx> // Autokorrektur
-#include <mdiexp.hxx> // Statusanzeige
+#include <acorrect.hxx> // Autokorrektur
+#include <mdiexp.hxx> // Statusanzeige
#include <docstat.hxx>
#include <docary.hxx>
#include <redline.hxx>
@@ -103,7 +103,7 @@
#include <printdata.hxx>
#include <swprtopt.hxx>
#include <cmdid.h> // fuer den dflt - Printer in SetJob
-#include <statstr.hrc> // StatLine-String
+#include <statstr.hrc> // StatLine-String
#include <comcore.hrc>
#include <SwUndoTOXChange.hxx>
#include <SwUndoFmt.hxx>
@@ -678,9 +678,9 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
return false;
{
- // BUG 26675: DataChanged vorm loeschen verschicken, dann bekommt
- // man noch mit, welche Objecte sich im Bereich befinden.
- // Danach koennen sie vor/hinter der Position befinden.
+ // BUG 26675: DataChanged vorm loeschen verschicken, dann bekommt
+ // man noch mit, welche Objecte sich im Bereich befinden.
+ // Danach koennen sie vor/hinter der Position befinden.
SwDataChanged aTmp( this, rPos, 0 );
}
@@ -697,9 +697,9 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
}
//JP 28.01.97: Sonderfall fuer SplitNode am Tabellenanfang:
- // steht die am Doc/Fly/Footer/..-Anfang oder direkt
- // hinter einer Tabelle, dann fuege davor
- // einen Absatz ein
+ // steht die am Doc/Fly/Footer/..-Anfang oder direkt
+ // hinter einer Tabelle, dann fuege davor
+ // einen Absatz ein
if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTxtNode() )
{
ULONG nPrevPos = rPos.nNode.GetIndex() - 1;
@@ -847,7 +847,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
const SwPosition& rPos = *rRg.GetPoint();
- if( pACEWord ) // Aufnahme in die Autokorrektur
+ if( pACEWord ) // Aufnahme in die Autokorrektur
{
if( 1 == rStr.Len() && pACEWord->IsDeleted() )
{
@@ -876,7 +876,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
}
}
else
- { // ist Undo und Gruppierung eingeschaltet, ist alles anders !
+ { // ist Undo und Gruppierung eingeschaltet, ist alles anders !
SwUndoInsert * pUndo = NULL; // #111827#
// don't group the start if hints at the start should be expanded
@@ -1039,8 +1039,8 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
}
/*************************************************************************
-|* SwDoc::GetFldType()
-|* Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
+|* SwDoc::GetFldType()
+|* Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
*************************************************************************/
SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
{
@@ -1051,7 +1051,7 @@ SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
}
/*************************************************************************
- * void SetDocStat( const SwDocStat& rStat );
+ * void SetDocStat( const SwDocStat& rStat );
*************************************************************************/
void SwDoc::SetDocStat( const SwDocStat& rStat )
{
@@ -1069,16 +1069,16 @@ struct _PostItFld : public _SetGetExpFld
: _SetGetExpFld( rNdIdx, pFld, pIdx ) {}
USHORT GetPageNo( const StringRangeEnumerator &rRangeEnum,
- const std::set< sal_Int32 > &rPossiblePages,
+ const std::set< sal_Int32 > &rPossiblePages,
USHORT& rVirtPgNo, USHORT& rLineNo );
-
+
SwPostItField* GetPostIt() const
- {
+ {
return (SwPostItField*) GetFld()->GetFld().GetFld();
}
};
-USHORT _PostItFld::GetPageNo(
+USHORT _PostItFld::GetPageNo(
const StringRangeEnumerator &rRangeEnum,
const std::set< sal_Int32 > &rPossiblePages,
/* out */ USHORT& rVirtPgNo, /* out */ USHORT& rLineNo )
@@ -1110,8 +1110,8 @@ USHORT _PostItFld::GetPageNo(
return 0;
}
-bool lcl_GetPostIts(
- IDocumentFieldsAccess* pIDFA,
+bool lcl_GetPostIts(
+ IDocumentFieldsAccess* pIDFA,
_SetGetExpFlds * pSrtLst )
{
bool bHasPostIts = false;
@@ -1147,9 +1147,9 @@ bool lcl_GetPostIts(
return bHasPostIts;
}
-static void lcl_FormatPostIt(
- IDocumentContentOperations* pIDCO,
- SwPaM& aPam,
+static void lcl_FormatPostIt(
+ IDocumentContentOperations* pIDCO,
+ SwPaM& aPam,
SwPostItField* pField,
bool bNewPage, bool bIsFirstPostIt,
USHORT nPageNo, USHORT nLineNo )
@@ -1169,7 +1169,7 @@ static void lcl_FormatPostIt(
pIDCO->SplitNode( *aPam.GetPoint(), false );
pIDCO->SplitNode( *aPam.GetPoint(), false );
}
-
+
String aStr( ViewShell::GetShellRes()->aPostItPage );
aStr.AppendAscii(sTmp);
@@ -1186,7 +1186,7 @@ static void lcl_FormatPostIt(
aStr.AppendAscii(sTmp);
aStr += pField->GetPar1();
aStr += ' ';
- SvtSysLocale aSysLocale;
+ SvtSysLocale aSysLocale;
aStr += /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() );
pIDCO->InsertString( aPam, aStr );
@@ -1216,7 +1216,7 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
}
void SwDoc::CalculatePagesForPrinting(
- /* out */ SwRenderData &rData,
+ /* out */ SwRenderData &rData,
const SwPrintUIOptions &rOptions,
bool bIsPDFExport,
sal_Int32 nDocPageCount )
@@ -1234,9 +1234,9 @@ void SwDoc::CalculatePagesForPrinting(
bool bPrintRightPages = bIsPDFExport ? true : rOptions.IsPrintRightPages();
// #i103700# printing selections should not allow for automatic inserting empty pages
bool bPrintEmptyPages = bPrintSelection ? false : rOptions.IsPrintEmptyPages( bIsPDFExport );
-
+
Range aPages( 1, nDocPageCount );
-
+
MultiSelection aMulti( aPages );
aMulti.SetTotalRange( Range( 0, RANGE_MAX ) );
aMulti.Select( aPages );
@@ -1329,7 +1329,7 @@ void SwDoc::CalculatePagesForPrinting(
}
}
-
+
//
// now that we have identified the valid pages for printing according
// to the print settings we need to get the PageRange to use and
@@ -1342,7 +1342,7 @@ void SwDoc::CalculatePagesForPrinting(
// PL, OD #i116085# - adjusting fix for i113919
if ( !bIsPDFExport )
{
- // PageContent :
+ // PageContent :
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
// 2 -> print selection
@@ -1353,9 +1353,9 @@ void SwDoc::CalculatePagesForPrinting(
// note that printing selections is actually implemented by copying
// the selection to a new temporary document and printing all of that one.
// Thus for Writer "PrintContent" must never be 2.
- // See SwXTextDocument::GetRenderDoc for evaluating if a selection is to be
+ // See SwXTextDocument::GetRenderDoc for evaluating if a selection is to be
// printed and for creating the temporary document.
- }
+ }
// please note
}
@@ -1370,15 +1370,15 @@ void SwDoc::CalculatePagesForPrinting(
// get vector of pages to print according to PageRange and valid pages set from above
// (result may be an empty vector, for example if the range string is not correct)
- StringRangeEnumerator::getRangesFromString(
+ StringRangeEnumerator::getRangesFromString(
aPageRange, rData.GetPagesToPrint(),
1, nDocPageCount, 0, &rData.GetValidPagesSet() );
}
-void SwDoc::UpdatePagesForPrintingWithPostItData(
- /* out */ SwRenderData &rData,
+void SwDoc::UpdatePagesForPrintingWithPostItData(
+ /* out */ SwRenderData &rData,
const SwPrintUIOptions &rOptions,
- bool /*bIsPDFExport*/,
+ bool /*bIsPDFExport*/,
sal_Int32 nDocPageCount )
{
@@ -1399,14 +1399,14 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
const StringRangeEnumerator aRangeEnum( rData.GetPageRange(), 1, nDocPageCount, 0 );
- // For mode POSTITS_ENDPAGE:
+ // For mode POSTITS_ENDPAGE:
// maps a physical page number to the page number in post-it document that holds
// the first post-it for that physical page . Needed to relate the correct start frames
// from the post-it doc to the physical page of the document
std::map< sal_Int32, sal_Int32 > aPostItLastStartPageNum;
// add all post-its on valid pages within the the page range to the
- // temporary post-it document.
+ // temporary post-it document.
// Since the array of post-it fileds is sorted by page and line number we will
// already get them in the correct order
USHORT nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0;
@@ -1415,7 +1415,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
{
_PostItFld& rPostIt = (_PostItFld&)*(*rData.m_pPostItFields)[ i ];
nLastPageNum = nPhyPageNum;
- nPhyPageNum = rPostIt.GetPageNo(
+ nPhyPageNum = rPostIt.GetPageNo(
aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
if (nPhyPageNum)
{
@@ -1424,46 +1424,46 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// post-it page needs to start on a new page
const bool bNewPage = nPostItMode == POSTITS_ENDPAGE &&
!bIsFirstPostIt && nPhyPageNum != nLastPageNum;
-
+
lcl_FormatPostIt( rData.m_pPostItShell->GetDoc(), aPam,
rPostIt.GetPostIt(), bNewPage, bIsFirstPostIt, nVirtPg, nLineNo );
bIsFirstPostIt = false;
-
+
if (nPostItMode == POSTITS_ENDPAGE)
{
// get the correct number of current pages for the post-it document
rData.m_pPostItShell->CalcLayout();
const sal_Int32 nPages = rData.m_pPostItDoc->GetPageCount();
aPostItLastStartPageNum[ nPhyPageNum ] = nPages;
- }
+ }
}
}
-
+
// format post-it doc to get correct number of pages
rData.m_pPostItShell->CalcLayout();
const sal_Int32 nPostItDocPageCount = rData.m_pPostItDoc->GetPageCount();
if (nPostItMode == POSTITS_ONLY || nPostItMode == POSTITS_ENDDOC)
{
- // now add those post-it pages to the vector of pages to print
+ // now add those post-it pages to the vector of pages to print
// or replace them if only post-its should be printed
-
+
rData.GetPostItStartFrames().clear();
if (nPostItMode == POSTITS_ENDDOC)
{
// set all values up to number of pages to print currently known to NULL,
- // meaning none of the pages currently in the vector is from the
+ // meaning none of the pages currently in the vector is from the
// post-it document, they are the documents pages.
rData.GetPostItStartFrames().resize( rData.GetPagesToPrint().size() );
- }
+ }
else if (nPostItMode == POSTITS_ONLY)
{
// no document page to be printed
rData.GetPagesToPrint().clear();
}
-
+
// now we just need to add the post-it pages to be printed to the end
- // of the vector of pages to print and keep the GetValidStartFrames
+ // of the vector of pages to print and keep the GetValidStartFrames
// data conform with it
sal_Int32 nPageNum = 0;
const SwPageFrm * pPageFrm = (SwPageFrm*)rData.m_pPostItShell->GetLayout()->Lower();
@@ -1477,7 +1477,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
}
DBG_ASSERT( nPageNum == nPostItDocPageCount, "unexpected number of pages" );
- }
+ }
else if (nPostItMode == POSTITS_ENDPAGE)
{
// the next step is to find all the start frames from the post-it
@@ -1495,10 +1495,10 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
aAllPostItStartFrames.push_back( pPageFrm );
pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
}
- DBG_ASSERT( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount,
+ DBG_ASSERT( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount,
"unexpected number of frames; does not match number of pages" );
-
- // get a map that holds all post-it frames to be printed for a
+
+ // get a map that holds all post-it frames to be printed for a
// given physical page from the document
sal_Int32 nLastStartPageNum = 0;
std::map< sal_Int32, sal_Int32 >::const_iterator aIt;
@@ -1513,7 +1513,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
for (sal_Int32 i = 0; i < nFrames; ++i)
{
const sal_Int32 nIdx = nFirstStartPageNum - 1 + i; // -1 because lowest page num is 1
- DBG_ASSERT( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()),
+ DBG_ASSERT( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()),
"index out of range" );
aStartFrames.push_back( aAllPostItStartFrames[ nIdx ] );
}
@@ -1521,12 +1521,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
nLastStartPageNum = aIt->second;
}
-
- // ok, now that aPhysPageToPostItFrames can give the start frames for all
+
+ // ok, now that aPhysPageToPostItFrames can give the start frames for all
// post-it pages to be printed we need to merge those at the correct
// position into the GetPagesToPrint vector and build and maintain the
// GetValidStartFrames vector as well.
- // Since inserting a larger number of entries in the middle of a vector
+ // Since inserting a larger number of entries in the middle of a vector
// isn't that efficient we will create new vectors by copying the required data
std::vector< sal_Int32 > aTmpPagesToPrint;
std::vector< const SwPageFrm * > aTmpPostItStartFrames;
@@ -1537,7 +1537,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
const sal_Int32 nPhysPage = rData.GetPagesToPrint()[i];
aTmpPagesToPrint.push_back( nPhysPage );
aTmpPostItStartFrames.push_back( NULL );
-
+
// add the post-it document pages to print, i.e those
// post-it pages that have the data for the above physical page
const std::vector< const SwPageFrm * > &rPostItFrames = aPhysPageToPostItFrames[ nPhysPage ];
@@ -1546,7 +1546,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
{
aTmpPagesToPrint.push_back( 0 );
aTmpPostItStartFrames.push_back( rPostItFrames[k] );
- }
+ }
}
// finally we need to assign those vectors to the resulting ones.
@@ -1554,12 +1554,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// we won't need the temporary vectors anymore
rData.GetPagesToPrint().swap( aTmpPagesToPrint );
rData.GetPostItStartFrames().swap( aTmpPostItStartFrames );
- }
- }
+ }
+ }
}
-void SwDoc::CalculatePagePairsForProspectPrinting(
- /* out */ SwRenderData &rData,
+void SwDoc::CalculatePagePairsForProspectPrinting(
+ /* out */ SwRenderData &rData,
const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount )
{
@@ -1567,13 +1567,13 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
std::set< sal_Int32 > &rValidPagesSet = rData.GetValidPagesSet();
std::map< sal_Int32, const SwPageFrm * > &rValidStartFrms = rData.GetValidStartFrames();
std::vector< std::pair< sal_Int32, sal_Int32 > > &rPagePairs = rData.GetPagePairsForProspectPrinting();
-
+
rPagePairs.clear();
rValidPagesSet.clear();
rValidStartFrms.clear();
rtl::OUString aPageRange = rOptions.getStringValue( "PageRange", rtl::OUString() );
- // PageContent :
+ // PageContent :
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
// 2 -> print selection
@@ -1598,7 +1598,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
if ( !pStPage ) // dann wars das
return;
- // currently for prospect printing all pages are valid to be printed
+ // currently for prospect printing all pages are valid to be printed
// thus we add them all to the respective map and set for later use
sal_Int32 nPageNum = 0;
const SwPageFrm *pPageFrm = (SwPageFrm*)pLayout->Lower();
@@ -1622,11 +1622,11 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
bool bPrintProspectRTL = rOptions.getIntValue( "PrintProspectRTL", 0 ) ? true : false;
// get pages for prospect printing according to the 'PageRange'
- // (duplicates and any order allowed!)
+ // (duplicates and any order allowed!)
std::vector< sal_Int32 > aPagesToPrint;
- StringRangeEnumerator::getRangesFromString(
+ StringRangeEnumerator::getRangesFromString(
aPageRange, aPagesToPrint, 1, nDocPageCount, 0 );
-
+
// now fill the vector for calculating the page pairs with the start frames
// from the above obtained vector
std::vector< const SwPageFrm * > aVec;
@@ -1638,7 +1638,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
// just one page is special ...
- if ( 1 == aVec.size() )
+ if ( 1 == aVec.size() )
aVec.insert( aVec.begin() + 1, 0 ); // insert a second empty page
else
{
@@ -1700,7 +1700,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
DBG_ASSERT( size_t(nCntPage) == rPagePairs.size(), "size mismatch for number of page pairs" );
- // luckily prospect printing does not make use of post-its so far,
+ // luckily prospect printing does not make use of post-its so far,
// thus we are done here.
}
@@ -1718,14 +1718,14 @@ const Size SwDoc::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
(GetRootFrm()->Lower());
while ( --nPageNum && pPage->GetNext() )
- {
+ {
pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
}
// switch to next page for an empty page, if empty pages are not skipped
// in order to get a sensible page size for an empty page - e.g. for printing.
if ( !bSkipEmptyPages && pPage->IsEmptyPage() && pPage->GetNext() )
- {
+ {
pPage = static_cast<const SwPageFrm*>( pPage->GetNext() );
}
@@ -1735,7 +1735,7 @@ const Size SwDoc::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
}
/*************************************************************************
- * void UpdateDocStat( const SwDocStat& rStat );
+ * void UpdateDocStat( const SwDocStat& rStat );
*************************************************************************/
void SwDoc::UpdateDocStat( SwDocStat& rStat )
{
@@ -1752,10 +1752,10 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
case ND_TEXTNODE:
((SwTxtNode*)pNd)->CountWords( rStat, 0, ((SwTxtNode*)pNd)->GetTxt().Len() );
break;
- case ND_TABLENODE: ++rStat.nTbl; break;
- case ND_GRFNODE: ++rStat.nGrf; break;
- case ND_OLENODE: ++rStat.nOLE; break;
- case ND_SECTIONNODE: break;
+ case ND_TABLENODE: ++rStat.nTbl; break;
+ case ND_GRFNODE: ++rStat.nGrf; break;
+ case ND_OLENODE: ++rStat.nOLE; break;
+ case ND_SECTIONNODE: break;
}
}
@@ -1777,7 +1777,7 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
}
}
- rStat.nPage = GetRootFrm() ? GetRootFrm()->GetPageNum() : 0;
+ rStat.nPage = GetRootFrm() ? GetRootFrm()->GetPageNum() : 0;
rStat.bModified = FALSE;
SetDocStat( rStat );
@@ -1878,7 +1878,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( USHORT nIndex ) const
// returne die Namen aller im Doc gesetzten Referenzen
//JP 24.06.96: Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine
-// RefMark gesetzt ist
+// RefMark gesetzt ist
// OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt
USHORT SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
{
@@ -1959,8 +1959,8 @@ void SwDoc::SetModified()
SwLayouter::ClearMoveBwdLayoutInfo( *this );
// <--
// dem Link wird der Status returnt, wie die Flags waren und werden
- // Bit 0: -> alter Zustand
- // Bit 1: -> neuer Zustand
+ // Bit 0: -> alter Zustand
+ // Bit 1: -> neuer Zustand
long nCall = mbModified ? 3 : 2;
mbModified = TRUE;
pDocStat->bModified = TRUE;
@@ -1978,8 +1978,8 @@ void SwDoc::SetModified()
void SwDoc::ResetModified()
{
// dem Link wird der Status returnt, wie die Flags waren und werden
- // Bit 0: -> alter Zustand
- // Bit 1: -> neuer Zustand
+ // Bit 0: -> alter Zustand
+ // Bit 1: -> neuer Zustand
long nCall = mbModified ? 1 : 0;
mbModified = FALSE;
// If there is already a document statistic, we assume that
@@ -2052,14 +2052,14 @@ BOOL lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
{
SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
-// BOOL bOnlyWrong = *(BOOL*)pArgs;
+// BOOL bOnlyWrong = *(BOOL*)pArgs;
if( pTxtNode )
{
pTxtNode->SetSmartTagDirty( true );
if( pTxtNode->GetSmartTags() )
{
// if ( bOnlyWrong ) // only some smart tag types have been enabled or disabled
-// pTxtNode->GetSmartTags()->SetInvalid( 0, STRING_LEN );
+// pTxtNode->GetSmartTags()->SetInvalid( 0, STRING_LEN );
// else // smart tags all have been enabled or disabled
pTxtNode->SetSmartTags( NULL );
}
@@ -2068,7 +2068,7 @@ BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
}
/*************************************************************************
- * SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong )
+ * SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong )
*
* stoesst das Spelling im Idle-Handler wieder an.
* Wird bInvalid als TRUE uebergeben, so werden zusaetzlich die WrongListen
@@ -2185,7 +2185,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, BYTE nLevel, BYTE nPara, BOOL bImpress )
{
SwNode *pNode;
BOOL bDelete = FALSE;
- if( (pNode = &aIndx.GetNode())->IsTxtNode() )
+ if( (pNode = &aIndx.GetNode())->IsTxtNode() )
{
SwTxtNode *pNd = (SwTxtNode*)pNode;
if( pNd->HasSwAttrSet() )
@@ -2453,7 +2453,7 @@ BOOL SwDoc::ConvertFieldsToText()
SwPaM aPam2(*pTxtFld->GetpTxtNode(), *pTxtFld->GetStart());
aPam2.SetMark();
aPam2.Move();
- DeleteAndJoin(aPam2);//remove the field
+ DeleteAndJoin(aPam2);//remove the field
}
}
++aBegin;
@@ -2535,7 +2535,7 @@ bool SwDoc::EmbedAllLinks()
rLnkMgr.Remove( xLink );
if( nCount != rLnks.Count() + 1 )
- n = 0; // wieder von vorne anfangen, es wurden
+ n = 0; // wieder von vorne anfangen, es wurden
// mehrere Links entfernt
bRet = TRUE;
}
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 8f7f374da5b8..fd18605015a6 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -2,7 +2,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
@@ -153,7 +153,7 @@ BOOL SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
BOOL bCheckPtr, SbxArray* pArgs, const Link* )
{
- if( !pDocShell ) // ohne DocShell geht das nicht!
+ if( !pDocShell ) // ohne DocShell geht das nicht!
return 0;
USHORT nRet = 0;
@@ -169,7 +169,7 @@ USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
if( 0 != (pItem = GetAttrPool().GetItem( RES_TXTATR_INETFMT, n ) )
&& rCallEvent.PTR.pINetAttr == pItem )
{
- bCheckPtr = FALSE; // als Flag missbrauchen
+ bCheckPtr = FALSE; // als Flag missbrauchen
break;
}
}
@@ -185,7 +185,7 @@ USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
{
USHORT nPos = GetSpzFrmFmts()->GetPos( pFmt );
if( USHRT_MAX != nPos )
- bCheckPtr = FALSE; // als Flag missbrauchen
+ bCheckPtr = FALSE; // als Flag missbrauchen
}
if( !bCheckPtr )
pTbl = &pFmt->GetMacro().GetMacroTable();
@@ -206,7 +206,7 @@ USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
for( nPos = pIMap->GetIMapObjectCount(); nPos; )
if( pIMapObj == pIMap->GetIMapObject( --nPos ))
{
- bCheckPtr = FALSE; // als Flag missbrauchen
+ bCheckPtr = FALSE; // als Flag missbrauchen
break;
}
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 6b2148f0508d..9717586e0694 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -2,7 +2,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
@@ -428,19 +428,19 @@ namespace sw { namespace mark
const rtl::OUString& rName,
const rtl::OUString& rType )
{
- sw::mark::IMark* pMark = makeMark( rPaM, rName,
+ sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::TEXT_FIELDMARK );
sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
pFieldMark->SetFieldname( rType );
return pFieldMark;
}
-
- ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+
+ ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType)
{
- sw::mark::IMark* pMark = makeMark( rPaM, rName,
+ sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::CHECKBOX_FIELDMARK );
sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
pFieldMark->SetFieldname( rType );
@@ -869,20 +869,20 @@ namespace sw { namespace mark
namespace
{
// Aufbau vom Array: 2 longs,
- // 1. Long enthaelt Type und Position im DocArray,
- // 2. die ContentPosition
+ // 1. Long enthaelt Type und Position im DocArray,
+ // 2. die ContentPosition
//
- // CntntType --
- // 0x8000 = Bookmark Pos1
- // 0x8001 = Bookmark Pos2
- // 0x2000 = Absatzgebundener Rahmen
- // 0x2001 = Auto-Absatzgebundener Rahmen, der umgehaengt werden soll
- // 0x1000 = Redline Mark
- // 0x1001 = Redline Point
- // 0x0800 = Crsr aus der CrsrShell Mark
- // 0x0801 = Crsr aus der CrsrShell Point
- // 0x0400 = UnoCrsr Mark
- // 0x0401 = UnoCrsr Point
+ // CntntType --
+ // 0x8000 = Bookmark Pos1
+ // 0x8001 = Bookmark Pos2
+ // 0x2000 = Absatzgebundener Rahmen
+ // 0x2001 = Auto-Absatzgebundener Rahmen, der umgehaengt werden soll
+ // 0x1000 = Redline Mark
+ // 0x1001 = Redline Point
+ // 0x0800 = Crsr aus der CrsrShell Mark
+ // 0x0801 = Crsr aus der CrsrShell Point
+ // 0x0400 = UnoCrsr Mark
+ // 0x0401 = UnoCrsr Point
//
class _SwSaveTypeCountContent
@@ -911,21 +911,21 @@ namespace
rArr.Insert( nContent, rArr.Count() );
}
- void SetType( USHORT n ) { TYPECOUNT.TC.nType = n; }
- USHORT GetType() const { return TYPECOUNT.TC.nType; }
- void IncType() { ++TYPECOUNT.TC.nType; }
- void DecType() { --TYPECOUNT.TC.nType; }
+ void SetType( USHORT n ) { TYPECOUNT.TC.nType = n; }
+ USHORT GetType() const { return TYPECOUNT.TC.nType; }
+ void IncType() { ++TYPECOUNT.TC.nType; }
+ void DecType() { --TYPECOUNT.TC.nType; }
- void SetCount( USHORT n ) { TYPECOUNT.TC.nCount = n; }
- USHORT GetCount() const { return TYPECOUNT.TC.nCount; }
- USHORT IncCount() { return ++TYPECOUNT.TC.nCount; }
- USHORT DecCount() { return --TYPECOUNT.TC.nCount; }
+ void SetCount( USHORT n ) { TYPECOUNT.TC.nCount = n; }
+ USHORT GetCount() const { return TYPECOUNT.TC.nCount; }
+ USHORT IncCount() { return ++TYPECOUNT.TC.nCount; }
+ USHORT DecCount() { return --TYPECOUNT.TC.nCount; }
void SetTypeAndCount( USHORT nT, USHORT nC )
{ TYPECOUNT.TC.nCount = nC; TYPECOUNT.TC.nType = nT; }
- void SetContent( xub_StrLen n ) { nContent = n; }
- xub_StrLen GetContent() const { return nContent; }
+ void SetContent( xub_StrLen n ) { nContent = n; }
+ xub_StrLen GetContent() const { return nContent; }
};
// #i59534: If a paragraph will be splitted we have to restore some redline positions
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 3a8f5b86c6d9..5ded86eb0ef4 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -2,7 +2,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
@@ -172,7 +172,7 @@ void SwDoc::UpdateCharts( const String &rName ) const
void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName )
{
-// BOOL bStop = 1;
+// BOOL bStop = 1;
const String aOldName( rTblFmt.GetName() );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 11030e68ea8a..f05f36a76dc7 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -2,7 +2,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
@@ -115,8 +115,8 @@ public:
: 0;
}
- ULONG GetLineCount() const { return aLines.Count(); }
- ULONG GetLineOffset() const { return nSttLineNum; }
+ ULONG GetLineCount() const { return aLines.Count(); }
+ ULONG GetLineOffset() const { return nSttLineNum; }
const CompareLine* GetLine( ULONG nLine ) const
{ return aLines.GetObject( nLine ); }
void InsertLine( CompareLine* pLine )
@@ -330,7 +330,7 @@ static const ULONG primes[] =
8388593,
16777213,
33554393,
- 67108859, /* Preposterously large . . . */
+ 67108859, /* Preposterously large . . . */
134217689,
268435399,
536870909,
@@ -675,16 +675,16 @@ void Compare::CompareSequence::Compare( ULONG nStt1, ULONG nEnd1,
ULONG Compare::CompareSequence::CheckDiag( ULONG nStt1, ULONG nEnd1,
ULONG nStt2, ULONG nEnd2, ULONG* pCost )
{
- const long dmin = nStt1 - nEnd2; /* Minimum valid diagonal. */
- const long dmax = nEnd1 - nStt2; /* Maximum valid diagonal. */
- const long fmid = nStt1 - nStt2; /* Center diagonal of top-down search. */
- const long bmid = nEnd1 - nEnd2; /* Center diagonal of bottom-up search. */
+ const long dmin = nStt1 - nEnd2; /* Minimum valid diagonal. */
+ const long dmax = nEnd1 - nStt2; /* Maximum valid diagonal. */
+ const long fmid = nStt1 - nStt2; /* Center diagonal of top-down search. */
+ const long bmid = nEnd1 - nEnd2; /* Center diagonal of bottom-up search. */
- long fmin = fmid, fmax = fmid; /* Limits of top-down search. */
- long bmin = bmid, bmax = bmid; /* Limits of bottom-up search. */
+ long fmin = fmid, fmax = fmid; /* Limits of top-down search. */
+ long bmin = bmid, bmax = bmid; /* Limits of bottom-up search. */
- long c; /* Cost. */
- long odd = (fmid - bmid) & 1; /* True if southeast corner is on an odd
+ long c; /* Cost. */
+ long odd = (fmid - bmid) & 1; /* True if southeast corner is on an odd
diagonal with respect to the northwest. */
pFDiag[fmid] = nStt1;
@@ -692,7 +692,7 @@ ULONG Compare::CompareSequence::CheckDiag( ULONG nStt1, ULONG nEnd1,
for (c = 1;; ++c)
{
- long d; /* Active diagonal. */
+ long d; /* Active diagonal. */
long big_snake = 0;
/* Extend the top-down search by an edit step in each diagonal. */
@@ -1030,11 +1030,11 @@ BOOL SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
// the same type of TOX?
const SwTOXBase* pSrcTOX = rSrcSect.GetTOXBase();
const SwTOXBase* pDstTOX = rDstSect.GetTOXBase();
- bRet = pSrcTOX && pDstTOX
+ bRet = pSrcTOX && pDstTOX
&& pSrcTOX->GetType() == pDstTOX->GetType()
&& pSrcTOX->GetTitle() == pDstTOX->GetTitle()
&& pSrcTOX->GetTypeName() == pDstTOX->GetTypeName()
-// && pSrcTOX->GetTOXName() == pDstTOX->GetTOXName()
+// && pSrcTOX->GetTOXName() == pDstTOX->GetTOXName()
;
}
break;
@@ -1103,7 +1103,7 @@ String SwCompareLine::GetText() const
if( pTOX )
sRet.Append( pTOX->GetTitle() )
.Append( pTOX->GetTypeName() )
-// .Append( pTOX->GetTOXName() )
+// .Append( pTOX->GetTOXName() )
.Append( String::CreateFromInt32( pTOX->GetType() ));
}
break;
@@ -1416,7 +1416,7 @@ void SwCompareData::SetRedlinesToDoc( BOOL bUseDocInfo )
SwPaM* pTmp = pDelRing;
// Bug #83296#: get the Author / TimeStamp from the "other"
- // document info
+ // document info
USHORT nAuthor = rDoc.GetRedlineAuthor();
DateTime aTimeStamp;
SwDocShell *pDocShell(rDoc.GetDocShell());
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index b68d512d1aa0..67f83f0f42f0 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -2,7 +2,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
@@ -122,9 +122,9 @@ namespace
const SwPosition& rEnd,
const SwPosition& rNewPos)
{
- for(int nb = 0; nb < 2; ++nb)
- if(rStart <= (pPam)->GetBound(BOOL(nb)) &&
- (pPam)->GetBound(BOOL(nb)) <= rEnd )
+ for(int nb = 0; nb < 2; ++nb)
+ if(rStart <= (pPam)->GetBound(BOOL(nb)) &&
+ (pPam)->GetBound(BOOL(nb)) <= rEnd )
(pPam)->GetBound(BOOL(nb)) = rNewPos;
};
@@ -139,7 +139,7 @@ namespace
(pPam)->GetBound(BOOL(nb)).nNode = rNewPos.nNode;
(pPam)->GetBound(BOOL(nb)).nContent.Assign(
const_cast<SwIndexReg*>(rNewPos.nContent.GetIdxReg()),
- nCntIdx + (pPam)->GetBound(BOOL(nb)).nContent.GetIndex());
+ nCntIdx + (pPam)->GetBound(BOOL(nb)).nContent.GetIndex());
}
}
}
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 6959e2880877..1b6c2e3c3aca 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -2,7 +2,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
@@ -38,15 +38,15 @@
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#include <sfx2/linkmgr.hxx> // LinkManager
+#include <sfx2/linkmgr.hxx> // LinkManager
#include <unotools/charclass.hxx>
#include <fmtcntnt.hxx>
#include <doc.hxx>
-#include <swserv.hxx> // fuer Server-Funktionalitaet
+#include <swserv.hxx> // fuer Server-Funktionalitaet
#include <IMark.hxx>
#include <bookmrk.hxx>
-#include <section.hxx> // fuer SwSectionFmt
-#include <swtable.hxx> // fuer SwTable
+#include <section.hxx> // fuer SwSectionFmt
+#include <swtable.hxx> // fuer SwTable
#include <node.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
@@ -115,20 +115,20 @@ BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bCaseS
pItem->pSectNd = pIdx->GetNode().GetSectionNode();
return FALSE;
}
-//nein!! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
+//nein!! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
// sie nicht. Die Namen sind immer eindeutig.
}
}
- return TRUE; // dann weiter
+ return TRUE; // dann weiter
}
BOOL lcl_FindSectionCaseSensitive( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
{
return lcl_FindSection( rpSectFmt, pArgs, true );
-}
+}
BOOL lcl_FindSectionCaseInsensitive( const SwSectionFmtPtr& rpSectFmt, void* pArgs )
{
return lcl_FindSection( rpSectFmt, pArgs, false );
-}
+}
@@ -150,10 +150,10 @@ BOOL lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
pFBox->GetSttNd()->FindTableNode();
return FALSE;
}
-//nein! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
+//nein! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
// sie nicht. Die Namen sind immer eindeutig.
}
- return TRUE; // dann weiter
+ return TRUE; // dann weiter
}
@@ -166,7 +166,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
while( true )
{
::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
- if(pBkmk)
+ if(pBkmk)
return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
// haben wir ueberhaupt das Item vorraetig?
@@ -179,7 +179,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
// gefunden, als erfrage die Daten
return SwServerObject( *aPara.pSectNd ).GetData( rValue, rMimeType );
}
- if( !bCaseSensitive )
+ if( !bCaseSensitive )
break;
bCaseSensitive = false;
}
@@ -205,7 +205,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
while( true )
{
::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
- if(pBkmk)
+ if(pBkmk)
return SwServerObject(*pBkmk).SetData(rMimeType, rValue);
// haben wir ueberhaupt das Item vorraetig?
@@ -217,7 +217,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
// gefunden, als erfrage die Daten
return SwServerObject( *aPara.pSectNd ).SetData( rMimeType, rValue );
}
- if( !bCaseSensitive )
+ if( !bCaseSensitive )
break;
bCaseSensitive = false;
}
@@ -248,12 +248,12 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
if(pBkmk && pBkmk->IsExpanded()
&& (0 == (pObj = pBkmk->GetRefObject())))
{
- // mark found, but no link yet -> create hotlink
+ // mark found, but no link yet -> create hotlink
pObj = new SwServerObject(*pBkmk);
pBkmk->SetRefObject(pObj);
GetLinkManager().InsertServer(pObj);
- }
- if(pObj)
+ }
+ if(pObj)
return pObj;
_FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
@@ -262,25 +262,25 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
if(aPara.pSectNd
&& (0 == (pObj = aPara.pSectNd->GetSection().GetObject())))
{
- // section found, but no link yet -> create hotlink
+ // section found, but no link yet -> create hotlink
pObj = new SwServerObject( *aPara.pSectNd );
aPara.pSectNd->GetSection().SetRefObject( pObj );
GetLinkManager().InsertServer(pObj);
}
- if(pObj)
+ if(pObj)
return pObj;
- if( !bCaseSensitive )
+ if( !bCaseSensitive )
break;
bCaseSensitive = false;
}
_FindItem aPara( GetAppCharClass().lower(rItem) );
- // tables
+ // tables
((SwFrmFmts*)pTblFrmFmtTbl)->ForEach(0, pTblFrmFmtTbl->Count(), lcl_FindTable, &aPara);
if(aPara.pTblNd
&& (0 == (pObj = aPara.pTblNd->GetTable().GetObject())))
{
- // table found, but no link yet -> create hotlink
+ // table found, but no link yet -> create hotlink
pObj = new SwServerObject(*aPara.pTblNd);
aPara.pTblNd->GetTable().SetRefObject(pObj);
GetLinkManager().InsertServer(pObj);
@@ -341,7 +341,7 @@ BOOL SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
}
else if( sCmp.EqualsAscii( pMarkToRegion ) )
{
- sItem = sName; // wird unten behandelt !
+ sItem = sName; // wird unten behandelt !
bWeiter = TRUE;
}
else if( sCmp.EqualsAscii( pMarkToOutline ) )
@@ -365,7 +365,7 @@ BOOL SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
//GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
GetAttrOutlineLevel()-1;//<-end,zhaojianwei
++nTmpPos )
- ; // es gibt keinen Block
+ ; // es gibt keinen Block
if( nTmpPos < rOutlNds.Count() )
rpRange->aEnd = *rOutlNds[ nTmpPos ];
@@ -393,7 +393,7 @@ BOOL SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
return static_cast<bool>(rpPam);
}
- //
+ //
_FindItem aPara( bCaseSensitive ? sItem : rCC.lower( sItem ) );
if( pSectionFmtTbl->Count() )
@@ -408,7 +408,7 @@ BOOL SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
}
}
- if( !bCaseSensitive )
+ if( !bCaseSensitive )
break;
bCaseSensitive = false;
}
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 00a9fd604f5a..a5a4078f1a82 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -2,7 +2,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
@@ -50,8 +50,8 @@
#include <mdiexp.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <pagefrm.hxx> //Fuer DelPageDesc
-#include <rootfrm.hxx> //Fuer DelPageDesc
+#include <pagefrm.hxx> //Fuer DelPageDesc
+#include <rootfrm.hxx> //Fuer DelPageDesc
#include <ndtxt.hxx>
#include <frmtool.hxx>
#include <pagedesc.hxx>
@@ -136,10 +136,10 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
/*************************************************************************
|*
-|* SwDoc::ChgPageDesc()
+|* SwDoc::ChgPageDesc()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 01. Mar. 95
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 01. Mar. 95
|*
|*************************************************************************/
@@ -220,7 +220,7 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
{
pDesc->SetNumType( rChged.GetNumType() );
// JP 30.03.99: Bug 64121 - den Seitennummernfeldern bescheid sagen,
- // das sich das Num-Format geaendert hat
+ // das sich das Num-Format geaendert hat
GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
@@ -260,7 +260,7 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
}
else if ( rHead.IsActive() )
- { //Left bekommt einen eigenen Header verpasst wenn das Format nicht
+ { //Left bekommt einen eigenen Header verpasst wenn das Format nicht
//bereits einen hat.
//Wenn er bereits einen hat und dieser auf die gleiche Section
//wie der Rechte zeigt, so muss er einen eigenen bekommen. Der
@@ -322,7 +322,7 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
//Left teilt sich den Header mit dem Master.
pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetFooter() );
else if ( rFoot.IsActive() )
- { //Left bekommt einen eigenen Footer verpasst wenn das Format nicht
+ { //Left bekommt einen eigenen Footer verpasst wenn das Format nicht
//bereits einen hat.
//Wenn er bereits einen hat und dieser auf die gleiche Section
//wie der Rechte zeigt, so muss er einen eigenen bekommen. Der
@@ -382,14 +382,14 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
bUseOn = TRUE;
}
if ( pDesc->GetFollow() != rChged.GetFollow() )
- { if ( rChged.GetFollow() == &rChged )
- { if ( pDesc->GetFollow() != pDesc )
- { pDesc->SetFollow( pDesc );
+ { if ( rChged.GetFollow() == &rChged )
+ { if ( pDesc->GetFollow() != pDesc )
+ { pDesc->SetFollow( pDesc );
bFollow = TRUE;
}
}
else
- { pDesc->SetFollow( rChged.pFollow );
+ { pDesc->SetFollow( rChged.pFollow );
bFollow = TRUE;
}
}
@@ -435,12 +435,12 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
/*************************************************************************
|*
-|* SwDoc::DelPageDesc()
+|* SwDoc::DelPageDesc()
|*
-|* Beschreibung Alle Descriptoren, deren Follow auf den zu loeschenden
-|* zeigen muessen angepasst werden.
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung JP 04.09.95
+|* Beschreibung Alle Descriptoren, deren Follow auf den zu loeschenden
+|* zeigen muessen angepasst werden.
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung JP 04.09.95
|*
|*************************************************************************/
@@ -489,7 +489,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
aPageDescs[0]->Add( pLast );
}
}
- else //Es kann noch eine Undo-Kopie existieren
+ else //Es kann noch eine Undo-Kopie existieren
aPageDescs[0]->Add( pLast );
}
@@ -583,10 +583,10 @@ void SwDoc::DelPageDesc( USHORT i, BOOL bBroadcast )
/*************************************************************************
|*
-|* SwDoc::MakePageDesc()
+|* SwDoc::MakePageDesc()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 20. Aug. 93
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 20. Aug. 93
|*
|*************************************************************************/
@@ -651,9 +651,9 @@ SwPageDesc* SwDoc::FindPageDescByName( const String& rName, USHORT* pPos ) const
/******************************************************************************
* Methode : void SwDoc::PrtDataChanged()
- * Beschreibung:
- * Erstellt : OK 27.10.94 10:20
- * Aenderung : MA 26. Mar. 98
+ * Beschreibung:
+ * Erstellt : OK 27.10.94 10:20
+ * Aenderung : MA 26. Mar. 98
******************************************************************************/
void SwDoc::PrtDataChanged()
@@ -739,7 +739,7 @@ void SwDoc::PrtOLENotify( BOOL bAll )
ViewShell *pSh = GetRootFrm()->GetCurrShell();
if ( !pSh->ISA(SwFEShell) )
do
- { pSh = (ViewShell*)pSh->GetNext();
+ { pSh = (ViewShell*)pSh->GetNext();
} while ( !pSh->ISA(SwFEShell) &&
pSh != GetRootFrm()->GetCurrShell() );
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 59e70d1fc36f..64a5913035c2 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -2,7 +2,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
@@ -51,12 +51,12 @@
#include <swhints.hxx>
#include <doc.hxx>
#include <docsh.hxx>
-#include <rootfrm.hxx> //Damit der RootDtor gerufen wird.
+#include <rootfrm.hxx> //Damit der RootDtor gerufen wird.
#include <poolfmt.hxx>
#include <viewsh.hxx> // fuer MakeDrawView
#include <drawdoc.hxx>
#include <undobj.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <dcontact.hxx>
#include <dview.hxx>
#include <mvsave.hxx>
@@ -85,7 +85,7 @@ SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
/*************************************************************************
|*
-|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
+|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
|*
|*************************************************************************/
// local method to determine positioning and
@@ -424,10 +424,10 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
/*************************************************************************
|*
-|* SwDoc::DeleteSelection()
+|* SwDoc::DeleteSelection()
|*
-|* Ersterstellung MA 14. Nov. 95
-|* Letzte Aenderung MA 14. Nov. 95
+|* Ersterstellung MA 14. Nov. 95
+|* Letzte Aenderung MA 14. Nov. 95
|*
|*************************************************************************/
@@ -479,7 +479,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView )
if( !pObj->GetUpGroup() )
{
SwUndoDrawDelete* pUndo = !DoesUndo() ? 0
- : new SwUndoDrawDelete( (USHORT)rMrkList.GetMarkCount() );
+ : new SwUndoDrawDelete( (USHORT)rMrkList.GetMarkCount() );
//ContactObjekte vernichten, Formate sicherstellen.
for( i = 0; i < rMrkList.GetMarkCount(); ++i )
@@ -525,10 +525,10 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView )
/*************************************************************************
|*
-|* SwDoc::DeleteSelection()
+|* SwDoc::DeleteSelection()
|*
-|* Ersterstellung JP 11.01.96
-|* Letzte Aenderung JP 11.01.96
+|* Ersterstellung JP 11.01.96
+|* Letzte Aenderung JP 11.01.96
|*
|*************************************************************************/
@@ -588,7 +588,7 @@ void SwDoc::InitDrawModel()
//dem Drawing nur mitgegeben. Im ReleaseDrawModel werden die Pools wieder
//zerstoert.
// 17.2.99: for Bug 73110 - for loading the drawing items. This must
- // be loaded without RefCounts!
+ // be loaded without RefCounts!
SfxItemPool *pSdrPool = new SdrItemPool( &GetAttrPool() );
// #75371# change DefaultItems for the SdrEdgeObj distance items
// to TWIPS.
@@ -624,10 +624,10 @@ void SwDoc::InitDrawModel()
String sLayerNm;
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Hell" ));
- nHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ nHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Heaven" ));
- nHeaven = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ nHeaven = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
nControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
@@ -660,7 +660,7 @@ void SwDoc::InitDrawModel()
SetCalcFieldValueHdl(&pDrawModel->GetHitTestOutliner());
//JP 16.07.98: Bug 50193 - Linkmanager am Model setzen, damit
- // dort ggfs. verlinkte Grafiken eingefuegt werden koennen
+ // dort ggfs. verlinkte Grafiken eingefuegt werden koennen
//JP 28.01.99: der WinWord Import benoetigt ihn auch
pDrawModel->SetLinkManager( &GetLinkManager() );
pDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
@@ -823,10 +823,10 @@ void SwDoc::ReleaseDrawModel()
OSL_ENSURE( pSdrPool, "missing Pool" );
SfxItemPool *pEEgPool = pSdrPool->GetSecondaryPool();
OSL_ENSURE( !pEEgPool->GetSecondaryPool(), "i don't accept additional pools");
- pSdrPool->Delete(); //Erst die Items vernichten lassen,
+ pSdrPool->Delete(); //Erst die Items vernichten lassen,
//dann erst die Verkettung loesen
- GetAttrPool().SetSecondaryPool( 0 ); //Der ist ein muss!
- pSdrPool->SetSecondaryPool( 0 ); //Der ist sicherer
+ GetAttrPool().SetSecondaryPool( 0 ); //Der ist ein muss!
+ pSdrPool->SetSecondaryPool( 0 ); //Der ist sicherer
SfxItemPool::Free(pSdrPool);
SfxItemPool::Free(pEEgPool);
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 5b2b3b7bcf69..26d376901553 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <string.h> // fuer strchr()
+#include <string.h> // fuer strchr()
#include <hintids.hxx>
#include <vcl/sound.hxx>
@@ -44,25 +44,25 @@
#include <fmtcntnt.hxx>
#include <fmtpdsc.hxx>
#include <txtftn.hxx>
-#include <acorrect.hxx> // Autokorrektur
-#include <IMark.hxx> // fuer SwBookmark
-#include <cntfrm.hxx> // fuers Spell
+#include <acorrect.hxx> // Autokorrektur
+#include <IMark.hxx> // fuer SwBookmark
+#include <cntfrm.hxx> // fuers Spell
#include <crsrsh.hxx>
#include <doc.hxx>
#include <docsh.hxx>
#include <docary.hxx>
-#include <doctxm.hxx> // beim Move: Verzeichnisse korrigieren
+#include <doctxm.hxx> // beim Move: Verzeichnisse korrigieren
#include <ftnidx.hxx>
#include <ftninfo.hxx>
-#include <mdiexp.hxx> // Statusanzeige
-#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
+#include <mdiexp.hxx> // Statusanzeige
+#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
#include <ndtxt.hxx>
#include <pam.hxx>
#include <redline.hxx>
-#include <rootfrm.hxx> // fuers UpdateFtn
-#include <splargs.hxx> // fuer Spell
+#include <rootfrm.hxx> // fuers UpdateFtn
+#include <splargs.hxx> // fuer Spell
#include <swtable.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <txtfrm.hxx>
#include <undobj.hxx>
#include <breakit.hxx>
@@ -284,7 +284,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
SwFmtAnchor aAnchor( *pAnchor );
aAnchor.SetAnchor( &aPos );
pFmt->SetFmtAttr( aAnchor );
-// ((SwFmtAnchor*)pAnchor)->SetAnchor( &aPos );
+// ((SwFmtAnchor*)pAnchor)->SetAnchor( &aPos );
}
}
else if( ( rSttNdIdx.GetIndex() + nSttOff <= pAPos->nNode.GetIndex()
@@ -392,7 +392,7 @@ bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
nFtnSttIdx >= pEndCnt->GetIndex() ))
: ( &rEndNd.GetNode() == pFtnNd ))
{
- ++nPos; // weiter suchen
+ ++nPos; // weiter suchen
}
else
{
@@ -593,7 +593,7 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-// rArr.Insert( pSave, rArr.Count() );
+// rArr.Insert( pSave, rArr.Count() );
rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
pTmpPos = pTmp->End();
@@ -617,7 +617,7 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
{
// gesamt verschieben
_SaveRedline* pSave = new _SaveRedline( pTmp, rRg.aStart );
-// rArr.Insert( pSave, rArr.Count() );
+// rArr.Insert( pSave, rArr.Count() );
rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
}
else
@@ -630,7 +630,7 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-// rArr.Insert( pSave, rArr.Count() );
+// rArr.Insert( pSave, rArr.Count() );
rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
pTmpPos = pTmp->Start();
@@ -744,12 +744,12 @@ void SwDoc::SetModified(SwPaM &rPaM)
}
/*************************************************************************
- * SwDoc::Overwrite()
+ * SwDoc::Overwrite()
************************************************************************/
bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
{
SwPosition& rPt = *(SwPosition*)rRg.GetPoint();
- if( pACEWord ) // Aufnahme in die Autokorrektur
+ if( pACEWord ) // Aufnahme in die Autokorrektur
{
if( 1 == rStr.Len() )
pACEWord->CheckChar( rPt, rStr.GetChar( 0 ) );
@@ -850,7 +850,7 @@ bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
SwNodeIndex aIdx( rPaM.Start()->nNode );
sal_Bool bJoinTxt = aIdx.GetNode().IsTxtNode();
sal_Bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
- aIdx--; // vor den Move Bereich !!
+ aIdx--; // vor den Move Bereich !!
bool bRet = MoveRange( rPaM, rPos, eMvFlags );
if( bRet && !bOneNode )
@@ -1009,7 +1009,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
"PaM wurde nicht verschoben, am Anfang/Ende keine ContentNodes?" );
*aSavePam.GetMark() = rPos;
- rPaM.SetMark(); // um den neuen Bereich eine Sel. aufspannen
+ rPaM.SetMark(); // um den neuen Bereich eine Sel. aufspannen
pTNd = aSavePam.GetNode()->GetTxtNode();
if( DoesUndo() )
{
@@ -1046,7 +1046,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
}
bJoin = sal_False;
}
-// else if( !bCorrSavePam && !pSavePam->Move( fnMoveForward, fnGoCntnt ))
+// else if( !bCorrSavePam && !pSavePam->Move( fnMoveForward, fnGoCntnt ))
else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
{
aSavePam.GetPoint()->nNode++;
@@ -1191,7 +1191,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
BOOL bNoDelFrms = 0 != (DOC_NO_DELFRMS & eMvFlags);
if( GetNodes()._MoveNodes( rRange, GetNodes(), rPos, !bNoDelFrms ) )
{
- aIdx++; // wieder auf alte Position
+ aIdx++; // wieder auf alte Position
if( pSaveInsPos )
(*pSaveInsPos)++;
}
@@ -1502,7 +1502,7 @@ bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
// N.B.: deletion must be split into several parts if the text node
// contains a text attribute with end and with dummy character
// and the selection does not contain the text attribute completely,
- // but overlaps its start (left), where the dummy character is.
+ // but overlaps its start (left), where the dummy character is.
SwPosition const & rSelectionEnd( *rPam.End() );
@@ -1661,9 +1661,9 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
}
{
- // Bug 26675: DataChanged vorm loeschen verschicken, dann bekommt
- // man noch mit, welche Objecte sich im Bereich befinden.
- // Danach koennen sie vor/hinter der Position befinden.
+ // Bug 26675: DataChanged vorm loeschen verschicken, dann bekommt
+ // man noch mit, welche Objecte sich im Bereich befinden.
+ // Danach koennen sie vor/hinter der Position befinden.
SwDataChanged aTmp( rPam, 0 );
}
@@ -1701,7 +1701,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
SwNodeIndex aSttIdx( pStt->nNode );
SwCntntNode * pCNd = aSttIdx.GetNode().GetCntntNode();
- do { // middle checked loop!
+ do { // middle checked loop!
if( pCNd )
{
SwTxtNode * pStartTxtNode( pCNd->GetTxtNode() );
@@ -1725,7 +1725,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
}
}
- if( bOneNd ) // das wars schon
+ if( bOneNd ) // das wars schon
break;
aSttIdx++;
@@ -2079,7 +2079,7 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos,
inline void SwHyphArgs::SetRange( const SwNode *pNew )
{
nStart = pStart == pNew ? nPamStart : 0;
- nLen = pEnd == pNew ? nPamLen : STRING_NOTFOUND;
+ nLen = pEnd == pNew ? nPamLen : STRING_NOTFOUND;
}
void SwHyphArgs::SetPam( SwPaM *pPam ) const
@@ -2151,7 +2151,7 @@ uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
GetNodes().ForEach( pPam->GetPoint()->nNode, aTmpIdx,
lcl_HyphenateNode, &aHyphArg );
aHyphArg.SetPam( pPam );
- return aHyphArg.GetHyphWord(); // will be set by lcl_HyphenateNode
+ return aHyphArg.GetHyphWord(); // will be set by lcl_HyphenateNode
}
sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bRegExpRplc )
@@ -2222,7 +2222,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const String& rStr,
// N.B.: deletion must be split into several parts if the text node
// contains a text attribute with end and with dummy character
// and the selection does not contain the text attribute completely,
- // but overlaps its start (left), where the dummy character is.
+ // but overlaps its start (left), where the dummy character is.
bool bRet( true );
// iterate from end to start, to avoid invalidating the offsets!
@@ -2323,7 +2323,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
{
// Attribute des 1. Zeichens ueber den ReplaceText setzen
SfxItemSet aSet( GetAttrPool(),
- RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1,
+ RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0 );
pTxtNd->GetAttr( aSet, nStt+1, nStt+1 );
@@ -2530,10 +2530,10 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
{
SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
//JP 24.08.98: will man wirklich den PageDesc/Break vom
-// nachfolgen Absatz ueberbuegeln?
-// const SwAttrSet& rAttrSet = pTableFmt->GetAttrSet();
-// if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
-// SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
+// nachfolgen Absatz ueberbuegeln?
+// const SwAttrSet& rAttrSet = pTableFmt->GetAttrSet();
+// if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
+// SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
{
const SfxPoolItem *pItem;
const SfxItemSet* pSet = ((SwCntntNode*)pNd)->GetpSwAttrSet();
@@ -2638,7 +2638,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
return sal_True;
}
-void SwDoc::TransliterateText(
+void SwDoc::TransliterateText(
const SwPaM& rPaM,
utl::TransliterationWrapper& rTrans )
{
@@ -2650,13 +2650,13 @@ void SwDoc::TransliterateText(
const SwPosition* pStt = rPaM.Start(),
* pEnd = rPaM.End();
- ULONG nSttNd = pStt->nNode.GetIndex(),
+ ULONG nSttNd = pStt->nNode.GetIndex(),
nEndNd = pEnd->nNode.GetIndex();
xub_StrLen nSttCnt = pStt->nContent.GetIndex(),
nEndCnt = pEnd->nContent.GetIndex();
SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
- if( pStt == pEnd && pTNd ) // no selection?
+ if( pStt == pEnd && pTNd ) // no selection?
{
// set current word as 'area of effect'
@@ -2713,7 +2713,7 @@ void SwDoc::TransliterateText(
SetModified();
}
-#define MAX_REDLINE_COUNT 250
+#define MAX_REDLINE_COUNT 250
void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode)
{
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 6aecde72872f..cfef5a9f7cab 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2,7 +2,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
@@ -85,9 +85,9 @@ SV_IMPL_OP_PTRARR_SORT( _SetGetExpFlds, _SetGetExpFldPtr )
Beschreibung: Feldtypen einfuegen
--------------------------------------------------------------------*/
/*
- * Implementierung der Feldfunktionen am Doc
- * Return immer einen gueltigen Pointer auf den Typ. Wenn er also neu
- * zugefuegt oder schon vorhanden ist.
+ * Implementierung der Feldfunktionen am Doc
+ * Return immer einen gueltigen Pointer auf den Typ. Wenn er also neu
+ * zugefuegt oder schon vorhanden ist.
*/
SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
{
@@ -100,7 +100,7 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
{
case RES_SETEXPFLD:
//JP 29.01.96: SequenceFelder beginnen aber bei INIT_FLDTYPES - 3!!
- // Sonst gibt es doppelte Nummernkreise!!
+ // Sonst gibt es doppelte Nummernkreise!!
//MIB 14.03.95: Ab sofort verlaesst sich auch der SW3-Reader
//beim Aufbau der String-Pools und beim Einlesen von SetExp-Feldern
//hierauf
@@ -169,7 +169,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
// Array entfernt. Nun muss man nach diesem wieder suchen.
// - Ist der nicht vorhanden, dann kann er eingefuegt werden.
// - Wird genau der gleiche Typ gefunden, dann muss der geloeschte
- // einen anderen Namen erhalten.
+ // einen anderen Namen erhalten.
USHORT nSize = pFldTypes->Count(), nFldWhich = rFldTyp.Which();
USHORT i = INIT_FLDTYPES;
@@ -196,10 +196,10 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
rSCmp.isEqual( sSrch, pFnd->GetName() ) )
break;
- if( i >= nSize ) // nicht gefunden
+ if( i >= nSize ) // nicht gefunden
{
((String&)rFldNm) = sSrch;
- break; // raus aus der While-Schleife
+ break; // raus aus der While-Schleife
}
++nNum;
} while( TRUE );
@@ -227,7 +227,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
--------------------------------------------------------------------*/
void SwDoc::RemoveFldType(USHORT nFld)
{
- OSL_ENSURE( INIT_FLDTYPES <= nFld, "keine InitFields loeschen" );
+ OSL_ENSURE( INIT_FLDTYPES <= nFld, "keine InitFields loeschen" );
/*
* Abheangige Felder vorhanden -> ErrRaise
*/
@@ -290,7 +290,7 @@ SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
{
case RES_SETEXPFLD:
//JP 29.01.96: SequenceFelder beginnen aber bei INIT_FLDTYPES - 3!!
- // Sonst gibt es doppelte Nummernkreise!!
+ // Sonst gibt es doppelte Nummernkreise!!
//MIB 14.03.95: Ab sofort verlaesst sich auch der SW3-Reader
//beim Aufbau der String-Pools und beim Einlesen von SetExp-Feldern
//hierauf
@@ -311,7 +311,7 @@ SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
SwFieldType* pFldType = (*pFldTypes)[i];
String aFldName( pFldType->GetName() );
- if (bDbFieldMatching && nResId == RES_DBFLD) // #i51815#
+ if (bDbFieldMatching && nResId == RES_DBFLD) // #i51815#
aFldName.SearchAndReplaceAll(DB_DELIM, '.');
if( nResId == pFldType->Which() &&
@@ -325,11 +325,11 @@ SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
}
/*************************************************************************
-|* SwDoc::UpdateFlds()
-|* Beschreibung Felder updaten
+|* SwDoc::UpdateFlds()
+|* Beschreibung Felder updaten
*************************************************************************/
/*
- * Alle sollen neu evaluiert werden.
+ * Alle sollen neu evaluiert werden.
*/
void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
{
@@ -346,7 +346,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
case RES_TABLEFLD:
case RES_DBFLD:
case RES_JUMPEDITFLD:
- case RES_REFPAGESETFLD: // werden nie expandiert!
+ case RES_REFPAGESETFLD: // werden nie expandiert!
break;
case RES_DDEFLD:
@@ -373,7 +373,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
}
if( !IsExpFldsLocked() )
- UpdateExpFlds( 0, FALSE ); // Expression-Felder Updaten
+ UpdateExpFlds( 0, FALSE ); // Expression-Felder Updaten
// Tabellen
UpdateTblFlds(pNewHt);
@@ -389,7 +389,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
}
/******************************************************************************
- * void SwDoc::UpdateUsrFlds()
+ * void SwDoc::UpdateUsrFlds()
******************************************************************************/
void SwDoc::UpdateUsrFlds()
{
@@ -458,7 +458,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
case TBL_CALC:
// setze das Value-Flag zurueck
// JP 17.06.96: interne Darstellung auf alle Formeln
- // (Referenzen auf andere Tabellen!!!)
+ // (Referenzen auf andere Tabellen!!!)
if( nsSwExtendedSubType::SUB_CMD & pFld->GetSubType() )
pFld->PtrToBoxNm( pUpdtFld->pTbl );
else
@@ -473,7 +473,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
case TBL_BOXPTR:
// zur internen Darstellung
// JP 17.06.96: interne Darstellung auf alle Formeln
- // (Referenzen auf andere Tabellen!!!)
+ // (Referenzen auf andere Tabellen!!!)
pFld->BoxNmToPtr( pUpdtFld->pTbl );
break;
case TBL_RELBOXNAME:
@@ -520,9 +520,9 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
SwClientIter aIter( *pFldType );
// dann rechne mal schoen
// JP 27.03.97: Beim Berechnen am Ende anfangen - weil neue
- // Felder immer am Anfang der Modifykette eingefuegt
- // werden. Beim Import haben wir damit eine bessere/
- // schnellere Berechnung bei "Kettenformeln"
+ // Felder immer am Anfang der Modifykette eingefuegt
+ // werden. Beim Import haben wir damit eine bessere/
+ // schnellere Berechnung bei "Kettenformeln"
if( 0 != ( pLast = aIter.GoEnd() ))
do {
SwFmtFld* pFmtFld = (SwFmtFld*)pLast;
@@ -557,7 +557,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
{
// steht im Sonderbereich, wird teuer !!
- Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
+ Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
pFrm = rTxtNd.GetFrm( &aPt );
if( pFrm )
{
@@ -623,7 +623,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
{
// steht im Sonderbereich, wird teuer !!
- Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
+ Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
SwNodeIndex aCNdIdx( *pTblNd, +2 );
SwCntntNode* pCNd = aCNdIdx.GetNode().GetCntntNode();
if( !pCNd )
@@ -1318,7 +1318,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
{
//!SECTION
-// if( pGFld->IsInBodyTxt() )
+// if( pGFld->IsInBodyTxt() )
SwSbxValue aValue = aCalc.Calculate(
pSect->GetCondition() );
if(!aValue.IsVoidValue())
@@ -1384,9 +1384,9 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
// Wert fuer den Calculator setzen
//JP 10.02.96: GetValue macht hier doch keinen Sinn
-// ((SwDBField*)pFld)->GetValue();
+// ((SwDBField*)pFld)->GetValue();
-//!OK aCalc.VarChange(aName, ((SwDBField*)pFld)->GetValue(aCalc));
+//!OK aCalc.VarChange(aName, ((SwDBField*)pFld)->GetValue(aCalc));
// Eintrag in den HashTable eintragen
// Eintrag vorhanden ?
@@ -1409,7 +1409,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
case RES_GETEXPFLD:
case RES_SETEXPFLD:
{
- if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() ) // String Ersetzung
+ if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() ) // String Ersetzung
{
if( RES_GETEXPFLD == nWhich )
{
@@ -1430,8 +1430,8 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
LookString( pHashStrTbl, nStrFmtCnt,
pSFld->GetFormula(), aNew );
- if( !aNew.Len() ) // nichts gefunden, dann ist die
- aNew = pSFld->GetFormula(); // Formel der neue Wert
+ if( !aNew.Len() ) // nichts gefunden, dann ist die
+ aNew = pSFld->GetFormula(); // Formel der neue Wert
// nur ein spezielles FeldUpdaten ?
if( !pUpdtFld || pUpdtFld == pTxtFld )
@@ -1457,7 +1457,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
aCalc.VarChange( aNew, aValue );
}
}
- else // Formel neu berechnen
+ else // Formel neu berechnen
{
if( RES_GETEXPFLD == nWhich )
{
@@ -1516,15 +1516,15 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
}
} // switch
- pFmtFld->Modify( 0, 0 ); // Formatierung anstossen
+ pFmtFld->Modify( 0, 0 ); // Formatierung anstossen
- if( pUpdtFld == pTxtFld ) // sollte nur dieses geupdatet werden
+ if( pUpdtFld == pTxtFld ) // sollte nur dieses geupdatet werden
{
- if( RES_GETEXPFLD == nWhich || // nur GetFeld oder
- RES_HIDDENTXTFLD == nWhich || // HiddenTxt?
- RES_HIDDENPARAFLD == nWhich) // HiddenParaFld?
- break; // beenden
- pUpdtFld = 0; // ab jetzt alle Updaten
+ if( RES_GETEXPFLD == nWhich || // nur GetFeld oder
+ RES_HIDDENTXTFLD == nWhich || // HiddenTxt?
+ RES_HIDDENPARAFLD == nWhich) // HiddenParaFld?
+ break; // beenden
+ pUpdtFld = 0; // ab jetzt alle Updaten
}
}
@@ -1573,7 +1573,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
}
}
-void SwDoc::_InitFieldTypes() // wird vom CTOR gerufen!!
+void SwDoc::_InitFieldTypes() // wird vom CTOR gerufen!!
{
// Feldtypen
USHORT nFldType = 0;
@@ -1609,7 +1609,7 @@ void SwDoc::_InitFieldTypes() // wird vom CTOR gerufen!!
// Types muessen am Ende stehen !!
// Im InsertFldType wird davon ausgegangen !!!!
// MIB 14.04.95: Im Sw3StringPool::Setup (sw3imp.cxx) und
- // lcl_sw3io_InSetExpField (sw3field.cxx) jetzt auch
+ // lcl_sw3io_InSetExpField (sw3field.cxx) jetzt auch
pFldTypes->Insert( new SwSetExpFieldType(this,
SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ), nFldType++);
pFldTypes->Insert( new SwSetExpFieldType(this,
@@ -1782,7 +1782,7 @@ void SwDoc::GetAllDBNames( SvStringsDtor& rAllDBNames )
{
SwDSParam* pParam = rArr[i];
String* pStr = new String( pParam->sDataSource );
- (*pStr) += DB_DELIM;
+ (*pStr) += DB_DELIM;
(*pStr) += (String)pParam->sCommand;
rAllDBNames.Insert( pStr, rAllDBNames.Count() );
}
@@ -1793,7 +1793,7 @@ SvStringsDtor& SwDoc::FindUsedDBs( const SvStringsDtor& rAllDBNames,
SvStringsDtor& rUsedDBNames )
{
const CharClass& rCC = GetAppCharClass();
- String sFormel( rFormel);
+ String sFormel( rFormel);
#ifndef UNX
rCC.toUpper( sFormel );
#endif
@@ -1904,7 +1904,7 @@ void SwDoc::ChangeDBFields( const SvStringsDtor& rOldNames,
SwDBFieldType* pTyp = (SwDBFieldType*)InsertFldType(
SwDBFieldType(this, pOldTyp->GetColumnName(), aNewDBData));
- pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen
+ pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen
pFld->ChgTyp(pTyp);
((SwDBField*)pFld)->ClearInitialized();
@@ -1961,8 +1961,8 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames,
const String& rNewName, String& rFormel )
{
const CharClass& rCC = GetAppCharClass();
- String sFormel(rFormel);
- String sNewName( rNewName );
+ String sFormel(rFormel);
+ String sNewName( rNewName );
sNewName.SearchAndReplace( DB_DELIM, '.');
//the command type is not part of the condition
sNewName = sNewName.GetToken(0, DB_DELIM);
@@ -1971,7 +1971,7 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames,
for( USHORT i = 0; i < rUsedDBNames.Count(); ++i )
{
- String sDBName( *rUsedDBNames.GetObject( i ) );
+ String sDBName( *rUsedDBNames.GetObject( i ) );
sDBName.SearchAndReplace( DB_DELIM, '.');
//cut off command type
@@ -2030,11 +2030,11 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
}
USHORT aTypes[5] = {
- /*0*/ RES_DOCINFOFLD,
- /*1*/ RES_AUTHORFLD,
- /*2*/ RES_EXTUSERFLD,
- /*3*/ RES_FILENAMEFLD,
- /*4*/ RES_DATETIMEFLD }; // MUSS am Ende stehen!!
+ /*0*/ RES_DOCINFOFLD,
+ /*1*/ RES_AUTHORFLD,
+ /*2*/ RES_EXTUSERFLD,
+ /*3*/ RES_FILENAMEFLD,
+ /*4*/ RES_DATETIMEFLD }; // MUSS am Ende stehen!!
USHORT nStt = bOnlyTimeDate ? 4 : 0;
@@ -2140,8 +2140,8 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, ULONG nLen )
const SwTxtNode* pTNd = rNds[ nStt++ ]->GetTxtNode();
if( pTNd )
{
- if( //pTNd->GetFmtColl() && //#outline level,zhaojianwei
- // MAXLEVEL > pTNd->GetTxtColl()->GetOutlineLevel() )
+ if( //pTNd->GetFmtColl() && //#outline level,zhaojianwei
+ // MAXLEVEL > pTNd->GetTxtColl()->GetOutlineLevel() )
pTNd->GetAttrOutlineLevel() != 0 )//<-end,zhaojianwei
// Kapitelfelder aktualisieren
b = TRUE;
@@ -2197,7 +2197,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( BOOL bIns, const SwTxtFld& rFld )
case RES_DBNEXTSETFLD:
case RES_DBSETNUMBERFLD:
case RES_GETEXPFLD:
- break; // diese muessen ein-/ausgetragen werden!
+ break; // diese muessen ein-/ausgetragen werden!
default:
return;
@@ -2206,12 +2206,12 @@ void SwDocUpdtFld::InsDelFldInFldLst( BOOL bIns, const SwTxtFld& rFld )
SetFieldsDirty( TRUE );
if( !pFldSortLst )
{
- if( !bIns ) // keine Liste vorhanden und loeschen
- return; // dann nichts tun
+ if( !bIns ) // keine Liste vorhanden und loeschen
+ return; // dann nichts tun
pFldSortLst = new _SetGetExpFlds( 64, 16 );
}
- if( bIns ) // neu einfuegen:
+ if( bIns ) // neu einfuegen:
GetBodyNode( rFld, nWhich );
else
{
@@ -2517,7 +2517,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
if( rSectNd.GetIndex() < rDoc.GetNodes().GetEndOfExtras().GetIndex() )
{
- do { // middle check loop
+ do { // middle check loop
// dann muessen wir uns mal den Anker besorgen!
// einen Index fuers bestimmen vom TextNode anlegen
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index ff79efddc707..1c9010c9de33 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -2,7 +2,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
@@ -156,11 +156,11 @@ SwFrmFmt* SwDoc::GetFlyNum( USHORT nIdx, FlyCntType eType )
}
/***********************************************************************
-#* Class : SwDoc
-#* Methode : SetFlyFrmAnchor
-#* Beschreibung: Das Ankerattribut des FlyFrms aendert sich.
-#* Datum : MA 01. Feb. 94
-#* Update : JP 09.03.98
+#* Class : SwDoc
+#* Methode : SetFlyFrmAnchor
+#* Beschreibung: Das Ankerattribut des FlyFrms aendert sich.
+#* Datum : MA 01. Feb. 94
+#* Update : JP 09.03.98
#***********************************************************************/
Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
const SwFrmFmt* pFlyFmt )
@@ -519,10 +519,10 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
// <--
/***************************************************************************
- * Methode : BOOL SwDoc::SetFrmFmtToFly( SwFlyFrm&, SwFrmFmt& )
- * Beschreibung:
- * Erstellt : OK 14.04.94 15:40
- * Aenderung : JP 23.04.98
+ * Methode : BOOL SwDoc::SetFrmFmtToFly( SwFlyFrm&, SwFrmFmt& )
+ * Beschreibung:
+ * Erstellt : OK 14.04.94 15:40
+ * Aenderung : JP 23.04.98
***************************************************************************/
BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
SfxItemSet* pSet, BOOL bKeepOrient )
@@ -574,7 +574,7 @@ BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
else
{
//JP 23.04.98: muss den FlyFmt-Range haben, denn im SetFlyFrmAnchor
- // werden Attribute in diesen gesetzt!
+ // werden Attribute in diesen gesetzt!
SfxItemSet aFlySet( *rNewFmt.GetAttrSet().GetPool(),
rNewFmt.GetAttrSet().GetRanges() );
aFlySet.Put( *pItem );
@@ -587,7 +587,7 @@ BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
//automatische Ausrichtung eingestellt ist, anderfalls den alten Wert
//wieder hineinstopfen.
//JP 09.06.98: beim Update der RahmenVorlage sollte der Fly NICHT
- // seine Orientierng verlieren (diese wird nicht geupdatet!)
+ // seine Orientierng verlieren (diese wird nicht geupdatet!)
//OS: #96584# text::HoriOrientation::NONE and text::VertOrientation::NONE are allowed now
if (!bKeepOrient)
{
@@ -630,10 +630,10 @@ void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, String* pGrfName,
/*************************************************************************
|*
-|* SwDoc::ChgAnchor()
+|* SwDoc::ChgAnchor()
|*
-|* Ersterstellung MA 10. Jan. 95
-|* Letzte Aenderung JP 08.07.98
+|* Ersterstellung MA 10. Jan. 95
+|* Letzte Aenderung JP 08.07.98
|*
*************************************************************************/
sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
@@ -780,7 +780,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
}
((SwTxtFrm*)pOldAnchorFrm)->Prepare();
}
- else // Ankerwechsel
+ else // Ankerwechsel
{
// OD 18.06.2003 #108784# - allow drawing objects in header/footer
pNewAnchorFrm = ::FindAnchor( pOldAnchorFrm, aPt, false );
@@ -792,7 +792,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
bUnmark = ( 0 != i );
Point aPoint( aPt );
- aPoint.X() -= 1; // nicht im DrawObj landen!!
+ aPoint.X() -= 1; // nicht im DrawObj landen!!
aNewAnch.SetType( FLY_AS_CHAR );
SwPosition aPos( *((SwCntntFrm*)pNewAnchorFrm)->GetNode() );
if ( pNewAnchorFrm->Frm().IsInside( aPoint ) )
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 89a300f49113..f3329d1e66a9 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2,7 +2,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
@@ -57,14 +57,14 @@
#include <doc.hxx>
#include <rootfrm.hxx>
#include <pagefrm.hxx>
-#include <hints.hxx> // fuer SwHyphenBug (in SetDefault)
+#include <hints.hxx> // fuer SwHyphenBug (in SetDefault)
#include <ndtxt.hxx>
#include <pam.hxx>
#include <undobj.hxx>
#include <ndgrf.hxx>
-#include <pagedesc.hxx> // Fuer Sonderbehandlung in InsFrmFmt
-#include <rolbck.hxx> // Undo-Attr
-#include <mvsave.hxx> // servieren: Veraenderungen erkennen
+#include <pagedesc.hxx> // Fuer Sonderbehandlung in InsFrmFmt
+#include <rolbck.hxx> // Undo-Attr
+#include <mvsave.hxx> // servieren: Veraenderungen erkennen
#include <txatbase.hxx>
#include <swtable.hxx>
#include <swtblfmt.hxx>
@@ -125,7 +125,7 @@ struct ParaRstFmt
bool bResetAll;
bool bInclRefToxMark;
- bool bKeepOutlineLevelAttr; //#outline level,add by zhaojianwei
+ bool bKeepOutlineLevelAttr; //#outline level,add by zhaojianwei
ParaRstFmt( const SwPosition* pStt, const SwPosition* pEnd,
SwHistory* pHst, USHORT nWhch = 0, const SfxItemSet* pSet = 0 )
@@ -141,7 +141,7 @@ struct ParaRstFmt
// <--
bResetAll( true ),
bInclRefToxMark( false ),
- bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
+ bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
{}
ParaRstFmt( SwHistory* pHst )
@@ -157,7 +157,7 @@ struct ParaRstFmt
// <--
bResetAll( true ),
bInclRefToxMark( false ),
- bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
+ bKeepOutlineLevelAttr( false ) //#outline level,add by zhaojianwei
{}
};
@@ -246,13 +246,13 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
// <--
const SfxPoolItem* pItem;
- // USHORT __READONLY_DATA aSavIds[ 3 ] = { RES_PAGEDESC, RES_BREAK, //#outline level,removed by zhaojianwei
+ // USHORT __READONLY_DATA aSavIds[ 3 ] = { RES_PAGEDESC, RES_BREAK, //#outline level,removed by zhaojianwei
// RES_PARATR_NUMRULE };
//for( USHORT n = 0; n < 3; ++n )
- USHORT __READONLY_DATA aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK, //->add by zhaojianwei
+ USHORT __READONLY_DATA aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK, //->add by zhaojianwei
RES_PARATR_NUMRULE,
RES_PARATR_OUTLINELEVEL };
- for( USHORT n = 0; n < 4; ++n ) //<-end,zhaojianwei
+ for( USHORT n = 0; n < 4; ++n ) //<-end,zhaojianwei
{
if( SFX_ITEM_SET == pSet->GetItemState( aSavIds[ n ], FALSE, &pItem ))
{
@@ -270,11 +270,11 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
bSave = 0 != ((SwNumRuleItem*)pItem)->GetValue().Len();
}
break;
- case RES_PARATR_OUTLINELEVEL: //#outline level,add by zhaojianwei
+ case RES_PARATR_OUTLINELEVEL: //#outline level,add by zhaojianwei
{
bSave = pPara && pPara->bKeepOutlineLevelAttr;
}
- break; //<-end,zhaojianwei
+ break; //<-end,zhaojianwei
}
if( bSave )
{
@@ -397,7 +397,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
USHORT nMkPos, nPtPos = rSt.GetIndex();
// JP 22.08.96: Sonderfall: steht der Crsr in einem URL-Attribut
- // dann wird dessen Bereich genommen
+ // dann wird dessen Bereich genommen
SwTxtAttr const*const pURLAttr(
pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
if (pURLAttr && pURLAttr->GetINetFmt().GetValue().Len())
@@ -488,7 +488,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
BOOL bAdd = TRUE;
SwNodeIndex aTmpStt( pStt->nNode );
SwNodeIndex aTmpEnd( pEnd->nNode );
- if( pStt->nContent.GetIndex() ) // nur ein Teil
+ if( pStt->nContent.GetIndex() ) // nur ein Teil
{
// dann spaeter aufsetzen und alle CharFmtAttr -> TxtFmtAttr
SwTxtNode* pTNd = aTmpStt.GetNode().GetTxtNode();
@@ -885,7 +885,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
}
- if( !rRg.HasMark() ) // kein Bereich
+ if( !rRg.HasMark() ) // kein Bereich
{
if( !pNode )
{
@@ -901,7 +901,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
const String& rStr = pTxtNd->GetTxt();
// JP 22.08.96: Sonderfall: steht der Crsr in einem URL-Attribut
- // dann wird dessen Bereich genommen
+ // dann wird dessen Bereich genommen
SwTxtAttr const*const pURLAttr(
pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
if (pURLAttr && pURLAttr->GetINetFmt().GetValue().Len())
@@ -1224,9 +1224,9 @@ int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
{
// dann aender bei allen TabStop die default's auf den neuen Wert
// !!! Achtung: hier wird immer auf dem PoolAttribut gearbeitet,
- // damit nicht in allen Sets die gleiche Berechnung
- // auf dem gleichen TabStop (gepoolt!) vorgenommen
- // wird. Als Modify wird ein FmtChg verschickt.
+ // damit nicht in allen Sets die gleiche Berechnung
+ // auf dem gleichen TabStop (gepoolt!) vorgenommen
+ // wird. Als Modify wird ein FmtChg verschickt.
USHORT nOldCnt = rChgTabStop.Count();
if( !nOldCnt || nOldWidth == nNewWidth )
@@ -1241,7 +1241,7 @@ int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
if( SVX_TAB_ADJUST_DEFAULT != pTabs->GetAdjustment() )
break;
++n;
- if( n < nOldCnt ) // die DefTabStops loeschen
+ if( n < nOldCnt ) // die DefTabStops loeschen
rChgTabStop.Remove( n, nOldCnt - n );
return TRUE;
}
@@ -1341,9 +1341,9 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
// TabStop-Aenderungen behandeln wir erstmal anders:
// dann aender bei allen TabStop die dafault's auf den neuen Wert
// !!! Achtung: hier wird immer auf dem PoolAttribut gearbeitet,
- // damit nicht in allen Sets die gleiche Berechnung
- // auf dem gleichen TabStop (gepoolt!) vorgenommen
- // wird. Als Modify wird ein FmtChg verschickt.
+ // damit nicht in allen Sets die gleiche Berechnung
+ // auf dem gleichen TabStop (gepoolt!) vorgenommen
+ // wird. Als Modify wird ein FmtChg verschickt.
SwTwips nNewWidth = (*(SvxTabStopItem*)pTmpItem)[ 0 ].GetTabPos(),
nOldWidth = ((SvxTabStopItem&)aOld.Get(RES_PARATR_TABSTOP))[ 0 ].GetTabPos();
@@ -1369,7 +1369,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
{
SwAttrSetChg aChgOld( aOld, aOld );
SwAttrSetChg aChgNew( aNew, aNew );
- aCallMod.Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ aCallMod.Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
// und die default-Formate wieder beim Object austragen
@@ -1688,7 +1688,7 @@ void SwDoc::DelTxtFmtColl(USHORT nFmtColl, BOOL bBroadcast)
// Wer hat die zu loeschende als Next
SwTxtFmtColl *pDel = (*pTxtFmtCollTbl)[nFmtColl];
if( pDfltTxtFmtColl == pDel )
- return; // default nie loeschen !!
+ return; // default nie loeschen !!
if (bBroadcast)
BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PARA,
@@ -1865,7 +1865,7 @@ SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, FALSE, TRUE );
// <--
pNewFmt->SetAuto( rFmt.IsAuto() );
- pNewFmt->CopyAttrs( rFmt, TRUE ); // kopiere Attribute
+ pNewFmt->CopyAttrs( rFmt, TRUE ); // kopiere Attribute
pNewFmt->SetPoolFmtId( rFmt.GetPoolFmtId() );
pNewFmt->SetPoolHelpId( rFmt.GetPoolHelpId() );
@@ -1929,8 +1929,8 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
pNewColl->CopyAttrs( rColl, TRUE );
// setze noch den Outline-Level
- //if( NO_NUMBERING != rColl.GetOutlineLevel() ) //#outline level,zhaojianwei
- // pNewColl->SetOutlineLevel( rColl.GetOutlineLevel() );
+ //if( NO_NUMBERING != rColl.GetOutlineLevel() ) //#outline level,zhaojianwei
+ // pNewColl->SetOutlineLevel( rColl.GetOutlineLevel() );
if(rColl.IsAssignedToListLevelOfOutlineStyle())
pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
//<-end
@@ -2041,8 +2041,8 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
pDest = FindFmtByName( rDestArr, pSrc->GetName() );
pDest->SetAuto( FALSE );
-// pDest->ResetAllAttr();
-// pDest->CopyAttrs( *pSrc, TRUE ); // kopiere Attribute
+// pDest->ResetAllAttr();
+// pDest->CopyAttrs( *pSrc, TRUE ); // kopiere Attribute
//JP 19.02.96: ist so wohl optimaler - loest ggfs. kein Modify aus!
pDest->DelDiffs( *pSrc );
// --> OD 2009-03-23 #i94285#
@@ -2093,8 +2093,8 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
rDestArr, pSrcColl->GetNextTxtFmtColl().GetName() ) );
// setze noch den Outline-Level
- //if( NO_NUMBERING != pSrcColl->GetOutlineLevel() ) //#outline level,zhaojianwei
- // pDstColl->SetOutlineLevel( pSrcColl->GetOutlineLevel() );
+ //if( NO_NUMBERING != pSrcColl->GetOutlineLevel() ) //#outline level,zhaojianwei
+ // pDstColl->SetOutlineLevel( pSrcColl->GetOutlineLevel() );
if(pSrcColl->IsAssignedToListLevelOfOutlineStyle())
pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
//<-end
@@ -2443,7 +2443,7 @@ void SwDoc::_CreateNumberFormatter()
LanguageType eLang = LANGUAGE_SYSTEM; //System::GetLanguage();
-/* ((const SvxLanguageItem&)GetAttrPool().
+/* ((const SvxLanguageItem&)GetAttrPool().
GetDefaultItem( RES_CHRATR_LANGUAGE )).GetLanguage();
*/
Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
@@ -2655,7 +2655,7 @@ namespace docfunc
if ( pTxtFmtColl->IsDefault() ||
// pTxtFmtColl->GetOutlineLevel() == NO_NUMBERING ) //#outline level,zhaojianwei
- ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() ) //<-end,zhaojianwei
+ ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() ) //<-end,zhaojianwei
{
continue;
}
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index a8cf79c40b7a..9080e14d194c 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -2,7 +2,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
@@ -224,7 +224,7 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
BOOL SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
{
- return ePos == rInfo.ePos &&
+ return ePos == rInfo.ePos &&
eNum == rInfo.eNum &&
SwEndNoteInfo::operator==(rInfo) &&
aQuoVadis == rInfo.aQuoVadis &&
@@ -414,7 +414,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr,
ULONG nIdx;
BOOL bChg = FALSE;
BOOL bTypeChgd = FALSE;
- USHORT n = nPos; // sichern
+ USHORT n = nPos; // sichern
while( nPos < rFtnArr.Count() &&
(( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] )))
< nEndNd || ( nIdx == nEndNd &&
@@ -446,7 +446,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr,
}
}
- nPos = n; // nach vorne gibt es auch noch welche !
+ nPos = n; // nach vorne gibt es auch noch welche !
while( nPos &&
(( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ --nPos ] )))
> nSttNd || ( nIdx == nSttNd &&
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 9b52c3f28369..9591edf74c0d 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -2,7 +2,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
@@ -50,7 +50,7 @@
#include <docsh.hxx>
#include <globdoc.hxx>
#include <shellio.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <section.hxx>
#include <doctxm.hxx>
#include <poolfmt.hxx>
@@ -171,7 +171,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
break;
default:
-// case SPLITDOC_TO_GLOBALDOC:
+// case SPLITDOC_TO_GLOBALDOC:
pFilter = SwIoSystem::GetFilterOfFormat(
String::CreateFromAscii( FILTER_XML ));
eDocType = SPLITDOC_TO_GLOBALDOC;
@@ -231,17 +231,17 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
pNd = pOutlNds->GetObject( nOutl );
SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl();
- //if( ( pTColl == pSplitColl || //#outline level,zhaojianwei
- // ( NO_NUMBERING != pSplitColl->GetOutlineLevel() &&
- // pTColl->GetOutlineLevel() <
- // pSplitColl->GetOutlineLevel() )) &&
- // !pNd->FindTableNode() )
+ //if( ( pTColl == pSplitColl || //#outline level,zhaojianwei
+ // ( NO_NUMBERING != pSplitColl->GetOutlineLevel() &&
+ // pTColl->GetOutlineLevel() <
+ // pSplitColl->GetOutlineLevel() )) &&
+ // !pNd->FindTableNode() )
if( ( pTColl == pSplitColl ||
( pSplitColl->GetAttrOutlineLevel() > 0 &&
- pTColl->GetAttrOutlineLevel() > 0 &&
+ pTColl->GetAttrOutlineLevel() > 0 &&
pTColl->GetAttrOutlineLevel() <
pSplitColl->GetAttrOutlineLevel() )) &&
- !pNd->FindTableNode() ) //<-end,zhaojianwei
+ !pNd->FindTableNode() ) //<-end,zhaojianwei
{
pEndNd = pNd;
@@ -275,8 +275,8 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
xDocProps->setTemplateDate(uDT);
xDocProps->setTemplateURL(rPath);
//JP 14.06.99: Set the text of the "split para" as title
- // from the new doc. Is the current doc has
- // a title, insert it at begin.
+ // from the new doc. Is the current doc has
+ // a title, insert it at begin.
String sTitle( xDocProps->getTitle() );
if( sTitle.Len() )
sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ));
@@ -407,7 +407,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
aSectData.SetLinkFileName(sFileName);
aSectData.SetProtectFlag(true);
- aEndIdx--; // im InsertSection ist Ende inclusive
+ aEndIdx--; // im InsertSection ist Ende inclusive
while( aEndIdx.GetNode().IsStartNode() )
aEndIdx--;
@@ -476,7 +476,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
}
} while( pSttNd );
-// if( pOutlNds != (SwOutlineNodes*)&GetNodes().GetOutLineNds();
+// if( pOutlNds != (SwOutlineNodes*)&GetNodes().GetOutLineNds();
if( pOutlNds != &GetNodes().GetOutLineNds() )
delete pOutlNds;
@@ -494,14 +494,14 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
}
break;
-// case SPLITDOC_TO_GLOBALDOC:
+// case SPLITDOC_TO_GLOBALDOC:
default:
// dann das Globaldoc speichern
set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false);
}
- // Medium istn't locked after reopen the document. Bug 91462
+ // Medium istn't locked after reopen the document. Bug 91462
SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() );
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) );
aReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
@@ -532,7 +532,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
break;
default:
-// case SPLITDOC_TO_GLOBALDOC:
+// case SPLITDOC_TO_GLOBALDOC:
pFilter = SwIoSystem::GetFilterOfFormat(
String::CreateFromAscii( FILTER_XML ));
eDocType = SPLITDOC_TO_GLOBALDOC;
@@ -591,7 +591,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
pNd = pOutlNds->GetObject( nOutl );
const int nLevel = pNd->GetTxtNode()->GetAttrOutlineLevel();
-
+
if( ( 0 < nLevel && nLevel <= nOutlineLevel ) &&
!pNd->FindTableNode() )
{
@@ -626,8 +626,8 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
xDocProps->setTemplateDate(uDT);
xDocProps->setTemplateURL(rPath);
//JP 14.06.99: Set the text of the "split para" as title
- // from the new doc. Is the current doc has
- // a title, insert it at begin.
+ // from the new doc. Is the current doc has
+ // a title, insert it at begin.
String sTitle( xDocProps->getTitle() );
if( sTitle.Len() )
sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ));
@@ -758,7 +758,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
aSectData.SetLinkFileName(sFileName);
aSectData.SetProtectFlag(true);
- aEndIdx--; // im InsertSection ist Ende inclusive
+ aEndIdx--; // im InsertSection ist Ende inclusive
while( aEndIdx.GetNode().IsStartNode() )
aEndIdx--;
@@ -838,7 +838,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
}
break;
-// case SPLITDOC_TO_GLOBALDOC:
+// case SPLITDOC_TO_GLOBALDOC:
default:
set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, false);
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 057d6881fb99..aa14673dbdce 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -2,7 +2,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
@@ -117,7 +117,7 @@ BOOL SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
if( (USHORT) -1 != nIdx )
{
// Bug #70238# ask the TextOnly-Flag before BeginGetDoc, because
- // the method closed the Storage!
+ // the method closed the Storage!
BOOL bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx );
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index a19dd58af6f9..d1f28a01be04 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -87,8 +87,8 @@
#include <swundo.hxx>
#include <flypos.hxx>
#include <undobj.hxx>
-#include <expfld.hxx> // InsertLabel
-#include <poolfmt.hxx> // PoolVorlagen-Id's
+#include <expfld.hxx> // InsertLabel
+#include <poolfmt.hxx> // PoolVorlagen-Id's
#include <docary.hxx>
#include <swtable.hxx>
#include <tblsel.hxx>
@@ -99,7 +99,7 @@
#include <ftninfo.hxx>
#include <pagedesc.hxx>
#include <PostItMgr.hxx>
-#include <comcore.hrc> // STR-ResId's
+#include <comcore.hrc> // STR-ResId's
#include <unoframe.hxx>
@@ -110,7 +110,7 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-#define DEF_FLY_WIDTH 2268 //Defaultbreite fuer FlyFrms (2268 == 4cm)
+#define DEF_FLY_WIDTH 2268 //Defaultbreite fuer FlyFrms (2268 == 4cm)
static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
@@ -125,13 +125,13 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*************************************************************************
|*
-|* SwDoc::MakeLayoutFmt()
+|* SwDoc::MakeLayoutFmt()
|*
-|* Beschreibung Erzeugt ein neues Format das in seinen Einstellungen
-|* Defaultmaessig zu dem Request passt. Das Format wird in das
-|* entsprechende Formate-Array gestellt.
-|* Wenn bereits ein passendes Format existiert, so wird dies
-|* zurueckgeliefert.
+|* Beschreibung Erzeugt ein neues Format das in seinen Einstellungen
+|* Defaultmaessig zu dem Request passt. Das Format wird in das
+|* entsprechende Formate-Array gestellt.
+|* Wenn bereits ein passendes Format existiert, so wird dies
+|* zurueckgeliefert.
|*************************************************************************/
SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
{
@@ -175,10 +175,10 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
) ) );
pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
- if( pSet ) // noch ein paar Attribute setzen ?
+ if( pSet ) // noch ein paar Attribute setzen ?
pFmt->SetFmtAttr( *pSet );
- // JP: warum zuruecksetzen ??? Doc. ist doch veraendert ???
+ // JP: warum zuruecksetzen ??? Doc. ist doch veraendert ???
// bei den Fly auf jedenfall verkehrt !!
if ( !bMod )
ResetModified();
@@ -188,7 +188,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
case RND_DRAW_OBJECT:
{
pFmt = MakeDrawFrmFmt( aEmptyStr, GetDfltFrmFmt() );
- if( pSet ) // noch ein paar Attribute setzen ?
+ if( pSet ) // noch ein paar Attribute setzen ?
pFmt->SetFmtAttr( *pSet );
if( DoesUndo() )
@@ -219,12 +219,12 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
/*************************************************************************
|*
-|* SwDoc::DelLayoutFmt()
+|* SwDoc::DelLayoutFmt()
|*
-|* Beschreibung Loescht das angegebene Format, der Inhalt wird mit
-|* geloescht.
-|* Ersterstellung MA 23. Sep. 92
-|* Letzte Aenderung MA 05. Feb. 93
+|* Beschreibung Loescht das angegebene Format, der Inhalt wird mit
+|* geloescht.
+|* Ersterstellung MA 23. Sep. 92
+|* Letzte Aenderung MA 05. Feb. 93
|*
|*************************************************************************/
void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
@@ -258,7 +258,7 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
if( pDoc )
{
SfxObjectShell* p = pDoc->GetPersist();
- if( p ) // muss da sein
+ if( p ) // muss da sein
{
SvInfoObjectRef aRef( p->Find( pOLENd->GetOLEObj().GetName() ) );
if( aRef.Is() )
@@ -372,18 +372,18 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
/*************************************************************************
|*
-|* SwDoc::CopyLayoutFmt()
+|* SwDoc::CopyLayoutFmt()
|*
-|* Beschreibung Kopiert das angegebene Format pSrc in pDest und
-|* returnt pDest. Wenn es noch kein pDest gibt, wird
-|* eins angelegt.
-|* JP: steht das Source Format in einem anderen
-|* Dokument, so kopiere auch dann noch richtig !!
-|* Vom chaos::Anchor-Attribut wird die Position immer
-|* auf 0 gesetzt !!!
+|* Beschreibung Kopiert das angegebene Format pSrc in pDest und
+|* returnt pDest. Wenn es noch kein pDest gibt, wird
+|* eins angelegt.
+|* JP: steht das Source Format in einem anderen
+|* Dokument, so kopiere auch dann noch richtig !!
+|* Vom chaos::Anchor-Attribut wird die Position immer
+|* auf 0 gesetzt !!!
|*
-|* Ersterstellung BP 18.12.92
-|* Letzte Aenderung MA 17. Jul. 96
+|* Ersterstellung BP 18.12.92
+|* Letzte Aenderung MA 17. Jul. 96
|*
|*************************************************************************/
SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
@@ -475,12 +475,12 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
String sOld( pDest->GetName() );
pDest->SetName( aEmptyStr );
- if( FindFlyByName( sOld, nNdTyp ) ) // einen gefunden
+ if( FindFlyByName( sOld, nNdTyp ) ) // einen gefunden
switch( nNdTyp )
{
- case ND_GRFNODE: sOld = GetUniqueGrfName(); break;
- case ND_OLENODE: sOld = GetUniqueOLEName(); break;
- default: sOld = GetUniqueFrameName(); break;
+ case ND_GRFNODE: sOld = GetUniqueGrfName(); break;
+ case ND_OLENODE: sOld = GetUniqueOLEName(); break;
+ default: sOld = GetUniqueFrameName(); break;
}
pDest->SetName( sOld );
@@ -611,9 +611,9 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
if( !mbInReading )
switch( rNode.GetNodeType() )
{
- case ND_GRFNODE: sName = GetUniqueGrfName(); break;
- case ND_OLENODE: sName = GetUniqueOLEName(); break;
- default: sName = GetUniqueFrameName(); break;
+ case ND_GRFNODE: sName = GetUniqueGrfName(); break;
+ case ND_OLENODE: sName = GetUniqueOLEName(); break;
+ default: sName = GetUniqueFrameName(); break;
}
SwFlyFrmFmt* pFmt = MakeFlyFrmFmt( sName, pFrmFmt );
@@ -720,7 +720,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
// Frames anlegen
if( GetRootFrm() )
- pFmt->MakeFrms(); // ???
+ pFmt->MakeFrms(); // ???
if( DoesUndo() )
{
@@ -807,14 +807,14 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
if( pFmt )
{
- do { // middle check loop
+ do { // middle check loop
const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
SwNodeIndex aIndex( *(rCntnt.GetCntntIdx()), 1 );
SwCntntNode *pNode = aIndex.GetNode().GetCntntNode();
// ACHTUNG: nicht einen Index auf dem Stack erzeugen, sonst
- // kann der CntntnNode am Ende nicht geloscht werden !!
+ // kann der CntntnNode am Ende nicht geloscht werden !!
SwPosition aPos( aIndex );
aPos.nContent.Assign( pNode, 0 );
@@ -860,11 +860,11 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
aIndex = rCntnt.GetCntntIdx()->GetNode().EndOfSectionIndex() - 1;
OSL_ENSURE( aIndex.GetNode().GetTxtNode(),
"hier sollte ein TextNode stehen" );
- aPos.nContent.Assign( 0, 0 ); // Index abmelden !!
+ aPos.nContent.Assign( 0, 0 ); // Index abmelden !!
GetNodes().Delete( aIndex, 1 );
//JP erstmal ein Hack, solange keine Flys/Headers/Footers Undofaehig sind
-if( DoesUndo() ) // werden erstmal alle Undo - Objecte geloescht.
+if( DoesUndo() ) // werden erstmal alle Undo - Objecte geloescht.
DelAllUndoObj();
}
@@ -1020,10 +1020,10 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
/*************************************************************************
|*
-|* SwDoc::GetAllFlyFmts
+|* SwDoc::GetAllFlyFmts
|*
-|* Ersterstellung MA 14. Jul. 93
-|* Letzte Aenderung MD 23. Feb. 95
+|* Ersterstellung MA 14. Jul. 93
+|* Letzte Aenderung MD 23. Feb. 95
|*
|*************************************************************************/
/*sal_Bool TstFlyRange( const SwPaM* pPam, sal_uInt32 nFlyPos )
@@ -1101,7 +1101,7 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
{
if( pCmpRange &&
!TstFlyRange( pCmpRange, pAPos, rAnchor.GetAnchorId() ))
- continue; // kein gueltiger FlyFrame
+ continue; // kein gueltiger FlyFrame
pFPos = new SwPosFlyFrm( pAPos->nNode, pFly, rPosFlyFmts.Count() );
rPosFlyFmts.Insert( pFPos );
}
@@ -1167,10 +1167,10 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
/*************************************************************************
|*
-|* SwDoc::InsertLabel()
+|* SwDoc::InsertLabel()
|*
-|* Ersterstellung MA 11. Feb. 94
-|* Letzte Aenderung MA 12. Nov. 97
+|* Ersterstellung MA 11. Feb. 94
+|* Letzte Aenderung MA 12. Nov. 97
|*
|*************************************************************************/
@@ -1326,10 +1326,10 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
if( bCpyBrd )
{
// JP 07.07.99: Bug 67029 - if at Grafik no BoxItem but
- // in the new Format is any, then set the
- // default item in the new Set. Because
- // the Size of the Grafik have never been
- // changed!
+ // in the new Format is any, then set the
+ // default item in the new Set. Because
+ // the Size of the Grafik have never been
+ // changed!
const SfxPoolItem *pItem;
if( SFX_ITEM_SET == pOldFmt->GetAttrSet().
GetItemState( RES_BOX, sal_True, &pItem ))
@@ -1531,10 +1531,10 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
/*************************************************************************
|*
-|* SwDoc::InsertDrawLabel()
+|* SwDoc::InsertDrawLabel()
|*
-|* Ersterstellung MIB 7. Dez. 98
-|* Letzte Aenderung MIB 7. Dez. 98
+|* Ersterstellung MIB 7. Dez. 98
+|* Letzte Aenderung MIB 7. Dez. 98
|*
|*************************************************************************/
SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
@@ -1664,7 +1664,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
GetFrmFmtFromPool( RES_POOLFRM_FRAME ) );
// JP 28.10.99: Bug 69487 - set border and shadow to default if the
- // template contains any.
+ // template contains any.
if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState( RES_BOX, sal_True ))
pNewSet->Put( *GetDfltAttr( RES_BOX ) );
@@ -1803,7 +1803,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
/*************************************************************************
|*
-|* IDocumentTimerAccess-methods
+|* IDocumentTimerAccess-methods
|*
|*************************************************************************/
void SwDoc::StartIdling()
@@ -1834,10 +1834,10 @@ void SwDoc::UnblockIdling()
/*************************************************************************
|*
-|* SwDoc::DoIdleJobs()
+|* SwDoc::DoIdleJobs()
|*
-|* Ersterstellung OK 30.03.94
-|* Letzte Aenderung MA 09. Jun. 95
+|* Ersterstellung OK 30.03.94
+|* Letzte Aenderung MA 09. Jun. 95
|*
|*************************************************************************/
IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
@@ -1897,10 +1897,10 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
const sal_Bool bOldLockView = pStartSh->IsViewLocked();
pStartSh->LockView( sal_True );
- GetSysFldType( RES_CHAPTERFLD )->Modify( 0, 0 ); // KapitelFld
- UpdateExpFlds( 0, sal_False ); // Expression-Felder Updaten
- UpdateTblFlds(NULL); // Tabellen
- UpdateRefFlds(NULL); // Referenzen
+ GetSysFldType( RES_CHAPTERFLD )->Modify( 0, 0 ); // KapitelFld
+ UpdateExpFlds( 0, sal_False ); // Expression-Felder Updaten
+ UpdateTblFlds(NULL); // Tabellen
+ UpdateRefFlds(NULL); // Referenzen
GetRootFrm()->EndAllAction();
@@ -2031,8 +2031,8 @@ void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const String& rName )
if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
{
- case ND_GRFNODE: nTyp = STR_GRAPHIC_DEFNAME; break;
- case ND_OLENODE: nTyp = STR_OBJECT_DEFNAME; break;
+ case ND_GRFNODE: nTyp = STR_GRAPHIC_DEFNAME; break;
+ case ND_OLENODE: nTyp = STR_OBJECT_DEFNAME; break;
}
sName = lcl_GetUniqueFlyName( this, nTyp );
}
@@ -2055,7 +2055,7 @@ void SwDoc::SetAllUniqueFlyNames()
n = 255;
SwSpzFrmFmts aArr( (sal_Int8)n, 10 );
SwFrmFmtPtr pFlyFmt;
- sal_Bool bLoadedFlag = sal_True; // noch etwas fuers Layout
+ sal_Bool bLoadedFlag = sal_True; // noch etwas fuers Layout
for( n = GetSpzFrmFmts()->Count(); n; )
{
@@ -2153,7 +2153,7 @@ void SwDoc::SetAllUniqueFlyNames()
sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
{
// gibt es ein Layout, dann ueber das laufen!!
- // (Das kann dann auch Fly in Fly in Kopfzeile !)
+ // (Das kann dann auch Fly in Fly in Kopfzeile !)
// MIB 9.2.98: Wird auch vom sw3io benutzt, um festzustellen, ob sich
// ein Redline-Objekt in einer Kopf- oder Fusszeile befindet. Da
// Redlines auch an Start- und Endnodes haengen, muss der Index nicht
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index eb878a1372a5..7e78a4b9b75b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -2,7 +2,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
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#define ROLBCK_HISTORY_ONLY // Der Kampf gegen die CLOOK's
+#define ROLBCK_HISTORY_ONLY // Der Kampf gegen die CLOOK's
#include <doc.hxx>
#include <dcontact.hxx>
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
@@ -78,8 +78,8 @@
#include <poolfmt.hxx> // fuer die Pool-Vorlage
#include <dbmgr.hxx>
#include <docsh.hxx>
-#include <acorrect.hxx> // fuer die autom. Aufnahme von Ausnahmen
-#include <visiturl.hxx> // fuer die URL-Change Benachrichtigung
+#include <acorrect.hxx> // fuer die autom. Aufnahme von Ausnahmen
+#include <visiturl.hxx> // fuer die URL-Change Benachrichtigung
#include <docary.hxx>
#include <lineinfo.hxx>
#include <drawdoc.hxx>
@@ -175,7 +175,7 @@ void StartGrammarChecking( SwDoc &rDoc )
bVisible = true;
pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, sal_False );
}
-
+
//!! only documents with visible views need to be checked
//!! (E.g. don't check temporary documents created for printing, see printing of notes and selections.
//!! Those get created on the fly and get hard deleted a bit later as well, and no one should have
@@ -233,7 +233,7 @@ SwDoc::SwDoc() :
pGrfFmtCollTbl( new SwGrfFmtColls() ),
pTOXTypes( new SwTOXTypes() ),
pDefTOXBases( new SwDefTOXBase_Impl() ),
- pLayout( 0 ), // Rootframe des spezifischen Layouts.
+ pLayout( 0 ), // Rootframe des spezifischen Layouts.
pDrawModel( 0 ),
pUndos( new SwUndos( 0, 20 ) ),
pUpdtFlds( new SwDocUpdtFld() ),
@@ -498,7 +498,7 @@ SwDoc::~SwDoc()
SwFmtCharFmt aCharFmt(NULL);
SetDefault(aCharFmt);
- StopIdling(); // stop idle timer
+ StopIdling(); // stop idle timer
delete pUnoCallBack, pUnoCallBack = 0;
delete pURLStateChgd;
@@ -517,7 +517,7 @@ SwDoc::~SwDoc()
delete pPgPViewPrtData;
- mbUndo = FALSE; // immer das Undo abschalten !!
+ mbUndo = FALSE; // immer das Undo abschalten !!
// damit die Fussnotenattribute die Fussnotennodes in Frieden lassen.
mbDtor = TRUE;
@@ -549,7 +549,7 @@ SwDoc::~SwDoc()
pFtnIdxs->Remove( USHORT(0), pFtnIdxs->Count() );
- pUndos->DeleteAndDestroy( 0, pUndos->Count() ); //Es koennen in den Attributen noch
+ pUndos->DeleteAndDestroy( 0, pUndos->Count() ); //Es koennen in den Attributen noch
//noch indizes angemeldet sein.
// in den BookMarks sind Indizies auf den Content. Diese muessen vorm
@@ -567,7 +567,7 @@ SwDoc::~SwDoc()
}
//JP: alt - loeschen ohne Flag ist teuer; Modify wird verschickt!
-// aTOXTypes.DeleteAndDestroy( 0, aTOXTypes.Count() );
+// aTOXTypes.DeleteAndDestroy( 0, aTOXTypes.Count() );
{
for( USHORT n = pTOXTypes->Count(); n; )
{
@@ -609,8 +609,8 @@ SwDoc::~SwDoc()
"Default-Text-Collection muss immer am Anfang stehen" );
// JP 27.01.98: opt.: ausgehend davon, das Standard als 2. im Array
- // steht, sollte das als letztes geloescht werden, damit
- // die ganze Umhaengerei der Formate vermieden wird!
+ // steht, sollte das als letztes geloescht werden, damit
+ // die ganze Umhaengerei der Formate vermieden wird!
if( 2 < pTxtFmtCollTbl->Count() )
pTxtFmtCollTbl->DeleteAndDestroy( 2, pTxtFmtCollTbl->Count()-2 );
pTxtFmtCollTbl->DeleteAndDestroy( 1, pTxtFmtCollTbl->Count()-1 );
@@ -621,7 +621,7 @@ SwDoc::~SwDoc()
pGrfFmtCollTbl->DeleteAndDestroy( 1, pGrfFmtCollTbl->Count()-1 );
// ergibt sich automatisch - kein _DEL Array!
-// pGrfFmtCollTbl->Remove( 0, n );
+// pGrfFmtCollTbl->Remove( 0, n );
delete pGrfFmtCollTbl;
/*
@@ -647,7 +647,7 @@ SwDoc::~SwDoc()
//Ausserdem koennen vorher noch DrawContacts existieren.
ReleaseDrawModel();
//JP 28.01.99: DrawModel vorm LinkManager zerstoeren, da am DrawModel
- // dieser immer gesetzt ist.
+ // dieser immer gesetzt ist.
DELETEZ( pLinkMgr );
//Tables vor dem loeschen der Defaults leeren, sonst GPF wegen Def-Abhaengigen.
@@ -730,7 +730,7 @@ SfxPrinter& SwDoc::CreatePrinter_() const
// Das ItemSet wird vom Sfx geloescht!
SfxItemSet *pSet = new SfxItemSet( ((SwDoc*)this)->GetAttrPool(),
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
- SID_HTML_MODE, SID_HTML_MODE,
+ SID_HTML_MODE, SID_HTML_MODE,
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0 );
@@ -778,7 +778,7 @@ void SwDoc::ClearDoc()
{
BOOL bOldUndo = mbUndo;
DelAllUndoObj();
- mbUndo = FALSE; // immer das Undo abschalten !!
+ mbUndo = FALSE; // immer das Undo abschalten !!
// Undo-Benachrichtigung vom Draw abschalten
if( pDrawModel )
@@ -856,8 +856,8 @@ void SwDoc::ClearDoc()
if( pFtnColl ) pFtnColl->Remove( pEndNoteInfo );
// JP 27.01.98: opt.: ausgehend davon, das Standard als 2. im Array
- // steht, sollte das als letztes geloescht werden, damit
- // die ganze Umhaengerei der Formate vermieden wird!
+ // steht, sollte das als letztes geloescht werden, damit
+ // die ganze Umhaengerei der Formate vermieden wird!
if( 2 < pTxtFmtCollTbl->Count() )
pTxtFmtCollTbl->DeleteAndDestroy( 2, pTxtFmtCollTbl->Count()-2 );
pTxtFmtCollTbl->DeleteAndDestroy( 1, pTxtFmtCollTbl->Count()-1 );
@@ -907,7 +907,7 @@ void SwDoc::SetPreViewPrtData( const SwPagePreViewPrtData* pNew )
SetModified();
}
-SwModify* SwDoc::GetUnoCallBack() const
+SwModify* SwDoc::GetUnoCallBack() const
{
return pUnoCallBack;
}
@@ -1130,7 +1130,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
SfxObjectShellRef xRetShell = new SwDocShell( pRet, SFX_CREATE_MODE_STANDARD );
if( bCallInitNew )
xRetShell->DoInitNew();
- //copy content
+ //copy content
pRet->Paste( *this );
pRet->SetRefForDocShell( 0 );
return xRetShell;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 5fad9f575c2c..cc9b780f3dfb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
#include <doc.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-#include <doctxm.hxx> // pTOXBaseRing
+#include <doctxm.hxx> // pTOXBaseRing
#include <poolfmt.hxx>
#include <undobj.hxx>
#include <swundo.hxx>
@@ -192,7 +192,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
{
//BYTE nLevel = (*pTxtFmtCollTbl)[ n ]->GetOutlineLevel();//#outline level,zhaojianwei
//if( nLevel < MAXLEVEL )
- // aCollArr[ nLevel ] = (*pTxtFmtCollTbl)[ n ];
+ // aCollArr[ nLevel ] = (*pTxtFmtCollTbl)[ n ];
if((*pTxtFmtCollTbl)[ n ]->IsAssignedToListLevelOfOutlineStyle())
{
const int nLevel = (*pTxtFmtCollTbl)[ n ]->GetAssignedOutlineStyleLevel();
@@ -372,7 +372,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
if( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
- // OSL_ENSURE(pColl->GetOutlineLevel() < MAXLEVEL, //#outline level,removed by zhaojianwei
+ // OSL_ENSURE(pColl->GetOutlineLevel() < MAXLEVEL, //#outline level,removed by zhaojianwei
// "non outline node in outline nodes?");
//int nLevel = pColl->GetOutlineLevel();
const int nLevel = pColl->GetAssignedOutlineStyleLevel();//#outline level,add by zhaojianwei
@@ -390,7 +390,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}
}
- else if( pTxtNd->GetAttrOutlineLevel() > 0) //#outline level,add by zhaojianwei
+ else if( pTxtNd->GetAttrOutlineLevel() > 0) //#outline level,add by zhaojianwei
{
int nLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
if( 0 <= nLevel && nLevel <= MAXLEVEL)
@@ -425,10 +425,10 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
USHORT nAktPos = 0;
SwNodeIndex aSttRg( rStt.nNode ), aEndRg( rEnd.nNode );
- //BYTE nOutLineLevel = NO_NUMBERING; //#outline level,zhaojianwei
- int nOutLineLevel = MAXLEVEL; //<-end,zhaojianwei
+ //BYTE nOutLineLevel = NO_NUMBERING; //#outline level,zhaojianwei
+ int nOutLineLevel = MAXLEVEL; //<-end,zhaojianwei
SwNode* pSrch = &aSttRg.GetNode();
- //if( pSrch->IsTxtNode() ) //#outline level,zhaojianwei
+ //if( pSrch->IsTxtNode() ) //#outline level,zhaojianwei
// nOutLineLevel = static_cast<BYTE>(((SwTxtNode*)pSrch)->GetOutlineLevel());
if( pSrch->IsTxtNode())
nOutLineLevel = static_cast<BYTE>(((SwTxtNode*)pSrch)->GetAttrOutlineLevel()-1);//<-end,zhaojianwei
@@ -590,15 +590,15 @@ USHORT lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
{
// Gueltig Nummern sind (immer nur Offsets!!!):
- // ([Nummer]+\.)+ (als regulaerer Ausdruck!)
- // (Nummer gefolgt von Punkt, zum 5 Wiederholungen)
- // also: "1.1.", "1.", "1.1.1."
+ // ([Nummer]+\.)+ (als regulaerer Ausdruck!)
+ // (Nummer gefolgt von Punkt, zum 5 Wiederholungen)
+ // also: "1.1.", "1.", "1.1.1."
xub_StrLen nPos = 0;
String sNum = rName.GetToken( 0, '.', nPos );
if( STRING_NOTFOUND == nPos )
- return USHRT_MAX; // ungueltige Nummer!!!
+ return USHRT_MAX; // ungueltige Nummer!!!
- USHORT nLevelVal[ MAXLEVEL ]; // Nummern aller Levels
+ USHORT nLevelVal[ MAXLEVEL ]; // Nummern aller Levels
memset( nLevelVal, 0, MAXLEVEL * sizeof( nLevelVal[0] ));
BYTE nLevel = 0;
String sName( rName );
@@ -613,9 +613,9 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
nVal *= 10; nVal += c - '0';
}
else if( nLevel )
- break; // "fast" gueltige Nummer
+ break; // "fast" gueltige Nummer
else
- return USHRT_MAX; // ungueltige Nummer!!!
+ return USHRT_MAX; // ungueltige Nummer!!!
if( MAXLEVEL > nLevel )
nLevelVal[ nLevel++ ] = nVal;
@@ -627,7 +627,7 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
if(!ByteString(sNum, gsl_getSystemTextEncoding()).IsNumericAscii())
nPos = STRING_NOTFOUND;
}
- rName = sName; // das ist der nachfolgende Text.
+ rName = sName; // das ist der nachfolgende Text.
// alle Levels gelesen, dann suche mal im Document nach dieser
// Gliederung:
@@ -642,7 +642,7 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
for( ; nPos < rOutlNds.Count(); ++nPos )
{
pNd = rOutlNds[ nPos ]->GetTxtNode();
- //BYTE nLvl = pNd->GetTxtColl()->GetOutlineLevel(); //#outline level,zhaojianwei
+ //BYTE nLvl = pNd->GetTxtColl()->GetOutlineLevel(); //#outline level,zhaojianwei
const int nLvl = pNd->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
if( nLvl == nLevel - 1)
{
@@ -725,7 +725,7 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
if( !sExpandedText.Equals( sName ) )
{
USHORT nTmp = ::lcl_FindOutlineName( GetNodes(), sName, TRUE );
- if( USHRT_MAX != nTmp ) // ueber den Namen gefunden
+ if( USHRT_MAX != nTmp ) // ueber den Namen gefunden
{
nFndPos = nTmp;
pNd = rOutlNds[ nFndPos ]->GetTxtNode();
@@ -943,7 +943,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
if (DoesUndo())
{
ClearRedo();
- StartUndo( UNDO_INSNUM, NULL ); // Klammerung fuer die Attribute!
+ StartUndo( UNDO_INSNUM, NULL ); // Klammerung fuer die Attribute!
AppendUndo( pUndo = new SwUndoInsNum( rPam, rRule ) );
}
@@ -1535,7 +1535,7 @@ BOOL SwDoc::NoNum( const SwPaM& rPam )
SetModified();
}
else
- bRet = FALSE; // keine Nummerierung , ?? oder immer TRUE ??
+ bRet = FALSE; // keine Nummerierung , ?? oder immer TRUE ??
}
return bRet;
}
@@ -1592,7 +1592,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
pTNd->ChkCondColl();
//else if( !pOutlNd && NO_NUMBERING != //#outline level,zhaojianwei
- // ((SwTxtFmtColl*)pTNd->GetFmtColl())->GetOutlineLevel() )
+ // ((SwTxtFmtColl*)pTNd->GetFmtColl())->GetOutlineLevel() )
else if( !pOutlNd &&
((SwTxtFmtColl*)pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )//<-end,zhaojianwei
pOutlNd = pTNd;
@@ -1646,7 +1646,7 @@ BOOL lcl_IsValidPrevNextNumNode( const SwNodeIndex& rIdx )
bRet = SwTableBoxStartNode == ((SwStartNode&)rNd).GetStartNodeType();
break;
- case ND_SECTIONNODE: // der ist erlaubt, also weiter
+ case ND_SECTIONNODE: // der ist erlaubt, also weiter
bRet = TRUE;
break;
}
@@ -1683,7 +1683,7 @@ BOOL lcl_GotoNextPrevNum( SwPosition& rPos, BOOL bNext,
nTmpNum = static_cast<BYTE>(pNd->GetActualListLevel());
if( !( ! pNd->IsCountedInList() &&
(nTmpNum >= nSrchNum )) )
- break; // gefunden
+ break; // gefunden
}
else
bError = TRUE;
@@ -1737,7 +1737,7 @@ BOOL lcl_GotoNextPrevNum( SwPosition& rPos, BOOL bNext,
aIdx--;
}
- if( !bRet && !bOverUpper && pLast ) // nicht ueber hoehere Nummmern, aber bis Ende
+ if( !bRet && !bOverUpper && pLast ) // nicht ueber hoehere Nummmern, aber bis Ende
{
if( bNext )
{
@@ -2073,23 +2073,23 @@ BOOL SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv )
switch( ComparePosition( *pRStt, *pREnd, aStPos, aEndPos ))
{
case POS_COLLIDE_START:
- case POS_BEHIND: // Pos1 liegt hinter Pos2
+ case POS_BEHIND: // Pos1 liegt hinter Pos2
nRedlPos = GetRedlineTbl().Count();
break;
case POS_COLLIDE_END:
- case POS_BEFORE: // Pos1 liegt vor Pos2
+ case POS_BEFORE: // Pos1 liegt vor Pos2
break;
- case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
+ case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
// ist erlaubt, aber checke dann alle nachfolgenden
// auf Ueberlappungen
bCheckDel = FALSE;
break;
- case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
- case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
- case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
- case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
+ case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
+ case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
+ case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
+ case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
return FALSE;
}
}
@@ -2656,8 +2656,8 @@ sal_Int32 SwDoc::getOutlineNodesCount() const
int SwDoc::getOutlineLevel( const sal_Int32 nIdx ) const
{
return GetNodes().GetOutLineNds()[ static_cast<USHORT>(nIdx) ]->
- // GetTxtNode()->GetOutlineLevel(); //#outline level,zhaojianwei
- GetTxtNode()->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
+ // GetTxtNode()->GetOutlineLevel(); //#outline level,zhaojianwei
+ GetTxtNode()->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
}
String SwDoc::getOutlineText( const sal_Int32 nIdx,
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 7854d2b9a973..128878dfc324 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2,7 +2,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
@@ -282,24 +282,24 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
Text heisst, nicht von Redline "verseuchter" Text.
Verhalten von Insert-Redline:
- - im Text - Redline Object einfuegen
- - im InsertRedline (eigenes) - ignorieren, bestehendes wird
+ - im Text - Redline Object einfuegen
+ - im InsertRedline (eigenes) - ignorieren, bestehendes wird
aufgespannt
- - im InsertRedline (andere) - Insert Redline aufsplitten
+ - im InsertRedline (andere) - Insert Redline aufsplitten
Redline Object einfuegen
- - in DeleteRedline - Delete Redline aufsplitten oder
+ - in DeleteRedline - Delete Redline aufsplitten oder
am Ende/Anfang verschieben
Verhalten von Delete-Redline:
- - im Text - Redline Object einfuegen
- - im DeleteRedline (eigenes/andere) - ignorieren
- - im InsertRedline (eigenes) - ignorieren, Zeichen aber loeschen
- - im InsertRedline (andere) - Insert Redline aufsplitten
+ - im Text - Redline Object einfuegen
+ - im DeleteRedline (eigenes/andere) - ignorieren
+ - im InsertRedline (eigenes) - ignorieren, Zeichen aber loeschen
+ - im InsertRedline (andere) - Insert Redline aufsplitten
Redline Object einfuegen
- - Ueberlappung von Text und - Text in eigenen Insert loeschen,
- eigenem Insert im andereren Text aufspannen (bis
+ - Ueberlappung von Text und - Text in eigenen Insert loeschen,
+ eigenem Insert im andereren Text aufspannen (bis
zum Insert!
- - Ueberlappung von Text und - Redline Object einfuegen, der
+ - Ueberlappung von Text und - Redline Object einfuegen, der
anderem Insert andere Insert wird vom Delete
ueberlappt
*/
@@ -634,7 +634,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
pRedlineTbl->DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
}
@@ -666,7 +666,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pNew->SetStart( *pREnd );
pNewRedl->SetEnd( *pRStt, pEnd );
AppendRedline( pNew, bCallDelete );
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
else
@@ -683,7 +683,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
case POS_OVERLAP_BEFORE:
case POS_OVERLAP_BEHIND:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
-// 1 == pRedl->GetStackCount() &&
+// 1 == pRedl->GetStackCount() &&
pRedl->CanCombine( *pNewRedl ))
{
// dann kann das zusammengefasst werden, sprich
@@ -704,7 +704,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
case POS_COLLIDE_START:
case POS_COLLIDE_END:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
-// 1 == pRedl->GetStackCount() &&
+// 1 == pRedl->GetStackCount() &&
pRedl->CanCombine( *pNewRedl ) )
{
if( IsHideChanges( eRedlineMode ))
@@ -848,7 +848,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pRedlineTbl->Remove( nFnd );
else
pNewRedl = 0;
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
}
bDec = true;
}
@@ -877,7 +877,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pRedlineTbl->Remove( nFnd );
else
pNewRedl = 0;
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
}
@@ -1079,7 +1079,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
( pRedl->GetContentIdx() == NULL ) )
pRedlineTbl->DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
}
@@ -1126,7 +1126,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pNew->SetStart( *pREnd );
pNewRedl->SetEnd( *pRStt, pEnd );
AppendRedline( pNew, bCallDelete );
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
}
@@ -1176,7 +1176,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
pNew->SetStart( *pEnd );
pRedl->SetEnd( *pStt, pREnd );
AppendRedline( pNew, bCallDelete );
- n = 0; // neu Aufsetzen
+ n = 0; // neu Aufsetzen
bDec = true;
}
break;
@@ -2023,7 +2023,7 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
* pEnd = pStt == rPam.GetPoint() ? rPam.GetMark()
: rPam.GetPoint();
const SwRedline* pFnd = lcl_FindCurrRedline( *pStt, n, TRUE );
- if( pFnd && // neu ein Teil davon?
+ if( pFnd && // neu ein Teil davon?
( *pFnd->Start() != *pStt || *pFnd->End() > *pEnd ))
{
// dann nur die TeilSelektion aufheben
@@ -2080,7 +2080,7 @@ void lcl_AdjustRedlineRange( SwPaM& rPam )
}
if( pEnd->nNode.GetNode().IsCntntNode() &&
!pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsCntntNode() &&
- pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
+ pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
{
const SwRedline* pRedl = pDoc->GetRedline( *pEnd, 0 );
if( pRedl )
@@ -3170,18 +3170,18 @@ void SwRedline::Show( USHORT nLoop )
switch( GetType() )
{
- case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
+ case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
bIsVisible = TRUE;
MoveFromSection();
break;
- case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
+ case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
bIsVisible = TRUE;
MoveFromSection();
break;
- case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
- case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
+ case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
+ case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
InvalidateRange();
break;
default:
@@ -3202,24 +3202,24 @@ void SwRedline::Hide( USHORT nLoop )
switch( GetType() )
{
- case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
+ case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
bIsVisible = TRUE;
if( 1 <= nLoop )
MoveFromSection();
break;
- case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
+ case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
bIsVisible = FALSE;
switch( nLoop )
{
- case 0: MoveToSection(); break;
- case 1: CopyToSection(); break;
- case 2: DelCopyOfSection(); break;
+ case 0: MoveToSection(); break;
+ case 1: CopyToSection(); break;
+ case 2: DelCopyOfSection(); break;
}
break;
- case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
- case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
+ case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
+ case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
if( 1 <= nLoop )
InvalidateRange();
break;
@@ -3246,24 +3246,24 @@ void SwRedline::ShowOriginal( USHORT nLoop )
switch( pCur->eType )
{
- case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
+ case nsRedlineType_t::REDLINE_INSERT: // Inhalt wurde eingefuegt
bIsVisible = FALSE;
switch( nLoop )
{
- case 0: MoveToSection(); break;
- case 1: CopyToSection(); break;
- case 2: DelCopyOfSection(); break;
+ case 0: MoveToSection(); break;
+ case 1: CopyToSection(); break;
+ case 2: DelCopyOfSection(); break;
}
break;
- case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
+ case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde geloescht
bIsVisible = TRUE;
if( 1 <= nLoop )
MoveFromSection();
break;
- case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
- case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
+ case nsRedlineType_t::REDLINE_FORMAT: // Attributierung wurde angewendet
+ case nsRedlineType_t::REDLINE_TABLE: // TabellenStruktur wurde veraendert
if( 1 <= nLoop )
InvalidateRange();
break;
@@ -3275,7 +3275,7 @@ void SwRedline::ShowOriginal( USHORT nLoop )
}
-void SwRedline::InvalidateRange() // das Layout anstossen
+void SwRedline::InvalidateRange() // das Layout anstossen
{
ULONG nSttNd = GetMark()->nNode.GetIndex(),
nEndNd = GetPoint()->nNode.GetIndex();
@@ -3313,14 +3313,14 @@ void SwRedline::CalcStartEnd( ULONG nNdIdx, USHORT& nStart, USHORT& nEnd ) const
{
if( pREnd->nNode > nNdIdx )
{
- nStart = 0; // Absatz ist komplett enthalten
+ nStart = 0; // Absatz ist komplett enthalten
nEnd = STRING_LEN;
}
else
{
OSL_ENSURE( pREnd->nNode == nNdIdx,
"SwRedlineItr::Seek: GetRedlinePos Error" );
- nStart = 0; // Absatz wird vorne ueberlappt
+ nStart = 0; // Absatz wird vorne ueberlappt
nEnd = pREnd->nContent.GetIndex();
}
}
@@ -3330,7 +3330,7 @@ void SwRedline::CalcStartEnd( ULONG nNdIdx, USHORT& nStart, USHORT& nEnd ) const
if( pREnd->nNode == nNdIdx )
nEnd = pREnd->nContent.GetIndex(); // Innerhalb des Absatzes
else
- nEnd = STRING_LEN; // Absatz wird hinten ueberlappt
+ nEnd = STRING_LEN; // Absatz wird hinten ueberlappt
}
else
{
@@ -3454,7 +3454,7 @@ void SwRedline::CopyToSection()
pDoc->CopyRange( *this, aPos, false );
// JP 08.10.98: die Vorlage vom EndNode ggfs. mit uebernehmen
- // - ist im Doc::Copy nicht erwuenscht
+ // - ist im Doc::Copy nicht erwuenscht
if( pCEndNd && pCEndNd != pCSttNd )
{
SwCntntNode* pDestNd = aPos.nNode.GetNode().GetCntntNode();
@@ -3726,14 +3726,14 @@ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx )
BOOL SwRedline::CanCombine( const SwRedline& rRedl ) const
{
- return IsVisible() && rRedl.IsVisible() &&
+ return IsVisible() && rRedl.IsVisible() &&
pRedlineData->CanCombine( *rRedl.pRedlineData );
}
void SwRedline::PushData( const SwRedline& rRedl, BOOL bOwnAsNext )
{
-// SwRedlineData* pNew = new SwRedlineData( rRedl.GetType(),
-// rRedl.GetAuthor() );
+// SwRedlineData* pNew = new SwRedlineData( rRedl.GetType(),
+// rRedl.GetAuthor() );
SwRedlineData* pNew = new SwRedlineData( *rRedl.pRedlineData, FALSE );
if( bOwnAsNext )
{
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index e09e74c3db03..866942b26365 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <string.h> // fuer strchr()
+#include <string.h> // fuer strchr()
#include <hintids.hxx>
#include <com/sun/star/i18n/UnicodeType.hdl>
@@ -38,12 +38,12 @@
#include <unotools/charclass.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
+#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
#include <ndtxt.hxx>
#include <txatbase.hxx>
#include <rubylist.hxx>
#include <pam.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <undobj.hxx>
#include <breakit.hxx>
#include <crsskip.hxx>
@@ -289,7 +289,7 @@ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, USHORT )
case UnicodeType::SPACE_SEPARATOR:
case UnicodeType::CONTROL:
-/*??*/ case UnicodeType::PRIVATE_USE:
+/*??*/ case UnicodeType::PRIVATE_USE:
case UnicodeType::START_PUNCTUATION:
case UnicodeType::END_PUNCTUATION:
bIgnoreChar = TRUE;
@@ -299,27 +299,27 @@ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, USHORT )
case UnicodeType::OTHER_LETTER:
bChkNxtWrd = TRUE;
// no break!
-// case UnicodeType::UNASSIGNED:
-// case UnicodeType::MODIFIER_LETTER:
-// case UnicodeType::NON_SPACING_MARK:
-// case UnicodeType::ENCLOSING_MARK:
-// case UnicodeType::COMBINING_SPACING_MARK:
-// case UnicodeType::LETTER_NUMBER:
-// case UnicodeType::OTHER_NUMBER:
-// case UnicodeType::LINE_SEPARATOR:
-// case UnicodeType::PARAGRAPH_SEPARATOR:
-// case UnicodeType::FORMAT:
-// case UnicodeType::SURROGATE:
-// case UnicodeType::DASH_PUNCTUATION:
-// case UnicodeType::CONNECTOR_PUNCTUATION:
+// case UnicodeType::UNASSIGNED:
+// case UnicodeType::MODIFIER_LETTER:
+// case UnicodeType::NON_SPACING_MARK:
+// case UnicodeType::ENCLOSING_MARK:
+// case UnicodeType::COMBINING_SPACING_MARK:
+// case UnicodeType::LETTER_NUMBER:
+// case UnicodeType::OTHER_NUMBER:
+// case UnicodeType::LINE_SEPARATOR:
+// case UnicodeType::PARAGRAPH_SEPARATOR:
+// case UnicodeType::FORMAT:
+// case UnicodeType::SURROGATE:
+// case UnicodeType::DASH_PUNCTUATION:
+// case UnicodeType::CONNECTOR_PUNCTUATION:
///*?? */case UnicodeType::OTHER_PUNCTUATION:
//--> char '!' is to ignore!
-// case UnicodeType::MATH_SYMBOL:
-// case UnicodeType::CURRENCY_SYMBOL:
-// case UnicodeType::MODIFIER_SYMBOL:
-// case UnicodeType::OTHER_SYMBOL:
-// case UnicodeType::INITIAL_PUNCTUATION:
-// case UnicodeType::FINAL_PUNCTUATION:
+// case UnicodeType::MATH_SYMBOL:
+// case UnicodeType::CURRENCY_SYMBOL:
+// case UnicodeType::MODIFIER_SYMBOL:
+// case UnicodeType::OTHER_SYMBOL:
+// case UnicodeType::INITIAL_PUNCTUATION:
+// case UnicodeType::FINAL_PUNCTUATION:
default:
bIsAlphaNum = FALSE;
break;
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index f39063e27702..9cbfc57e0f26 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -2,7 +2,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
@@ -61,13 +61,13 @@
using namespace ::com::sun::star::lang;
-SwSortOptions* SwSortElement::pOptions = 0;
-SwDoc* SwSortElement::pDoc = 0;
-const FlatFndBox* SwSortElement::pBox = 0;
-CollatorWrapper* SwSortElement::pSortCollator = 0;
-Locale* SwSortElement::pLocale = 0;
-String* SwSortElement::pLastAlgorithm = 0;
-LocaleDataWrapper* SwSortElement::pLclData = 0;
+SwSortOptions* SwSortElement::pOptions = 0;
+SwDoc* SwSortElement::pDoc = 0;
+const FlatFndBox* SwSortElement::pBox = 0;
+CollatorWrapper* SwSortElement::pSortCollator = 0;
+Locale* SwSortElement::pLocale = 0;
+String* SwSortElement::pLastAlgorithm = 0;
+LocaleDataWrapper* SwSortElement::pLclData = 0;
SV_IMPL_OP_PTRARR_SORT( SwSortElements, SwSortElementPtr );
@@ -94,8 +94,8 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
pSortCollator = new CollatorWrapper(
::comphelper::getProcessServiceFactory() );
-// pSortCollator->loadCollatorAlgorithm( sAlgorithm, aLocale,
-// rOpt.bIgnoreCase ? SW_COLLATOR_IGNORES : 0 );
+// pSortCollator->loadCollatorAlgorithm( sAlgorithm, aLocale,
+// rOpt.bIgnoreCase ? SW_COLLATOR_IGNORES : 0 );
}
void SwSortElement::Finit()
@@ -258,14 +258,14 @@ String SwSortBoxElement::GetKey(USHORT nKey) const
USHORT nCol = pOptions->aKeys[nKey]->nColumnId-1;
if( SRT_ROWS == pOptions->eDirection )
- pFndBox = pBox->GetBox(nCol, nRow); // Zeilen sortieren
+ pFndBox = pBox->GetBox(nCol, nRow); // Zeilen sortieren
else
- pFndBox = pBox->GetBox(nRow, nCol); // Spalten sortieren
+ pFndBox = pBox->GetBox(nRow, nCol); // Spalten sortieren
// Den Text rausfieseln
String aRetStr;
if( pFndBox )
- { // StartNode holen und ueberlesen
+ { // StartNode holen und ueberlesen
const SwTableBox* pMyBox = pFndBox->GetBox();
OSL_ENSURE(pMyBox, "Keine atomare Box");
@@ -287,9 +287,9 @@ double SwSortBoxElement::GetValue( USHORT nKey ) const
USHORT nCol = pOptions->aKeys[nKey]->nColumnId-1;
if( SRT_ROWS == pOptions->eDirection )
- pFndBox = pBox->GetBox(nCol, nRow); // Zeilen sortieren
+ pFndBox = pBox->GetBox(nCol, nRow); // Zeilen sortieren
else
- pFndBox = pBox->GetBox(nRow, nCol); // Spalten sortieren
+ pFndBox = pBox->GetBox(nRow, nCol); // Spalten sortieren
double nVal;
if( pFndBox )
@@ -416,9 +416,9 @@ BOOL SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
for ( USHORT n = 0; n < aSortArr.Count(); ++n )
{
SwSortTxtElement* pBox = (SwSortTxtElement*)aSortArr[n];
- aStart = nBeg + n;
- aRg.aStart = pBox->aPos.GetIndex();
- aRg.aEnd = aRg.aStart.GetIndex() + 1;
+ aStart = nBeg + n;
+ aRg.aStart = pBox->aPos.GetIndex();
+ aRg.aEnd = aRg.aStart.GetIndex() + 1;
// Nodes verschieben
MoveNodeRange( aRg, aStart,
@@ -559,7 +559,7 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
if(bUndo)
{
ClearRedo();
- pUndoSort = new SwUndoSort( rBoxes[0]->GetSttIdx(),
+ pUndoSort = new SwUndoSort( rBoxes[0]->GetSttIdx(),
rBoxes[rBoxes.Count()-1]->GetSttIdx(),
*pTblNd, rOpt, aFlatBox.HasItemSets() );
AppendUndo(pUndoSort);
@@ -623,7 +623,7 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
SwMovedBoxes& rMovedList, SwUndoSort* pUD)
{
for( USHORT i=0; i < rBox.GetCols(); ++i )
- { // Alte Zellen-Pos bestimmen und merken
+ { // Alte Zellen-Pos bestimmen und merken
const _FndBox* pSource = rBox.GetBox(i, nS);
// neue Zellen-Pos
@@ -669,7 +669,7 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
SwMovedBoxes& rMovedList, SwUndoSort* pUD)
{
for(USHORT i=0; i < rBox.GetRows(); ++i)
- { // Alte Zellen-Pos bestimmen und merken
+ { // Alte Zellen-Pos bestimmen und merken
const _FndBox* pSource = rBox.GetBox(nS, i);
// neue Zellen-Pos
@@ -737,7 +737,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
// Ist das Ziel leer(1 leerer Node vorhanden)
// -> diesen loeschen und move
// Ziel
- SwNodeIndex aTar( *pTar->GetSttNd() );
+ SwNodeIndex aTar( *pTar->GetSttNd() );
pNd = pDoc->GetNodes().GoNext( &aTar ); // naechsten ContentNode
ULONG nCount = pNd->EndOfSectionIndex() - pNd->StartOfSectionIndex();
@@ -749,7 +749,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
}
if(!bDelFirst)
- { // Es besteht schon Inhalt -> alter I n h a l t Section Down
+ { // Es besteht schon Inhalt -> alter I n h a l t Section Down
SwNodeRange aRgTar( aTar.GetNode(), 0, *pNd->EndOfSectionNode() );
pDoc->GetNodes().SectionDown( &aRgTar );
}
@@ -801,7 +801,7 @@ FlatFndBox::~FlatFndBox()
}
/*--------------------------------------------------------------------
- Beschreibung: Alle Lines einer Box muessen gleichviel Boxen haben
+ Beschreibung: Alle Lines einer Box muessen gleichviel Boxen haben
--------------------------------------------------------------------*/
BOOL FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
{
@@ -810,7 +810,7 @@ BOOL FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
// UeberLines iterieren
for(USHORT i=0; i < rLines.Count(); ++i)
- { // Die Boxen einer Line
+ { // Die Boxen einer Line
_FndLine* pLn = rLines[i];
const _FndBoxes& rBoxes = pLn->GetBoxes();
@@ -826,7 +826,7 @@ BOOL FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
}
/*--------------------------------------------------------------------
- Beschreibung: Box auf Symmetrie pruefen
+ Beschreibung: Box auf Symmetrie pruefen
Alle Boxen einer Line muessen gleichviele Lines haben
--------------------------------------------------------------------*/
BOOL FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
@@ -836,7 +836,7 @@ BOOL FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
// Ueber Boxes iterieren
for(USHORT i=0; i < rBoxes.Count(); ++i)
- { // Die Boxen einer Line
+ { // Die Boxen einer Line
_FndBox* pBox = rBoxes[i];
const _FndLines& rLines = pBox->GetLines();
@@ -868,7 +868,7 @@ USHORT FlatFndBox::GetColCount(const _FndBox& rBox)
USHORT nCount = 0;
const _FndBoxes& rBoxes = rLines[i]->GetBoxes();
for( USHORT j=0; j < rBoxes.Count(); ++j )
- // Rekursiv wirder ueber die Lines Iterieren
+ // Rekursiv wirder ueber die Lines Iterieren
nCount += rBoxes[j]->GetLines().Count()
? GetColCount(*rBoxes[j]) : 1;
@@ -889,12 +889,12 @@ USHORT FlatFndBox::GetRowCount(const _FndBox& rBox)
USHORT nLines = 0;
for(USHORT i=0; i < rLines.Count(); ++i)
- { // Die Boxen einer Line
+ { // Die Boxen einer Line
const _FndBoxes& rBoxes = rLines[i]->GetBoxes();
USHORT nLn = 1;
for(USHORT j=0; j < rBoxes.Count(); ++j)
if( rBoxes[j]->GetLines().Count() )
- // Rekursiv ueber die Lines Iterieren
+ // Rekursiv ueber die Lines Iterieren
nLn = Max(GetRowCount(*rBoxes[j]), nLn);
nLines = nLines + nLn;
@@ -920,7 +920,7 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, BOOL bLastBox)
for( USHORT j = 0; j < rBoxes.Count(); ++j )
{
// Die Box pruefen ob es eine atomare Box ist
- const _FndBox* pBox = rBoxes[ j ];
+ const _FndBox* pBox = rBoxes[ j ];
if( !pBox->GetLines().Count() )
{
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index 5225ffd6ad10..e2bef7fd4992 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
/************************************************************************
- * SwDocStat::SwDocStat()
+ * SwDocStat::SwDocStat()
************************************************************************/
SwDocStat::SwDocStat() :
@@ -51,19 +51,19 @@ SwDocStat::SwDocStat() :
{}
/************************************************************************
- * void SwDocStat::Reset()
+ * void SwDocStat::Reset()
************************************************************************/
void SwDocStat::Reset()
{
- nTbl = 0;
- nGrf = 0;
- nOLE = 0;
+ nTbl = 0;
+ nGrf = 0;
+ nOLE = 0;
nPage = 1;
nPara = 1;
nAllPara= 1;
- nWord = 0;
- nChar = 0;
+ nWord = 0;
+ nChar = 0;
nCharExcludingSpaces = 0;
bModified = TRUE;
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 3d7ed1be1d7a..dfc587d3cb12 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -2,7 +2,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
@@ -79,17 +79,17 @@
using namespace ::com::sun::star;
-const sal_Unicode cNumRepl = '@';
-const sal_Unicode cEndPageNum = '~';
+const sal_Unicode cNumRepl = '@';
+const sal_Unicode cEndPageNum = '~';
const sal_Char __FAR_DATA sPageDeli[] = ", ";
SV_IMPL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr)
-TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection ); // fuers RTTI
+TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection ); // fuers RTTI
struct LinkStruct
{
- SwFmtINetFmt aINetFmt;
+ SwFmtINetFmt aINetFmt;
xub_StrLen nStartTextPos, nEndTextPos;
LinkStruct( const String& rURL, xub_StrLen nStart, xub_StrLen nEnd )
@@ -161,7 +161,7 @@ USHORT SwDoc::GetCurTOXMark( const SwPosition& rPos,
// pruefe Ende mit ab
if( 0 == ( pEndIdx = pHt->GetEnd() ) ||
*pEndIdx <= nAktPos )
- continue; // weiter suchen
+ continue; // weiter suchen
}
else if( nSttIdx > nAktPos )
// ist Start vom Hint groesser als rPos, dann abbrechen. Denn
@@ -252,12 +252,12 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
CompareNodeCntnt aMax( 0, 0 );
CompareNodeCntnt aMin( ULONG_MAX, STRING_NOTFOUND );
- const SwTOXMark* pNew = 0;
- const SwTOXMark* pMax = &rCurTOXMark;
- const SwTOXMark* pMin = &rCurTOXMark;
+ const SwTOXMark* pNew = 0;
+ const SwTOXMark* pMax = &rCurTOXMark;
+ const SwTOXMark* pMin = &rCurTOXMark;
const SwModify* pType = rCurTOXMark.GetRegisteredIn();
- SwClientIter aIter( *(SwModify*)pType );
+ SwClientIter aIter( *(SwModify*)pType );
const SwTOXMark* pTOXMark;
const SwCntntFrm* pCFrm;
@@ -431,7 +431,7 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( ULONG nSttNd, ULONG nEndNd,
if(pSet)
pFmt->SetFmtAttr(*pSet);
-// --aEnd; // im InsertSection ist Ende inclusive
+// --aEnd; // im InsertSection ist Ende inclusive
SwSectionNode *const pNewSectionNode =
GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, &rTOX, &aEnd);
@@ -484,13 +484,13 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
SwTOXBase** prBase = 0;
switch(eTyp)
{
- case TOX_CONTENT: prBase = &pDefTOXBases->pContBase; break;
+ case TOX_CONTENT: prBase = &pDefTOXBases->pContBase; break;
case TOX_INDEX: prBase = &pDefTOXBases->pIdxBase; break;
case TOX_USER: prBase = &pDefTOXBases->pUserBase; break;
case TOX_TABLES: prBase = &pDefTOXBases->pTblBase; break;
case TOX_OBJECTS: prBase = &pDefTOXBases->pObjBase; break;
case TOX_ILLUSTRATIONS: prBase = &pDefTOXBases->pIllBase; break;
- case TOX_AUTHORITIES: prBase = &pDefTOXBases->pAuthBase; break;
+ case TOX_AUTHORITIES: prBase = &pDefTOXBases->pAuthBase; break;
}
if(!(*prBase) && bCreate)
{
@@ -501,18 +501,18 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
return (*prBase);
}
-void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
+void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
{
SwTOXBase** prBase = 0;
switch(rBase.GetType())
{
- case TOX_CONTENT: prBase = &pDefTOXBases->pContBase; break;
+ case TOX_CONTENT: prBase = &pDefTOXBases->pContBase; break;
case TOX_INDEX: prBase = &pDefTOXBases->pIdxBase; break;
case TOX_USER: prBase = &pDefTOXBases->pUserBase; break;
case TOX_TABLES: prBase = &pDefTOXBases->pTblBase; break;
case TOX_OBJECTS: prBase = &pDefTOXBases->pObjBase; break;
case TOX_ILLUSTRATIONS: prBase = &pDefTOXBases->pIllBase; break;
- case TOX_AUTHORITIES: prBase = &pDefTOXBases->pAuthBase; break;
+ case TOX_AUTHORITIES: prBase = &pDefTOXBases->pAuthBase; break;
}
if(*prBase)
delete (*prBase);
@@ -612,7 +612,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnistypen verwalten
+ Beschreibung: Verzeichnistypen verwalten
--------------------------------------------------------------------*/
USHORT SwDoc::GetTOXTypeCount(TOXTypes eTyp) const
{
@@ -726,7 +726,7 @@ const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, BYTE nLvl = 0 )
{
SwPosition aPos( *pNd );
pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm );
- OSL_ENSURE( pNd, "wo steht der Absatz" );
+ OSL_ENSURE( pNd, "wo steht der Absatz" );
}
}
return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0;
@@ -1001,7 +1001,7 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
aSortArr[ nCnt ]->pTOXNd = pTOXNd;
// Generierung: Form auswerten und Platzhalter
- // fuer die Seitennummer eintragen
+ // fuer die Seitennummer eintragen
//if it is a TOX_INDEX and the SwForm IsCommaSeparated()
// then a range of entries must be generated into one paragraph
USHORT nRange = 1;
@@ -1069,7 +1069,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
String sDeli, sLastDeli;
- USHORT i = 0;
+ USHORT i = 0;
while( i < aSortArr.Count() )
{
::SetProgressState( 0, pDoc->GetDocShell() );
@@ -1120,17 +1120,17 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( USHORT nLevel )
const TOXTypes eMyType = SwTOXBase::GetType();
switch( eMyType )
{
- case TOX_INDEX: nPoolFmt = RES_POOLCOLL_TOX_IDXH; break;
+ case TOX_INDEX: nPoolFmt = RES_POOLCOLL_TOX_IDXH; break;
case TOX_USER:
if( nLevel < 6 )
nPoolFmt = RES_POOLCOLL_TOX_USERH;
else
nPoolFmt = RES_POOLCOLL_TOX_USER6 - 6;
break;
- case TOX_ILLUSTRATIONS: nPoolFmt = RES_POOLCOLL_TOX_ILLUSH; break;
- case TOX_OBJECTS: nPoolFmt = RES_POOLCOLL_TOX_OBJECTH; break;
- case TOX_TABLES: nPoolFmt = RES_POOLCOLL_TOX_TABLESH; break;
- case TOX_AUTHORITIES: nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
+ case TOX_ILLUSTRATIONS: nPoolFmt = RES_POOLCOLL_TOX_ILLUSH; break;
+ case TOX_OBJECTS: nPoolFmt = RES_POOLCOLL_TOX_OBJECTH; break;
+ case TOX_TABLES: nPoolFmt = RES_POOLCOLL_TOX_TABLESH; break;
+ case TOX_AUTHORITIES: nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
case TOX_CONTENT:
// im Content Bereich gibt es einen Sprung!
@@ -1222,7 +1222,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
else if( TOX_USER == eTOXTyp ||
pMark->GetLevel() <= GetLevel())
- { // Inhaltsberzeichnismarkierung
+ { // Inhaltsberzeichnismarkierung
// also used for user marks
pBase = new SwTOXContent( *pTOXSrc, pTxtMark, rIntl );
InsertSorted(pBase);
@@ -1233,7 +1233,7 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnisinhalt aus Gliederungsebene generieren
+ Beschreibung: Verzeichnisinhalt aus Gliederungsebene generieren
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
{
@@ -1246,8 +1246,8 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
::SetProgressState( 0, pDoc->GetDocShell() );
SwTxtNode* pTxtNd = rOutlNds[ n ]->GetTxtNode();
if( pTxtNd && pTxtNd->Len() && pTxtNd->GetDepends() &&
- //USHORT(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() && //#outline level,zhaojianwei
- USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei
+ //USHORT(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() && //#outline level,zhaojianwei
+ USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei
pTxtNd->GetFrm() &&
!pTxtNd->HasHiddenParaField() &&
!pTxtNd->HasHiddenCharAttribute( true ) &&
@@ -1361,7 +1361,7 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
::SetProgressState( 0, pDoc->GetDocShell() );
-// const SwTxtNode* pChapterCompareNode = 0;
+// const SwTxtNode* pChapterCompareNode = 0;
if( rTxtNode.GetTxt().Len() && rTxtNode.GetFrm() &&
rTxtNode.GetNodes().IsDocNodes() /*&&
@@ -1473,7 +1473,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
long nMyOLEOptions = GetOLEOptions();
SwOLEObj& rOLEObj = pOLENode->GetOLEObj();
- if( rOLEObj.IsOleRef() ) //Noch nicht geladen
+ if( rOLEObj.IsOleRef() ) //Noch nicht geladen
{
SvGlobalName aTmpName = SvGlobalName( rOLEObj.GetOleRef()->getClassID() );
long nObj = ::lcl_IsSOObject( aTmpName );
@@ -1511,7 +1511,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
{
//USHORT nTmp = pOutlNd->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
//if( nTmp < NO_NUMBERING )
- // nSetLevel = nTmp + 1;
+ // nSetLevel = nTmp + 1;
if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel() ;//<-end,zhaojianwei
}
@@ -1533,7 +1533,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
}
/*--------------------------------------------------------------------
- Beschreibung: Tabelleneintraege zusammensuchen
+ Beschreibung: Tabelleneintraege zusammensuchen
--------------------------------------------------------------------*/
void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
{
@@ -1569,7 +1569,7 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
{
//USHORT nTmp = pOutlNd->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
//if( nTmp < NO_NUMBERING )
- // pNew->SetLevel( nTmp + 1 );
+ // pNew->SetLevel( nTmp + 1 );
if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
{
const int nTmp = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
@@ -1586,7 +1586,7 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
}
/*--------------------------------------------------------------------
- Beschreibung: String generieren anhand der Form
+ Beschreibung: String generieren anhand der Form
SonderZeichen 0-31 und 255 entfernen
--------------------------------------------------------------------*/
String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, BYTE nLevel )
@@ -1594,7 +1594,7 @@ String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, BYT
String sRet;
if( !rBase.pTxtMark && rBase.aTOXSources.Count() > 0 )
- { // nur wenn es keine Marke ist
+ { // nur wenn es keine Marke ist
const SwTxtNode* pNd = rBase.aTOXSources[0].pNd->GetTxtNode();
if( pNd )
{
@@ -1615,7 +1615,7 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
const sal_uInt32 _nTOXSectNdIdx,
const SwPageDesc* _pDefaultPageDesc )
{
- LinkStructArr aLinkArr;
+ LinkStructArr aLinkArr;
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
::SetProgressState( 0, pDoc->GetDocShell() );
@@ -1769,9 +1769,9 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
aInsStr += cEndPageNum;
rTxt.Append( aInsStr );
}
-// // Tab entfernen, wenn keine Seitennummer
-// else if( rTxt.Len() && '\t' == rTxt.GetChar( rTxt.Len() - 1 ))
-// rTxt.Erase( rTxt.Len()-1, 1 );
+// // Tab entfernen, wenn keine Seitennummer
+// else if( rTxt.Len() && '\t' == rTxt.GetChar( rTxt.Len() - 1 ))
+// rTxt.Erase( rTxt.Len()-1, 1 );
}
break;
@@ -1878,7 +1878,7 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
if( aToken.sCharStyleName.Len() )
{
SwCharFmt* pCharFmt;
- if( USHRT_MAX != aToken.nPoolId )
+ if( USHRT_MAX != aToken.nPoolId )
pCharFmt = pDoc->GetCharFmtFromPool( aToken.nPoolId );
else
pCharFmt = pDoc->FindCharFmtByName( aToken.sCharStyleName);
@@ -1916,8 +1916,8 @@ void SwTOXBaseSection::UpdatePageNum()
return ;
// die aktuellen Seitennummern ins Verzeichnis eintragen
- SwPageFrm* pAktPage = 0;
- USHORT nPage = 0;
+ SwPageFrm* pAktPage = 0;
+ USHORT nPage = 0;
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
SwTOXInternational aIntl( GetLanguage(),
@@ -1928,8 +1928,8 @@ void SwTOXBaseSection::UpdatePageNum()
for( USHORT nCnt = 0; nCnt < aSortArr.Count(); ++nCnt )
{
// Schleife ueber alle SourceNodes
- SvUShorts aNums; //Die Seitennummern
- SvPtrarr aDescs; //Die PageDescriptoren passend zu den Seitennummern.
+ SvUShorts aNums; //Die Seitennummern
+ SvPtrarr aDescs; //Die PageDescriptoren passend zu den Seitennummern.
SvUShorts* pMainNums = 0; // contains page numbers of main entries
// process run in lines
@@ -1976,11 +1976,11 @@ void SwTOXBaseSection::UpdatePageNum()
pFrm = pNext;
}
- SwPageFrm* pTmpPage = pFrm->FindPageFrm();
+ SwPageFrm* pTmpPage = pFrm->FindPageFrm();
if( pTmpPage != pAktPage )
{
- nPage = pTmpPage->GetVirtPageNum();
- pAktPage = pTmpPage;
+ nPage = pTmpPage->GetVirtPageNum();
+ pAktPage = pTmpPage;
}
// sortiert einfuegen
@@ -2075,7 +2075,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
{
SwTxtAttr* pAttr = pHints->GetStart(nHintIdx);
xub_StrLen nTmpEnd = pAttr->GetEnd() ? *pAttr->GetEnd() : 0;
- if( nStartPos >= *pAttr->GetStart() &&
+ if( nStartPos >= *pAttr->GetStart() &&
(nStartPos + 2) <= nTmpEnd &&
pAttr->Which() == RES_TXTATR_CHARFMT)
{
@@ -2089,7 +2089,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
{
SvxNumberType aType( ((SwPageDesc*)rDescs[i])->GetNumType() );
if( TOX_INDEX == SwTOXBase::GetType() )
- { // Zusammenfassen f. ff.
+ { // Zusammenfassen f. ff.
// Alle folgenden aufaddieren
// break up if main entry starts or ends and
// insert a char style index
@@ -2119,19 +2119,19 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
}
// neuen String anlegen
- nBeg = rNums[i];
+ nBeg = rNums[i];
aNumStr.AppendAscii( sPageDeli );
//the change of the character style must apply after sPageDeli is appended
if(pCharStyleIdx && bMainEntryChanges)
pCharStyleIdx->Insert(aNumStr.Len(),
pCharStyleIdx->Count());
aNumStr += aType.GetNumStr( nBeg );
- nCount = 0;
+ nCount = 0;
}
nOld = rNums[i];
}
else
- { // Alle Nummern eintragen
+ { // Alle Nummern eintragen
aNumStr += aType.GetNumStr( USHORT(rNums[i]) );
if(i != (rNums.Count()-1))
aNumStr.AppendAscii( sPageDeli );
@@ -2252,7 +2252,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
short i;
for( i = (short)aRange.Min(); i < (short)aRange.Max(); ++i)
- { // nur auf gleicher Ebene pruefen
+ { // nur auf gleicher Ebene pruefen
//
SwTOXSortTabBase* pOld = aSortArr[i];
if(*pOld == *pNew)
@@ -2266,7 +2266,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
continue;
if(!(pNew->GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
- { // Eigener Eintrag
+ { // Eigener Eintrag
aSortArr.Insert(pNew, i );
return;
}
@@ -2332,7 +2332,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
break;
}
if(i == nMax)
- { // Falls nicht vorhanden erzeugen und einfuegen
+ { // Falls nicht vorhanden erzeugen und einfuegen
//
SwTOXCustom* pKey = new SwTOXCustom( sToCompare, sToCompareReading, nLevel, rIntl,
rNew.GetLocale() );
@@ -2350,7 +2350,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
for(i = nStart; i < aSortArr.Count(); ++i)
{
if(aSortArr[i]->GetLevel() <= nLevel)
- { nEnd = i;
+ { nEnd = i;
break;
}
}
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index bf34f2a64699..322d28643115 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -2,7 +2,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
@@ -99,14 +99,14 @@ void SwDoc::initXForms( bool bCreateDefaultModel )
if( bCreateDefaultModel && xXForms.is() )
{
OUString sName(RTL_CONSTASCII_USTRINGPARAM("Model 1"));
- Reference<XModel> xModel(
+ Reference<XModel> xModel(
lcl_createInstance( "com.sun.star.xforms.Model" ),
UNO_QUERY );
DBG_ASSERT( xModel.is(), "no model?" );
if( xModel.is() )
{
xModel->setID( sName );
- Reference<XFormsUIHelper1>( xModel, UNO_QUERY )->newInstance(
+ Reference<XFormsUIHelper1>( xModel, UNO_QUERY )->newInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM("Instance 1")),
OUString(), sal_True );
xModel->initialize();
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index fdfe5ca10310..01dcfd295680 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 624aca83618b..b1d130082cbf 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <doc.hxx> // fuer GetAttrPool
+#include <doc.hxx> // fuer GetAttrPool
#include <errhdl.hxx>
#include <fmtcol.hxx>
// --> OD 2006-11-22 #i71574#
@@ -250,27 +250,27 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
(const SfxPoolItem**)&pOldLRSpace ))
{
int bChg = FALSE;
- if( pOldLRSpace != pNewLRSpace ) // verhinder Rekursion (SetAttr!!)
+ if( pOldLRSpace != pNewLRSpace ) // verhinder Rekursion (SetAttr!!)
{
SvxLRSpaceItem aNew( *pOldLRSpace );
// wir hatten eine relative Angabe -> neu berechnen
if( 100 != aNew.GetPropLeft() )
{
- long nTmp = aNew.GetLeft(); // alten zum Vergleichen
+ long nTmp = aNew.GetLeft(); // alten zum Vergleichen
aNew.SetLeft( pNewLRSpace->GetLeft(), aNew.GetPropLeft() );
bChg |= nTmp != aNew.GetLeft();
}
// wir hatten eine relative Angabe -> neu berechnen
if( 100 != aNew.GetPropRight() )
{
- long nTmp = aNew.GetRight(); // alten zum Vergleichen
+ long nTmp = aNew.GetRight(); // alten zum Vergleichen
aNew.SetRight( pNewLRSpace->GetRight(), aNew.GetPropRight() );
bChg |= nTmp != aNew.GetRight();
}
// wir hatten eine relative Angabe -> neu berechnen
if( 100 != aNew.GetPropTxtFirstLineOfst() )
{
- short nTmp = aNew.GetTxtFirstLineOfst(); // alten zum Vergleichen
+ short nTmp = aNew.GetTxtFirstLineOfst(); // alten zum Vergleichen
aNew.SetTxtFirstLineOfst( pNewLRSpace->GetTxtFirstLineOfst(),
aNew.GetPropTxtFirstLineOfst() );
bChg |= nTmp != aNew.GetTxtFirstLineOfst();
@@ -289,21 +289,21 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
if( pNewULSpace && SFX_ITEM_SET == GetItemState(
RES_UL_SPACE, FALSE, (const SfxPoolItem**)&pOldULSpace ) &&
- pOldULSpace != pNewULSpace ) // verhinder Rekursion (SetAttr!!)
+ pOldULSpace != pNewULSpace ) // verhinder Rekursion (SetAttr!!)
{
SvxULSpaceItem aNew( *pOldULSpace );
int bChg = FALSE;
// wir hatten eine relative Angabe -> neu berechnen
if( 100 != aNew.GetPropUpper() )
{
- USHORT nTmp = aNew.GetUpper(); // alten zum Vergleichen
+ USHORT nTmp = aNew.GetUpper(); // alten zum Vergleichen
aNew.SetUpper( pNewULSpace->GetUpper(), aNew.GetPropUpper() );
bChg |= nTmp != aNew.GetUpper();
}
// wir hatten eine relative Angabe -> neu berechnen
if( 100 != aNew.GetPropLower() )
{
- USHORT nTmp = aNew.GetLower(); // alten zum Vergleichen
+ USHORT nTmp = aNew.GetLower(); // alten zum Vergleichen
aNew.SetLower( pNewULSpace->GetLower(), aNew.GetPropLower() );
bChg |= nTmp != aNew.GetLower();
}
@@ -339,7 +339,7 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
else
{
// wir hatten eine relative Angabe -> neu berechnen
- UINT32 nTmp = pOldFSize->GetHeight(); // alten zum Vergleichen
+ UINT32 nTmp = pOldFSize->GetHeight(); // alten zum Vergleichen
SvxFontHeightItem aNew(240 , 100, pFSize->Which());
aNew.SetHeight( pFSize->GetHeight(), pOldFSize->GetProp(),
pOldFSize->GetPropUnit() );
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index afd96de4ba90..c63b4fce8c62 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -2,7 +2,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
@@ -110,16 +110,16 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
for( n = 0; n < rOutlNds.Count(); ++n )
if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
- break; // gefunden
- //else if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() ) //#outline level,zhaojianwei
+ break; // gefunden
+ //else if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() ) //#outline level,zhaojianwei
else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 ) //<-end,zhaojianwei
- pCapStt = rOutlNds[ n ]; // Start eines neuen Kapitels
+ pCapStt = rOutlNds[ n ]; // Start eines neuen Kapitels
// dann suche jetzt noch das Ende vom Bereich
for( ; n < rOutlNds.Count(); ++n )
//if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
{
- nCapEnd = rOutlNds[ n ]->GetIndex(); // Ende des gefundenen Kapitels
+ nCapEnd = rOutlNds[ n ]->GetIndex(); // Ende des gefundenen Kapitels
break;
}
}
@@ -134,7 +134,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
++nPos;
}
- if( nPos == Count() ) // nichts gefunden
+ if( nPos == Count() ) // nichts gefunden
return;
if( !rOutlNds.Count() )
@@ -227,14 +227,14 @@ void SwFtnIdxs::UpdateAllFtn()
if( FTNNUM_CHAPTER == rFtnInfo.eNum )
{
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
- USHORT nNo = 1, // Nummer fuer die Fussnoten
- nFtnIdx = 0; // Index in das FtnIdx-Array
+ USHORT nNo = 1, // Nummer fuer die Fussnoten
+ nFtnIdx = 0; // Index in das FtnIdx-Array
for( USHORT n = 0; n < rOutlNds.Count(); ++n )
{
//if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
{
- ULONG nCapStt = rOutlNds[ n ]->GetIndex(); // Start eines neuen Kapitels
+ ULONG nCapStt = rOutlNds[ n ]->GetIndex(); // Start eines neuen Kapitels
for( ; nFtnIdx < Count(); ++nFtnIdx )
{
pTxtFtn = (*this)[ nFtnIdx ];
@@ -249,7 +249,7 @@ void SwFtnIdxs::UpdateAllFtn()
&rFtn.GetNumStr() );
}
if( nFtnIdx >= Count() )
- break; // ok alles geupdatet
+ break; // ok alles geupdatet
nNo = 1;
}
}
@@ -338,7 +338,7 @@ const SwSectionNode* SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr(
const SwTxtFtn& rTxtFtn )
{
USHORT nWh = static_cast<USHORT>( rTxtFtn.GetFtn().IsEndNote() ?
- RES_END_AT_TXTEND : RES_FTN_AT_TXTEND );
+ RES_END_AT_TXTEND : RES_FTN_AT_TXTEND );
USHORT nVal;
const SwSectionNode* pNd = rTxtFtn.GetTxtNode().FindSectionNode();
while( pNd && FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal =
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 6e49dc8108d5..401affef93e4 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -2,7 +2,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
@@ -366,7 +366,7 @@ BOOL lcl_MergeGCBox( const SwTableBox*& rpTblBox, void* pPara )
// loesche alte die Box mit der Line
pInsLine->GetTabBoxes().DeleteAndDestroy( nInsPos );
- return FALSE; // neu aufsetzen
+ return FALSE; // neu aufsetzen
}
}
return TRUE;
@@ -401,7 +401,7 @@ BOOL lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
SwTableBox* pUpper = pLn->GetUpper();
- rLns.Remove( nInsPos, 1 ); // die Line dem aus Array loeschen
+ rLns.Remove( nInsPos, 1 ); // die Line dem aus Array loeschen
rLns.Insert( &pBox->GetTabLines(), nInsPos );
// JP 31.03.99: Bug 60000 - die Attribute der zu loeschenden
@@ -417,7 +417,7 @@ BOOL lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
pGCPara->pShareFmts->SetAttr( *rBoxLns[ nLns ], *pItem );
}
- pBox->GetTabLines().Remove( 0, nLen ); // Lines aus Array loeschen
+ pBox->GetTabLines().Remove( 0, nLen ); // Lines aus Array loeschen
delete pLn;
@@ -425,7 +425,7 @@ BOOL lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
while( nLen-- )
rLns[ nInsPos++ ]->SetUpper( pUpper );
- pLn = pLine; // und neu setzen
+ pLn = pLine; // und neu setzen
nLen = pLn->GetTabBoxes().Count();
}
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 4eeff2a0ec0e..7afb7a1fa175 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -2,7 +2,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
@@ -66,13 +66,13 @@ using namespace ::com::sun::star;
class SwHTMLTableLayoutConstraints
{
- USHORT nRow; // Start-Zeile
- USHORT nCol; // Start-Spalte
- USHORT nColSpan; // COLSPAN der Zelle
+ USHORT nRow; // Start-Zeile
+ USHORT nCol; // Start-Spalte
+ USHORT nColSpan; // COLSPAN der Zelle
- SwHTMLTableLayoutConstraints *pNext; // die naechste Bedingung
+ SwHTMLTableLayoutConstraints *pNext; // die naechste Bedingung
- ULONG nMinNoAlign, nMaxNoAlign; // Zwischenergebnisse AL-Pass 1
+ ULONG nMinNoAlign, nMaxNoAlign; // Zwischenergebnisse AL-Pass 1
public:
@@ -150,7 +150,7 @@ SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( USHORT nWidth,
/* */
SwHTMLTableLayoutConstraints::SwHTMLTableLayoutConstraints(
- ULONG nMin, ULONG nMax, USHORT nRw, USHORT nColumn, USHORT nColSp ):
+ ULONG nMin, ULONG nMax, USHORT nRw, USHORT nColumn, USHORT nColSp ):
nRow( nRw ), nCol( nColumn ), nColSpan( nColSp ),
pNext( 0 ),
nMinNoAlign( nMin ), nMaxNoAlign( nMax )
@@ -512,7 +512,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
pColumn->ClearPass1Info( !HasColTags() );
USHORT nMinColSpan = USHRT_MAX; // Spaltenzahl, auf die sich dir
// berechnete Breite bezieht
- USHORT nColSkip = USHRT_MAX; // Wie viele Spalten muessen
+ USHORT nColSkip = USHRT_MAX; // Wie viele Spalten muessen
// uebersprungen werden
for( USHORT j=0; j<nRows; j++ )
@@ -782,19 +782,19 @@ void SwHTMLTableLayout::AutoLayoutPass1()
// Werte anhand folgender Tabelle (Netscape 4.0 pv 3) uebernehmen:
//
- // WIDTH: kein COLS COLS
+ // WIDTH: kein COLS COLS
//
- // keine min = min min = absmin
- // max = max max = max
+ // keine min = min min = absmin
+ // max = max max = max
//
- // >= min min = min min = width
- // max = width max = width
+ // >= min min = min min = width
+ // max = width max = width
//
- // >= absmin min = wdith(*) min = width
- // max = width max = width
+ // >= absmin min = wdith(*) min = width
+ // max = width max = width
//
- // < absmin min = absmin min = absmin
- // max = absmin max = absmin
+ // < absmin min = absmin min = absmin
+ // max = absmin max = absmin
//
// (*) Netscape benutzt hier die Mindestbreite ohne einen
// Umbruch vor der letzten Grafik. Haben wir (noch?) nicht,
@@ -962,9 +962,9 @@ void SwHTMLTableLayout::AutoLayoutPass1()
// erhalten und dient als Ausgangsbasis fuer die andern Breiten.
// Es werden auch hier nur die Maximalbreiten beeinflusst!
- ULONG nAbsMin = 0; // absolte Min-Breite alter Spalten mit
+ ULONG nAbsMin = 0; // absolte Min-Breite alter Spalten mit
// relativer Breite
- ULONG nRel = 0; // Summe der relativen Breiten aller Spalten
+ ULONG nRel = 0; // Summe der relativen Breiten aller Spalten
for( i=0; i<nCols; i++ )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( i );
@@ -1010,9 +1010,9 @@ void SwHTMLTableLayout::AutoLayoutPass1()
}
else
{
- USHORT nRel = 0; // Summe der relativen Breiten aller Spalten
- USHORT nRelCols = 0; // Anzahl Spalten mit relativer Angabe
- ULONG nRelMax = 0; // Anteil am Maximum dieser Spalten
+ USHORT nRel = 0; // Summe der relativen Breiten aller Spalten
+ USHORT nRelCols = 0; // Anzahl Spalten mit relativer Angabe
+ ULONG nRelMax = 0; // Anteil am Maximum dieser Spalten
for( i=0; i<nCols; i++ )
{
OSL_ENSURE( nRel<=100, "relative Breite aller Spalten>100%" );
@@ -1588,7 +1588,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelLeftFill && !pLeftFillerBox &&
( nWidthSet>0 || nAbsLeftFill<MINLAY+nInhLeftBorderWidth ||
(HasColTags() && nAbsLeftFill < nAbsLeftSpace+nParentInhAbsLeftSpace+20) ) )
-// (nAbsLeftFill<MINLAY || nAbsLeftFill<=nAbsLeftSpace) )
+// (nAbsLeftFill<MINLAY || nAbsLeftFill<=nAbsLeftSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( 0 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsLeftFill );
@@ -1599,7 +1599,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelRightFill && !pRightFillerBox &&
( nWidthSet>0 || nAbsRightFill<MINLAY+nInhRightBorderWidth ||
(HasColTags() && nAbsRightFill < nAbsRightSpace+nParentInhAbsRightSpace+20) ) )
-// (nAbsRightFill<MINLAY || nAbsRightFill<=nAbsRightSpace) )
+// (nAbsRightFill<MINLAY || nAbsRightFill<=nAbsRightSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( nCols-1 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsRightFill );
@@ -1621,7 +1621,7 @@ static BOOL lcl_ResizeBox( const SwTableBox*& rpBox, void* pPara )
USHORT nWidth = 0;
((SwTableBox *)rpBox)->GetTabLines().ForEach( &lcl_ResizeLine, &nWidth );
rpBox->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth, 0 ));
- *pWidth = *pWidth + nWidth;
+ *pWidth = *pWidth + nWidth;
}
else
{
@@ -1743,7 +1743,7 @@ void SwHTMLTableLayout::SetWidths( BOOL bCallPass2, USHORT nAbsAvail,
if( bUseRelWidth )
{
// Bei %-Angaben wird die Breite auf das Minimum gesetzt.
- aFlyFrmSize.SetWidth( nMin > USHRT_MAX ? USHRT_MAX
+ aFlyFrmSize.SetWidth( nMin > USHRT_MAX ? USHRT_MAX
: nMin );
aFlyFrmSize.SetWidthPercent( (BYTE)nWidthOption );
}
@@ -1797,7 +1797,7 @@ void SwHTMLTableLayout::_Resize( USHORT nAbsAvail, BOOL bRecalc )
SetWidths( TRUE, nAbsAvail );
if ( pRoot && pRoot->IsCallbackActionEnabled() )
- pRoot->EndAllAction( TRUE ); //True per VirDev (Browsen ruhiger)
+ pRoot->EndAllAction( TRUE ); //True per VirDev (Browsen ruhiger)
}
IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 3d6b872522ee..92d8bb88cf08 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 259d6f06e646..8c34485600b5 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 349cfbda11b9..994cb535b2b0 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -2,7 +2,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
@@ -152,11 +152,11 @@ void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
/*************************************************************************
|*
-|* SwGrfFrm::SwGrfFrm(ViewShell * const,SwGrfNode *)
+|* SwGrfFrm::SwGrfFrm(ViewShell * const,SwGrfNode *)
|*
-|* Beschreibung
-|* Ersterstellung JP 05.03.91
-|* Letzte Aenderung MA 03. Mar. 93
+|* Beschreibung
+|* Ersterstellung JP 05.03.91
+|* Letzte Aenderung MA 03. Mar. 93
|*
*************************************************************************/
@@ -182,11 +182,11 @@ void SwNoTxtFrm::InitCtor()
/*************************************************************************
|*
-|* SwNoTxtNode::MakeFrm()
+|* SwNoTxtNode::MakeFrm()
|*
-|* Beschreibung
-|* Ersterstellung JP 05.03.91
-|* Letzte Aenderung MA 03. Mar. 93
+|* Beschreibung
+|* Ersterstellung JP 05.03.91
+|* Letzte Aenderung MA 03. Mar. 93
|*
*************************************************************************/
@@ -198,11 +198,11 @@ SwCntntFrm *SwNoTxtNode::MakeFrm()
/*************************************************************************
|*
-|* SwNoTxtFrm::~SwNoTxtFrm()
+|* SwNoTxtFrm::~SwNoTxtFrm()
|*
-|* Beschreibung
-|* Ersterstellung JP 05.03.91
-|* Letzte Aenderung MA 30. Apr. 96
+|* Beschreibung
+|* Ersterstellung JP 05.03.91
+|* Letzte Aenderung MA 30. Apr. 96
|*
*************************************************************************/
@@ -213,11 +213,11 @@ SwNoTxtFrm::~SwNoTxtFrm()
/*************************************************************************
|*
-|* void SwNoTxtFrm::Modify( SwHint * pOld, SwHint * pNew )
+|* void SwNoTxtFrm::Modify( SwHint * pOld, SwHint * pNew )
|*
-|* Beschreibung
-|* Ersterstellung JP 05.03.91
-|* Letzte Aenderung JP 05.03.91
+|* Beschreibung
+|* Ersterstellung JP 05.03.91
+|* Letzte Aenderung JP 05.03.91
|*
*************************************************************************/
@@ -257,11 +257,11 @@ void lcl_ClearArea( const SwFrm &rFrm,
/*************************************************************************
|*
-|* void SwNoTxtFrm::Paint()
+|* void SwNoTxtFrm::Paint()
|*
-|* Beschreibung
-|* Ersterstellung JP 05.03.91
-|* Letzte Aenderung MA 10. Jan. 97
+|* Beschreibung
+|* Ersterstellung JP 05.03.91
+|* Letzte Aenderung MA 10. Jan. 97
|*
*************************************************************************/
@@ -390,13 +390,13 @@ void lcl_CalcRect( Point& rPt, Size& rDim, USHORT nMirror )
/*************************************************************************
|*
-|* void SwNoTxtFrm::GetGrfArea()
+|* void SwNoTxtFrm::GetGrfArea()
|*
-|* Beschreibung Errechne die Position und die Groesse der Bitmap
-|* innerhalb des uebergebenem Rechtecks.
+|* Beschreibung Errechne die Position und die Groesse der Bitmap
+|* innerhalb des uebergebenem Rechtecks.
|*
-|* Ersterstellung JP 03.09.91
-|* Letzte Aenderung MA 11. Oct. 94
+|* Ersterstellung JP 03.09.91
+|* Letzte Aenderung MA 11. Oct. 94
|*
*************************************************************************/
@@ -405,7 +405,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
{
// JP 23.01.2001: currently only used for scaling, cropping and mirroring
// the contour of graphics!
- // all other is handled by the GraphicObject
+ // all other is handled by the GraphicObject
//In rRect wird das sichbare Rechteck der Grafik gesteckt.
//In pOrigRect werden Pos+Size der Gesamtgrafik gesteck.
@@ -484,12 +484,12 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
//Erst das 'sichtbare' Rect einstellen.
if ( nLeftCrop > 0 )
{
- aVisPt.X() += nLeftCrop;
+ aVisPt.X() += nLeftCrop;
aVisSz.Width() -= nLeftCrop;
}
if ( nTopCrop > 0 )
{
- aVisPt.Y() += nTopCrop;
+ aVisPt.Y() += nTopCrop;
aVisSz.Height() -= nTopCrop;
}
if ( nRightCrop > 0 )
@@ -506,7 +506,7 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
Size aTmpSz( aGrfSz );
aGrfPt.X() += nLeftCrop;
aTmpSz.Width() -= nLeftCrop + nRightCrop;
- aGrfPt.Y() += nTopCrop;
+ aGrfPt.Y() += nTopCrop;
aTmpSz.Height()-= nTopCrop + nBottomCrop;
if( RES_MIRROR_GRAPH_DONT != nMirror )
@@ -519,12 +519,12 @@ void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
/*************************************************************************
|*
-|* Size SwNoTxtFrm::GetSize()
+|* Size SwNoTxtFrm::GetSize()
|*
-|* Beschreibung Gebe die Groesse des umgebenen FLys und
-|* damit die der Grafik zurueck.
-|* Ersterstellung JP 04.03.91
-|* Letzte Aenderung JP 31.08.94
+|* Beschreibung Gebe die Groesse des umgebenen FLys und
+|* damit die der Grafik zurueck.
+|* Ersterstellung JP 04.03.91
+|* Letzte Aenderung JP 31.08.94
|*
*************************************************************************/
@@ -540,10 +540,10 @@ const Size& SwNoTxtFrm::GetSize() const
/*************************************************************************
|*
-|* SwNoTxtFrm::MakeAll()
+|* SwNoTxtFrm::MakeAll()
|*
-|* Ersterstellung MA 29. Nov. 96
-|* Letzte Aenderung MA 29. Nov. 96
+|* Ersterstellung MA 29. Nov. 96
+|* Letzte Aenderung MA 29. Nov. 96
|*
*************************************************************************/
@@ -564,7 +564,7 @@ void SwNoTxtFrm::MakeAll()
MakePrtArea( rAttrs );
if ( !bValidSize )
- { bValidSize = TRUE;
+ { bValidSize = TRUE;
Format();
}
}
@@ -572,11 +572,11 @@ void SwNoTxtFrm::MakeAll()
/*************************************************************************
|*
-|* SwNoTxtFrm::Format()
+|* SwNoTxtFrm::Format()
|*
-|* Beschreibung Errechne die Groesse der Bitmap, wenn noetig
-|* Ersterstellung JP 11.03.91
-|* Letzte Aenderung MA 13. Mar. 96
+|* Beschreibung Errechne die Groesse der Bitmap, wenn noetig
+|* Ersterstellung JP 11.03.91
+|* Letzte Aenderung MA 13. Mar. 96
|*
*************************************************************************/
@@ -597,11 +597,11 @@ void SwNoTxtFrm::Format( const SwBorderAttrs * )
/*************************************************************************
|*
-|* SwNoTxtFrm::GetCharRect()
+|* SwNoTxtFrm::GetCharRect()
|*
-|* Beschreibung
-|* Ersterstellung SS 29-Apr-1991
-|* Letzte Aenderung MA 10. Oct. 94
+|* Beschreibung
+|* Ersterstellung SS 29-Apr-1991
+|* Letzte Aenderung MA 10. Oct. 94
|*
|*************************************************************************/
@@ -731,7 +731,7 @@ void SwNoTxtFrm::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
CLEARCACHE( (SwGrfNode*) GetNode() )
break;
}
- if( RES_GRFATR_END == n ) // not found
+ if( RES_GRFATR_END == n ) // not found
return ;
}
break;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index a3e49d23b04e..166a53c8088d 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -2,7 +2,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
@@ -350,7 +350,7 @@ void SwNumFmt::SetCharFmtName(const String& rSet)
SvxNumberFormat::SetCharFmtName(rSet);
}
-const String& SwNumFmt::GetCharFmtName() const
+const String& SwNumFmt::GetCharFmtName() const
{
if((SwCharFmt*)pRegisteredIn)
return ((SwCharFmt*)pRegisteredIn)->GetName();
@@ -358,7 +358,7 @@ const String& SwNumFmt::GetCharFmtName() const
return aEmptyStr;
}
-void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
+void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
const sal_Int16* pOrient)
{
if(pOrient)
@@ -472,7 +472,7 @@ SwNumRule::SwNumRule( const String& rNm,
nSerial = nInstances++;
#endif
- if( !nRefCount++ ) // zum erstmal, also initialisiern
+ if( !nRefCount++ ) // zum erstmal, also initialisiern
{
SwNumFmt* pFmt;
BYTE n;
@@ -591,7 +591,7 @@ SwNumRule::~SwNumRule()
pNumRuleMap->erase(GetName());
}
- if( !--nRefCount ) // der letzte macht die Tuer zu
+ if( !--nRefCount ) // der letzte macht die Tuer zu
{
// Nummerierung:
SwNumFmt** ppFmts = (SwNumFmt**)SwNumRule::aBaseFmts;
@@ -776,13 +776,13 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
aStr += rNFmt.GetNumStr( rNumVector[ i ] );
}
else
- aStr += '0'; // alle 0-Level sind eine 0
+ aStr += '0'; // alle 0-Level sind eine 0
if( i != nLevel && aStr.Len() )
aStr += aDotStr;
}
//JP 14.12.99: the type dont have any number, so dont append
- // the Post-/Prefix String
+ // the Post-/Prefix String
if( bInclStrings && !bOnlyArabic &&
SVX_NUM_CHAR_SPECIAL != rMyNFmt.GetNumberingType() &&
SVX_NUM_BITMAP != rMyNFmt.GetNumberingType() )
@@ -929,7 +929,7 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
SwList* pList = pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() );
OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
if ( pList )
- {
+ {
aLists.insert( pList );
}
// <--
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index daef15f54ea9..738a1a95c976 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2,7 +2,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
@@ -75,34 +75,34 @@
using namespace ::com::sun::star;
-const USHORT PT_3 = 3 * 20; // 3 pt
-const USHORT PT_6 = 6 * 20; // 6 pt
-const USHORT PT_7 = 7 * 20; // 6 pt
-const USHORT PT_8 = 8 * 20; // 8 pt
-const USHORT PT_9 = 9 * 20; // 9 pt
-const USHORT PT_10 = 10 * 20; // 10 pt
-const USHORT PT_11 = 11 * 20; // 11 pt
-const USHORT PT_12 = 12 * 20; // 12 pt
-const USHORT PT_14 = 14 * 20; // 14 pt
-const USHORT PT_16 = 16 * 20; // 16 pt
-const USHORT PT_18 = 18 * 20; // 18 pt
-const USHORT PT_22 = 22 * 20; // 22 pt
-const USHORT PT_24 = 24 * 20; // 22 pt
+const USHORT PT_3 = 3 * 20; // 3 pt
+const USHORT PT_6 = 6 * 20; // 6 pt
+const USHORT PT_7 = 7 * 20; // 6 pt
+const USHORT PT_8 = 8 * 20; // 8 pt
+const USHORT PT_9 = 9 * 20; // 9 pt
+const USHORT PT_10 = 10 * 20; // 10 pt
+const USHORT PT_11 = 11 * 20; // 11 pt
+const USHORT PT_12 = 12 * 20; // 12 pt
+const USHORT PT_14 = 14 * 20; // 14 pt
+const USHORT PT_16 = 16 * 20; // 16 pt
+const USHORT PT_18 = 18 * 20; // 18 pt
+const USHORT PT_22 = 22 * 20; // 22 pt
+const USHORT PT_24 = 24 * 20; // 22 pt
//const USHORT HTML_PARSPACE = ((CM_05 * 7) / 10);
-#define HTML_PARSPACE GetMetricVal( CM_05 )
+#define HTML_PARSPACE GetMetricVal( CM_05 )
static const sal_Char __FAR_DATA sKomma[] = ", ";
static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
-// PT_16, PT_14, PT_14, PT_12, PT_12, // normal
+// PT_16, PT_14, PT_14, PT_12, PT_12, // normal
//JP 10.12.96: jetzt soll alles prozentual sein:
115, 100, 100, 85, 85,
- 75, 75, 75, 75, 75, // normal
-// PT_22, PT_16, PT_12, PT_11, PT_9 // HTML-Mode
+ 75, 75, 75, 75, 75, // normal
+// PT_22, PT_16, PT_12, PT_11, PT_9 // HTML-Mode
PT_24, PT_18, PT_14, PT_12, PT_10,
- PT_7, PT_7, PT_7, PT_7, PT_7 // HTML-Mode
+ PT_7, PT_7, PT_7, PT_7, PT_7 // HTML-Mode
};
long lcl_GetRightMargin( SwDoc& rDoc )
@@ -225,7 +225,7 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
{
if( !( nOutLvlBits & ( 1 << nLevel )) )
{
- //pColl->SetOutlineLevel( nLevel ); //#outline level zhaojianwei
+ //pColl->SetOutlineLevel( nLevel ); //#outline level zhaojianwei
pColl->AssignToListLevelOfOutlineStyle(nLevel);//<-end,zhaojianwei
if( !bHTMLMode )
{
@@ -337,9 +337,9 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
{
return pNewColl;
}
- //if( pNewColl->GetOutlineLevel() < MAXLEVEL ) //#outline level,zhaojianwei
+ //if( pNewColl->GetOutlineLevel() < MAXLEVEL ) //#outline level,zhaojianwei
//nOutLvlBits |= ( 1 << pNewColl->GetOutlineLevel() );
- if( pNewColl->IsAssignedToListLevelOfOutlineStyle())
+ if( pNewColl->IsAssignedToListLevelOfOutlineStyle())
nOutLvlBits |= ( 1 << pNewColl->GetAssignedOutlineStyleLevel() );//<-end,zhaojianwei
}
@@ -407,21 +407,21 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_TEXT: // Textkoerper
+ case RES_POOLCOLL_TEXT: // Textkoerper
{
SvxULSpaceItem aUL( 0, PT_6, RES_UL_SPACE );
if( get(IDocumentSettingAccess::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE );
aSet.Put( aUL );
}
break;
- case RES_POOLCOLL_TEXT_IDENT: // Textkoerper Einzug
+ case RES_POOLCOLL_TEXT_IDENT: // Textkoerper Einzug
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTxtFirstLineOfst( GetMetricVal( CM_05 ));
aSet.Put( aLR );
}
break;
- case RES_POOLCOLL_TEXT_NEGIDENT: // Textkoerper neg. Einzug
+ case RES_POOLCOLL_TEXT_NEGIDENT: // Textkoerper neg. Einzug
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTxtFirstLineOfst( -(short)GetMetricVal( CM_05 ));
@@ -432,7 +432,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
aSet.Put( aTStops );
}
break;
- case RES_POOLCOLL_TEXT_MOVE: // Textkoerper Einrueckung
+ case RES_POOLCOLL_TEXT_MOVE: // Textkoerper Einrueckung
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTxtLeft( GetMetricVal( CM_05 ));
@@ -440,7 +440,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_CONFRONTATION: // Textkoerper Gegenueberstellung
+ case RES_POOLCOLL_CONFRONTATION: // Textkoerper Gegenueberstellung
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTxtFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
@@ -452,7 +452,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
aSet.Put( aTStops );
}
break;
- case RES_POOLCOLL_MARGINAL: // Textkoerper maginalie
+ case RES_POOLCOLL_MARGINAL: // Textkoerper maginalie
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 4 );
@@ -460,14 +460,14 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_HEADLINE_BASE: // Basis Ueberschrift
+ case RES_POOLCOLL_HEADLINE_BASE: // Basis Ueberschrift
{
static const USHORT aFntInit[] = {
- DEFAULTFONT_LATIN_HEADING, RES_CHRATR_FONT,
+ DEFAULTFONT_LATIN_HEADING, RES_CHRATR_FONT,
RES_CHRATR_LANGUAGE, LANGUAGE_ENGLISH_US,
- DEFAULTFONT_CJK_HEADING, RES_CHRATR_CJK_FONT,
+ DEFAULTFONT_CJK_HEADING, RES_CHRATR_CJK_FONT,
RES_CHRATR_CJK_LANGUAGE, LANGUAGE_ENGLISH_US,
- DEFAULTFONT_CTL_HEADING, RES_CHRATR_CTL_FONT,
+ DEFAULTFONT_CTL_HEADING, RES_CHRATR_CTL_FONT,
RES_CHRATR_CTL_LANGUAGE, LANGUAGE_ARABIC_SAUDI_ARABIA,
0
};
@@ -499,47 +499,47 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_NUMBUL_BASE: // Basis Numerierung/Aufzaehlung
+ case RES_POOLCOLL_NUMBUL_BASE: // Basis Numerierung/Aufzaehlung
break;
- case RES_POOLCOLL_GREETING: // Grussformel
- case RES_POOLCOLL_REGISTER_BASE: // Basis Verzeichnisse
- case RES_POOLCOLL_SIGNATURE: // Unterschrift
- case RES_POOLCOLL_TABLE: // Tabelle-Inhalt
+ case RES_POOLCOLL_GREETING: // Grussformel
+ case RES_POOLCOLL_REGISTER_BASE: // Basis Verzeichnisse
+ case RES_POOLCOLL_SIGNATURE: // Unterschrift
+ case RES_POOLCOLL_TABLE: // Tabelle-Inhalt
{
SwFmtLineNumber aLN; aLN.SetCountLines( FALSE );
aSet.Put( aLN );
}
break;
- case RES_POOLCOLL_HEADLINE1: // Ueberschrift 1
+ case RES_POOLCOLL_HEADLINE1: // Ueberschrift 1
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 0, FALSE );
break;
- case RES_POOLCOLL_HEADLINE2: // Ueberschrift 2
+ case RES_POOLCOLL_HEADLINE2: // Ueberschrift 2
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 1, TRUE );
break;
- case RES_POOLCOLL_HEADLINE3: // Ueberschrift 3
+ case RES_POOLCOLL_HEADLINE3: // Ueberschrift 3
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 2, FALSE );
break;
- case RES_POOLCOLL_HEADLINE4: // Ueberschrift 4
+ case RES_POOLCOLL_HEADLINE4: // Ueberschrift 4
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 3, TRUE );
break;
- case RES_POOLCOLL_HEADLINE5: // Ueberschrift 5
+ case RES_POOLCOLL_HEADLINE5: // Ueberschrift 5
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 4, FALSE );
break;
- case RES_POOLCOLL_HEADLINE6: // Ueberschrift 6
+ case RES_POOLCOLL_HEADLINE6: // Ueberschrift 6
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 5, FALSE );
break;
- case RES_POOLCOLL_HEADLINE7: // Ueberschrift 7
+ case RES_POOLCOLL_HEADLINE7: // Ueberschrift 7
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 6, FALSE );
break;
- case RES_POOLCOLL_HEADLINE8: // Ueberschrift 8
+ case RES_POOLCOLL_HEADLINE8: // Ueberschrift 8
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 7, FALSE );
break;
- case RES_POOLCOLL_HEADLINE9: // Ueberschrift 9
+ case RES_POOLCOLL_HEADLINE9: // Ueberschrift 9
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 8, FALSE );
break;
- case RES_POOLCOLL_HEADLINE10: // Ueberschrift 10
+ case RES_POOLCOLL_HEADLINE10: // Ueberschrift 10
lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 9, FALSE );
break;
@@ -576,7 +576,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_FOOTNOTE: // Fussnote
+ case RES_POOLCOLL_FOOTNOTE: // Fussnote
case RES_POOLCOLL_ENDNOTE:
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
@@ -589,7 +589,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_LABEL: // Beschriftung-Basis
+ case RES_POOLCOLL_LABEL: // Beschriftung-Basis
{
SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetUpper( PT_6 ); aUL.SetLower( PT_6 );
aSet.Put( aUL );
@@ -600,14 +600,14 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_FRAME: // Rahmen Inhalt
- case RES_POOLCOLL_LABEL_ABB: // Beschriftung-Abbildung
- case RES_POOLCOLL_LABEL_TABLE: // Beschriftung-Tabelle
- case RES_POOLCOLL_LABEL_FRAME: // Beschriftung-Rahmen
- case RES_POOLCOLL_LABEL_DRAWING: // Beschriftung-Zeichnung
+ case RES_POOLCOLL_FRAME: // Rahmen Inhalt
+ case RES_POOLCOLL_LABEL_ABB: // Beschriftung-Abbildung
+ case RES_POOLCOLL_LABEL_TABLE: // Beschriftung-Tabelle
+ case RES_POOLCOLL_LABEL_FRAME: // Beschriftung-Rahmen
+ case RES_POOLCOLL_LABEL_DRAWING: // Beschriftung-Zeichnung
break;
- case RES_POOLCOLL_JAKETADRESS: // UmschlagAdresse
+ case RES_POOLCOLL_JAKETADRESS: // UmschlagAdresse
{
SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
aSet.Put( aUL );
@@ -616,7 +616,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_SENDADRESS: // AbsenderAdresse
+ case RES_POOLCOLL_SENDADRESS: // AbsenderAdresse
{
if( get(IDocumentSettingAccess::HTML_MODE) )
SetAllScriptItem( aSet, SvxPostureItem(ITALIC_NORMAL, RES_CHRATR_POSTURE) );
@@ -631,101 +631,101 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
break;
// Benutzer-Verzeichnisse:
- case RES_POOLCOLL_TOX_USERH: // Header
+ case RES_POOLCOLL_TOX_USERH: // Header
lcl_SetRegister( this, aSet, 0, TRUE, FALSE );
{
SwFmtLineNumber aLN; aLN.SetCountLines( FALSE );
aSet.Put( aLN );
}
break;
- case RES_POOLCOLL_TOX_USER1: // 1. Ebene
+ case RES_POOLCOLL_TOX_USER1: // 1. Ebene
lcl_SetRegister( this, aSet, 0, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER2: // 2. Ebene
+ case RES_POOLCOLL_TOX_USER2: // 2. Ebene
lcl_SetRegister( this, aSet, 1, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER3: // 3. Ebene
+ case RES_POOLCOLL_TOX_USER3: // 3. Ebene
lcl_SetRegister( this, aSet, 2, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER4: // 4. Ebene
+ case RES_POOLCOLL_TOX_USER4: // 4. Ebene
lcl_SetRegister( this, aSet, 3, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER5: // 5. Ebene
+ case RES_POOLCOLL_TOX_USER5: // 5. Ebene
lcl_SetRegister( this, aSet, 4, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER6: // 6. Ebene
+ case RES_POOLCOLL_TOX_USER6: // 6. Ebene
lcl_SetRegister( this, aSet, 5, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER7: // 7. Ebene
+ case RES_POOLCOLL_TOX_USER7: // 7. Ebene
lcl_SetRegister( this, aSet, 6, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER8: // 8. Ebene
+ case RES_POOLCOLL_TOX_USER8: // 8. Ebene
lcl_SetRegister( this, aSet, 7, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER9: // 9. Ebene
+ case RES_POOLCOLL_TOX_USER9: // 9. Ebene
lcl_SetRegister( this, aSet, 8, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_USER10: // 10. Ebene
+ case RES_POOLCOLL_TOX_USER10: // 10. Ebene
lcl_SetRegister( this, aSet, 9, FALSE, TRUE );
break;
// Index-Verzeichnisse
- case RES_POOLCOLL_TOX_IDXH: // Header
+ case RES_POOLCOLL_TOX_IDXH: // Header
lcl_SetRegister( this, aSet, 0, TRUE, FALSE );
{
SwFmtLineNumber aLN; aLN.SetCountLines( FALSE );
aSet.Put( aLN );
}
break;
- case RES_POOLCOLL_TOX_IDX1: // 1. Ebene
+ case RES_POOLCOLL_TOX_IDX1: // 1. Ebene
lcl_SetRegister( this, aSet, 0, FALSE, FALSE );
break;
- case RES_POOLCOLL_TOX_IDX2: // 2. Ebene
+ case RES_POOLCOLL_TOX_IDX2: // 2. Ebene
lcl_SetRegister( this, aSet, 1, FALSE, FALSE );
break;
- case RES_POOLCOLL_TOX_IDX3: // 3. Ebene
+ case RES_POOLCOLL_TOX_IDX3: // 3. Ebene
lcl_SetRegister( this, aSet, 2, FALSE, FALSE );
break;
- case RES_POOLCOLL_TOX_IDXBREAK: // Trenner
+ case RES_POOLCOLL_TOX_IDXBREAK: // Trenner
lcl_SetRegister( this, aSet, 0, FALSE, FALSE );
break;
// Inhalts-Verzeichnisse
- case RES_POOLCOLL_TOX_CNTNTH: // Header
+ case RES_POOLCOLL_TOX_CNTNTH: // Header
lcl_SetRegister( this, aSet, 0, TRUE, FALSE );
{
SwFmtLineNumber aLN; aLN.SetCountLines( FALSE );
aSet.Put( aLN );
}
break;
- case RES_POOLCOLL_TOX_CNTNT1: // 1. Ebene
+ case RES_POOLCOLL_TOX_CNTNT1: // 1. Ebene
lcl_SetRegister( this, aSet, 0, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT2: // 2. Ebene
+ case RES_POOLCOLL_TOX_CNTNT2: // 2. Ebene
lcl_SetRegister( this, aSet, 1, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT3: // 3. Ebene
+ case RES_POOLCOLL_TOX_CNTNT3: // 3. Ebene
lcl_SetRegister( this, aSet, 2, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT4: // 4. Ebene
+ case RES_POOLCOLL_TOX_CNTNT4: // 4. Ebene
lcl_SetRegister( this, aSet, 3, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT5: // 5. Ebene
+ case RES_POOLCOLL_TOX_CNTNT5: // 5. Ebene
lcl_SetRegister( this, aSet, 4, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT6: // 6. Ebene
+ case RES_POOLCOLL_TOX_CNTNT6: // 6. Ebene
lcl_SetRegister( this, aSet, 5, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT7: // 7. Ebene
+ case RES_POOLCOLL_TOX_CNTNT7: // 7. Ebene
lcl_SetRegister( this, aSet, 6, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT8: // 8. Ebene
+ case RES_POOLCOLL_TOX_CNTNT8: // 8. Ebene
lcl_SetRegister( this, aSet, 7, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT9: // 9. Ebene
+ case RES_POOLCOLL_TOX_CNTNT9: // 9. Ebene
lcl_SetRegister( this, aSet, 8, FALSE, TRUE );
break;
- case RES_POOLCOLL_TOX_CNTNT10: // 10. Ebene
+ case RES_POOLCOLL_TOX_CNTNT10: // 10. Ebene
lcl_SetRegister( this, aSet, 9, FALSE, TRUE );
break;
@@ -940,7 +940,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
0, SwNumRule::GetBullIndent( 4 ), 0, PT_6 );
break;
- case RES_POOLCOLL_DOC_TITEL: // Doc. Titel
+ case RES_POOLCOLL_DOC_TITEL: // Doc. Titel
{
SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) );
SetAllScriptItem( aSet, SvxFontHeightItem( PT_18, 100, RES_CHRATR_FONTSIZE ) );
@@ -952,7 +952,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
}
break;
- case RES_POOLCOLL_DOC_SUBTITEL: // Doc. UnterTitel
+ case RES_POOLCOLL_DOC_SUBTITEL: // Doc. UnterTitel
{
SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL, RES_CHRATR_POSTURE ));
SetAllScriptItem( aSet, SvxFontHeightItem( PT_14, 100, RES_CHRATR_FONTSIZE ));
@@ -1050,7 +1050,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
{
pNewColl->SetFmtAttr( aSet );
// JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
- // (Bug: 18545)
+ // (Bug: 18545)
// SetModified();
}
}
@@ -1114,7 +1114,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
pWhichRange = aCharFmtSetRange;
// Fehlerfall: unbekanntes Format, aber CharFormat
- // -> returne das erste
+ // -> returne das erste
if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
{
OSL_ENSURE( !this, "ungueltige Id" );
@@ -1132,7 +1132,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
pWhichRange = aFrmFmtSetRange;
// Fehlerfall: unbekanntes Format, aber FrameFormat
- // -> returne das erste
+ // -> returne das erste
if( RES_POOLFRM_BEGIN > nId || nId >= RES_POOLFRM_END )
{
OSL_ENSURE( !this, "ungueltige Id" );
@@ -1184,30 +1184,30 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
if( !bIsModified )
ResetModified();
pNewFmt->SetPoolFmtId( nId );
- pNewFmt->SetAuto( FALSE ); // kein Auto-Format
+ pNewFmt->SetAuto( FALSE ); // kein Auto-Format
}
switch( nId )
{
- case RES_POOLCHR_FOOTNOTE: // Fussnote
- case RES_POOLCHR_PAGENO: // Seiten/Feld
- case RES_POOLCHR_LABEL: // Beschriftung
- case RES_POOLCHR_DROPCAPS: // Initialien
- case RES_POOLCHR_NUM_LEVEL: // Aufzaehlungszeichen
- case RES_POOLCHR_TOXJUMP: // Verzeichnissprung
- case RES_POOLCHR_ENDNOTE: // Endnote
- case RES_POOLCHR_LINENUM: // Zeilennummerierung
+ case RES_POOLCHR_FOOTNOTE: // Fussnote
+ case RES_POOLCHR_PAGENO: // Seiten/Feld
+ case RES_POOLCHR_LABEL: // Beschriftung
+ case RES_POOLCHR_DROPCAPS: // Initialien
+ case RES_POOLCHR_NUM_LEVEL: // Aufzaehlungszeichen
+ case RES_POOLCHR_TOXJUMP: // Verzeichnissprung
+ case RES_POOLCHR_ENDNOTE: // Endnote
+ case RES_POOLCHR_LINENUM: // Zeilennummerierung
break;
- case RES_POOLCHR_ENDNOTE_ANCHOR: // Endnotenanker
- case RES_POOLCHR_FOOTNOTE_ANCHOR: // Fussnotenanker
+ case RES_POOLCHR_ENDNOTE_ANCHOR: // Endnotenanker
+ case RES_POOLCHR_FOOTNOTE_ANCHOR: // Fussnotenanker
{
aSet.Put( SvxEscapementItem( DFLT_ESC_AUTO_SUPER, 58, RES_CHRATR_ESCAPEMENT ) );
}
break;
- case RES_POOLCHR_BUL_LEVEL: // Aufzaehlungszeichen
+ case RES_POOLCHR_BUL_LEVEL: // Aufzaehlungszeichen
{
const Font& rBulletFont = numfunc::GetDefBulletFont();
SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamily(),
@@ -1287,8 +1287,8 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
aSet.Put( SvxCharRotateItem( 900, sal_False, RES_CHRATR_ROTATE ) );
break;
//nichts besonderes
-// case RES_POOLCHR_HTML_DEFINSTANCE:
-// break;
+// case RES_POOLCHR_HTML_DEFINSTANCE:
+// break;
case RES_POOLFRM_FRAME:
@@ -1378,7 +1378,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
{
pNewFmt->SetFmtAttr( aSet );
// JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
- // (Bug: 18545)
+ // (Bug: 18545)
// SetModified();
}
}
@@ -1509,7 +1509,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
switch( nId )
{
- case RES_POOLPAGE_STANDARD: // Standard-Seite
+ case RES_POOLPAGE_STANDARD: // Standard-Seite
{
aSet.Put( aLR );
aSet.Put( aUL );
@@ -1518,8 +1518,8 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
- case RES_POOLPAGE_FIRST: // Erste Seite
- case RES_POOLPAGE_REGISTER: // Verzeichnis
+ case RES_POOLPAGE_FIRST: // Erste Seite
+ case RES_POOLPAGE_REGISTER: // Verzeichnis
{
lcl_GetStdPgSize( this, aSet );
aSet.Put( aLR );
@@ -1533,7 +1533,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
- case RES_POOLPAGE_LEFT: // Linke Seite
+ case RES_POOLPAGE_LEFT: // Linke Seite
{
lcl_GetStdPgSize( this, aSet );
aSet.Put( aLR );
@@ -1543,7 +1543,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
pNewPgDsc->SetUseOn( nsUseOnPage::PD_LEFT );
}
break;
- case RES_POOLPAGE_RIGHT: // Rechte Seite
+ case RES_POOLPAGE_RIGHT: // Rechte Seite
{
lcl_GetStdPgSize( this, aSet );
aSet.Put( aLR );
@@ -1554,7 +1554,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
- case RES_POOLPAGE_JAKET: // Umschlag
+ case RES_POOLPAGE_JAKET: // Umschlag
{
aLR.SetLeft( 0 ); aLR.SetRight( 0 );
aUL.SetUpper( 0 ); aUL.SetLower( 0 );
@@ -1572,7 +1572,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
- case RES_POOLPAGE_HTML: // HTML
+ case RES_POOLPAGE_HTML: // HTML
{
lcl_GetStdPgSize( this, aSet );
aLR.SetRight( GetMetricVal( CM_1 ));
@@ -1599,7 +1599,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
aInf.SetBottomDist( 0 );
pNewPgDsc->SetFtnInfo( aInf );
}
- break;
+ break;
case RES_POOLPAGE_LANDSCAPE:
{
SwPageDesc* pStdPgDsc = this->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
@@ -1627,7 +1627,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
pNewPgDsc->GetLeft().SetFmtAttr( aSet );
pNewPgDsc->GetMaster().SetFmtAttr( aSet );
// JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
- // (Bug: 18545)
+ // (Bug: 18545)
// SetModified();
}
}
@@ -1702,7 +1702,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
+// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
};
#ifdef USE_MEASUREMENT
@@ -1751,9 +1751,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
{
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
- 283, 283, 567, 709, // 0.50, 0.50, 1.00, 1.25
- 850, 1021, 1304, 1474, // 1.50, 1.80, 2.30, 2.60
- 1588, 1758 // 2.80, 3.10
+ 283, 283, 567, 709, // 0.50, 0.50, 1.00, 1.25
+ 850, 1021, 1304, 1474, // 1.50, 1.80, 2.30, 2.60
+ 1588, 1758 // 2.80, 3.10
};
#ifdef USE_MEASUREMENT
@@ -1859,7 +1859,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
+// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
};
#ifdef USE_MEASUREMENT
@@ -1909,9 +1909,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
// [ First, LSpace ]
static const USHORT aAbsSpace0to2[] =
{
- 227, 227, // 0.40, 0.40,
- 369, 624, // 0.65, 1.10,
- 255, 879 // 0.45, 1.55
+ 227, 227, // 0.40, 0.40,
+ 369, 624, // 0.65, 1.10,
+ 255, 879 // 0.45, 1.55
};
#ifdef USE_MEASUREMENT
@@ -2053,7 +2053,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
+// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
#ifdef USE_MEASUREMENT
@@ -2114,7 +2114,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,3 0,6 0,9 1,2 1,5 1,8 2,1 2,4 2,7 3,0
+// cm: 0,3 0,6 0,9 1,2 1,5 1,8 2,1 2,4 2,7 3,0
170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
};
#ifdef USE_MEASUREMENT
@@ -2219,7 +2219,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
+// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
#ifdef USE_MEASUREMENT
@@ -2250,9 +2250,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
{
switch( n )
{
- case 0: aFmt.SetBulletChar( 0x27a2 ); break;
- case 1: aFmt.SetBulletChar( 0xE006 ); break;
- default: aFmt.SetBulletChar( 0xE004 ); break;
+ case 0: aFmt.SetBulletChar( 0x27a2 ); break;
+ case 1: aFmt.SetBulletChar( 0xE006 ); break;
+ default: aFmt.SetBulletChar( 0xE004 ); break;
}
// --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
@@ -2286,7 +2286,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
+// cm: 0,4 0,8 1,2 1,6 2,0 2,4 2,8 3,2 3,6 4,0
227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
};
#ifdef USE_MEASUREMENT
@@ -2353,7 +2353,7 @@ bool SwDoc::IsPoolPageDescUsed( USHORT nId ) const
}
// nicht gefunden oder keine Abhaengigen ?
- if( !bFnd || !pNewPgDsc->GetDepends() ) // ??????
+ if( !bFnd || !pNewPgDsc->GetDepends() ) // ??????
return FALSE;
// dann teste mal, ob es abhaengige ContentNodes im Nodes Array gibt
@@ -2428,7 +2428,7 @@ USHORT SwDoc::SetDocPattern( const String& rPatternName )
return n;
if( nNewPos < aPatternNms.Count() )
- aPatternNms.Remove( nNewPos ); // Platz wieder frei machen
+ aPatternNms.Remove( nNewPos ); // Platz wieder frei machen
String* pNewNm = new String( rPatternName );
aPatternNms.Insert( pNewNm, nNewPos );
@@ -2439,17 +2439,17 @@ USHORT SwDoc::SetDocPattern( const String& rPatternName )
USHORT GetPoolParent( USHORT nId )
{
USHORT nRet = USHRT_MAX;
- if( POOLGRP_NOCOLLID & nId ) // 1 == Formate / 0 == Collections
+ if( POOLGRP_NOCOLLID & nId ) // 1 == Formate / 0 == Collections
{
switch( ( COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID ) & nId )
{
case POOLGRP_CHARFMT:
case POOLGRP_FRAMEFMT:
- nRet = 0; // vom default abgeleitet
+ nRet = 0; // vom default abgeleitet
break;
case POOLGRP_PAGEDESC:
case POOLGRP_NUMRULE:
- break; // es gibt keine Ableitung
+ break; // es gibt keine Ableitung
}
}
else
@@ -2460,19 +2460,19 @@ USHORT GetPoolParent( USHORT nId )
switch( nId )
{
case RES_POOLCOLL_STANDARD:
- nRet = 0; break;
+ nRet = 0; break;
case RES_POOLCOLL_TEXT_IDENT:
case RES_POOLCOLL_TEXT_NEGIDENT:
case RES_POOLCOLL_TEXT_MOVE:
case RES_POOLCOLL_CONFRONTATION:
case RES_POOLCOLL_MARGINAL:
- nRet = RES_POOLCOLL_TEXT; break;
+ nRet = RES_POOLCOLL_TEXT; break;
case RES_POOLCOLL_TEXT:
case RES_POOLCOLL_GREETING:
case RES_POOLCOLL_SIGNATURE:
case RES_POOLCOLL_HEADLINE_BASE:
- nRet = RES_POOLCOLL_STANDARD; break;
+ nRet = RES_POOLCOLL_STANDARD; break;
case RES_POOLCOLL_HEADLINE1:
case RES_POOLCOLL_HEADLINE2:
@@ -2484,7 +2484,7 @@ USHORT GetPoolParent( USHORT nId )
case RES_POOLCOLL_HEADLINE8:
case RES_POOLCOLL_HEADLINE9:
case RES_POOLCOLL_HEADLINE10:
- nRet = RES_POOLCOLL_HEADLINE_BASE; break;
+ nRet = RES_POOLCOLL_HEADLINE_BASE; break;
}
break;
@@ -2492,10 +2492,10 @@ USHORT GetPoolParent( USHORT nId )
switch( nId )
{
case RES_POOLCOLL_NUMBUL_BASE:
- nRet = RES_POOLCOLL_TEXT; break;
+ nRet = RES_POOLCOLL_TEXT; break;
default:
- nRet = RES_POOLCOLL_NUMBUL_BASE; break;
+ nRet = RES_POOLCOLL_NUMBUL_BASE; break;
}
break;
@@ -2503,10 +2503,10 @@ USHORT GetPoolParent( USHORT nId )
switch( nId )
{
case RES_POOLCOLL_FRAME:
- nRet = RES_POOLCOLL_TEXT; break;
+ nRet = RES_POOLCOLL_TEXT; break;
case RES_POOLCOLL_TABLE_HDLN:
- nRet = RES_POOLCOLL_TABLE; break;
+ nRet = RES_POOLCOLL_TABLE; break;
case RES_POOLCOLL_TABLE:
case RES_POOLCOLL_FOOTNOTE:
@@ -2520,13 +2520,13 @@ USHORT GetPoolParent( USHORT nId )
case RES_POOLCOLL_FOOTERL:
case RES_POOLCOLL_FOOTERR:
case RES_POOLCOLL_LABEL:
- nRet = RES_POOLCOLL_STANDARD; break;
+ nRet = RES_POOLCOLL_STANDARD; break;
case RES_POOLCOLL_LABEL_ABB:
case RES_POOLCOLL_LABEL_TABLE:
case RES_POOLCOLL_LABEL_FRAME:
case RES_POOLCOLL_LABEL_DRAWING:
- nRet = RES_POOLCOLL_LABEL; break;
+ nRet = RES_POOLCOLL_LABEL; break;
}
break;
@@ -2534,7 +2534,7 @@ USHORT GetPoolParent( USHORT nId )
switch( nId )
{
case RES_POOLCOLL_REGISTER_BASE:
- nRet = RES_POOLCOLL_STANDARD; break;
+ nRet = RES_POOLCOLL_STANDARD; break;
case RES_POOLCOLL_TOX_USERH:
case RES_POOLCOLL_TOX_CNTNTH:
@@ -2543,10 +2543,10 @@ USHORT GetPoolParent( USHORT nId )
case RES_POOLCOLL_TOX_OBJECTH:
case RES_POOLCOLL_TOX_TABLESH:
case RES_POOLCOLL_TOX_AUTHORITIESH:
- nRet = RES_POOLCOLL_HEADLINE_BASE; break;
+ nRet = RES_POOLCOLL_HEADLINE_BASE; break;
default:
- nRet = RES_POOLCOLL_REGISTER_BASE; break;
+ nRet = RES_POOLCOLL_REGISTER_BASE; break;
}
break;
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 9e432f8402f7..0ddb85800f1e 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
SV_IMPL_PTRARR(SwSortKeys, SwSortKey*)
/*--------------------------------------------------------------------
- Beschreibung: Sortier-Schluessel
+ Beschreibung: Sortier-Schluessel
--------------------------------------------------------------------*/
SwSortKey::SwSortKey() :
eSortOrder( SRT_ASCENDING ),
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index faf2f4e8d79e..4a9ad233cca4 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -2,7 +2,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
@@ -295,7 +295,7 @@ void SwServerObject::SetNoServer()
if(eType == BOOKMARK_SERVER && CNTNT_TYPE.pBkmk)
{
::sw::mark::DdeBookmark* const pDdeBookmark = dynamic_cast< ::sw::mark::DdeBookmark* >(CNTNT_TYPE.pBkmk);
- if(pDdeBookmark)
+ if(pDdeBookmark)
{
CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
pDdeBookmark->SetRefObject(NULL);
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index b430cf2307a3..b43291b58b4d 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index 977245e5cfb4..799ce4e1b911 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.hxx
@@ -2,7 +2,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
@@ -36,6 +36,6 @@ class SfxItemSet;
// --> OD 2008-03-07 #refactorlists#
IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems = 0 );
// <--
-#endif //_SWSTYLEMANAGER_HXX
+#endif //_SWSTYLEMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 97f060da28ef..2c9d86cc43d7 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#define READ_OLDVERS // erstmal noch alte Versionen lesen
+#define READ_OLDVERS // erstmal noch alte Versionen lesen
#include <swtypes.hxx>
#include <doc.hxx>
#include <poolfmt.hxx>
@@ -52,17 +52,17 @@
#include <SwStyleNameMapper.hxx>
// bis SO5PF
-const USHORT AUTOFORMAT_ID_X = 9501;
-const USHORT AUTOFORMAT_ID_358 = 9601;
-const USHORT AUTOFORMAT_DATA_ID_X = 9502;
+const USHORT AUTOFORMAT_ID_X = 9501;
+const USHORT AUTOFORMAT_ID_358 = 9601;
+const USHORT AUTOFORMAT_DATA_ID_X = 9502;
// ab SO5
//! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein
-const USHORT AUTOFORMAT_ID_504 = 9801;
-const USHORT AUTOFORMAT_DATA_ID_504 = 9802;
+const USHORT AUTOFORMAT_ID_504 = 9801;
+const USHORT AUTOFORMAT_DATA_ID_504 = 9802;
-const USHORT AUTOFORMAT_ID_552 = 9901;
-const USHORT AUTOFORMAT_DATA_ID_552 = 9902;
+const USHORT AUTOFORMAT_ID_552 = 9901;
+const USHORT AUTOFORMAT_DATA_ID_552 = 9902;
// --- from 641 on: CJK and CTL font settings
const USHORT AUTOFORMAT_ID_641 = 10001;
@@ -86,9 +86,9 @@ const USHORT AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_300OVRLN;
#ifdef READ_OLDVERS
-const USHORT AUTOFORMAT_OLD_ID = 8201;
-const USHORT AUTOFORMAT_OLD_ID1 = 8301;
-const USHORT AUTOFORMAT_OLD_DATA_ID = 8202;
+const USHORT AUTOFORMAT_OLD_ID = 8201;
+const USHORT AUTOFORMAT_OLD_ID1 = 8301;
+const USHORT AUTOFORMAT_OLD_DATA_ID = 8202;
#endif
@@ -100,7 +100,7 @@ SwBoxAutoFmt* SwTableAutoFmt::pDfltBoxAutoFmt = 0;
SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* )
-// Struct mit Versionsnummern der Items
+// Struct mit Versionsnummern der Items
struct SwAfVersions
{
@@ -192,7 +192,7 @@ void SwAfVersions::Load( SvStream& rStream, USHORT nVer )
rStream >> nNumFmtVersion;
}
-// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
SwBoxAutoFmt::SwBoxAutoFmt()
: aFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) ),
@@ -371,7 +371,7 @@ BOOL SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, USHOR
READ( aBLTR, SvxLineItem, rVersions.nLineVersion)
}
- READ( aBackground, SvxBrushItem , rVersions.nBrushVersion)
+ READ( aBackground, SvxBrushItem , rVersions.nBrushVersion)
pNew = aAdjust.Create(rStream, rVersions.nAdjustVersion );
SetAdjust( *(SvxAdjustItem*)pNew );
@@ -405,7 +405,7 @@ BOOL SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, USHOR
>> eSys >> eLge;
eSysLanguage = (LanguageType) eSys;
eNumFmtLanguage = (LanguageType) eLge;
- if ( eSysLanguage == LANGUAGE_SYSTEM ) // von alten Versionen (Calc)
+ if ( eSysLanguage == LANGUAGE_SYSTEM ) // von alten Versionen (Calc)
eSysLanguage = static_cast<LanguageType>(::GetAppLanguage());
}
@@ -420,26 +420,26 @@ BOOL SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, USHOR
BOOL SwBoxAutoFmt::LoadOld( SvStream& rStream, USHORT aLoadVer[] )
{
SfxPoolItem* pNew;
- READ( aFont, SvxFontItem , 0)
+ READ( aFont, SvxFontItem , 0)
if( rStream.GetStreamCharSet() == aFont.GetCharSet() )
aFont.GetCharSet() = ::gsl_getSystemTextEncoding();
- READ( aHeight, SvxFontHeightItem , 1)
- READ( aWeight, SvxWeightItem , 2)
- READ( aPosture, SvxPostureItem , 3)
- READ( aUnderline, SvxUnderlineItem , 4)
- READ( aCrossedOut, SvxCrossedOutItem , 5)
- READ( aContour, SvxContourItem , 6)
- READ( aShadowed, SvxShadowedItem , 7)
- READ( aColor, SvxColorItem , 8)
+ READ( aHeight, SvxFontHeightItem , 1)
+ READ( aWeight, SvxWeightItem , 2)
+ READ( aPosture, SvxPostureItem , 3)
+ READ( aUnderline, SvxUnderlineItem , 4)
+ READ( aCrossedOut, SvxCrossedOutItem , 5)
+ READ( aContour, SvxContourItem , 6)
+ READ( aShadowed, SvxShadowedItem , 7)
+ READ( aColor, SvxColorItem , 8)
pNew = aAdjust.Create(rStream, aLoadVer[ 9 ] );
SetAdjust( *(SvxAdjustItem*)pNew );
delete pNew;
- READ( aBox, SvxBoxItem , 10)
- READ( aBackground, SvxBrushItem , 11)
+ READ( aBox, SvxBoxItem , 10)
+ READ( aBackground, SvxBrushItem , 11)
return 0 == rStream.GetError();
}
@@ -519,7 +519,7 @@ BOOL SwBoxAutoFmt::SaveVerionNo( SvStream& rStream ) const
rStream << aRotateAngle.GetVersion( SOFFICE_FILEFORMAT_40 );
rStream << aRotateMode.GetVersion( SOFFICE_FILEFORMAT_40 );
- rStream << (USHORT)0; // NumberFormat
+ rStream << (USHORT)0; // NumberFormat
return 0 == rStream.GetError();
}
@@ -556,9 +556,9 @@ SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
delete aBoxAutoFmt[ n ];
SwBoxAutoFmt* pFmt = rNew.aBoxAutoFmt[ n ];
- if( pFmt ) // ist gesetzt -> kopieren
+ if( pFmt ) // ist gesetzt -> kopieren
aBoxAutoFmt[ n ] = new SwBoxAutoFmt( *pFmt );
- else // sonst default
+ else // sonst default
aBoxAutoFmt[ n ] = 0;
}
@@ -589,9 +589,9 @@ void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos )
OSL_ENSURE( nPos < 16, "falscher Bereich" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
- if( pFmt ) // ist gesetzt -> kopieren
+ if( pFmt ) // ist gesetzt -> kopieren
*aBoxAutoFmt[ nPos ] = rNew;
- else // sonst neu setzen
+ else // sonst neu setzen
aBoxAutoFmt[ nPos ] = new SwBoxAutoFmt( rNew );
}
@@ -601,9 +601,9 @@ const SwBoxAutoFmt& SwTableAutoFmt::GetBoxFmt( BYTE nPos ) const
OSL_ENSURE( nPos < 16, "falscher Bereich" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
- if( pFmt ) // ist gesetzt -> kopieren
+ if( pFmt ) // ist gesetzt -> kopieren
return *pFmt;
- else // sonst den default returnen
+ else // sonst den default returnen
{
// falls noch nicht vorhanden:
if( !pDfltBoxAutoFmt )
@@ -622,7 +622,7 @@ SwBoxAutoFmt& SwTableAutoFmt::UpdateFromSet( BYTE nPos,
OSL_ENSURE( nPos < 16, "falscher Bereich" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
- if( !pFmt ) // ist gesetzt -> kopieren
+ if( !pFmt ) // ist gesetzt -> kopieren
{
pFmt = new SwBoxAutoFmt;
aBoxAutoFmt[ nPos ] = pFmt;
@@ -769,8 +769,8 @@ void SwTableAutoFmt::UpdateToSet( BYTE nPos, SfxItemSet& rSet,
BOOL SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
{
- BOOL bRet = TRUE;
- USHORT nVal = 0;
+ BOOL bRet = TRUE;
+ USHORT nVal = 0;
rStream >> nVal;
bRet = 0 == rStream.GetError();
@@ -822,8 +822,8 @@ BOOL SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
BOOL SwTableAutoFmt::LoadOld( SvStream& rStream, USHORT aLoadVer[] )
{
- BOOL bRet = TRUE;
- USHORT nVal = 0;
+ BOOL bRet = TRUE;
+ USHORT nVal = 0;
rStream >> nVal;
bRet = 0 == rStream.GetError();
@@ -875,7 +875,7 @@ BOOL SwTableAutoFmt::Save( SvStream& rStream ) const
for( int i = 0; bRet && i < 16; ++i )
{
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ i ];
- if( !pFmt ) // nicht gesetzt -> default schreiben
+ if( !pFmt ) // nicht gesetzt -> default schreiben
{
// falls noch nicht vorhanden:
if( !pDfltBoxAutoFmt )
@@ -993,8 +993,8 @@ BOOL SwTableAutoFmtTbl::Load( SvStream& rStream )
BYTE nChrSet, nCnt;
long nPos = rStream.Tell();
rStream >> nCnt >> nChrSet;
-// if( 4 <= nCnt )
-// rStream >> nFileVers;
+// if( 4 <= nCnt )
+// rStream >> nFileVers;
if( rStream.Tell() != ULONG(nPos + nCnt) )
{
OSL_ENSURE( !this, "Der Header enthaelt mehr/neuere Daten" );
@@ -1007,7 +1007,7 @@ BOOL SwTableAutoFmtTbl::Load( SvStream& rStream )
if( nVal == AUTOFORMAT_ID_358 || nVal == AUTOFORMAT_ID_X ||
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
- aVersions.Load( rStream, nVal ); // Item-Versionen
+ aVersions.Load( rStream, nVal ); // Item-Versionen
SwTableAutoFmt* pNew;
USHORT nAnz = 0;
@@ -1077,11 +1077,11 @@ BOOL SwTableAutoFmtTbl::Save( SvStream& rStream ) const
// Achtung hier muss ein allgemeiner Header gespeichert werden
USHORT nVal = AUTOFORMAT_ID;
rStream << nVal
- << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem
+ << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem
<< (BYTE)GetStoreCharSet( ::gsl_getSystemTextEncoding() );
-// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem
-// << (BYTE)::GetSystemCharSet()
-// << (UNIT16)SOFFICE_FILEFORMAT_NOW;
+// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem
+// << (BYTE)::GetSystemCharSet()
+// << (UNIT16)SOFFICE_FILEFORMAT_NOW;
bRet = 0 == rStream.GetError();
//-----------------------------------------------------------
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 4f05900233d4..b6d976fe6080 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -2,7 +2,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
@@ -528,12 +528,12 @@ namespace
// ---------------------------------------------------------------
// kopiere die Tabelle in diese.
-// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
-// wird dabei geloescht.
-// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
-// Box einer "GrundLine".
-// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
-// einer "GrundLine"
+// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
+// wird dabei geloescht.
+// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
+// Box einer "GrundLine".
+// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
+// einer "GrundLine"
void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
@@ -646,7 +646,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
RES_POOLCOLL_TABLE == nPoolId
? RES_POOLCOLL_TABLE_HDLN
: RES_POOLCOLL_TABLE ) );
- if( pColl ) // Vorlage umsetzen
+ if( pColl ) // Vorlage umsetzen
{
SwPaM aPam( aSavePos );
aPam.SetMark();
@@ -751,16 +751,16 @@ BOOL SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
}
// kopiere die Tabelle in diese.
-// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
-// wird dabei geloescht.
-// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
-// Box einer "GrundLine".
-// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
-// einer "GrundLine"
+// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
+// wird dabei geloescht.
+// Ist keine mehr vorhanden, kommt der restliche Inhalt in die letzte
+// Box einer "GrundLine".
+// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
+// einer "GrundLine"
BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
SwUndoTblCpyTbl* pUndo )
{
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
SwDoc* pDoc = GetFrmFmt()->GetDoc();
@@ -804,11 +804,11 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
lcl_CpyBox( rCpyTbl, pCpyBox, *this, pMyBox, bDelCntnt, pUndo );
if( 0 == (pTmp = pCpyBox->FindNextBox( rCpyTbl, pCpyBox, FALSE )))
- break; // es folgt keine weitere Box mehr
+ break; // es folgt keine weitere Box mehr
pCpyBox = pTmp;
if( 0 == ( pTmp = pMyBox->FindNextBox( *this, pMyBox, FALSE )))
- bDelCntnt = FALSE; // kein Platz mehr ??
+ bDelCntnt = FALSE; // kein Platz mehr ??
else
pMyBox = (SwTableBox*)pTmp;
@@ -821,7 +821,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
USHORT nPos = GetTabLines().C40_GETPOS( SwTableLine, pNxtLine );
// gibt es eine naechste ??
if( nPos + 1 >= GetTabLines().Count() )
- bDelCntnt = FALSE; // es gibt keine, alles in die letzte Box
+ bDelCntnt = FALSE; // es gibt keine, alles in die letzte Box
else
{
// suche die naechste "Inhaltstragende Box"
@@ -833,7 +833,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
}
}
- aFndBox.MakeFrms( pTblNd->GetTable() ); // erzeuge die Frames neu
+ aFndBox.MakeFrms( pTblNd->GetTable() ); // erzeuge die Frames neu
return TRUE;
}
@@ -842,7 +842,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
{
OSL_ENSURE( rSelBoxes.Count(), "Missing selection" );
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
if( IsNewModel() || rCpyTbl.IsNewModel() )
return InsNewTable( rCpyTbl, rSelBoxes, pUndo );
@@ -866,7 +866,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
}
// JP 06.09.96: Sonderfall - eine Box in der Tabelle -> in alle
- // selektierten Boxen kopieren!
+ // selektierten Boxen kopieren!
if( 1 != rCpyTbl.GetTabSortBoxes().Count() )
{
SwTableLine* pSttLine = pSttBox->GetUpper();
@@ -935,12 +935,12 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
return FALSE;
}
- nTstLns = rCpyTbl.GetTabLines().Count(); // soviele Kopieren
+ nTstLns = rCpyTbl.GetTabLines().Count(); // soviele Kopieren
}
else if( 0 == (nFndCnt % rCpyTbl.GetTabLines().Count()) )
nTstLns = nFndCnt;
else
- return FALSE; // kein Platz fuer die Zeilen
+ return FALSE; // kein Platz fuer die Zeilen
for( nLn = 0; nLn < nTstLns; ++nLn )
{
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 1779aca328d2..2f302b034283 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2,7 +2,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
@@ -89,13 +89,13 @@ SV_IMPL_PTRARR( _SwShareBoxFmts, SwShareBoxFmt* )
struct _CpyTabFrm
{
union {
- SwTableBoxFmt *pFrmFmt; // fuer CopyCol
- SwTwips nSize; // fuer DelCol
+ SwTableBoxFmt *pFrmFmt; // fuer CopyCol
+ SwTwips nSize; // fuer DelCol
} Value;
SwTableBoxFmt *pNewFrmFmt;
_CpyTabFrm( SwTableBoxFmt* pAktFrmFmt ) : pNewFrmFmt( 0 )
- { Value.pFrmFmt = pAktFrmFmt; }
+ { Value.pFrmFmt = pAktFrmFmt; }
_CpyTabFrm& operator=( const _CpyTabFrm& );
@@ -195,11 +195,11 @@ typedef BOOL (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, BOOL
void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
-#define CHECKBOXWIDTH \
- { \
- SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth(); \
- for( USHORT nTmp = 0; nTmp < aLines.Count(); ++nTmp ) \
- ::_CheckBoxWidth( *aLines[ nTmp ], nSize ); \
+#define CHECKBOXWIDTH \
+ { \
+ SwTwips nSize = GetFrmFmt()->GetFrmSize().GetWidth(); \
+ for( USHORT nTmp = 0; nTmp < aLines.Count(); ++nTmp ) \
+ ::_CheckBoxWidth( *aLines[ nTmp ], nSize ); \
}
#define CHECKTABLELAYOUT \
@@ -297,7 +297,7 @@ struct _CpyPara
_CpyTabFrms& rTabFrmArr;
SwTableLine* pInsLine;
SwTableBox* pInsBox;
- ULONG nOldSize, nNewSize; // zum Korrigieren der Size-Attribute
+ ULONG nOldSize, nNewSize; // zum Korrigieren der Size-Attribute
ULONG nMinLeft, nMaxRight;
USHORT nCpyCnt, nInsPos;
USHORT nLnIdx, nBoxIdx;
@@ -393,7 +393,7 @@ BOOL lcl_CopyCol( const _FndBox*& rpFndBox, void* pPara )
else
{
aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ];
-// aFindFrm.pNewFrmFmt->Add( pBox );
+// aFindFrm.pNewFrmFmt->Add( pBox );
pBox->ChgFrmFmt( (SwTableBoxFmt*)aFindFrm.pNewFrmFmt );
}
}
@@ -489,7 +489,7 @@ void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, USHORT nCpyCnt,
BOOL bBehind )
{
// Bug 29124: nicht nur in den Grundlines kopieren. Wenns geht, so weit
- // runter wie moeglich.
+ // runter wie moeglich.
_FndBox* pFBox;
if( 1 == pFndLn->GetBoxes().Count() &&
!( pFBox = pFndLn->GetBoxes()[ 0 ] )->GetBox()->GetSttNd() )
@@ -549,7 +549,7 @@ BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt, BOO
if( !aFndBox.GetLines().Count() )
return FALSE;
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
//Lines fuer das Layout-Update herausuchen.
aFndBox.SetTableLines( *this );
@@ -600,7 +600,7 @@ BOOL SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
if( !aFndBox.GetLines().Count() )
return FALSE;
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
_FndBox* pFndBox = &aFndBox;
{
@@ -728,7 +728,7 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt )
{
const SwTableLine* pLLine = GetTabLines()[ GetTabLines().Count()-1 ];
- const SwSelBoxes* pBxs = 0; // Dummy !!!
+ const SwSelBoxes* pBxs = 0; // Dummy !!!
_FndPara aPara( *pBxs, &aFndBox );
_FndBoxAppendRowLine( pLLine, &aPara );
@@ -736,7 +736,7 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt )
if( !aFndBox.GetLines().Count() )
return FALSE;
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
//Lines fuer das Layout-Update herausuchen.
const BOOL bLayout = 0 != SwClientIter( *GetFrmFmt() ).First( TYPE(SwTabFrm) );
@@ -922,10 +922,10 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
::lcl_LastBoxSetWidthLine( pBox->GetTabLines(), nBoxSz,
!bLastBox,
pShareFmts ? *pShareFmts
- : aShareFmts );
+ : aShareFmts );
}
}
- break; // nichts mehr loeschen
+ break; // nichts mehr loeschen
}
// loesche die Line aus Tabelle/Box
if( !pUpperBox )
@@ -935,7 +935,7 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* pUndo,
if( pShareFmts )
pShareFmts->RemoveFormat( *rTbl.GetTabLines()[ nDelPos ]->GetFrmFmt() );
rTbl.GetTabLines().DeleteAndDestroy( nDelPos );
- break; // mehr kann nicht geloescht werden
+ break; // mehr kann nicht geloescht werden
}
// dann loesche auch noch die Line
@@ -1037,11 +1037,11 @@ void lcl_SaveUpperLowerBorder( SwTable& rTbl, const SwTableBox& rBox,
SwTwips nBoxWidth = rBox.GetFrmFmt()->GetFrmSize().GetWidth();
SwTableBox *pPrvBox = 0, *pNxtBox = 0;
- if( nLnPos ) // Vorgaenger?
+ if( nLnPos ) // Vorgaenger?
pPrvBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
nLnPos, FALSE, pAllDelBoxes, pCurPos );
- if( nLnPos + 1 < pTblLns->Count() ) // Nachfolger?
+ if( nLnPos + 1 < pTblLns->Count() ) // Nachfolger?
pNxtBox = ::lcl_FndNxtPrvDelBox( *pTblLns, nBoxStt, nBoxWidth,
nLnPos, TRUE, pAllDelBoxes, pCurPos );
@@ -1092,7 +1092,7 @@ BOOL SwTable::DeleteSel(
return FALSE;
}
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
//Lines fuer das Layout-Update herausuchen.
_FndBox aFndBox( 0, 0 );
@@ -1164,7 +1164,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
// Thus we tell the charts to use their own data provider and forget about this table
pDoc->CreateChartInternalDataProviders( this );
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
// If the rows should get the same (min) height, we first have
// to store the old row heights before deleting the frames
@@ -1208,11 +1208,11 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
SwTableBox* pNewBox = new SwTableBox( pFrmFmt, nCnt, pInsLine );
USHORT nBoxPos = pInsLine->GetTabBoxes().C40_GETPOS( SwTableBox, pSelBox );
- pInsLine->GetTabBoxes().Remove( nBoxPos ); // alte loeschen
+ pInsLine->GetTabBoxes().Remove( nBoxPos ); // alte loeschen
pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pNewBox, nBoxPos );
// Hintergrund- / Rand Attribut loeschen
- SwTableBox* pLastBox = pSelBox; // zum verteilen der TextNodes !!
+ SwTableBox* pLastBox = pSelBox; // zum verteilen der TextNodes !!
// sollte Bereiche in der Box stehen, dann bleibt sie so bestehen
// !! FALLS DAS GEAENDERT WIRD MUSS DAS UNDO ANGEPASST WERDEN !!!
BOOL bMoveNodes = TRUE;
@@ -1244,7 +1244,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
pNewBox->GetTabLines().C40_INSERT( SwTableLine, pNewLine, i );
// dann eine neue Box in der Line
- if( !i ) // haenge die originale Box ein
+ if( !i ) // haenge die originale Box ein
{
pSelBox->SetUpper( pNewLine );
pNewLine->GetTabBoxes().C40_INSERT( SwTableBox, pSelBox, 0 );
@@ -1270,7 +1270,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
{
// TextNodes verschieben
SwNodeRange aRg( *pLastBox->GetSttNd(), +2, *pEndNd );
- pLastBox = pNewLine->GetTabBoxes()[0]; // neu setzen
+ pLastBox = pNewLine->GetTabBoxes()[0]; // neu setzen
SwNodeIndex aInsPos( *pLastBox->GetSttNd(), 1 );
pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, FALSE);
pDoc->GetNodes().Delete( aInsPos, 1 ); // den leeren noch loeschen
@@ -1307,7 +1307,7 @@ BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
// Thus we tell the charts to use their own data provider and forget about this table
pDoc->CreateChartInternalDataProviders( this );
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
SwSelBoxes aSelBoxes;
aSelBoxes.Insert(rBoxes.GetData(), rBoxes.Count());
ExpandSelection( aSelBoxes );
@@ -1368,10 +1368,10 @@ BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
// dann fuege mal an der Position die neuen Boxen ein
for( USHORT i = 1; i < nCnt; ++i )
::_InsTblBox( pDoc, pTblNd, pInsLine, aFindFrm.pNewFrmFmt,
- pSelBox, nBoxPos + i ); // dahinter einfuegen
+ pSelBox, nBoxPos + i ); // dahinter einfuegen
::_InsTblBox( pDoc, pTblNd, pInsLine, pLastBoxFmt,
- pSelBox, nBoxPos + nCnt ); // dahinter einfuegen
+ pSelBox, nBoxPos + nCnt ); // dahinter einfuegen
// Sonderbehandlung fuer die Umrandung:
const SvxBoxItem& aSelBoxItem = aFindFrm.pNewFrmFmt->GetBox();
@@ -1470,7 +1470,7 @@ struct _InsULPara
SwTableNode* pTblNd;
SwTableLine* pInsLine;
SwTableBox* pInsBox;
- BOOL bUL_LR : 1; // Upper-Lower(TRUE) oder Left-Right(FALSE) ?
+ BOOL bUL_LR : 1; // Upper-Lower(TRUE) oder Left-Right(FALSE) ?
BOOL bUL : 1; // Upper-Left(TRUE) oder Lower-Right(FALSE) ?
SwTableBox* pLeftBox;
@@ -1482,16 +1482,16 @@ struct _InsULPara
SwTableLine* pLine=0, SwTableBox* pBox=0 )
: pTblNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
pLeftBox( pLeft ), pRightBox( pRight ), pMergeBox( pMerge )
- { bUL_LR = bUpperLower; bUL = bUpper; }
+ { bUL_LR = bUpperLower; bUL = bUpper; }
void SetLeft( SwTableBox* pBox=0 )
- { bUL_LR = FALSE; bUL = TRUE; if( pBox ) pInsBox = pBox; }
+ { bUL_LR = FALSE; bUL = TRUE; if( pBox ) pInsBox = pBox; }
void SetRight( SwTableBox* pBox=0 )
- { bUL_LR = FALSE; bUL = FALSE; if( pBox ) pInsBox = pBox; }
+ { bUL_LR = FALSE; bUL = FALSE; if( pBox ) pInsBox = pBox; }
void SetUpper( SwTableLine* pLine=0 )
- { bUL_LR = TRUE; bUL = TRUE; if( pLine ) pInsLine = pLine; }
+ { bUL_LR = TRUE; bUL = TRUE; if( pLine ) pInsLine = pLine; }
void SetLower( SwTableLine* pLine=0 )
- { bUL_LR = TRUE; bUL = FALSE; if( pLine ) pInsLine = pLine; }
+ { bUL_LR = TRUE; bUL = FALSE; if( pLine ) pInsLine = pLine; }
};
BOOL lcl_Merge_MoveBox( const _FndBox*& rpFndBox, void* pPara )
@@ -1501,18 +1501,18 @@ BOOL lcl_Merge_MoveBox( const _FndBox*& rpFndBox, void* pPara )
USHORT nStt = 0, nEnd = rpFndBox->GetLines().Count();
USHORT nInsPos = USHRT_MAX;
- if( !pULPara->bUL_LR ) // Left/Right
+ if( !pULPara->bUL_LR ) // Left/Right
{
USHORT nPos;
SwTableBox* pFndBox = (SwTableBox*)rpFndBox->GetBox();
pBoxes = &pFndBox->GetUpper()->GetTabBoxes();
- if( pULPara->bUL ) // Left ?
+ if( pULPara->bUL ) // Left ?
{
// gibt es noch davor Boxen, dann move sie
if( 0 != ( nPos = pBoxes->C40_GETPOS( SwTableBox, pFndBox )) )
lcl_CpyBoxes( 0, nPos, *pBoxes, pULPara->pInsLine );
}
- else // Right
+ else // Right
// gibt es noch dahinter Boxen, dann move sie
if( (nPos = pBoxes->C40_GETPOS( SwTableBox, pFndBox )) +1 < pBoxes->Count() )
{
@@ -1535,7 +1535,7 @@ BOOL lcl_Merge_MoveBox( const _FndBox*& rpFndBox, void* pPara )
if( rpFndBox->GetBox()->GetTabLines().Count() )
{
SwTableBox* pBox = new SwTableBox(
- (SwTableBoxFmt*)rpFndBox->GetBox()->GetFrmFmt(), 0, pULPara->pInsLine );
+ (SwTableBoxFmt*)rpFndBox->GetBox()->GetFrmFmt(), 0, pULPara->pInsLine );
_InsULPara aPara( *pULPara );
aPara.pInsBox = pBox;
((_FndBox*)rpFndBox)->GetLines().ForEach( nStt, nEnd,
@@ -1545,7 +1545,7 @@ BOOL lcl_Merge_MoveBox( const _FndBox*& rpFndBox, void* pPara )
if( USHRT_MAX == nInsPos )
nInsPos = pBoxes->Count();
pBoxes->C40_INSERT( SwTableBox, pBox, nInsPos );
- lcl_CalcWidth( pBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pBox ); // bereche die Breite der Box
}
else
delete pBox;
@@ -1560,7 +1560,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
USHORT nStt = 0, nEnd = rpFndLine->GetBoxes().Count();
USHORT nInsPos = USHRT_MAX;
- if( pULPara->bUL_LR ) // UpperLower ?
+ if( pULPara->bUL_LR ) // UpperLower ?
{
USHORT nPos;
SwTableLine* pFndLn = (SwTableLine*)rpFndLine->GetLine();
@@ -1574,11 +1574,11 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
USHORT nLeft = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pLBx );
USHORT nRight = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pRBx );
-// if( ( nLeft && nRight+1 < pFndLn->GetTabBoxes().Count() ) ||
-// ( !nLeft && nRight+1 >= pFndLn->GetTabBoxes().Count() ) )
+// if( ( nLeft && nRight+1 < pFndLn->GetTabBoxes().Count() ) ||
+// ( !nLeft && nRight+1 >= pFndLn->GetTabBoxes().Count() ) )
if( !nLeft || nRight == pFndLn->GetTabBoxes().Count() )
{
- if( pULPara->bUL ) // Upper ?
+ if( pULPara->bUL ) // Upper ?
{
// gibt es noch davor Zeilen, dann move sie
if( 0 != ( nPos = pLines->C40_GETPOS( SwTableLine, pFndLn )) )
@@ -1612,7 +1612,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pLMBox, 0 );
- if( pULPara->bUL ) // Upper ?
+ if( pULPara->bUL ) // Upper ?
{
// gibt es noch davor Zeilen, dann move sie
if( 0 != ( nPos = pLines->C40_GETPOS( SwTableLine, pFndLn )) )
@@ -1623,7 +1623,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
if( (nPos = pLines->C40_GETPOS( SwTableLine, pFndLn )) +1 < pLines->Count() )
lcl_CpyLines( nPos+1, pLines->Count(), *pLines,
pLMBox );
- lcl_CalcWidth( pLMBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pLMBox ); // bereche die Breite der Box
}
else if( nRight+1 < pFndLn->GetTabBoxes().Count() )
{
@@ -1684,14 +1684,14 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
lcl_CpyLines( nPos1, nPos2,
pNewLn->GetUpper()->GetTabLines(), pRMBox );
- lcl_CalcWidth( pRMBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pRMBox ); // bereche die Breite der Box
pRMBox = new SwTableBox( (SwTableBoxFmt*)pRMBox->GetFrmFmt(), 0, pNewLn );
pNewLn->GetTabBoxes().C40_INSERT( SwTableBox, pRMBox,
pNewLn->GetTabBoxes().Count() );
}
}
- if( pULPara->bUL ) // Upper ?
+ if( pULPara->bUL ) // Upper ?
{
// gibt es noch davor Zeilen, dann move sie
if( 0 != ( nPos = pLines->C40_GETPOS( SwTableLine, pFndLn )) )
@@ -1702,7 +1702,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
if( (nPos = pLines->C40_GETPOS( SwTableLine, pFndLn )) +1 < pLines->Count() )
lcl_CpyLines( nPos+1, pLines->Count(), *pLines,
pRMBox );
- lcl_CalcWidth( pRMBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pRMBox ); // bereche die Breite der Box
}
else {
OSL_ENSURE( FALSE , "Was denn nun" );
@@ -1719,7 +1719,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
SwTableLine* pNewLine = new SwTableLine(
(SwTableLineFmt*)rpFndLine->GetLine()->GetFrmFmt(), 0, pULPara->pInsBox );
- _InsULPara aPara( *pULPara ); // kopieren
+ _InsULPara aPara( *pULPara ); // kopieren
aPara.pInsLine = pNewLine;
((_FndLine*)rpFndLine)->GetBoxes().ForEach( nStt, nEnd,
&lcl_Merge_MoveBox, &aPara );
@@ -1757,7 +1757,7 @@ BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
// Thus we tell the charts to use their own data provider and forget about this table
pDoc->CreateChartInternalDataProviders( this );
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
if( pUndo )
pUndo->SetSelBoxes( rBoxes );
@@ -1816,7 +1816,7 @@ BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
_DeleteBox( *this, pLeftBox, 0, FALSE, FALSE );
else
{
- lcl_CalcWidth( pLeftBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pLeftBox ); // bereche die Breite der Box
if( pUndo && pLeftBox->GetSttNd() )
pUndo->AddNewBox( pLeftBox->GetSttIdx() );
}
@@ -1824,7 +1824,7 @@ BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
_DeleteBox( *this, pRightBox, 0, FALSE, FALSE );
else
{
- lcl_CalcWidth( pRightBox ); // bereche die Breite der Box
+ lcl_CalcWidth( pRightBox ); // bereche die Breite der Box
if( pUndo && pRightBox->GetSttNd() )
pUndo->AddNewBox( pRightBox->GetSttIdx() );
}
@@ -2038,7 +2038,7 @@ BOOL lcl_CopyBoxToDoc( const _FndBox*& rpFndBox, void* pPara )
rpFndBox->GetLines().Count(), pCpyPara->pInsLine );
pCpyPara->pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pBox, pCpyPara->nInsPos++ );
_CpyPara aPara( *pCpyPara, pBox );
- aPara.nNewSize = nSize; // hole die Groesse
+ aPara.nNewSize = nSize; // hole die Groesse
((_FndBox*)rpFndBox)->GetLines().ForEach( &lcl_CopyLineToDoc, &aPara );
}
else
@@ -2344,7 +2344,7 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
// Mal kurz aufraeumen:
pNewTbl->GCLines();
- pTblNd->MakeFrms( &aIdx ); // erzeuge die Frames neu
+ pTblNd->MakeFrms( &aIdx ); // erzeuge die Frames neu
CHECKTABLELAYOUT
@@ -2355,7 +2355,7 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
const SwTableBox* pSrchBox, BOOL bOvrTblLns ) const
{
- const SwTableLine* pLine = this; // fuer M800
+ const SwTableLine* pLine = this; // fuer M800
SwTableBox* pBox;
USHORT nFndPos;
if( GetTabBoxes().Count() && pSrchBox &&
@@ -2377,12 +2377,12 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
return GetUpper()->GetUpper()->FindNextBox( rTbl, GetUpper(), bOvrTblLns );
pLine = GetUpper()->GetTabLines()[nFndPos+1];
}
- else if( bOvrTblLns ) // ueber die "GrundLines" einer Tabelle ?
+ else if( bOvrTblLns ) // ueber die "GrundLines" einer Tabelle ?
{
// suche in der Tabelle nach der naechsten Line
nFndPos = rTbl.GetTabLines().GetPos( pLine );
if( nFndPos + 1 >= rTbl.GetTabLines().Count() )
- return 0; // es gibt keine weitere Box mehr
+ return 0; // es gibt keine weitere Box mehr
pLine = rTbl.GetTabLines()[ nFndPos+1 ];
}
@@ -2403,7 +2403,7 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
const SwTableBox* pSrchBox, BOOL bOvrTblLns ) const
{
- const SwTableLine* pLine = this; // fuer M800
+ const SwTableLine* pLine = this; // fuer M800
SwTableBox* pBox;
USHORT nFndPos;
if( GetTabBoxes().Count() && pSrchBox &&
@@ -2428,12 +2428,12 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
return GetUpper()->GetUpper()->FindPreviousBox( rTbl, GetUpper(), bOvrTblLns );
pLine = GetUpper()->GetTabLines()[nFndPos-1];
}
- else if( bOvrTblLns ) // ueber die "GrundLines" einer Tabelle ?
+ else if( bOvrTblLns ) // ueber die "GrundLines" einer Tabelle ?
{
// suche in der Tabelle nach der naechsten Line
nFndPos = rTbl.GetTabLines().GetPos( pLine );
if( !nFndPos )
- return 0; // es gibt keine weitere Box mehr
+ return 0; // es gibt keine weitere Box mehr
pLine = rTbl.GetTabLines()[ nFndPos-1 ];
}
@@ -2640,7 +2640,7 @@ BOOL lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
{
rParam.bAnyBoxFnd = TRUE;
SwTwips nDiff;
- if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
+ if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
{
// relativ berechnen
nDiff = nWidth;
@@ -2679,7 +2679,7 @@ BOOL lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
if( !nLowerDiff )
{
- if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
+ if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
{
// relativ berechnen
nLowerDiff = nWidth;
@@ -2806,7 +2806,7 @@ BOOL lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
rParam.aShareFmts.SetSize( *pNewBox, aNew );
// Sonderfall: kein Platz in den anderen Boxen
- // aber in der Zelle
+ // aber in der Zelle
if( rParam.bSplittBox )
{
// die akt. Box auf
@@ -2899,7 +2899,7 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
{
rParam.bAnyBoxFnd = TRUE;
SwTwips nDiff;
- if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
+ if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
{
// relativ berechnen
nDiff = nWidth;
@@ -2926,10 +2926,10 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
pTmpBox = pTmpBox->GetUpper()->GetUpper();
nBoxPos = pTmpBox->GetUpper()->GetTabBoxes().GetPos( pTmpBox );
}
-// if( nBoxPos )
+// if( nBoxPos )
nTmpWidth = pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth();
-// else
-// nTmpWidth = 0;
+// else
+// nTmpWidth = 0;
}
if( nTmpWidth < nDiff || nTmpWidth - nDiff < MINLAY )
@@ -2963,7 +2963,7 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
{
if( !nLowerDiff )
{
- if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
+ if( TBLFIX_CHGPROP == rParam.nMode ) // Tabelle fix, proport.
{
// relativ berechnen
nLowerDiff = nWidth;
@@ -2994,13 +2994,13 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
}
// das Ergebnis des Positions Vergleiches
-// POS_BEFORE, // Box liegt davor
-// POS_BEHIND, // Box liegt dahinter
-// POS_INSIDE, // Box liegt vollstaendig in Start/End
-// POS_OUTSIDE, // Box ueberlappt Start/End vollstaendig
-// POS_EQUAL, // Box und Start/End sind gleich
-// POS_OVERLAP_BEFORE, // Box ueberlappt den Start
-// POS_OVERLAP_BEHIND // Box ueberlappt das Ende
+// POS_BEFORE, // Box liegt davor
+// POS_BEHIND, // Box liegt dahinter
+// POS_INSIDE, // Box liegt vollstaendig in Start/End
+// POS_OUTSIDE, // Box ueberlappt Start/End vollstaendig
+// POS_EQUAL, // Box und Start/End sind gleich
+// POS_OVERLAP_BEFORE, // Box ueberlappt den Start
+// POS_OVERLAP_BEHIND // Box ueberlappt das Ende
SwComparePosition _CheckBoxInRange( USHORT nStt, USHORT nEnd,
USHORT nBoxStt, USHORT nBoxEnd )
{
@@ -3082,12 +3082,12 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
switch( rParam.nMode )
{
- case TBLFIX_CHGABS: // Tabelle feste Breite, den Nachbar andern
+ case TBLFIX_CHGABS: // Tabelle feste Breite, den Nachbar andern
nDiff = rDelWidth + rParam.nLowerDiff;
bSetSize = TRUE;
break;
- case TBLFIX_CHGPROP: // Tabelle feste Breite, alle Nachbarn aendern
+ case TBLFIX_CHGPROP: // Tabelle feste Breite, alle Nachbarn aendern
if( !rParam.nRemainWidth )
{
// dann kurz berechnen:
@@ -3105,7 +3105,7 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam,
bSetSize = TRUE;
break;
- case TBLVAR_CHGABS: // Tabelle variable, alle Nachbarn aendern
+ case TBLVAR_CHGABS: // Tabelle variable, alle Nachbarn aendern
if( COLFUZZY < Abs( rParam.nBoxWidth -
( rDelWidth + rParam.nLowerDiff )))
{
@@ -3239,13 +3239,13 @@ BOOL lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
}
break;
- case POS_OUTSIDE: // Box ueberlappt Start/End vollstaendig
- case POS_INSIDE: // Box liegt vollstaendig in Start/End
- case POS_EQUAL: // Box und Start/End sind gleich
+ case POS_OUTSIDE: // Box ueberlappt Start/End vollstaendig
+ case POS_INSIDE: // Box liegt vollstaendig in Start/End
+ case POS_EQUAL: // Box und Start/End sind gleich
bDelBox = TRUE;
break;
- case POS_OVERLAP_BEFORE: // Box ueberlappt den Start
+ case POS_OVERLAP_BEFORE: // Box ueberlappt den Start
if( nBoxChkStt <= ( nDist + (rParam.bLeft ? - nWidth / 2
: nWidth / 2 )))
{
@@ -3267,7 +3267,7 @@ BOOL lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
}
break;
- case POS_OVERLAP_BEHIND: // Box ueberlappt das Ende
+ case POS_OVERLAP_BEHIND: // Box ueberlappt das Ende
// JP 10.02.99:
// generell loeschen oder wie beim OVERLAP_Before nur die, die
// bis zur Haelfte in die "Loesch-"Box reicht ???
@@ -3370,10 +3370,10 @@ BOOL lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
{
switch( ePosType )
{
- case POS_OVERLAP_BEFORE: // Box ueberlappt den Start
+ case POS_OVERLAP_BEFORE: // Box ueberlappt den Start
if( TBLFIX_CHGPROP == rParam.nMode )
bCorrRel = rParam.bLeft;
- else if( rParam.bLeft ) // TBLFIX_CHGABS
+ else if( rParam.bLeft ) // TBLFIX_CHGABS
{
nLowerDiff = nLowerDiff - nDelWidth;
bCorrLowers = TRUE;
@@ -3381,10 +3381,10 @@ BOOL lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
}
break;
- case POS_OVERLAP_BEHIND: // Box ueberlappt das Ende
+ case POS_OVERLAP_BEHIND: // Box ueberlappt das Ende
if( TBLFIX_CHGPROP == rParam.nMode )
bCorrRel = !rParam.bLeft;
- else if( !rParam.bLeft ) // TBLFIX_CHGABS
+ else if( !rParam.bLeft ) // TBLFIX_CHGABS
{
nLowerDiff = nLowerDiff - nDelWidth;
bCorrLowers = TRUE;
@@ -3543,13 +3543,13 @@ _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
BOOL SwTable::SetColWidth( SwTableBox& rAktBox, USHORT eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo )
{
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
const SwFmtFrmSize& rSz = GetFrmFmt()->GetFrmSize();
const SvxLRSpaceItem& rLR = GetFrmFmt()->GetLRSpace();
- _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen
- SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo
+ _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen
+ SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo
BOOL bBigger,
bRet = FALSE,
bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) ||
@@ -4078,14 +4078,14 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
SwFrmFmt* pFmt = rLine.ClaimFrmFmt();
SwTwips nMyNewH, nMyOldH = pLineFrm->Frm().Height();
- if( !nOldHeight ) // die BaseLine und absolut
+ if( !nOldHeight ) // die BaseLine und absolut
nMyNewH = nMyOldH + nNewHeight;
else
{
// moeglichst genau rechnen
Fraction aTmp( nMyOldH );
aTmp *= Fraction( nNewHeight, nOldHeight );
- aTmp += Fraction( 1, 2 ); // ggfs. aufrunden
+ aTmp += Fraction( 1, 2 ); // ggfs. aufrunden
nMyNewH = aTmp;
}
@@ -4284,8 +4284,8 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
while( pBaseLine->GetUpper() )
pBaseLine = pBaseLine->GetUpper()->GetUpper();
- _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen
- SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo
+ _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen
+ SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo
BOOL bBigger,
bRet = FALSE,
bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) ||
@@ -4312,7 +4312,7 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
case nsTblChgWidthHeightType::WH_CELL_TOP:
case nsTblChgWidthHeightType::WH_CELL_BOTTOM:
if( pLine == pBaseLine )
- break; // dann geht es nicht!
+ break; // dann geht es nicht!
// ist eine verschachtelte Line (Box!)
pLines = &pLine->GetUpper()->GetTabLines();
@@ -4323,7 +4323,7 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
case nsTblChgWidthHeightType::WH_ROW_TOP:
case nsTblChgWidthHeightType::WH_ROW_BOTTOM:
{
- if( bInsDel && !bBigger ) // um wieviel wird es Hoeher?
+ if( bInsDel && !bBigger ) // um wieviel wird es Hoeher?
{
nAbsDiff = GetRowFrm( *pBaseLine )->Frm().Height();
}
@@ -4603,7 +4603,7 @@ void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, const SwFrmFmt& rNew )
// wenn das Format nicht geshared ist, braucht es auch nicht in die
// Liste aufgenommen werden. Denn es gibt keinen 2. der es sucht.
//leider werden auch die CellFrms gefunden
-// if( !rOld.IsLastDepend() )
+// if( !rOld.IsLastDepend() )
{
USHORT nPos;
SwShareBoxFmt* pEntry;
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 6de29cd3d866..387f6568a21d 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx
index ec32c602137f..40c57e5b4cc0 100644
--- a/sw/source/core/docnode/cancellablejob.cxx
+++ b/sw/source/core/docnode/cancellablejob.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index d675159f757b..6c881acb020d 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 2b871af0b6bc..1517b00b08ea 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 31c309519cff..8427d30a583f 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -2,7 +2,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
@@ -292,7 +292,7 @@ BOOL lcl_SrchNew( const _MapTblFrmFmt& rMap, void * pPara )
if( rMap.pOld != *(const SwFrmFmt**)pPara )
return TRUE;
*((const SwFrmFmt**)pPara) = rMap.pNew;
- return FALSE; // abbrechen, Pointer gefunden
+ return FALSE; // abbrechen, Pointer gefunden
}
@@ -323,7 +323,7 @@ BOOL lcl_CopyTblBox( const SwTableBox*& rpBox, void* pPara )
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rpBox->GetFrmFmt();
pCT->rMapArr.ForEach( lcl_SrchNew, &pBoxFmt );
- if( pBoxFmt == rpBox->GetFrmFmt() ) // ein neues anlegen ??
+ if( pBoxFmt == rpBox->GetFrmFmt() ) // ein neues anlegen ??
{
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pBoxFmt->GetItemState( RES_BOXATR_FORMULA, FALSE,
@@ -386,7 +386,7 @@ BOOL lcl_CopyTblLine( const SwTableLine*& rpLine, void* pPara )
_CopyTable* pCT = (_CopyTable*)pPara;
SwTableLineFmt* pLineFmt = (SwTableLineFmt*)rpLine->GetFrmFmt();
pCT->rMapArr.ForEach( lcl_SrchNew, &pLineFmt );
- if( pLineFmt == rpLine->GetFrmFmt() ) // ein neues anlegen ??
+ if( pLineFmt == rpLine->GetFrmFmt() ) // ein neues anlegen ??
{
pLineFmt = pCT->pDoc->MakeTableLineFmt();
pLineFmt->CopyAttrs( *rpLine->GetFrmFmt() );
@@ -453,7 +453,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
SwNodeIndex aInsPos( *pEndNd );
SwTable& rTbl = (SwTable&)pTblNd->GetTable();
- pTblFmt->Add( &rTbl ); // das Frame-Format setzen
+ pTblFmt->Add( &rTbl ); // das Frame-Format setzen
rTbl.SetRowsToRepeat( GetTable().GetRowsToRepeat() );
rTbl.SetTblChgMode( GetTable().GetTblChgMode() );
@@ -477,7 +477,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
}
// dann kopiere erstmal den Inhalt der Tabelle, die Zuordnung der
// Boxen/Lines und das anlegen der Frames erfolgt spaeter
- SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
+ SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
// If there is a table in this table, the table format for the outer table
// does not seem to be used, because the table does not have any contents yet
@@ -570,11 +570,11 @@ BOOL lcl_ChkFlyFly( SwDoc* pDoc, ULONG nSttNd, ULONG nEndNd,
if( pSNd->GetIndex() < nInsNd &&
nInsNd < pSNd->EndOfSectionIndex() )
- return TRUE; // nicht kopieren !!
+ return TRUE; // nicht kopieren !!
if( lcl_ChkFlyFly( pDoc, pSNd->GetIndex(),
pSNd->EndOfSectionIndex(), nInsNd ) )
- return TRUE; // nicht kopieren !!
+ return TRUE; // nicht kopieren !!
}
}
@@ -608,11 +608,11 @@ void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
switch( eCmpPos )
{
case POS_COLLIDE_END:
- case POS_BEFORE: // Pos1 liegt vor Pos2
+ case POS_BEFORE: // Pos1 liegt vor Pos2
break;
case POS_COLLIDE_START:
- case POS_BEHIND: // Pos1 liegt hinter Pos2
+ case POS_BEHIND: // Pos1 liegt hinter Pos2
n = rTbl.Count();
break;
@@ -736,13 +736,13 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
BOOL bDoUndo = pDoc->DoesUndo();
- pDoc->DoUndo( FALSE ); // Auf jedenfall Undo abschalten
+ pDoc->DoUndo( FALSE ); // Auf jedenfall Undo abschalten
// dann kopiere den Bereich im unteren DokumentBereich,
// (mit Start/End-Nodes geklammert) und verschiebe diese
// dann an die gewuenschte Stelle.
SwUndoCpyDoc* pUndo = 0;
- SwPaM aPam( rPos ); // UndoBereich sichern
+ SwPaM aPam( rPos ); // UndoBereich sichern
if( bDoUndo )
{
pDoc->ClearRedo();
@@ -767,10 +767,10 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
pDoc->MoveRange( aPam, rPos, DOC_MOVEDEFAULT );
pNode = aPam.GetCntntNode();
- *aPam.GetPoint() = rPos; // Cursor umsetzen fuers Undo !
- aPam.SetMark(); // auch den Mark umsetzen !!
- aPam.DeleteMark(); // aber keinen Bereich makieren !!
- pDoc->DeleteSection( pNode ); // Bereich wieder loeschen
+ *aPam.GetPoint() = rPos; // Cursor umsetzen fuers Undo !
+ aPam.SetMark(); // auch den Mark umsetzen !!
+ aPam.DeleteMark(); // aber keinen Bereich makieren !!
+ pDoc->DeleteSection( pNode ); // Bereich wieder loeschen
// falls Undo eingeschaltet ist, so speicher den eingefuegten Bereich
pDoc->DoUndo( bDoUndo );
@@ -1002,7 +1002,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
aRg.aEnd = pEnd->nNode;
pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
}
- else if( rPos == *pEnd ) // Wurde das Ende auch verschoben
+ else if( rPos == *pEnd ) // Wurde das Ende auch verschoben
{
pEnd->nNode--;
pEnd->nContent.Assign( pDestTxtNd, nCntntEnd );
@@ -1119,7 +1119,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// korrigiere den Bereich wieder !!
if( bEndEqualIns )
aRg.aEnd--;
- else if( rPos == *pEnd ) // Wurde das Ende auch verschoben
+ else if( rPos == *pEnd ) // Wurde das Ende auch verschoben
{
rPos.nNode-=2;
rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
@@ -1331,8 +1331,8 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndConte
#if OSL_DEBUG_LEVEL > 1
{
//JP 17.06.99: Bug 66973 - check count only if the selection is in
- // the same (or no) section. Becaus not full selected
- // section are not copied.
+ // the same (or no) section. Becaus not full selected
+ // section are not copied.
const SwSectionNode* pSSectNd = rRg.aStart.GetNode().FindSectionNode();
SwNodeIndex aTmpI( rRg.aEnd, -1 );
const SwSectionNode* pESectNd = aTmpI.GetNode().FindSectionNode();
@@ -1391,9 +1391,9 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
const bool bCopyFlyAtFly ) const
{
// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
- // ihrer Ordnungsnummer und kopiere sie erst dann. Damit wird
- // die Ordnungsnummer (wird nur im DrawModel verwaltet)
- // beibehalten.
+ // ihrer Ordnungsnummer und kopiere sie erst dann. Damit wird
+ // die Ordnungsnummer (wird nur im DrawModel verwaltet)
+ // beibehalten.
SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
_ZSortFlys aArr;
USHORT nArrLen = GetSpzFrmFmts()->Count();
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index 4e830f37b66c..3b5e5ecef6c9 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -2,7 +2,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
@@ -31,8 +31,8 @@
-#include "errhdl.hxx" // fuers ASSERT
-#include "error.h" // fuers ASSERT
+#include "errhdl.hxx" // fuers ASSERT
+#include "error.h" // fuers ASSERT
#include "ndindex.hxx"
#if OSL_DEBUG_LEVEL > 1
@@ -70,7 +70,7 @@ SwNodeIndex::SwNodeIndex( SwNodes& rNds, ULONG nIdx )
rNds.RegisterIndex( *this );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
}
@@ -85,7 +85,7 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
pNd->GetNodes().RegisterIndex( *this );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
}
@@ -100,7 +100,7 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
pNd->GetNodes().RegisterIndex( *this );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
}
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index aeb4dcb8e797..001394d43c28 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@
#include <ndgrf.hxx>
#include <ndole.hxx>
#include <ndindex.hxx>
-#include <hints.hxx> // fuer SwFmtChg
+#include <hints.hxx> // fuer SwFmtChg
#include <istyleaccess.hxx>
#include <SwStyleNameMapper.hxx>
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index c7974c05b9a6..cde6cbc5f5c2 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <doc.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-#include <fldbas.hxx> // UpdateFlds der KapitelNummerierung
+#include <fldbas.hxx> // UpdateFlds der KapitelNummerierung
#include <docary.hxx>
_SV_IMPL_SORTAR_ALG( SwOutlineNodes, SwNodePtr )
@@ -46,8 +46,8 @@ BOOL SwOutlineNodes::Seek_Entry( const SwNodePtr rSrch, USHORT* pFndPos ) const
if( nO > 0 )
{
//JP 17.03.98: aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
-// Nodes aus dem falschen NodesArray im OutlineArray standen,
-// jetzt mal einen Check eingebaut.
+// Nodes aus dem falschen NodesArray im OutlineArray standen,
+// jetzt mal einen Check eingebaut.
#if OSL_DEBUG_LEVEL > 1
{
for( USHORT n = 1; n < nO; ++n )
@@ -128,23 +128,23 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
//void SwNodes::UpdateOutlineNode( const SwNode& rNd, BYTE nOldLevel, //#outline level,removed by zhaojianwei
// BYTE nNewLevel )
//{
-// const SwNodePtr pSrch = (SwNodePtr)&rNd;
-// USHORT nSttPos;
-// BOOL bSeekIdx = pOutlineNds->Seek_Entry( pSrch, &nSttPos );
+// const SwNodePtr pSrch = (SwNodePtr)&rNd;
+// USHORT nSttPos;
+// BOOL bSeekIdx = pOutlineNds->Seek_Entry( pSrch, &nSttPos );
//
-// //if( NO_NUMBERING == nOldLevel ) //#outline level,zhaojianwei
-// if( 0 == nOldLevel ) //<-end, zhaojianwei
-// {
-// // nicht vorhanden, also einfuegen
-// / OSL_ENSURE( !bSeekIdx, "Der Node ist schon als OutlineNode vorhanden" );
+// //if( NO_NUMBERING == nOldLevel ) //#outline level,zhaojianwei
+// if( 0 == nOldLevel ) //<-end, zhaojianwei
+// {
+// // nicht vorhanden, also einfuegen
+// / OSL_ENSURE( !bSeekIdx, "Der Node ist schon als OutlineNode vorhanden" );
//
-// //JP 12.03.99: 63293 - Nodes vom RedlineBereich NIE aufnehmen
-// ULONG nNd = rNd.GetIndex();
-// if( nNd < GetEndOfRedlines().GetIndex() &&
+// //JP 12.03.99: 63293 - Nodes vom RedlineBereich NIE aufnehmen
+// ULONG nNd = rNd.GetIndex();
+// if( nNd < GetEndOfRedlines().GetIndex() &&
// nNd > GetEndOfRedlines().StartOfSectionNode()->GetIndex() )
-// return ;
+// return ;
//
-// // jetzt noch alle nachfolgende Outline-Nodes updaten
+// // jetzt noch alle nachfolgende Outline-Nodes updaten
// if (! bSeekIdx)
// {
// // --> OD 2005-11-03 #125329#
@@ -161,33 +161,33 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
// // <--
// }
//
-// }
-// //else if( NO_NUMBERING == nNewLevel ) //#outline level,removed by zhaojianwei
-// else if( 0 == nNewLevel ) //<-end,added by zhaojianwei // Level entfernen
-// {
-// if( !bSeekIdx )
-// return;
+// }
+// //else if( NO_NUMBERING == nNewLevel ) //#outline level,removed by zhaojianwei
+// else if( 0 == nNewLevel ) //<-end,added by zhaojianwei // Level entfernen
+// {
+// if( !bSeekIdx )
+// return;
//
-// // jetzt noch alle nachfolgende Outline-Nodes updaten
-// pOutlineNds->Remove( nSttPos );
-// }
-// else if( !bSeekIdx ) // Update und Index nicht gefunden ??
-// return ;
+// // jetzt noch alle nachfolgende Outline-Nodes updaten
+// pOutlineNds->Remove( nSttPos );
+// }
+// else if( !bSeekIdx ) // Update und Index nicht gefunden ??
+// return ;
//
// {
// SwTxtNode & rTxtNd = (SwTxtNode &) rNd;
// SwPaM aPam(rTxtNd); // #115901#
//
// //if (nNewLevel != NO_NUMBERING) //#outline level,zhaojianwei // #115901#
-// if (nNewLevel != 0) //<-end,zhaojianwei // #115901#
+// if (nNewLevel != 0) //<-end,zhaojianwei // #115901#
// {
-// //rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetOutlineLevel()); //#outline level,zhaojianwei
-// //rTxtNd.NumRuleChgd();
-// if(rTxtNd.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
-// {
-// rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetAssignedOutlineStyleLevel());
-// rTxtNd.NumRuleChgd();
-// }//<-end,zhaojianwei
+// //rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetOutlineLevel()); //#outline level,zhaojianwei
+// //rTxtNd.NumRuleChgd();
+// if(rTxtNd.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
+// {
+// rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetAssignedOutlineStyleLevel());
+// rTxtNd.NumRuleChgd();
+// }//<-end,zhaojianwei
//
// //GetDoc()->SetNumRule(aPam, *GetDoc()->GetOutlineNumRule());
// }
@@ -197,20 +197,20 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
// }
// }
//
-// // die Gliederungs-Felder Updaten
-// GetDoc()->GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
+// // die Gliederungs-Felder Updaten
+// GetDoc()->GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
// GetDoc()->ChkCondColls();
//}//<-end,zhaojianwei
void SwNodes::UpdtOutlineIdx( const SwNode& rNd )
{
- if( !pOutlineNds->Count() ) // keine OutlineNodes vorhanden ?
+ if( !pOutlineNds->Count() ) // keine OutlineNodes vorhanden ?
return;
const SwNodePtr pSrch = (SwNodePtr)&rNd;
USHORT nPos;
pOutlineNds->Seek_Entry( pSrch, &nPos );
- if( nPos == pOutlineNds->Count() ) // keine zum Updaten vorhanden ?
+ if( nPos == pOutlineNds->Count() ) // keine zum Updaten vorhanden ?
return;
if( nPos )
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 25994a475e88..4ce74c6b85b3 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -2,7 +2,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
@@ -219,7 +219,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
while( pPrvNd != aEnd.GetNode().StartOfSectionNode() )
aEnd++;
- --aEnd; // im InsertSection ist Ende inclusive
+ --aEnd; // im InsertSection ist Ende inclusive
pNewSectNode = GetNodes().InsertTextSection(
aStt, *pFmt, rNewData, pTOXBase, & aEnd);
}
@@ -464,7 +464,7 @@ USHORT SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
aIdx++;
} while( aIdx.GetNode().IsEndNode() &&
0 != aIdx.GetNode().FindSectionNode() );
-// if( !aIdx.GetNode().IsEndNode() )
+// if( !aIdx.GetNode().IsEndNode() )
{
nRet = 2;
if( ppSttNd )
@@ -582,8 +582,8 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, BOOL bDelNodes )
nPos = pSectionFmtTbl->GetPos( pFmt );
// ACHTUNG: erst aus dem Array entfernen und dann loeschen.
- // Der Section-DTOR versucht selbst noch sein Format
- // zu loeschen!
+ // Der Section-DTOR versucht selbst noch sein Format
+ // zu loeschen!
pSectionFmtTbl->Remove( nPos );
//FEATURE::CONDCOLL
ULONG nCnt = 0, nSttNd = 0;
@@ -830,7 +830,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
bool const bInsAtStart, bool const bCreateFrms)
{
SwNodeIndex aInsPos( rNdIdx );
- if( !pEnde ) // kein Bereich also neue Section davor/hinter anlegen
+ if( !pEnde ) // kein Bereich also neue Section davor/hinter anlegen
{
// #i26762#
OSL_ENSURE(!pEnde || rNdIdx <= *pEnde,
@@ -904,7 +904,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
if( pCpyTNd->HasSwAttrSet() )
{
// Task 70955 - move PageDesc/Break to the first Node of the
- // section
+ // section
const SfxItemSet& rSet = *pCpyTNd->GetpSwAttrSet();
if( SFX_ITEM_SET == rSet.GetItemState( RES_BREAK ) ||
SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC ))
@@ -955,7 +955,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
SwNode* pNd = (*this)[n];
//JP 30.04.99: Bug 65644 - alle in der NodeSection liegenden
- // Sections unter die neue haengen
+ // Sections unter die neue haengen
if( ULONG_MAX == nSkipIdx )
pNd->pStartOfSection = pSectNd;
else if( n >= nSkipIdx )
@@ -1276,9 +1276,9 @@ void SwSectionNode::DelFrms()
m_pSection->m_Data.SetHiddenFlag(true);
// Bug 30582: falls der Bereich in Fly oder TabellenBox ist, dann
- // kann er nur "gehiddet" werden, wenn weiterer Content
- // vorhanden ist, der "Frames" haelt. Sonst hat der
- // Fly/TblBox-Frame keinen Lower !!!
+ // kann er nur "gehiddet" werden, wenn weiterer Content
+ // vorhanden ist, der "Frames" haelt. Sonst hat der
+ // Fly/TblBox-Frame keinen Lower !!!
{
SwNodeIndex aIdx( *this );
if( !rNds.GoPrevSection( &aIdx, TRUE, FALSE ) ||
@@ -1351,7 +1351,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
pNewSect->SetEditInReadonly( TRUE );
// <--
- SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
+ SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
rNds._Copy( aRg, aInsPos, FALSE );
// loesche alle Frames vom kopierten Bereich, diese werden beim
@@ -1359,7 +1359,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
pSectNd->DelFrms();
// dann kopiere auch noch die Links/Server
- if( pNewSect->IsLinkType() ) // den Link eintragen
+ if( pNewSect->IsLinkType() ) // den Link eintragen
pNewSect->CreateLink( pDoc->GetRootFrm() ? CREATE_CONNECT
: CREATE_NONE );
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4bf6e94be153..6d5912419e2e 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2,7 +2,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
@@ -142,10 +142,10 @@ void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, BYTE nId )
BOOL bTop = FALSE, bBottom = FALSE, bLeft = FALSE, bRight = FALSE;
switch ( nId )
{
- case 0: bTop = bBottom = bLeft = TRUE; break;
- case 1: bTop = bBottom = bLeft = bRight = TRUE; break;
- case 2: bBottom = bLeft = TRUE; break;
- case 3: bBottom = bLeft = bRight = TRUE; break;
+ case 0: bTop = bBottom = bLeft = TRUE; break;
+ case 1: bTop = bBottom = bLeft = bRight = TRUE; break;
+ case 2: bBottom = bLeft = TRUE; break;
+ case 3: bBottom = bLeft = bRight = TRUE; break;
}
const BOOL bHTML = rFmt.getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE);
@@ -314,9 +314,9 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
// Tabelle ohne irgendeinen Inhalt oder am Ende, also vors Ende
nIdxPos = pTblNd->EndOfSectionIndex();
}
- else if( pNxtBox ) // es gibt einen Nachfolger
+ else if( pNxtBox ) // es gibt einen Nachfolger
nIdxPos = pNxtBox->GetSttIdx();
- else // es gibt einen Vorgaenger
+ else // es gibt einen Vorgaenger
nIdxPos = pPrvBox->GetSttNd()->EndOfSectionIndex() + 1;
SwNodeIndex aEndIdx( *this, nIdxPos );
@@ -330,7 +330,7 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
- USHORT nRealInsPos = nInsPos + n;
+ USHORT nRealInsPos = nInsPos + n;
if (nRealInsPos > rTabBoxes.Count())
nRealInsPos = rTabBoxes.Count();
@@ -612,7 +612,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
SwTableNode * pTblNd = new SwTableNode( rNdIdx );
SwEndNode* pEndNd = new SwEndNode( rNdIdx, *pTblNd );
- if( !nLines ) // fuer die FOR-Schleife
+ if( !nLines ) // fuer die FOR-Schleife
++nLines;
SwNodeIndex aIdx( *pEndNd );
@@ -788,7 +788,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
//Orientation am Fmt der Table setzen
pTableFmt->SetFmtAttr( SwFmtHoriOrient( 0, eAdjust ) );
- pTableFmt->Add( pNdTbl ); // das Frame-Format setzen
+ pTableFmt->Add( pNdTbl ); // das Frame-Format setzen
if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) )
{
@@ -902,7 +902,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
{
- SwPaM& rTmp = (SwPaM&)rRange; // Point immer an den Anfang
+ SwPaM& rTmp = (SwPaM&)rRange; // Point immer an den Anfang
rTmp.DeleteMark();
rTmp.GetPoint()->nNode = *pTblNd;
SwCntntNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
@@ -951,9 +951,9 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
cCh = 0x09;
// JP 28.10.96: vom 1. Node die Positionen des Trenners besorgen,
- // damit die Boxen entsprechend eingestellt werden
+ // damit die Boxen entsprechend eingestellt werden
SwTxtFrmInfo aFInfo( (SwTxtFrm*)pTxtNd->GetFrm() );
- if( aFInfo.IsOneLine() ) // nur dann sinnvoll!
+ if( aFInfo.IsOneLine() ) // nur dann sinnvoll!
{
const sal_Unicode* pTxt = pTxtNd->GetTxt().GetBuffer();
for( xub_StrLen nChPos = 0; *pTxt; ++nChPos, ++pTxt )
@@ -983,7 +983,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
{
// das entfernen der PageBreaks erst nach dem erzeugen der Tabelle
// erfolgen, denn sonst stehen sie falsch in der History !!!
-// SwRegHistory aRegH( pTxtNd, *pTxtNd, pHistory );
+// SwRegHistory aRegH( pTxtNd, *pTxtNd, pHistory );
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE, &pItem ) )
{
@@ -1097,7 +1097,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
aPosArr[ n ] - nLastPos ));
for( USHORT nTmpLine = 0; nTmpLine < rLns.Count(); ++nTmpLine )
//JP 24.06.98: hier muss ein Add erfolgen, da das BoxFormat
- // von der rufenden Methode noch gebraucht wird!
+ // von der rufenden Methode noch gebraucht wird!
pNewFmt->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
nLastPos = aPosArr[ n ];
@@ -1269,23 +1269,23 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
{
SwNodeRange * pResult = NULL;
bool bChanged = false;
-
+
SwNodeIndex aNewStart = rRange.aStart;
SwNodeIndex aNewEnd = rRange.aEnd;
-
+
SwNodeIndex aEndIndex = rRange.aEnd;
SwNodeIndex aIndex = rRange.aStart;
-
+
while (aIndex < aEndIndex)
{
SwNode& rNode = aIndex.GetNode();
-
+
if (rNode.IsStartNode())
{
// advance aIndex to the end node of this start node
SwNode * pEndNode = rNode.EndOfSectionNode();
aIndex = *pEndNode;
-
+
if (aIndex > aNewEnd)
{
aNewEnd = aIndex;
@@ -1296,34 +1296,34 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
{
SwNode * pStartNode = rNode.StartOfSectionNode();
SwNodeIndex aStartIndex = *pStartNode;
-
+
if (aStartIndex < aNewStart)
{
aNewStart = aStartIndex;
bChanged = true;
}
}
-
+
if (aIndex < aEndIndex)
- ++aIndex;
+ ++aIndex;
}
-
+
SwNode * pNode = &aIndex.GetNode();
while (pNode->IsEndNode())
{
SwNode * pStartNode = pNode->StartOfSectionNode();
SwNodeIndex aStartIndex(*pStartNode);
- aNewStart = aStartIndex;
+ aNewStart = aStartIndex;
aNewEnd = aIndex;
bChanged = true;
-
+
++aIndex;
pNode = &aIndex.GetNode();
}
-
+
if (bChanged)
pResult = new SwNodeRange(aNewStart, aNewEnd);
-
+
return pResult;
}
@@ -1552,7 +1552,7 @@ BOOL SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
}
// -- benutze die ForEach Methode vom PtrArray um aus einer Tabelle wieder
-// Text zuerzeugen. (Die Boxen koennen auch noch Lines enthalten !!)
+// Text zuerzeugen. (Die Boxen koennen auch noch Lines enthalten !!)
struct _DelTabPara
{
SwTxtNode* pLastNd;
@@ -1576,7 +1576,7 @@ BOOL lcl_DelLine( const SwTableLine*& rpLine, void* pPara )
OSL_ENSURE( pPara, "die Parameter fehlen" );
_DelTabPara aPara( *(_DelTabPara*)pPara );
((SwTableLine*&)rpLine)->GetTabBoxes().ForEach( &lcl_DelBox, &aPara );
- if( rpLine->GetUpper() ) // gibt es noch eine uebergeordnete Box ??
+ if( rpLine->GetUpper() ) // gibt es noch eine uebergeordnete Box ??
// dann gebe den letzten TextNode zurueck
((_DelTabPara*)pPara)->pLastNd = aPara.pLastNd;
return TRUE;
@@ -1639,7 +1639,7 @@ BOOL lcl_DelBox( const SwTableBox*& rpBox, void* pPara )
pDelPara->pLastNd = aDelRg.aEnd.GetNode().GetTxtNode();
//JP 03.04.97: die Ausrichtung der ZahlenFormatierung auf
- // keinen Fall uebernehmen
+ // keinen Fall uebernehmen
if( pDelPara->pLastNd && pDelPara->pLastNd->HasSwAttrSet() )
pDelPara->pLastNd->ResetAttr( RES_PARATR_ADJUST );
}
@@ -1679,7 +1679,7 @@ BOOL SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
SwNodeRange aDelRg( rRange.aStart, rRange.aEnd );
// JP 14.01.97: hat die Tabelle PageDesc-/Break-Attribute? Dann in den
- // ersten TextNode uebernehmen
+ // ersten TextNode uebernehmen
{
// was ist mit UNDO???
const SfxItemSet& rTblSet = pTblNd->pTable->GetFrmFmt()->GetAttrSet();
@@ -1700,7 +1700,7 @@ BOOL SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
}
}
- SectionUp( &aDelRg ); // loesche die Section und damit die Tabelle
+ SectionUp( &aDelRg ); // loesche die Section und damit die Tabelle
// #i28006#
ULONG nStt = aDelRg.aStart.GetIndex(), nEnd = aDelRg.aEnd.GetIndex();
if( !pFrmNd )
@@ -1909,9 +1909,9 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor )
// die Crsr aus dem Loeschbereich entfernen.
// Der Cursor steht danach:
- // - es folgt noch eine Zeile, in dieser
- // - vorher steht noch eine Zeile, in dieser
- // - sonst immer dahinter
+ // - es folgt noch eine Zeile, in dieser
+ // - vorher steht noch eine Zeile, in dieser
+ // - sonst immer dahinter
{
SwTableNode* pTblNd = rCursor.GetNode()->FindTableNode();
@@ -1941,7 +1941,7 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor )
{
_FndBox* pTmp = pFndBox->GetLines()[0]->GetBoxes()[0];
if( pTmp->GetBox()->GetSttNd() )
- break; // das ist sonst zu weit
+ break; // das ist sonst zu weit
pFndBox = pTmp;
}
@@ -1961,7 +1961,7 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor )
pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
pNextBox = pNextBox->FindNextBox( pTblNd->GetTable(), pNextBox );
- if( !pNextBox ) // keine nachfolgende? dann die vorhergehende
+ if( !pNextBox ) // keine nachfolgende? dann die vorhergehende
{
pDelLine = pFndBox->GetLines()[ 0 ]->GetLine();
pDelBox = pDelLine->GetTabBoxes()[ 0 ];
@@ -1975,9 +1975,9 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor )
}
ULONG nIdx;
- if( pNextBox ) // dann den Cursor hier hinein
+ if( pNextBox ) // dann den Cursor hier hinein
nIdx = pNextBox->GetSttIdx() + 1;
- else // ansonsten hinter die Tabelle
+ else // ansonsten hinter die Tabelle
nIdx = pTblNd->EndOfSectionIndex() + 1;
SwNodeIndex aIdx( GetNodes(), nIdx );
@@ -1991,7 +1991,7 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor )
SwPaM* pPam = (SwPaM*)&rCursor;
pPam->GetPoint()->nNode = aIdx;
pPam->GetPoint()->nContent.Assign( pCNd, 0 );
- pPam->SetMark(); // beide wollen etwas davon haben
+ pPam->SetMark(); // beide wollen etwas davon haben
pPam->DeleteMark();
}
}
@@ -2131,10 +2131,10 @@ BOOL SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
if( pNextNd )
{
//JP 24.08.98: will man wirklich den PageDesc/Break vom
-// nachfolgen Absatz ueberbuegeln?
-// const SwAttrSet& rAttrSet = pNextNd->GetSwAttrSet();
-// if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
-// SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
+// nachfolgen Absatz ueberbuegeln?
+// const SwAttrSet& rAttrSet = pNextNd->GetSwAttrSet();
+// if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
+// SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
{
SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
const SfxPoolItem *pItem;
@@ -3187,10 +3187,10 @@ BOOL lcl_BoxSetSplitBoxFmts( const SwTableBox*& rpBox, void* pPara )
else
{
USHORT __FAR_DATA aTableSplitBoxSetRange[] = {
- RES_LR_SPACE, RES_UL_SPACE,
- RES_BACKGROUND, RES_SHADOW,
- RES_PROTECT, RES_PROTECT,
- RES_VERT_ORIENT, RES_VERT_ORIENT,
+ RES_LR_SPACE, RES_UL_SPACE,
+ RES_BACKGROUND, RES_SHADOW,
+ RES_PROTECT, RES_PROTECT,
+ RES_VERT_ORIENT, RES_VERT_ORIENT,
0 };
SfxItemSet aTmpSet( pFmt->GetDoc()->GetAttrPool(),
aTableSplitBoxSetRange );
@@ -3236,7 +3236,7 @@ BOOL SwDoc::SplitTable( const SwPosition& rPos, USHORT eHdlnMode,
return FALSE;
SwTable& rTbl = pTNd->GetTable();
- rTbl.SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ rTbl.SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
SwTableFmlUpdate aMsgHnt( &rTbl );
@@ -3386,7 +3386,7 @@ BOOL lcl_ChgTblSize( SwTable& rTbl )
aTblMaxSz.SetWidth( nMaxLnWidth );
}
pFmt->SetFmtAttr( aTblMaxSz );
- if( !bLocked ) // und gegebenenfalls Lock wieder freigeben
+ if( !bLocked ) // und gegebenenfalls Lock wieder freigeben
pFmt->UnlockModify();
return TRUE;
@@ -3489,7 +3489,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, BOOL bAfter,
USHORT nLinePos = rTbl.GetTabLines().C40_GETPOS( SwTableLine, pLine );
if( USHRT_MAX == nLinePos ||
( bAfter ? ++nLinePos >= rTbl.GetTabLines().Count() : !nLinePos ))
- return 0; // nicht gefunden oder letze Line !!
+ return 0; // nicht gefunden oder letze Line !!
// Suche jetzt die 1. Box der nachfolgenden Line
SwTableLine* pNextLine = rTbl.GetTabLines()[ nLinePos ];
@@ -3573,7 +3573,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, BOOL bAfter,
// TL_CHART2: need to inform chart of probably changed cell names
rTbl.UpdateCharts();
- return pNewTblNd; // das wars
+ return pNewTblNd; // das wars
}
// und die Umkehrung davon. rPos muss in der Tabelle stehen, die bestehen
@@ -3726,7 +3726,7 @@ BOOL SwNodes::MergeTable( const SwNodeIndex& rPos, BOOL bWithPrev,
// jetzt an der 1. eingefuegten Line die bedingten Vorlagen umschubsen
const SwTableLine* pFirstLn = rTbl.GetTabLines()[ nOldSize ];
- if( 1 == nMode ) //
+ if( 1 == nMode ) //
{
// Header-Vorlagen in der Zeile setzen
// und ggfs. in der History speichern fuers Undo!!!
@@ -3780,7 +3780,7 @@ BOOL lcl_SetAFmtBox( const _FndBox*& rpBox, void *pPara )
{
_SetAFmtTabPara* pSetPara = (_SetAFmtTabPara*)pPara;
- if( !rpBox->GetUpper()->GetUpper() ) // Box auf 1. Ebene ?
+ if( !rpBox->GetUpper()->GetUpper() ) // Box auf 1. Ebene ?
{
if( !pSetPara->nCurBox )
pSetPara->nAFmtBox = 0;
@@ -3829,7 +3829,7 @@ BOOL lcl_SetAFmtBox( const _FndBox*& rpBox, void *pPara )
else
((_FndBox*&)rpBox)->GetLines().ForEach( &lcl_SetAFmtLine, pPara );
- if( !rpBox->GetUpper()->GetUpper() ) // eine BaseLine
+ if( !rpBox->GetUpper()->GetUpper() ) // eine BaseLine
++pSetPara->nCurBox;
return TRUE;
}
@@ -3859,7 +3859,7 @@ BOOL SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
1 == pFndBox->GetLines()[0]->GetBoxes().Count() )
pFndBox = pFndBox->GetLines()[0]->GetBoxes()[0];
- if( !pFndBox->GetLines().Count() ) // eine zu weit? (nur 1 sel.Box)
+ if( !pFndBox->GetLines().Count() ) // eine zu weit? (nur 1 sel.Box)
pFndBox = pFndBox->GetUpper()->GetUpper();
@@ -3932,7 +3932,7 @@ BOOL SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
1 == pFndBox->GetLines()[0]->GetBoxes().Count() )
pFndBox = pFndBox->GetLines()[0]->GetBoxes()[0];
- if( !pFndBox->GetLines().Count() ) // eine zu weit? (nur 1 sel.Box)
+ if( !pFndBox->GetLines().Count() ) // eine zu weit? (nur 1 sel.Box)
pFndBox = pFndBox->GetUpper()->GetUpper();
_FndLines& rFLns = pFndBox->GetLines();
@@ -4081,7 +4081,7 @@ BOOL SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, USHORT eType,
{
ClearRedo();
AppendUndo( pUndo );
- DoUndo( TRUE ); // im SetColWidth kann es abgeschaltet werden!
+ DoUndo( TRUE ); // im SetColWidth kann es abgeschaltet werden!
}
if( bRet )
@@ -4097,7 +4097,7 @@ BOOL SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, USHORT eType,
void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, BOOL bCallUpdate )
{
//JP 09.07.97: Optimierung: wenn die Box schon sagt, das es Text
- // sein soll, dann bleibt das auch Text!
+ // sein soll, dann bleibt das auch Text!
const SfxPoolItem* pNumFmtItem = 0;
if( SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT,
FALSE, &pNumFmtItem ) && GetNumberFormatter()->IsTextFormat(
@@ -4161,14 +4161,14 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, BOOL bCallUpdate )
}
// JP 28.04.98: Nur Formel zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
if( !bSetNumFmt && !bIsEmptyTxtNd && pNumFmtItem )
{
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
}
@@ -4208,8 +4208,8 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, BOOL bCallUpdate )
nWhich1 = RES_BOXATR_FORMAT;
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->SetFmtAttr( *GetDfltAttr( nWhich1 ));
}
pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
@@ -4340,8 +4340,8 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
nWhich1 = RES_BOXATR_FORMULA;
else
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
@@ -4435,7 +4435,7 @@ BOOL SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
}
return FALSE;
}
- aPos.nNode -= 1; // auf den EndNode der Tabelle
+ aPos.nNode -= 1; // auf den EndNode der Tabelle
pSrcTblNd = aPos.nNode.GetNode().FindTableNode();
pCpyDoc->SetRefForDocShell( NULL );
@@ -4629,7 +4629,7 @@ BOOL SwDoc::UnProtectTbls( const SwPaM& rPam )
} while( !bFound && &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ) );
if( !bFound )
- continue; // weitersuchen
+ continue; // weitersuchen
}
// dann mal den Schutz aufheben
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 573a29de8b2e..35d0cd133254 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -2,7 +2,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
@@ -158,10 +158,10 @@ BOOL lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
}
/***********************************************************************
-#* Class : SwDoc
-#* Methoden : SetRowHeight(), GetRowHeight()
-#* Datum : MA 17. May. 93
-#* Update : JP 28.04.98
+#* Class : SwDoc
+#* Methoden : SetRowHeight(), GetRowHeight()
+#* Datum : MA 17. May. 93
+#* Update : JP 28.04.98
#***********************************************************************/
//Die Zeilenhoehe wird ausgehend von der Selektion ermittelt/gesetzt.
//Ausgehend von jeder Zelle innerhalb der Selektion werden nach oben alle
@@ -198,7 +198,7 @@ struct LinesAndTable
{
SvPtrarr &rLines;
const SwTable &rTable;
- BOOL bInsertLines;
+ BOOL bInsertLines;
LinesAndTable( SvPtrarr &rL, const SwTable &rTbl ) :
rLines( rL ), rTable( rTbl ), bInsertLines( TRUE ) {}
@@ -387,14 +387,14 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const
/******************************************************************************
- * void SwDoc::SetRowHeight( SwTwips nNew )
+ * void SwDoc::SetRowHeight( SwTwips nNew )
******************************************************************************/
void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
{
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
if( pTblNd )
{
- SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
+ SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
::lcl_CollectLines( aRowArr, rCursor, true );
if( aRowArr.Count() )
@@ -417,7 +417,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew )
/******************************************************************************
- * SwTwips SwDoc::GetRowHeight() const
+ * SwTwips SwDoc::GetRowHeight() const
******************************************************************************/
void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const
{
@@ -426,7 +426,7 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
if( pTblNd )
{
- SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines.
+ SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines.
::lcl_CollectLines( aRowArr, rCursor, true );
if( aRowArr.Count() )
@@ -451,7 +451,7 @@ BOOL SwDoc::BalanceRowHeight( const SwCursor& rCursor, BOOL bTstOnly )
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
if( pTblNd )
{
- SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines.
+ SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines.
::lcl_CollectLines( aRowArr, rCursor, true );
if( 1 < aRowArr.Count() )
@@ -493,14 +493,14 @@ BOOL SwDoc::BalanceRowHeight( const SwCursor& rCursor, BOOL bTstOnly )
}
/******************************************************************************
- * void SwDoc::SetRowBackground()
+ * void SwDoc::SetRowBackground()
******************************************************************************/
void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew )
{
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
if( pTblNd )
{
- SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
+ SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
::lcl_CollectLines( aRowArr, rCursor, true );
if( aRowArr.Count() )
@@ -523,7 +523,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
}
/******************************************************************************
- * SwTwips SwDoc::GetRowBackground() const
+ * SwTwips SwDoc::GetRowBackground() const
******************************************************************************/
BOOL SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const
{
@@ -531,7 +531,7 @@ BOOL SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) c
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
if( pTblNd )
{
- SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
+ SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines.
::lcl_CollectLines( aRowArr, rCursor, true );
if( aRowArr.Count() )
@@ -551,10 +551,10 @@ BOOL SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) c
}
/***********************************************************************
-#* Class : SwDoc
-#* Methoden : SetTabBorders(), GetTabBorders()
-#* Datum : MA 18. May. 93
-#* Update : JP 29.04.98
+#* Class : SwDoc
+#* Methoden : SetTabBorders(), GetTabBorders()
+#* Datum : MA 18. May. 93
+#* Update : JP 29.04.98
#***********************************************************************/
inline void InsertCell( SvPtrarr& rCellArr, SwCellFrm* pCellFrm )
{
@@ -579,7 +579,7 @@ void lcl_CollectCells( SvPtrarr &rArr, const SwRect &rUnion,
//Dafuer sorgen, dass die Zelle auch verlassen wird (Bereiche)
SwLayoutFrm *pTmp = pCell;
do
- { pTmp = pTmp->GetNextLayoutLeaf();
+ { pTmp = pTmp->GetNextLayoutLeaf();
} while ( pCell->IsAnLower( pTmp ) );
pCell = pTmp;
} while( pCell && pTab->IsAnLower( pCell ) );
@@ -622,7 +622,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
bLeftValid = TRUE, bRightValid = TRUE;
// JP 21.07.95: die Flags im BoxInfo-Item entscheiden, wann eine
- // BorderLine gueltig ist!!
+ // BorderLine gueltig ist!!
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, FALSE,
(const SfxPoolItem**)&pSetBoxInfo) )
{
@@ -925,15 +925,15 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if( aUnions.Count() )
{
- SvxBoxItem aSetBox ((const SvxBoxItem &) rSet.Get(RES_BOX ));
+ SvxBoxItem aSetBox ((const SvxBoxItem &) rSet.Get(RES_BOX ));
SvxBoxInfoItem aSetBoxInfo((const SvxBoxInfoItem&) rSet.Get(SID_ATTR_BORDER_INNER));
- BOOL bTopSet = FALSE,
- bBottomSet = FALSE,
- bLeftSet = FALSE,
- bRightSet = FALSE,
- bHoriSet = FALSE,
- bVertSet = FALSE,
+ BOOL bTopSet = FALSE,
+ bBottomSet = FALSE,
+ bLeftSet = FALSE,
+ bRightSet = FALSE,
+ bHoriSet = FALSE,
+ bVertSet = FALSE,
bDistanceSet = FALSE;
aSetBoxInfo.ResetFlags();
@@ -977,7 +977,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
bLeftOver = bTmp;
}
- const SwFrmFmt *pFmt = pCell->GetFmt();
+ const SwFrmFmt *pFmt = pCell->GetFmt();
const SvxBoxItem &rBox = pFmt->GetBox();
//Obere Kante
@@ -986,7 +986,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if (aSetBoxInfo.IsValid(VALID_TOP))
{
if ( !bTopSet )
- { bTopSet = TRUE;
+ { bTopSet = TRUE;
aSetBox.SetLine( rBox.GetTop(), BOX_LINE_TOP );
}
else if ((aSetBox.GetTop() && rBox.GetTop() &&
@@ -1005,7 +1005,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if (aSetBoxInfo.IsValid(VALID_LEFT))
{
if ( !bLeftSet )
- { bLeftSet = TRUE;
+ { bLeftSet = TRUE;
aSetBox.SetLine( rBox.GetLeft(), BOX_LINE_LEFT );
}
else if ((aSetBox.GetLeft() && rBox.GetLeft() &&
@@ -1022,13 +1022,13 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if (aSetBoxInfo.IsValid(VALID_VERT))
{
if ( !bVertSet )
- { bVertSet = TRUE;
+ { bVertSet = TRUE;
aSetBoxInfo.SetLine( rBox.GetLeft(), BOXINFO_LINE_VERT );
}
else if ((aSetBoxInfo.GetVert() && rBox.GetLeft() &&
!(*aSetBoxInfo.GetVert() == *rBox.GetLeft())) ||
((!aSetBoxInfo.GetVert()) ^ (!rBox.GetLeft())))
- { aSetBoxInfo.SetValid( VALID_VERT, FALSE );
+ { aSetBoxInfo.SetValid( VALID_VERT, FALSE );
aSetBoxInfo.SetLine( 0, BOXINFO_LINE_VERT );
}
}
@@ -1038,13 +1038,13 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if ( aSetBoxInfo.IsValid(VALID_RIGHT) && bRightOver )
{
if ( !bRightSet )
- { bRightSet = TRUE;
+ { bRightSet = TRUE;
aSetBox.SetLine( rBox.GetRight(), BOX_LINE_RIGHT );
}
else if ((aSetBox.GetRight() && rBox.GetRight() &&
!(*aSetBox.GetRight() == *rBox.GetRight())) ||
(!aSetBox.GetRight() ^ !rBox.GetRight()))
- { aSetBoxInfo.SetValid( VALID_RIGHT, FALSE );
+ { aSetBoxInfo.SetValid( VALID_RIGHT, FALSE );
aSetBox.SetLine( 0, BOX_LINE_RIGHT );
}
}
@@ -1055,13 +1055,13 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if ( aSetBoxInfo.IsValid(VALID_BOTTOM) )
{
if ( !bBottomSet )
- { bBottomSet = TRUE;
+ { bBottomSet = TRUE;
aSetBox.SetLine( rBox.GetBottom(), BOX_LINE_BOTTOM );
}
else if ((aSetBox.GetBottom() && rBox.GetBottom() &&
!(*aSetBox.GetBottom() == *rBox.GetBottom())) ||
(!aSetBox.GetBottom() ^ !rBox.GetBottom()))
- { aSetBoxInfo.SetValid( VALID_BOTTOM, FALSE );
+ { aSetBoxInfo.SetValid( VALID_BOTTOM, FALSE );
aSetBox.SetLine( 0, BOX_LINE_BOTTOM );
}
}
@@ -1073,7 +1073,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
if (aSetBoxInfo.IsValid(VALID_HORI))
{
if ( !bHoriSet )
- { bHoriSet = TRUE;
+ { bHoriSet = TRUE;
aSetBoxInfo.SetLine( rBox.GetBottom(), BOXINFO_LINE_HORI );
}
else if ((aSetBoxInfo.GetHori() && rBox.GetBottom() &&
@@ -1094,7 +1094,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
BOX_LINE_RIGHT, BOX_LINE_LEFT };
const USHORT* pBrd = aBorders;
- if( !bDistanceSet ) // bei 1. Durchlauf erstmal setzen
+ if( !bDistanceSet ) // bei 1. Durchlauf erstmal setzen
{
bDistanceSet = TRUE;
for( int k = 0; k < 4; ++k, ++pBrd )
@@ -1121,10 +1121,10 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
}
/***********************************************************************
-#* Class : SwDoc
-#* Methoden : SetBoxAttr
-#* Datum : MA 18. Dec. 96
-#* Update : JP 29.04.98
+#* Class : SwDoc
+#* Methoden : SetBoxAttr
+#* Datum : MA 18. Dec. 96
+#* Update : JP 29.04.98
#***********************************************************************/
void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
{
@@ -1171,10 +1171,10 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
}
/***********************************************************************
-#* Class : SwDoc
+#* Class : SwDoc
#* Methoden : GetBoxAttr()
-#* Datum : MA 01. Jun. 93
-#* Update : JP 29.04.98
+#* Datum : MA 01. Jun. 93
+#* Update : JP 29.04.98
#***********************************************************************/
BOOL SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
@@ -1227,10 +1227,10 @@ BOOL SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
}
/***********************************************************************
-#* Class : SwDoc
-#* Methoden : SetBoxAlign, SetBoxAlign
-#* Datum : MA 18. Dec. 96
-#* Update : JP 29.04.98
+#* Class : SwDoc
+#* Methoden : SetBoxAlign, SetBoxAlign
+#* Datum : MA 18. Dec. 96
+#* Update : JP 29.04.98
#***********************************************************************/
void SwDoc::SetBoxAlign( const SwCursor& rCursor, USHORT nAlign )
{
@@ -1264,15 +1264,15 @@ USHORT SwDoc::GetBoxAlign( const SwCursor& rCursor ) const
/***********************************************************************
-#* Class : SwDoc
-#* Methoden : AdjustCellWidth()
-#* Datum : MA 20. Feb. 95
-#* Update : JP 29.04.98
+#* Class : SwDoc
+#* Methoden : AdjustCellWidth()
+#* Datum : MA 20. Feb. 95
+#* Update : JP 29.04.98
#***********************************************************************/
USHORT lcl_CalcCellFit( const SwLayoutFrm *pCell )
{
SwTwips nRet = 0;
- const SwFrm *pFrm = pCell->Lower(); //Die ganze Zelle.
+ const SwFrm *pFrm = pCell->Lower(); //Die ganze Zelle.
SWRECTFN( pCell )
while ( pFrm )
{
@@ -1322,7 +1322,7 @@ void lcl_CalcSubColValues( SvUShorts &rToFill, const SwTabCols &rCols,
for ( USHORT i = 0 ; i <= rCols.Count(); ++i )
{
- long nColLeft = i == 0 ? rCols.GetLeft() : rCols[i-1];
+ long nColLeft = i == 0 ? rCols.GetLeft() : rCols[i-1];
long nColRight = i == rCols.Count() ? rCols.GetRight() : rCols[i];
nColLeft += rCols.GetLeftMin();
nColRight += rCols.GetLeftMin();
@@ -1358,16 +1358,16 @@ void lcl_CalcSubColValues( SvUShorts &rToFill, const SwTabCols &rCols,
*Es wird nicht ueber die Eintrage in den TabCols itereriert, sondern
*quasi ueber die Zwischenraeume, die ja die Zellen beschreiben.
*
- *bWishValues == TRUE: Es werden zur aktuellen Selektion bzw. zur aktuellen
- * Zelle die Wunschwerte aller betroffen Zellen ermittelt.
- * Sind mehrere Zellen in einer Spalte, so wird der
- * groesste Wunschwert als Ergebnis geliefert.
- * Fuer die TabCol-Eintraege, zu denen keine Zellen
- * ermittelt wurden, werden 0-en eingetragen.
+ *bWishValues == TRUE: Es werden zur aktuellen Selektion bzw. zur aktuellen
+ * Zelle die Wunschwerte aller betroffen Zellen ermittelt.
+ * Sind mehrere Zellen in einer Spalte, so wird der
+ * groesste Wunschwert als Ergebnis geliefert.
+ * Fuer die TabCol-Eintraege, zu denen keine Zellen
+ * ermittelt wurden, werden 0-en eingetragen.
*
*bWishValues == FALSE: Die Selektion wird senkrecht ausgedehnt. Zu jeder
- * Spalte in den TabCols, die sich mit der Selektion
- * schneidet wird der Minimalwert ermittelt.
+ * Spalte in den TabCols, die sich mit der Selektion
+ * schneidet wird der Minimalwert ermittelt.
*/
void lcl_CalcColValues( SvUShorts &rToFill, const SwTabCols &rCols,
@@ -1400,7 +1400,7 @@ void lcl_CalcColValues( SvUShorts &rToFill, const SwTabCols &rCols,
for ( USHORT i = 0; i <= rCols.Count(); ++i )
{
USHORT nFit = rToFill[i];
- long nColLeft = i == 0 ? rCols.GetLeft() : rCols[i-1];
+ long nColLeft = i == 0 ? rCols.GetLeft() : rCols[i-1];
long nColRight = i == rCols.Count() ? rCols.GetRight() : rCols[i];
if ( bRTL )
@@ -1416,10 +1416,10 @@ void lcl_CalcColValues( SvUShorts &rToFill, const SwTabCols &rCols,
//Werte auf die Verhaeltnisse der Tabelle (Follows) anpassen.
long nLeftA = nColLeft;
long nRightA = nColRight;
- if ( rCols.GetLeftMin() != USHORT((pTab->Frm().*fnRect->fnGetLeft)()) )
+ if ( rCols.GetLeftMin() != USHORT((pTab->Frm().*fnRect->fnGetLeft)()) )
{
const long nDiff = (pTab->Frm().*fnRect->fnGetLeft)() - rCols.GetLeftMin();
- nLeftA += nDiff;
+ nLeftA += nDiff;
nRightA += nDiff;
}
@@ -1434,7 +1434,7 @@ void lcl_CalcColValues( SvUShorts &rToFill, const SwTabCols &rCols,
nFit = nWish;
}
else
- { const USHORT nMin = MINLAY + USHORT(pCell->Frm().Width() -
+ { const USHORT nMin = MINLAY + USHORT(pCell->Frm().Width() -
pCell->Prt().Width());
if ( !nFit || nMin < nFit )
nFit = nMin;
@@ -1562,7 +1562,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, BOOL bBalance )
if ( !bBalance && nTabRight > aTabCols.GetRightMax() )
{
const long nTmpD = nTabRight - aTabCols.GetRightMax();
- nDiff -= nTmpD;
+ nDiff -= nTmpD;
nTabRight -= nTmpD;
}
for ( USHORT i2 = i; i2 < aTabCols.Count(); ++i2 )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 58e65a0b1df5..37d6e581089d 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -2,7 +2,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
@@ -273,25 +273,25 @@ USHORT ClearItem_BC( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
/*******************************************************************
|*
-|* SwNode::GetSectionLevel
+|* SwNode::GetSectionLevel
|*
-|* Beschreibung
-|* Die Funktion liefert den Sectionlevel an der durch
-|* aIndex bezeichneten Position.
+|* Beschreibung
+|* Die Funktion liefert den Sectionlevel an der durch
+|* aIndex bezeichneten Position.
|*
-|* Die Logik ist wie folgt: ( S -> Start, E -> End, C -> CntntNode)
-|* Level 0 E
-|* 1 S E
-|* 2 SC
+|* Die Logik ist wie folgt: ( S -> Start, E -> End, C -> CntntNode)
+|* Level 0 E
+|* 1 S E
+|* 2 SC
|*
-|* alle EndNodes der GrundSection haben den Level 0
-|* alle StartNodes der GrundSection haben den Level 1
+|* alle EndNodes der GrundSection haben den Level 0
+|* alle StartNodes der GrundSection haben den Level 1
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Aenderung: JP 11.08.93
-|* keine Rekursion mehr !!
+|* Aenderung: JP 11.08.93
+|* keine Rekursion mehr !!
|*
*******************************************************************/
@@ -311,29 +311,29 @@ USHORT SwNode::GetSectionLevel() const
/*******************************************************************
|*
-|* SwNode::SwNode
+|* SwNode::SwNode
|*
-|* Beschreibung
-|* Konstruktor; dieser fuegt einen Node in das Array rNodes
-|* an der Position rWhere ein. Dieser bekommt als
-|* theEndOfSection den EndOfSection-Index des Nodes
-|* unmittelbar vor ihm. Falls er sich an der Position 0
-|* innerhalb des variablen Arrays befindet, wird
-|* theEndOfSection 0 (der neue selbst).
+|* Beschreibung
+|* Konstruktor; dieser fuegt einen Node in das Array rNodes
+|* an der Position rWhere ein. Dieser bekommt als
+|* theEndOfSection den EndOfSection-Index des Nodes
+|* unmittelbar vor ihm. Falls er sich an der Position 0
+|* innerhalb des variablen Arrays befindet, wird
+|* theEndOfSection 0 (der neue selbst).
|*
-|* Parameter
-|* IN
-|* rNodes bezeichnet das variable Array, in das der Node
-|* eingefuegt werden soll
-|* IN
-|* rWhere bezeichnet die Position innerhalb dieses Arrays,
-|* an der der Node eingefuegt werden soll
+|* Parameter
+|* IN
+|* rNodes bezeichnet das variable Array, in das der Node
+|* eingefuegt werden soll
+|* IN
+|* rWhere bezeichnet die Position innerhalb dieses Arrays,
+|* an der der Node eingefuegt werden soll
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
@@ -348,7 +348,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
nAFmtNumLvl = 0;
SwNodes& rNodes = (SwNodes&)rWhere.GetNodes();
- SwNode* pInsNd = this; // der MAC kann this nicht einfuegen !!
+ SwNode* pInsNd = this; // der MAC kann this nicht einfuegen !!
if( rWhere.GetIndex() )
{
SwNode* pNd = rNodes[ rWhere.GetIndex() -1 ];
@@ -356,7 +356,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
if( 0 == ( pStartOfSection = pNd->GetStartNode()) )
{
pStartOfSection = pNd->pStartOfSection;
- if( pNd->GetEndNode() ) // EndNode ? Section ueberspringen!
+ if( pNd->GetEndNode() ) // EndNode ? Section ueberspringen!
{
pNd = pStartOfSection;
pStartOfSection = pNd->pStartOfSection;
@@ -381,7 +381,7 @@ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
bSetNumLSpace = bIgnoreDontExpand = FALSE;
nAFmtNumLvl = 0;
- SwNode* pInsNd = this; // der MAC kann this nicht einfuegen !!
+ SwNode* pInsNd = this; // der MAC kann this nicht einfuegen !!
if( nPos )
{
SwNode* pNd = rNodes[ nPos - 1 ];
@@ -389,7 +389,7 @@ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
if( 0 == ( pStartOfSection = pNd->GetStartNode()) )
{
pStartOfSection = pNd->pStartOfSection;
- if( pNd->GetEndNode() ) // EndNode ? Section ueberspringen!
+ if( pNd->GetEndNode() ) // EndNode ? Section ueberspringen!
{
pNd = pStartOfSection;
pStartOfSection = pNd->pStartOfSection;
@@ -464,7 +464,7 @@ BOOL SwNode::IsInVisibleArea( ViewShell* pSh ) const
if( !pFrm->IsValid() )
do
- { pFrm = pFrm->FindPrev();
+ { pFrm = pFrm->FindPrev();
} while ( pFrm && !pFrm->IsValid() );
if( !pFrm || pSh->VisArea().IsOver( pFrm->Frm() ) )
@@ -484,7 +484,7 @@ BOOL SwNode::IsInProtectSect() const
// befindet sich der Node in irgendetwas geschuetzten ?
// (Bereich/Rahmen/Tabellenzellen/... incl. des Ankers bei
- // Rahmen/Fussnoten/..)
+ // Rahmen/Fussnoten/..)
BOOL SwNode::IsProtect() const
{
const SwNode* pNd = ND_SECTIONNODE == nNodeType ? pStartOfSection : this;
@@ -882,7 +882,7 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( BYTE nLvl ) const
->GetAttrOutlineLevel() - 1 ) //<-end,zhaojianwei
--nPos;
- if( !nPos ) // bei 0 gesondert holen !!
+ if( !nPos ) // bei 0 gesondert holen !!
pRet = rONds[0]->GetTxtNode();
}
}
@@ -935,20 +935,20 @@ BYTE SwNode::HasPrevNextLayNode() const
/*******************************************************************
|*
-|* SwNode::StartOfSection
+|* SwNode::StartOfSection
|*
-|* Beschreibung
-|* Die Funktion liefert die StartOfSection des Nodes.
+|* Beschreibung
+|* Die Funktion liefert die StartOfSection des Nodes.
|*
-|* Parameter
-|* IN
-|* rNodes bezeichnet das variable Array, in dem sich der Node
-|* befindet
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Parameter
+|* IN
+|* rNodes bezeichnet das variable Array, in dem sich der Node
+|* befindet
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
@@ -983,31 +983,31 @@ void SwStartNode::CheckSectionCondColl() const
/*******************************************************************
|*
-|* SwEndNode::SwEndNode
+|* SwEndNode::SwEndNode
|*
-|* Beschreibung
-|* Konstruktor; dieser fuegt einen Node in das Array rNodes
-|* an der Position aWhere ein. Der
-|* theStartOfSection-Pointer wird entsprechend gesetzt,
-|* und der EndOfSection-Pointer des zugehoerigen
-|* Startnodes -- durch rStartOfSection bezeichnet --
-|* wird auf diesen Node gesetzt.
+|* Beschreibung
+|* Konstruktor; dieser fuegt einen Node in das Array rNodes
+|* an der Position aWhere ein. Der
+|* theStartOfSection-Pointer wird entsprechend gesetzt,
+|* und der EndOfSection-Pointer des zugehoerigen
+|* Startnodes -- durch rStartOfSection bezeichnet --
+|* wird auf diesen Node gesetzt.
|*
-|* Parameter
-|* IN
-|* rNodes bezeichnet das variable Array, in das der Node
-|* eingefuegt werden soll
-|* IN
-|* aWhere bezeichnet die Position innerhalb dieses Arrays,
-|* an der der Node eingefuegt werden soll
-|* !!!!!!!!!!!!
-|* Es wird eine Kopie uebergeben!
+|* Parameter
+|* IN
+|* rNodes bezeichnet das variable Array, in das der Node
+|* eingefuegt werden soll
+|* IN
+|* aWhere bezeichnet die Position innerhalb dieses Arrays,
+|* an der der Node eingefuegt werden soll
+|* !!!!!!!!!!!!
+|* Es wird eine Kopie uebergeben!
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
@@ -1035,7 +1035,7 @@ SwEndNode::SwEndNode( SwNodes& rNds, ULONG nPos, SwStartNode& rSttNd )
SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const BYTE nNdType,
SwFmtColl *pColl )
- : SwModify( pColl ), // CrsrsShell, FrameFmt,
+ : SwModify( pColl ), // CrsrsShell, FrameFmt,
SwNode( rWhere, nNdType ),
pCondColl( 0 ),
mbSetModifyAtAttr( false )
@@ -1113,7 +1113,7 @@ void SwCntntNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
{
ChkCondColl();
}
- return ; // nicht an die Basisklasse / Frames weitergeben
+ return ; // nicht an die Basisklasse / Frames weitergeben
//FEATURE::CONDCOLL
case RES_ATTRSET_CHG:
@@ -1209,7 +1209,7 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
//FEATURE::CONDCOLL
// HACK: hier muss die entsprechend der neuen Vorlage die Bedingungen
- // neu ueberprueft werden!
+ // neu ueberprueft werden!
if( TRUE /*pNewColl */ )
{
SetCondFmtColl( 0 );
@@ -1342,7 +1342,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
OSL_ENSURE( &rNode != this,
"Kein Contentnode oder Copy-Node und neuer Node identisch." );
- if( !GetDepends() || &rNode == this ) // gibt es ueberhaupt Frames ??
+ if( !GetDepends() || &rNode == this ) // gibt es ueberhaupt Frames ??
return;
SwFrm *pFrm, *pNew;
@@ -1525,7 +1525,7 @@ BOOL SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
BOOL SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
{
if( !GetpSwAttrSet() ) // lasse von den entsprechenden Nodes die
- NewAttrSet( GetDoc()->GetAttrPool() ); // AttrSets anlegen
+ NewAttrSet( GetDoc()->GetAttrPool() ); // AttrSets anlegen
OSL_ENSURE( GetpSwAttrSet(), "warum wurde kein AttrSet angelegt?" );
@@ -1550,7 +1550,7 @@ BOOL SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
{
SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
return bRet;
@@ -1606,7 +1606,7 @@ BOOL SwCntntNode::SetAttr( const SfxItemSet& rSet )
}
if( !GetpSwAttrSet() ) // lasse von den entsprechenden Nodes die
- NewAttrSet( GetDoc()->GetAttrPool() ); // AttrSets anlegen
+ NewAttrSet( GetDoc()->GetAttrPool() ); // AttrSets anlegen
BOOL bRet = FALSE;
// wenn Modify gelockt ist, werden keine Modifies verschickt
@@ -1626,7 +1626,7 @@ BOOL SwCntntNode::SetAttr( const SfxItemSet& rSet )
// einige Sonderbehandlungen fuer Attribute
SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
return bRet;
@@ -1666,7 +1666,7 @@ BOOL SwCntntNode::ResetAttr( USHORT nWhich1, USHORT nWhich2 )
// sollte kein gueltiger Bereich definiert sein ?
if( !nWhich2 || nWhich2 < nWhich1 )
- nWhich2 = nWhich1; // dann setze auf 1. Id, nur dieses Item
+ nWhich2 = nWhich1; // dann setze auf 1. Id, nur dieses Item
SwAttrSet aOld( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() ),
aNew( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() );
@@ -1676,7 +1676,7 @@ BOOL SwCntntNode::ResetAttr( USHORT nWhich1, USHORT nWhich2 )
{
SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
if( !GetpSwAttrSet()->Count() ) // leer, dann loeschen
mpAttrSet.reset();//DELETEZ( mpAttrSet );
@@ -1717,7 +1717,7 @@ BOOL SwCntntNode::ResetAttr( const SvUShorts& rWhichArr )
{
SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
}
}
if( !GetpSwAttrSet()->Count() ) // leer, dann loeschen
@@ -1756,7 +1756,7 @@ USHORT SwCntntNode::ResetAllAttr()
{
SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
- Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
+ Modify( &aChgOld, &aChgNew ); // alle veraenderten werden verschickt
if( !GetpSwAttrSet()->Count() ) // leer, dann loeschen
mpAttrSet.reset();//DELETEZ( mpAttrSet );
@@ -1917,8 +1917,8 @@ BOOL SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
{
switch( pSttNd->GetNodeType() )
{
- case ND_TABLENODE: nCond = PARA_IN_TABLEBODY; break;
- case ND_SECTIONNODE: nCond = PARA_IN_SECTION; break;
+ case ND_TABLENODE: nCond = PARA_IN_TABLEBODY; break;
+ case ND_SECTIONNODE: nCond = PARA_IN_SECTION; break;
default:
switch( pSttNd->GetStartNodeType() )
@@ -1934,7 +1934,7 @@ BOOL SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
nCond = PARA_IN_TABLEHEAD;
}
break;
- case SwFlyStartNode: nCond = PARA_IN_FRAME; break;
+ case SwFlyStartNode: nCond = PARA_IN_FRAME; break;
case SwFootnoteStartNode:
{
nCond = PARA_IN_FOOTENOTE;
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 6f8f495d213c..3ff7287a3ad0 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <calbck.hxx> // SwClientIter
+#include <calbck.hxx> // SwClientIter
#include <node.hxx>
#include <ndindex.hxx>
#include <swtable.hxx>
@@ -53,8 +53,8 @@ class SwNode2LayImpl
SwClientIter *pIter; // Der eigentliche Iterator
SvPtrarr *pUpperFrms;// Zum Einsammeln der Upper
ULONG nIndex; // Der Index des einzufuegenden Nodes
- BOOL bMaster : 1; // TRUE => nur Master , FALSE => nur Frames ohne Follow
- BOOL bInit : 1; // Ist am SwClient bereits ein First()-Aufruf erfolgt?
+ BOOL bMaster : 1; // TRUE => nur Master , FALSE => nur Frames ohne Follow
+ BOOL bInit : 1; // Ist am SwClient bereits ein First()-Aufruf erfolgt?
public:
SwNode2LayImpl( const SwNode& rNode, ULONG nIdx, BOOL bSearch );
~SwNode2LayImpl() { delete pIter; delete pUpperFrms; }
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 2342d3283ac6..e47a094dd990 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2,7 +2,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
@@ -70,11 +70,11 @@ USHORT HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange );
//-----------------------------------------------------------------------
/*******************************************************************
-|* SwNodes::SwNodes
+|* SwNodes::SwNodes
|*
-|* Beschreibung
-|* Konstruktor; legt die vier Grundsektions (PostIts,
-|* Inserts, Icons, Inhalt) an
+|* Beschreibung
+|* Konstruktor; legt die vier Grundsektions (PostIts,
+|* Inserts, Icons, Inhalt) an
*******************************************************************/
SwNodes::SwNodes( SwDoc* pDocument )
: pRoot( 0 ), pMyDoc( pDocument )
@@ -107,19 +107,19 @@ SwNodes::SwNodes( SwDoc* pDocument )
/*******************************************************************
|*
-|* SwNodes::~SwNodes
+|* SwNodes::~SwNodes
|*
-|* Beschreibung
-|* dtor, loescht alle Nodes, deren Pointer in diesem dynamischen
-|* Array sind. Ist kein Problem, da Nodes ausserhalb dieses
-|* Arrays nicht erzeugt werden koennen und somit auch nicht
-|* in mehreren drin sein koennen
+|* Beschreibung
+|* dtor, loescht alle Nodes, deren Pointer in diesem dynamischen
+|* Array sind. Ist kein Problem, da Nodes ausserhalb dieses
+|* Arrays nicht erzeugt werden koennen und somit auch nicht
+|* in mehreren drin sein koennen
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
@@ -153,7 +153,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
const SwNode* pPrevInsNd = rNds[ rInsPos.GetIndex() -1 ];
//JP 03.02.99: alle Felder als invalide erklaeren, aktu. erfolgt im
- // Idle-Handler des Docs
+ // Idle-Handler des Docs
if( GetDoc()->SetFieldsDirty( TRUE, &rDelPos.GetNode(), nSz ) &&
rNds.GetDoc() != GetDoc() )
rNds.GetDoc()->SetFieldsDirty( true, NULL, 0 );
@@ -164,7 +164,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
rNds.GetEndOfRedlines().StartOfSectionNode()->GetIndex() < nNd &&
nNd < rNds.GetEndOfRedlines().GetIndex() );
- if( &rNds == this ) // im gleichen Nodes-Array -> moven !!
+ if( &rNds == this ) // im gleichen Nodes-Array -> moven !!
{
// wird von vorne nach hinten gemovt, so wird nach vorne immer
// nachgeschoben, d.H. die Loeschposition ist immer gleich
@@ -279,7 +279,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
// <--
}
- RemoveNode( rDelPos.GetIndex(), 1, FALSE ); // Indizies verschieben !!
+ RemoveNode( rDelPos.GetIndex(), 1, FALSE ); // Indizies verschieben !!
SwCntntNode * pCNd = pNd->GetCntntNode();
rNds.InsertNode( pNd, aInsPos );
@@ -290,8 +290,8 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
{
SwpHints * const pHts = pTxtNd->GetpSwpHints();
// setze die OultineNodes im neuen Nodes-Array
- //if( bInsOutlineIdx && NO_NUMBERING != //#outline level,removed by zhaojianwei
- // pTxtNd->GetTxtColl()->GetOutlineLevel() )
+ //if( bInsOutlineIdx && NO_NUMBERING != //#outline level,removed by zhaojianwei
+ // pTxtNd->GetTxtColl()->GetOutlineLevel() )
if( bInsOutlineIdx &&
0 != pTxtNd->GetAttrOutlineLevel() ) //#outline level,added by zhaojianwei
{
@@ -388,7 +388,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
}
//JP 03.02.99: alle Felder als invalide erklaeren, aktu. erfolgt im
- // Idle-Handler des Docs
+ // Idle-Handler des Docs
GetDoc()->SetFieldsDirty( true, NULL, 0 );
if( rNds.GetDoc() != GetDoc() )
rNds.GetDoc()->SetFieldsDirty( true, NULL, 0 );
@@ -440,19 +440,19 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
/***********************************************************************
|*
-|* SwNodes::Move
+|* SwNodes::Move
|*
-|* Beschreibung
-|* Move loescht die Node-Pointer ab und einschliesslich der Startposition
-|* bis zu und ausschliesslich der Endposition und fuegt sie an
-|* der vor der Zielposition ein.
-|* Wenn das Ziel vor dem ersten oder dem letzten zu bewegenden Element oder
-|* dazwischen liegt, geschieht nichts.
-|* Wenn der zu bewegende Bereich leer ist oder das Ende vor
-|* dem Anfang liegt, geschieht nichts.
+|* Beschreibung
+|* Move loescht die Node-Pointer ab und einschliesslich der Startposition
+|* bis zu und ausschliesslich der Endposition und fuegt sie an
+|* der vor der Zielposition ein.
+|* Wenn das Ziel vor dem ersten oder dem letzten zu bewegenden Element oder
+|* dazwischen liegt, geschieht nichts.
+|* Wenn der zu bewegende Bereich leer ist oder das Ende vor
+|* dem Anfang liegt, geschieht nichts.
|*
-|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
-|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
+|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
+|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
|*
|*
|*
@@ -466,7 +466,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
( (pAktNode = &aIndex.GetNode())->GetStartNode() &&
!pAktNode->StartOfSectionIndex() ))
return FALSE;
-
+
SwNodeRange aRg( aRange );
// "einfache" StartNodes oder EndNodes ueberspringen
@@ -498,8 +498,8 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
return FALSE;
}
- USHORT nLevel = 0; // Level-Counter
- ULONG nInsPos = 0; // Cnt fuer das TmpArray
+ USHORT nLevel = 0; // Level-Counter
+ ULONG nInsPos = 0; // Cnt fuer das TmpArray
// das Array bildet einen Stack, es werden alle StartOfSelction's gesichert
SwSttNdPtrs aSttNdStack( 1, 5 );
@@ -513,8 +513,8 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
SwStartNode* pStartNode = aIdx.GetNode().pStartOfSection;
aSttNdStack.C40_INSERT( SwStartNode, pStartNode, 0 );
-// aSttNdStack.Insert( rNodes[ aIdx ]->pStartOfSection, 0 );
- SwNodeRange aOrigInsPos( aIdx, -1, aIdx ); // Originale Insert Pos
+// aSttNdStack.Insert( rNodes[ aIdx ]->pStartOfSection, 0 );
+ SwNodeRange aOrigInsPos( aIdx, -1, aIdx ); // Originale Insert Pos
//JP 16.01.98: SectionNodes: DelFrms/MakeFrms beim obersten SectionNode!
USHORT nSectNdCnt = 0;
@@ -526,7 +526,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
{
case ND_ENDNODE:
{
- if( nInsPos ) // verschieb schon mal alle bis hier her
+ if( nInsPos ) // verschieb schon mal alle bis hier her
{
// loeschen und kopieren. ACHTUNG: die Indizies ab
// "aRg.aEnd+1" werden mit verschoben !!
@@ -555,7 +555,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
if( bNewFrms )
// loesche erstmal die Frames
pTblNd->DelFrms();
- if( &rNodes == this ) // in sich selbst moven ??
+ if( &rNodes == this ) // in sich selbst moven ??
{
// dann bewege alle Start/End/ContentNodes. Loesche
// bei den ContentNodes auch die Frames !!
@@ -571,22 +571,22 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
if( pTmpNd->IsTxtNode() )
((SwTxtNode*)pTmpNd)->RemoveFromList();
-// if( bNewFrms )
-// pCNd->DelFrms();
+// if( bNewFrms )
+// pCNd->DelFrms();
// setze bei Start/EndNodes die richtigen Indizies
// loesche die Gliederungs-Indizies aus
// dem alten Nodes-Array
- //if( pCNd->IsTxtNode() && NO_NUMBERING != //#outline level,zhaojianwei
- // ((SwTxtNode*)pCNd)->GetTxtColl()->GetOutlineLevel() )
+ //if( pCNd->IsTxtNode() && NO_NUMBERING != //#outline level,zhaojianwei
+ // ((SwTxtNode*)pCNd)->GetTxtColl()->GetOutlineLevel() )
if( pCNd->IsTxtNode() && 0 !=
((SwTxtNode*)pCNd)->GetAttrOutlineLevel() )//<-end,by zhaojianwei
pOutlineNds->Remove( pCNd );
else
pCNd = 0;
}
-// else if( bNewFrms && pTmpNd->IsSectionNode() )
-// ((SwSectionNode*)pTmpNd)->DelFrms();
+// else if( bNewFrms && pTmpNd->IsSectionNode() )
+// ((SwSectionNode*)pTmpNd)->DelFrms();
BigPtrArray::Move( aMvIdx.GetIndex(), aIdx.GetIndex() );
if( bInsOutlineIdx && pCNd )
@@ -610,7 +610,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
for( ULONG n = 0; n < nInsPos; ++n )
{
SwNode* pNd = &aMvIdx.GetNode();
-/* if( bNewFrms )
+/* if( bNewFrms )
{
if( pNd->IsCntntNode() )
((SwCntntNode*)pNd)->DelFrms();
@@ -619,7 +619,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
}
*/
//BOOL bOutlNd = pNd->IsTxtNode() && NO_NUMBERING !=//#outline level,zhaojianwei
- // ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();
+ // ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();
const bool bOutlNd = pNd->IsTxtNode() &&
0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//<-end,zhaojianwei
// loesche die Gliederungs-Indizies aus
@@ -678,10 +678,10 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
else if( pSttNd->GetIndex() < aRg.aStart.GetIndex() )
{
// SectionNode: es wird nicht die gesamte Section
- // verschoben, also bewege nur die
- // ContentNodes
- // StartNode: erzeuge an der Postion eine neue Section
- do { // middle check loop
+ // verschoben, also bewege nur die
+ // ContentNodes
+ // StartNode: erzeuge an der Postion eine neue Section
+ do { // middle check loop
if( !pSttNd->IsSectionNode() )
{
// Start und EndNode an der InsertPos erzeugen
@@ -690,7 +690,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
/*?? welcher NodeTyp ??*/
SwNormalStartNode );
- nLevel++; // den Index auf StartNode auf den Stack
+ nLevel++; // den Index auf StartNode auf den Stack
aSttNdStack.C40_INSERT( SwStartNode, pTmp, nLevel );
// noch den EndNode erzeugen
@@ -720,7 +720,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
// Start und EndNode komplett verschieben
// s. u. SwIndex aOldStt( pSttNd->theIndex );
//JP 21.05.97: sollte der Start genau der Start des Bereiches sein, so muss
-// der Node auf jedenfall noch besucht werden!
+// der Node auf jedenfall noch besucht werden!
if( &aRg.aStart.GetNode() == pSttNd )
--aRg.aStart;
@@ -745,7 +745,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
aRg.aEnd--;
- nLevel++; // den Index auf StartNode auf den Stack
+ nLevel++; // den Index auf StartNode auf den Stack
aSttNdStack.C40_INSERT( SwStartNode, pSttNd, nLevel );
// SectionNode muss noch ein paar Indizies ummelden
@@ -767,7 +767,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
{
// dann muss an der akt. InsPos ein SectionDummyNode
// eingefuegt werden
- if( nInsPos ) // verschieb schon mal alle bis hier her
+ if( nInsPos ) // verschieb schon mal alle bis hier her
{
// loeschen und kopieren. ACHTUNG: die Indizies ab
// "aRg.aEnd+1" werden mit verschoben !!
@@ -793,7 +793,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
break;
}
- if( !nLevel ) // es wird eine Stufe runter gestuft
+ if( !nLevel ) // es wird eine Stufe runter gestuft
{
// erzeuge die Runterstufung
SwNodeIndex aTmpSIdx( aOrigInsPos.aStart, 1 );
@@ -826,8 +826,8 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
aTmpEIdx--;
}
- aIdx--; // hinter den eingefuegten StartNode
- aRg.aEnd--; // vor den StartNode
+ aIdx--; // hinter den eingefuegten StartNode
+ aRg.aEnd--; // vor den StartNode
// kopiere jetzt das Array. ACHTUNG: die Indizies ab
// "aRg.aEnd+1" werden mit verschoben !!
SwNodeIndex aSwIndex( aRg.aEnd, 1 );
@@ -835,8 +835,8 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
aIdx -= nInsPos+1;
nInsPos = 0;
}
- else // es wurden alle Nodes innerhalb eines
- { // Start- und End-Nodes verschoben
+ else // es wurden alle Nodes innerhalb eines
+ { // Start- und End-Nodes verschoben
OSL_ENSURE( pAktNode == aSttNdStack[nLevel] ||
( pAktNode->IsStartNode() &&
aSttNdStack[nLevel]->IsSectionNode()),
@@ -844,11 +844,11 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
SwNodeIndex aSwIndex( aRg.aEnd, 1 );
ChgNode( aSwIndex, nInsPos, aIdx, bNewFrms );
- aIdx -= nInsPos+1; // vor den eingefuegten StartNode
+ aIdx -= nInsPos+1; // vor den eingefuegten StartNode
nInsPos = 0;
// loesche nur noch den Pointer aus dem Nodes-Array.
-// RemoveNode( aRg.aEnd.GetIndex(), 1, FALSE );
+// RemoveNode( aRg.aEnd.GetIndex(), 1, FALSE );
RemoveNode( aRg.aEnd.GetIndex(), 1, TRUE );
aRg.aEnd--;
@@ -859,7 +859,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
pSectNd->MakeFrms( &aTmp );
bNewFrms = bSaveNewFrms;
}
- aSttNdStack.Remove( nLevel ); // vom Stack loeschen
+ aSttNdStack.Remove( nLevel ); // vom Stack loeschen
nLevel--;
}
@@ -872,7 +872,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
DelNodes( aRg.aEnd, 2 );
aRg.aEnd--;
}
-// aRg.aEnd--;
+// aRg.aEnd--;
}
break;
@@ -892,18 +892,18 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
case ND_SECTIONDUMMY:
if( (const SwNodes*)this == GetDoc()->GetUndoNds() )
{
- if( &rNodes == this ) // innerhalb vom UndoNodesArray
+ if( &rNodes == this ) // innerhalb vom UndoNodesArray
{
// mit verschieben
pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
nInsPos++;
}
- else // in ein "normales" Nodes-Array verschieben
+ else // in ein "normales" Nodes-Array verschieben
{
// dann muss an der akt. InsPos auch ein SectionNode
// (Start/Ende) stehen; dann diesen ueberspringen.
// Andernfalls nicht weiter beachten.
- if( nInsPos ) // verschieb schon mal alle bis hier her
+ if( nInsPos ) // verschieb schon mal alle bis hier her
{
// loeschen und kopieren. ACHTUNG: die Indizies ab
// "aRg.aEnd+1" werden mit verschoben !!
@@ -915,7 +915,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
SwNode* pTmpNd = &aIdx.GetNode();
if( pTmpNd->IsSectionNode() ||
pTmpNd->StartOfSectionNode()->IsSectionNode() )
- aIdx--; // ueberspringen
+ aIdx--; // ueberspringen
}
}
else {
@@ -928,14 +928,14 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
OSL_ENSURE( FALSE, "was ist das fuer ein Node??" );
break;
}
-
- if( nInsPos ) // kopiere den Rest
+
+ if( nInsPos ) // kopiere den Rest
{
// der Rest muesste so stimmen
SwNodeIndex aSwIndex( aRg.aEnd, 1 );
ChgNode( aSwIndex, nInsPos, aIdx, bNewFrms );
}
- aRg.aEnd++; // wieder exklusive Ende
+ aRg.aEnd++; // wieder exklusive Ende
// loesche alle leeren Start-/End-Node-Paare
if( ( pAktNode = &aRg.aStart.GetNode())->GetStartNode() &&
@@ -980,47 +980,47 @@ extern Writer* GetDebugWriter(const String&);
/*******************************************************************
|*
-|* SwNodes::SectionDown
+|* SwNodes::SectionDown
|*
-|* Beschreibung
-|* SectionDown() legt ein Paar von Start- und EndSection-Node
-|* (andere Nodes koennen dazwischen liegen) an.
+|* Beschreibung
+|* SectionDown() legt ein Paar von Start- und EndSection-Node
+|* (andere Nodes koennen dazwischen liegen) an.
|*
-|* Zustand des SRange beim Verlassen der Funktion: nStart ist der
-|* Index des ersten Node hinter dem Start Section Node, nEnd ist
-|* der Index des End Section Nodes. Beispiel: Wird Insert Section
-|* mehrmals hintereinander aufgerufen, so werden mehrere
-|* unmittelbar geschachtelte Sections (keine Content Nodes
-|* zwischen Start- bzw. End Nodes) angelegt.
+|* Zustand des SRange beim Verlassen der Funktion: nStart ist der
+|* Index des ersten Node hinter dem Start Section Node, nEnd ist
+|* der Index des End Section Nodes. Beispiel: Wird Insert Section
+|* mehrmals hintereinander aufgerufen, so werden mehrere
+|* unmittelbar geschachtelte Sections (keine Content Nodes
+|* zwischen Start- bzw. End Nodes) angelegt.
|*
-|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
-|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
+|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
+|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
|*
-|* Parameter
-|* SwRange &rRange
-|* IO:
-|* IN
-|* rRange.aStart: Einfuegeposition des StartNodes
-|* rRange.aEnd: Einfuegeposition des EndNodes
-|* OUT
-|* rRange.aStart: steht hinter dem eingefuegten Startnode
-|* rRange.aEnd: steht auf dem eingefuegen Endnode
+|* Parameter
+|* SwRange &rRange
+|* IO:
+|* IN
+|* rRange.aStart: Einfuegeposition des StartNodes
+|* rRange.aEnd: Einfuegeposition des EndNodes
+|* OUT
+|* rRange.aStart: steht hinter dem eingefuegten Startnode
+|* rRange.aEnd: steht auf dem eingefuegen Endnode
|*
-|* Ausnahmen
-|* 1. SRange-Anfang und SRange-Ende muessen auf dem gleichen Level sein
-|* 2. duerfen nicht auf dem obersten Level sein
-|* Ist dies nicht der Fall, wird die
-|* Funktion durch Aufruf von ERR_RAISE verlassen.
+|* Ausnahmen
+|* 1. SRange-Anfang und SRange-Ende muessen auf dem gleichen Level sein
+|* 2. duerfen nicht auf dem obersten Level sein
+|* Ist dies nicht der Fall, wird die
+|* Funktion durch Aufruf von ERR_RAISE verlassen.
|*
-|* Debug-Funktionen
-|* die Debugging Tools geben rRange beim Eintritt und beim
-|* Verlassen der Funktion aus
+|* Debug-Funktionen
+|* die Debugging Tools geben rRange beim Eintritt und beim
+|* Verlassen der Funktion aus
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp )
@@ -1037,7 +1037,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp )
SwNodeIndex aTmpIdx( *pAktNode->StartOfSectionNode() );
if( pAktNode->GetEndNode() )
- DelNodes( pRange->aStart, 1 ); // verhinder leere Section
+ DelNodes( pRange->aStart, 1 ); // verhinder leere Section
else
{
// fuege einen neuen StartNode ein
@@ -1065,39 +1065,39 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp )
/*******************************************************************
|*
-|* SwNodes::SectionUp
+|* SwNodes::SectionUp
|*
-|* Beschreibung
-|* Der von rRange umspannte Bereich wird auf die naechst hoehere
-|* Ebene gehoben. Das geschieht dadurch, dass bei
-|* rRange.aStart ein Endnode und bei rRange.aEnd ein
-|* Startnode eingefuegt wird. Die Indices fuer den Bereich
-|* innerhalb von rRange werden geupdated.
+|* Beschreibung
+|* Der von rRange umspannte Bereich wird auf die naechst hoehere
+|* Ebene gehoben. Das geschieht dadurch, dass bei
+|* rRange.aStart ein Endnode und bei rRange.aEnd ein
+|* Startnode eingefuegt wird. Die Indices fuer den Bereich
+|* innerhalb von rRange werden geupdated.
|*
-|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
-|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
+|* Allg.: aRange beschreibt den Bereich -exklusive- aEnd !!
+|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
|*
-|* Parameter
-|* SwRange &rRange
-|* IO:
-|* IN
-|* rRange.aStart: Anfang des hoeher zubewegenden Bereiches
-|* rRange.aEnd: der 1.Node hinter dem Bereich
-|* OUT
-|* rRange.aStart: an der ersten Position innerhalb des
-|* hochbewegten Bereiches
-|* rRange.aEnd: an der letzten Position innerhalb des
-|* hochbewegten Bereiches
+|* Parameter
+|* SwRange &rRange
+|* IO:
+|* IN
+|* rRange.aStart: Anfang des hoeher zubewegenden Bereiches
+|* rRange.aEnd: der 1.Node hinter dem Bereich
+|* OUT
+|* rRange.aStart: an der ersten Position innerhalb des
+|* hochbewegten Bereiches
+|* rRange.aEnd: an der letzten Position innerhalb des
+|* hochbewegten Bereiches
|*
-|* Debug-Funktionen
-|* die Debugging Tools geben rRange beim Eintritt und beim
-|* Verlassen der Funktion aus
+|* Debug-Funktionen
+|* die Debugging Tools geben rRange beim Eintritt und beim
+|* Verlassen der Funktion aus
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
void SwNodes::SectionUp(SwNodeRange *pRange)
@@ -1113,7 +1113,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
// Bei anderen Nodes wird eine neuer EndNode eingefuegt
SwNode * pAktNode = &pRange->aStart.GetNode();
SwNodeIndex aIdx( *pAktNode->StartOfSectionNode() );
- if( pAktNode->IsStartNode() ) // selbst StartNode
+ if( pAktNode->IsStartNode() ) // selbst StartNode
{
SwEndNode* pEndNd = pRange->aEnd.GetNode().GetEndNode();
if( pAktNode == pEndNd->pStartOfSection )
@@ -1137,7 +1137,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
}
DelNodes( pRange->aStart, 1 );
}
- else if( aIdx == pRange->aStart.GetIndex()-1 ) // vor StartNode
+ else if( aIdx == pRange->aStart.GetIndex()-1 ) // vor StartNode
DelNodes( aIdx, 1 );
else
new SwEndNode( pRange->aStart, *aIdx.GetNode().GetStartNode() );
@@ -1162,19 +1162,19 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
/*************************************************************************
|*
-|* SwNodes::SectionUpDown()
+|* SwNodes::SectionUpDown()
|*
-|* Beschreibung
-|* Methode setzt die Indizies die bei SectionUp oder SectionDwon
-|* veraendert wurden wieder richtig, sodass die Ebenen wieder
-|* Konsistent sind.
+|* Beschreibung
+|* Methode setzt die Indizies die bei SectionUp oder SectionDwon
+|* veraendert wurden wieder richtig, sodass die Ebenen wieder
+|* Konsistent sind.
|*
-|* Parameter
-|* SwIndex & aStart StartNode !!!
-|* SwIndex & aEnd EndPunkt
+|* Parameter
+|* SwIndex & aStart StartNode !!!
+|* SwIndex & aEnd EndPunkt
|*
-|* Ersterstellung JP 23.04.91
-|* Letzte Aenderung JP 23.04.91
+|* Ersterstellung JP 23.04.91
+|* Letzte Aenderung JP 23.04.91
|*
*************************************************************************/
void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd )
@@ -1204,15 +1204,15 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn
pSttNd->pEndOfSection = (SwEndNode*)pAktNode;
aSttNdStack.Remove( aSttNdStack.Count() - 1 );
if( aSttNdStack.Count() )
- continue; // noch genuegend EndNodes auf dem Stack
+ continue; // noch genuegend EndNodes auf dem Stack
- else if( aTmpIdx < aEnd ) // Uebergewicht an StartNodes
+ else if( aTmpIdx < aEnd ) // Uebergewicht an StartNodes
// ist das Ende noch nicht erreicht, so hole den Start von
// der uebergeordneten Section
{
aSttNdStack.C40_INSERT( SwStartNode, pSttNd->pStartOfSection, 0 );
}
- else // wenn ueber den Bereich hinaus, dann Ende
+ else // wenn ueber den Bereich hinaus, dann Ende
break;
}
}
@@ -1223,43 +1223,43 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn
/*******************************************************************
|*
-|* SwNodes::Delete
+|* SwNodes::Delete
|*
-|* Beschreibung
-|* Spezielle Implementierung der Delete-Funktion des
-|* variablen Array. Diese spezielle Implementierung ist
-|* notwendig, da durch das Loeschen von Start- bzw.
-|* Endnodes Inkonsistenzen entstehen koennen. Diese werden
-|* durch diese Funktion beseitigt.
+|* Beschreibung
+|* Spezielle Implementierung der Delete-Funktion des
+|* variablen Array. Diese spezielle Implementierung ist
+|* notwendig, da durch das Loeschen von Start- bzw.
+|* Endnodes Inkonsistenzen entstehen koennen. Diese werden
+|* durch diese Funktion beseitigt.
|*
-|* Parameter
-|* IN
-|* SwIndex &rIndex bezeichnet die Position, an der
-|* geloescht wird
-|* rIndex ist nach Aufruf der Funktion unveraendert (Kopie?!)
-|* USHORT nNodes bezeichnet die Anzahl der zu loeschenden
-|* Nodes; ist auf 1 defaulted
+|* Parameter
+|* IN
+|* SwIndex &rIndex bezeichnet die Position, an der
+|* geloescht wird
+|* rIndex ist nach Aufruf der Funktion unveraendert (Kopie?!)
+|* USHORT nNodes bezeichnet die Anzahl der zu loeschenden
+|* Nodes; ist auf 1 defaulted
|*
-|* Debug-Funktionen
-|* geben beim Eintritt in die Funktion Position und Anzahl
-|* der zu loeschenden Nodes aus.
+|* Debug-Funktionen
+|* geben beim Eintritt in die Funktion Position und Anzahl
+|* der zu loeschenden Nodes aus.
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
{
- USHORT nLevel = 0; // Level-Counter
+ USHORT nLevel = 0; // Level-Counter
SwNode * pAktNode;
ULONG nCnt = Count() - rIndex.GetIndex() - 1;
if( nCnt > nNodes ) nCnt = nNodes;
- if( nCnt == 0 ) // keine Anzahl -> return
+ if( nCnt == 0 ) // keine Anzahl -> return
return;
SwNodeRange aRg( rIndex, 0, rIndex, nCnt-1 );
@@ -1307,8 +1307,8 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
if( pNd->IsTxtNode() )
{
- //if( NO_NUMBERING != //#outline level,zhaojianwei
- // ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() &&
+ //if( NO_NUMBERING != //#outline level,zhaojianwei
+ // ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() &&
if( 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() &&//<-end,zhaojianwei
pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
{
@@ -1329,15 +1329,15 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
}
else
{
- RemoveNode( aRg.aEnd.GetIndex()+1, nCnt, TRUE ); // loesche
+ RemoveNode( aRg.aEnd.GetIndex()+1, nCnt, TRUE ); // loesche
nCnt = 0;
- aRg.aEnd--; // vor den EndNode
+ aRg.aEnd--; // vor den EndNode
nLevel++;
}
}
- else if( pAktNode->GetStartNode() ) // StartNode gefunden
+ else if( pAktNode->GetStartNode() ) // StartNode gefunden
{
- if( nLevel == 0 ) // es wird eine Stufe runter gestuft
+ if( nLevel == 0 ) // es wird eine Stufe runter gestuft
{
if( nCnt )
{
@@ -1347,9 +1347,9 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
nCnt = 0;
}
}
- else // es werden alle Nodes Innerhalb eines Start- und
- { // End-Nodes geloescht, loesche mit Start/EndNode
- RemoveNode( aRg.aEnd.GetIndex(), nCnt + 2, TRUE ); // loesche Array
+ else // es werden alle Nodes Innerhalb eines Start- und
+ { // End-Nodes geloescht, loesche mit Start/EndNode
+ RemoveNode( aRg.aEnd.GetIndex(), nCnt + 2, TRUE ); // loesche Array
nCnt = 0;
nLevel--;
}
@@ -1368,13 +1368,13 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
aRg.aEnd--;
}
}
- else // normaler Node, also ins TmpArray einfuegen
+ else // normaler Node, also ins TmpArray einfuegen
{
SwTxtNode* pTxtNd = pAktNode->GetTxtNode();
if( pTxtNd )
{
if( pTxtNd->IsOutline())
- { // loesche die Gliederungs-Indizies.
+ { // loesche die Gliederungs-Indizies.
pOutlineNds->Remove( pTxtNd );
bUpdateOutline = TRUE;
}
@@ -1390,7 +1390,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
aRg.aEnd++;
if( nCnt != 0 )
- RemoveNode( aRg.aEnd.GetIndex(), nCnt, TRUE ); // loesche den Rest
+ RemoveNode( aRg.aEnd.GetIndex(), nCnt, TRUE ); // loesche den Rest
// loesche alle leeren Start-/End-Node-Paare
while( aRg.aEnd.GetNode().GetEndNode() &&
@@ -1398,7 +1398,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
pAktNode->StartOfSectionIndex() )
// aber ja keinen der heiligen 5.
{
- DelNodes( aRg.aStart, 2 ); // loesche den Start- und EndNode
+ DelNodes( aRg.aStart, 2 ); // loesche den Start- und EndNode
aRg.aStart--;
}
@@ -1423,36 +1423,36 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
/*******************************************************************
|*
-|* SwNodes::GetSectionLevel
-|*
-|* Beschreibung
-|* Die Funktion liefert den Sectionlevel an der durch
-|* aIndex bezeichneten Position. Die Funktion ruft die
-|* GetSectionlevel-Funktion des durch aIndex bezeichneten
-|* Nodes. Diese ist eine virtuelle Funktion, die fuer
-|* Endnodes speziell implementiert werden musste.
-|* Die Sectionlevels werden ermittelt, indem rekursiv durch
-|* die Nodesstruktur (jeweils zum naechsten theEndOfSection)
-|* gegangen wird, bis die oberste Ebene erreicht ist
-|* (theEndOfSection == 0)
-|*
-|* Parameter
-|* aIndex bezeichnet die Position des Nodes, dessen
-|* Sectionlevel ermittelt werden soll. Hier wird eine Kopie
-|* uebergeben, da eine Veraenderung der Variablen in der
-|* rufenden Funktion nicht wuenschenswert ist.
-|*
-|* Ausnahmen
-|* Der erste Node im Array sollte immer ein Startnode sein.
-|* Dieser erfaehrt in der Funktion SwNodes::GetSectionLevel()
+|* SwNodes::GetSectionLevel
+|*
+|* Beschreibung
+|* Die Funktion liefert den Sectionlevel an der durch
+|* aIndex bezeichneten Position. Die Funktion ruft die
+|* GetSectionlevel-Funktion des durch aIndex bezeichneten
+|* Nodes. Diese ist eine virtuelle Funktion, die fuer
+|* Endnodes speziell implementiert werden musste.
+|* Die Sectionlevels werden ermittelt, indem rekursiv durch
+|* die Nodesstruktur (jeweils zum naechsten theEndOfSection)
+|* gegangen wird, bis die oberste Ebene erreicht ist
+|* (theEndOfSection == 0)
+|*
+|* Parameter
+|* aIndex bezeichnet die Position des Nodes, dessen
+|* Sectionlevel ermittelt werden soll. Hier wird eine Kopie
+|* uebergeben, da eine Veraenderung der Variablen in der
+|* rufenden Funktion nicht wuenschenswert ist.
+|*
+|* Ausnahmen
+|* Der erste Node im Array sollte immer ein Startnode sein.
+|* Dieser erfaehrt in der Funktion SwNodes::GetSectionLevel()
|* eine Sonderbehandlung; es wird davon ausgegangen, dass der
-|* erste Node auch ein Startnode ist.
+|* erste Node auch ein Startnode ist.
|*
-|* Ersterstellung
-|* VER0100 vb 901214
+|* Ersterstellung
+|* VER0100 vb 901214
|*
-|* Stand
-|* VER0100 vb 901214
+|* Stand
+|* VER0100 vb 901214
|*
*******************************************************************/
USHORT SwNodes::GetSectionLevel(const SwNodeIndex &rIdx) const {
@@ -1474,15 +1474,15 @@ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx) const
// steht der Index auf keinem ContentNode, dann gehe dahin. Ist aber
// kein weiterer vorhanden, dann lasse den Index an alter Pos stehen !!!
while( !aTmp.GetNode().IsCntntNode() )
- { // gehe vom StartNode ( es kann nur ein StartNode sein ! ) an sein
+ { // gehe vom StartNode ( es kann nur ein StartNode sein ! ) an sein
// Ende
if( *pIdx <= aTmp )
- return; // FEHLER: Steht schon hinter der Sektion
+ return; // FEHLER: Steht schon hinter der Sektion
aTmp = aTmp.GetNode().EndOfSectionIndex()+1;
if( *pIdx <= aTmp )
- return; // FEHLER: Steht schon hinter der Sektion
+ return; // FEHLER: Steht schon hinter der Sektion
}
- (*pIdx) = aTmp; // steht auf einem ContentNode
+ (*pIdx) = aTmp; // steht auf einem ContentNode
}
void SwNodes::GoEndOfSection(SwNodeIndex *pIdx) const
@@ -1601,26 +1601,26 @@ SwNode* SwNodes::GoPreviousWithFrm(SwNodeIndex *pIdx) const
/*************************************************************************
|*
-|* BOOL SwNodes::CheckNodesRange()
+|* BOOL SwNodes::CheckNodesRange()
|*
-|* Beschreibung
-|* Teste ob der uebergene SRange nicht ueber die Grenzen der
-|* einzelnen Bereiche (PosIts, Autotext, Content, Icons und Inserts )
-|* hinaus reicht.
-|* Nach Wahrscheinlichkeit des Ranges sortiert.
+|* Beschreibung
+|* Teste ob der uebergene SRange nicht ueber die Grenzen der
+|* einzelnen Bereiche (PosIts, Autotext, Content, Icons und Inserts )
+|* hinaus reicht.
+|* Nach Wahrscheinlichkeit des Ranges sortiert.
|*
-|* Alg.: Da festgelegt ist, das aRange.aEnd den 1.Node hinter dem Bereich
-|* bezeichnet, wird hier auf aEnd <= End.. getestet !!
+|* Alg.: Da festgelegt ist, das aRange.aEnd den 1.Node hinter dem Bereich
+|* bezeichnet, wird hier auf aEnd <= End.. getestet !!
|*
-|* Parameter SwIndex & Start-Index vom Bereich
-|* SwIndex & End-Index vom Bereich
-|* BOOL TRUE: Start+End in gleicher Section!
-|* FALSE: Start+End in verschiedenen Sect.
-|* Return-Wert BOOL TRUE: gueltiger SRange
-|* FALSE: ungueltiger SRange
+|* Parameter SwIndex & Start-Index vom Bereich
+|* SwIndex & End-Index vom Bereich
+|* BOOL TRUE: Start+End in gleicher Section!
+|* FALSE: Start+End in verschiedenen Sect.
+|* Return-Wert BOOL TRUE: gueltiger SRange
+|* FALSE: ungueltiger SRange
|*
-|* Ersterstellung JP 23.04.91
-|* Letzte Aenderung JP 18.06.92
+|* Ersterstellung JP 23.04.91
+|* Letzte Aenderung JP 18.06.92
|*
*************************************************************************/
@@ -1644,22 +1644,22 @@ BOOL SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd
if( TstIdx( nStt, nEnd, pEndOfRedlines->StartOfSectionIndex(),
pEndOfRedlines->GetIndex() )) return TRUE;
- return FALSE; // liegt irgendwo dazwischen, FEHLER
+ return FALSE; // liegt irgendwo dazwischen, FEHLER
}
/*************************************************************************
|*
-|* void SwNodes::DelNodes()
+|* void SwNodes::DelNodes()
|*
-|* Beschreibung
-|* Loesche aus den NodesArray ab einer Position entsprechend Node's.
+|* Beschreibung
+|* Loesche aus den NodesArray ab einer Position entsprechend Node's.
|*
-|* Parameter SwIndex & Der Startpunkt im Nodes-Array
-|* USHORT die Anzahl
+|* Parameter SwIndex & Der Startpunkt im Nodes-Array
+|* USHORT die Anzahl
|*
-|* Ersterstellung JP 23.04.91
-|* Letzte Aenderung JP 23.04.91
+|* Ersterstellung JP 23.04.91
+|* Letzte Aenderung JP 23.04.91
|*
*************************************************************************/
void SwNodes::DelNodes( const SwNodeIndex & rStart, ULONG nCnt )
@@ -1698,7 +1698,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, ULONG nCnt )
if( pNd->IsTxtNode() &&
//NO_NUMBERING != ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
- 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() ) //<-end,zhaojianwei
+ 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() ) //<-end,zhaojianwei
{ // loesche die Gliederungs-Indizies.
USHORT nIdxPos;
if( pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
@@ -1724,17 +1724,17 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, ULONG nCnt )
/*************************************************************************
|*
-|* USHORT HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange )
+|* USHORT HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange )
|*
-|* Beschreibung
-|* Berechne den hoehsten Level innerhalb des Bereiches
+|* Beschreibung
+|* Berechne den hoehsten Level innerhalb des Bereiches
|*
-|* Parameter SwNodes & das Node-Array
-|* SwNodeRange & der zu ueberpruefende Bereich
-|* Return USHORT der hoechste Level
+|* Parameter SwNodes & das Node-Array
+|* SwNodeRange & der zu ueberpruefende Bereich
+|* Return USHORT der hoechste Level
|*
-|* Ersterstellung JP 24.04.91
-|* Letzte Aenderung JP 24.04.91
+|* Ersterstellung JP 24.04.91
+|* Letzte Aenderung JP 24.04.91
|*
*************************************************************************/
@@ -1771,9 +1771,9 @@ USHORT HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange )
|* SwNodes::Move()
|*
|* Beschreibung
-|* Parameter SwPaM& zu kopierender Bereich
-|* SwNodes& in dieses Nodes-Array
-|* SwPosition& auf diese Position im Nodes-Array
+|* Parameter SwPaM& zu kopierender Bereich
+|* SwNodes& in dieses Nodes-Array
+|* SwPosition& auf diese Position im Nodes-Array
|* Ersterstellung JP 09.07.92
|* Letzte Aenderung JP 09.07.92
|*
@@ -1880,7 +1880,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
bCopyCollFmt = FALSE;
}
- if( bOneNd ) // das wars schon
+ if( bOneNd ) // das wars schon
{
// der PaM wird korrigiert, denn falls ueber Nodegrenzen verschoben
// wurde, so stehen sie in unterschieden Nodes. Auch die Selektion
@@ -2028,9 +2028,9 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
|* SwNodes::_Copy()
|*
|* Beschreibung
-|* Parameter SwNodeRange& zu kopierender Bereich
-|* SwDoc& in dieses Dokument
-|* SwIndex& auf diese Position im Nodes-Array
+|* Parameter SwNodeRange& zu kopierender Bereich
+|* SwDoc& in dieses Dokument
+|* SwIndex& auf diese Position im Nodes-Array
|* Ersterstellung JP 11.11.92
|* Letzte Aenderung JP 11.11.92
|*
@@ -2092,8 +2092,8 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
return;
SwNodeIndex aInsPos( rIndex );
- SwNodeIndex aOrigInsPos( rIndex, -1 ); // Originale Insert Pos
- USHORT nLevel = 0; // Level-Counter
+ SwNodeIndex aOrigInsPos( rIndex, -1 ); // Originale Insert Pos
+ USHORT nLevel = 0; // Level-Counter
for( ULONG nNodeCnt = aRg.aEnd.GetIndex() - aRg.aStart.GetIndex();
nNodeCnt > 0; --nNodeCnt )
@@ -2157,7 +2157,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_SECTIONNODE: // SectionNode
+ case ND_SECTIONNODE: // SectionNode
// If the end of the section is outside the copy range,
// the section node will skipped, not copied!
// If someone want to change this behaviour, he has to adjust the function
@@ -2178,7 +2178,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_STARTNODE: // StartNode gefunden
+ case ND_STARTNODE: // StartNode gefunden
{
SwStartNode* pTmp = new SwStartNode( aInsPos, ND_STARTNODE,
((SwStartNode*)pAktNode)->GetStartNodeType() );
@@ -2189,10 +2189,10 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
break;
case ND_ENDNODE:
- if( nLevel ) // vollstaendige Section
+ if( nLevel ) // vollstaendige Section
{
--nLevel;
- aInsPos++; // EndNode schon vorhanden
+ aInsPos++; // EndNode schon vorhanden
}
else if( !pAktNode->pStartOfSection->IsSectionNode() )
{
@@ -2209,7 +2209,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
{
SwCntntNode* pNew = ((SwCntntNode*)pAktNode)->MakeCopy(
pDoc, aInsPos );
- if( !bNewFrms ) // dflt. werden die Frames immer angelegt
+ if( !bNewFrms ) // dflt. werden die Frames immer angelegt
pNew->DelFrms();
}
break;
@@ -2223,7 +2223,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
SwNode* pTmpNd = pDoc->GetNodes()[ aInsPos ];
if( pTmpNd->IsSectionNode() ||
pTmpNd->StartOfSectionNode()->IsSectionNode() )
- aInsPos++; // ueberspringen
+ aInsPos++; // ueberspringen
}
else {
OSL_ENSURE( FALSE, "wie kommt diser Node ins Nodes-Array??" );
@@ -2591,10 +2591,10 @@ void SwNodes::RemoveNode( ULONG nDelPos, ULONG nSz, BOOL bDel )
// temp. Object setzen
//JP 24.08.98: muessten eigentlich einzeln removed werden, weil
- // das Remove auch rekursiv gerufen werden kann, z.B. bei
- // zeichengebundenen Rahmen. Da aber dabei viel zu viel
- // ablaueft, wird hier ein temp. Objekt eingefuegt, das
- // dann mit dem Remove wieder entfernt wird.
+ // das Remove auch rekursiv gerufen werden kann, z.B. bei
+ // zeichengebundenen Rahmen. Da aber dabei viel zu viel
+ // ablaueft, wird hier ein temp. Objekt eingefuegt, das
+ // dann mit dem Remove wieder entfernt wird.
// siehe Bug 55406
_TempBigPtrEntry aTempEntry;
BigPtrEntry* pTempEntry = &aTempEntry;
@@ -2616,7 +2616,7 @@ void SwNodes::RemoveNode( ULONG nDelPos, ULONG nSz, BOOL bDel )
void SwNodes::RegisterIndex( SwNodeIndex& rIdx )
{
- if( !pRoot ) // noch keine Root gesetzt?
+ if( !pRoot ) // noch keine Root gesetzt?
{
pRoot = &rIdx;
pRoot->pPrev = 0;
diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx
index f8cd4afd146e..411cfd44d978 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx
index 5dfd94e898c8..2b3b5bb58356 100644
--- a/sw/source/core/docnode/pausethreadstarting.cxx
+++ b/sw/source/core/docnode/pausethreadstarting.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 03a1c4a7c396..52a19ae715f3 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index eff719bd195d..cddae56040cb 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index ac7aa90b18d3..f55809fbb56d 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 45f91e7478e9..2474b0f09465 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -2,7 +2,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
@@ -255,7 +255,7 @@ SwSection::~SwSection()
}
else
{
- pFmt->Remove( this ); // austragen,
+ pFmt->Remove( this ); // austragen,
if (CONTENT_SECTION != m_Data.GetType())
{
@@ -274,10 +274,10 @@ SwSection::~SwSection()
if( !pFmt->GetDepends() )
{
// Bug: 28191 - nicht ins Undo aufnehmen, sollte schon vorher
- // geschehen sein!!
+ // geschehen sein!!
BOOL bUndo = pDoc->DoesUndo();
pDoc->DoUndo( FALSE );
- pDoc->DelSectionFmt( pFmt ); // und loeschen
+ pDoc->DelSectionFmt( pFmt ); // und loeschen
pDoc->DoUndo( bUndo );
}
}
@@ -492,7 +492,7 @@ void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
if( !bNewFlag )
{
// Abschalten: teste ob nicht vielleich ueber die Parents
- // doch ein Schutzt besteht!
+ // doch ein Schutzt besteht!
const SwSection* pSect = this;
do {
if( pSect->IsProtect() )
@@ -904,12 +904,12 @@ void SwSectionFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
SwClientIter aIter( *this );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
pLast->Modify( pOld, pNew );
} while( 0 != ( pLast = aIter++ ));
}
- return; // das wars
+ return; // das wars
case RES_OBJECTDYING:
if( !GetDoc()->IsInDtor() &&
@@ -917,7 +917,7 @@ void SwSectionFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
// mein Parent wird vernichtet, dann an den Parent vom Parent
// umhaengen und wieder aktualisieren
- SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!!
+ SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!!
UpdateParent();
return;
}
@@ -929,7 +929,7 @@ void SwSectionFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
((SwFmtChg*)pNew)->pChangedFmt->IsA( TYPE( SwSectionFmt )) )
{
// mein Parent wird veraendert, muss mich aktualisieren
- SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!!
+ SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!!
UpdateParent();
return;
}
@@ -1074,7 +1074,7 @@ BOOL SwSectionFmt::IsInNodesArr() const
}
-void SwSectionFmt::UpdateParent() // Parent wurde veraendert
+void SwSectionFmt::UpdateParent() // Parent wurde veraendert
{
if( !GetDepends() )
return;
@@ -1088,7 +1088,7 @@ void SwSectionFmt::UpdateParent() // Parent wurde veraendert
SwClientIter aIter( *this );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
if( pLast->IsA( TYPE(SwSectionFmt) ) )
{
@@ -1278,7 +1278,7 @@ void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
SwBaseLink* pBLink;
String sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE ));
uno::Any aValue;
- aValue <<= ::rtl::OUString( sName ); // beliebiger Name
+ aValue <<= ::rtl::OUString( sName ); // beliebiger Name
const ::sfx2::SvBaseLinks& rLnks = pDoc->GetLinkManager().GetLinks();
for( USHORT n = rLnks.Count(); n; )
@@ -1318,9 +1318,9 @@ void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
// sucht sich die richtige DocShell raus oder erzeugt eine neue:
// Der Return-Wert gibt an, was mit der Shell zu geschehen hat:
-// 0 - Fehler, konnte DocShell nicht finden
-// 1 - DocShell ist ein existieren Document
-// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden
+// 0 - Fehler, konnte DocShell nicht finden
+// 1 - DocShell ist ein existieren Document
+// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden
int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
const String& rFileName,
@@ -1379,7 +1379,7 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
SfxMedium* pMed = new SfxMedium( aTmpObj.GetMainURL(
INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
if( INET_PROT_FILE == aTmpObj.GetProtocol() )
- pMed->DownLoad(); // nur mal das Medium anfassen (DownLoaden)
+ pMed->DownLoad(); // nur mal das Medium anfassen (DownLoaden)
const SfxFilter* pSfxFlt = 0;
if( !pMed->GetError() )
@@ -1414,10 +1414,10 @@ int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
}
}
- if( !xDocSh.Is() ) // Medium muss noch geloescht werden
+ if( !xDocSh.Is() ) // Medium muss noch geloescht werden
delete pMed;
- return 0; // das war wohl nichts
+ return 0; // das war wohl nichts
}
@@ -1613,7 +1613,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
{
aSave = rInsPos;
pPam->Move( fnMoveBackward, fnGoNode );
- pPam->SetMark(); // beide SwPositions ummelden!
+ pPam->SetMark(); // beide SwPositions ummelden!
pDoc->CorrAbs( aSave, *pPam->GetPoint(), 0, TRUE );
pDoc->GetNodes().Delete( aSave, 1 );
@@ -1677,7 +1677,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
if( pESh )
{
pESh->Pop( FALSE );
- pPam = 0; // pam is deleted before
+ pPam = 0; // pam is deleted before
}
}
@@ -1695,7 +1695,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
pESh->EndAllAction();
else if( pVSh )
pVSh->EndAction();
- delete pPam; // wurde am Anfang angelegt
+ delete pPam; // wurde am Anfang angelegt
}
@@ -1802,11 +1802,11 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
switch( eCreateType )
{
- case CREATE_CONNECT: // Link gleich connecten
+ case CREATE_CONNECT: // Link gleich connecten
pLnk->Connect();
break;
- case CREATE_UPDATE: // Link connecten und updaten
+ case CREATE_UPDATE: // Link connecten und updaten
pLnk->Update();
break;
case CREATE_NONE: break;
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 6aaef5e5e962..32dabad9bb3d 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@
#include <sfx2/linkmgr.hxx>
#include <sfx2/objsh.hxx>
#include <editeng/boxitem.hxx>
-#include <svx/svxids.hrc> // fuer die EventIds
+#include <svx/svxids.hrc> // fuer die EventIds
#include <sfx2/linkmgr.hxx>
#include <svtools/soerr.hxx>
#include <fmtfsize.hxx>
@@ -74,16 +74,16 @@ SV_IMPL_REF( SwServerObject )
void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
//JP 4.7.2001: call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
- // The reason is, that in the SwNoTxtFrames the Graphic
- // after a Paint will be swapped out! So all other "behind"
- // them havent't a loaded Graphic. - #86501#
+ // The reason is, that in the SwNoTxtFrames the Graphic
+ // after a Paint will be swapped out! So all other "behind"
+ // them havent't a loaded Graphic. - #86501#
rGrfNd.LockModify();
SwClientIter aIter( rGrfNd );
for( int n = 0; n < 2; ++n )
{
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
{
do {
if( (0 == n) ^ ( 0 != pLast->ISA( SwCntntFrm )) )
@@ -123,9 +123,9 @@ void SwBaseLink::DataChanged( const String& rMimeType,
USHORT nEvent = 0;
switch( sState.toInt32() )
{
- case sfx2::LinkManager::STATE_LOAD_OK: nEvent = SVX_EVENT_IMAGE_LOAD; break;
- case sfx2::LinkManager::STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break;
- case sfx2::LinkManager::STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break;
+ case sfx2::LinkManager::STATE_LOAD_OK: nEvent = SVX_EVENT_IMAGE_LOAD; break;
+ case sfx2::LinkManager::STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break;
+ case sfx2::LinkManager::STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break;
}
SwFrmFmt* pFmt;
@@ -136,7 +136,7 @@ void SwBaseLink::DataChanged( const String& rMimeType,
pDoc->CallEvent( nEvent, aCallEvent );
}
}
- return; // das wars!
+ return; // das wars!
}
BOOL bUpdate = FALSE;
@@ -190,12 +190,12 @@ void SwBaseLink::DataChanged( const String& rMimeType,
bUpdate = TRUE;
// Bug 33999: damit der Node den Transparent-Status
- // richtig gesetzt hat, ohne auf die Grafik
- // zugreifen zu muessen (sonst erfolgt ein SwapIn!).
+ // richtig gesetzt hat, ohne auf die Grafik
+ // zugreifen zu muessen (sonst erfolgt ein SwapIn!).
if( bGraphicArrived )
{
// Bug #34735#: immer mit der korrekten Grafik-Size
- // arbeiten
+ // arbeiten
if( aGrfSz.Height() && aGrfSz.Width() &&
aSz.Height() && aSz.Width() &&
aGrfSz != aSz )
@@ -330,7 +330,7 @@ BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
//Hoehe und Breite uebernehmen
aCalcSz = rFrmSz;
- const SvxBoxItem &rBox = pFmt->GetBox();
+ const SvxBoxItem &rBox = pFmt->GetBox();
aCalcSz.Width() += rBox.CalcLineSpace(BOX_LINE_LEFT) +
rBox.CalcLineSpace(BOX_LINE_RIGHT);
aCalcSz.Height()+= rBox.CalcLineSpace(BOX_LINE_TOP) +
@@ -359,12 +359,12 @@ BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
const BOOL bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
SwHTMLTableLayout *pLayout =
pTblNd->GetTable().GetHTMLTableLayout();
- if( pLayout )
+ if( pLayout )
{
const USHORT nBrowseWidth =
pLayout->GetBrowseWidthByTable( *pDoc );
if ( nBrowseWidth )
- {
+ {
pLayout->Resize( nBrowseWidth, TRUE, TRUE,
bLastGrf ? HTMLTABLE_RESIZE_NOW
: 500 );
@@ -429,8 +429,8 @@ BOOL SwBaseLink::SwapIn( BOOL bWaitForData, BOOL bNativFormat )
String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
//!! ??? what have we here to do ????
-//!! if( bNativFormat )
-//!! aData.SetAspect( aData.GetAspect() | ASPECT_ICON );
+//!! if( bNativFormat )
+//!! aData.SetAspect( aData.GetAspect() | ASPECT_ICON );
uno::Any aValue;
GetObj()->GetData( aValue, aMimeType, !IsSynchron() && bWaitForData );
@@ -443,8 +443,8 @@ BOOL SwBaseLink::SwapIn( BOOL bWaitForData, BOOL bNativFormat )
else if( 0 != ( bRes = aValue.hasValue() ) )
{
//JP 14.04.99: Bug 64820 - das Flag muss beim SwapIn natuerlich
- // zurueckgesetzt werden. Die Daten sollen ja neu
- // uebernommen werden
+ // zurueckgesetzt werden. Die Daten sollen ja neu
+ // uebernommen werden
bIgnoreDataChanged = FALSE;
DataChanged( aMimeType, aValue );
}
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index 70997287e0ae..15df3505477d 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/swthreadmanager.cxx b/sw/source/core/docnode/swthreadmanager.cxx
index 5ec9aa6806ff..89e86c5aafee 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/threadlistener.cxx b/sw/source/core/docnode/threadlistener.cxx
index 3b5ce65244e2..749c0ce53809 100644
--- a/sw/source/core/docnode/threadlistener.cxx
+++ b/sw/source/core/docnode/threadlistener.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index a1f829963a40..c42f476b4b3e 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 672692550732..4c150d0e095f 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@
#include <fmtcntnt.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
-#include <frmtool.hxx> // Notify_Background
+#include <frmtool.hxx> // Notify_Background
#include <flyfrm.hxx>
#include <frmfmt.hxx>
#include <dflyobj.hxx>
@@ -193,10 +193,10 @@ BOOL IsMarqueeTextObj( const SdrObject& rObj )
/*************************************************************************
|*
-|* SwContact, Ctor und Dtor
+|* SwContact, Ctor und Dtor
|*
-|* Ersterstellung AMA 27.Sep.96 18:13
-|* Letzte Aenderung AMA 27.Sep.96
+|* Ersterstellung AMA 27.Sep.96 18:13
+|* Letzte Aenderung AMA 27.Sep.96
|*
|*************************************************************************/
@@ -460,10 +460,10 @@ sal_uInt32 SwContact::GetMaxOrdNum() const
/*************************************************************************
|*
-|* SwFlyDrawContact, Ctor und Dtor
+|* SwFlyDrawContact, Ctor und Dtor
|*
-|* Ersterstellung OK 23.11.94 18:13
-|* Letzte Aenderung MA 06. Apr. 95
+|* Ersterstellung OK 23.11.94 18:13
+|* Letzte Aenderung MA 06. Apr. 95
|*
|*************************************************************************/
@@ -546,10 +546,10 @@ void SwFlyDrawContact::SetMaster( SdrObject* _pNewMaster )
/*************************************************************************
|*
-|* SwFlyDrawContact::CreateNewRef()
+|* SwFlyDrawContact::CreateNewRef()
|*
-|* Ersterstellung MA 14. Dec. 94
-|* Letzte Aenderung MA 24. Apr. 95
+|* Ersterstellung MA 14. Dec. 94
+|* Letzte Aenderung MA 24. Apr. 95
|*
|*************************************************************************/
@@ -628,10 +628,10 @@ sal_uInt32 SwFlyDrawContact::_GetOrdNumForNewRef( const SwFlyFrm* _pFlyFrm )
/*************************************************************************
|*
-|* SwFlyDrawContact::Modify()
+|* SwFlyDrawContact::Modify()
|*
-|* Ersterstellung OK 08.11.94 10:21
-|* Letzte Aenderung MA 06. Dec. 94
+|* Ersterstellung OK 08.11.94 10:21
+|* Letzte Aenderung MA 06. Dec. 94
|*
|*************************************************************************/
@@ -732,10 +732,10 @@ void SwFlyDrawContact::GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAncho
/*************************************************************************
|*
-|* SwDrawContact, Ctor+Dtor
+|* SwDrawContact, Ctor+Dtor
|*
-|* Ersterstellung MA 09. Jan. 95
-|* Letzte Aenderung MA 22. Jul. 98
+|* Ersterstellung MA 09. Jan. 95
+|* Letzte Aenderung MA 22. Jul. 98
|*
|*************************************************************************/
bool CheckControlLayer( const SdrObject *pObj )
@@ -1117,10 +1117,10 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
/*************************************************************************
|*
-|* SwDrawContact::Changed
+|* SwDrawContact::Changed
|*
-|* Ersterstellung MA 09. Jan. 95
-|* Letzte Aenderung MA 29. May. 96
+|* Ersterstellung MA 09. Jan. 95
+|* Letzte Aenderung MA 29. May. 96
|*
|*************************************************************************/
@@ -1419,7 +1419,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
maAnchoredDrawObj.DrawObj()->SetLayer(aInvisibleControlLayerID);
}
else
- {
+ {
maAnchoredDrawObj.DrawObj()->SetLayer(aControlLayerID);
}
}
@@ -1615,10 +1615,10 @@ namespace
/*************************************************************************
|*
-|* SwDrawContact::Modify()
+|* SwDrawContact::Modify()
|*
-|* Ersterstellung MA 09. Jan. 95
-|* Letzte Aenderung MA 03. Dec. 95
+|* Ersterstellung MA 09. Jan. 95
+|* Letzte Aenderung MA 03. Dec. 95
|*
|*************************************************************************/
@@ -1783,10 +1783,10 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
/*************************************************************************
|*
-|* SwDrawContact::DisconnectFromLayout()
+|* SwDrawContact::DisconnectFromLayout()
|*
-|* Ersterstellung MA 09. Jan. 95
-|* Letzte Aenderung MA 25. Mar. 99
+|* Ersterstellung MA 09. Jan. 95
+|* Letzte Aenderung MA 25. Mar. 99
|*
|*************************************************************************/
@@ -1908,10 +1908,10 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
/*************************************************************************
|*
-|* SwDrawContact::ConnectToLayout()
+|* SwDrawContact::ConnectToLayout()
|*
-|* Ersterstellung MA 09. Jan. 95
-|* Letzte Aenderung MA 25. Mar. 99
+|* Ersterstellung MA 09. Jan. 95
+|* Letzte Aenderung MA 25. Mar. 99
|*
|*************************************************************************/
SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
@@ -2130,10 +2130,10 @@ void SwDrawContact::InsertMasterIntoDrawPage()
/*************************************************************************
|*
-|* SwDrawContact::FindPage(), ChkPage()
+|* SwDrawContact::FindPage(), ChkPage()
|*
-|* Ersterstellung MA 21. Mar. 95
-|* Letzte Aenderung MA 19. Jul. 96
+|* Ersterstellung MA 21. Mar. 95
+|* Letzte Aenderung MA 19. Jul. 96
|*
|*************************************************************************/
@@ -2186,10 +2186,10 @@ void SwDrawContact::ChkPage()
/*************************************************************************
|*
-|* SwDrawContact::ChangeMasterObject()
+|* SwDrawContact::ChangeMasterObject()
|*
-|* Ersterstellung MA 07. Aug. 95
-|* Letzte Aenderung MA 20. Apr. 99
+|* Ersterstellung MA 07. Aug. 95
+|* Letzte Aenderung MA 20. Apr. 99
|*
|*************************************************************************/
// OD 10.07.2003 #110742# - Important note:
@@ -2229,9 +2229,9 @@ void SwDrawContact::GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchored
}
//////////////////////////////////////////////////////////////////////////////////////
-// AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed
-// since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj.
-// For paint, that offset is used by setting at the OutputDevice; for primitives this is
+// AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed
+// since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj.
+// For paint, that offset is used by setting at the OutputDevice; for primitives this is
// not possible since we have no OutputDevice, but define the geometry itself.
namespace sdr
@@ -2272,7 +2272,7 @@ namespace sdr
{
}
virtual ~VCOfDrawVirtObj();
-
+
// access to SwDrawVirtObj
SwDrawVirtObj& GetSwDrawVirtObj() const
{
@@ -2395,7 +2395,7 @@ namespace sdr
const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, xRetval));
xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
-
+
return xRetval;
}
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index c76baa5e5b86..c0a420e70837 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -81,10 +81,10 @@ TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
/*************************************************************************
|*
-|* SwFlyDrawObj::Ctor
+|* SwFlyDrawObj::Ctor
|*
-|* Ersterstellung MA 18. Apr. 95
-|* Letzte Aenderung MA 28. May. 96
+|* Ersterstellung MA 18. Apr. 95
+|* Letzte Aenderung MA 28. May. 96
|*
*************************************************************************/
@@ -152,10 +152,10 @@ SwFlyDrawObj::~SwFlyDrawObj()
/*************************************************************************
|*
-|* SwFlyDrawObj::Factory-Methoden
+|* SwFlyDrawObj::Factory-Methoden
|*
-|* Ersterstellung MA 23. Feb. 95
-|* Letzte Aenderung MA 23. Feb. 95
+|* Ersterstellung MA 23. Feb. 95
+|* Letzte Aenderung MA 23. Feb. 95
|*
*************************************************************************/
@@ -165,7 +165,7 @@ UINT32 __EXPORT SwFlyDrawObj::GetObjInventor() const
}
-UINT16 __EXPORT SwFlyDrawObj::GetObjIdentifier() const
+UINT16 __EXPORT SwFlyDrawObj::GetObjIdentifier() const
{
return SwFlyDrawObjIdentifier;
}
@@ -178,10 +178,10 @@ UINT16 __EXPORT SwFlyDrawObj::GetObjVersion() const
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::CToren, Dtor
+|* SwVirtFlyDrawObj::CToren, Dtor
|*
-|* Ersterstellung MA 08. Dec. 94
-|* Letzte Aenderung MA 28. May. 96
+|* Ersterstellung MA 08. Dec. 94
+|* Letzte Aenderung MA 28. May. 96
|*
*************************************************************************/
@@ -196,7 +196,7 @@ namespace drawinglayer
{
private:
const SwVirtFlyDrawObj& mrSwVirtFlyDrawObj;
- const basegfx::B2DRange maOuterRange;
+ const basegfx::B2DRange maOuterRange;
protected:
// method which is to be used to implement the local decomposition of a 2D primitive
@@ -242,14 +242,14 @@ namespace drawinglayer
if(!getOuterRange().isEmpty())
{
// currently this SW object has no primitive representation. As long as this is the case,
- // create invisible geometry to allow corfect HitTest and BoundRect calculations for the
+ // create invisible geometry to allow corfect HitTest and BoundRect calculations for the
// object. Use a filled primitive to get 'inside' as default object hit. The special cases from
// the old SwVirtFlyDrawObj::CheckHit implementation are handled now in SwDrawView::PickObj;
// this removed the 'hack' to get a view from inside model data or to react on null-tolerance
// as it was done in the old implementation
const Primitive2DReference aHitTestReference(
createHiddenGeometryPrimitives2D(
- true,
+ true,
getOuterRange()));
aRetval = Primitive2DSequence(&aHitTestReference, 1);
@@ -439,16 +439,16 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
__EXPORT SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
{
- if ( GetPage() ) //Der SdrPage die Verantwortung entziehen.
+ if ( GetPage() ) //Der SdrPage die Verantwortung entziehen.
GetPage()->RemoveObject( GetOrdNum() );
}
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::GetFmt()
+|* SwVirtFlyDrawObj::GetFmt()
|*
-|* Ersterstellung MA 08. Dec. 94
-|* Letzte Aenderung MA 08. Dec. 94
+|* Ersterstellung MA 08. Dec. 94
+|* Letzte Aenderung MA 08. Dec. 94
|*
*************************************************************************/
@@ -465,10 +465,10 @@ SwFrmFmt *SwVirtFlyDrawObj::GetFmt()
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::Paint()
+|* SwVirtFlyDrawObj::Paint()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 18. Dec. 95
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 18. Dec. 95
|*
*************************************************************************/
@@ -513,32 +513,32 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::TakeObjInfo()
+|* SwVirtFlyDrawObj::TakeObjInfo()
|*
-|* Ersterstellung MA 03. May. 95
-|* Letzte Aenderung MA 03. May. 95
+|* Ersterstellung MA 03. May. 95
+|* Letzte Aenderung MA 03. May. 95
|*
*************************************************************************/
void __EXPORT SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
{
- rInfo.bSelectAllowed = rInfo.bMoveAllowed =
+ rInfo.bSelectAllowed = rInfo.bMoveAllowed =
rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = TRUE;
rInfo.bRotateFreeAllowed = rInfo.bRotate90Allowed =
rInfo.bMirrorFreeAllowed = rInfo.bMirror45Allowed =
- rInfo.bMirror90Allowed = rInfo.bShearAllowed =
- rInfo.bCanConvToPath = rInfo.bCanConvToPoly =
+ rInfo.bMirror90Allowed = rInfo.bShearAllowed =
+ rInfo.bCanConvToPath = rInfo.bCanConvToPoly =
rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = FALSE;
}
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::Groessenermittlung
+|* SwVirtFlyDrawObj::Groessenermittlung
|*
-|* Ersterstellung MA 12. Jan. 95
-|* Letzte Aenderung MA 10. Nov. 95
+|* Ersterstellung MA 12. Jan. 95
+|* Letzte Aenderung MA 10. Nov. 95
|*
*************************************************************************/
@@ -636,10 +636,10 @@ void __EXPORT SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& )
/*************************************************************************
|*
-|* SwVirtFlyDrawObj::Move() und Resize()
+|* SwVirtFlyDrawObj::Move() und Resize()
|*
-|* Ersterstellung MA 12. Jan. 95
-|* Letzte Aenderung MA 26. Jul. 96
+|* Ersterstellung MA 12. Jan. 95
+|* Letzte Aenderung MA 26. Jul. 96
|*
*************************************************************************/
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index f769ed84cc63..34311748e381 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index a64046be6b8b..117efd5352ee 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -2,7 +2,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
@@ -75,10 +75,10 @@ SwDPage::~SwDPage()
/*************************************************************************
|*
-|* SwDPage::ReplaceObject()
+|* SwDPage::ReplaceObject()
|*
-|* Ersterstellung MA 07. Aug. 95
-|* Letzte Aenderung MA 07. Aug. 95
+|* Ersterstellung MA 07. Aug. 95
+|* Letzte Aenderung MA 07. Aug. 95
|*
*************************************************************************/
@@ -95,10 +95,10 @@ SdrObject* SwDPage::ReplaceObject( SdrObject* pNewObj, ULONG nObjNum )
/*************************************************************************
|*
-|* SwDPage::GetGridFrameList()
+|* SwDPage::GetGridFrameList()
|*
-|* Ersterstellung MA 04. Sep. 95
-|* Letzte Aenderung MA 15. Feb. 96
+|* Ersterstellung MA 04. Sep. 95
+|* Letzte Aenderung MA 15. Feb. 96
|*
*************************************************************************/
@@ -133,7 +133,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList(
const SwRect aRect( *pRect );
const SwFrm *pPg = pSh->GetLayout()->Lower();
do
- { if ( pPg->Frm().IsOver( aRect ) )
+ { if ( pPg->Frm().IsOver( aRect ) )
::InsertGridFrame( ((SwDPage*)this)->pGridLst, pPg );
pPg = pPg->GetNext();
} while ( pPg );
@@ -144,7 +144,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList(
const SwFrm *pPg = pSh->Imp()->GetFirstVisPage();
if ( pPg )
do
- { ::InsertGridFrame( ((SwDPage*)this)->pGridLst, pPg );
+ { ::InsertGridFrame( ((SwDPage*)this)->pGridLst, pPg );
pPg = pPg->GetNext();
} while ( pPg && pPg->Frm().IsOver( pSh->VisArea() ) );
}
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 08a6e7890742..126ab2c7ec2b 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index d4c9e3f34a64..4207552ccaf8 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -103,10 +103,10 @@ const SwFrm *lcl_FindAnchor( const SdrObject *pObj, BOOL bAll )
/*************************************************************************
|*
-|* SwDrawView::Ctor
+|* SwDrawView::Ctor
|*
-|* Ersterstellung OK 18.11.94
-|* Letzte Aenderung MA 22. Jul. 96
+|* Ersterstellung OK 18.11.94
+|* Letzte Aenderung MA 22. Jul. 96
|*
*************************************************************************/
@@ -224,12 +224,12 @@ SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, S
/*************************************************************************
|*
-|* SwDrawView::AddCustomHdl()
+|* SwDrawView::AddCustomHdl()
|*
|* Gets called every time the handles need to be build
|*
-|* Ersterstellung AW 06. Sep. 99
-|* Letzte Aenderung AW 06. Sep. 99
+|* Ersterstellung AW 06. Sep. 99
+|* Letzte Aenderung AW 06. Sep. 99
|*
*************************************************************************/
@@ -280,10 +280,10 @@ void SwDrawView::AddCustomHdl()
/*************************************************************************
|*
-|* SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
+|* SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
|*
-|* Ersterstellung MA 13. Jan. 95
-|* Letzte Aenderung MA 18. Mar. 97
+|* Ersterstellung MA 13. Jan. 95
+|* Letzte Aenderung MA 18. Mar. 97
|*
*************************************************************************/
@@ -336,10 +336,10 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
/*************************************************************************
|*
-|* SwDrawView::GetMaxToBtmObj()
+|* SwDrawView::GetMaxToBtmObj()
|*
-|* Ersterstellung MA 13. Jan. 95
-|* Letzte Aenderung MA 05. Sep. 96
+|* Ersterstellung MA 13. Jan. 95
+|* Letzte Aenderung MA 05. Sep. 96
|*
*************************************************************************/
@@ -365,10 +365,10 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
/*************************************************************************
|*
-|* SwDrawView::ObjOrderChanged()
+|* SwDrawView::ObjOrderChanged()
|*
-|* Ersterstellung MA 31. Jul. 95
-|* Letzte Aenderung MA 18. Mar. 97
+|* Ersterstellung MA 31. Jul. 95
+|* Letzte Aenderung MA 18. Mar. 97
|*
*************************************************************************/
@@ -752,10 +752,10 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
/*************************************************************************
|*
-|* SwDrawView::TakeDragLimit()
+|* SwDrawView::TakeDragLimit()
|*
-|* Ersterstellung AMA 26. Apr. 96
-|* Letzte Aenderung MA 03. May. 96
+|* Ersterstellung AMA 26. Apr. 96
+|* Letzte Aenderung MA 03. May. 96
|*
*************************************************************************/
@@ -780,10 +780,10 @@ BOOL SwDrawView::TakeDragLimit( SdrDragMode eMode,
/*************************************************************************
|*
-|* SwDrawView::CalcAnchor()
+|* SwDrawView::CalcAnchor()
|*
-|* Ersterstellung MA 13. Jan. 95
-|* Letzte Aenderung MA 08. Nov. 96
+|* Ersterstellung MA 13. Jan. 95
+|* Letzte Aenderung MA 08. Nov. 96
|*
*************************************************************************/
@@ -871,10 +871,10 @@ const SwFrm* SwDrawView::CalcAnchor()
/*************************************************************************
|*
-|* SwDrawView::ShowDragXor(), HideDragXor()
+|* SwDrawView::ShowDragXor(), HideDragXor()
|*
-|* Ersterstellung MA 17. Jan. 95
-|* Letzte Aenderung MA 27. Jan. 95
+|* Ersterstellung MA 17. Jan. 95
+|* Letzte Aenderung MA 27. Jan. 95
|*
*************************************************************************/
@@ -895,10 +895,10 @@ void SwDrawView::ShowDragAnchor()
/*************************************************************************
|*
-|* SwDrawView::MarkListHasChanged()
+|* SwDrawView::MarkListHasChanged()
|*
-|* Ersterstellung OM 02. Feb. 95
-|* Letzte Aenderung OM 07. Jul. 95
+|* Ersterstellung OM 02. Feb. 95
+|* Letzte Aenderung OM 07. Jul. 95
|*
*************************************************************************/
@@ -1016,8 +1016,8 @@ void SwDrawView::CheckPossibilities()
}
}
}
- bMoveProtect |= bProtect;
- bResizeProtect |= bProtect | bSzProtect;
+ bMoveProtect |= bProtect;
+ bResizeProtect |= bProtect | bSzProtect;
}
/** replace marked <SwDrawVirtObj>-objects by its reference object for delete
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 718dc9d04a50..08dd66389475 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -2,7 +2,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
@@ -184,13 +184,13 @@ BOOL SwAutoCorrDoc::Replace( xub_StrLen nPos, const String& rTxt )
{
SwDoc* pDoc = rEditSh.GetDoc();
-// if( !pDoc->IsAutoFmtRedline() &&
-// pPam != &rCrsr ) // nur an akt. Position das Redline sichern
-// pDoc->SetRedlineMode_intern( eOld | REDLINE_IGNORE );
+// if( !pDoc->IsAutoFmtRedline() &&
+// pPam != &rCrsr ) // nur an akt. Position das Redline sichern
+// pDoc->SetRedlineMode_intern( eOld | REDLINE_IGNORE );
if( pDoc->IsAutoFmtRedline() )
{
- if( nPos == pNd->GetTxt().Len() ) // am Ende erfolgt ein Insert
+ if( nPos == pNd->GetTxt().Len() ) // am Ende erfolgt ein Insert
{
pDoc->InsertString( *pPam, rTxt );
}
@@ -209,7 +209,7 @@ BOOL SwAutoCorrDoc::Replace( xub_StrLen nPos, const String& rTxt )
else
pDoc->Overwrite( *pPam, rTxt );
-// pDoc->SetRedlineMode_intern( eOld );
+// pDoc->SetRedlineMode_intern( eOld );
if( bUndoIdInitialized )
{
bUndoIdInitialized = true;
@@ -269,9 +269,9 @@ BOOL SwAutoCorrDoc::SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String&
// Dieser darf nicht leer sein!
// Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0
// Das Flag gibt an:
- // TRUE: den, vor der normalen Einfuegeposition (TRUE)
- // FALSE: den, in den das korrigierte Wort eingfuegt wurde.
- // (Muss nicht der gleiche Absatz sein!!!!)
+ // TRUE: den, vor der normalen Einfuegeposition (TRUE)
+ // FALSE: den, in den das korrigierte Wort eingfuegt wurde.
+ // (Muss nicht der gleiche Absatz sein!!!!)
const String* SwAutoCorrDoc::GetPrevPara( BOOL bAtNormalPos )
{
const String* pStr = 0;
@@ -400,8 +400,8 @@ BOOL SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos,
// wird nach dem austauschen der Zeichen von den Funktionen
- // - FnCptlSttWrd
- // - FnCptlSttSntnc
+ // - FnCptlSttWrd
+ // - FnCptlSttSntnc
// gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
// aufgenommen werden.
void SwAutoCorrDoc::SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos,
@@ -437,7 +437,7 @@ void SwAutoCorrExceptWord::CheckChar( const SwPosition& rPos, sal_Unicode cChr )
rPos.nContent.GetIndex() == nCntnt )
{
// die akt. Autokorrektur besorgen:
- SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get()->GetAutoCorrect();
+ SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get()->GetAutoCorrect();
// dann in die Liste aufnehmen:
if( CptlSttWrd & nFlags )
@@ -496,7 +496,7 @@ void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos )
{
SwTxtAttr* pHt = pTxtNd->GetpSwpHints()->GetTextHint( n );
nAttrStart = *pHt->GetStart();
- if( nAttrStart > nStart ) // ueber den Bereich hinaus
+ if( nAttrStart > nStart ) // ueber den Bereich hinaus
break;
if( 0 != ( pAttrEnd = pHt->GetEnd() ) &&
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2fadc7252649..fbdb7bffe258 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@
#include <pam.hxx>
#include <edimp.hxx>
#include <fesh.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <poolfmt.hxx>
#include <ndtxt.hxx>
#include <txtfrm.hxx>
@@ -83,9 +83,9 @@ using namespace ::com::sun::star;
//-------------------------------------------------------------------
//JP 16.12.99: definition:
-// from pos cPosEnDash to cPosEmDash all chars changed to endashes,
-// from pos cPosEmDash to cPosEnd all chars changed to emdashes
-// all other chars are changed to the user configuration
+// from pos cPosEnDash to cPosEmDash all chars changed to endashes,
+// from pos cPosEmDash to cPosEnd all chars changed to emdashes
+// all other chars are changed to the user configuration
const sal_Unicode pBulletChar[6] = { '+', '*', '-', 0x2013, 0x2014, 0 };
const int cnPosEnDash = 2, cnPosEmDash = 4, cnPosEnd = 5;
@@ -103,16 +103,16 @@ const USHORT cnNumBullColls = 4;
class SwAutoFormat
{
SvxSwAutoFmtFlags aFlags;
- SwPaM aDelPam; // ein Pam der benutzt werden kann
- SwNodeIndex aNdIdx; // der Index auf den akt. TextNode
- SwNodeIndex aEndNdIdx; // Index auf das Ende vom Bereich
+ SwPaM aDelPam; // ein Pam der benutzt werden kann
+ SwNodeIndex aNdIdx; // der Index auf den akt. TextNode
+ SwNodeIndex aEndNdIdx; // Index auf das Ende vom Bereich
SwEditShell* pEditShell;
SwDoc* pDoc;
- SwTxtNode* pAktTxtNd; // der akt. TextNode
- SwTxtFrm* pAktTxtFrm; // Frame vom akt. TextNode
- CharClass* pCharClass; // Character classification
- ULONG nEndNdIdx; // fuer die Prozent-Anzeige
+ SwTxtNode* pAktTxtNd; // der akt. TextNode
+ SwTxtFrm* pAktTxtFrm; // Frame vom akt. TextNode
+ CharClass* pCharClass; // Character classification
+ ULONG nEndNdIdx; // fuer die Prozent-Anzeige
LanguageType eCharClassLang;
USHORT nLastHeadLvl, nLastCalcHeadLvl;
@@ -178,7 +178,7 @@ class SwAutoFormat
// TxtNode Methoden
const SwTxtNode* GetNextNode() const;
BOOL IsEmptyLine( const SwTxtNode& rNd ) const
- { return 0 == rNd.GetTxt().Len() ||
+ { return 0 == rNd.GetTxt().Len() ||
rNd.GetTxt().Len() == GetLeadingBlanks( rNd.GetTxt() ); }
BOOL IsOneLine( const SwTxtNode& ) const;
@@ -242,9 +242,9 @@ class SwAutoFormat
void _SetRedlineTxt( USHORT nId );
BOOL SetRedlineTxt( USHORT nId )
- { if( aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return TRUE; }
+ { if( aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return TRUE; }
BOOL ClearRedlineTxt()
- { if( aFlags.bWithRedlining ) pDoc->SetAutoFmtRedlineComment(0); return TRUE; }
+ { if( aFlags.bWithRedlining ) pDoc->SetAutoFmtRedlineComment(0); return TRUE; }
public:
SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
@@ -345,9 +345,9 @@ String SwAutoFormat::GoNextPara()
pNewNd = &aNdIdx.GetNode();
// kein TextNode ->
- // TableNode : Tabelle ueberspringen
- // NoTxtNode : Nodes ueberspringen
- // EndNode : Ende erreicht, beenden
+ // TableNode : Tabelle ueberspringen
+ // NoTxtNode : Nodes ueberspringen
+ // EndNode : Ende erreicht, beenden
if( pNewNd->IsEndNode() )
{
bEnde = TRUE;
@@ -454,7 +454,7 @@ BOOL SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const
{
if( IsSpace( *pTmp ) )
{
- if( IsSpace( *++pTmp )) // 2 Space nach einander
+ if( IsSpace( *++pTmp )) // 2 Space nach einander
{
const sal_Unicode* pStt = pTmp;
while( *pTmp && IsSpace( *++pTmp ))
@@ -496,10 +496,10 @@ USHORT SwAutoFormat::CalcLevel( const SwTxtNode& rNd, USHORT *pDigitLvl ) const
{
switch( rTxt.GetChar( n ) )
{
- case ' ': if( 3 == ++nBlnk )
+ case ' ': if( 3 == ++nBlnk )
++nLvl, nBlnk = 0;
break;
- case '\t': ++nLvl, nBlnk = 0;
+ case '\t': ++nLvl, nBlnk = 0;
break;
default:
if( pDigitLvl )
@@ -537,7 +537,7 @@ BOOL SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
if( !rStr.Len() )
return FALSE;
// oder besser: ueber die Anzahl von Alpha/Num- und !AN-Zeichen
- // bestimmen.
+ // bestimmen.
xub_StrLen nANChar = 0, nBlnk = 0;
CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().GetLanguage().GetLanguage() );
@@ -549,7 +549,7 @@ BOOL SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
// sind zu 75% keine Alpha-Nummerische-Zeichen, dann TRUE
ULONG nLen = rStr.Len() - nBlnk;
- nLen = ( nLen * 3 ) / 4; // long overflow, if the strlen > USHORT
+ nLen = ( nLen * 3 ) / 4; // long overflow, if the strlen > USHORT
return xub_StrLen(nLen) < (rStr.Len() - nANChar - nBlnk);
}
@@ -566,17 +566,17 @@ BOOL SwAutoFormat::DoUnderline()
while( *pStr )
{
//JP 29.03.96: Spaces unterbrechen die Umrandung!
-// if( !IsSpace( *pStr ) )
+// if( !IsSpace( *pStr ) )
{
int eTmp = 0;
switch( *pStr )
{
- case '-': eTmp = 1; break;
- case '_': eTmp = 2; break;
- case '=': eTmp = 3; break;
- case '*': eTmp = 4; break;
- case '~': eTmp = 5; break;
- case '#': eTmp = 6; break;
+ case '-': eTmp = 1; break;
+ case '_': eTmp = 2; break;
+ case '=': eTmp = 3; break;
+ case '*': eTmp = 4; break;
+ case '~': eTmp = 5; break;
+ case '#': eTmp = 6; break;
default:
return FALSE;
}
@@ -596,33 +596,33 @@ BOOL SwAutoFormat::DoUnderline()
aDelPam.SetMark();
aDelPam.GetMark()->nContent = 0;
//JP 19.03.96: kein Underline sondern eine Umrandung setzen!
-// pDoc->Insert( aDelPam, SvxUnderlineItem( eState ) );
+// pDoc->Insert( aDelPam, SvxUnderlineItem( eState ) );
SvxBorderLine aLine;
switch( eState )
{
- case 1: // einfach, 0,05 pt
+ case 1: // einfach, 0,05 pt
aLine.SetOutWidth( DEF_LINE_WIDTH_0 );
break;
- case 2: // einfach, 1,0 pt
+ case 2: // einfach, 1,0 pt
aLine.SetOutWidth( DEF_LINE_WIDTH_1 );
break;
- case 3: // doppelt, 1,1 pt
+ case 3: // doppelt, 1,1 pt
aLine.SetOutWidth( DEF_DOUBLE_LINE0_OUT );
aLine.SetInWidth( DEF_DOUBLE_LINE0_IN );
aLine.SetDistance( DEF_DOUBLE_LINE0_DIST );
break;
- case 4: // doppelt, 4,5 pt
+ case 4: // doppelt, 4,5 pt
aLine.SetOutWidth( DEF_DOUBLE_LINE4_OUT );
aLine.SetInWidth( DEF_DOUBLE_LINE4_IN );
aLine.SetDistance( DEF_DOUBLE_LINE4_DIST );
break;
- case 5: // doppelt, 6,0 pt
+ case 5: // doppelt, 6,0 pt
aLine.SetOutWidth( DEF_DOUBLE_LINE5_OUT );
aLine.SetInWidth( DEF_DOUBLE_LINE5_IN );
aLine.SetDistance( DEF_DOUBLE_LINE5_DIST );
break;
- case 6: // doppelt, 9,0 pt
+ case 6: // doppelt, 9,0 pt
aLine.SetOutWidth( DEF_DOUBLE_LINE6_OUT );
aLine.SetInWidth( DEF_DOUBLE_LINE6_IN );
aLine.SetDistance( DEF_DOUBLE_LINE6_DIST );
@@ -635,7 +635,7 @@ BOOL SwAutoFormat::DoUnderline()
aSet.Put( SwParaConnectBorderItem( FALSE ) );
SvxBoxItem aBox( RES_BOX );
aBox.SetLine( &aLine, BOX_LINE_BOTTOM );
- aBox.SetDistance( 42 ); // ~0,75 mm
+ aBox.SetDistance( 42 ); // ~0,75 mm
aSet.Put(aBox);
pDoc->InsertItemSet( aDelPam, aSet, 0 );
@@ -736,7 +736,7 @@ String& SwAutoFormat::DelLeadingBlanks( String& rStr ) const
for( nL = rStr.Len(), n = 0; n < nL && IsSpace( rStr.GetChar(n) ); ++n )
;
- if( n ) // keine Spaces
+ if( n ) // keine Spaces
rStr.Erase( 0, n );
return rStr;
}
@@ -750,7 +750,7 @@ String& SwAutoFormat::DelTrailingBlanks( String& rStr ) const
while( --n && IsSpace( rStr.GetChar( n ) ) )
;
- if( n+1 != nL ) // keine Spaces
+ if( n+1 != nL ) // keine Spaces
rStr.Erase( n+1 );
return rStr;
}
@@ -820,7 +820,7 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
{
if( eScan & DELIM )
{
- if( eScan & CHG ) // nicht wenns mit einer Zahl beginnt
+ if( eScan & CHG ) // nicht wenns mit einer Zahl beginnt
{
++nDigitLvl;
if( pPostFix )
@@ -835,12 +835,12 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
else if( pNumTypes && !(eScan & DIGIT) )
*pNumTypes += (sal_Unicode)('0' + SVX_NUM_ARABIC);
- eScan &= ~DELIM; // Delim raus
+ eScan &= ~DELIM; // Delim raus
if( 0 != (eScan & ~CHG) && DIGIT != (eScan & ~CHG))
return USHRT_MAX;
- eScan |= DIGIT; // Digit rein
- if( 3 == ++nDigitCnt ) // mehr als 2 Nummern sind kein Enum mehr
+ eScan |= DIGIT; // Digit rein
+ if( 3 == ++nDigitCnt ) // mehr als 2 Nummern sind kein Enum mehr
return USHRT_MAX;
nStart *= 10;
@@ -857,7 +857,7 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
// roemische Zeichen sind "mdclxvi". Da man aber eher mal eine
// Numerierung mit c oder d anfangen will, werden diese erstmal
// zu chars und spaeter ggfs. zu romischen Zeichen!
-// if( strchr( "mdclxvi", cLow ))
+// if( strchr( "mdclxvi", cLow ))
#ifdef WITH_ALPHANUM_AS_NUMFMT
//detection of 'c' and 'd' a ROMAN numbering should not be done here
if( 256 > cLow &&( (eScan & (LOWER_ROMAN|UPPER_ROMAN))
@@ -899,7 +899,7 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
if( eScan & DELIM )
{
- if( eScan & CHG ) // nicht wenns mit einer Zahl beginnt
+ if( eScan & CHG ) // nicht wenns mit einer Zahl beginnt
{
++nDigitLvl;
if( pPostFix )
@@ -913,7 +913,7 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
else if( pNumTypes && !(eScan & eTmpScan) )
*pNumTypes += cNumTyp;
- eScan &= ~DELIM; // Delim raus
+ eScan &= ~DELIM; // Delim raus
// falls ein andere Type gesetzt ist, brechen wir ab
if( 0 != ( eScan & ~CHG ) && eTmpScan != ( eScan & ~CHG ))
@@ -931,12 +931,12 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
BOOL bError = FALSE;
switch( cLow )
{
- case 'm': nVal = 1000; goto CHECK_ROMAN_1;
- case 'd': nVal = 500; goto CHECK_ROMAN_5;
- case 'c': nVal = 100; goto CHECK_ROMAN_1;
- case 'l': nVal = 50; goto CHECK_ROMAN_5;
- case 'x': nVal = 10; goto CHECK_ROMAN_1;
- case 'v': nVal = 5; goto CHECK_ROMAN_5;
+ case 'm': nVal = 1000; goto CHECK_ROMAN_1;
+ case 'd': nVal = 500; goto CHECK_ROMAN_5;
+ case 'c': nVal = 100; goto CHECK_ROMAN_1;
+ case 'l': nVal = 50; goto CHECK_ROMAN_5;
+ case 'x': nVal = 10; goto CHECK_ROMAN_1;
+ case 'v': nVal = 5; goto CHECK_ROMAN_5;
CHECK_ROMAN_1:
{
@@ -989,7 +989,7 @@ CHECK_ROMAN_5:
if( bError )
return USHRT_MAX;
}
- eScan |= eTmpScan; // Digit rein
+ eScan |= eTmpScan; // Digit rein
++nDigitCnt;
}
else if( (256 > cCurrentChar &&
@@ -1016,8 +1016,8 @@ CHECK_ROMAN_5:
(*pPreFix += (sal_Unicode)1)
+= String::CreateFromInt32( nStart );
}
- eScan &= ~NO_DELIM; // Delim raus
- eScan |= DELIM; // Digit rein
+ eScan &= ~NO_DELIM; // Delim raus
+ eScan |= DELIM; // Digit rein
nDigitCnt = 0;
nStart = 0;
}
@@ -1030,11 +1030,11 @@ CHECK_ROMAN_5:
(nOpeningParentheses > nClosingParentheses))
return USHRT_MAX;
- if( (NO_DELIM & eScan) && pPreFix ) // den letzen nicht vergessen
+ if( (NO_DELIM & eScan) && pPreFix ) // den letzen nicht vergessen
(*pPreFix += (sal_Unicode)1) += String::CreateFromInt32( nStart );
rPos = nPos;
- return nDigitLvl; // 0 .. 9 (MAXLEVEL - 1)
+ return nDigitLvl; // 0 .. 9 (MAXLEVEL - 1)
}
@@ -1274,7 +1274,7 @@ void SwAutoFormat::DelMoreLinesBlanks( BOOL bWithLineBreaks )
{
if( aFlags.bAFmtByInput
? aFlags.bAFmtByInpDelSpacesBetweenLines
- : aFlags.bAFmtDelSpacesBetweenLines )
+ : aFlags.bAFmtDelSpacesBetweenLines )
{
// loesche alle "Blanks" Links und Rechts vom Einzug
aDelPam.DeleteMark();
@@ -1386,7 +1386,7 @@ void SwAutoFormat::BuildTextIndent()
{
SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
const SwTxtNode* pNxtNd = GetNextNode();
- while( CanJoin( pNxtNd ) &&
+ while( CanJoin( pNxtNd ) &&
CalcLevel( *pNxtNd ) )
{
bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
@@ -1422,7 +1422,7 @@ void SwAutoFormat::BuildText()
{
SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
const SwTxtNode* pNxtNd = GetNextNode();
- while( CanJoin( pNxtNd ) &&
+ while( CanJoin( pNxtNd ) &&
!CalcLevel( *pNxtNd ) )
{
bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
@@ -1470,7 +1470,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
IsBlanksInString( *pAktTxtNd ) ||
IsSentenceAtEnd( *pAktTxtNd );
sal_Bool bRTL = pEditShell->IsInRightToLeftText();
-// SetColl( RES_POOLCOLL_NUM_LEVEL1 + ( nLvl * 4 ) );
+// SetColl( RES_POOLCOLL_NUM_LEVEL1 + ( nLvl * 4 ) );
DeleteAktPara( TRUE, TRUE );
BOOL bChgBullet = FALSE, bChgEnum = FALSE;
@@ -1491,7 +1491,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
const String& rStr = pAktTxtNd->GetTxt();
xub_StrLen nTxtStt = 0, nOrigTxtStt = 0;
const sal_Unicode* pFndBulletChr;
-// if( aFlags.bAFmtByInput ? aFlags.bSetNumRule : aFlags.bChgEnumNum &&
+// if( aFlags.bAFmtByInput ? aFlags.bSetNumRule : aFlags.bChgEnumNum &&
if( aFlags.bChgEnumNum &&
2 < rStr.Len() &&
0 != ( pFndBulletChr = StrChr( pBulletChar, rStr.GetChar( nTxtStt ) ))
@@ -1567,8 +1567,8 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
// dann ist das eine Nummerierung
//JP 21.11.97: Der NumLevel wird entweder der DigitLevel oder
- // wenn der nicht vorhanden oder 0 ist, durch den
- // (Einrueckungs-)Level.
+ // wenn der nicht vorhanden oder 0 ist, durch den
+ // (Einrueckungs-)Level.
String aPostFix, aPreFix, aNumTypes;
if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *pAktTxtNd, nTxtStt,
@@ -1587,7 +1587,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
if( bChgEnum && aFlags.bSetNumRule )
{
- if( !pCur ) // NumRule anpassen, wenn sie neu ist
+ if( !pCur ) // NumRule anpassen, wenn sie neu ist
{
SwCharFmt* pCFmt = pDoc->GetCharFmtFromPool(
RES_POOLCHR_NUM_LEVEL );
@@ -1733,7 +1733,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
if( bBreak )
{
- AutoCorrect( nAutoCorrPos ); /* Offset wegen Bullet + Tab */
+ AutoCorrect( nAutoCorrPos ); /* Offset wegen Bullet + Tab */
return;
}
@@ -1797,7 +1797,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
;
++nSpaceStt;
- if( bInsTab && '\t' == rStr.GetChar( nSpaceStt ) ) // ein Tab, das belassen wir
+ if( bInsTab && '\t' == rStr.GetChar( nSpaceStt ) ) // ein Tab, das belassen wir
{
++nSpaceStt;
bInsTab = FALSE;
@@ -1826,7 +1826,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
SwTxtFrmInfo aFInfo( pAktTxtFrm );
const SwTxtNode* pNxtNd = GetNextNode();
- while( CanJoin( pNxtNd ) &&
+ while( CanJoin( pNxtNd ) &&
20 < Abs( (long)(nSpaces - aFInfo.SetFrm(
GetFrm( *pNxtNd ) ).GetLineStart() ))
)
@@ -1927,9 +1927,9 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
while( nPos < pTxt->Len() && IsSpace( cChar = pTxt->GetChar( nPos ) ))
++nPos;
if( nPos == pTxt->Len() )
- break; // das wars
+ break; // das wars
- if( ( ( bReplaceQuote && '\"' == cChar ) ||
+ if( ( ( bReplaceQuote && '\"' == cChar ) ||
( bReplaceSglQuote && '\'' == cChar ) ) &&
( !nPos || ' ' == pTxt->GetChar( nPos-1 ) ) )
{
@@ -2074,7 +2074,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
LanguageType eLang = (bGetLanguage && pAktTxtNd)
? pAktTxtNd->GetLang( nSttPos )
: LANGUAGE_SYSTEM;
-
+
SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
if ( pATst->FnAddNonBrkSpace( aACorrDoc, *pTxt, nSttPos, nPos, eLang ) )
--nPos;
@@ -2087,15 +2087,15 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
if( aFlags.bCptlSttSntnc )
bFirstSent = TRUE;
//alle Wortrenner loesen die Autokorrektur aus!
-// break;
+// break;
default:
//alle Wortrenner loesen die Autokorrektur aus!
-// case ' ':
-// case '\t':
+// case ' ':
+// case '\t':
if( !( rAppCC.isLetterNumeric( *pTxt, nPos )
|| '/' == cChar )) // '/' should not be a word seperator (e.g. '1/2' needs to be handled as one word for replacement)
{
- --nPos; // ++nPos von dem for ungueltig machen !
+ --nPos; // ++nPos von dem for ungueltig machen !
++bBreak;
}
break;
@@ -2129,13 +2129,13 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
aDelPam.DeleteMark();
}
- continue; // nichts weiter mehr abpruefen
+ continue; // nichts weiter mehr abpruefen
}
LanguageType eLang = (bGetLanguage && pAktTxtNd)
? pAktTxtNd->GetLang( nSttPos )
: LANGUAGE_SYSTEM;
-
+
if ( aFlags.bAddNonBrkSpace )
{
SetRedlineTxt( STR_AUTOFMTREDL_NON_BREAK_SPACE );
@@ -2216,7 +2216,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( pSttNd )
{
aNdIdx = *pSttNd;
- aNdIdx--; // fuer GoNextPara, ein Absatz davor
+ aNdIdx--; // fuer GoNextPara, ein Absatz davor
aEndNdIdx = *pEndNd;
aEndNdIdx++;
@@ -2227,7 +2227,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
IsNoAlphaLine( *pNxtNd );
}
else
- bEmptyLine = TRUE; // am Dokument Anfang
+ bEmptyLine = TRUE; // am Dokument Anfang
bEnde = FALSE;
@@ -2283,7 +2283,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
aWarning.SetDefaultCheckBoxText();
USHORT nDefaultButton = nResult==RET_YES?BUTTONID_YES:(nResult==RET_NO?BUTTONID_NO:BUTTONID_CANCEL);
aWarning.SetFocusButton(nDefaultButton);
- nResult = aWarning.Execute();
+ nResult = aWarning.Execute();
m_bAskForCancelUndoWhileBufferOverflow = !aWarning.GetCheckBoxState();
m_nActionWhileAutoformatUndoBufferOverflow = nResult;
// TODO: #102007# store m_bAskForCancelUndoWhileBufferOverflow in configuration
@@ -2332,7 +2332,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
DelEmptyLine();
// wurde wiklich ein Node geloescht ?
if( nOldCnt != pDoc->GetNodes().Count() )
- aNdIdx--; // nicht den naechsten Absatz ueberspringen
+ aNdIdx--; // nicht den naechsten Absatz ueberspringen
}
eStat = READ_NEXT_PARA;
}
@@ -2347,7 +2347,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( aFlags.bAFmtByInput && aFlags.bCreateTable && DoTable() )
{
//JP 30.09.96: das DoTable() verlaesst sich auf das
- // Pop und Move - Crsr nach dem AutoFormat!
+ // Pop und Move - Crsr nach dem AutoFormat!
pEdShell->Pop( FALSE );
*pEdShell->GetCrsr() = aDelPam;
pEdShell->Push();
@@ -2387,8 +2387,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
aFInfo.SetFrm( pAktTxtFrm );
// erstmal: wurden schon mal entsprechende Vorlagen
- // vergeben, so behalte die bei, gehe zum
- // naechsten Node.
+ // vergeben, so behalte die bei, gehe zum
+ // naechsten Node.
USHORT nPoolId = pAktTxtNd->GetTxtColl()->GetPoolFmtId();
if( IsPoolUserFmt( nPoolId )
? !aFlags.bChgUserColl
@@ -2414,7 +2414,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
0 != pLRSpace->GetTxtLeft() ) )
{
// Ausnahme: Numerierun/Aufzaehlung kann mit Einzug
- // existieren!!
+ // existieren!!
if( IsEnumericChar( *pAktTxtNd ))
{
nLevel = CalcLevel( *pAktTxtNd, &nDigitLvl );
@@ -2433,11 +2433,11 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( bReplaceStyles )
{
// dann setze doch eine unserer Vorlagen
- if( 0 < nSz ) // positiver 1. Zeileneinzug
+ if( 0 < nSz ) // positiver 1. Zeileneinzug
BuildIndent();
- else if( 0 > nSz ) // negativer 1. Zeileneinzug
+ else if( 0 > nSz ) // negativer 1. Zeileneinzug
BuildNegIndent( aFInfo.GetLineStart() );
- else if( pLRSpace->GetTxtLeft() ) // ist ein Einzug
+ else if( pLRSpace->GetTxtLeft() ) // ist ein Einzug
BuildTextIndent();
}
eStat = READ_NEXT_PARA;
@@ -2461,8 +2461,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
// fuer z.B. selbst definierte Einzuege oder
// rechts/zentierte Ausrichtung
-// if( !nLevel && 0 != aFInfo.GetLineStart() )
-// nLevel = 1;
+// if( !nLevel && 0 != aFInfo.GetLineStart() )
+// nLevel = 1;
}
else
{
@@ -2486,7 +2486,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
{
bEmptyLine = TRUE;
eStat = READ_NEXT_PARA;
- break; // naechsten Absatz lesen
+ break; // naechsten Absatz lesen
}
// Teste auf Ueberschrift
@@ -2505,8 +2505,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
// Wie ist denn nun die Bedingung fuer die Ueberschrift auf Ebene 3 ??
// Zur Zeit: generell wenn am Ende ein ':' ist.
//
-// if( bNxtEmpty || bNxtAlpha )
-// !IsEnumericChar( *pNxtNd ) )
+// if( bNxtEmpty || bNxtAlpha )
+// !IsEnumericChar( *pNxtNd ) )
//---------------------------------------------------------------------------
{
BuildHeadLine( 2 );
@@ -2528,8 +2528,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
)
{
// wurde Level vom Text vorgegeben ?
-// if( USHRT_MAX != nDigitLvl )
-// nLevel = nDigitLvl;
+// if( USHRT_MAX != nDigitLvl )
+// nLevel = nDigitLvl;
// eine Ebene runter ?
if( nLevel >= MAXLEVEL )
@@ -2572,8 +2572,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
eStat = READ_NEXT_PARA;
}
//JP 25.03.96: Vorlagen fuer Einzug zulassen
-// else if( aFlags.bAFmtByInput )
-// eStat = READ_NEXT_PARA;
+// else if( aFlags.bAFmtByInput )
+// eStat = READ_NEXT_PARA;
else if( bReplaceStyles )
eStat = nLevel ? TST_IDENT : TST_NEG_IDENT;
else
@@ -2586,11 +2586,11 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( bMoreLines && nLevel )
{
SwTwips nSz = aFInfo.GetFirstIndent();
- if( 0 < nSz ) // positiver 1. Zeileneinzug
+ if( 0 < nSz ) // positiver 1. Zeileneinzug
BuildIndent();
- else if( 0 > nSz ) // negativer 1. Zeileneinzug
+ else if( 0 > nSz ) // negativer 1. Zeileneinzug
BuildNegIndent( aFInfo.GetLineStart() );
- else // ist ein Einzug
+ else // ist ein Einzug
BuildTextIndent();
eStat = READ_NEXT_PARA;
}
@@ -2612,11 +2612,11 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( bMoreLines && !nLevel )
{
SwTwips nSz = aFInfo.GetFirstIndent();
- if( 0 < nSz ) // positiver 1. Zeileneinzug
+ if( 0 < nSz ) // positiver 1. Zeileneinzug
BuildIndent();
- else if( 0 > nSz ) // negativer 1. Zeileneinzug
+ else if( 0 > nSz ) // negativer 1. Zeileneinzug
BuildNegIndent( aFInfo.GetLineStart() );
- else // ist ein kein Einzug
+ else // ist ein kein Einzug
BuildText();
eStat = READ_NEXT_PARA;
}
@@ -2638,11 +2638,11 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
if( bMoreLines )
{
SwTwips nSz = aFInfo.GetFirstIndent();
- if( 0 < nSz ) // positiver 1. Zeileneinzug
+ if( 0 < nSz ) // positiver 1. Zeileneinzug
BuildIndent();
- else if( 0 > nSz ) // negativer 1. Zeileneinzug
+ else if( 0 > nSz ) // negativer 1. Zeileneinzug
BuildNegIndent( aFInfo.GetLineStart() );
- else if( nLevel ) // ist ein Einzug
+ else if( nLevel ) // ist ein Einzug
BuildTextIndent();
else
BuildText();
@@ -2658,8 +2658,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
case HAS_FMTCOLL:
{
// erstmal: wurden schon mal entsprechende Vorlagen
- // vergeben, so behalte die bei, gehe zum
- // naechsten Node.
+ // vergeben, so behalte die bei, gehe zum
+ // naechsten Node.
bEmptyLine = FALSE;
eStat = READ_NEXT_PARA;
// loesche alle Blanks am Anfang/Ende
@@ -2680,13 +2680,13 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
0 != pLRSpace->GetTxtLeft() ) )
{
// dann setze doch eine unserer Vorlagen
- if( 0 < nSz ) // positiver 1. Zeileneinzug
+ if( 0 < nSz ) // positiver 1. Zeileneinzug
BuildIndent();
- else if( 0 > nSz ) // negativer 1. Zeileneinzug
+ else if( 0 > nSz ) // negativer 1. Zeileneinzug
{
BuildNegIndent( aFInfo.GetLineStart() );
}
- else if( pLRSpace->GetTxtLeft() ) // ist ein Einzug
+ else if( pLRSpace->GetTxtLeft() ) // ist ein Einzug
BuildTextIndent();
else
BuildText();
@@ -2721,8 +2721,8 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags )
StartAllAction();
StartUndo( UNDO_AUTOFORMAT );
- SvxSwAutoFmtFlags aAFFlags; // erst mal default - Werte
- if( pAFlags ) // oder doch angegeben ??
+ SvxSwAutoFmtFlags aAFFlags; // erst mal default - Werte
+ if( pAFlags ) // oder doch angegeben ??
{
aAFFlags = *pAFlags;
if( !aAFFlags.bAFmtByInput )
@@ -2785,15 +2785,15 @@ void SwEditShell::AutoFmtBySplitNode()
if( bRange )
{
- Push(); // Cursor sichern
+ Push(); // Cursor sichern
- SvxSwAutoFmtFlags aAFFlags = *GetAutoFmtFlags(); // erst mal default - Werte
+ SvxSwAutoFmtFlags aAFFlags = *GetAutoFmtFlags(); // erst mal default - Werte
SwAutoFormat aFmt( this, aAFFlags, &pCrsr->GetMark()->nNode,
&pCrsr->GetPoint()->nNode );
//JP 30.09.96: das DoTable() verlaesst sich auf das PopCrsr
- // und MoveCrsr!
+ // und MoveCrsr!
Pop( FALSE );
pCrsr = GetCrsr();
}
@@ -2817,22 +2817,22 @@ void SwEditShell::SetAutoFmtFlags(SvxSwAutoFmtFlags * pFlags)
{
SvxSwAutoFmtFlags* pEditFlags = GetAutoFmtFlags();
- pEditFlags->bSetNumRule = pFlags->bSetNumRule;
- pEditFlags->bChgEnumNum = pFlags->bChgEnumNum;
- pEditFlags->bSetBorder = pFlags->bSetBorder;
- pEditFlags->bCreateTable = pFlags->bCreateTable;
- pEditFlags->bReplaceStyles = pFlags->bReplaceStyles;
+ pEditFlags->bSetNumRule = pFlags->bSetNumRule;
+ pEditFlags->bChgEnumNum = pFlags->bChgEnumNum;
+ pEditFlags->bSetBorder = pFlags->bSetBorder;
+ pEditFlags->bCreateTable = pFlags->bCreateTable;
+ pEditFlags->bReplaceStyles = pFlags->bReplaceStyles;
pEditFlags->bAFmtByInpDelSpacesAtSttEnd =
pFlags->bAFmtByInpDelSpacesAtSttEnd;
pEditFlags->bAFmtByInpDelSpacesBetweenLines =
pFlags->bAFmtByInpDelSpacesBetweenLines;
//JP 15.12.98: BulletZeichen und Font in die "normalen" kopieren,
- // weil beim Autoformat nur mit diesen gearbeitet wird!
- pEditFlags->cBullet = pFlags->cByInputBullet;
- pEditFlags->aBulletFont = pFlags->aByInputBulletFont;
- pEditFlags->cByInputBullet = pFlags->cByInputBullet;
- pEditFlags->aByInputBulletFont = pFlags->aByInputBulletFont;
+ // weil beim Autoformat nur mit diesen gearbeitet wird!
+ pEditFlags->cBullet = pFlags->cByInputBullet;
+ pEditFlags->aBulletFont = pFlags->aByInputBulletFont;
+ pEditFlags->cByInputBullet = pFlags->cByInputBullet;
+ pEditFlags->aByInputBulletFont = pFlags->aByInputBulletFont;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index d2edcc2ebd99..8077547036d0 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -2,7 +2,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
@@ -68,9 +68,9 @@ void SwEditShell::ResetAttr( const SvUShortsSort* pAttrs )
void SwEditShell::GCAttr()
{
//JP 04.02.97: wozu eine Action-Klammerung - ein Formatierung sollte nicht
-// ausgeloest werden, so dass es hier ueberfluessig ist.
-// Sonst Probleme im MouseBut.DownHdl - Bug 35562
-// StartAllAction();
+// ausgeloest werden, so dass es hier ueberfluessig ist.
+// Sonst Probleme im MouseBut.DownHdl - Bug 35562
+// StartAllAction();
FOREACHPAM_START(this)
SwTxtNode *pTxtNode;
if ( !PCURCRSR->HasMark() )
@@ -92,7 +92,7 @@ void SwEditShell::GCAttr()
aIdx <= rEnd );
}
FOREACHPAM_END()
-// EndAllAction();
+// EndAllAction();
}
// Setze das Attribut als neues default Attribut im Dokument.
@@ -131,7 +131,7 @@ void SwEditShell::SetAttr( const SfxPoolItem& rHint, USHORT nFlags )
SET_CURR_SHELL( this );
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
+ if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
{
BOOL bIsTblMode = IsTableMode();
GetDoc()->StartUndo(UNDO_INSATTR, NULL);
@@ -161,7 +161,7 @@ void SwEditShell::SetAttr( const SfxItemSet& rSet, USHORT nFlags )
SET_CURR_SHELL( this );
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
+ if( pCrsr->GetNext() != pCrsr ) // Ring von Cursorn
{
BOOL bIsTblMode = IsTableMode();
GetDoc()->StartUndo(UNDO_INSATTR, NULL);
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 9ff64239398e..c3cc8af0b155 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -2,7 +2,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
@@ -40,9 +40,9 @@
#include <txtftn.hxx>
#include <fmtftn.hxx>
#include <editsh.hxx>
-#include <edimp.hxx> // fuer MACROS
+#include <edimp.hxx> // fuer MACROS
#include <doc.hxx>
-#include <swundo.hxx> // fuer UNDO-Ids
+#include <swundo.hxx> // fuer UNDO-Ids
#include <ndtxt.hxx>
#include <ftnidx.hxx>
#include <expfld.hxx>
@@ -52,7 +52,7 @@
#include <txtfld.hxx>
#include <fmtfld.hxx>
#include <crsskip.hxx>
-#include <txtfrm.hxx> // SwTxtFrm
+#include <txtfrm.hxx> // SwTxtFrm
#include <scriptinfo.hxx>
#include <svl/ctloptions.hxx>
#include <charfmt.hxx> // #i27615#
@@ -387,7 +387,7 @@ void SwEditShell::MoveLeftMargin( BOOL bRight, BOOL bModulus )
StartUndo( UNDO_START );
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
SwPamRanges aRangeArr( *pCrsr );
SwPaM aPam( *pCrsr->GetPoint() );
@@ -408,9 +408,9 @@ inline USHORT lcl_SetScriptFlags( USHORT nType )
USHORT nRet;
switch( nType )
{
- case ::com::sun::star::i18n::ScriptType::LATIN: nRet = SCRIPTTYPE_LATIN; break;
- case ::com::sun::star::i18n::ScriptType::ASIAN: nRet = SCRIPTTYPE_ASIAN; break;
- case ::com::sun::star::i18n::ScriptType::COMPLEX: nRet = SCRIPTTYPE_COMPLEX; break;
+ case ::com::sun::star::i18n::ScriptType::LATIN: nRet = SCRIPTTYPE_LATIN; break;
+ case ::com::sun::star::i18n::ScriptType::ASIAN: nRet = SCRIPTTYPE_ASIAN; break;
+ case ::com::sun::star::i18n::ScriptType::COMPLEX: nRet = SCRIPTTYPE_COMPLEX; break;
default: nRet = 0;
}
return nRet;
@@ -509,7 +509,7 @@ USHORT SwEditShell::GetScriptType() const
xub_StrLen nPos = pStt->nContent.GetIndex();
//Task 90448: we need the scripttype of the previous
- // position, if no selection exist!
+ // position, if no selection exist!
if( nPos )
{
SwIndex aIdx( pStt->nContent );
@@ -610,7 +610,7 @@ USHORT SwEditShell::GetCurLang() const
if( pTNd )
{
//JP 24.9.2001: if exist no selection, then get the language before
- // the current character!
+ // the current character!
xub_StrLen nPos = rPos.nContent.GetIndex();
if( nPos && !pCrsr->HasMark() )
--nPos;
@@ -642,7 +642,7 @@ USHORT SwEditShell::GetScalingOfSelectedText() const
nScaleWidth = pTNd->GetScalingOfSelectedText( nStt, nEnd );
}
else
- nScaleWidth = 100; // default are no scaling -> 100%
+ nScaleWidth = 100; // default are no scaling -> 100%
return nScaleWidth;
}
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index f1d24f6c4511..60fe52d0092c 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <editsh.hxx>
#include <cntfrm.hxx>
#include <pam.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <edimp.hxx>
#include <IMark.hxx>
#include <docary.hxx>
@@ -59,8 +59,8 @@ void SwEditShell::DeleteSel( SwPaM& rPam, BOOL* pUndo )
// besteht eine Selection in einer Tabelle ?
// dann nur den Inhalt der selektierten Boxen loeschen
// jetzt gibt es 2 Faelle die beachtet werden muessen:
- // 1. Point und Mark stehen in einer Box, Selection normal loeschen
- // 2. Point und Mark stehen in unterschiedlichen Boxen, alle
+ // 1. Point und Mark stehen in einer Box, Selection normal loeschen
+ // 2. Point und Mark stehen in unterschiedlichen Boxen, alle
// selektierten Boxen suchen in den Inhalt loeschen
if( rPam.GetNode()->FindTableNode() &&
rPam.GetNode()->StartOfSectionNode() !=
@@ -81,7 +81,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, BOOL* pUndo )
if( pEndSelPos->nNode.GetIndex() <= rEndNd.GetIndex() )
{
*aDelPam.GetPoint() = *pEndSelPos;
- pEndSelPos = 0; // Pointer als Flag missbrauchen
+ pEndSelPos = 0; // Pointer als Flag missbrauchen
}
else
{
@@ -98,15 +98,15 @@ void SwEditShell::DeleteSel( SwPaM& rPam, BOOL* pUndo )
SaveTblBoxCntnt( aDelPam.GetPoint() );
}
- if( !pEndSelPos ) // am Ende der Selection
+ if( !pEndSelPos ) // am Ende der Selection
break;
aDelPam.DeleteMark();
- aDelPam.Move( fnMoveForward, fnGoCntnt ); // naechste Box
+ aDelPam.Move( fnMoveForward, fnGoCntnt ); // naechste Box
} while( pEndSelPos );
}
else
{
- // alles loeschen
+ // alles loeschen
GetDoc()->DeleteAndJoin( rPam );
SaveTblBoxCntnt( rPam.GetPoint() );
}
@@ -176,7 +176,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
pPos = pDestShell->GetCrsr()->GetPoint();
}
if( IsBlockMode() )
- { // In block mode different insert positions will be calculated
+ { // In block mode different insert positions will be calculated
// by simulated cursor movements from the given first insert position
if( nMove )
{
@@ -193,7 +193,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
}
SwPosition *pTmp = IsBlockMode() ? pInsertPos.get() : pPos;
// Check if a selection would be copied into itself
- if( pDestShell->GetDoc() == GetDoc() &&
+ if( pDestShell->GetDoc() == GetDoc() &&
*PCURCRSR->Start() <= *pTmp && *pTmp < *PCURCRSR->End() )
return FALSE;
FOREACHPAM_END()
@@ -302,9 +302,9 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
// Ersetz einen selektierten Bereich in einem TextNode mit dem
// String. Ist fuers Suchen&Ersetzen gedacht.
// bRegExpRplc - ersetze Tabs (\\t) und setze den gefundenen String
- // ein ( nicht \& )
- // z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
- // --> "xx\t<Tab>..zzz..&"
+ // ein ( nicht \& )
+ // z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
+ // --> "xx\t<Tab>..zzz..&"
BOOL SwEditShell::Replace( const String& rNewStr, BOOL bRegExpRplc )
{
SET_CURR_SHELL( this );
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 6b45e1188245..7194e39de3b2 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -2,7 +2,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
@@ -33,8 +33,8 @@
#include <hintids.hxx>
#include <editeng/brkitem.hxx>
#include <editsh.hxx>
-#include <doc.hxx> // fuer SwTxtFmtColls
-#include <edimp.hxx> // fuer MACROS
+#include <doc.hxx> // fuer SwTxtFmtColls
+#include <edimp.hxx> // fuer MACROS
#include <ndtxt.hxx>
#include <paratr.hxx>
#include <fmtpdsc.hxx>
@@ -124,9 +124,9 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, BOOL bReset)
if( pSet )
{
// JP 05.10.98: falls eines der Attribute Break/PageDesc/NumRule(auto)
- // im ItemSet steht, so entferne die VORM setzen an der Collection.
- // Ansonst wird zu viel gemacht oder falsche gemacht (NumRules!)
- // Bug 57568
+ // im ItemSet steht, so entferne die VORM setzen an der Collection.
+ // Ansonst wird zu viel gemacht oder falsche gemacht (NumRules!)
+ // Bug 57568
// AutoNumRules NICHT in die Vorlagen uebernehmen
const SfxPoolItem* pItem;
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index deabf5606905..71106550895b 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <unotools/charclass.hxx>
#include <editsh.hxx>
#include <fldbas.hxx>
-#include <ndtxt.hxx> // GetCurFld
+#include <ndtxt.hxx> // GetCurFld
#include <doc.hxx>
#include <docary.hxx>
#include <fmtfld.hxx>
@@ -206,7 +206,7 @@ void SwEditShell::FieldToText( SwFieldType* pType )
SwClientIter aIter( *pType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
pPaM->DeleteMark();
const SwFmtFld* pFmtFld = bDDEFld
@@ -249,10 +249,10 @@ void SwEditShell::FieldToText( SwFieldType* pType )
/*************************************************************************
|*
-|* SwEditShell::Insert( SwField )
+|* SwEditShell::Insert( SwField )
|*
-|* Beschreibung an der Cursorposition ein Feld einfuegen
-|* Quelle: vgl. SwEditShell::Insert( String )
+|* Beschreibung an der Cursorposition ein Feld einfuegen
+|* Quelle: vgl. SwEditShell::Insert( String )
|*
*************************************************************************/
void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
@@ -265,21 +265,21 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
? nsSetAttrMode::SETATTR_FORCEHINTEXPAND
: nsSetAttrMode::SETATTR_DEFAULT;
- FOREACHPAM_START(this) // fuer jeden PaM
+ FOREACHPAM_START(this) // fuer jeden PaM
bool bSuccess(GetDoc()->InsertPoolItem(*PCURCRSR, aFld, nInsertFlags));
OSL_ENSURE( bSuccess, "Doc->Insert(Field) failed");
(void) bSuccess;
- FOREACHPAM_END() // fuer jeden PaM
+ FOREACHPAM_END() // fuer jeden PaM
EndAllAction();
}
/*************************************************************************
|*
-|* SwEditShell::GetCurFld()
+|* SwEditShell::GetCurFld()
|*
-|* Beschreibung Stehen die PaMs auf Feldern ?
-|* Quelle: edtfrm.cxx:
+|* Beschreibung Stehen die PaMs auf Feldern ?
+|* Quelle: edtfrm.cxx:
|*
*************************************************************************/
@@ -328,10 +328,10 @@ SwField* SwEditShell::GetCurFld() const
/*************************************************************************
|*
-|* SwEditShell::UpdateFlds()
+|* SwEditShell::UpdateFlds()
|*
-|* Beschreibung Stehen die PaMs auf Feldern ?
-|* BP 12.05.92
+|* Beschreibung Stehen die PaMs auf Feldern ?
+|* BP 12.05.92
|*
*************************************************************************/
SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
@@ -376,11 +376,11 @@ void SwEditShell::UpdateFlds( SwField &rFld )
SwTxtFld *pTxtFld;
SwFmtFld *pFmtFld;
-// if( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark() &&
-// ( 0 != ( pTxtFld = GetDocTxtFld( pCrsr->Start() ) ) ||
-// 0 != ( pTxtFld = lcl_FindInputFld( GetDoc(), rFld ) ) ) &&
-// ( pFmtFld = (SwFmtFld*)&pTxtFld->GetFld())->GetFld()
-// ->GetTyp()->Which() == rFld.GetTyp()->Which() )
+// if( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark() &&
+// ( 0 != ( pTxtFld = GetDocTxtFld( pCrsr->Start() ) ) ||
+// 0 != ( pTxtFld = lcl_FindInputFld( GetDoc(), rFld ) ) ) &&
+// ( pFmtFld = (SwFmtFld*)&pTxtFld->GetFld())->GetFld()
+// ->GetTyp()->Which() == rFld.GetTyp()->Which() )
if ( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark())
{
pTxtFld = GetDocTxtFld(pCrsr->Start());
@@ -399,8 +399,8 @@ void SwEditShell::UpdateFlds( SwField &rFld )
BOOL bTblSelBreak = FALSE;
SwMsgPoolItem aHint( RES_TXTATR_FIELD ); // Such-Hint
- FOREACHPAM_START(this) // fuer jeden PaM
- if( PCURCRSR->HasMark() && bOkay ) // ... mit Selektion
+ FOREACHPAM_START(this) // fuer jeden PaM
+ if( PCURCRSR->HasMark() && bOkay ) // ... mit Selektion
{
// Kopie des PaM
SwPaM aCurPam( *PCURCRSR->GetMark(), *PCURCRSR->GetPoint() );
@@ -417,11 +417,11 @@ void SwEditShell::UpdateFlds( SwField &rFld )
*/
// Suche nach SwTxtFld ...
- while( bOkay
+ while( bOkay
&& pCurStt->nContent != pCurEnd->nContent
&& aPam.Find( aHint, FALSE, fnMoveForward, &aCurPam ) )
{
- // wenn nur ein Pam mehr als ein Feld enthaelt ...
+ // wenn nur ein Pam mehr als ein Feld enthaelt ...
if( aPam.Start()->nContent != pCurStt->nContent )
bOkay = FALSE;
@@ -444,10 +444,10 @@ void SwEditShell::UpdateFlds( SwField &rFld )
}
}
- if( bTblSelBreak ) // wenn Tabellen Selektion und Tabellen-
- break; // Formel aktualisiert wurde -> beenden
+ if( bTblSelBreak ) // wenn Tabellen Selektion und Tabellen-
+ break; // Formel aktualisiert wurde -> beenden
- FOREACHPAM_END() // fuer jeden PaM
+ FOREACHPAM_END() // fuer jeden PaM
}
GetDoc()->SetModified();
EndAllAction();
@@ -493,7 +493,7 @@ void SwEditShell::UpdateExpFlds(BOOL bCloseDB)
StartAllAction();
GetDoc()->UpdateExpFlds(NULL, true);
if (bCloseDB)
- GetDoc()->GetNewDBMgr()->CloseAll(); // Alle Datenbankverbindungen dichtmachen
+ GetDoc()->GetNewDBMgr()->CloseAll(); // Alle Datenbankverbindungen dichtmachen
EndAllAction();
}
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index a16f84281154..74f3b6037584 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <doc.hxx>
#include <docary.hxx>
-#include <ndtxt.hxx> // GetCurFld
+#include <ndtxt.hxx> // GetCurFld
#include <txtfld.hxx>
#include <fmtfld.hxx>
#include <edimp.hxx>
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 20e54ef0001a..016fa4ddb8d2 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -2,7 +2,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
@@ -93,7 +93,7 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, BOOL bReset)
{
const SwPosition* pPtPos = pPam->GetPoint();
const SwPosition* pMkPos = pPam->GetMark();
- if( pPtPos->nNode == pMkPos->nNode ) // im selben Node ?
+ if( pPtPos->nNode == pMkPos->nNode ) // im selben Node ?
{
nStt = pPtPos->nContent.GetIndex();
if( nStt < pMkPos->nContent.GetIndex() )
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index 15b1a45f072d..38fbf54b7687 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <ndtxt.hxx>
#include <docary.hxx>
#include <swwait.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <section.hxx>
#include <doctxm.hxx>
#include <edglbldc.hxx>
@@ -52,7 +52,7 @@ BOOL SwEditShell::IsGlobalDoc() const
void SwEditShell::SetGlblDocSaveLinks( BOOL bFlag )
{
getIDocumentSettingAccess()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bFlag);
- if( !GetDoc()->IsModified() ) // Bug 57028
+ if( !GetDoc()->IsModified() ) // Bug 57028
GetDoc()->SetUndoNoResetModified();
GetDoc()->SetModified();
}
@@ -83,7 +83,7 @@ USHORT SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
SwGlblDocContentPtr pNew;
switch( pSect->GetType() )
{
- case TOX_HEADER_SECTION: break; // ignore
+ case TOX_HEADER_SECTION: break; // ignore
case TOX_CONTENT_SECTION:
OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
pNew = new SwGlblDocContent( (SwTOXBaseSection*)pSect );
@@ -114,7 +114,7 @@ USHORT SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
if( !rArr.Insert( pNew ) )
delete pNew;
else
- ++n; // auf die naechste Position
+ ++n; // auf die naechste Position
break;
}
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index a35eb7848b39..5fb1ad940c3d 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -2,7 +2,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
@@ -40,15 +40,15 @@
#include <editsh.hxx>
#include <edimp.hxx>
#include <frmfmt.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <ndtxt.hxx>
-#include <swtable.hxx> // fuers kopieren von Tabellen
-#include <shellio.hxx> // SwTextBlocks
+#include <swtable.hxx> // fuers kopieren von Tabellen
+#include <shellio.hxx> // SwTextBlocks
#include <acorrect.hxx>
-#include <swerror.h> // SwTextBlocks
+#include <swerror.h> // SwTextBlocks
/******************************************************************************
- * jetzt mit einem verkappten Reader/Writer/Dokument
+ * jetzt mit einem verkappten Reader/Writer/Dokument
******************************************************************************/
void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const String& rStr )
@@ -60,8 +60,8 @@ void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const String& rStr )
/******************************************************************************
- * aktuelle Selektion zum Textbaustein machen und ins
- * Textbausteindokument einfuegen, einschliesslich Vorlagen
+ * aktuelle Selektion zum Textbaustein machen und ins
+ * Textbausteindokument einfuegen, einschliesslich Vorlagen
******************************************************************************/
@@ -176,7 +176,7 @@ USHORT SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
}
/******************************************************************************
- * kopiere alle Selectionen und das Doc
+ * kopiere alle Selectionen und das Doc
******************************************************************************/
@@ -243,7 +243,7 @@ BOOL SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
if( !PCURCRSR->HasMark() )
{
- if( 0 != (pNd = PCURCRSR->GetCntntNode()) &&
+ if( 0 != (pNd = PCURCRSR->GetCntntNode()) &&
( bColSel || !pNd->GetTxtNode() ) )
{
PCURCRSR->SetMark();
@@ -276,15 +276,15 @@ BOOL SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
}
/*------------------------------------------------------------------------
- Beschreibung: Text innerhalb der Selektion erfragen
- Returnwert: liefert FALSE, wenn der selektierte Bereich
+ Beschreibung: Text innerhalb der Selektion erfragen
+ Returnwert: liefert FALSE, wenn der selektierte Bereich
zu gross ist, um in den Stringpuffer kopiert zu werden.
------------------------------------------------------------------------*/
BOOL SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk )
{
BOOL bRet = FALSE;
- GetCrsr(); // ggfs. alle Cursor erzeugen lassen
+ GetCrsr(); // ggfs. alle Cursor erzeugen lassen
if( IsSelOnePara() )
{
rBuf = GetSelTxt();
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 73a099ceb208..dcb831c5c33e 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -2,7 +2,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
@@ -47,11 +47,11 @@
#include <frame.hxx>
#include <cntfrm.hxx>
#include <pam.hxx>
-#include <ndtxt.hxx> // fuer SwTxtNode
+#include <ndtxt.hxx> // fuer SwTxtNode
#include <grfatr.hxx>
#include <flyfrm.hxx>
#include <swtable.hxx>
-#include <swundo.hxx> // UNDO_START, UNDO_END
+#include <swundo.hxx> // UNDO_START, UNDO_END
#include <calc.hxx>
#include <edimp.hxx>
#include <ndgrf.hxx>
@@ -75,7 +75,7 @@ using namespace com::sun::star;
SV_IMPL_PTRARR(SwGetINetAttrs, SwGetINetAttr*)
/******************************************************************************
- * void SwEditShell::Insert(char c)
+ * void SwEditShell::Insert(char c)
******************************************************************************/
@@ -99,7 +99,7 @@ void SwEditShell::Insert( sal_Unicode c, BOOL bOnlyCurrCrsr )
/******************************************************************************
- * void SwEditShell::Insert(const String &rStr)
+ * void SwEditShell::Insert(const String &rStr)
******************************************************************************/
@@ -177,7 +177,7 @@ void SwEditShell::Insert2(const String &rStr, const bool bForceExpandHints )
/******************************************************************************
- * void SwEditShell::Overwrite(const String &rStr)
+ * void SwEditShell::Overwrite(const String &rStr)
******************************************************************************/
@@ -196,7 +196,7 @@ void SwEditShell::Overwrite(const String &rStr)
/******************************************************************************
- * long SwEditShell::SplitNode()
+ * long SwEditShell::SplitNode()
******************************************************************************/
long SwEditShell::SplitNode( BOOL bAutoFormat, BOOL bCheckTableStart )
@@ -244,8 +244,8 @@ sal_Bool SwEditShell::AppendTxtNode()
}
/******************************************************************************
- * liefert einen Pointer auf einen SwGrfNode; dieser wird von
- * GetGraphic() und GetGraphicSize() verwendet.
+ * liefert einen Pointer auf einen SwGrfNode; dieser wird von
+ * GetGraphic() und GetGraphicSize() verwendet.
******************************************************************************/
@@ -260,9 +260,9 @@ SwGrfNode * SwEditShell::_GetGrfNode() const
return pGrfNode;
}
/******************************************************************************
- * liefert Pointer auf eine Graphic, wenn CurCrsr->GetPoint() auf
- * einen SwGrfNode zeigt (und GetMark nicht gesetzt ist
- * oder auf die gleiche Graphic zeigt)
+ * liefert Pointer auf eine Graphic, wenn CurCrsr->GetPoint() auf
+ * einen SwGrfNode zeigt (und GetMark nicht gesetzt ist
+ * oder auf die gleiche Graphic zeigt)
******************************************************************************/
// --> OD 2005-02-09 #119353# - robust
@@ -331,9 +331,9 @@ USHORT SwEditShell::GetGraphicType() const
}
/******************************************************************************
- * liefert die Groesse der Graphic, wenn CurCrsr->GetPoint() auf
- * einen SwGrfNode zeigt (und GetMark nicht gesetzt ist
- * oder auf die gleiche Graphic zeigt)
+ * liefert die Groesse der Graphic, wenn CurCrsr->GetPoint() auf
+ * einen SwGrfNode zeigt (und GetMark nicht gesetzt ist
+ * oder auf die gleiche Graphic zeigt)
******************************************************************************/
BOOL SwEditShell::GetGrfSize(Size& rSz) const
@@ -351,8 +351,8 @@ BOOL SwEditShell::GetGrfSize(Size& rSz) const
}
/******************************************************************************
- * erneutes Einlesen, falls Graphic nicht Ok ist. Die
- * aktuelle wird durch die neue ersetzt.
+ * erneutes Einlesen, falls Graphic nicht Ok ist. Die
+ * aktuelle wird durch die neue ersetzt.
******************************************************************************/
void SwEditShell::ReRead( const String& rGrfName, const String& rFltName,
@@ -365,9 +365,9 @@ void SwEditShell::ReRead( const String& rGrfName, const String& rFltName,
/******************************************************************************
- * liefert den Namen und den FilterNamen einer Graphic, wenn der Cursor
- * auf einer Graphic steht
- * Ist ein String-Ptr != 0 dann returne den entsp. Namen
+ * liefert den Namen und den FilterNamen einer Graphic, wenn der Cursor
+ * auf einer Graphic steht
+ * Ist ein String-Ptr != 0 dann returne den entsp. Namen
******************************************************************************/
@@ -448,11 +448,11 @@ void SwEditShell::ClearAutomaticContour()
}
/******************************************************************************
- * liefert Pointer auf ein SvInPlaceObjectRef, wenn CurCrsr->GetPoint() auf
- * einen SwOLENode zeigt (und GetMark nicht gesetzt ist
- * oder auf das gleiche SvInPlaceObjectRef zeigt)
- * besorgt den Pointer vom Doc wenn das Objekt per Namen gesucht werden
- * soll
+ * liefert Pointer auf ein SvInPlaceObjectRef, wenn CurCrsr->GetPoint() auf
+ * einen SwOLENode zeigt (und GetMark nicht gesetzt ist
+ * oder auf das gleiche SvInPlaceObjectRef zeigt)
+ * besorgt den Pointer vom Doc wenn das Objekt per Namen gesucht werden
+ * soll
******************************************************************************/
svt::EmbeddedObjectRef& SwEditShell::GetOLEObject() const
@@ -503,7 +503,7 @@ void SwEditShell::UpdateCharts( const String &rName )
/******************************************************************************
- * Aenderung des Tabellennamens
+ * Aenderung des Tabellennamens
******************************************************************************/
void SwEditShell::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName )
@@ -524,7 +524,7 @@ String SwEditShell::GetCurWord()
}
/****************************************************************************
- * void SwEditShell::UpdateDocStat( SwDocStat& rStat )
+ * void SwEditShell::UpdateDocStat( SwDocStat& rStat )
****************************************************************************/
@@ -551,7 +551,7 @@ USHORT SwEditShell::GetRefMarks( SvStringsDtor* pStrings ) const
}
/******************************************************************************
- * DropCap-SS
+ * DropCap-SS
******************************************************************************/
@@ -621,18 +621,18 @@ void SwEditShell::ReplaceDropTxt( const String &rStr )
}
/******************************************************************************
- * Methode :
- * Beschreibung:
- * Erstellt : OK 25.04.94 13:45
- * Aenderung :
+ * Methode :
+ * Beschreibung:
+ * Erstellt : OK 25.04.94 13:45
+ * Aenderung :
******************************************************************************/
String SwEditShell::Calculate()
{
- String aFormel; // die entgueltige Formel
- SwPaM *pPaMLast = (SwPaM*)GetCrsr()->GetNext(),
- *pPaM = pPaMLast; // die Pointer auf Cursor
- SwCalc aCalc( *GetDoc() );
+ String aFormel; // die entgueltige Formel
+ SwPaM *pPaMLast = (SwPaM*)GetCrsr()->GetNext(),
+ *pPaM = pPaMLast; // die Pointer auf Cursor
+ SwCalc aCalc( *GetDoc() );
const CharClass& rCC = GetAppCharClass();
do {
@@ -647,7 +647,7 @@ String SwEditShell::Calculate()
rCC.toLower( aStr );
sal_Unicode ch;
- BOOL bValidFlds = FALSE;
+ BOOL bValidFlds = FALSE;
xub_StrLen nPos = 0;
while( nPos < aStr.Len() )
@@ -750,7 +750,7 @@ Graphic SwEditShell::GetIMapGraphic() const
BOOL SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, BOOL bKeepSelection )
{
// URL und Hinweistext (direkt oder via Selektion) notwendig
- if( !rFmt.GetValue().Len() || ( !rStr.Len() && !HasSelection() ) )
+ if( !rFmt.GetValue().Len() || ( !rStr.Len() && !HasSelection() ) )
return FALSE;
StartAllAction();
GetDoc()->StartUndo( UNDO_UI_INSERT_URLTXT, NULL);
@@ -771,7 +771,7 @@ BOOL SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, BOOL
if( sTxt == rStr )
bDelTxt = bInsTxt = FALSE;
}
- else if( rFmt.GetValue() == rStr ) // Name und URL gleich?
+ else if( rFmt.GetValue() == rStr ) // Name und URL gleich?
bDelTxt = bInsTxt = FALSE;
if( bDelTxt )
@@ -976,12 +976,12 @@ USHORT SwEditShell::GetLineCount( BOOL bActPos )
0 != ( pCntFrm = pCNd->GetFrm() ) )
{
const SwStartNode *pTmp;
- if( pCntFrm->IsInFly() ) // Fly
+ if( pCntFrm->IsInFly() ) // Fly
pTmp = pCNd->FindFlyStartNode();
- else if( pCntFrm->IsInFtn() ) // Footnote
+ else if( pCntFrm->IsInFtn() ) // Footnote
pTmp = pCNd->FindFootnoteStartNode();
else
- { // Footer/Header
+ { // Footer/Header
const USHORT nTyp = FRM_HEADER | FRM_FOOTER;
SwFrm* pFrm = pCntFrm;
while( pFrm && !(pFrm->GetType() & nTyp) )
@@ -1100,8 +1100,8 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, BOOL bInsText )
if( !pDel )
{
//JP 25.10.2001: under UNIX the cursor is moved before the Input-
- // Engine event comes in. So take any - normally there
- // exist only one at the time. -- Task 92016
+ // Engine event comes in. So take any - normally there
+ // exist only one at the time. -- Task 92016
pDel = GetDoc()->GetExtTextInput();
}
}
@@ -1156,7 +1156,7 @@ void SwEditShell::SetExtTextInputData( const CommandExtTextInputData& rData )
EndAllAction();
- if( !rData.IsCursorVisible() ) // must be called after the EndAction
+ if( !rData.IsCursorVisible() ) // must be called after the EndAction
HideCrsr();
}
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 25cc35503e69..6dcdcd71b145 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -2,7 +2,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
@@ -50,12 +50,12 @@
#include <doc.hxx>
#include <rootfrm.hxx> // SwRootFrm
#include <pam.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <ndtxt.hxx> // AdjHyphPos
#include <viewopt.hxx> // HyphStart/End
-#include <viscrs.hxx> // SwShellCrsr
-#include <SwGrammarMarkUp.hxx> // SwWrongList
-#include <mdiexp.hxx> // Statusanzeige
+#include <viscrs.hxx> // SwShellCrsr
+#include <SwGrammarMarkUp.hxx> // SwWrongList
+#include <mdiexp.hxx> // Statusanzeige
#include <statstr.hrc> // StatLine-String
#include <cntfrm.hxx>
#include <crsskip.hxx>
@@ -77,21 +77,21 @@ using namespace ::com::sun::star::linguistic2;
extern void repaintTextFrames( SwModify& rModify );
/*************************************************************************
- * class SwLinguIter
+ * class SwLinguIter
*************************************************************************/
class SwLinguIter
{
SwEditShell *pSh;
- SwPosition *pStart;
- SwPosition *pEnd;
- SwPosition *pCurr;
- SwPosition *pCurrX;
+ SwPosition *pStart;
+ SwPosition *pEnd;
+ SwPosition *pCurr;
+ SwPosition *pCurrX;
sal_uInt16 nCrsrCnt;
public:
SwLinguIter();
- inline SwEditShell *GetSh() { return pSh; }
+ inline SwEditShell *GetSh() { return pSh; }
inline const SwEditShell *GetSh() const { return pSh; }
inline const SwPosition *GetEnd() const { return pEnd; }
@@ -115,7 +115,7 @@ public:
};
/*************************************************************************
- * class SwSpellIter
+ * class SwSpellIter
*************************************************************************/
// #i18881# to be able to identify the postions of the changed words
@@ -128,7 +128,7 @@ struct SpellContentPosition
typedef std::vector<SpellContentPosition> SpellContentPositions;
class SwSpellIter : public SwLinguIter
{
- uno::Reference< XSpellChecker1 > xSpeller;
+ uno::Reference< XSpellChecker1 > xSpeller;
::svx::SpellPortions aLastPortions;
SpellContentPositions aLastPositions;
@@ -139,12 +139,12 @@ class SwSpellIter : public SwLinguIter
void CreatePortion(uno::Reference< XSpellAlternatives > xAlt,
linguistic2::ProofreadingResult* pGrammarResult,
bool bIsField, bool bIsHidden);
-
+
void AddPortion(uno::Reference< XSpellAlternatives > xAlt,
- linguistic2::ProofreadingResult* pGrammarResult,
+ linguistic2::ProofreadingResult* pGrammarResult,
const SpellContentPositions& rDeletedRedlines);
public:
- SwSpellIter() :
+ SwSpellIter() :
bBackToStartOfSentence(false), bMoveToEndOfSentence(false) {}
void Start( SwEditShell *pSh, SwDocPositions eStart, SwDocPositions eEnd );
@@ -177,7 +177,7 @@ public:
};
/*************************************************************************
- * class SwHyphIter
+ * class SwHyphIter
*************************************************************************/
class SwHyphIter : public SwLinguIter
@@ -200,9 +200,9 @@ public:
void ShowSelection();
};
-static SwSpellIter* pSpellIter = 0;
+static SwSpellIter* pSpellIter = 0;
static SwConvIter* pConvIter = 0;
-static SwHyphIter* pHyphIter = 0;
+static SwHyphIter* pHyphIter = 0;
// Wir ersparen uns in Hyphenate ein GetFrm()
// Achtung: in txtedt.cxx stehen extern-Deklarationen auf diese Pointer!
@@ -210,7 +210,7 @@ const SwTxtNode *pLinguNode;
SwTxtFrm *pLinguFrm;
/*************************************************************************
- * SwLinguIter::SwLinguIter
+ * SwLinguIter::SwLinguIter
*************************************************************************/
SwLinguIter::SwLinguIter()
@@ -220,7 +220,7 @@ SwLinguIter::SwLinguIter()
}
/*************************************************************************
- * SwLinguIter::Start
+ * SwLinguIter::Start
*************************************************************************/
@@ -243,7 +243,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
SwPaM *pCrsr = pSh->GetCrsr();
// pStk->SetCurCrsr();
-// if( pCrsr->HasMark() || pCrsr != pCrsr->GetNext() )
+// if( pCrsr->HasMark() || pCrsr != pCrsr->GetNext() )
if( pShell->HasSelection() || pCrsr != pCrsr->GetNext() )
{
bSetCurr = 0 != GetCurr();
@@ -289,7 +289,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
}
/*************************************************************************
- * SwLinguIter::End
+ * SwLinguIter::End
*************************************************************************/
@@ -321,7 +321,7 @@ void SwLinguIter::_End(bool bRestoreSelection)
}
/*************************************************************************
- * virtual SwSpellIter::Start()
+ * virtual SwSpellIter::Start()
*************************************************************************/
@@ -341,7 +341,7 @@ void SwSpellIter::Start( SwEditShell *pShell, SwDocPositions eStart,
}
/*************************************************************************
- * SwSpellIter::Continue
+ * SwSpellIter::Continue
*************************************************************************/
// SwSpellIter::Continue ist das alte Original von
@@ -358,7 +358,7 @@ uno::Any SwSpellIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
if( !pMySh )
return aSpellRet;
-// const SwPosition *pEnd = GetEnd();
+// const SwPosition *pEnd = GetEnd();
OSL_ENSURE( GetEnd(), "SwEditShell::SpellContinue() ohne Start?");
@@ -513,7 +513,7 @@ void SwHyphIter::ShowSelection()
}
/*************************************************************************
- * virtual SwHyphIter::Start()
+ * virtual SwHyphIter::Start()
*************************************************************************/
@@ -534,7 +534,7 @@ void SwHyphIter::Start( SwEditShell *pShell, SwDocPositions eStart, SwDocPositio
}
/*************************************************************************
- * virtual SwHyphIter::End
+ * virtual SwHyphIter::End
*************************************************************************/
// Selektionen wiederherstellen
@@ -550,7 +550,7 @@ void SwHyphIter::End()
}
/*************************************************************************
- * SwHyphIter::Continue
+ * SwHyphIter::Continue
*************************************************************************/
uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
@@ -594,7 +594,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
{
pMySh->InsertSoftHyph( xHyphWord->getHyphenationPos() + 1);
}
- } while( bAuto && xHyphWord.is() ); //end of do-while
+ } while( bAuto && xHyphWord.is() ); //end of do-while
bGoOn = !xHyphWord.is() && GetCrsrCnt() > 1;
if( bGoOn )
@@ -614,7 +614,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
}
/*************************************************************************
- * SwHyphIter::HyphIgnore
+ * SwHyphIter::HyphIgnore
*************************************************************************/
// Beschreibung: Trennstelle ignorieren
@@ -633,7 +633,7 @@ void SwHyphIter::Ignore()
}
/*************************************************************************
- * SwHyphIter::DelSoftHyph
+ * SwHyphIter::DelSoftHyph
*************************************************************************/
void SwHyphIter::DelSoftHyph( SwPaM &rPam )
@@ -646,7 +646,7 @@ void SwHyphIter::DelSoftHyph( SwPaM &rPam )
}
/*************************************************************************
- * SwHyphIter::InsertSoftHyph
+ * SwHyphIter::InsertSoftHyph
*************************************************************************/
@@ -700,7 +700,7 @@ bool SwEditShell::HasLastSentenceGotGrammarChecked() const
::svx::SpellPortions aLastPortions( pSpellIter->GetLastPortions() );
for (size_t i = 0; i < aLastPortions.size() && !bTextWasGrammarChecked; ++i)
{
- // bIsGrammarError is also true if the text was only checked but no
+ // bIsGrammarError is also true if the text was only checked but no
// grammar error was found. (That is if a ProofreadingResult was obtained in
// SwDoc::Spell and in turn bIsGrammarError was set in SwSpellIter::CreatePortion)
if (aLastPortions[i].bIsGrammarError)
@@ -831,8 +831,8 @@ uno::Any SwEditShell::SpellContinue(
OSL_ENSURE( pConvArgs || pSpellIter, "SpellIter missing" );
OSL_ENSURE( !pConvArgs || pConvIter, "ConvIter missing" );
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
- // KEIN StartAction, da damit auch die Paints abgeschaltet
- // werden !!!!!
+ // KEIN StartAction, da damit auch die Paints abgeschaltet
+ // werden !!!!!
++nStartAction;
rtl::OUString aRet;
uno::Reference< uno::XInterface > xRet;
@@ -857,7 +857,7 @@ uno::Any SwEditShell::SpellContinue(
return aRes;
}
/*************************************************************************
- * SwEditShell::HyphStart
+ * SwEditShell::HyphStart
*************************************************************************/
/* Interaktive Trennung, BP 10.03.93
@@ -865,26 +865,26 @@ uno::Any SwEditShell::SpellContinue(
* 1) HyphStart
* - Aufheben aller Selektionen
* - Sichern des aktuellen Cursors
- * - falls keine Selektion vorhanden:
- * - neue Selektion bis zum Dokumentende
+ * - falls keine Selektion vorhanden:
+ * - neue Selektion bis zum Dokumentende
* 2) HyphContinue
- * - nLastHyphLen wird auf den Selektionsstart addiert
- * - iteriert ueber alle selektierten Bereiche
- * - pDoc->Hyphenate() iteriert ueber alle Nodes der Selektion
- * - pTxtNode->Hyphenate() ruft das SwTxtFrm::Hyphenate zur EditShell
- * - SwTxtFrm:Hyphenate() iteriert ueber die Zeilen des Pams
- * - LineIter::Hyphenate() stellt den Hyphenator
- * und den Pam auf das zu trennende Wort ein.
- * - Es gibt nur zwei Returnwerte sal_True, wenn eine Trennstelle anliegt
- * und sal_False, wenn der Pam abgearbeitet wurde.
- * - Bei sal_True wird das selektierte Wort zur Anzeige gebracht und
- * nLastHyphLen gesetzt.
- * - Bei sal_False wird die aktuelle Selektion geloescht und die naechste
- * zur aktuellen gewaehlt. Return HYPH_OK, wenn keine mehr vorhanden.
+ * - nLastHyphLen wird auf den Selektionsstart addiert
+ * - iteriert ueber alle selektierten Bereiche
+ * - pDoc->Hyphenate() iteriert ueber alle Nodes der Selektion
+ * - pTxtNode->Hyphenate() ruft das SwTxtFrm::Hyphenate zur EditShell
+ * - SwTxtFrm:Hyphenate() iteriert ueber die Zeilen des Pams
+ * - LineIter::Hyphenate() stellt den Hyphenator
+ * und den Pam auf das zu trennende Wort ein.
+ * - Es gibt nur zwei Returnwerte sal_True, wenn eine Trennstelle anliegt
+ * und sal_False, wenn der Pam abgearbeitet wurde.
+ * - Bei sal_True wird das selektierte Wort zur Anzeige gebracht und
+ * nLastHyphLen gesetzt.
+ * - Bei sal_False wird die aktuelle Selektion geloescht und die naechste
+ * zur aktuellen gewaehlt. Return HYPH_OK, wenn keine mehr vorhanden.
* 3) InsertSoftHyph (wird ggf. von der UI gerufen)
- * - Der aktuelle Cursor wird plaziert und das Attribut eingefuegt.
+ * - Der aktuelle Cursor wird plaziert und das Attribut eingefuegt.
* 4) HyphEnd
- * - Wiederherstellen des alten Cursors, EndAction
+ * - Wiederherstellen des alten Cursors, EndAction
*/
@@ -901,7 +901,7 @@ void SwEditShell::HyphStart( SwDocPositions eStart, SwDocPositions eEnd )
}
/*************************************************************************
- * SwEditShell::HyphEnd
+ * SwEditShell::HyphEnd
*************************************************************************/
// Selektionen wiederherstellen
@@ -919,7 +919,7 @@ void SwEditShell::HyphEnd()
}
/*************************************************************************
- * SwEditShell::HyphContinue
+ * SwEditShell::HyphContinue
*************************************************************************/
// Returnwerte: (BP: ich wuerde es genau umdrehen, aber die UI wuenscht es so)
@@ -942,14 +942,14 @@ uno::Reference< uno::XInterface >
*pPageCnt = nEndPage;
::StartProgress( STR_STATSTR_HYPHEN, 0, nEndPage, GetDoc()->GetDocShell());
}
- else // Hiermit unterdruecken wir ein fuer allemal
- *pPageSt = 1; // das StatLineStartPercent
+ else // Hiermit unterdruecken wir ein fuer allemal
+ *pPageSt = 1; // das StatLineStartPercent
}
OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
- // KEIN StartAction, da damit auch die Paints abgeschaltet
- // werden !!!!!
+ // KEIN StartAction, da damit auch die Paints abgeschaltet
+ // werden !!!!!
++nStartAction;
uno::Reference< uno::XInterface > xRet;
pHyphIter->Continue( pPageCnt, pPageSt ) >>= xRet;
@@ -963,7 +963,7 @@ uno::Reference< uno::XInterface >
/*************************************************************************
- * SwEditShell::InsertSoftHyph
+ * SwEditShell::InsertSoftHyph
*************************************************************************/
// Zum Einfuegen des SoftHyphens, Position ist der Offset
@@ -978,7 +978,7 @@ void SwEditShell::InsertSoftHyph( const xub_StrLen nHyphPos )
/*************************************************************************
- * SwEditShell::HyphIgnore
+ * SwEditShell::HyphIgnore
*************************************************************************/
// Beschreibung: Trennstelle ignorieren
@@ -987,8 +987,8 @@ void SwEditShell::HyphIgnore()
{
OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
- // KEIN StartAction, da damit auch die Paints abgeschaltet
- // werden !!!!!
+ // KEIN StartAction, da damit auch die Paints abgeschaltet
+ // werden !!!!!
++nStartAction;
pHyphIter->Ignore();
--nStartAction;
@@ -997,7 +997,7 @@ void SwEditShell::HyphIgnore()
}
/*************************************************************************
- * SwEditShell::GetCorrection()
+ * SwEditShell::GetCorrection()
* liefert eine Liste von Vorschlaegen fuer falsch geschriebene Worte,
* ein NULL-Pointer signalisiert, dass das Wort richtig geschrieben ist,
* eine leere Liste, dass das Wort zwar unbekannt ist, aber keine Alternativen
@@ -1025,7 +1025,7 @@ uno::Reference< XSpellAlternatives >
{
xub_StrLen nBegin = aPos.nContent.GetIndex();
xub_StrLen nLen = 1;
- if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) )
+ if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) )
{
String aText( pNode->GetTxt().Copy( nBegin, nLen ) );
String aWord( aText );
@@ -1114,8 +1114,8 @@ uno::Reference< XSpellAlternatives >
/*-------------------------------------------------------------------------
-----------------------------------------------------------------------*/
-
-bool SwEditShell::GetGrammarCorrection(
+
+bool SwEditShell::GetGrammarCorrection(
linguistic2::ProofreadingResult /*out*/ &rResult, // the complete result
sal_Int32 /*out*/ &rErrorPosInText, // offset of error position in string that was grammar checked...
sal_Int32 /*out*/ &rErrorIndexInResult, // index of error in rResult.aGrammarErrors
@@ -1151,17 +1151,17 @@ bool SwEditShell::GetGrammarCorrection(
{
// LanguageType eActLang = (LanguageType)pNode->GetLang( nBegin, nLen );
uno::Reference< lang::XComponent > xDoc( pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY );
-
+
// Expand the string:
rtl::OUString aExpandText;
const ModelToViewHelper::ConversionMap* pConversionMap =
pNode->BuildConversionMap( aExpandText );
// get XFlatParagraph to use...
uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNode, aExpandText, pConversionMap );
-
+
// get error position of cursor in XFlatParagraph
rErrorPosInText = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nBegin );
-
+
sal_Int32 nStartOfSentence = ModelToViewHelper::ConvertToViewPosition( pConversionMap, pWrong->getSentenceStart( nBegin ) );
sal_Int32 nEndOfSentence = ModelToViewHelper::ConvertToViewPosition( pConversionMap, pWrong->getSentenceEnd( nBegin ) );
if( nEndOfSentence == STRING_LEN )
@@ -1174,11 +1174,11 @@ bool SwEditShell::GetGrammarCorrection(
else */
nEndOfSentence = aExpandText.getLength();
}
-
- rResult = xGCIterator->checkSentenceAtPosition(
+
+ rResult = xGCIterator->checkSentenceAtPosition(
xDoc, xFlatPara, aExpandText, lang::Locale(), nStartOfSentence, nEndOfSentence, rErrorPosInText );
bRes = true;
-
+
// get suggestions to use for the specific error position
sal_Int32 nErrors = rResult.aErrors.getLength();
rSuggestions.realloc( 0 );
@@ -1186,14 +1186,14 @@ bool SwEditShell::GetGrammarCorrection(
{
// return suggestions for first error that includes the given error position
const linguistic2::SingleProofreadingError &rError = rResult.aErrors[i];
- if (rError.nErrorStart <= rErrorPosInText &&
+ if (rError.nErrorStart <= rErrorPosInText &&
rErrorPosInText < rError.nErrorStart + rError.nErrorLength)
{
rSuggestions = rError.aSuggestions;
rErrorIndexInResult = i;
break;
}
- }
+ }
}
if (rResult.aErrors.getLength() > 0) // error found?
@@ -1254,7 +1254,7 @@ bool SwEditShell::GetGrammarCorrection(
}
return bRes;
-}
+}
/*-- 18.09.2003 15:08:18---------------------------------------------------
@@ -1303,7 +1303,7 @@ sal_uInt32 lcl_CountRedlines(
void SwEditShell::MoveContinuationPosToEndOfCheckedSentence()
{
- // give hint that continuation position for spell/grammar checking is
+ // give hint that continuation position for spell/grammar checking is
// at the end of this sentence
if (pSpellIter)
{
@@ -1401,7 +1401,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
//add the 'ignore' markup to the TextNode's grammar ignore markup list
IgnoreGrammarErrorAt( *pCrsr );
DBG_ERROR("TODO: add ignore mark to text node");
- }
+ }
if(aCurrentNewPortion == rNewPortions.begin())
break;
}
@@ -1445,8 +1445,8 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
}
}
- // restore cursor to the end of the sentence
- // (will work also if the sentence length has changed,
+ // restore cursor to the end of the sentence
+ // (will work also if the sentence length has changed,
// since cursors get updated automatically!)
Pop( FALSE );
@@ -1575,7 +1575,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
pMySh->GoStartSentence();
bBackToStartOfSentence = false;
}
- uno::Any aSpellRet =
+ uno::Any aSpellRet =
pMySh->GetDoc()->Spell(*pCrsr,
xSpeller, 0, 0, bIsGrammarCheck );
aSpellRet >>= xSpellRet;
@@ -1654,9 +1654,9 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
--nSentenceEnd;
if( pCrsr->End()->nContent.GetIndex() < nSentenceEnd )
{
- pCrsr->End()->nContent.Assign(
+ pCrsr->End()->nContent.Assign(
pCrsr->End()->nNode.GetNode().GetCntntNode(), nSentenceEnd);
- }
+ }
}
lcl_CutRedlines( aDeletedRedlines, pMySh );
@@ -1715,7 +1715,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
{
//go to the end of sentence as the grammar check returned it
// at this time the Point is behind the grammar error
- // and the mark points to the sentence end as
+ // and the mark points to the sentence end as
if ( *pCrsr->GetPoint() < *pCrsr->GetMark() )
pCrsr->Exchange();
}
@@ -1807,7 +1807,7 @@ void SwSpellIter::CreatePortion(uno::Reference< XSpellAlternatives > xAlt,
}
}
}
- }
+ }
else
aPortion.sText = sText;
aPortion.eLanguage = lcl_GetLanguage(*GetSh());
@@ -1826,7 +1826,7 @@ void SwSpellIter::CreatePortion(uno::Reference< XSpellAlternatives > xAlt,
-----------------------------------------------------------------------*/
void SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
- linguistic2::ProofreadingResult* pGrammarResult,
+ linguistic2::ProofreadingResult* pGrammarResult,
const SpellContentPositions& rDeletedRedlines)
{
SwEditShell *pMySh = GetSh();
@@ -1971,7 +1971,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
++aIdx;
nStart = 0;
}
-}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index ccbbb44ddd4f..ed366786e9b8 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -2,7 +2,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
@@ -55,20 +55,20 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
{
SwPamRange aRg( rIdx1.GetIndex(), rIdx2.GetIndex() );
if( aRg.nEnd < aRg.nStart )
- { aRg.nStart = aRg.nEnd; aRg.nEnd = rIdx1.GetIndex(); }
+ { aRg.nStart = aRg.nEnd; aRg.nEnd = rIdx1.GetIndex(); }
USHORT nPos = 0;
const SwPamRange* pTmp;
- if( Count() && Seek_Entry( aRg, &nPos )) // suche Insert Position
+ if( Count() && Seek_Entry( aRg, &nPos )) // suche Insert Position
{
// ist der im Array stehende kleiner ??
if( ( pTmp = GetData()+ nPos )->nEnd < aRg.nEnd )
{
aRg.nEnd = pTmp->nEnd;
- Remove( nPos, 1 ); // zusammenfassen
+ Remove( nPos, 1 ); // zusammenfassen
}
else
- return; // ende, weil schon alle zusammengefasst waren
+ return; // ende, weil schon alle zusammengefasst waren
}
BOOL bEnde;
@@ -83,7 +83,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
{
aRg.nStart = pTmp->nStart;
bEnde = FALSE;
- Remove( --nPos, 1 ); // zusammenfassen
+ Remove( --nPos, 1 ); // zusammenfassen
}
// SSelection im Bereich ??
else if( pTmp->nStart <= aRg.nStart && aRg.nEnd <= pTmp->nEnd )
@@ -97,7 +97,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
{
aRg.nEnd = pTmp->nEnd;
bEnde = FALSE;
- Remove( nPos, 1 ); // zusammenfassen
+ Remove( nPos, 1 ); // zusammenfassen
}
// SSelection im Bereich ??
@@ -130,7 +130,7 @@ SwPaM& SwPamRanges::SetPam( USHORT nArrPos, SwPaM& rPam )
void SwEditShell::SetOutlineNumRule(const SwNumRule& rRule)
{
- StartAllAction(); // Klammern fuers Updaten !!
+ StartAllAction(); // Klammern fuers Updaten !!
GetDoc()->SetOutlineNumRule(rRule);
EndAllAction();
}
@@ -152,7 +152,7 @@ BOOL SwEditShell::NoNum()
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
GetDoc()->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( *pCrsr );
@@ -216,7 +216,7 @@ void SwEditShell::DelNumRules()
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
GetDoc()->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( *pCrsr );
@@ -252,7 +252,7 @@ BOOL SwEditShell::NumUpDown( BOOL bDown )
BOOL bRet = TRUE;
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
+ if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
bRet = GetDoc()->NumUpDown( *pCrsr, bDown );
else
{
@@ -437,7 +437,7 @@ BOOL SwEditShell::MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft )
long nOffset = 0;
const SwNode* pNd;
- if( bUpperLeft ) // verschiebe nach oben
+ if( bUpperLeft ) // verschiebe nach oben
{
SwPosition aPos( *aCrsr.GetMark() );
if( GetDoc()->GotoPrevNum( aPos, FALSE ) )
@@ -454,7 +454,7 @@ BOOL SwEditShell::MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft )
nOffset = nIdx - nStt;
}
}
- else // verschiebe nach unten
+ else // verschiebe nach unten
{
const SwNumRule* pOrig = aCrsr.GetNode(FALSE)->GetTxtNode()->GetNumRule();
if( aCrsr.GetNode()->IsTxtNode() &&
@@ -514,7 +514,7 @@ BOOL SwEditShell::OutlineUpDown( short nOffset )
BOOL bRet = TRUE;
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
+ if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
bRet = GetDoc()->OutlineUpDown( *pCrsr, nOffset );
else
{
@@ -565,7 +565,7 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
// int nTmpLvl = pTmpNd->GetTxtNode()->GetOutlineLevel();//#outline level,zhaojianwei
int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
// OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl < MAXLEVEL,
- OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL, //<-end,zhaojianwei
+ OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL, //<-end,zhaojianwei
"<SwEditShell::IsProtectedOutlinePara()>" );
// <--
if( bFirst )
@@ -626,7 +626,7 @@ BOOL SwEditShell::NumOrNoNum( BOOL bNumOn, BOOL bChkStart ) // #115901#
if( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark() &&
( !bChkStart || !pCrsr->GetPoint()->nContent.GetIndex()) )
{
- StartAllAction(); // Klammern fuers Updaten !!
+ StartAllAction(); // Klammern fuers Updaten !!
// #115901#
bRet = GetDoc()->NumOrNoNum( pCrsr->GetPoint()->nNode, !bNumOn ); // #i29560#
EndAllAction();
@@ -658,8 +658,8 @@ BOOL SwEditShell::IsNoNum( BOOL bChkStart ) const
BYTE SwEditShell::GetNumLevel() const
{
// gebe die akt. Ebene zurueck, auf der sich der Point vom Cursor befindet
- //BYTE nLevel = NO_NUMBERING; //#outline level,zhaojianwei
- BYTE nLevel = MAXLEVEL; //end,zhaojianwei
+ //BYTE nLevel = NO_NUMBERING; //#outline level,zhaojianwei
+ BYTE nLevel = MAXLEVEL; //end,zhaojianwei
SwPaM* pCrsr = GetCrsr();
const SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
@@ -700,7 +700,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
GetDoc()->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( *pCrsr );
@@ -760,7 +760,7 @@ void SwEditShell::SetNumRuleStart( BOOL bFlag )
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
GetDoc()->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( *pCrsr );
@@ -789,7 +789,7 @@ void SwEditShell::SetNodeNumStart( USHORT nStt )
StartAllAction();
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
{
GetDoc()->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( *pCrsr );
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 2bbd97027691..41de9878579b 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index caa4a084078d..e390117c318d 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -2,7 +2,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
@@ -34,12 +34,12 @@
#include <editsh.hxx>
#include <pam.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <section.hxx>
#include <edimp.hxx>
-#include <sectfrm.hxx> // SwSectionFrm
-#include <cntfrm.hxx> // SwCntntFrm
-#include <tabfrm.hxx> // SwTabFrm
+#include <sectfrm.hxx> // SwSectionFrm
+#include <cntfrm.hxx> // SwCntntFrm
+#include <tabfrm.hxx> // SwTabFrm
#include <rootfrm.hxx> // SwRootFrm
@@ -288,9 +288,9 @@ USHORT SwEditShell::GetFullSelectedSectionCount() const
// !!!!!!!!!!!!!!!!!!!!!!!!!!
// what about table at start or end ?
-// There is no selection possible!
+// There is no selection possible!
// What about only a table inside the section ?
-// There is only a table selection possible!
+// There is only a table selection possible!
SwNodeIndex aSIdx( pStt->nNode, -1 ), aEIdx( pEnd->nNode, +1 );
if( !aSIdx.GetNode().IsSectionNode() ||
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 65df523cb512..d74268783c9b 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -2,7 +2,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
@@ -166,7 +166,7 @@ BOOL SwEditShell::IsTextToTableAvailable() const
// pruefe ob in der Selection eine Tabelle liegt
ULONG nStt = PCURCRSR->GetMark()->nNode.GetIndex(),
nEnd = PCURCRSR->GetPoint()->nNode.GetIndex();
- if( nStt > nEnd ) { ULONG n = nStt; nStt = nEnd; nEnd = n; }
+ if( nStt > nEnd ) { ULONG n = nStt; nStt = nEnd; nEnd = n; }
for( ; nStt <= nEnd; ++nStt )
if( !GetDoc()->GetNodes()[ nStt ]->IsTxtNode() )
@@ -207,7 +207,7 @@ void SwEditShell::InsertDDETable( const SwInsertTableOptions& rInsTblOpts,
SwTableNode* pTblNode = (SwTableNode*)pTbl->GetTabSortBoxes()[ 0 ]->
GetSttNd()->FindTableNode();
SwDDETable* pDDETbl = new SwDDETable( *pTbl, pDDEType );
- pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle
+ pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle
if( bEndUndo )
EndUndo( UNDO_END );
@@ -257,7 +257,7 @@ void SwEditShell::SetTblChgMode( TblChgMode eMode )
if( pTblNd )
{
((SwTable&)pTblNd->GetTable()).SetTblChgMode( eMode );
- if( !GetDoc()->IsModified() ) // Bug 57028
+ if( !GetDoc()->IsModified() ) // Bug 57028
GetDoc()->SetUndoNoResetModified();
GetDoc()->SetModified();
}
@@ -452,13 +452,13 @@ BOOL SwEditShell::CanMergeTable( BOOL bWithPrev, BOOL* pChkNxtPrv ) const
// --> FME 2004-09-17 #117418# Consider table in table case
pChkNd->EndOfSectionIndex() == pTblNd->GetIndex() - 1 )
// <--
- *pChkNxtPrv = TRUE, bRet = TRUE; // mit Prev ist moeglich
+ *pChkNxtPrv = TRUE, bRet = TRUE; // mit Prev ist moeglich
else
{
pChkNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
bNew == pChkNd->GetTable().IsNewModel() )
- *pChkNxtPrv = FALSE, bRet = TRUE; // mit Next ist moeglich
+ *pChkNxtPrv = FALSE, bRet = TRUE; // mit Next ist moeglich
}
}
else
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 8a7d9357c1f8..370b9d6719d1 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@
#include <statstr.hrc>
#include <bookmrk.hxx>
#include <xmloff/odffields.hxx>
-
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
@@ -120,7 +120,7 @@ BOOL SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const
{
OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
- return rTOXSect.IsProtect();
+ return rTOXSect.IsProtect();
}
/* -----------------18.10.99 15:53-------------------
@@ -140,14 +140,14 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly)
/* -----------------02.09.99 07:47-------------------
--------------------------------------------------*/
-const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
+const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
{
return GetDoc()->GetDefaultTOXBase( eTyp, bCreate );
}
/* -----------------02.09.99 08:05-------------------
--------------------------------------------------*/
-void SwEditShell::SetDefaultTOXBase(const SwTOXBase& rBase)
+void SwEditShell::SetDefaultTOXBase(const SwTOXBase& rBase)
{
GetDoc()->SetDefaultTOXBase(rBase);
}
@@ -313,7 +313,7 @@ BOOL SwEditShell::IsUpdateTOX() const
/* -----------------26.08.99 13:49-------------------
--------------------------------------------------*/
-const String& SwEditShell::GetTOIAutoMarkURL() const
+const String& SwEditShell::GetTOIAutoMarkURL() const
{
return GetDoc()->GetTOIAutoMarkURL();
}
@@ -333,7 +333,7 @@ void SwEditShell::ApplyAutoMark()
BOOL bDoesUndo = DoesUndo();
DoUndo(FALSE);
//1. remove all automatic generated index entries if AutoMarkURL has a
- // length and the file exists
+ // length and the file exists
//2. load file
//3. select all occurrences of the searched words
//4. apply index entries
@@ -362,15 +362,15 @@ void SwEditShell::ApplyAutoMark()
//
// SearchOptions to be used in loop below
//
- //SearchAlgorithms eSrchType = SearchAlgorithms_ABSOLUTE;
- //OUString aSrchStr = rText;
- BOOL bCaseSensitive = TRUE;
- BOOL bWordOnly = FALSE;
- BOOL bSrchInSel = FALSE;
- BOOL bLEV_Relaxed = TRUE;
- INT32 nLEV_Other = 2; // -> changedChars;
- INT32 nLEV_Longer = 3; //! -> deletedChars;
- INT32 nLEV_Shorter = 1; //! -> insertedChars;
+ //SearchAlgorithms eSrchType = SearchAlgorithms_ABSOLUTE;
+ //OUString aSrchStr = rText;
+ BOOL bCaseSensitive = TRUE;
+ BOOL bWordOnly = FALSE;
+ BOOL bSrchInSel = FALSE;
+ BOOL bLEV_Relaxed = TRUE;
+ INT32 nLEV_Other = 2; // -> changedChars;
+ INT32 nLEV_Longer = 3; //! -> deletedChars;
+ INT32 nLEV_Shorter = 1; //! -> insertedChars;
INT32 nTransliterationFlags = 0;
//
INT32 nSrchFlags = 0;
@@ -413,14 +413,14 @@ void SwEditShell::ApplyAutoMark()
if( sToSelect.Len() )
{
String sAlternative = sLine.GetToken(0, ';', nTokenPos);
- String sPrimary = sLine.GetToken(0, ';', nTokenPos);
- String sSecondary = sLine.GetToken(0, ';', nTokenPos);
+ String sPrimary = sLine.GetToken(0, ';', nTokenPos);
+ String sSecondary = sLine.GetToken(0, ';', nTokenPos);
String sCase = sLine.GetToken(0, ';', nTokenPos);
- String sWordOnly = sLine.GetToken(0, ';', nTokenPos);
+ String sWordOnly = sLine.GetToken(0, ';', nTokenPos);
//3.
- bCaseSensitive = sCase.Len() && sCase != sZero;
- bWordOnly = sWordOnly.Len() && sWordOnly != sZero;
+ bCaseSensitive = sCase.Len() && sCase != sZero;
+ bWordOnly = sWordOnly.Len() && sWordOnly != sZero;
//
if (!bCaseSensitive)
{
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 1e6f3ae4a5a8..15fa4dcbb187 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -2,7 +2,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
@@ -69,14 +69,14 @@ BOOL SwEditShell::Undo( SwUndoId nUndoId, USHORT nCnt )
ClearMark();
// JP 02.04.98: Cursor merken - beim Auto-Format/-Korrektur
- // soll dieser wieder an die Position
+ // soll dieser wieder an die Position
SwUndoId nLastUndoId = GetDoc()->GetUndoIds(NULL, NULL);
BOOL bRestoreCrsr = 1 == nCnt && ( UNDO_AUTOFORMAT == nLastUndoId ||
UNDO_AUTOCORRECT == nLastUndoId );
Push();
//JP 18.09.97: gesicherten TabellenBoxPtr zerstoeren, eine autom.
- // Erkennung darf nur noch fuer die neue "Box" erfolgen!
+ // Erkennung darf nur noch fuer die neue "Box" erfolgen!
ClearTblBoxCntnt();
RedlineMode_t eOld = GetDoc()->GetRedlineMode();
@@ -104,7 +104,7 @@ BOOL SwEditShell::Undo( SwUndoId nUndoId, USHORT nCnt )
Pop( !bRestoreCrsr );
- if( aUndoIter.pSelFmt ) // dann erzeuge eine Rahmen-Selection
+ if( aUndoIter.pSelFmt ) // dann erzeuge eine Rahmen-Selection
{
if( RES_DRAWFRMFMT == aUndoIter.pSelFmt->Which() )
{
@@ -124,8 +124,8 @@ BOOL SwEditShell::Undo( SwUndoId nUndoId, USHORT nCnt )
{
lcl_SelectSdrMarkList( this, aUndoIter.pMarkList );
}
- else if( GetCrsr()->GetNext() != GetCrsr() ) // gehe nach einem
- GoNextCrsr(); // Undo zur alten Undo-Position !!
+ else if( GetCrsr()->GetNext() != GetCrsr() ) // gehe nach einem
+ GoNextCrsr(); // Undo zur alten Undo-Position !!
GetDoc()->SetRedlineMode( eOld );
GetDoc()->CompressRedlines();
@@ -162,7 +162,7 @@ USHORT SwEditShell::Redo( USHORT nCnt )
ClearMark();
//JP 18.09.97: gesicherten TabellenBoxPtr zerstoeren, eine autom.
- // Erkennung darf nur noch fuer die neue "Box" erfolgen!
+ // Erkennung darf nur noch fuer die neue "Box" erfolgen!
ClearTblBoxCntnt();
RedlineMode_t eOld = GetDoc()->GetRedlineMode();
@@ -190,7 +190,7 @@ USHORT SwEditShell::Redo( USHORT nCnt )
if( aUndoIter.IsUpdateAttr() )
UpdateAttr();
- if( aUndoIter.pSelFmt ) // dann erzeuge eine Rahmen-Selection
+ if( aUndoIter.pSelFmt ) // dann erzeuge eine Rahmen-Selection
{
if( RES_DRAWFRMFMT == aUndoIter.pSelFmt->Which() )
{
@@ -210,8 +210,8 @@ USHORT SwEditShell::Redo( USHORT nCnt )
{
lcl_SelectSdrMarkList( this, aUndoIter.pMarkList );
}
- else if( GetCrsr()->GetNext() != GetCrsr() ) // gehe nach einem
- GoNextCrsr(); // Redo zur alten Undo-Position !!
+ else if( GetCrsr()->GetNext() != GetCrsr() ) // gehe nach einem
+ GoNextCrsr(); // Redo zur alten Undo-Position !!
GetDoc()->SetRedlineMode( eOld );
GetDoc()->CompressRedlines();
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index f50ed630642b..03152c903f61 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -2,7 +2,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
@@ -69,7 +69,7 @@ SwEditShell::~SwEditShell() // USED
}
/******************************************************************************
- * sal_Bool SwEditShell::IsModified() const
+ * sal_Bool SwEditShell::IsModified() const
******************************************************************************/
@@ -78,7 +78,7 @@ sal_Bool SwEditShell::IsModified() const
return GetDoc()->IsModified();
}
/******************************************************************************
- * void SwEditShell::SetModified()
+ * void SwEditShell::SetModified()
******************************************************************************/
@@ -87,7 +87,7 @@ void SwEditShell::SetModified()
GetDoc()->SetModified();
}
/******************************************************************************
- * void SwEditShell::ResetModified()
+ * void SwEditShell::ResetModified()
******************************************************************************/
@@ -103,7 +103,7 @@ void SwEditShell::SetUndoNoResetModified()
}
/******************************************************************************
- * void SwEditShell::StartAllAction()
+ * void SwEditShell::StartAllAction()
******************************************************************************/
@@ -119,7 +119,7 @@ void SwEditShell::StartAllAction()
} while(pSh != this);
}
/******************************************************************************
- * void SwEditShell::EndAllAction()
+ * void SwEditShell::EndAllAction()
******************************************************************************/
@@ -136,7 +136,7 @@ void SwEditShell::EndAllAction()
}
/******************************************************************************
- * void SwEditShell::CalcLayout()
+ * void SwEditShell::CalcLayout()
******************************************************************************/
@@ -158,7 +158,7 @@ void SwEditShell::CalcLayout()
}
/******************************************************************************
- * Inhaltsform bestimmen, holen
+ * Inhaltsform bestimmen, holen
******************************************************************************/
// OPT: wird fuer jedes Attribut gerufen?
@@ -172,7 +172,7 @@ sal_uInt16 SwEditShell::GetCntType() const
else
switch( GetCrsr()->GetNode()->GetNodeType() )
{
- case ND_TEXTNODE: nRet = CNT_TXT; break;
+ case ND_TEXTNODE: nRet = CNT_TXT; break;
case ND_GRFNODE: nRet = CNT_GRF; break;
case ND_OLENODE: nRet = CNT_OLE; break;
}
@@ -205,7 +205,7 @@ sal_Bool SwEditShell::HasOtherCnt() const
}
/******************************************************************************
- * Zugriffsfunktionen fuer Filename-Behandlung
+ * Zugriffsfunktionen fuer Filename-Behandlung
******************************************************************************/
@@ -222,8 +222,8 @@ SwActKontext::~SwActKontext()
}
/******************************************************************************
- * Klasse fuer den automatisierten Aufruf von Start- und
- * EndCrsrMove();
+ * Klasse fuer den automatisierten Aufruf von Start- und
+ * EndCrsrMove();
******************************************************************************/
@@ -239,7 +239,7 @@ SwMvKontext::~SwMvKontext()
}
-SwFrmFmt *SwEditShell::GetTableFmt() // OPT: schnellster Test auf Tabelle?
+SwFrmFmt *SwEditShell::GetTableFmt() // OPT: schnellster Test auf Tabelle?
{
const SwTableNode* pTblNd = IsCrsrInTbl();
return pTblNd ? (SwFrmFmt*)pTblNd->GetTable().GetFrmFmt() : 0;
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index 4bc9d568701b..ddb3a7b1a4fd 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@
DbgLoopStack DbgLoop::aDbgLoopStack;
/*************************************************************************
- * class DbgLoopStack
+ * class DbgLoopStack
*************************************************************************/
DbgLoopStack::DbgLoopStack()
@@ -56,7 +56,7 @@ void DbgLoopStack::Reset()
}
/*************************************************************************
- * DbgLoopStack::Push()
+ * DbgLoopStack::Push()
*************************************************************************/
void DbgLoopStack::Push( const void *pThis )
@@ -82,7 +82,7 @@ void DbgLoopStack::Push( const void *pThis )
}
/*************************************************************************
- * DbgLoopStack::Pop()
+ * DbgLoopStack::Pop()
*************************************************************************/
void DbgLoopStack::Pop()
@@ -99,7 +99,7 @@ void DbgLoopStack::Pop()
}
/*************************************************************************
- * DbgLoopStack::Print()
+ * DbgLoopStack::Print()
*************************************************************************/
void DbgLoopStack::Print( SvStream &rOS ) const
@@ -118,7 +118,7 @@ void DbgLoopStack::Print( SvStream &rOS ) const
// compile with: cl /AL /DSTAND_ALONE dbgloop.cxx
/*************************************************************************
- * main()
+ * main()
*************************************************************************/
#include <stdlib.h>
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index a41cc9ed642c..4c80f63c1ad3 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -2,7 +2,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
@@ -38,14 +38,14 @@
#include <vcl/svapp.hxx>
#include <vcl/sound.hxx>
#include <errhdl.hxx>
-#include <error.h> // fuer die defines von ERR_SW6MSG_ ...
+#include <error.h> // fuer die defines von ERR_SW6MSG_ ...
// break into CodeView
#if defined(ZTC) && defined(WIN)
-#define CVBREAK asm( 0xCC );
+#define CVBREAK asm( 0xCC );
#endif
#if defined(MSC) && defined(WIN)
-#define CVBREAK __asm int 3;
+#define CVBREAK __asm int 3;
#endif
#ifndef CVBREAK
#define CVBREAK
@@ -56,9 +56,9 @@
wo der Fehler auftrat.
Die Funktion wird durch das OSL_ENSURE(Makro gerufen!
Parameter:
- USHORT nErrorId Id fuer Fehlermeldung
- char *pFileName Filename in dem der Fehler auftrat
- USHORT nLine Zeilennummer in dem der Fehler auftrat
+ USHORT nErrorId Id fuer Fehlermeldung
+ char *pFileName Filename in dem der Fehler auftrat
+ USHORT nLine Zeilennummer in dem der Fehler auftrat
------------------------------------------------------------------------*/
void AssertFail( USHORT nErrorId, const sal_Char* pFileName )
@@ -66,13 +66,13 @@ void AssertFail( USHORT nErrorId, const sal_Char* pFileName )
// Umsetzung der ErrorId in eine Fehlermeldung
static const sal_Char
/* Error Fehlermeldungen zugriffe ausserhalb eines Bereiches */
- sERR_VAR_IDX[] = "Op[]",
- sERR_OUTOFSCOPE[] = "Zugriff ausserhalb des Bereiches",
+ sERR_VAR_IDX[] = "Op[]",
+ sERR_OUTOFSCOPE[] = "Zugriff ausserhalb des Bereiches",
/* Error Codes fuer Numerierungsregeln */
- sERR_NUMLEVEL[] = "Falscher Num-Level",
+ sERR_NUMLEVEL[] = "Falscher Num-Level",
/* Error Codes fuer TxtNode */
- sERR_NOHINTS[] = "Zugriff auf ungueltiges HintsArray",
- sERR_UNKNOWN[] = "???";
+ sERR_NOHINTS[] = "Zugriff auf ungueltiges HintsArray",
+ sERR_UNKNOWN[] = "???";
static const sal_Char* aErrStrTab[ ERR_SWGMSG_END - ERR_SWGMSG_START +1 ] =
{
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 31ebf2f3415c..fad66215488a 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -2,7 +2,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
@@ -84,7 +84,7 @@ SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
aAuthFields[i] = rCopy.aAuthFields[i];
}
// --------------------------------------------------------
-BOOL SwAuthEntry::operator==(const SwAuthEntry& rComp)
+BOOL SwAuthEntry::operator==(const SwAuthEntry& rComp)
{
for(USHORT i = 0; i < AUTH_FIELD_END; i++)
if(aAuthFields[i] != rComp.aAuthFields[i])
@@ -131,7 +131,7 @@ SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType)
--------------------------------------------------*/
SwAuthorityFieldType::~SwAuthorityFieldType()
{
-// DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
+// DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
delete m_pSortKeyArr;
delete m_pSequArr;
@@ -140,14 +140,14 @@ SwAuthorityFieldType::~SwAuthorityFieldType()
/*-- 14.09.99 16:22:09---------------------------------------------------
-----------------------------------------------------------------------*/
-SwFieldType* SwAuthorityFieldType::Copy() const
+SwFieldType* SwAuthorityFieldType::Copy() const
{
return new SwAuthorityFieldType(m_pDoc);
}
/* -----------------17.09.99 13:43-------------------
--------------------------------------------------*/
-void SwAuthorityFieldType::RemoveField(long nHandle)
+void SwAuthorityFieldType::RemoveField(long nHandle)
{
#if OSL_DEBUG_LEVEL > 1
BOOL bRemoved = FALSE;
@@ -178,7 +178,7 @@ void SwAuthorityFieldType::RemoveField(long nHandle)
/* -----------------17.09.99 13:43-------------------
--------------------------------------------------*/
-long SwAuthorityFieldType::AddField(const String& rFieldContents)
+long SwAuthorityFieldType::AddField(const String& rFieldContents)
{
long nRet = 0;
SwAuthEntry* pEntry = new SwAuthEntry;
@@ -232,7 +232,7 @@ BOOL SwAuthorityFieldType::AddField(long nHandle)
/* -----------------17.09.99 14:52-------------------
--------------------------------------------------*/
-const SwAuthEntry* SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
+const SwAuthEntry* SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
{
const SwAuthEntry* pRet = 0;
for(USHORT j = 0; j < m_pDataArr->Count(); j++)
@@ -264,7 +264,7 @@ void SwAuthorityFieldType::GetAllEntryIdentifiers(
/* -----------------21.09.99 13:34-------------------
--------------------------------------------------*/
-const SwAuthEntry* SwAuthorityFieldType::GetEntryByIdentifier(
+const SwAuthEntry* SwAuthorityFieldType::GetEntryByIdentifier(
const String& rIdentifier)const
{
const SwAuthEntry* pRet = 0;
@@ -301,10 +301,10 @@ bool SwAuthorityFieldType::ChangeEntryContent(const SwAuthEntry* pNewEntry)
return bChanged;
}
/*-- 11.10.99 08:49:22---------------------------------------------------
- Description: appends a new entry (if new) and returns the array position
+ Description: appends a new entry (if new) and returns the array position
-----------------------------------------------------------------------*/
-USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
+USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
{
USHORT nRet = 0;
for( nRet = 0; nRet < m_pDataArr->Count(); ++nRet )
@@ -327,7 +327,7 @@ USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
/*-- 11.10.99 08:49:24---------------------------------------------------
-----------------------------------------------------------------------*/
-long SwAuthorityFieldType::GetHandle(USHORT nPos)
+long SwAuthorityFieldType::GetHandle(USHORT nPos)
{
long nRet = 0;
if( nPos < m_pDataArr->Count() )
@@ -340,7 +340,7 @@ long SwAuthorityFieldType::GetHandle(USHORT nPos)
/* -----------------19.10.99 13:46-------------------
--------------------------------------------------*/
-USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
+USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
{
//find the field in a sorted array of handles,
#if OSL_DEBUG_LEVEL > 1
@@ -479,7 +479,7 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
sProp2( C2U(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
for(sal_uInt16 i = 0; i < m_pSortKeyArr->Count(); i++)
{
- const SwTOXSortKey* pKey = (*m_pSortKeyArr)[i];
+ const SwTOXSortKey* pKey = (*m_pSortKeyArr)[i];
pValues[i].realloc(2);
PropertyValue* pValue = pValues[i].getArray();
pValue[0].Name = sProp1;
@@ -640,7 +640,7 @@ SwAuthorityField::~SwAuthorityField()
/*-- 14.09.99 16:20:59---------------------------------------------------
-----------------------------------------------------------------------*/
-String SwAuthorityField::Expand() const
+String SwAuthorityField::Expand() const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
String sRet;
@@ -651,7 +651,7 @@ String SwAuthorityField::Expand() const
{
if(!pAuthType->GetDoc()->IsExpFldsLocked())
m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
- if( m_nTempSequencePos >= 0 )
+ if( m_nTempSequencePos >= 0 )
sRet += String::CreateFromInt32( m_nTempSequencePos );
}
else
@@ -676,7 +676,7 @@ SwField* SwAuthorityField::Copy() const
/* -----------------21.09.99 12:55-------------------
--------------------------------------------------*/
-const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
+const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
const SwAuthEntry* pEntry = pAuthType->GetEntryByHandle( m_nHandle );
@@ -685,7 +685,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
/* -----------------21.09.99 14:57-------------------
--------------------------------------------------*/
-void SwAuthorityField::SetPar1(const String& rStr)
+void SwAuthorityField::SetPar1(const String& rStr)
{
SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp();
pInitType->RemoveField(m_nHandle);
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 28b4ae00a0bc..3ed664f0e14f 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@
#include <ndindex.hxx>
const sal_Unicode cRelTrenner = ',';
-const sal_Unicode cRelKennung = ''; // CTRL-R
+const sal_Unicode cRelKennung = ''; // CTRL-R
const USHORT cMAXSTACKSIZE = 50;
@@ -66,14 +66,14 @@ String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
/*************************************************************************
|*
-|* double SwTableBox::GetValue() const
-|* gebe den Wert dieser Box zurueck. Der Wert ergibt sich aus dem 1.
-|* TextNode. Beginnt dieser mit einer Zahl/Formel, so berechne diese;
-|* oder mit einem Feld, dann hole den Wert.
-|* Alle anderen Bedingungen returnen einen Fehler (oder 0 ?)
+|* double SwTableBox::GetValue() const
+|* gebe den Wert dieser Box zurueck. Der Wert ergibt sich aus dem 1.
+|* TextNode. Beginnt dieser mit einer Zahl/Formel, so berechne diese;
+|* oder mit einem Feld, dann hole den Wert.
+|* Alle anderen Bedingungen returnen einen Fehler (oder 0 ?)
|*
-|* Ersterstellung JP 30. Jun. 93
-|* Letzte Aenderung JP 30. Jun. 93
+|* Ersterstellung JP 30. Jun. 93
+|* Letzte Aenderung JP 30. Jun. 93
|*
|*************************************************************************/
@@ -82,9 +82,9 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
double nRet = 0;
if( rCalcPara.rCalc.IsCalcError() )
- return nRet; // schon ein Fehler in der Berechnung
+ return nRet; // schon ein Fehler in der Berechnung
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
// keine Content Box ?
if( !pSttNd )
@@ -98,13 +98,13 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
// wird eine Rekursion erzeugt ?
SwTableBox* pBox = (SwTableBox*)this;
if( rCalcPara.pBoxStk->Seek_Entry( pBox ))
- return nRet; // steht schon auf dem Stack: FEHLER
+ return nRet; // steht schon auf dem Stack: FEHLER
// bei dieser Box nochmal aufsetzen
rCalcPara.SetLastTblBox( this );
- rCalcPara.pBoxStk->Insert( pBox ); // eintragen
- do { // Middle-Check-Loop, damit aus dieser gesprungen werden kann
+ rCalcPara.pBoxStk->Insert( pBox ); // eintragen
+ do { // Middle-Check-Loop, damit aus dieser gesprungen werden kann
// hier aufgespannt, damit am Ende der Box-Pointer aus dem
// Stack ausgetragen wird
SwDoc* pDoc = GetFrmFmt()->GetDoc();
@@ -113,7 +113,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( SFX_ITEM_SET == GetFrmFmt()->GetItemState(
RES_BOXATR_FORMULA, FALSE, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
if( !((SwTblBoxFormula*)pItem)->IsValid() )
{
// dann berechnen
@@ -140,7 +140,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
RES_BOXATR_VALUE, FALSE, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
nRet = ((SwTblBoxValue*)pItem)->GetValue();
break;
}
@@ -167,7 +167,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( !pTxtFld )
break;
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
const SwField* pFld = pTxtFld->GetFld().GetFld();
switch( pFld->GetTyp()->Which() )
@@ -181,7 +181,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
case RES_TABLEFLD:
{
SwTblField* pTblFld = (SwTblField*)pFld;
- if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
+ if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
{
// die richtige Tabelle mitgeben!
const SwTable* pTmp = rCalcPara.pTbl;
@@ -199,7 +199,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
case RES_JUMPEDITFLD:
//JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
- // gueltigen Inhalt haben!
+ // gueltigen Inhalt haben!
nRet = 0;
break;
@@ -211,7 +211,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else
{
// Ergebnis ist 0 und kein Fehler!
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
double aNum;
String sTxt( rTxt.Copy( nSttPos ) );
@@ -240,13 +240,13 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( !rCalcPara.IsStackOverFlow() )
{
- rCalcPara.pBoxStk->Remove( pBox ); // raus aus dem Stack
+ rCalcPara.pBoxStk->Remove( pBox ); // raus aus dem Stack
rCalcPara.DecStackCnt();
}
//JP 12.01.99: mit Fehlererkennung, Bug 60794
if( DBL_MAX == nRet )
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
return nRet;
}
@@ -287,7 +287,7 @@ bool SwTblCalcPara::CalcWithStackOverflow()
pBox->GetValue( *this );
} while( IsStackOverFlow() );
- nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
+ nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
// falls Rekursionen erkannt wurden
nStackCnt = 0;
@@ -323,12 +323,12 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
SwTblCalcPara* pCalcPara = (SwTblCalcPara*)pPara;
- if( pCalcPara->rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
+ if( pCalcPara->rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
return;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
@@ -345,7 +345,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
pSttBox = 0;
rNewStr += ' ';
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // Bereich ?
{
// hole ueber das Layout alle "selectierten" Boxen und berechne
// deren Werte
@@ -369,7 +369,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
}
rNewStr += ')';
}
- else if( pSttBox && !pLastBox ) // nur die StartBox ?
+ else if( pSttBox && !pLastBox ) // nur die StartBox ?
{
//JP 12.01.99: und keine EndBox in der Formel!
// Berechne den Wert der Box
@@ -380,7 +380,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
}
}
else
- pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
rNewStr += ' ';
}
@@ -393,7 +393,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -423,7 +423,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -462,7 +462,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
sRefBoxNm = pBox->GetName();
}
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -486,7 +486,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, String& rNewStr,
// ein Bereich in dieser Klammer ?
SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -518,7 +518,7 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
// ein Bereich in dieser Klammer ?
const SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -636,7 +636,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
aStr.Insert( sFormel, nFml, sFormel.Len() - nFml );
break;
}
- aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
+ aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
if( fnFormel != NULL )
{
@@ -663,7 +663,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
aStr += sTblNm;
nStt = nTrenner;
- sTblNm.Erase( 0, 1 ); // Trenner loeschen
+ sTblNm.Erase( 0, 1 ); // Trenner loeschen
if( sTblNm != rTbl.GetFrmFmt()->GetName() )
{
// dann suchen wir uns mal unsere Tabelle:
@@ -742,7 +742,7 @@ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
SwNodeIndex aIdx( *rBox.GetSttNd() );
SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
OSL_ENSURE( pCNd, "Box hat keinen TextNode" );
- Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
+ Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
return pCNd->GetFrm( &aPt, NULL, FALSE );
}
@@ -772,7 +772,7 @@ const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
String sGetName( rGetName );
// ist es denn wirklich eine relative Angabe??
- if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
+ if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
{
if( !pRefBox )
return 0;
@@ -873,7 +873,7 @@ String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
long nLine = SwTable::_GetBoxNum( sTmp );
nLine -= SwTable::_GetBoxNum( sCpy );
- sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen
+ sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen
sTmp = cRelKennung;
sTmp += String::CreateFromInt32( nBox );
@@ -910,7 +910,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
SwSelBoxes* pBoxes = (SwSelBoxes*)pPara;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
@@ -927,7 +927,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
pSttBox = 0;
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // Bereich ?
{
// ueber das Layout alle "selectierten" Boxen und berechne
// deren Werte
@@ -935,7 +935,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
GetBoxes( *pSttBox, *pEndBox, aBoxes );
pBoxes->Insert( &aBoxes );
}
- else if( pSttBox ) // nur die StartBox ?
+ else if( pSttBox ) // nur die StartBox ?
pBoxes->Insert( pSttBox );
}
@@ -949,7 +949,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
pStt = pFrm ? pFrm->GetUpper() : 0;
pEnd = ( 0 != (pFrm = lcl_GetBoxFrm( rEndBox ))) ? pFrm->GetUpper() : 0;
if( !pStt || !pEnd )
- return ; // no valid selection
+ return ; // no valid selection
GetTblSel( pStt, pEnd, rBoxes, 0 );
@@ -958,7 +958,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
// filter die Kopfzeilen-Boxen heraus:
if( pTbl->GetRowsToRepeat() > 0 )
{
- do { // middle-check loop
+ do { // middle-check loop
const SwTableLine* pLine = rSttBox.GetUpper();
while( pLine->GetUpper() )
pLine = pLine->GetUpper()->GetUpper();
@@ -972,7 +972,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
pLine = pLine->GetUpper()->GetUpper();
if( pTbl->IsHeadline( *pLine ) )
- break; // Headline mit im Bereich !
+ break; // Headline mit im Bereich !
const SwTabFrm *pTable = pStt->FindTabFrm();
const SwTabFrm *pEndTable = pEnd->FindTabFrm();
@@ -999,10 +999,10 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
bool* pBValid = (bool*)pPara;
- if( *pBValid ) // einmal falsch, immer falsch
+ if( *pBValid ) // einmal falsch, immer falsch
{
SwTableBox* pSttBox = 0, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
@@ -1072,7 +1072,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
{
SwTableFmlUpdate& rTblUpd = *(SwTableFmlUpdate*)pPara;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
String sTblNm;
@@ -1099,19 +1099,19 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
{
if( pFnd == rTblUpd.DATA.pDelTbl )
{
- if( rTblUpd.pTbl != &rTbl ) // es ist nicht die akt.
+ if( rTblUpd.pTbl != &rTbl ) // es ist nicht die akt.
(rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() )
- += '.'; // den neuen Tabellen Namen setzen
+ += '.'; // den neuen Tabellen Namen setzen
rTblUpd.bModified = TRUE;
}
else if( pFnd != rTblUpd.pTbl ||
( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
else
rTblUpd.bModified = TRUE;
}
else
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
}
}
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index a4f04e30367a..8bf00d8b14b2 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -2,7 +2,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
@@ -32,11 +32,11 @@
#include <com/sun/star/text/ChapterFormat.hpp>
#include <doc.hxx>
-#include <frame.hxx> // SwChapterFieldType::ChangeExpansion()
-#include <pam.hxx> // fuer GetBodyTxtNode
+#include <frame.hxx> // SwChapterFieldType::ChangeExpansion()
+#include <pam.hxx> // fuer GetBodyTxtNode
#include <ndtxt.hxx>
#include <chpfld.hxx>
-#include <expfld.hxx> // fuer GetBodyTxtNode
+#include <expfld.hxx> // fuer GetBodyTxtNode
#include <unofldmid.h>
#include <numrule.hxx>
@@ -74,7 +74,7 @@ String SwChapterField::Expand() const
String sStr( sNumber );
switch( GetFormat() )
{
- case CF_TITLE: sStr = sTitle; break;
+ case CF_TITLE: sStr = sTitle; break;
case CF_NUMBER:
case CF_NUM_TITLE: sStr.Insert( sPre, 0 );
@@ -83,7 +83,7 @@ String SwChapterField::Expand() const
sStr += sTitle;
break;
- case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break;
+ case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break;
}
return sStr;
}
@@ -156,12 +156,12 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
// --> OD 2008-04-02 #refactorlists#
// nLevel = GetRealLevel( pONd->GetTxtColl()->
// GetOutlineLevel() );
- // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei
+ // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei
// "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
//nLevel = static_cast<BYTE>(pONd->GetOutlineLevel());
OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
"<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
- nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei
+ nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei
// <--
if( nPrevLvl < nLevel )
@@ -241,7 +241,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nRet;
switch( GetFormat() )
{
- case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break;
+ case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break;
case CF_TITLE: nRet = text::ChapterFormat::NAME; break;
case CF_NUMBER_NOPREPST:
nRet = text::ChapterFormat::DIGIT;
@@ -250,7 +250,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
nRet = text::ChapterFormat::NO_PREFIX_SUFFIX;
break;
case CF_NUM_TITLE:
- default: nRet = text::ChapterFormat::NAME_NUMBER;
+ default: nRet = text::ChapterFormat::NAME_NUMBER;
}
rAny <<= nRet;
}
@@ -286,7 +286,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>= nVal;
switch( nVal )
{
- case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break;
+ case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break;
case text::ChapterFormat::NUMBER: SetFormat(CF_NUMBER); break;
case text::ChapterFormat::NO_PREFIX_SUFFIX:
SetFormat(CF_NUM_NOPREPST_TITLE);
@@ -295,7 +295,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
SetFormat(CF_NUMBER_NOPREPST);
break;
//case text::ChapterFormat::NAME_NUMBER:
- default: SetFormat(CF_NUM_TITLE);
+ default: SetFormat(CF_NUM_TITLE);
}
}
break;
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a23dbd21e66f..22008b09af5e 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -2,7 +2,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
@@ -199,7 +199,7 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
--------------------------------------------------------------------*/
SwDBField::SwDBField(SwDBFieldType* pTyp, ULONG nFmt)
- : SwValueField(pTyp, nFmt),
+ : SwValueField(pTyp, nFmt),
nSubType(0),
bIsInBodyTxt(TRUE),
bValidValue(FALSE),
@@ -267,11 +267,11 @@ String SwDBField::Expand() const
SwField* SwDBField::Copy() const
{
SwDBField *pTmp = new SwDBField((SwDBFieldType*)GetTyp(), GetFormat());
- pTmp->aContent = aContent;
- pTmp->bIsInBodyTxt = bIsInBodyTxt;
- pTmp->bValidValue = bValidValue;
- pTmp->bInitialized = bInitialized;
- pTmp->nSubType = nSubType;
+ pTmp->aContent = aContent;
+ pTmp->bIsInBodyTxt = bIsInBodyTxt;
+ pTmp->bValidValue = bValidValue;
+ pTmp->bInitialized = bInitialized;
+ pTmp->nSubType = nSubType;
pTmp->SetValue(GetValue());
pTmp->sFieldCode = sFieldCode;
@@ -356,7 +356,7 @@ void SwDBField::Evaluate()
if( DBL_MAX != nValue )
{
sal_Int32 nColumnType = pMgr->GetColumnType(aTmpData.sDataSource, aTmpData.sCommand, aColNm);
- if( DataType::DATE == nColumnType || DataType::TIME == nColumnType ||
+ if( DataType::DATE == nColumnType || DataType::TIME == nColumnType ||
DataType::TIMESTAMP == nColumnType)
{
@@ -379,7 +379,7 @@ void SwDBField::Evaluate()
SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
if (nFmt && nFmt != SAL_MAX_UINT32 && !pFormatter->IsTextFormat(nFmt))
- bValidValue = TRUE; // Wegen Bug #60339 nicht mehr bei allen Strings
+ bValidValue = TRUE; // Wegen Bug #60339 nicht mehr bei allen Strings
}
else
{
@@ -810,7 +810,7 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
if( bCondValid && pMgr && pMgr->IsInMerge() &&
pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
- { // Bedingug OK -> aktuellen Set einstellen
+ { // Bedingug OK -> aktuellen Set einstellen
pMgr->ToRecordId(Max((USHORT)aPar2.ToInt32(), USHORT(1))-1);
}
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index dde46bd3ea01..1765ce7dd997 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@
using rtl::OUString;
using namespace ::com::sun::star;
-#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
+#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
/*--------------------------------------------------------------------
Beschreibung: Globale Variablen
@@ -83,7 +83,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
uno::Sequence< sal_Int8 > aSeq;
rValue >>= aSeq;
String sStr( (sal_Char*)aSeq.getConstArray(), static_cast<xub_StrLen>(aSeq.getLength()),
- DDE_TXT_ENCODING );
+ DDE_TXT_ENCODING );
// CR-LF am Ende entfernen, ist ueberfluessig!
xub_StrLen n = sStr.Len();
@@ -125,7 +125,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ) ||
@@ -187,7 +187,7 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
const SwNode* pNd = 0;
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
@@ -214,7 +214,7 @@ BOOL SwIntrnlRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd,
SwNodes* pNds = &rFldType.GetDoc()->GetNodes();
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
@@ -400,8 +400,8 @@ SwDDEField::SwDDEField( SwDDEFieldType* pInitType )
SwDDEField::~SwDDEField()
{
- if( GetTyp()->IsLastDepend() ) // der Letzte mach das
- ((SwDDEFieldType*)GetTyp())->Disconnect(); // Licht aus
+ if( GetTyp()->IsLastDepend() ) // der Letzte mach das
+ ((SwDDEFieldType*)GetTyp())->Disconnect(); // Licht aus
}
String SwDDEField::Expand() const
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index b7ed6b0dcaa3..799a57e31ebc 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <ndtxt.hxx>
#include <swtable.hxx>
#include <swddetbl.hxx>
-#include <ddefld.hxx> // fuer den FieldType
+#include <ddefld.hxx> // fuer den FieldType
#include <ndindex.hxx>
#include <fldupde.hxx>
#include <swtblfmt.hxx>
@@ -55,7 +55,7 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
rTable.GetTabSortBoxes().Count() ); // move die Inh. Boxen
rTable.GetTabSortBoxes().Remove( (USHORT)0, rTable.GetTabSortBoxes().Count() );
- aLines.Insert( &rTable.GetTabLines(),0 ); // move die Lines
+ aLines.Insert( &rTable.GetTabLines(),0 ); // move die Lines
rTable.GetTabLines().Remove( 0, rTable.GetTabLines().Count() );
if( aLines.Count() )
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index a8b3e981a22f..fecd9dc810ee 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2,7 +2,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
@@ -84,9 +84,9 @@
#include <pagedesc.hxx>
#include <fmtpdsc.hxx>
#include <doc.hxx>
-#include <rootfrm.hxx> // AuthorField
-#include <pagefrm.hxx> //
-#include <cntfrm.hxx> //
+#include <rootfrm.hxx> // AuthorField
+#include <pagefrm.hxx> //
+#include <cntfrm.hxx> //
#include <pam.hxx>
#include <viewsh.hxx>
#include <dbmgr.hxx>
@@ -105,7 +105,7 @@
#include <editeng/outliner.hxx>
#include <editeng/outlobj.hxx>
-#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
+#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -144,8 +144,8 @@ SwFieldType* SwPageNumberFieldType::Copy() const
{
SwPageNumberFieldType *pTmp = new SwPageNumberFieldType();
- pTmp->nNum = nNum;
- pTmp->nMax = nMax;
+ pTmp->nNum = nNum;
+ pTmp->nMax = nMax;
pTmp->nNumberingType = nNumberingType;
pTmp->bVirtuell = bVirtuell;
@@ -551,7 +551,7 @@ bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
case FF_NAME:
nRet = text::FilenameDisplayFormat::NAME_AND_EXT;
break;
- default: nRet = text::FilenameDisplayFormat::FULL;
+ default: nRet = text::FilenameDisplayFormat::FULL;
}
rAny <<= nRet;
}
@@ -582,8 +582,8 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_FORMAT:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nType = 0;
rAny >>= nType;
BOOL bFixed = IsFixed();
@@ -598,7 +598,7 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case text::FilenameDisplayFormat::NAME_AND_EXT:
nType = FF_NAME;
break;
- default: nType = FF_PATHNAME;
+ default: nType = FF_PATHNAME;
}
if(bFixed)
nType |= FF_FIXED;
@@ -718,12 +718,12 @@ bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nRet;
switch( GetFormat() )
{
- case FF_PATH: nRet = text::FilenameDisplayFormat::PATH; break;
+ case FF_PATH: nRet = text::FilenameDisplayFormat::PATH; break;
case FF_NAME_NOEXT: nRet = text::FilenameDisplayFormat::NAME; break;
- case FF_NAME: nRet = text::FilenameDisplayFormat::NAME_AND_EXT; break;
- case FF_UI_RANGE: nRet = text::TemplateDisplayFormat::AREA; break;
+ case FF_NAME: nRet = text::FilenameDisplayFormat::NAME_AND_EXT; break;
+ case FF_UI_RANGE: nRet = text::TemplateDisplayFormat::AREA; break;
case FF_UI_NAME: nRet = text::TemplateDisplayFormat::TITLE; break;
- default: nRet = text::FilenameDisplayFormat::FULL;
+ default: nRet = text::FilenameDisplayFormat::FULL;
}
rAny <<= nRet;
@@ -744,8 +744,8 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_FORMAT:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nType = 0;
rAny >>= nType;
switch( nType )
@@ -759,13 +759,13 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case text::FilenameDisplayFormat::NAME_AND_EXT:
SetFormat(FF_NAME);
break;
- case text::TemplateDisplayFormat::AREA :
+ case text::TemplateDisplayFormat::AREA :
SetFormat(FF_UI_RANGE);
break;
case text::TemplateDisplayFormat::TITLE :
SetFormat(FF_UI_NAME);
break;
- default: SetFormat(FF_PATHNAME);
+ default: SetFormat(FF_PATHNAME);
}
}
break;
@@ -798,7 +798,7 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
case DS_CHAR: nVal = rDStat.nChar; break;
case DS_PAGE:
if( pDoc->GetRootFrm() )
- ((SwDocStat &)rDStat).nPage = pDoc->GetRootFrm()->GetPageNum();
+ ((SwDocStat &)rDStat).nPage = pDoc->GetRootFrm()->GetPageNum();
nVal = rDStat.nPage;
if( SVX_NUM_PAGEDESC == nFmt )
nFmt = (sal_uInt32)nNumberingType;
@@ -954,17 +954,17 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
sal_uInt16 nExtSub = nSub & 0xff00;
- nSub &= 0xff; // ExtendedSubTypes nicht beachten
+ nSub &= 0xff; // ExtendedSubTypes nicht beachten
switch(nSub)
{
- case DI_TITEL: aStr = xDocProps->getTitle(); break;
- case DI_THEMA: aStr = xDocProps->getSubject(); break;
- case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated(
+ case DI_TITEL: aStr = xDocProps->getTitle(); break;
+ case DI_THEMA: aStr = xDocProps->getSubject(); break;
+ case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated(
xDocProps->getKeywords());
break;
- case DI_COMMENT:aStr = xDocProps->getDescription(); break;
- case DI_DOCNO: aStr = String::CreateFromInt32(
+ case DI_COMMENT:aStr = xDocProps->getDescription(); break;
+ case DI_DOCNO: aStr = String::CreateFromInt32(
xDocProps->getEditingCycles() );
break;
case DI_EDIT:
@@ -1011,7 +1011,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
DateTime aDate(aD,aT);
if( nSub == DI_CREATE )
- ; // das wars schon!!
+ ; // das wars schon!!
else if( nSub == DI_CHANGE )
{
aName = xDocProps->getModifiedBy();
@@ -1154,7 +1154,7 @@ String SwDocInfoField::Expand() const
util::Date aDate;
util::DateTime aDateTime;
util::Duration aDuration;
- if( aAny >>= aDate)
+ if( aAny >>= aDate)
{
SvNumberFormatter* pFormatter = pDocShell->GetDoc()->GetNumberFormatter();
Date* pNullDate = pFormatter->GetNullDate();
@@ -1381,17 +1381,17 @@ void SwHiddenTxtFieldType::SetHiddenFlag( sal_Bool bSetHidden )
if( bHidden != bSetHidden )
{
bHidden = bSetHidden;
- UpdateFlds(); // alle HiddenText benachrichtigen
+ UpdateFlds(); // alle HiddenText benachrichtigen
}
}
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
- sal_Bool bConditional,
- const String& rCond,
- const String& rStr,
- sal_Bool bHidden,
+ sal_Bool bConditional,
+ const String& rCond,
+ const String& rStr,
+ sal_Bool bHidden,
sal_uInt16 nSub) :
SwField( pFldType ), aCond(rCond), nSubType(nSub),
bCanToggle(bConditional), bIsHidden(bHidden), bValid(sal_False)
@@ -1425,7 +1425,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
: SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub),
bIsHidden(sal_True), bValid(sal_False)
{
- bCanToggle = aCond.Len() > 0;
+ bCanToggle = aCond.Len() > 0;
}
/* ---------------------------------------------------------------------------
@@ -1433,7 +1433,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
String SwHiddenTxtField::Expand() const
{
// Type: !Hidden -> immer anzeigen
- // Hide -> Werte die Bedingung aus
+ // Hide -> Werte die Bedingung aus
if( TYP_CONDTXTFLD == nSubType )
{
@@ -1471,12 +1471,12 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
sTmpName = aFALSETxt;
// OS 21.08.97: #42943# Datenbankausdruecke muessen sich von
-// einfachem Text unterscheiden. also wird der einfache Text
-// bevorzugt in Anfuehrungszeichen gesetzt.
-// Sind diese vorhanden werden umschliessende entfernt.
-// Wenn nicht, dann wird auf die Tauglichkeit als Datenbankname
-// geprueft. Nur wenn zwei oder mehr Punkte vorhanden sind und kein
-// Anfuehrungszeichen enthalten ist, gehen wir von einer DB aus.
+// einfachem Text unterscheiden. also wird der einfache Text
+// bevorzugt in Anfuehrungszeichen gesetzt.
+// Sind diese vorhanden werden umschliessende entfernt.
+// Wenn nicht, dann wird auf die Tauglichkeit als Datenbankname
+// geprueft. Nur wenn zwei oder mehr Punkte vorhanden sind und kein
+// Anfuehrungszeichen enthalten ist, gehen wir von einer DB aus.
if(sTmpName.Len() > 1 && sTmpName.GetChar(0) == '\"' &&
sTmpName.GetChar((sTmpName.Len() - 1))== '\"')
{
@@ -1488,7 +1488,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
{
::ReplacePoint(sTmpName);
if(sTmpName.GetChar(0) == '[' && sTmpName.GetChar(sTmpName.Len()-1) == ']')
- { // Eckige Klammern entfernen
+ { // Eckige Klammern entfernen
sTmpName.Erase(0, 1);
sTmpName.Erase(sTmpName.Len()-1, 1);
}
@@ -1547,10 +1547,10 @@ SwField* SwHiddenTxtField::Copy() const
new SwHiddenTxtField((SwHiddenTxtFieldType*)GetTyp(), aCond,
aTRUETxt, aFALSETxt);
pFld->bIsHidden = bIsHidden;
- pFld->bValid = bValid;
- pFld->aContent = aContent;
+ pFld->bValid = bValid;
+ pFld->aContent = aContent;
pFld->SetFormat(GetFormat());
- pFld->nSubType = nSubType;
+ pFld->nSubType = nSubType;
return pFld;
}
@@ -2070,7 +2070,7 @@ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 ) const
case EU_STATE: nRet = USER_OPT_STATE; break;
case EU_FATHERSNAME: nRet = USER_OPT_FATHERSNAME; break;
case EU_APARTMENT: nRet = USER_OPT_APARTMENT; break;
- default: OSL_ENSURE( !this, "Field unknown");
+ default: OSL_ENSURE( !this, "Field unknown");
}
if( USHRT_MAX != nRet )
{
@@ -2407,7 +2407,7 @@ void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().GetFrm( &aPt, 0, sal_False );
const SwPageFrm* pPgFrm = 0;
sal_uInt16 nDiff = ( pFrm && pRefFrm )
- ? (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
+ ? (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
pRefFrm->FindPageFrm()->GetPhyPageNum() + 1
: 1;
@@ -2491,7 +2491,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
aTmpLst.Seek_Entry( &aEndFld, &nLast );
if( !nLast-- )
- return ; // es gibt kein entsprechendes Set - Feld vor mir
+ return ; // es gibt kein entsprechendes Set - Feld vor mir
const SwTxtFld* pRefTxtFld = aTmpLst[ nLast ]->GetFld();
const SwRefPageSetField* pSetFld =
@@ -2587,7 +2587,7 @@ SwCharFmt* SwJumpEditFieldType::GetCharFmt()
// noch nicht registriert ?
if( !aDep.GetRegisteredIn() )
- pFmt->Add( &aDep ); // anmelden
+ pFmt->Add( &aDep ); // anmelden
return pFmt;
}
@@ -2664,8 +2664,8 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
case JE_FMT_TABLE: nRet = text::PlaceholderType::TABLE; break;
case JE_FMT_FRAME: nRet = text::PlaceholderType::TEXTFRAME; break;
case JE_FMT_GRAPHIC:nRet = text::PlaceholderType::GRAPHIC; break;
- case JE_FMT_OLE: nRet = text::PlaceholderType::OBJECT; break;
-// case JE_FMT_TEXT:
+ case JE_FMT_OLE: nRet = text::PlaceholderType::OBJECT; break;
+// case JE_FMT_TEXT:
default:
nRet = text::PlaceholderType::TEXT; break;
}
@@ -2693,17 +2693,17 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_USHORT1:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nSet = 0;
rAny >>= nSet;
switch( nSet )
{
- case text::PlaceholderType::TEXT : SetFormat(JE_FMT_TEXT); break;
- case text::PlaceholderType::TABLE : SetFormat(JE_FMT_TABLE); break;
+ case text::PlaceholderType::TEXT : SetFormat(JE_FMT_TEXT); break;
+ case text::PlaceholderType::TABLE : SetFormat(JE_FMT_TABLE); break;
case text::PlaceholderType::TEXTFRAME: SetFormat(JE_FMT_FRAME); break;
case text::PlaceholderType::GRAPHIC : SetFormat(JE_FMT_GRAPHIC); break;
- case text::PlaceholderType::OBJECT : SetFormat(JE_FMT_OLE); break;
+ case text::PlaceholderType::OBJECT : SetFormat(JE_FMT_OLE); break;
}
}
break;
@@ -2743,7 +2743,7 @@ SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp,
{
}
-String SwCombinedCharField::Expand() const
+String SwCombinedCharField::Expand() const
{
return sCharacters;
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index da60c16d2993..3bd4a3d463f7 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -2,7 +2,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
@@ -77,10 +77,10 @@ sal_Int16 lcl_SubTypeToAPI(USHORT nSubType)
sal_Int16 nRet = 0;
switch(nSubType)
{
- case nsSwGetSetExpType::GSE_EXPR : nRet = SetVariableType::VAR /*0*/; break;
- case nsSwGetSetExpType::GSE_SEQ : nRet = SetVariableType::SEQUENCE /*1*/; break;
- case nsSwGetSetExpType::GSE_FORMULA : nRet = SetVariableType::FORMULA /*2*/; break;
- case nsSwGetSetExpType::GSE_STRING : nRet = SetVariableType::STRING /*3*/; break;
+ case nsSwGetSetExpType::GSE_EXPR : nRet = SetVariableType::VAR /*0*/; break;
+ case nsSwGetSetExpType::GSE_SEQ : nRet = SetVariableType::SEQUENCE /*1*/; break;
+ case nsSwGetSetExpType::GSE_FORMULA : nRet = SetVariableType::FORMULA /*2*/; break;
+ case nsSwGetSetExpType::GSE_STRING : nRet = SetVariableType::STRING /*3*/; break;
}
return nRet;
}
@@ -92,10 +92,10 @@ sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
sal_Int32 nSet = 0;
switch(nVal)
{
- case SetVariableType::VAR: nSet = nsSwGetSetExpType::GSE_EXPR; break;
+ case SetVariableType::VAR: nSet = nsSwGetSetExpType::GSE_EXPR; break;
case SetVariableType::SEQUENCE: nSet = nsSwGetSetExpType::GSE_SEQ; break;
case SetVariableType::FORMULA: nSet = nsSwGetSetExpType::GSE_FORMULA; break;
- case SetVariableType::STRING: nSet = nsSwGetSetExpType::GSE_STRING; break;
+ case SetVariableType::STRING: nSet = nsSwGetSetExpType::GSE_STRING; break;
default:
DBG_ERROR("wrong value");
nSet = -1;
@@ -195,7 +195,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
const_cast<SwTxtNode*>(pTxtNode)->MakeStartIndex(
&rPos.nContent );
// oder doch besser das Ende vom (Anker-)TextNode nehmen ??
-// ((SwTxtNode*)pTxtNode)->MakeEndIndex( &rPos.nContent );
+// ((SwTxtNode*)pTxtNode)->MakeEndIndex( &rPos.nContent );
}
// noch nicht abbrechen, kann ja auch noch im
@@ -248,7 +248,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
else
{
Point aPt( pLayout->Frm().Pos() );
- aPt.Y()++; // aus dem Header raus
+ aPt.Y()++; // aus dem Header raus
pCntFrm = pPgFrm->GetCntntPos( aPt, FALSE, TRUE, FALSE );
pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
}
@@ -258,7 +258,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
pLayout = pLayout->GetUpper();
continue;
}
- break; // gefunden und beende die Schleife
+ break; // gefunden und beende die Schleife
}
return pTxtNode;
}
@@ -326,8 +326,8 @@ SwField* SwGetExpField::Copy() const
GetFormula(), nSubType, GetFormat());
pTmp->SetLanguage(GetLanguage());
pTmp->SwValueField::SetValue(GetValue());
- pTmp->sExpand = sExpand;
- pTmp->bIsInBodyTxt = bIsInBodyTxt;
+ pTmp->sExpand = sExpand;
+ pTmp->bIsInBodyTxt = bIsInBodyTxt;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
if( bLateInitialization )
pTmp->SetLateInitialization();
@@ -337,7 +337,7 @@ SwField* SwGetExpField::Copy() const
void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
{
- if( bIsInBodyTxt ) // nur Felder in Footer, Header, FootNote, Flys
+ if( bIsInBodyTxt ) // nur Felder in Footer, Header, FootNote, Flys
return;
OSL_ENSURE( !rFrm.IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
@@ -356,7 +356,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
//
if(!pTxtNode)
return;
- // #i82544#
+ // #i82544#
if( bLateInitialization )
{
SwFieldType* pSetExpFld = rDoc.GetFldType(RES_SETEXPFLD, GetFormula(), sal_False);
@@ -368,7 +368,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
SetSubType( nsSwGetSetExpType::GSE_STRING );
}
}
-
+
_SetGetExpFld aEndFld( aPos.nNode, &rFld, &aPos.nContent );
if(GetSubType() & nsSwGetSetExpType::GSE_STRING)
{
@@ -376,7 +376,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
USHORT nSize;
rDoc.FldsToExpand( ppHashTbl, nSize, aEndFld );
LookString( ppHashTbl, nSize, GetFormula(), sExpand );
- ::DeleteHashTable( ppHashTbl, nSize ); // HashTabelle loeschen
+ ::DeleteHashTable( ppHashTbl, nSize ); // HashTabelle loeschen
}
else
{
@@ -516,7 +516,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, USHORT nT
bDeleted( FALSE )
{
if( ( nsSwGetSetExpType::GSE_SEQ | nsSwGetSetExpType::GSE_STRING ) & nType )
- EnableFormat(FALSE); // Numberformatter nicht einsetzen
+ EnableFormat(FALSE); // Numberformatter nicht einsetzen
}
SwFieldType* SwSetExpFieldType::Copy() const
@@ -536,7 +536,7 @@ const String& SwSetExpFieldType::GetName() const
void SwSetExpFieldType::Modify( SfxPoolItem*, SfxPoolItem* )
{
- return; // nicht weiter expandieren
+ return; // nicht weiter expandieren
}
void SwSetExpFieldType::SetSeqFormat(ULONG nFmt)
@@ -584,12 +584,12 @@ extern void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 );
{
for( n = 0; n < aArr.Count(); ++n )
if( aArr[ n ] > nNum )
- return nNum; // nicht vorhanden -> also benutzen
+ return nNum; // nicht vorhanden -> also benutzen
else if( aArr[ n ] == nNum )
- break; // schon vorhanden -> neue erzeugen
+ break; // schon vorhanden -> neue erzeugen
if( n == aArr.Count() )
- return nNum; // nicht vorhanden -> also benutzen
+ return nNum; // nicht vorhanden -> also benutzen
}
// alle Nummern entsprechend geflag, also bestimme die richtige Nummer
@@ -696,7 +696,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
{
String sTmp;
if( ::GetString( rAny, sTmp ).Len() )
-// SetDelimiter( sTmp.GetChar( 0 ));
+// SetDelimiter( sTmp.GetChar( 0 ));
SetDelimiter( sTmp );
else
SetDelimiter(String::CreateFromAscii( " "));
@@ -822,7 +822,7 @@ String SwSetExpField::Expand() const
{
String aStr;
if (nSubType & nsSwExtendedSubType::SUB_CMD)
- { // Der CommandString ist gefragt
+ { // Der CommandString ist gefragt
aStr = GetTyp()->GetName();
aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " = " ));
aStr += GetFormula();
@@ -871,12 +871,12 @@ SwField* SwSetExpField::Copy() const
SwSetExpField *pTmp = new SwSetExpField((SwSetExpFieldType*)GetTyp(),
GetFormula(), GetFormat());
pTmp->SwValueField::SetValue(GetValue());
- pTmp->sExpand = sExpand;
+ pTmp->sExpand = sExpand;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
pTmp->SetLanguage(GetLanguage());
- pTmp->aPText = aPText;
- pTmp->bInput = bInput;
- pTmp->nSeqNo = nSeqNo;
+ pTmp->aPText = aPText;
+ pTmp->bInput = bInput;
+ pTmp->nSeqNo = nSeqNo;
pTmp->SetSubType(GetSubType());
return pTmp;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 2b9e538eb817..761f3a53ff27 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@ using namespace nsSwDocInfoSubType;
USHORT lcl_GetLanguageOfFormat( USHORT nLng, ULONG nFmt,
const SvNumberFormatter& rFormatter )
{
- if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
+ if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
nLng = LANGUAGE_SYSTEM;
else if( nLng == ::GetAppLanguage() )
switch( rFormatter.GetIndexTableOffset( nFmt ))
@@ -90,45 +90,45 @@ SvStringsDtor* SwFieldType::pFldNames = 0;
DBG_NAME(SwFieldType)
USHORT __FAR_DATA aTypeTab[] = {
- /* RES_DBFLD */ TYP_DBFLD,
- /* RES_USERFLD */ TYP_USERFLD,
- /* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
- /* RES_DBNAMEFLD */ TYP_DBNAMEFLD,
- /* RES_DATEFLD */ TYP_DATEFLD,
- /* RES_TIMEFLD */ TYP_TIMEFLD,
- /* RES_PAGENUMBERFLD */ TYP_PAGENUMBERFLD, // dynamisch
- /* RES_AUTHORFLD */ TYP_AUTHORFLD,
- /* RES_CHAPTERFLD */ TYP_CHAPTERFLD,
- /* RES_DOCSTATFLD */ TYP_DOCSTATFLD,
- /* RES_GETEXPFLD */ TYP_GETFLD, // dynamisch
- /* RES_SETEXPFLD */ TYP_SETFLD, // dynamisch
- /* RES_GETREFFLD */ TYP_GETREFFLD,
- /* RES_HIDDENTXTFLD */ TYP_HIDDENTXTFLD,
- /* RES_POSTITFLD */ TYP_POSTITFLD,
- /* RES_FIXDATEFLD */ TYP_FIXDATEFLD,
- /* RES_FIXTIMEFLD */ TYP_FIXTIMEFLD,
- /* RES_REGFLD */ 0, // alt
- /* RES_VARREGFLD */ 0, // alt
- /* RES_SETREFFLD */ TYP_SETREFFLD,
- /* RES_INPUTFLD */ TYP_INPUTFLD,
- /* RES_MACROFLD */ TYP_MACROFLD,
- /* RES_DDEFLD */ TYP_DDEFLD,
- /* RES_TABLEFLD */ TYP_FORMELFLD,
- /* RES_HIDDENPARAFLD */ TYP_HIDDENPARAFLD,
- /* RES_DOCINFOFLD */ TYP_DOCINFOFLD,
- /* RES_TEMPLNAMEFLD */ TYP_TEMPLNAMEFLD,
- /* RES_DBNEXTSETFLD */ TYP_DBNEXTSETFLD,
- /* RES_DBNUMSETFLD */ TYP_DBNUMSETFLD,
- /* RES_DBSETNUMBERFLD */ TYP_DBSETNUMBERFLD,
- /* RES_EXTUSERFLD */ TYP_EXTUSERFLD,
- /* RES_REFPAGESETFLD */ TYP_SETREFPAGEFLD,
- /* RES_REFPAGEGETFLD */ TYP_GETREFPAGEFLD,
- /* RES_INTERNETFLD */ TYP_INTERNETFLD,
- /* RES_JUMPEDITFLD */ TYP_JUMPEDITFLD,
- /* RES_SCRIPTFLD */ TYP_SCRIPTFLD,
- /* RES_DATETIMEFLD */ 0, // dynamisch
- /* RES_AUTHORITY */ TYP_AUTHORITY,
- /* RES_COMBINED_CHARS */ TYP_COMBINED_CHARS,
+ /* RES_DBFLD */ TYP_DBFLD,
+ /* RES_USERFLD */ TYP_USERFLD,
+ /* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
+ /* RES_DBNAMEFLD */ TYP_DBNAMEFLD,
+ /* RES_DATEFLD */ TYP_DATEFLD,
+ /* RES_TIMEFLD */ TYP_TIMEFLD,
+ /* RES_PAGENUMBERFLD */ TYP_PAGENUMBERFLD, // dynamisch
+ /* RES_AUTHORFLD */ TYP_AUTHORFLD,
+ /* RES_CHAPTERFLD */ TYP_CHAPTERFLD,
+ /* RES_DOCSTATFLD */ TYP_DOCSTATFLD,
+ /* RES_GETEXPFLD */ TYP_GETFLD, // dynamisch
+ /* RES_SETEXPFLD */ TYP_SETFLD, // dynamisch
+ /* RES_GETREFFLD */ TYP_GETREFFLD,
+ /* RES_HIDDENTXTFLD */ TYP_HIDDENTXTFLD,
+ /* RES_POSTITFLD */ TYP_POSTITFLD,
+ /* RES_FIXDATEFLD */ TYP_FIXDATEFLD,
+ /* RES_FIXTIMEFLD */ TYP_FIXTIMEFLD,
+ /* RES_REGFLD */ 0, // alt
+ /* RES_VARREGFLD */ 0, // alt
+ /* RES_SETREFFLD */ TYP_SETREFFLD,
+ /* RES_INPUTFLD */ TYP_INPUTFLD,
+ /* RES_MACROFLD */ TYP_MACROFLD,
+ /* RES_DDEFLD */ TYP_DDEFLD,
+ /* RES_TABLEFLD */ TYP_FORMELFLD,
+ /* RES_HIDDENPARAFLD */ TYP_HIDDENPARAFLD,
+ /* RES_DOCINFOFLD */ TYP_DOCINFOFLD,
+ /* RES_TEMPLNAMEFLD */ TYP_TEMPLNAMEFLD,
+ /* RES_DBNEXTSETFLD */ TYP_DBNEXTSETFLD,
+ /* RES_DBNUMSETFLD */ TYP_DBNUMSETFLD,
+ /* RES_DBSETNUMBERFLD */ TYP_DBSETNUMBERFLD,
+ /* RES_EXTUSERFLD */ TYP_EXTUSERFLD,
+ /* RES_REFPAGESETFLD */ TYP_SETREFPAGEFLD,
+ /* RES_REFPAGEGETFLD */ TYP_GETREFPAGEFLD,
+ /* RES_INTERNETFLD */ TYP_INTERNETFLD,
+ /* RES_JUMPEDITFLD */ TYP_JUMPEDITFLD,
+ /* RES_SCRIPTFLD */ TYP_SCRIPTFLD,
+ /* RES_DATETIMEFLD */ 0, // dynamisch
+ /* RES_AUTHORITY */ TYP_AUTHORITY,
+ /* RES_COMBINED_CHARS */ TYP_COMBINED_CHARS,
/* RES_DROPDOWN */ TYP_DROPDOWN
};
// ????? TYP_USRINPFLD,
@@ -183,7 +183,7 @@ bool SwFieldType::PutValue( const uno::Any& , USHORT )
}
/*--------------------------------------------------------------------
- Beschreibung: Basisklasse aller Felder
+ Beschreibung: Basisklasse aller Felder
Felder referenzieren einen Feldtyp
Felder sind n-mal vorhanden, Feldtypen nur einmal
--------------------------------------------------------------------*/
@@ -355,7 +355,7 @@ bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
/*--------------------------------------------------------------------
- Beschreibung: neuen Typ setzen
+ Beschreibung: neuen Typ setzen
(wird fuer das Kopieren zwischen Dokumenten benutzt)
muss immer vom gleichen Typ sein.
--------------------------------------------------------------------*/
@@ -490,7 +490,7 @@ SwValueFieldType::SwValueFieldType( const SwValueFieldType& rTyp )
String SwValueFieldType::ExpandValue( const double& rVal,
sal_uInt32 nFmt, USHORT nLng) const
{
- if (rVal >= DBL_MAX) // FehlerString fuer Calculator
+ if (rVal >= DBL_MAX) // FehlerString fuer Calculator
return ViewShell::GetShellRes()->aCalc_Error;
String sExpand;
@@ -562,10 +562,10 @@ void SwValueFieldType::DoubleToString( String &rValue, const double &rVal,
SvNumberFormatter* pFormatter = pDoc->GetNumberFormatter();
// wegen Bug #60010
- if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
+ if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
nLng = LANGUAGE_SYSTEM;
- pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen
+ pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen
rValue = ::rtl::math::doubleToUString( rVal, rtl_math_StringFormat_F, 12,
pFormatter->GetDecSep(), true );
}
@@ -591,7 +591,7 @@ SwValueField::~SwValueField()
{
}
/*--------------------------------------------------------------------
- Beschreibung: neuen Typ setzen
+ Beschreibung: neuen Typ setzen
(wird fuer das Kopieren zwischen Dokumenten benutzt)
muss immer vom gleichen Typ sein.
--------------------------------------------------------------------*/
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 6bc6bc5421d4..e8968d852414 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 3e8edeea5b68..81b7cb26299d 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 6f704a34a25b..d6827dddd96a 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -2,7 +2,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
@@ -71,7 +71,7 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, BOOL bBuildTmpLst )
{
const SwTxtFld* pTxtFld = pFld->GetTxtFld();
- // nur InputFields und interaktive SetExpFlds bearbeiten
+ // nur InputFields und interaktive SetExpFlds bearbeiten
// and DropDown fields
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
!((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
@@ -168,7 +168,7 @@ USHORT SwInputFieldList::BuildSortLst()
{
const SwTxtFld* pTxtFld = pFld->GetTxtFld();
- // nur InputFields und interaktive SetExpFlds bearbeiten
+ // nur InputFields und interaktive SetExpFlds bearbeiten
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
!((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
continue;
@@ -204,7 +204,7 @@ USHORT SwInputFieldList::BuildSortLst()
void SwInputFieldList::RemoveUnselectedFlds()
{
- _SetGetExpFlds* pNewLst = new _SetGetExpFlds();
+ _SetGetExpFlds* pNewLst = new _SetGetExpFlds();
FOREACHPAM_START(pSh)
{
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 5aef3045b2f7..998aeae04563 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -2,7 +2,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
@@ -69,7 +69,7 @@ SwMacroField::SwMacroField(SwMacroFieldType* pInitType,
}
String SwMacroField::Expand() const
-{ // Button malen anstatt von
+{ // Button malen anstatt von
return aText ;
}
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 63cdb337f526..8e00fabf590a 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -91,7 +91,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( std::vector< SwLa
{
SwLayoutStatus aRet = INVISIBLE;
const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
- SwCntntNode* pNode = rPos.nNode.GetNode().GetCntntNode(); // getfirstcontentnode // getnext...
+ SwCntntNode* pNode = rPos.nNode.GetNode().GetCntntNode(); // getfirstcontentnode // getnext...
if( !pNode )
return aRet;
SwClientIter aIter( *pNode );
@@ -180,12 +180,12 @@ SwPosition SwAnnotationItem::GetAnchorPosition() const
//if( pFld )
//{
SwTxtNode* pTNd = pFld->GetpTxtNode();
- // if( pTNd )
- // {
+ // if( pTNd )
+ // {
SwPosition aPos( *pTNd );
aPos.nContent.Assign( pTNd, *pFld->GetStart() );
return aPos;
- // }
+ // }
//}
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 0a2f5710bf2a..213ab9e24c57 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -2,7 +2,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
@@ -83,7 +83,7 @@ void lcl_GetLayTree( const SwFrm* pFrm, SvPtrarr& rArr )
{
while( pFrm )
{
- if( pFrm->IsBodyFrm() ) // soll uns nicht weiter interessieren
+ if( pFrm->IsBodyFrm() ) // soll uns nicht weiter interessieren
pFrm = pFrm->GetUpper();
else
{
@@ -181,7 +181,7 @@ BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
pRefFrm = (const SwFrm*)aRefArr[ nRefCnt - 1 ];
}
- if( pRefFrm ) // als Flag missbrauchen
+ if( pRefFrm ) // als Flag missbrauchen
{
if( bVert )
{
@@ -368,12 +368,12 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
sTxt = pFtnIdx->GetFtn().GetViewNumStr( *pDoc );
break;
}
- nStt = nEnd; // kein Bereich, der String ist fertig
+ nStt = nEnd; // kein Bereich, der String ist fertig
}
break;
}
- if( nStt != nEnd ) // ein Bereich?
+ if( nStt != nEnd ) // ein Bereich?
{
sTxt = pTxtNd->GetExpandTxt( nStt, nEnd - nStt );
@@ -593,14 +593,14 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nPart = 0;
switch(GetFormat())
{
- case REF_PAGE : nPart = ReferenceFieldPart::PAGE ; break;
- case REF_CHAPTER : nPart = ReferenceFieldPart::CHAPTER ; break;
- case REF_CONTENT : nPart = ReferenceFieldPart::TEXT ; break;
- case REF_UPDOWN : nPart = ReferenceFieldPart::UP_DOWN ; break;
- case REF_PAGE_PGDESC: nPart = ReferenceFieldPart::PAGE_DESC ; break;
- case REF_ONLYNUMBER : nPart = ReferenceFieldPart::CATEGORY_AND_NUMBER ; break;
- case REF_ONLYCAPTION: nPart = ReferenceFieldPart::ONLY_CAPTION ; break;
- case REF_ONLYSEQNO : nPart = ReferenceFieldPart::ONLY_SEQUENCE_NUMBER; break;
+ case REF_PAGE : nPart = ReferenceFieldPart::PAGE ; break;
+ case REF_CHAPTER : nPart = ReferenceFieldPart::CHAPTER ; break;
+ case REF_CONTENT : nPart = ReferenceFieldPart::TEXT ; break;
+ case REF_UPDOWN : nPart = ReferenceFieldPart::UP_DOWN ; break;
+ case REF_PAGE_PGDESC: nPart = ReferenceFieldPart::PAGE_DESC ; break;
+ case REF_ONLYNUMBER : nPart = ReferenceFieldPart::CATEGORY_AND_NUMBER ; break;
+ case REF_ONLYCAPTION: nPart = ReferenceFieldPart::ONLY_CAPTION ; break;
+ case REF_ONLYSEQNO : nPart = ReferenceFieldPart::ONLY_SEQUENCE_NUMBER; break;
// --> OD 2007-09-06 #i81002#
case REF_NUMBER: nPart = ReferenceFieldPart::NUMBER; break;
case REF_NUMBER_NO_CONTEXT: nPart = ReferenceFieldPart::NUMBER_NO_CONTEXT; break;
@@ -669,13 +669,13 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>= nPart;
switch(nPart)
{
- case ReferenceFieldPart::PAGE: nPart = REF_PAGE; break;
- case ReferenceFieldPart::CHAPTER: nPart = REF_CHAPTER; break;
- case ReferenceFieldPart::TEXT: nPart = REF_CONTENT; break;
- case ReferenceFieldPart::UP_DOWN: nPart = REF_UPDOWN; break;
- case ReferenceFieldPart::PAGE_DESC: nPart = REF_PAGE_PGDESC; break;
- case ReferenceFieldPart::CATEGORY_AND_NUMBER: nPart = REF_ONLYNUMBER; break;
- case ReferenceFieldPart::ONLY_CAPTION: nPart = REF_ONLYCAPTION; break;
+ case ReferenceFieldPart::PAGE: nPart = REF_PAGE; break;
+ case ReferenceFieldPart::CHAPTER: nPart = REF_CHAPTER; break;
+ case ReferenceFieldPart::TEXT: nPart = REF_CONTENT; break;
+ case ReferenceFieldPart::UP_DOWN: nPart = REF_UPDOWN; break;
+ case ReferenceFieldPart::PAGE_DESC: nPart = REF_PAGE_PGDESC; break;
+ case ReferenceFieldPart::CATEGORY_AND_NUMBER: nPart = REF_ONLYNUMBER; break;
+ case ReferenceFieldPart::ONLY_CAPTION: nPart = REF_ONLYCAPTION; break;
case ReferenceFieldPart::ONLY_SEQUENCE_NUMBER : nPart = REF_ONLYSEQNO; break;
// --> OD 2007-09-06 #i81002#
case ReferenceFieldPart::NUMBER: nPart = REF_NUMBER; break;
@@ -702,9 +702,9 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
ConvertProgrammaticToUIName();
}
break;
- case ReferenceFieldSource::BOOKMARK : nSubType = REF_BOOKMARK ; break;
- case ReferenceFieldSource::FOOTNOTE : nSubType = REF_FOOTNOTE ; break;
- case ReferenceFieldSource::ENDNOTE : nSubType = REF_ENDNOTE ; break;
+ case ReferenceFieldSource::BOOKMARK : nSubType = REF_BOOKMARK ; break;
+ case ReferenceFieldSource::FOOTNOTE : nSubType = REF_FOOTNOTE ; break;
+ case ReferenceFieldSource::ENDNOTE : nSubType = REF_ENDNOTE ; break;
}
}
break;
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 9d5e808d985a..c77e8bf0e414 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 5ffe9084ba7b..2761ff3a1860 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -2,7 +2,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
@@ -32,12 +32,12 @@
#include <cntfrm.hxx>
#include <doc.hxx>
-#include <pam.hxx> // fuer GetBodyTxtNode
+#include <pam.hxx> // fuer GetBodyTxtNode
#include <ndtxt.hxx>
#include <fmtfld.hxx>
#include <txtfld.hxx>
#include <expfld.hxx>
-#include <docfld.hxx> // fuer _SetGetExpFld
+#include <docfld.hxx> // fuer _SetGetExpFld
#include <unofldmid.h>
using namespace ::com::sun::star;
@@ -58,14 +58,14 @@ SwFieldType* SwTblFieldType::Copy() const
void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
{
- if( rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
+ if( rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
return;
// erzeuge aus den BoxNamen die Pointer
BoxNmToPtr( rCalcPara.pTbl );
String sFml( MakeFormel( rCalcPara ));
SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
- ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder gueltig?
+ ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder gueltig?
}
@@ -82,7 +82,7 @@ SwField* SwTblField::Copy() const
{
SwTblField* pTmp = new SwTblField( (SwTblFieldType*)GetTyp(),
SwTableFormula::GetFormula(), nSubType, GetFormat() );
- pTmp->sExpand = sExpand;
+ pTmp->sExpand = sExpand;
pTmp->SwValueField::SetValue(GetValue());
pTmp->SwTableFormula::operator=( *this );
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
@@ -116,7 +116,7 @@ const SwNode* SwTblField::GetNodeOfFormula() const
SwClientIter aIter( *GetTyp() );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
const SwFmtFld* pFmtFld = (SwFmtFld*)pLast;
if( this == pFmtFld->GetFld() )
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 09d2ddc20fae..f94562b56adc 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -2,7 +2,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
@@ -49,13 +49,13 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0,0,0,0,0}
};
- static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
+ static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
return &aSvxTextPortionPropertySet;
}
@@ -71,14 +71,14 @@ SwTextAPIObject::~SwTextAPIObject() throw()
delete pSource;
}
-struct SwTextAPIEditSource_Impl
+struct SwTextAPIEditSource_Impl
{
// needed for "internal" refcounting
- SfxItemPool* mpPool;
- SwDoc* mpDoc;
- Outliner* mpOutliner;
- SvxOutlinerForwarder* mpTextForwarder;
- sal_Int32 mnRef;
+ SfxItemPool* mpPool;
+ SwDoc* mpDoc;
+ Outliner* mpOutliner;
+ SvxOutlinerForwarder* mpTextForwarder;
+ sal_Int32 mnRef;
};
SwTextAPIEditSource::SwTextAPIEditSource( const SwTextAPIEditSource& rSource )
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index c267b03d52d0..1d4046e1a28b 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -2,7 +2,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
@@ -74,7 +74,7 @@ SwField* SwUserField::Copy() const
String SwUserField::GetCntnt(sal_Bool bName) const
{
if ( bName )
- { String aStr(SwFieldType::GetTypeStr(TYP_USERFLD));
+ { String aStr(SwFieldType::GetTypeStr(TYP_USERFLD));
aStr += ' ';
aStr += GetTyp()->GetName();
aStr.AppendAscii(" = ");
@@ -200,7 +200,7 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const String& aNam )
aName = aNam;
if (nType & nsSwGetSetExpType::GSE_STRING)
- EnableFormat(sal_False); // Numberformatter nicht einsetzen
+ EnableFormat(sal_False); // Numberformatter nicht einsetzen
}
String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng)
@@ -212,7 +212,7 @@ String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16
aStr = ExpandValue(nValue, nFmt, nLng);
}
else
- EnableFormat(sal_False); // Numberformatter nicht einsetzen
+ EnableFormat(sal_False); // Numberformatter nicht einsetzen
return aStr;
}
@@ -220,11 +220,11 @@ String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16
SwFieldType* SwUserFieldType::Copy() const
{
SwUserFieldType *pTmp = new SwUserFieldType( GetDoc(), aName );
- pTmp->aContent = aContent;
- pTmp->nType = nType;
- pTmp->bValidValue = bValidValue;
- pTmp->nValue = nValue;
- pTmp->bDeleted = bDeleted;
+ pTmp->aContent = aContent;
+ pTmp->nType = nType;
+ pTmp->bValidValue = bValidValue;
+ pTmp->nValue = nValue;
+ pTmp->bDeleted = bDeleted;
return pTmp;
}
@@ -303,7 +303,7 @@ void SwUserFieldType::SetContent( const String& rStr, sal_uInt32 nFmt )
sal_Bool bModified = GetDoc()->IsModified();
GetDoc()->SetModified();
- if( !bModified ) // Bug 57028
+ if( !bModified ) // Bug 57028
GetDoc()->SetUndoNoResetModified();
}
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index b2ca4e906d99..c2b2531e0490 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -2,7 +2,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
@@ -93,19 +93,19 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwFEShell::Copy() Copy fuer das Interne Clipboard.
-|* Kopiert alle Selektionen in das Clipboard.
+|* SwFEShell::Copy() Copy fuer das Interne Clipboard.
+|* Kopiert alle Selektionen in das Clipboard.
|*
-|* Ersterstellung JP ??
-|* Letzte Aenderung MA 22. Feb. 95
+|* Ersterstellung JP ??
+|* Letzte Aenderung MA 22. Feb. 95
|
|*************************************************************************/
BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
{
- OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" );
+ OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" );
- pClpDoc->DoUndo( FALSE ); // immer auf FALSE !!
+ pClpDoc->DoUndo( FALSE ); // immer auf FALSE !!
// steht noch Inhalt im ClpDocument, dann muss dieser geloescht werden
SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -126,7 +126,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
SwFlyFrmFmt* pFly = (SwFlyFrmFmt*)(*pClpDoc->GetSpzFrmFmts())[n];
pClpDoc->DelLayoutFmt( pFly );
}
- pClpDoc->GCFieldTypes(); // loesche die FieldTypes
+ pClpDoc->GCFieldTypes(); // loesche die FieldTypes
// wurde ein String uebergeben, so kopiere diesen in das Clipboard-
// Dokument. Somit kann auch der Calculator das interne Clipboard
@@ -134,7 +134,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
if( pNewClpTxt )
{
pTxtNd->InsertText( *pNewClpTxt, SwIndex( pTxtNd ) );
- return TRUE; // das wars.
+ return TRUE; // das wars.
}
pClpDoc->LockExpFlds();
@@ -178,10 +178,10 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
if ( FLY_AS_CHAR == aAnchor.GetAnchorId() )
{
// JP 13.02.99 Bug 61863: wenn eine Rahmenselektion ins Clipboard
- // gestellt wird, so muss beim Pasten auch wieder
- // eine solche vorgefunden werden. Also muss im Node
- // das kopierte TextAttribut wieder entfernt werden,
- // sonst wird es als TextSelektion erkannt
+ // gestellt wird, so muss beim Pasten auch wieder
+ // eine solche vorgefunden werden. Also muss im Node
+ // das kopierte TextAttribut wieder entfernt werden,
+ // sonst wird es als TextSelektion erkannt
const SwIndex& rIdx = pFlyFmt->GetAnchor().GetCntntAnchor()->nContent;
SwTxtFlyCnt *const pTxtFly = static_cast<SwTxtFlyCnt *>(
pTxtNd->GetTxtAttrForCharAt(
@@ -236,7 +236,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
bRet = TRUE;
}
else
- bRet = _CopySelToDoc( pClpDoc, 0 ); // kopiere die Selectionen
+ bRet = _CopySelToDoc( pClpDoc, 0 ); // kopiere die Selectionen
pClpDoc->SetRedlineMode_intern((RedlineMode_t)0 );
pClpDoc->UnlockExpFlds();
@@ -518,7 +518,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
bRet = FALSE;
else
- { //Nicht in sich selbst kopieren
+ { //Nicht in sich selbst kopieren
const SwNodeIndex *pTmp = pFlyFmt->GetCntnt().GetCntntIdx();
if ( aPos.nNode > *pTmp && aPos.nNode <
pTmp->GetNode().EndOfSectionIndex() )
@@ -573,7 +573,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
GetDoc()->DelLayoutFmt( pOldFmt );
// nur selektieren wenn es in der gleichen Shell verschoben/
- // kopiert wird
+ // kopiert wird
if( bSelectInsert )
{
SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aPt, FALSE );
@@ -640,7 +640,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
GetCrsr();
// JP 16.04.99: Bug 64908 - InsPos setzen, damit der geparkte
- // Cursor auf die EinfuegePos. positioniert wird
+ // Cursor auf die EinfuegePos. positioniert wird
if( this == pDestShell )
GetCrsrDocPos() = rInsPt;
}
@@ -690,11 +690,11 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
/*************************************************************************
|*
-|* SwFEShell::Paste() Paste fuer das Interne Clipboard.
-|* Kopiert den Inhalt vom Clipboard in das Dokument.
+|* SwFEShell::Paste() Paste fuer das Interne Clipboard.
+|* Kopiert den Inhalt vom Clipboard in das Dokument.
|*
-|* Ersterstellung JP ??
-|* Letzte Aenderung MA 22. Feb. 95
+|* Ersterstellung JP ??
+|* Letzte Aenderung MA 22. Feb. 95
|
|*************************************************************************/
@@ -707,7 +707,7 @@ namespace {
BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
{
SET_CURR_SHELL( this );
- OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" );
+ OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" );
const USHORT nStartPageNumber = GetPhyPageNum();
// dann bis zum Ende vom Nodes Array
SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -720,8 +720,8 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
SwFieldType* pTblFldTyp = GetDoc()->GetSysFldType( RES_TABLEFLD );
SwTableNode *pDestNd, *pSrcNd = aCpyPam.GetNode()->GetTableNode();
- if( !pSrcNd ) // TabellenNode ?
- { // nicht ueberspringen!!
+ if( !pSrcNd ) // TabellenNode ?
+ { // nicht ueberspringen!!
SwCntntNode* pCNd = aCpyPam.GetNode()->GetCntntNode();
if( pCNd )
aCpyPam.GetPoint()->nContent.Assign( pCNd, 0 );
@@ -861,7 +861,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
// TABLE IN TABLE: Tabelle in Tabelle kopieren
// lasse ueber das Layout die Boxen suchen
SwSelBoxes aBoxes;
- if( IsTableMode() ) // Tabellen-Selecktion ??
+ if( IsTableMode() ) // Tabellen-Selecktion ??
{
GetTblSel( *this, aBoxes );
ParkTblCrsr();
@@ -906,7 +906,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
::PaMCorrAbs( PCURCRSR->GetPoint()->nNode, aPos );
}
- break; // aus der "while"-Schleife heraus
+ break; // aus der "while"-Schleife heraus
}
else if( *aCpyPam.GetPoint() == *aCpyPam.GetMark() &&
pClpDoc->GetSpzFrmFmts()->Count() )
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index b24461fab3b2..5df3a3444d87 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -2,7 +2,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
@@ -45,10 +45,10 @@
#include <SwStyleNameMapper.hxx>
/*************************************************************************
|*
-|* SwFEShell::GetPageDescCnt()
+|* SwFEShell::GetPageDescCnt()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 25. Jan. 93
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 25. Jan. 93
|*
|*************************************************************************/
@@ -59,10 +59,10 @@ USHORT SwFEShell::GetPageDescCnt() const
/*************************************************************************
|*
-|* SwFEShell::ChgCurPageDesc()
+|* SwFEShell::ChgCurPageDesc()
|*
-|* Ersterstellung ST ??
-|* Letzte Aenderung MA 01. Aug. 94
+|* Ersterstellung ST ??
+|* Letzte Aenderung MA 01. Aug. 94
|*
|*************************************************************************/
@@ -132,10 +132,10 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
/*************************************************************************
|*
-|* SwFEShell::ChgPageDesc()
+|* SwFEShell::ChgPageDesc()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 24. Jan. 95
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 24. Jan. 95
|*
|*************************************************************************/
@@ -156,10 +156,10 @@ void SwFEShell::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
/*************************************************************************
|*
-|* SwFEShell::GetPageDesc(), GetCurPageDesc()
+|* SwFEShell::GetPageDesc(), GetCurPageDesc()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 23. Apr. 93
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 23. Apr. 93
|
|*************************************************************************/
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 91c6430a565b..7172b0ceaaef 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -63,7 +63,7 @@
#include <ndtxt.hxx>
#include <edimp.hxx>
#include <swtable.hxx>
-#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
+#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
#include <ndgrf.hxx>
#include <flyfrms.hxx>
#include <flypos.hxx>
@@ -87,12 +87,12 @@ using namespace ::com::sun::star;
void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
/***********************************************************************
-#* Class : SwDoc
-#* Methode : UseSpzLayoutFmt
-#* Beschreibung: Anhand des Request werden zu dem Format entsprechende
-#* Aenderungen an den Spezifischen Layouts vorgenommen.
-#* Datum : MA 23. Sep. 92
-#* Update : JP 09.03.98
+#* Class : SwDoc
+#* Methode : UseSpzLayoutFmt
+#* Beschreibung: Anhand des Request werden zu dem Format entsprechende
+#* Aenderungen an den Spezifischen Layouts vorgenommen.
+#* Datum : MA 23. Sep. 92
+#* Update : JP 09.03.98
#***********************************************************************/
sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
@@ -151,7 +151,7 @@ BOOL lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm,
// es muss ein TextNode gefunden werden, denn nur in diesen
// ist ein Inhaltsgebundene Frames zu verankern
SwCrsrMoveState aState( MV_SETONLYTEXT );
- aTmpPnt.X() -= 1; //nicht im Fly landen!!
+ aTmpPnt.X() -= 1; //nicht im Fly landen!!
if( !pNewAnch->GetCrsrOfst( &aPos, aTmpPnt, &aState ) )
{
SwCntntNode* pCNd = ((SwCntntFrm*)pNewAnch)->GetNode();
@@ -171,7 +171,7 @@ BOOL lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm,
//dichtesten SwFlyFrm suchen.
SwCrsrMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( rDoc.GetNodes() );
- aTmpPnt.X() -= 1; //nicht im Fly landen!!
+ aTmpPnt.X() -= 1; //nicht im Fly landen!!
rDoc.GetRootFrm()->GetCrsrOfst( &aPos, aTmpPnt, &aState );
pNewAnch = ::FindAnchor(
aPos.nNode.GetNode().GetCntntNode()->GetFrm( 0, 0, sal_False ),
@@ -232,13 +232,13 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
{
SET_CURR_SHELL( this );
- // Wenn es ein neuer Rahmen ist, so soll er selektiert sein.
- // !!Rahmen immer selektieren, wenn sie nicht selektiert sind.
- // - Es kann ein neuer 'alter' sein weil der Anker gewechselt wurde.
- // - 'alte' Rahmen sind vorher immer selektiert denn sonst wird nix
- // an ihnen veraendert.
- // Der Rahmen darf nicht per Dokumentposition selektiert werden, weil er
- // auf jedenfall selektiert sein muss!
+ // Wenn es ein neuer Rahmen ist, so soll er selektiert sein.
+ // !!Rahmen immer selektieren, wenn sie nicht selektiert sind.
+ // - Es kann ein neuer 'alter' sein weil der Anker gewechselt wurde.
+ // - 'alte' Rahmen sind vorher immer selektiert denn sonst wird nix
+ // an ihnen veraendert.
+ // Der Rahmen darf nicht per Dokumentposition selektiert werden, weil er
+ // auf jedenfall selektiert sein muss!
SwViewImp *pImpl = Imp();
if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
{
@@ -273,11 +273,11 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
/*************************************************************************
|*
-|* SwFEShell::FindFlyFrm()
+|* SwFEShell::FindFlyFrm()
|*
-|* Beschreibung Liefert den Fly wenn einer Selektiert ist.
-|* Ersterstellung MA 03. Nov. 92
-|* Letzte Aenderung MA 05. Mar. 96
+|* Beschreibung Liefert den Fly wenn einer Selektiert ist.
+|* Ersterstellung MA 03. Nov. 92
+|* Letzte Aenderung MA 05. Mar. 96
|*
*************************************************************************/
@@ -298,12 +298,12 @@ SwFlyFrm *SwFEShell::FindFlyFrm() const
/*************************************************************************
|*
-|* SwFEShell::IsFlyInFly()
+|* SwFEShell::IsFlyInFly()
|*
-|* Beschreibung Liefert sal_True, wenn der aktuelle Fly an einem anderen
-|* verankert werden koennte (also innerhalb ist)
-|* Ersterstellung AMA 11. Sep. 97
-|* Letzte Aenderung AMA 14. Jan. 98
+|* Beschreibung Liefert sal_True, wenn der aktuelle Fly an einem anderen
+|* verankert werden koennte (also innerhalb ist)
+|* Ersterstellung AMA 11. Sep. 97
+|* Letzte Aenderung AMA 14. Jan. 98
|*
*************************************************************************/
@@ -350,7 +350,7 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
SwNodeIndex aSwNodeIndex( GetDoc()->GetNodes() );
SwPosition aPos( aSwNodeIndex );
Point aPoint( aTmpPos );
- aPoint.X() -= 1; //nicht im Fly landen!!
+ aPoint.X() -= 1; //nicht im Fly landen!!
GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
// OD 01.07.2003 #108784# - determine text frame by left-top-corner
// of object
@@ -366,10 +366,10 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
/*************************************************************************
|*
-|* SwFEShell::SetFlyPos
+|* SwFEShell::SetFlyPos
|*
-|* Ersterstellung MA 14. Jan. 93
-|* Letzte Aenderung MA 14. Feb. 95
+|* Ersterstellung MA 14. Jan. 93
+|* Letzte Aenderung MA 14. Feb. 95
|*
*************************************************************************/
@@ -409,15 +409,15 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
}
// --> OD 2004-06-11 #i28701# - no format here
// pFly->Calc();
- CallChgLnk(); // rufe das AttrChangeNotify auf der UI-Seite.
+ CallChgLnk(); // rufe das AttrChangeNotify auf der UI-Seite.
}
/*************************************************************************
|*
-|* SwFEShell::FindAnchorPos
+|* SwFEShell::FindAnchorPos
|*
-|* Ersterstellung AMA 24. Sep. 97
-|* Letzte Aenderung AMA 24. Sep. 97
+|* Ersterstellung AMA 24. Sep. 97
+|* Letzte Aenderung AMA 24. Sep. 97
|*
*************************************************************************/
@@ -623,11 +623,11 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : NewFlyFrm
-#* Beschreibung:
-#* Datum : MA 03. Nov. 92
-#* Update : JP 11. Aug. 93
+#* Class : SwFEShell
+#* Methode : NewFlyFrm
+#* Beschreibung:
+#* Datum : MA 03. Nov. 92
+#* Update : JP 11. Aug. 93
#***********************************************************************/
const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchValid,
@@ -673,7 +673,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
switch( eRndId )
{
case FLY_AT_PAGE:
- if( !rAnch.GetPageNum() ) //HotFix: Bug in UpdateByExample
+ if( !rAnch.GetPageNum() ) //HotFix: Bug in UpdateByExample
rAnch.SetPageNum( 1 );
break;
@@ -713,8 +713,8 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
// erstmal als mit Seitenbindung, Absatz/Zeichenbindung erst wenn
// alles verschoben ist. Dann ist die Position gueltig!
// JP 13.05.98: ggfs. auch noch die Hori/Vert-Orientierung
- // umsetzen, damit diese beim Umanker NICHT
- // korrigiert wird
+ // umsetzen, damit diese beim Umanker NICHT
+ // korrigiert wird
pOldAnchor = new SwFmtAnchor( rAnch );
const_cast<SfxItemSet&>(rSet).Put( SwFmtAnchor( FLY_AT_PAGE, 1 ) );
@@ -745,8 +745,8 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
{
// neue Position bestimmen
//JP 24.03.97: immer ueber die Seitenbindung gehen - der
- // chaos::Anchor darf nie im verschobenen Bereich
- // liegen
+ // chaos::Anchor darf nie im verschobenen Bereich
+ // liegen
pRet->DelFrms();
const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt, sal_False );
@@ -801,10 +801,10 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : Insert
-#* Datum : ??
-#* Update : MA 12. Sep. 94
+#* Class : SwFEShell
+#* Methode : Insert
+#* Datum : ??
+#* Update : MA 12. Sep. 94
#***********************************************************************/
void SwFEShell::Insert( const String& rGrfName, const String& rFltName,
@@ -958,10 +958,10 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : GetPageObjs
-#* Datum : ??
-#* Update : MA 11. Jan. 95
+#* Class : SwFEShell
+#* Methode : GetPageObjs
+#* Datum : ??
+#* Update : MA 11. Jan. 95
#***********************************************************************/
void SwFEShell::GetPageObjs( SvPtrarr& rFillArr )
@@ -981,10 +981,10 @@ void SwFEShell::GetPageObjs( SvPtrarr& rFillArr )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : SetPageFlysNewPage
-#* Datum : ??
-#* Update : MA 14. Feb. 95
+#* Class : SwFEShell
+#* Methode : SetPageFlysNewPage
+#* Datum : ??
+#* Update : MA 14. Feb. 95
#***********************************************************************/
void SwFEShell::SetPageObjsNewPage( SvPtrarr& rFillArr, int nOffset )
@@ -1038,14 +1038,14 @@ void SwFEShell::SetPageObjsNewPage( SvPtrarr& rFillArr, int nOffset )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : GetFlyFrmAttr
-#* Beschreibung: Alle Attribute in dem 'Koerbchen' werden mit den
-#* Attributen des aktuellen FlyFrms gefuellt.
-#* Sind Attribute nicht zu fuellen weil fehl am Platz oder
-#* uneindeutig (Mehrfachtselektionen) so werden sie entfernt.
-#* Datum : MA 03. Nov. 92
-#* Update : MA 03. Feb. 94
+#* Class : SwFEShell
+#* Methode : GetFlyFrmAttr
+#* Beschreibung: Alle Attribute in dem 'Koerbchen' werden mit den
+#* Attributen des aktuellen FlyFrms gefuellt.
+#* Sind Attribute nicht zu fuellen weil fehl am Platz oder
+#* uneindeutig (Mehrfachtselektionen) so werden sie entfernt.
+#* Datum : MA 03. Nov. 92
+#* Update : MA 03. Feb. 94
#***********************************************************************/
sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
@@ -1104,11 +1104,11 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
return sal_True;
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : SetFlyFrmAttr
-#* Beschreibung: Die Attribute des aktuellen Flys aendern sich.
-#* Datum : MA 03. Nov. 92
-#* Update : MA 01. Aug. 95
+#* Class : SwFEShell
+#* Methode : SetFlyFrmAttr
+#* Beschreibung: Die Attribute des aktuellen Flys aendern sich.
+#* Datum : MA 03. Nov. 92
+#* Update : MA 01. Aug. 95
#***********************************************************************/
sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
@@ -1193,12 +1193,12 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : ResetFlyFrmAttr
-#* Beschreibung: Das gewuenschte Attribut oder die im Set befindlichen
-#* werden zurueckgesetzt.
-#* Datum : MA 14. Mar. 97
-#* Update : MA 14. Mar. 97
+#* Class : SwFEShell
+#* Methode : ResetFlyFrmAttr
+#* Beschreibung: Das gewuenschte Attribut oder die im Set befindlichen
+#* werden zurueckgesetzt.
+#* Datum : MA 14. Mar. 97
+#* Update : MA 14. Mar. 97
#***********************************************************************/
sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
@@ -1246,11 +1246,11 @@ sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : GetCurFrmFmt
-#* Beschreibung: liefert wenn Rahmen, dann Rahmenvorlage, sonst 0
-#* Datum : ST 04. Jun. 93
-#* Update :
+#* Class : SwFEShell
+#* Methode : GetCurFrmFmt
+#* Beschreibung: liefert wenn Rahmen, dann Rahmenvorlage, sonst 0
+#* Datum : ST 04. Jun. 93
+#* Update :
#***********************************************************************/
SwFrmFmt* SwFEShell::GetCurFrmFmt() const
@@ -1264,10 +1264,10 @@ SwFrmFmt* SwFEShell::GetCurFrmFmt() const
}
/******************************************************************************
- * Methode : void SwFEShell::SetFrmFmt(SwFrmFmt *pNewFmt)
- * Beschreibung:
- * Erstellt : OK 14.04.94 15:40
- * Aenderung : MA 23. Apr. 97
+ * Methode : void SwFEShell::SetFrmFmt(SwFrmFmt *pNewFmt)
+ * Beschreibung:
+ * Erstellt : OK 14.04.94 15:40
+ * Aenderung : MA 23. Apr. 97
******************************************************************************/
void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos )
@@ -1318,10 +1318,10 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocP
/*************************************************************************
|*
-|* SwFEShell::GetFlyFrmFmt()
+|* SwFEShell::GetFlyFrmFmt()
|*
-|* Ersterstellung OK 23.06.93 13:15
-|* Letzte Aenderung OK 23.06.93 13:15
+|* Ersterstellung OK 23.06.93 13:15
+|* Letzte Aenderung OK 23.06.93 13:15
|*
*************************************************************************/
@@ -1353,10 +1353,10 @@ SwFrmFmt* SwFEShell::GetFlyFrmFmt()
/*************************************************************************
|*
-|* SwFEShell::GetFlyRect()
+|* SwFEShell::GetFlyRect()
|*
-|* Ersterstellung AMA 6. Mae. 97
-|* Letzte Aenderung AMA 6. Mae. 97
+|* Ersterstellung AMA 6. Mae. 97
+|* Letzte Aenderung AMA 6. Mae. 97
|*
*************************************************************************/
@@ -1375,10 +1375,10 @@ SwRect SwFEShell::GetFlyRect() const
/*************************************************************************
|*
-|* SwFEShell::GetObjRect()
+|* SwFEShell::GetObjRect()
|*
-|* Ersterstellung MA 22. Aug. 93
-|* Letzte Aenderung MA 11. Jan. 95
+|* Ersterstellung MA 22. Aug. 93
+|* Letzte Aenderung MA 11. Jan. 95
|*
*************************************************************************/
@@ -1398,15 +1398,15 @@ void SwFEShell::SetObjRect( const SwRect& rRect )
if ( Imp()->HasDrawView() )
{
Imp()->GetDrawView()->SetAllMarkedRect( rRect.SVRect() );
- CallChgLnk(); // rufe das AttrChangeNotify auf der UI-Seite.
+ CallChgLnk(); // rufe das AttrChangeNotify auf der UI-Seite.
}
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : RequestObjectResize()
-#* Datum : MA 10. Feb. 95
-#* Update : MA 13. Jul. 95
+#* Class : SwFEShell
+#* Methode : RequestObjectResize()
+#* Datum : MA 10. Feb. 95
+#* Update : MA 13. Jul. 95
#***********************************************************************/
Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < embed::XEmbeddedObject >& xObj )
@@ -1530,10 +1530,10 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : WizzardFindCurFrmFmt
-#* Datum : JP 31.07.95
-#* Update : JP 31.07.95
+#* Class : SwFEShell
+#* Methode : WizzardFindCurFrmFmt
+#* Datum : JP 31.07.95
+#* Update : JP 31.07.95
#***********************************************************************/
SwFrmFmt* SwFEShell::WizzardGetFly()
@@ -1907,8 +1907,8 @@ sal_Bool SwFEShell::ReplaceSdrObj( const String& rGrfName, const String& rFltNam
const Rectangle &rBound = pObj->GetSnapRect();
Point aRelPos( pObj->GetRelativePos() );
- const long nWidth = rBound.Right() - rBound.Left();
- const long nHeight= rBound.Bottom() - rBound.Top();
+ const long nWidth = rBound.Right() - rBound.Left();
+ const long nHeight= rBound.Bottom() - rBound.Top();
aFrmSet.Put( SwFmtFrmSize( ATT_MIN_SIZE,
Max( nWidth, long(MINFLY) ),
Max( nHeight, long(MINFLY) )));
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 24332a60917a..28fb8fdf42d7 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -2,7 +2,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
@@ -121,7 +121,7 @@ void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >&
}
}
-BOOL SwFEShell::FinishOLEObj() // Server wird beendet
+BOOL SwFEShell::FinishOLEObj() // Server wird beendet
{
SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient();
if ( !pIPClient )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 0ebd92d93038..6a6b3f108837 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -81,12 +81,12 @@
#include "ndole.hxx"
#include "ndgrf.hxx"
#include "ndtxt.hxx"
-#include "viewopt.hxx" // fuer GetHTMLMode
+#include "viewopt.hxx" // fuer GetHTMLMode
#include "swundo.hxx"
#include "notxtfrm.hxx"
#include "txtfrm.hxx"
#include "txatbase.hxx"
-#include "mdiexp.hxx" // fuer Update der Statuszeile bei drag
+#include "mdiexp.hxx" // fuer Update der Statuszeile bei drag
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
// --> OD 2006-03-06 #125892#
@@ -123,7 +123,7 @@ void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
{
// dann das evt. gesetzte Macro rufen
pSh->GetFlyMacroLnk().Call( (void*)pFlyFmt );
-extern BOOL bNoInterrupt; // in swapp.cxx
+extern BOOL bNoInterrupt; // in swapp.cxx
// wir in dem Makro ein Dialog gestartet, dann kommt das
// MouseButtonUp zu diesem und nicht zu uns. Dadurch ist
// Flag bei uns immer gesetzt und schaltet nie die auf die
@@ -143,10 +143,10 @@ extern BOOL bNoInterrupt; // in swapp.cxx
/*************************************************************************
|*
-|* SwFEShell::SelectObj()
+|* SwFEShell::SelectObj()
|*
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 22. Oct. 96
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 22. Oct. 96
|*
*************************************************************************/
@@ -156,7 +156,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj )
if(!pDView)
return sal_False;
SET_CURR_SHELL( this );
- StartAction(); //Aktion ist Notwendig, damit nicht mehrere
+ StartAction(); //Aktion ist Notwendig, damit nicht mehrere
//AttrChgdNotify (etwa durch Unmark->MarkListHasChgd)
//durchkommen
@@ -542,10 +542,10 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
/*************************************************************************
|*
-|* SwFEShell::GetSelFrmType()
+|* SwFEShell::GetSelFrmType()
|*
-|* Ersterstellung MA 12. Jan. 93
-|* Letzte Aenderung JP 19.03.96
+|* Ersterstellung MA 12. Jan. 93
+|* Letzte Aenderung JP 19.03.96
|*
*************************************************************************/
@@ -609,10 +609,10 @@ bool SwFEShell::IsSelContainsControl() const
/*************************************************************************
|*
-|* SwFEShell::Scroll()
+|* SwFEShell::Scroll()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 27. Jul. 95
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 27. Jul. 95
|*
*************************************************************************/
@@ -630,10 +630,10 @@ void SwFEShell::ScrollTo( const Point &rPt )
/*************************************************************************
|*
-|* SwFEShell::SetDragMode()
+|* SwFEShell::SetDragMode()
|*
-|* Ersterstellung MA 30. Jan. 95
-|* Letzte Aenderung MA 30. Jan. 95
+|* Ersterstellung MA 30. Jan. 95
+|* Letzte Aenderung MA 30. Jan. 95
|*
*************************************************************************/
@@ -645,10 +645,10 @@ void SwFEShell::SetDragMode( UINT16 eDragMode )
/*************************************************************************
|*
-|* SwFEShell::BeginDrag()
+|* SwFEShell::BeginDrag()
|*
-|* Ersterstellung MS 10.06.92
-|* Letzte Aenderung MA 13. Mar. 96
+|* Ersterstellung MS 10.06.92
+|* Letzte Aenderung MA 13. Mar. 96
|*
*************************************************************************/
@@ -667,10 +667,10 @@ long SwFEShell::BeginDrag( const Point* pPt, BOOL )
}
/*************************************************************************
|*
-|* SwFEShell::Drag()
+|* SwFEShell::Drag()
|*
-|* Ersterstellung MS 10.06.92
-|* Letzte Aenderung MA 13. Mar. 96
+|* Ersterstellung MS 10.06.92
+|* Letzte Aenderung MA 13. Mar. 96
|*
*************************************************************************/
@@ -690,10 +690,10 @@ long SwFEShell::Drag( const Point *pPt, BOOL )
/*************************************************************************
|*
-|* SwFEShell::EndDrag()
+|* SwFEShell::EndDrag()
|*
-|* Ersterstellung MS 10.06.92
-|* Letzte Aenderung MA 13. Mar. 96
+|* Ersterstellung MS 10.06.92
+|* Letzte Aenderung MA 13. Mar. 96
|*
*************************************************************************/
@@ -722,7 +722,7 @@ long SwFEShell::EndDrag( const Point *, BOOL )
pView->EndDragObj();
// JP 18.08.95: DrawUndo-Action auf FlyFrames werden nicht gespeichert
- // Die Fly aendern das Flag
+ // Die Fly aendern das Flag
GetDoc()->SetNoDrawUndoObj( FALSE );
ChgAnchor( 0, TRUE );
@@ -743,10 +743,10 @@ long SwFEShell::EndDrag( const Point *, BOOL )
/*************************************************************************
|*
-|* SwFEShell::BreakDrag()
+|* SwFEShell::BreakDrag()
|*
-|* Ersterstellung OM 02. Okt. 95
-|* Letzte Aenderung OM 02. Okt. 95
+|* Ersterstellung OM 02. Okt. 95
+|* Letzte Aenderung OM 02. Okt. 95
|*
*************************************************************************/
@@ -760,12 +760,12 @@ void SwFEShell::BreakDrag()
/*************************************************************************
|*
-|* SwFEShell::SelFlyGrabCrsr()
+|* SwFEShell::SelFlyGrabCrsr()
|*
-|* Beschreibung Wenn ein Fly selektiert ist, zieht er den Crsr in
-|* den ersten CntntFrm
-|* Ersterstellung MA 11. Dec. 92
-|* Letzte Aenderung MA 07. Oct. 96
+|* Beschreibung Wenn ein Fly selektiert ist, zieht er den Crsr in
+|* den ersten CntntFrm
+|* Ersterstellung MA 11. Dec. 92
+|* Letzte Aenderung MA 07. Oct. 96
|*
*************************************************************************/
@@ -783,13 +783,13 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
SwCntntFrm *pCFrm = pFly->ContainsCntnt();
if ( pCFrm )
{
- SwCntntNode *pCNode = pCFrm->GetNode();
+ SwCntntNode *pCNode = pCFrm->GetNode();
// --> OD 2007-07-25 #126039#
// assure, that the cursor is consistent.
KillPams();
ClearMark();
// <--
- SwPaM *pCrsr = GetCrsr();
+ SwPaM *pCrsr = GetCrsr();
pCrsr->GetPoint()->nNode = *pCNode;
pCrsr->GetPoint()->nContent.Assign( pCNode, 0 );
@@ -808,12 +808,12 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
/*************************************************************************
|*
-|* SwFEShell::SelectionToTop(), SelectionToBottom()
+|* SwFEShell::SelectionToTop(), SelectionToBottom()
|*
-|* Beschreibung Selektion nach oben/unten (Z-Order)
+|* Beschreibung Selektion nach oben/unten (Z-Order)
|*
-|* Ersterstellung MA 05. Nov. 92
-|* Letzte Aenderung MA 03. Jun. 96
+|* Ersterstellung MA 05. Nov. 92
+|* Letzte Aenderung MA 03. Jun. 96
|*
*************************************************************************/
@@ -821,7 +821,7 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst )
{
//Die Regeln fuer die Ausweichmanoever haben sich veraendert.
//1. Die Umgebung des Fly und aller innenliegenden muss benachrichtigt
- // werden.
+ // werden.
//2. Der Inhalt des Rahmen selbst muss benachrichtigt werden.
//3. Rahmen die dem Rahmen ausweichen bzw. wichen muessen benachrichtigt werden.
//4. Auch Zeichenobjekte koennen Rahmen verdraengen
@@ -887,7 +887,7 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst )
{
const SwFmtHoriOrient &rH = pAct->GetFmt()->GetHoriOrient();
if ( rH.GetHoriOrient() == aHori &&
- pAct->Frm().Top() <= aRect.Bottom() &&
+ pAct->Frm().Top() <= aRect.Bottom() &&
pAct->Frm().Bottom() >= aRect.Top() )
{
pAct->InvalidatePos();
@@ -940,12 +940,12 @@ void SwFEShell::SelectionToBottom( BOOL bBottom )
/*************************************************************************
|*
-|* SwFEShell::GetLayerId()
+|* SwFEShell::GetLayerId()
|*
-|* Beschreibung Objekt ueber/unter dem Dokument?
-|* 2 Controls, 1 Heaven, 0 Hell, -1 Uneindeutig
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 20. Dec. 94
+|* Beschreibung Objekt ueber/unter dem Dokument?
+|* 2 Controls, 1 Heaven, 0 Hell, -1 Uneindeutig
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 20. Dec. 94
|*
*************************************************************************/
@@ -974,11 +974,11 @@ short SwFEShell::GetLayerId() const
/*************************************************************************
|*
-|* SwFEShell::SelectionToHeaven(), SelectionToHell()
+|* SwFEShell::SelectionToHeaven(), SelectionToHell()
|*
-|* Beschreibung Objekt ueber/unter dem Dokument
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung AMA 04. Jun. 98
+|* Beschreibung Objekt ueber/unter dem Dokument
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung AMA 04. Jun. 98
|*
*************************************************************************/
// OD 25.06.2003 #108784#
@@ -1034,10 +1034,10 @@ void SwFEShell::SelectionToHell()
/*************************************************************************
|*
-|* SwFEShell::IsObjSelected(), IsFrmSelected()
+|* SwFEShell::IsObjSelected(), IsFrmSelected()
|*
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 17. Jan. 95
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 17. Jan. 95
|*
*************************************************************************/
@@ -1069,10 +1069,10 @@ sal_Bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
/*************************************************************************
|*
-|* SwFEShell::EndTextEdit()
+|* SwFEShell::EndTextEdit()
|*
-|* Ersterstellung MA 19. Feb. 96
-|* Letzte Aenderung MA 19. Feb. 96
+|* Ersterstellung MA 19. Feb. 96
+|* Letzte Aenderung MA 19. Feb. 96
|*
*************************************************************************/
@@ -1130,10 +1130,10 @@ void SwFEShell::EndTextEdit()
/*************************************************************************
|*
-|* SwFEShell::IsInsideSelectedObj()
+|* SwFEShell::IsInsideSelectedObj()
|*
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 08. Nov. 96
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 08. Nov. 96
|*
*************************************************************************/
@@ -1154,10 +1154,10 @@ int SwFEShell::IsInsideSelectedObj( const Point &rPt )
/*************************************************************************
|*
-|* SwFEShell::IsObjSelectable()
+|* SwFEShell::IsObjSelectable()
|*
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 02. Feb. 95
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 02. Feb. 95
|*
*************************************************************************/
@@ -1286,12 +1286,12 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
/*************************************************************************
|*
-|* SwFEShell::GotoObj()
+|* SwFEShell::GotoObj()
|*
-|* Beschreibung Wenn ein Obj selektiert ist, gehen wir von dessen
-|* TopLeft aus, andernfalls von der Mitte des aktuellen CharRects.
-|* Ersterstellung MA 01. Jun. 95
-|* Letzte Aenderung MA 30. Apr. 96
+|* Beschreibung Wenn ein Obj selektiert ist, gehen wir von dessen
+|* TopLeft aus, andernfalls von der Mitte des aktuellen CharRects.
+|* Ersterstellung MA 01. Jun. 95
+|* Letzte Aenderung MA 30. Apr. 96
|*
*************************************************************************/
/* -----------------23.09.98 10:29-------------------
@@ -1339,12 +1339,12 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT
if( !Imp()->HasDrawView() )
return NULL;
- const SdrObject *pBest = 0,
- *pTop = 0;
+ const SdrObject *pBest = 0,
+ *pTop = 0;
const long nTmp = bNext ? LONG_MAX : 0;
Point aBestPos( nTmp, nTmp );
- Point aTopPos( nTmp, nTmp );
+ Point aTopPos( nTmp, nTmp );
Point aCurPos;
Point aPos;
BOOL bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType);
@@ -1537,10 +1537,10 @@ BOOL SwFEShell::GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType )
/*************************************************************************
|*
-|* SwFEShell::BeginCreate()
+|* SwFEShell::BeginCreate()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 21. Mar. 95
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 21. Mar. 95
|*
*************************************************************************/
@@ -1588,10 +1588,10 @@ BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eOb
/*************************************************************************
|*
-|* SwFEShell::MoveCreate()
+|* SwFEShell::MoveCreate()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 24. Jan. 95
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 24. Jan. 95
|*
*************************************************************************/
@@ -1608,10 +1608,10 @@ void SwFEShell::MoveCreate( const Point &rPos )
/*************************************************************************
|*
-|* SwFEShell::EndCreate(), ImpEndCreate()
+|* SwFEShell::EndCreate(), ImpEndCreate()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 14. Oct. 96
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 14. Oct. 96
|*
*************************************************************************/
@@ -1652,7 +1652,7 @@ BOOL SwFEShell::ImpEndCreate()
if( rSdrObj.GetSnapRect().IsEmpty() )
{
//JP 10.04.95: das Object vergessen wir lieber, fuerht nur
- // zu Problemen
+ // zu Problemen
Imp()->GetDrawView()->DeleteMarked();
Imp()->GetDrawView()->UnmarkAll();
::FrameNotify( this, FLY_DRAG_END );
@@ -1797,7 +1797,7 @@ BOOL SwFEShell::ImpEndCreate()
aAnch.SetType( FLY_AT_PAGE );
aAnch.SetPageNum( pPage->GetPhyPageNum() );
- pAnch = pPage; // die Page wird jetzt zum Anker
+ pAnch = pPage; // die Page wird jetzt zum Anker
}
}
@@ -1835,9 +1835,9 @@ BOOL SwFEShell::ImpEndCreate()
if( OBJ_NONE == nIdent )
{
//Bei OBJ_NONE wird ein Fly eingefuegt.
- const long nWidth = rBound.Right() - rBound.Left();
- const long nHeight= rBound.Bottom() - rBound.Top();
- aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, Max( nWidth, long(MINFLY) ),
+ const long nWidth = rBound.Right() - rBound.Left();
+ const long nHeight= rBound.Bottom() - rBound.Top();
+ aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, Max( nWidth, long(MINFLY) ),
Max( nHeight, long(MINFLY) )));
SwFmtHoriOrient aHori( nXOffset, text::HoriOrientation::NONE, text::RelOrientation::FRAME );
@@ -1851,7 +1851,7 @@ BOOL SwFEShell::ImpEndCreate()
//Erzeugtes Object wegwerfen, so kann der Fly am elegentesten
//ueber vorhandene SS erzeugt werden.
- GetDoc()->SetNoDrawUndoObj( TRUE ); // siehe oben
+ GetDoc()->SetNoDrawUndoObj( TRUE ); // siehe oben
// --> OD 2005-08-08 #i52858# - method name changed
SdrPage *pPg = getIDocumentDrawModelAccess()->GetOrCreateDrawModel()->GetPage( 0 );
// <--
@@ -1986,10 +1986,10 @@ BOOL SwFEShell::ImpEndCreate()
/*************************************************************************
|*
-|* SwFEShell::BreakCreate()
+|* SwFEShell::BreakCreate()
|*
-|* Ersterstellung MA 20. Dec. 94
-|* Letzte Aenderung MA 09. Jan. 95
+|* Ersterstellung MA 20. Dec. 94
+|* Letzte Aenderung MA 09. Jan. 95
|*
*************************************************************************/
@@ -2002,10 +2002,10 @@ void SwFEShell::BreakCreate()
/*************************************************************************
|*
-|* SwFEShell::IsDrawCreate()
+|* SwFEShell::IsDrawCreate()
|*
-|* Ersterstellung OM 16. Mar. 95
-|* Letzte Aenderung OM 16. Mar. 95
+|* Ersterstellung OM 16. Mar. 95
+|* Letzte Aenderung OM 16. Mar. 95
|*
*************************************************************************/
@@ -2016,10 +2016,10 @@ BOOL SwFEShell::IsDrawCreate() const
/*************************************************************************
|*
-|* SwFEShell::BeginMark()
+|* SwFEShell::BeginMark()
|*
-|* Ersterstellung OM 07. Feb. 95
-|* Letzte Aenderung OM 07. Feb. 95
+|* Ersterstellung OM 07. Feb. 95
+|* Letzte Aenderung OM 07. Feb. 95
|*
*************************************************************************/
@@ -2043,10 +2043,10 @@ BOOL SwFEShell::BeginMark( const Point &rPos )
/*************************************************************************
|*
-|* SwFEShell::MoveMark()
+|* SwFEShell::MoveMark()
|*
-|* Ersterstellung OM 07. Feb. 95
-|* Letzte Aenderung OM 07. Feb. 95
+|* Ersterstellung OM 07. Feb. 95
+|* Letzte Aenderung OM 07. Feb. 95
|*
*************************************************************************/
@@ -2058,7 +2058,7 @@ void SwFEShell::MoveMark( const Point &rPos )
{
ScrollTo( rPos );
SwDrawView* pDView = Imp()->GetDrawView();
-// Imp()->GetDrawView()->MovMarkObj( rPos );
+// Imp()->GetDrawView()->MovMarkObj( rPos );
if (pDView->IsInsObjPoint())
pDView->MovInsObjPoint( rPos );
@@ -2071,10 +2071,10 @@ void SwFEShell::MoveMark( const Point &rPos )
/*************************************************************************
|*
-|* SwFEShell::EndMark()
+|* SwFEShell::EndMark()
|*
-|* Ersterstellung OM 07. Feb. 95
-|* Letzte Aenderung MA 08. Feb. 95
+|* Ersterstellung OM 07. Feb. 95
+|* Letzte Aenderung MA 08. Feb. 95
|*
*************************************************************************/
@@ -2108,7 +2108,7 @@ BOOL SwFEShell::EndMark()
bShowHdl = TRUE;
}
rMrkList.DeleteMark( i );
- --i; //keinen auslassen.
+ --i; //keinen auslassen.
}
}
@@ -2139,10 +2139,10 @@ BOOL SwFEShell::EndMark()
/*************************************************************************
|*
-|* SwFEShell::BreakSelect()
+|* SwFEShell::BreakSelect()
|*
-|* Ersterstellung OM 07. Feb. 95
-|* Letzte Aenderung OM 07. Feb. 95
+|* Ersterstellung OM 07. Feb. 95
+|* Letzte Aenderung OM 07. Feb. 95
|*
*************************************************************************/
@@ -2154,10 +2154,10 @@ void SwFEShell::BreakMark()
/*************************************************************************
|*
-|* SwFEShell::GetAnchorId()
+|* SwFEShell::GetAnchorId()
|*
-|* Ersterstellung MA 30. Jan. 95
-|* Letzte Aenderung MA 30. Jan. 95
+|* Ersterstellung MA 30. Jan. 95
+|* Letzte Aenderung MA 30. Jan. 95
|*
*************************************************************************/
@@ -2193,10 +2193,10 @@ short SwFEShell::GetAnchorId() const
/*************************************************************************
|*
-|* SwFEShell::ChgAnchor()
+|* SwFEShell::ChgAnchor()
|*
-|* Ersterstellung MA 10. Jan. 95
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 10. Jan. 95
+|* Letzte Aenderung MA 30. May. 96
|*
*************************************************************************/
@@ -2220,10 +2220,10 @@ void SwFEShell::ChgAnchor( int eAnchorId, BOOL bSameOnly, BOOL bPosCorr )
/*************************************************************************
|*
-|* SwFEShell::DelSelectedObj()
+|* SwFEShell::DelSelectedObj()
|*
-|* Ersterstellung MA 03. Nov. 92
-|* Letzte Aenderung MA 14. Nov. 95
+|* Ersterstellung MA 03. Nov. 92
+|* Letzte Aenderung MA 14. Nov. 95
|*
*************************************************************************/
@@ -2241,12 +2241,12 @@ void SwFEShell::DelSelectedObj()
/*************************************************************************
|*
-|* SwFEShell::GetObjSize(), GetAnchorObjDiff()
+|* SwFEShell::GetObjSize(), GetAnchorObjDiff()
|*
-|* Beschreibung Fuer die Statuszeile zum Erfragen der aktuellen
-|* Verhaeltnisse
-|* Ersterstellung MA 25. Apr. 95
-|* Letzte Aenderung MA 25. Apr. 95
+|* Beschreibung Fuer die Statuszeile zum Erfragen der aktuellen
+|* Verhaeltnisse
+|* Ersterstellung MA 25. Apr. 95
+|* Letzte Aenderung MA 25. Apr. 95
|*
*************************************************************************/
@@ -2302,10 +2302,10 @@ Point SwFEShell::GetObjAbsPos() const
/*************************************************************************
|*
-|* SwFEShell::IsGroupSelected()
+|* SwFEShell::IsGroupSelected()
|*
-|* Ersterstellung MA 30. Jan. 95
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 30. Jan. 95
+|* Letzte Aenderung MA 30. May. 96
|*
*************************************************************************/
@@ -2413,12 +2413,12 @@ bool SwFEShell::IsGroupAllowed() const
/*************************************************************************
|*
-|* SwFEShell::GroupSelection()
+|* SwFEShell::GroupSelection()
|*
-|* Beschreibung Die Gruppe bekommt den Anker und das Contactobjekt
-|* des ersten in der Selektion
-|* Ersterstellung MA 30. Jan. 95
-|* Letzte Aenderung MA 23. Apr. 95
+|* Beschreibung Die Gruppe bekommt den Anker und das Contactobjekt
+|* des ersten in der Selektion
+|* Ersterstellung MA 30. Jan. 95
+|* Letzte Aenderung MA 23. Apr. 95
|*
*************************************************************************/
@@ -2438,12 +2438,12 @@ void SwFEShell::GroupSelection()
/*************************************************************************
|*
-|* SwFEShell::UnGroupSelection()
+|* SwFEShell::UnGroupSelection()
|*
-|* Beschreibung Die Einzelobjekte bekommen eine Kopie vom Anker und
-|* Contactobjekt der Gruppe.
-|* Ersterstellung MA 30. Jan. 95
-|* Letzte Aenderung MA 01. Feb. 95
+|* Beschreibung Die Einzelobjekte bekommen eine Kopie vom Anker und
+|* Contactobjekt der Gruppe.
+|* Ersterstellung MA 30. Jan. 95
+|* Letzte Aenderung MA 01. Feb. 95
|*
*************************************************************************/
@@ -2463,10 +2463,10 @@ void SwFEShell::UnGroupSelection()
/*************************************************************************
|*
-|* SwFEShell::MirrorSelection()
+|* SwFEShell::MirrorSelection()
|*
-|* Ersterstellung MA 06. Aug. 95
-|* Letzte Aenderung MA 06. Aug. 95
+|* Ersterstellung MA 06. Aug. 95
+|* Letzte Aenderung MA 06. Aug. 95
|*
*************************************************************************/
@@ -2488,10 +2488,10 @@ BOOL SwFEShell::GotoFly( const String& rName, FlyCntType eType, BOOL bSelFrm )
{
BOOL bRet = FALSE;
static BYTE __READONLY_DATA aChkArr[ 4 ] = {
- /* FLYCNTTYPE_ALL */ 0,
- /* FLYCNTTYPE_FRM */ ND_TEXTNODE,
- /* FLYCNTTYPE_GRF */ ND_GRFNODE,
- /* FLYCNTTYPE_OLE */ ND_OLENODE
+ /* FLYCNTTYPE_ALL */ 0,
+ /* FLYCNTTYPE_FRM */ ND_TEXTNODE,
+ /* FLYCNTTYPE_GRF */ ND_GRFNODE,
+ /* FLYCNTTYPE_OLE */ ND_OLENODE
};
const SwFlyFrmFmt* pFlyFmt = pDoc->FindFlyByName( rName, aChkArr[ eType]);
@@ -2517,7 +2517,7 @@ static BYTE __READONLY_DATA aChkArr[ 4 ] = {
SwCntntFrm *pCFrm = pFrm->ContainsCntnt();
if ( pCFrm )
{
- SwCntntNode *pCNode = pCFrm->GetNode();
+ SwCntntNode *pCNode = pCFrm->GetNode();
ClearMark();
SwPaM* pCrsr = GetCrsr();
@@ -2573,7 +2573,7 @@ BYTE SwFEShell::IsSelObjProtected( USHORT eType ) const
SdrObject *pObj = rMrkList.GetMark( --i )->GetMarkedSdrObj();
if( !bParent )
{
- nChk |= ( pObj->IsMoveProtect() ? FLYPROTECT_POS : 0 ) |
+ nChk |= ( pObj->IsMoveProtect() ? FLYPROTECT_POS : 0 ) |
( pObj->IsResizeProtect()? FLYPROTECT_SIZE : 0 );
if( FLYPROTECT_CONTENT & eType && pObj->ISA(SwVirtFlyDrawObj) )
@@ -2856,7 +2856,7 @@ void SwFEShell::HideChainMarker()
void SwFEShell::SetChainMarker()
{
BOOL bDelFrom = TRUE,
- bDelTo = TRUE;
+ bDelTo = TRUE;
if ( IsFrmSelected() )
{
SwFlyFrm *pFly = FindFlyFrm();
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 0f25cea37c05..1e7dea335794 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2,7 +2,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
@@ -199,10 +199,10 @@ void SwFEShell::ParkCursorInTab()
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : InsertRow(), InsertCol
-#* Datum : MA 03. May. 93
-#* Update : MA 19. Apr. 95
+#* Class : SwFEShell
+#* Methoden : InsertRow(), InsertCol
+#* Datum : MA 03. May. 93
+#* Update : MA 19. Apr. 95
#***********************************************************************/
BOOL SwFEShell::InsertRow( USHORT nCnt, BOOL bBehind )
{
@@ -274,10 +274,10 @@ BOOL SwFEShell::InsertCol( USHORT nCnt, BOOL bBehind )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : DeleteRow(), DeleteCol()
-#* Datum : MA 03. May. 93
-#* Update : MA 19. Apr. 95
+#* Class : SwFEShell
+#* Methoden : DeleteRow(), DeleteCol()
+#* Datum : MA 03. May. 93
+#* Update : MA 19. Apr. 95
#***********************************************************************/
/**
@@ -373,9 +373,9 @@ BOOL SwFEShell::DeleteRow()
// die Crsr aus dem Loeschbereich entfernen.
// Der Cursor steht danach:
- // - es folgt noch eine Zeile, in dieser
- // - vorher steht noch eine Zeile, in dieser
- // - sonst immer dahinter
+ // - es folgt noch eine Zeile, in dieser
+ // - vorher steht noch eine Zeile, in dieser
+ // - sonst immer dahinter
{
SwTableNode* pTblNd = ((SwCntntFrm*)pFrm)->GetNode()->FindTableNode();
@@ -400,7 +400,7 @@ BOOL SwFEShell::DeleteRow()
{
_FndBox* pTmp = pFndBox->GetLines()[0]->GetBoxes()[0];
if( pTmp->GetBox()->GetSttNd() )
- break; // das ist sonst zu weit
+ break; // das ist sonst zu weit
pFndBox = pTmp;
}
@@ -420,7 +420,7 @@ BOOL SwFEShell::DeleteRow()
pNextBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
pNextBox = pNextBox->FindNextBox( pTblNd->GetTable(), pNextBox );
- if( !pNextBox ) // keine nachfolgende? dann die vorhergehende
+ if( !pNextBox ) // keine nachfolgende? dann die vorhergehende
{
pDelLine = pFndBox->GetLines()[ 0 ]->GetLine();
pDelBox = pDelLine->GetTabBoxes()[ 0 ];
@@ -434,9 +434,9 @@ BOOL SwFEShell::DeleteRow()
}
ULONG nIdx;
- if( pNextBox ) // dann den Cursor hier hinein
+ if( pNextBox ) // dann den Cursor hier hinein
nIdx = pNextBox->GetSttIdx() + 1;
- else // ansonsten hinter die Tabelle
+ else // ansonsten hinter die Tabelle
nIdx = pTblNd->EndOfSectionIndex() + 1;
SwNodeIndex aIdx( GetDoc()->GetNodes(), nIdx );
@@ -449,7 +449,7 @@ BOOL SwFEShell::DeleteRow()
SwPaM* pPam = GetCrsr();
pPam->GetPoint()->nNode = aIdx;
pPam->GetPoint()->nContent.Assign( pCNd, 0 );
- pPam->SetMark(); // beide wollen etwas davon haben
+ pPam->SetMark(); // beide wollen etwas davon haben
pPam->DeleteMark();
}
}
@@ -467,10 +467,10 @@ BOOL SwFEShell::DeleteRow()
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : MergeTab(), SplitTab()
-#* Datum : MA 03. May. 93
-#* Update : MA 19. Apr. 95
+#* Class : SwFEShell
+#* Methoden : MergeTab(), SplitTab()
+#* Datum : MA 03. May. 93
+#* Update : MA 19. Apr. 95
#***********************************************************************/
USHORT SwFEShell::MergeTab()
@@ -549,10 +549,10 @@ BOOL SwFEShell::SplitTab( BOOL bVert, USHORT nCnt, BOOL bSameHeight )
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : _GetTabCols
-#* Datum : MA 30. Nov. 95
-#* Update : MA 08. Jan. 97
+#* Class : SwFEShell
+#* Methoden : _GetTabCols
+#* Datum : MA 30. Nov. 95
+#* Update : MA 08. Jan. 97
#***********************************************************************/
void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const
{
@@ -633,10 +633,10 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : _GetTabRows
-#* Datum : FME 2004-01-14
-#* Update :
+#* Class : SwFEShell
+#* Methoden : _GetTabRows
+#* Datum : FME 2004-01-14
+#* Update :
#***********************************************************************/
void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const
{
@@ -687,10 +687,10 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetTabCols(), GetTabCols()
-#* Datum : MA 03. May. 93
-#* Update : MA 18. May. 93
+#* Class : SwFEShell
+#* Methoden : SetTabCols(), GetTabCols()
+#* Datum : MA 03. May. 93
+#* Update : MA 18. May. 93
#***********************************************************************/
void SwFEShell::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly )
{
@@ -715,7 +715,7 @@ void SwFEShell::GetTabCols( SwTabCols &rToFill ) const
if( !pFrm || !pFrm->IsInTab() )
return;
do
- { pFrm = pFrm->GetUpper();
+ { pFrm = pFrm->GetUpper();
} while ( !pFrm->IsCellFrm() );
_GetTabCols( rToFill, pFrm );
@@ -730,7 +730,7 @@ void SwFEShell::GetTabRows( SwTabCols &rToFill ) const
if( !pFrm || !pFrm->IsInTab() )
return;
do
- { pFrm = pFrm->GetUpper();
+ { pFrm = pFrm->GetUpper();
} while ( !pFrm->IsCellFrm() );
_GetTabRows( rToFill, pFrm );
@@ -799,10 +799,10 @@ void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetRowHeight(), GetRowHeight()
-#* Datum : MA 17. May. 93
-#* Update : JP 29.04.98
+#* Class : SwFEShell
+#* Methoden : SetRowHeight(), GetRowHeight()
+#* Datum : MA 17. May. 93
+#* Update : JP 29.04.98
#***********************************************************************/
void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew )
@@ -814,7 +814,7 @@ void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew )
}
/******************************************************************************
- * SwTwips SwFEShell::GetRowHeight() const
+ * SwTwips SwFEShell::GetRowHeight() const
******************************************************************************/
void SwFEShell::GetRowHeight( SwFmtFrmSize *& rpSz ) const
{
@@ -833,7 +833,7 @@ BOOL SwFEShell::BalanceRowHeight( BOOL bTstOnly )
}
/******************************************************************************
- * void SwFEShell::SetRowBackground()
+ * void SwFEShell::SetRowBackground()
******************************************************************************/
void SwFEShell::SetRowBackground( const SvxBrushItem &rNew )
{
@@ -844,7 +844,7 @@ void SwFEShell::SetRowBackground( const SvxBrushItem &rNew )
}
/******************************************************************************
- * SwTwips SwFEShell::GetRowBackground() const
+ * SwTwips SwFEShell::GetRowBackground() const
******************************************************************************/
BOOL SwFEShell::GetRowBackground( SvxBrushItem &rToFill ) const
{
@@ -852,10 +852,10 @@ BOOL SwFEShell::GetRowBackground( SvxBrushItem &rToFill ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetTabBorders(), GetTabBorders()
-#* Datum : MA 18. May. 93
-#* Update : JP 29.04.98
+#* Class : SwFEShell
+#* Methoden : SetTabBorders(), GetTabBorders()
+#* Datum : MA 18. May. 93
+#* Update : JP 29.04.98
#***********************************************************************/
void SwFEShell::SetTabBorders( const SfxItemSet& rSet )
@@ -883,10 +883,10 @@ void SwFEShell::GetTabBorders( SfxItemSet& rSet ) const
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetBoxBackground(), GetBoxBackground()
-#* Datum : MA 01. Jun. 93
-#* Update : MA 03. Jul. 96
+#* Class : SwFEShell
+#* Methoden : SetBoxBackground(), GetBoxBackground()
+#* Datum : MA 01. Jun. 93
+#* Update : MA 03. Jul. 96
#***********************************************************************/
void SwFEShell::SetBoxBackground( const SvxBrushItem &rNew )
{
@@ -902,8 +902,8 @@ BOOL SwFEShell::GetBoxBackground( SvxBrushItem &rToFill ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetBoxDirection(), GetBoxDirection()
+#* Class : SwFEShell
+#* Methoden : SetBoxDirection(), GetBoxDirection()
#* Datum : FME 2004-02-03
#* Update : FME 2004-02-03
#***********************************************************************/
@@ -921,10 +921,10 @@ BOOL SwFEShell::GetBoxDirection( SvxFrameDirectionItem& rToFill ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetBoxAlign, SetBoxAlign
-#* Datum : MA 18. Dec. 96
-#* Update : JP 29.04.98
+#* Class : SwFEShell
+#* Methoden : SetBoxAlign, SetBoxAlign
+#* Datum : MA 18. Dec. 96
+#* Update : JP 29.04.98
#***********************************************************************/
void SwFEShell::SetBoxAlign( USHORT nAlign )
{
@@ -940,10 +940,10 @@ USHORT SwFEShell::GetBoxAlign() const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : SetTabBackground(), GetTabBackground()
-#* Datum : MA 08. Jul. 96
-#* Update : MA 08. Jul. 96
+#* Class : SwFEShell
+#* Methoden : SetTabBackground(), GetTabBackground()
+#* Datum : MA 08. Jul. 96
+#* Update : MA 08. Jul. 96
#***********************************************************************/
void SwFEShell::SetTabBackground( const SvxBrushItem &rNew )
{
@@ -954,7 +954,7 @@ void SwFEShell::SetTabBackground( const SvxBrushItem &rNew )
SET_CURR_SHELL( this );
StartAllAction();
GetDoc()->SetAttr( rNew, *pFrm->ImplFindTabFrm()->GetFmt() );
- EndAllAction(); //Kein Call, denn es veraendert sich nichts!
+ EndAllAction(); //Kein Call, denn es veraendert sich nichts!
GetDoc()->SetModified();
}
@@ -967,10 +967,10 @@ void SwFEShell::GetTabBackground( SvxBrushItem &rToFill ) const
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : HasWholeTabSelection()
-#* Datum : MA 18. May. 93
-#* Update : MA 20. Jul. 93
+#* Class : SwFEShell
+#* Methoden : HasWholeTabSelection()
+#* Datum : MA 18. May. 93
+#* Update : MA 20. Jul. 93
#***********************************************************************/
BOOL SwFEShell::HasWholeTabSelection() const
{
@@ -1000,8 +1000,8 @@ BOOL SwFEShell::HasBoxSelection() const
return TRUE;
SwPaM* pPam = GetCrsr();
// leere Boxen gelten auch ohne Selektion als selektiert
-// if( !pPam->HasMark() )
-// return FALSE;
+// if( !pPam->HasMark() )
+// return FALSE;
BOOL bChg = FALSE;
if( pPam->GetPoint() == pPam->End())
{
@@ -1035,10 +1035,10 @@ BOOL SwFEShell::HasBoxSelection() const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : ProtectCells(), UnProtectCells()
-#* Datum : MA 20. Jul. 93
-#* Update : JP 25. Sep. 93
+#* Class : SwFEShell
+#* Methoden : ProtectCells(), UnProtectCells()
+#* Datum : MA 20. Jul. 93
+#* Update : JP 25. Sep. 93
#***********************************************************************/
void SwFEShell::ProtectCells()
{
@@ -1250,10 +1250,10 @@ BOOL SwFEShell::CheckHeadline( bool bRepeat ) const
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : AdjustCellWidth()
-#* Datum : MA 20. Feb. 95
-#* Update : MA 27. Jul. 95
+#* Class : SwFEShell
+#* Methoden : AdjustCellWidth()
+#* Datum : MA 20. Feb. 95
+#* Update : MA 27. Jul. 95
#***********************************************************************/
void SwFEShell::AdjustCellWidth( BOOL bBalance )
@@ -1287,7 +1287,7 @@ BOOL SwFEShell::IsAdjustCellWidthAllowed( BOOL bBalance ) const
if ( !aBoxes.Count() )
{
do
- { pFrm = pFrm->GetUpper();
+ { pFrm = pFrm->GetUpper();
} while ( !pFrm->IsCellFrm() );
SwTableBox *pBox = (SwTableBox*)((SwCellFrm*)pFrm)->GetTabBox();
aBoxes.Insert( pBox );
@@ -1324,7 +1324,7 @@ BOOL SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
SwSelBoxes aBoxes;
- if ( !IsTableMode() ) // falls Crsr noch nicht akt. sind
+ if ( !IsTableMode() ) // falls Crsr noch nicht akt. sind
GetCrsr();
// gesamte Tabelle oder nur auf die akt. Selektion
@@ -1363,7 +1363,7 @@ BOOL SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
SwSelBoxes aBoxes;
- if ( !IsTableMode() ) // falls Crsr noch nicht akt. sind
+ if ( !IsTableMode() ) // falls Crsr noch nicht akt. sind
GetCrsr();
// gesamte Tabelle oder nur auf die akt. Selektion
@@ -1383,10 +1383,10 @@ BOOL SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
}
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : DeleteTblSel()
-#* Datum : MA 03. May. 93
-#* Update : MA 19. Apr. 95
+#* Class : SwFEShell
+#* Methoden : DeleteTblSel()
+#* Datum : MA 03. May. 93
+#* Update : MA 19. Apr. 95
#***********************************************************************/
BOOL SwFEShell::DeleteTblSel()
{
@@ -1433,10 +1433,10 @@ BOOL SwFEShell::DeleteTblSel()
/*************************************************************************
|*
-|* SwFEShell::GetCurTabColNum()
+|* SwFEShell::GetCurTabColNum()
|*
-|* Ersterstellung MA 03. Feb. 95
-|* Letzte Aenderung MA 21. May. 95
+|* Ersterstellung MA 03. Feb. 95
+|* Letzte Aenderung MA 21. May. 95
|
|*************************************************************************/
USHORT SwFEShell::GetCurTabColNum() const
@@ -1450,8 +1450,8 @@ USHORT SwFEShell::GetCurTabColNum() const
// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
if( pFrm && pFrm->IsInTab() )
{
- do { // JP 26.09.95: warum mit dem CntntFrame und nicht mit
- // dem CellFrame vergleichen????
+ do { // JP 26.09.95: warum mit dem CntntFrame und nicht mit
+ // dem CellFrame vergleichen????
pFrm = pFrm->GetUpper();
} while ( !pFrm->IsCellFrm() );
SWRECTFN( pFrm )
@@ -1502,10 +1502,10 @@ USHORT SwFEShell::GetCurTabColNum() const
/*************************************************************************
|*
-|* SwFEShell::GetBox()
+|* SwFEShell::GetBox()
|*
-|* Ersterstellung MA 22. Jun. 95
-|* Letzte Aenderung MA 21. Nov. 96
+|* Ersterstellung MA 22. Jun. 95
+|* Letzte Aenderung MA 21. Nov. 96
|*
|*************************************************************************/
@@ -2025,7 +2025,7 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
|*
|* SwFEShell::WhichMouseTabCol()
|*
-|* Ersterstellung MA 22. Jun. 95
+|* Ersterstellung MA 22. Jun. 95
|* Last change AMA 12. Jun. 02
|
|*************************************************************************/
@@ -2170,10 +2170,10 @@ bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
/*************************************************************************
|*
-|* SwFEShell::GetMouseTabCols()
+|* SwFEShell::GetMouseTabCols()
|*
-|* Ersterstellung MA 22. Jun. 95
-|* Letzte Aenderung MA 27. Aug. 96
+|* Ersterstellung MA 22. Jun. 95
+|* Letzte Aenderung MA 27. Aug. 96
|
|*************************************************************************/
void SwFEShell::GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const
@@ -2198,10 +2198,10 @@ void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
/*************************************************************************
|*
-|* SwFEShell::GetMouseColNum(), GetMouseTabColNum()
+|* SwFEShell::GetMouseColNum(), GetMouseTabColNum()
|*
-|* Ersterstellung MA 04. Jul. 95
-|* Letzte Aenderung MA 04. Jul. 95
+|* Ersterstellung MA 04. Jul. 95
+|* Letzte Aenderung MA 04. Jul. 95
|
|*************************************************************************/
USHORT SwFEShell::GetCurMouseColNum( const Point &rPt,
@@ -2248,10 +2248,10 @@ void ClearFEShellTabCols()
/*************************************************************************
|*
-|* SwFEShell::GetTblAttr(), SetTblAttr()
+|* SwFEShell::GetTblAttr(), SetTblAttr()
|*
-|* Ersterstellung MA 09. Dec. 96
-|* Letzte Aenderung MA 09. Dec. 96
+|* Ersterstellung MA 09. Dec. 96
+|* Letzte Aenderung MA 09. Dec. 96
|
|*************************************************************************/
void SwFEShell::GetTblAttr( SfxItemSet &rSet ) const
@@ -2425,7 +2425,7 @@ BOOL lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& rFml,
USHORT i;
for( i = 0; i < rCells.Count(); ++i )
if( rCells[ i ]->GetTabBox() == pBox )
- break; // gefunden
+ break; // gefunden
if( i == rCells.Count() )
return FALSE;
@@ -2458,7 +2458,7 @@ BOOL SwFEShell::GetAutoSum( String& rFml ) const
if( !nW )
{
if( USHRT_MAX == nBoxW )
- continue; // leere am Anfang ueberspringen
+ continue; // leere am Anfang ueberspringen
rFml += '(';
nInsPos = rFml.Len();
@@ -2523,7 +2523,7 @@ BOOL SwFEShell::GetAutoSum( String& rFml ) const
else if( USHRT_MAX == nBoxW )
break;
else
- continue; // diese Boxen ignorieren
+ continue; // diese Boxen ignorieren
}
else
// alles andere beendet die Schleife
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 286589256978..2ec641a1fdfa 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@
#include <tabfrm.hxx>
#include <cellfrm.hxx>
#include <flyfrms.hxx>
-#include <txtfrm.hxx> // SwTxtFrm
+#include <txtfrm.hxx> // SwTxtFrm
#include <mdiexp.hxx>
#include <edimp.hxx>
#include <pagedesc.hxx>
@@ -72,11 +72,11 @@ using namespace com::sun::star;
TYPEINIT1(SwFEShell,SwEditShell)
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : EndAllActionAndCall()
+#* Class : SwFEShell
+#* Methode : EndAllActionAndCall()
#*
-#* Datum : MA 03. May. 93
-#* Update : MA 31. Oct. 95
+#* Datum : MA 03. May. 93
+#* Update : MA 31. Oct. 95
#***********************************************************************/
void SwFEShell::EndAllActionAndCall()
@@ -95,11 +95,11 @@ void SwFEShell::EndAllActionAndCall()
/***********************************************************************
-#* Class : SwFEShell
-#* Methode : GetCntntPos
-#* Beschreibung: Ermitteln des Cntnt's der dem Punkt am naechsten liegt
-#* Datum : MA 02. Jun. 92
-#* Update : MA 02. May. 95
+#* Class : SwFEShell
+#* Methode : GetCntntPos
+#* Beschreibung: Ermitteln des Cntnt's der dem Punkt am naechsten liegt
+#* Datum : MA 02. Jun. 92
+#* Update : MA 02. May. 95
#***********************************************************************/
Point SwFEShell::GetCntntPos( const Point& rPoint, BOOL bNext ) const
@@ -134,19 +134,19 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
if( !pFrm )
return GetLayout()->Frm();
- BOOL bFrm = TRUE;
+ BOOL bFrm = TRUE;
switch ( eType )
{
- case RECT_PAGE_PRT: bFrm = FALSE; /* no break */
- case RECT_PAGE : pFrm = pFrm->FindPageFrm();
+ case RECT_PAGE_PRT: bFrm = FALSE; /* no break */
+ case RECT_PAGE : pFrm = pFrm->FindPageFrm();
break;
- case RECT_PAGE_CALC: pFrm->Calc();
+ case RECT_PAGE_CALC: pFrm->Calc();
pFrm = pFrm->FindPageFrm();
pFrm->Calc();
break;
- case RECT_FLY_PRT_EMBEDDED: bFrm = FALSE; /* no break */
+ case RECT_FLY_PRT_EMBEDDED: bFrm = FALSE; /* no break */
case RECT_FLY_EMBEDDED: pFrm = xObj.is() ? FindFlyFrm( xObj )
: pFrm->IsFlyFrm()
? pFrm
@@ -161,7 +161,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
}
/* KEIN BREAK */
case RECT_SECTION_PRT:
- case RECT_SECTION: if( pFrm->IsInSct() )
+ case RECT_SECTION: if( pFrm->IsInSct() )
pFrm = pFrm->FindSctFrm();
else {
OSL_ENSURE( FALSE, "Missing section" );
@@ -172,8 +172,8 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
bFrm = FALSE;
break;
- case RECT_HEADERFOOTER_PRT: bFrm = FALSE; /* no break */
- case RECT_HEADERFOOTER: if( 0 == (pFrm = pFrm->FindFooterOrHeader()) )
+ case RECT_HEADERFOOTER_PRT: bFrm = FALSE; /* no break */
+ case RECT_HEADERFOOTER: if( 0 == (pFrm = pFrm->FindFooterOrHeader()) )
return GetLayout()->Frm();
break;
@@ -201,20 +201,20 @@ BOOL SwFEShell::GetPageNumber( long nYPos, BOOL bAtCrsrPos, USHORT& rPhyNum, USH
{
const SwFrm *pPage;
- if ( bAtCrsrPos ) //Seite vom Crsr besorgen
+ if ( bAtCrsrPos ) //Seite vom Crsr besorgen
{
pPage = GetCurrFrm( FALSE );
if ( pPage )
pPage = pPage->FindPageFrm();
}
- else if ( nYPos > -1 ) //Seite ueber die Positon ermitteln
+ else if ( nYPos > -1 ) //Seite ueber die Positon ermitteln
{
pPage = GetLayout()->Lower();
while( pPage && (pPage->Frm().Bottom() < nYPos ||
nYPos < pPage->Frm().Top() ) )
pPage = pPage->GetNext();
}
- else //Die erste sichtbare Seite
+ else //Die erste sichtbare Seite
{
pPage = Imp()->GetFirstVisPage();
if ( pPage && ((SwPageFrm*)pPage)->IsEmptyPage() )
@@ -248,10 +248,10 @@ bool SwFEShell::IsDirectlyInSection() const
/*************************************************************************
|*
-|* SwFEShell::GetFrmType()
+|* SwFEShell::GetFrmType()
|*
-|* Ersterstellung MA 12. Jan. 93
-|* Letzte Aenderung AMA 25. Nov. 98
+|* Ersterstellung MA 12. Jan. 93
+|* Letzte Aenderung AMA 25. Nov. 98
|*
*************************************************************************/
@@ -273,7 +273,7 @@ USHORT SwFEShell::GetFrmType( const Point *pPt, BOOL bStopAtFly ) const
{
switch ( pFrm->GetType() )
{
- case FRM_COLUMN: if( pFrm->GetUpper()->IsSctFrm() )
+ case FRM_COLUMN: if( pFrm->GetUpper()->IsSctFrm() )
{
// Check, if isn't not only a single column
// from a section with footnotes at the end.
@@ -285,16 +285,16 @@ USHORT SwFEShell::GetFrmType( const Point *pPt, BOOL bStopAtFly ) const
else // nur Seiten und Rahmenspalten
nReturn |= FRMTYPE_COLUMN;
break;
- case FRM_PAGE: nReturn |= FRMTYPE_PAGE;
- if( ((SwPageFrm*)pFrm)->IsFtnPage() )
+ case FRM_PAGE: nReturn |= FRMTYPE_PAGE;
+ if( ((SwPageFrm*)pFrm)->IsFtnPage() )
nReturn |= FRMTYPE_FTNPAGE;
break;
- case FRM_HEADER: nReturn |= FRMTYPE_HEADER; break;
- case FRM_FOOTER: nReturn |= FRMTYPE_FOOTER; break;
- case FRM_BODY: if( pFrm->GetUpper()->IsPageFrm() ) // nicht bei ColumnFrms
+ case FRM_HEADER: nReturn |= FRMTYPE_HEADER; break;
+ case FRM_FOOTER: nReturn |= FRMTYPE_FOOTER; break;
+ case FRM_BODY: if( pFrm->GetUpper()->IsPageFrm() ) // nicht bei ColumnFrms
nReturn |= FRMTYPE_BODY;
break;
- case FRM_FTN: nReturn |= FRMTYPE_FOOTNOTE; break;
+ case FRM_FTN: nReturn |= FRMTYPE_FOOTNOTE; break;
case FRM_FLY: if( ((SwFlyFrm*)pFrm)->IsFlyLayFrm() )
nReturn |= FRMTYPE_FLY_FREE;
else if ( ((SwFlyFrm*)pFrm)->IsFlyAtCntFrm() )
@@ -311,8 +311,8 @@ USHORT SwFEShell::GetFrmType( const Point *pPt, BOOL bStopAtFly ) const
break;
case FRM_TAB:
case FRM_ROW:
- case FRM_CELL: nReturn |= FRMTYPE_TABLE; break;
- default: /* do nothing */ break;
+ case FRM_CELL: nReturn |= FRMTYPE_TABLE; break;
+ default: /* do nothing */ break;
}
if ( pFrm->IsFlyFrm() )
pFrm = ((SwFlyFrm*)pFrm)->GetAnchorFrm();
@@ -324,10 +324,10 @@ USHORT SwFEShell::GetFrmType( const Point *pPt, BOOL bStopAtFly ) const
/*************************************************************************
|*
-|* SwFEShell::ShLooseFcs(), ShGetFcs()
+|* SwFEShell::ShLooseFcs(), ShGetFcs()
|*
-|* Ersterstellung MA 10. May. 93
-|* Letzte Aenderung MA 09. Sep. 98
+|* Ersterstellung MA 10. May. 93
+|* Letzte Aenderung MA 09. Sep. 98
|*
*************************************************************************/
@@ -353,16 +353,16 @@ void SwFEShell::ShLooseFcs()
Imp()->GetDrawView()->hideMarkHandles();
FrameNotify( this, FLY_DRAG_END );
}
-// ::ResetShell();
+// ::ResetShell();
}
/*************************************************************************
|*
-|* SwFEShell::GetPhyPageNum()
-|* SwFEShell::GetVirtPageNum()
+|* SwFEShell::GetPhyPageNum()
+|* SwFEShell::GetVirtPageNum()
|*
-|* Ersterstellung OK 07.07.93 08:20
-|* Letzte Aenderung MA 03. Jan. 94
+|* Ersterstellung OK 07.07.93 08:20
+|* Letzte Aenderung MA 03. Jan. 94
|*
*************************************************************************/
@@ -384,13 +384,13 @@ USHORT SwFEShell::GetVirtPageNum( const BOOL bCalcFrm )
/*************************************************************************
|*
-|* void lcl_SetAPageOffset()
-|* void SwFEShell::SetNewPageOffset()
-|* void SwFEShell::SetPageOffset()
-|* USHORT SwFEShell::GetPageOffset() const
+|* void lcl_SetAPageOffset()
+|* void SwFEShell::SetNewPageOffset()
+|* void SwFEShell::SetPageOffset()
+|* USHORT SwFEShell::GetPageOffset() const
|*
-|* Ersterstellung OK 07.07.93 08:20
-|* Letzte Aenderung MA 30. Mar. 95
+|* Ersterstellung OK 07.07.93 08:20
+|* Letzte Aenderung MA 30. Mar. 95
|*
*************************************************************************/
@@ -465,10 +465,10 @@ USHORT SwFEShell::GetPageOffset() const
/*************************************************************************
|*
-|* SwFEShell::InsertLabel()
+|* SwFEShell::InsertLabel()
|*
-|* Ersterstellung MA 10. Feb. 94
-|* Letzte Aenderung MA 10. Feb. 94
+|* Ersterstellung MA 10. Feb. 94
+|* Letzte Aenderung MA 10. Feb. 94
|*
*************************************************************************/
@@ -496,7 +496,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
//Bei Flys den Index auf den StartNode herunterreichen.
nIdx = pCnt->FindFlyFrm()->
GetFmt()->GetCntnt().GetCntntIdx()->GetIndex();
-//warum?? Bug 61913 ParkCrsr( GetCrsr()->GetPoint()->nNode );
+//warum?? Bug 61913 ParkCrsr( GetCrsr()->GetPoint()->nNode );
}
break;
case LTYPE_TABLE:
@@ -563,10 +563,10 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
/***********************************************************************
-#* Class : SwFEShell
-#* Methoden : Sort
-#* Datum : ??
-#* Update : ??
+#* Class : SwFEShell
+#* Methoden : Sort
+#* Datum : ??
+#* Update : ??
#***********************************************************************/
BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
@@ -585,7 +585,7 @@ BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
OSL_ENSURE( pFrm->FindTabFrm(), "Crsr nicht in Tabelle." );
// lasse ueber das Layout die Boxen suchen
- SwSelBoxes aBoxes;
+ SwSelBoxes aBoxes;
GetTblSel(*this, aBoxes);
// die Crsr muessen noch aus dem Loesch Bereich entfernt
@@ -613,7 +613,7 @@ BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
SwNodeIndex aPrevIdx( pStart->nNode, -1 );
ULONG nOffset = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex();
- xub_StrLen nCntStt = pStart->nContent.GetIndex();
+ xub_StrLen nCntStt = pStart->nContent.GetIndex();
// Das Sortieren
bRet = pDoc->SortText(*pPam, rOpt);
@@ -641,10 +641,10 @@ BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
/*************************************************************************
|*
-|* SwFEShell::GetCurColNum(), _GetColNum()
+|* SwFEShell::GetCurColNum(), _GetColNum()
|*
-|* Ersterstellung MA 03. Feb. 95
-|* Letzte Aenderung MA 20. Apr. 95
+|* Ersterstellung MA 03. Feb. 95
+|* Letzte Aenderung MA 20. Apr. 95
|
|*************************************************************************/
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index b5c872fa0459..987edbbf9b0a 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2,7 +2,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
@@ -61,17 +61,17 @@
#define COLFUZZY 20L
// defines, die bestimmen, wie Tabellen Boxen gemergt werden:
-// - 1. alle leeren Zeilen entfernen, alle Boxen werden mit Blank,
-// alle Lines mit ParaBreak getrennt
-// - 2. alle leeren Zeilen und alle leeren Boxen am Anfang und Ende
-// entfernen, alle Boxen werden mit Blank,
-// alle Lines mit ParaBreak getrennt
-// - 3. alle leeren Boxen entfernen, alle Boxen werden mit Blank,
-// alle Lines mit ParaBreak getrennt
+// - 1. alle leeren Zeilen entfernen, alle Boxen werden mit Blank,
+// alle Lines mit ParaBreak getrennt
+// - 2. alle leeren Zeilen und alle leeren Boxen am Anfang und Ende
+// entfernen, alle Boxen werden mit Blank,
+// alle Lines mit ParaBreak getrennt
+// - 3. alle leeren Boxen entfernen, alle Boxen werden mit Blank,
+// alle Lines mit ParaBreak getrennt
-#undef DEL_ONLY_EMPTY_LINES
-#undef DEL_EMPTY_BOXES_AT_START_AND_END
-#define DEL_ALL_EMPTY_BOXES
+#undef DEL_ONLY_EMPTY_LINES
+#undef DEL_EMPTY_BOXES_AT_START_AND_END
+#define DEL_ALL_EMPTY_BOXES
_SV_IMPL_SORTAR_ALG( SwSelBoxes, SwTableBoxPtr )
@@ -259,7 +259,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
// pb: #i20193# if tableintable then nSttPos == nEndPos == USHRT_MAX
if ( nSttPos != USHRT_MAX && nEndPos != USHRT_MAX )
{
- if( nEndPos < nSttPos ) // vertauschen
+ if( nEndPos < nSttPos ) // vertauschen
{
USHORT nTmp = nSttPos; nSttPos = nEndPos; nEndPos = nTmp;
}
@@ -290,10 +290,10 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
}
const SwCntntNode *pCntNd = rCrsr.GetCntntNode();
const SwLayoutFrm *pStart = pCntNd ?
- pCntNd->GetFrm( &aPtPos )->GetUpper() : 0;
+ pCntNd->GetFrm( &aPtPos )->GetUpper() : 0;
pCntNd = rCrsr.GetCntntNode(FALSE);
const SwLayoutFrm *pEnd = pCntNd ?
- pCntNd->GetFrm( &aMkPos )->GetUpper() : 0;
+ pCntNd->GetFrm( &aMkPos )->GetUpper() : 0;
if( pStart && pEnd )
GetTblSel( pStart, pEnd, rBoxes, 0, eSearchType );
}
@@ -315,7 +315,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
BOOL bTblIsValid;
// --> FME 2006-01-25 #i55421# Reduced value 10
- int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
+ int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
// <--
USHORT i;
@@ -525,7 +525,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
BOOL bTblIsValid, bValidChartSel;
// --> FME 2006-01-25 #i55421# Reduced value 10
- int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
+ int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
// <--
USHORT i = 0;
@@ -598,7 +598,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
const long nXFuzzy = bVert ? 0 : 20;
const long nYFuzzy = bVert ? 20 : 0;
- if( !( rUnion.Top() + nYFuzzy > nFrmBottom ||
+ if( !( rUnion.Top() + nYFuzzy > nFrmBottom ||
nUnionBottom < rFrmRect.Top() + nYFuzzy ||
rUnion.Left() + nXFuzzy > nFrmRight ||
nUnionRight < rFrmRect.Left() + nXFuzzy ))
@@ -608,14 +608,14 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
// wenn es aber nicht komplett in der Union liegt,
// dann ist es fuers Chart eine ungueltige
// Selektion.
- if( rUnion.Left() <= rFrmRect.Left() + nXFuzzy &&
- rFrmRect.Left() <= nUnionRight &&
- rUnion.Left() <= nFrmRight &&
- nFrmRight <= nUnionRight + nXFuzzy &&
- rUnion.Top() <= rFrmRect.Top() + nYFuzzy &&
- rFrmRect.Top() <= nUnionBottom &&
- rUnion.Top() <= nFrmBottom &&
- nFrmBottom <= nUnionBottom+ nYFuzzy )
+ if( rUnion.Left() <= rFrmRect.Left() + nXFuzzy &&
+ rFrmRect.Left() <= nUnionRight &&
+ rUnion.Left() <= nFrmRight &&
+ nFrmRight <= nUnionRight + nXFuzzy &&
+ rUnion.Top() <= rFrmRect.Top() + nYFuzzy &&
+ rFrmRect.Top() <= nUnionBottom &&
+ rUnion.Top() <= nFrmBottom &&
+ nFrmBottom <= nUnionBottom+ nYFuzzy )
aCellFrms.Insert(
_Sort_CellFrm( *(SwCellFrm*)pCell ),
@@ -657,7 +657,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
// neue Zeile
if( n )
{
- if( USHRT_MAX == nRowCells ) // 1. Zeilenwechsel
+ if( USHRT_MAX == nRowCells ) // 1. Zeilenwechsel
nRowCells = nCellCnt;
else if( nRowCells != nCellCnt )
{
@@ -777,7 +777,7 @@ BOOL GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
const SwLayoutFrm *pStart = pCrsr->GetCntntNode()->GetFrm(
&pCrsr->GetPtPos() )->GetUpper(),
- *pEnd = pCrsr->GetCntntNode(FALSE)->GetFrm(
+ *pEnd = pCrsr->GetCntntNode(FALSE)->GetFrm(
&pCrsr->GetMkPos() )->GetUpper();
const SwLayoutFrm* pSttCell = pStart;
@@ -1011,9 +1011,9 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
"Tabselection nicht auf Cnt." );
//JP 24.09.96: Merge mit wiederholenden TabellenHeadline funktioniert nicht
-// richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert,
-// das die 1. Headline mit drin ist.
-// Point aPt( rShell.GetCharRect().Pos() );
+// richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert,
+// das die 1. Headline mit drin ist.
+// Point aPt( rShell.GetCharRect().Pos() );
Point aPt( 0, 0 );
const SwLayoutFrm *pStart = rPam.GetCntntNode()->GetFrm(
&aPt )->GetUpper(),
@@ -1030,7 +1030,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
SwTableNode* pTblNd = (SwTableNode*)pTable->GetTabSortBoxes()[ 0 ]->
GetSttNd()->FindTableNode();
- _MergePos aPosArr; // Sort-Array mit den Positionen der Frames
+ _MergePos aPosArr; // Sort-Array mit den Positionen der Frames
long nWidth;
SwTableBox* pLastBox = 0;
@@ -1226,14 +1226,14 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
// Absaetze zusammengefasst
// 1. Loesung: gehe ueber das Array und
- // alle auf der gleichen Y-Ebene werden mit Blanks getrennt
- // alle anderen werden als Absaetze getrennt.
+ // alle auf der gleichen Y-Ebene werden mit Blanks getrennt
+ // alle anderen werden als Absaetze getrennt.
BOOL bCalcWidth = TRUE;
const SwTableBox* pFirstBox = aPosArr[ 0 ].pSelBox;
// JP 27.03.98: Optimierung - falls die Boxen einer Line leer sind,
- // dann werden jetzt dafuer keine Blanks und
- // kein Umbruch mehr eingefuegt.
+ // dann werden jetzt dafuer keine Blanks und
+ // kein Umbruch mehr eingefuegt.
//Block damit SwPaM, SwPosition vom Stack geloescht werden
{
SwPaM aPam( pDoc->GetNodes() );
@@ -1246,7 +1246,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
for( n = 0; n < aPosArr.Count(); ++n )
{
const _CmpLPt& rPt = aPosArr[ n ];
- if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // gleiche Ebene ?
+ if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // gleiche Ebene ?
{
if( bEmptyLine && !IsEmptyBox( *rPt.pSelBox, aPam ))
bEmptyLine = FALSE;
@@ -1256,7 +1256,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
else
{
if( bCalcWidth && n )
- bCalcWidth = FALSE; // eine Zeile fertig
+ bCalcWidth = FALSE; // eine Zeile fertig
if( bEmptyLine && nSttPos < n )
{
@@ -1291,15 +1291,15 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
for( n = 0; n < aPosArr.Count(); ++n )
{
const _CmpLPt& rPt = aPosArr[ n ];
- if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // gleiche Ebene ?
+ if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // gleiche Ebene ?
{
BOOL bEmptyBox = IsEmptyBox( *rPt.pSelBox, aPam );
if( bEmptyBox )
{
- if( nSEndPos == n ) // der Anfang ist leer
+ if( nSEndPos == n ) // der Anfang ist leer
nESttPos = ++nSEndPos;
}
- else // das Ende kann leer sein
+ else // das Ende kann leer sein
nESttPos = n+1;
if( bCalcWidth )
@@ -1308,7 +1308,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
else
{
if( bCalcWidth && n )
- bCalcWidth = FALSE; // eine Zeile fertig
+ bCalcWidth = FALSE; // eine Zeile fertig
// zuerst die vom Anfang
if( nSttPos < nSEndPos )
@@ -1389,7 +1389,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // gleiche Ebene ?
nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
else
- bCalcWidth = FALSE; // eine Zeile fertig
+ bCalcWidth = FALSE; // eine Zeile fertig
}
if( IsEmptyBox( *rPt.pSelBox, aPam ) )
@@ -1412,7 +1412,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
lcl_InsTblBox( pTblNd, pDoc, pTmpBox, nInsPos );
(*ppMergeBox) = pInsLine->GetTabBoxes()[ nInsPos ];
- pInsLine->GetTabBoxes().Remove( nInsPos ); // wieder austragen
+ pInsLine->GetTabBoxes().Remove( nInsPos ); // wieder austragen
(*ppMergeBox)->SetUpper( 0 );
(*ppMergeBox)->ClaimFrmFmt();
@@ -1468,7 +1468,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
// wo steht jetzt aInsPos ??
if( bCalcWidth )
- bCalcWidth = FALSE; // eine Zeile fertig
+ bCalcWidth = FALSE; // eine Zeile fertig
// den initialen TextNode ueberspringen
rInsPosNd.Assign( pDoc->GetNodes(),
@@ -1523,8 +1523,8 @@ USHORT CheckMergeSel( const SwPaM& rPam )
{
SwSelBoxes aBoxes;
//JP 24.09.96: Merge mit wiederholenden TabellenHeadline funktioniert nicht
-// richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert,
-// das die 1. Headline mit drin ist.
+// richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert,
+// das die 1. Headline mit drin ist.
Point aPt;
const SwLayoutFrm *pStart = rPam.GetCntntNode()->GetFrm(
&aPt )->GetUpper(),
@@ -1603,7 +1603,7 @@ SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish,
return nRet;
}
-/* MA: 20. Sep. 93 wird nicht mehr gebraucht.
+/* MA: 20. Sep. 93 wird nicht mehr gebraucht.
static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell )
{
const SwLayoutFrm *pLay = pCell->GetPrevLayoutLeaf();
@@ -1657,12 +1657,12 @@ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart,
if( aSttArr[ n ] != aEndArr[ n ] )
{
// first unequal line or box - all odds are
- if( n & 1 ) // 1, 3, 5, ... are boxes
+ if( n & 1 ) // 1, 3, 5, ... are boxes
{
rpStart = (SwLayoutFrm*)aSttArr[ n ];
rpEnd = (SwLayoutFrm*)aEndArr[ n ];
}
- else // 0, 2, 4, ... are lines
+ else // 0, 2, 4, ... are lines
{
// check if start & end line are the first & last Line of the
// box. If not return these cells.
@@ -1689,7 +1689,7 @@ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart,
break;
}
- if( !bChkProtected ) // geschuetzte Zellen beachten ?
+ if( !bChkProtected ) // geschuetzte Zellen beachten ?
return;
@@ -1808,7 +1808,7 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
rpEnd = pTmpLeaf;
}
- if( !bChkProtected ) // geschuetzte Zellen beachten ?
+ if( !bChkProtected ) // geschuetzte Zellen beachten ?
return;
//Anfang und Ende duerfen nicht auf geschuetzten Zellen liegen.
@@ -2085,7 +2085,7 @@ BOOL CheckSplitCells( const SwCursor& rCrsr, USHORT nDiv,
}
const SwLayoutFrm *pStart = rCrsr.GetCntntNode()->GetFrm(
&aPtPos )->GetUpper(),
- *pEnd = rCrsr.GetCntntNode(FALSE)->GetFrm(
+ *pEnd = rCrsr.GetCntntNode(FALSE)->GetFrm(
&aMkPos )->GetUpper();
SWRECTFN( pStart->GetUpper() )
@@ -2523,8 +2523,8 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber,
const BOOL bBehind )
{
//Frms fuer neu eingefuege Zeilen erzeugen.
- //bBehind == TRUE: vor pLineBehind
- // == FALSE: hinter pLineBefore
+ //bBehind == TRUE: vor pLineBehind
+ // == FALSE: hinter pLineBefore
const USHORT nBfPos = pLineBefore ?
rTable.GetTabLines().GetPos( (const SwTableLine*&)pLineBefore ) :
USHRT_MAX;
@@ -2533,7 +2533,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber,
USHRT_MAX;
//nNumber: wie oft ist eingefuegt worden.
- //nCnt: wieviele sind nNumber mal eingefuegt worden.
+ //nCnt: wieviele sind nNumber mal eingefuegt worden.
const USHORT nCnt =
((nBhPos != USHRT_MAX ? nBhPos : rTable.GetTabLines().Count()) -
@@ -2547,7 +2547,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber,
{
if( !pTable->IsFollow() )
{
- SwFrm *pSibling = 0;
+ SwFrm *pSibling = 0;
SwLayoutFrm *pUpperFrm = 0;
if ( bBehind )
{
@@ -2687,7 +2687,7 @@ BOOL _FndBox::AreLinesToRestore( const SwTable &rTable ) const
else
nBhPos = USHRT_MAX;
- if ( nBfPos == nBhPos ) //Duerfte eigentlich nie vorkommen.
+ if ( nBfPos == nBhPos ) //Duerfte eigentlich nie vorkommen.
{
OSL_ENSURE( FALSE, "Table, Loeschen auf keinem Bereich !?!" );
return FALSE;
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 19e2c802d0ed..a904fa8f6454 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -2,7 +2,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
@@ -57,7 +57,7 @@ TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem)
TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem)
/******************************************************************************
- * Implementierung class SwMirrorGrf
+ * Implementierung class SwMirrorGrf
******************************************************************************/
SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
@@ -164,7 +164,7 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
/******************************************************************************
- * Implementierung class SwCropGrf
+ * Implementierung class SwCropGrf
******************************************************************************/
SwCropGrf::SwCropGrf()
@@ -188,7 +188,7 @@ SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const
}
-int SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const
+int SwRotationGrf::operator==( const SfxPoolItem& rCmp ) const
{
return SfxUInt16Item::operator==( rCmp ) &&
GetUnrotatedSize() == ((SwRotationGrf&)rCmp).GetUnrotatedSize();
@@ -261,7 +261,7 @@ SfxPoolItem* SwGammaGrf::Clone( SfxItemPool * ) const
return new SwGammaGrf( *this );
}
-int SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const
+int SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==( rCmp ) &&
nValue == ((SwGammaGrf&)rCmp).GetValue();
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index fcd56c239203..9d1a75c3a5cc 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -2,7 +2,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
@@ -161,7 +161,7 @@ BOOL SwGrfNode::ReRead(
if( rGrfName.Len() )
{
// Besonderheit: steht im FltNamen DDE, handelt es sich um eine
- // DDE-gelinkte Grafik
+ // DDE-gelinkte Grafik
String sCmd( rGrfName );
if( rFltName.Len() )
{
@@ -183,7 +183,7 @@ BOOL SwGrfNode::ReRead(
refLink->SetLinkSourceName( sCmd );
}
- else // kein Name mehr, Link aufheben
+ else // kein Name mehr, Link aufheben
{
GetDoc()->GetLinkManager().Remove( refLink );
refLink.Clear();
@@ -301,7 +301,7 @@ BOOL SwGrfNode::ReRead(
}
// Bug 39281: Size nicht sofort loeschen - Events auf ImageMaps
- // sollten nicht beim Austauschen nicht ins "leere greifen"
+ // sollten nicht beim Austauschen nicht ins "leere greifen"
if( bSetTwipSize )
SetTwipSize( ::GetGraphicSizeTwip( aGrfObj.GetGraphic(), 0 ) );
@@ -416,7 +416,7 @@ BOOL SwGrfNode::ImportGraphic( SvStream& rStrm )
short SwGrfNode::SwapIn( BOOL bWaitForData )
{
- if( bInSwapIn ) // nicht rekuriv!!
+ if( bInSwapIn ) // nicht rekuriv!!
return !aGrfObj.IsSwappedOut();
short nRet = 0;
@@ -641,7 +641,7 @@ void SwGrfNode::ReleaseLink()
if( refLink.Is() )
{
// erst die Grafik reinswappen!
-// if( aGraphic.IsSwapOut() || !refLink->IsSynchron() )
+// if( aGraphic.IsSwapOut() || !refLink->IsSynchron() )
{
bInSwapIn = TRUE;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
@@ -1067,7 +1067,7 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
case RES_MIRROR_GRAPH_VERT: nMirror = BMP_MIRROR_NONE; break;
case RES_MIRROR_GRAPH_HOR: nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT;
break;
- default: nMirror = BMP_MIRROR_VERT; break;
+ default: nMirror = BMP_MIRROR_VERT; break;
}
}
else
@@ -1108,7 +1108,7 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
BOOL SwGrfNode::IsTransparent() const
{
BOOL bRet = aGrfObj.IsTransparent();
- if( !bRet ) // ask the attribut
+ if( !bRet ) // ask the attribut
bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue();
return bRet;
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx
index 610bd935dc86..6e0df29bae6b 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -2,7 +2,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
@@ -30,18 +30,18 @@
#include <tools/solar.h>
-#define CM_1 0 // 1 centimeter or 1/2 inch
-#define CM_05 1 // 0.5 centimeter or 1/4 inch
-#define CM_01 2 // 0.1 centimeter or 1/20 inch
+#define CM_1 0 // 1 centimeter or 1/2 inch
+#define CM_05 1 // 0.5 centimeter or 1/4 inch
+#define CM_01 2 // 0.1 centimeter or 1/20 inch
inline USHORT GetMetricVal( int n )
{
#ifdef USE_MEASUREMENT
USHORT nVal = MEASURE_METRIC == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()
- ? 567 // 1 cm
- : 770; // 1/2 Inch
+ ? 567 // 1 cm
+ : 770; // 1/2 Inch
#else
- USHORT nVal = 567; // 1 cm
+ USHORT nVal = 567; // 1 cm
#endif
if( CM_01 == n )
@@ -52,6 +52,6 @@ inline USHORT GetMetricVal( int n )
}
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 415b8e7b6a68..c415313e89f9 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -2,7 +2,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
@@ -45,12 +45,12 @@ namespace sw { namespace mark
#endif
// IDocumentMarkAccess
virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
-
- virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+
+ virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType);
- virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
+ virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
+ const rtl::OUString& rName,
const rtl::OUString& rType);
virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
@@ -67,13 +67,13 @@ namespace sw { namespace mark
virtual void deleteMark(const ::sw::mark::IMark* const pMark);
virtual void clearAllMarks();
- // marks
+ // marks
virtual const_iterator_t getMarksBegin() const;
virtual const_iterator_t getMarksEnd() const;
virtual sal_Int32 getMarksCount() const;
virtual const_iterator_t findMark(const ::rtl::OUString& rName) const;
- // bookmarks
+ // bookmarks
virtual const_iterator_t getBookmarksBegin() const;
virtual const_iterator_t getBookmarksEnd() const;
virtual sal_Int32 getBookmarksCount() const;
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 0d831d3f0b2a..509d896b0db6 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -2,7 +2,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
@@ -26,15 +26,15 @@
*
************************************************************************/
-#ifndef _SWGRAMMARMARKUP_HXX
-#define _SWGRAMMARMARKUP_HXX
+#ifndef _SWGRAMMARMARKUP_HXX
+#define _SWGRAMMARMARKUP_HXX
#include <wrong.hxx>
#include <vector>
/* SwGrammarMarkUp extends the functionality of a "normal" SwWrongList by memorizing
the start positions of sentences in the paragraph
-
+
The whole class is only a temporary solution without usage of virtual functions.
At the end the whole SwWrongList stuff should be reworked and replaced by interfaces
to deal with all the different wronglists like
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 7830e59e46d8..fd9ce038165a 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class String;
* held by the corresponding SwTxtNode.
*
* The SwPortionHandler can be used with the
- * SwTextFrame::VisitPortions(...) method.
+ * SwTextFrame::VisitPortions(...) method.
*/
class SwPortionHandler
{
@@ -94,7 +94,7 @@ public:
) = 0;
/** end of paragraph. This method is to be called when all the
- * paragraph's portions have been processed.
+ * paragraph's portions have been processed.
*/
virtual void Finish() = 0;
};
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index 8d02e47a4e8f..d1da8ec86d0e 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -2,7 +2,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
@@ -39,9 +39,9 @@ private:
SwXMLTextBlocks &rBlockList;
public:
// #110680#
- SwXMLBlockListExport(
+ SwXMLBlockListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- SwXMLTextBlocks & rBlocks,
+ SwXMLTextBlocks & rBlocks,
const rtl::OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
@@ -58,9 +58,9 @@ private:
SwXMLTextBlocks &rBlockList;
public:
// #110680#
- SwXMLTextBlockExport(
+ SwXMLTextBlockExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- SwXMLTextBlocks & rBlocks,
+ SwXMLTextBlocks & rBlocks,
const rtl::OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 4d37e9b417ee..1cae68bb296b 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -2,7 +2,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
@@ -74,7 +74,7 @@ public:
String &m_rText;
// #110680#
- SwXMLTextBlockImport(
+ SwXMLTextBlockImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
SwXMLTextBlocks &rBlocks, String &rNewText, sal_Bool bNewTextOnly );
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 64c9dbb8c0e9..f05a6e75ddb9 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -2,7 +2,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
@@ -39,14 +39,14 @@ private:
SwXMLBlockListImport & rLocalRef;
public:
SwXMLBlockListContext( SwXMLBlockListImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLBlockListContext ( void );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
};
@@ -56,9 +56,9 @@ private:
SwXMLBlockListImport & rLocalRef;
public:
SwXMLBlockContext( SwXMLBlockListImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLBlockContext ( void );
};
@@ -69,13 +69,13 @@ private:
SwXMLTextBlockImport & rLocalRef;
public:
SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockDocumentContext ( void );
};
@@ -85,13 +85,13 @@ private:
SwXMLTextBlockImport & rLocalRef;
public:
SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockBodyContext ( void );
};
@@ -101,13 +101,13 @@ private:
SwXMLTextBlockImport & rLocalRef;
public:
SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockTextContext ( void );
};
@@ -117,9 +117,9 @@ private:
SwXMLTextBlockImport & rLocalRef;
public:
SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual void Characters( const ::rtl::OUString& rChars );
~SwXMLTextBlockParContext ( void );
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 4e5cfac7544d..12d54899adfe 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -2,7 +2,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
@@ -37,17 +37,17 @@ class SwDoc;
class SvxMacroTableDtor;
class SwImpBlocks;
-#define SWXML_CONVBLOCK 0x0001
-#define SWXML_NOROOTCOMMIT 0x0002
+#define SWXML_CONVBLOCK 0x0001
+#define SWXML_NOROOTCOMMIT 0x0002
class SwXMLTextBlocks : public SwImpBlocks
{
protected:
- BOOL bAutocorrBlock;
- BOOL bBlock;
+ BOOL bAutocorrBlock;
+ BOOL bBlock;
SfxObjectShellRef xDocShellRef;
- USHORT nFlags;
- String aPackageName;
+ USHORT nFlags;
+ String aPackageName;
SfxMediumRef xMedium;
void ReadInfo();
@@ -58,7 +58,7 @@ protected:
public:
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xBlkRoot;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xRoot;
- short nCurBlk;
+ short nCurBlk;
SwXMLTextBlocks( const String& rFile );
SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile );
void AddName( const String&, const String&, const String&, BOOL bOnlyTxt = FALSE );
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 931ed54006bf..6e31d3734da6 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 9031c7a98363..6896a3abd6b8 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -2,7 +2,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
@@ -79,9 +79,9 @@ public:
// Dieser darf nicht leer sein!
// Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0
// Das Flag gibt an:
- // TRUE: den, vor der normalen Einfuegeposition (TRUE)
- // FALSE: den, in den das korrigierte Wort eingfuegt wurde.
- // (Muss nicht der gleiche Absatz sein!!!!)
+ // TRUE: den, vor der normalen Einfuegeposition (TRUE)
+ // FALSE: den, in den das korrigierte Wort eingfuegt wurde.
+ // (Muss nicht der gleiche Absatz sein!!!!)
virtual const String* GetPrevPara( BOOL bAtNormalPos );
virtual BOOL ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
@@ -89,8 +89,8 @@ public:
const String** ppPara );
// wird nach dem austauschen der Zeichen von den Funktionen
- // - FnCptlSttWrd
- // - FnCptlSttSntnc
+ // - FnCptlSttWrd
+ // - FnCptlSttSntnc
// gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
// aufgenommen werden.
virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos,
@@ -114,7 +114,7 @@ public:
cChar(cChr), eLanguage(eLang), bDeleted(FALSE)
{}
- BOOL IsDeleted() const { return bDeleted; }
+ BOOL IsDeleted() const { return bDeleted; }
void CheckChar( const SwPosition& rPos, sal_Unicode cChar );
BOOL CheckDelChar( const SwPosition& rPos );
};
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 5bb1bf9cf810..10a6c7b87d20 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index f83cdf6259c7..dd84145f2ff3 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index ad56ed7750ca..e432d5d32434 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -2,7 +2,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
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _BLINK_HXX
-#define _BLINK_HXX
+#ifndef _BLINK_HXX
+#define _BLINK_HXX
class SwLinePortion;
class SwRootFrm;
@@ -40,8 +40,8 @@ class SwTxtFrm;
class SwBlinkPortion
{
Point aPos;
- const SwLinePortion *pPor;
- const SwRootFrm *pFrm;
+ const SwLinePortion *pPor;
+ const SwRootFrm *pFrm;
USHORT nDir;
public:
SwBlinkPortion( const SwLinePortion* pPortion, USHORT nDirection )
@@ -65,9 +65,9 @@ SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0, 10)
class SwBlink
{
- SwBlinkList aList;
- AutoTimer aTimer;
- BOOL bVisible;
+ SwBlinkList aList;
+ AutoTimer aTimer;
+ BOOL bVisible;
public:
SwBlink();
~SwBlink();
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 625011d17382..5694c0b118b1 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -2,7 +2,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
@@ -44,11 +44,11 @@ protected:
public:
SwBodyFrm( SwFrmFmt* );
- virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
+ virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm)
};
-#endif //_BODYFRM_HXX
+#endif //_BODYFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index b495e987d404..88683ca2e8cc 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextContent; }
} } }
-struct SwPosition; // fwd Decl. wg. UI
+struct SwPosition; // fwd Decl. wg. UI
class SwDoc;
namespace sw { namespace mark
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index bd59b54e3530..1cb26b46abfd 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ extern BOOL GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* );
class SwCntntFrm: public SwFrm, public SwFlowFrm
{
- friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); //ruft MakePrtArea
+ friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); //ruft MakePrtArea
// --> OD 2007-11-26 #b6614158#
// parameter <bObjsInNewUpper>, indicating that objects are existing in
@@ -73,32 +73,32 @@ protected:
public:
virtual ~SwCntntFrm();
- TYPEINFO(); //bereits in Basisklassen drin
+ TYPEINFO(); //bereits in Basisklassen drin
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
- inline SwCntntNode *GetNode();
+ inline SwCntntNode *GetNode();
inline const SwCntntNode *GetNode() const;
- USHORT GetSectionLevel();
+ USHORT GetSectionLevel();
inline const SwCntntFrm *GetFollow() const;
- inline SwCntntFrm *GetFollow();
+ inline SwCntntFrm *GetFollow();
SwTxtFrm* FindMaster() const;
//Layoutabhaengiges Cursortravelling
- virtual BOOL LeftMargin( SwPaM * ) const;
- virtual BOOL RightMargin( SwPaM *, BOOL bAPI = FALSE ) const;
- virtual BOOL UnitUp( SwPaM *, const SwTwips nOffset = 0,
+ virtual BOOL LeftMargin( SwPaM * ) const;
+ virtual BOOL RightMargin( SwPaM *, BOOL bAPI = FALSE ) const;
+ virtual BOOL UnitUp( SwPaM *, const SwTwips nOffset = 0,
BOOL bSetInReadOnly = FALSE ) const;
- virtual BOOL UnitDown( SwPaM *, const SwTwips nOffset = 0,
+ virtual BOOL UnitDown( SwPaM *, const SwTwips nOffset = 0,
BOOL bSetInReadOnly = FALSE ) const;
- inline BOOL StartNextPage( SwPaM * ) const;
- inline BOOL StartPrevPage( SwPaM * ) const;
- inline BOOL StartCurrPage( SwPaM * ) const;
- inline BOOL EndCurrPage( SwPaM * ) const;
- inline BOOL EndNextPage( SwPaM * ) const;
- inline BOOL EndPrevPage( SwPaM * ) const;
+ inline BOOL StartNextPage( SwPaM * ) const;
+ inline BOOL StartPrevPage( SwPaM * ) const;
+ inline BOOL StartCurrPage( SwPaM * ) const;
+ inline BOOL EndCurrPage( SwPaM * ) const;
+ inline BOOL EndNextPage( SwPaM * ) const;
+ inline BOOL EndPrevPage( SwPaM * ) const;
// nMaxHeight is the required height
// bSplit indicates, that the paragraph has to be split
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 011daf07fa74..fd8b2b80df10 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -2,7 +2,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
@@ -40,6 +40,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm)
};
-#endif //_COLFRM_HXX
+#endif //_COLFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index ef5f8933a81a..7c3623ce2d29 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index 141d55d41946..cda2de717990 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -2,7 +2,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
@@ -30,35 +30,35 @@
#define _DBG_LAY_HXX
#define PROT_FILE_INIT 0x00000000
-#define PROT_INIT 0x00000001
-#define PROT_MAKEALL 0x00000002
-#define PROT_MOVE_FWD 0x00000004
-#define PROT_MOVE_BWD 0x00000008
-#define PROT_GROW 0x00000010
-#define PROT_SHRINK 0x00000020
-#define PROT_GROW_TST 0x00000040
-#define PROT_SHRINK_TST 0x00000080
-#define PROT_SIZE 0x00000100
-#define PROT_PRTAREA 0x00000200
-#define PROT_POS 0x00000400
-#define PROT_ADJUSTN 0x00000800
-#define PROT_SECTION 0x00001000
-#define PROT_CUT 0x00002000
-#define PROT_PASTE 0x00004000
-#define PROT_LEAF 0x00008000
-#define PROT_TESTFORMAT 0x00010000
-#define PROT_FRMCHANGES 0x00020000
+#define PROT_INIT 0x00000001
+#define PROT_MAKEALL 0x00000002
+#define PROT_MOVE_FWD 0x00000004
+#define PROT_MOVE_BWD 0x00000008
+#define PROT_GROW 0x00000010
+#define PROT_SHRINK 0x00000020
+#define PROT_GROW_TST 0x00000040
+#define PROT_SHRINK_TST 0x00000080
+#define PROT_SIZE 0x00000100
+#define PROT_PRTAREA 0x00000200
+#define PROT_POS 0x00000400
+#define PROT_ADJUSTN 0x00000800
+#define PROT_SECTION 0x00001000
+#define PROT_CUT 0x00002000
+#define PROT_PASTE 0x00004000
+#define PROT_LEAF 0x00008000
+#define PROT_TESTFORMAT 0x00010000
+#define PROT_FRMCHANGES 0x00020000
#define PROT_SNAPSHOT 0x00040000
-#define ACT_START 1
-#define ACT_END 2
+#define ACT_START 1
+#define ACT_END 2
#define ACT_CREATE_MASTER 3
#define ACT_CREATE_FOLLOW 4
-#define ACT_DEL_MASTER 5
-#define ACT_DEL_FOLLOW 6
-#define ACT_MERGE 7
-#define ACT_NEXT_SECT 8
-#define ACT_PREV_SECT 9
+#define ACT_DEL_MASTER 5
+#define ACT_DEL_FOLLOW 6
+#define ACT_MERGE 7
+#define ACT_NEXT_SECT 8
+#define ACT_PREV_SECT 9
#define SNAP_LOWER 0x00000001
#define SNAP_FLYFRAMES 0x00000002
@@ -99,7 +99,7 @@ public:
~SwEnterLeave() { if( pImpl ) Dtor(); }
};
-#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\
+#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\
SwProtocol::Record( pFrm, nFunc, nAct, pPar ); }
#define PROTOCOL_INIT SwProtocol::Init();
#define PROTOCOL_STOP SwProtocol::Stop();
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
index da803ac9479b..c15eda62a7de 100644
--- a/sw/source/core/inc/dbgloop.hxx
+++ b/sw/source/core/inc/dbgloop.hxx
@@ -2,7 +2,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
@@ -35,8 +35,8 @@
class SvStream;
-#define DBG_MAX_STACK 20 // Verschachtelungstiefe
-#define DBG_MAX_LOOP 1000 // das Abbruchkriterium
+#define DBG_MAX_STACK 20 // Verschachtelungstiefe
+#define DBG_MAX_LOOP 1000 // das Abbruchkriterium
class DbgLoopStack
{
@@ -65,8 +65,8 @@ inline void PrintLoopStack( SvStream &rOS ) //$ ostream
DbgLoop::aDbgLoopStack.Print( rOS );
}
-#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this );
-#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 );
+#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this );
+#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 );
#else
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index f89947ee95b6..372e4b82ee63 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -26,19 +26,19 @@
*
************************************************************************/
#ifndef _DFLYOBJ_HXX
-#define _DFLYOBJ_HXX
+#define _DFLYOBJ_HXX
#include <svx/svdovirt.hxx>
class SwFlyFrm;
class SwFrmFmt;
class SdrObjMacroHitRec;
-const UINT32 SWGInventor = UINT32('S')*0x00000001+
+const UINT32 SWGInventor = UINT32('S')*0x00000001+
UINT32('W')*0x00000100+
UINT32('G')*0x00010000;
const UINT16 SwFlyDrawObjIdentifier = 0x0001;
-const UINT16 SwDrawFirst = 0x0001;
+const UINT16 SwDrawFirst = 0x0001;
//---------------------------------------
//SwFlyDrawObj, Die DrawObjekte fuer Flys.
@@ -61,9 +61,9 @@ public:
//Damit eine Instanz dieser Klasse beim laden erzeugt werden kann
//(per Factory).
- virtual UINT32 GetObjInventor() const;
- virtual UINT16 GetObjIdentifier() const;
- virtual UINT16 GetObjVersion() const;
+ virtual UINT32 GetObjInventor() const;
+ virtual UINT16 GetObjIdentifier() const;
+ virtual UINT16 GetObjVersion() const;
};
//---------------------------------------
@@ -97,33 +97,33 @@ public:
~SwVirtFlyDrawObj();
//Ueberladene Methoden der Basisklasse SdrVirtObj
- virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const;
+ virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const;
//Wir nehemen die Groessenbehandlung vollstaendig selbst in die Hand.
virtual const Rectangle& GetCurrentBoundRect() const;
virtual const Rectangle& GetLastBoundRect() const;
- virtual void RecalcBoundRect();
- virtual void RecalcSnapRect();
- virtual const Rectangle& GetSnapRect() const;
- virtual void SetSnapRect(const Rectangle& rRect);
- virtual void NbcSetSnapRect(const Rectangle& rRect);
+ virtual void RecalcBoundRect();
+ virtual void RecalcSnapRect();
+ virtual const Rectangle& GetSnapRect() const;
+ virtual void SetSnapRect(const Rectangle& rRect);
+ virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual const Rectangle& GetLogicRect() const;
- virtual void SetLogicRect(const Rectangle& rRect);
- virtual void NbcSetLogicRect(const Rectangle& rRect);
+ virtual void SetLogicRect(const Rectangle& rRect);
+ virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
- virtual void NbcMove (const Size& rSiz);
- virtual void NbcResize(const Point& rRef, const Fraction& xFact,
+ virtual void NbcMove (const Size& rSiz);
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact,
const Fraction& yFact);
- virtual void Move (const Size& rSiz);
- virtual void Resize(const Point& rRef, const Fraction& xFact,
+ virtual void Move (const Size& rSiz);
+ virtual void Resize(const Point& rRef, const Fraction& xFact,
const Fraction& yFact);
const SwFrmFmt *GetFmt() const;
SwFrmFmt *GetFmt();
// Get Methoden fuer die Fly Verpointerung
- SwFlyFrm* GetFlyFrm() { return pFlyFrm; }
- const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; }
+ SwFlyFrm* GetFlyFrm() { return pFlyFrm; }
+ const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; }
void SetRect() const;
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 891c6f2b02d7..5902e53ec616 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -2,7 +2,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
@@ -28,7 +28,7 @@
#ifndef _DOCFLD_HXX
#define _DOCFLD_HXX
-#include <calc.hxx> // fuer SwHash
+#include <calc.hxx> // fuer SwHash
class SwTxtFld;
class SwIndex;
@@ -86,7 +86,7 @@ public:
_SetGetExpFld( const SwFlyFrmFmt& rFlyFmt, const SwPosition* pPos = 0 );
BOOL operator==( const _SetGetExpFld& rFld ) const
- { return nNode == rFld.nNode && nCntnt == rFld.nCntnt &&
+ { return nNode == rFld.nNode && nCntnt == rFld.nCntnt &&
( !CNTNT.pTxtFld || !rFld.CNTNT.pTxtFld ||
CNTNT.pTxtFld == rFld.CNTNT.pTxtFld ); }
BOOL operator<( const _SetGetExpFld& rFld ) const;
@@ -145,24 +145,24 @@ void LookString( SwHash** ppTbl, USHORT nSize, const String& rName,
// --------
-const int GETFLD_ALL = 3; // veroderte Flags !!
-const int GETFLD_CALC = 1;
-const int GETFLD_EXPAND = 2;
+const int GETFLD_ALL = 3; // veroderte Flags !!
+const int GETFLD_CALC = 1;
+const int GETFLD_EXPAND = 2;
class SwDocUpdtFld
{
- _SetGetExpFlds* pFldSortLst; // akt. Field-Liste zum Calculieren
+ _SetGetExpFlds* pFldSortLst; // akt. Field-Liste zum Calculieren
SwCalcFldType* aFldTypeTable[ TBLSZ ];
// noch eine weitere Optimierung - wird z.Z. nicht angesprochen!
- long nFldUpdtPos; // ab dieser Position mit Update starten
- SwCntntNode* pCNode; // der TxtNode zur UpdatePos.
+ long nFldUpdtPos; // ab dieser Position mit Update starten
+ SwCntntNode* pCNode; // der TxtNode zur UpdatePos.
- ULONG nNodes; // sollte die NodesAnzahl unterschiedlich sein
+ ULONG nNodes; // sollte die NodesAnzahl unterschiedlich sein
BYTE nFldLstGetMode;
- BOOL bInUpdateFlds : 1; // zur Zeit laeuft ein UpdateFlds,
- BOOL bFldsDirty : 1; // irgendwelche Felder sind ungueltig
+ BOOL bInUpdateFlds : 1; // zur Zeit laeuft ein UpdateFlds,
+ BOOL bFldsDirty : 1; // irgendwelche Felder sind ungueltig
void _MakeFldList( SwDoc& pDoc, int eGetMode );
void GetBodyNode( const SwTxtFld& , USHORT nFldWhich );
@@ -180,16 +180,16 @@ public:
void InsertFldType( const SwFieldType& rType );
void RemoveFldType( const SwFieldType& rType );
- BOOL IsInUpdateFlds() const { return bInUpdateFlds; }
- void SetInUpdateFlds( BOOL b ) { bInUpdateFlds = b; }
+ BOOL IsInUpdateFlds() const { return bInUpdateFlds; }
+ void SetInUpdateFlds( BOOL b ) { bInUpdateFlds = b; }
- BOOL IsFieldsDirty() const { return bFldsDirty; }
- void SetFieldsDirty( BOOL b ) { bFldsDirty = b; }
+ BOOL IsFieldsDirty() const { return bFldsDirty; }
+ void SetFieldsDirty( BOOL b ) { bFldsDirty = b; }
- SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; }
+ SwHash** GetFldTypeTable() const { return (SwHash**)aFldTypeTable; }
};
-#endif // _DOCFLD_HXX
+#endif // _DOCFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index f30d88d2d439..92d9ab90f012 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -2,7 +2,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
@@ -52,12 +52,12 @@ namespace com { namespace sun { namespace star { namespace lang {
/*--------------------------------------------------------------------
Beschreibung: Liste aller sortierten Elemente
--------------------------------------------------------------------*/
-typedef const _FndBox* _FndBoxPtr;
-typedef SwSortElement* SwSortElementPtr;
-typedef const SwTableBox* SwMovedBoxPtr;
+typedef const _FndBox* _FndBoxPtr;
+typedef SwSortElement* SwSortElementPtr;
+typedef const SwTableBox* SwMovedBoxPtr;
SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0, 1 )
-SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 )
+SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 )
/*--------------------------------------------------------------------
Beschreibung: Funktionen zum Moven von Boxen
@@ -76,21 +76,21 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource,
struct SwSortElement
{
- static SwSortOptions* pOptions;
- static SwDoc* pDoc;
- static const FlatFndBox* pBox;
- static CollatorWrapper* pSortCollator;
+ static SwSortOptions* pOptions;
+ static SwDoc* pDoc;
+ static const FlatFndBox* pBox;
+ static CollatorWrapper* pSortCollator;
static ::com::sun::star::lang::Locale* pLocale;
- static String* pLastAlgorithm;
- static LocaleDataWrapper* pLclData;
+ static String* pLastAlgorithm;
+ static LocaleDataWrapper* pLclData;
static void Init( SwDoc*, const SwSortOptions& rOpt, FlatFndBox* = 0 );
static void Finit();
virtual ~SwSortElement();
- virtual String GetKey(USHORT nKey ) const = 0;
- virtual double GetValue(USHORT nKey ) const;
+ virtual String GetKey(USHORT nKey ) const = 0;
+ virtual double GetValue(USHORT nKey ) const;
BOOL operator==(const SwSortElement& );
BOOL operator<(const SwSortElement& );
@@ -105,8 +105,8 @@ struct SwSortElement
struct SwSortTxtElement : public SwSortElement
{
// fuer Text
- ULONG nOrg;
- SwNodeIndex aPos;
+ ULONG nOrg;
+ SwNodeIndex aPos;
SwSortTxtElement( const SwNodeIndex& rPos );
virtual ~SwSortTxtElement();
@@ -120,13 +120,13 @@ struct SwSortTxtElement : public SwSortElement
struct SwSortBoxElement : public SwSortElement
{
- USHORT nRow;
+ USHORT nRow;
SwSortBoxElement( USHORT nRC );
virtual ~SwSortBoxElement();
virtual String GetKey( USHORT nKey ) const;
- virtual double GetValue( USHORT nKey ) const;
+ virtual double GetValue( USHORT nKey ) const;
};
@@ -141,39 +141,39 @@ public:
FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox);
~FlatFndBox();
- BOOL IsSymmetric() const { return bSym; }
- USHORT GetRows() const { return nRows; }
- USHORT GetCols() const { return nCols; }
+ BOOL IsSymmetric() const { return bSym; }
+ USHORT GetRows() const { return nRows; }
+ USHORT GetCols() const { return nCols; }
- const _FndBox* GetBox(USHORT nCol, USHORT nRow) const;
+ const _FndBox* GetBox(USHORT nCol, USHORT nRow) const;
- inline BOOL HasItemSets() const;
- const SfxItemSet* GetItemSet(USHORT nCol, USHORT nRow) const;
+ inline BOOL HasItemSets() const;
+ const SfxItemSet* GetItemSet(USHORT nCol, USHORT nRow) const;
private:
- BOOL CheckLineSymmetry(const _FndBox& rBox);
- BOOL CheckBoxSymmetry(const _FndLine& rLn);
- USHORT GetColCount(const _FndBox& rBox);
- USHORT GetRowCount(const _FndBox& rBox);
- void FillFlat(const _FndBox&, BOOL bLastBox=FALSE);
+ BOOL CheckLineSymmetry(const _FndBox& rBox);
+ BOOL CheckBoxSymmetry(const _FndLine& rLn);
+ USHORT GetColCount(const _FndBox& rBox);
+ USHORT GetRowCount(const _FndBox& rBox);
+ void FillFlat(const _FndBox&, BOOL bLastBox=FALSE);
- SwDoc* pDoc;
- const _FndBox& rBoxRef;
- _FndBoxPtr* pArr;
- SfxItemSet** ppItemSets;
+ SwDoc* pDoc;
+ const _FndBox& rBoxRef;
+ _FndBoxPtr* pArr;
+ SfxItemSet** ppItemSets;
- USHORT nRows;
- USHORT nCols;
+ USHORT nRows;
+ USHORT nCols;
- USHORT nRow;
- USHORT nCol;
+ USHORT nRow;
+ USHORT nCol;
- BOOL bSym;
+ BOOL bSym;
};
-inline BOOL FlatFndBox::HasItemSets() const { return 0 != ppItemSets; }
+inline BOOL FlatFndBox::HasItemSets() const { return 0 != ppItemSets; }
#endif // _NDSORT_HXX
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index a7431ea526f0..86637c7c0f49 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -2,7 +2,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
@@ -56,22 +56,22 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
{
SwTOXSortTabBases aSortArr;
- void UpdateMarks( const SwTOXInternational& rIntl,
+ void UpdateMarks( const SwTOXInternational& rIntl,
const SwTxtNode* pOwnChapterNode );
- void UpdateOutline( const SwTxtNode* pOwnChapterNode );
- void UpdateTemplate( const SwTxtNode* pOwnChapterNode );
- void UpdateCntnt( SwTOXElement eType,
+ void UpdateOutline( const SwTxtNode* pOwnChapterNode );
+ void UpdateTemplate( const SwTxtNode* pOwnChapterNode );
+ void UpdateCntnt( SwTOXElement eType,
const SwTxtNode* pOwnChapterNode );
- void UpdateTable( const SwTxtNode* pOwnChapterNode );
- void UpdateSequence( const SwTxtNode* pOwnChapterNode );
- void UpdateAuthorities( const SwTOXInternational& rIntl );
- void UpdateAll();
+ void UpdateTable( const SwTxtNode* pOwnChapterNode );
+ void UpdateSequence( const SwTxtNode* pOwnChapterNode );
+ void UpdateAuthorities( const SwTOXInternational& rIntl );
+ void UpdateAll();
// Sortiert einfuegen ins Array fuer die Generierung
- void InsertSorted(SwTOXSortTabBase* pBase);
+ void InsertSorted(SwTOXSortTabBase* pBase);
// Alpha-Trennzeichen bei der Generierung einfuegen
- void InsertAlphaDelimitter( const SwTOXInternational& rIntl );
+ void InsertAlphaDelimitter( const SwTOXInternational& rIntl );
// Textrumpf generieren
// OD 18.03.2003 #106329# - add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
@@ -82,7 +82,7 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
const SwPageDesc* _pDefaultPageDesc );
// Seitennummerplatzhalter gegen aktuelle Nummern austauschen
- void _UpdatePageNum( SwTxtNode* pNd,
+ void _UpdatePageNum( SwTxtNode* pNd,
const SvUShorts& rNums,
const SvPtrarr &rDescs,
const SvUShorts* pMainEntryNums,
@@ -105,8 +105,8 @@ public:
// a table-of-content. Default value: false
void Update( const SfxItemSet* pAttr = 0,
const bool _bNewTOX = false ); // Formatieren
- void UpdatePageNum(); // Seitennummern einfuegen
- TYPEINFO(); // fuers rtti
+ void UpdatePageNum(); // Seitennummern einfuegen
+ TYPEINFO(); // fuers rtti
BOOL SetPosAtStartEnd( SwPosition& rPos, BOOL bAtStart = TRUE ) const;
};
@@ -145,6 +145,6 @@ struct SwDefTOXBase_Impl
};
-#endif // _DOCTXM_HXX
+#endif // _DOCTXM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx
index 5f5be7c02344..49da0d942969 100644
--- a/sw/source/core/inc/drawdev.hxx
+++ b/sw/source/core/inc/drawdev.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <vcl/outdev.hxx>
/*************************************************************************
- * class SwDrawDev
+ * class SwDrawDev
*
* Alle Draw-Methoden werden um den Offset *pPos verschoben.
*************************************************************************/
@@ -72,7 +72,7 @@ public:
};
/*************************************************************************
- * SwDrawDev::DrawText
+ * SwDrawDev::DrawText
*************************************************************************/
inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt,
@@ -85,7 +85,7 @@ inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt,
}
/*************************************************************************
- * SwDrawDev::DrawStretchText
+ * SwDrawDev::DrawStretchText
*************************************************************************/
inline void SwDrawDev::DrawStretchText( const Point& rStart, USHORT nWidth,
@@ -98,7 +98,7 @@ inline void SwDrawDev::DrawStretchText( const Point& rStart, USHORT nWidth,
}
/*************************************************************************
- * SwDrawDev::DrawTextArray
+ * SwDrawDev::DrawTextArray
*************************************************************************/
inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt,
@@ -111,7 +111,7 @@ inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt,
}
/*************************************************************************
- * SwDrawDev::DrawLine
+ * SwDrawDev::DrawLine
*************************************************************************/
inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd )
@@ -123,7 +123,7 @@ inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd )
}
/*************************************************************************
- * SwDrawDev::DrawRect
+ * SwDrawDev::DrawRect
*************************************************************************/
inline void SwDrawDev::DrawRect( const SwRect& rRect,
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index abc70caa34cb..bcbcf35e43e9 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -2,7 +2,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
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DRAWFONT_HXX
-#define _DRAWFONT_HXX
+#ifndef _DRAWFONT_HXX
+#define _DRAWFONT_HXX
#include <tools/solar.h>
#include <tools/string.hxx>
@@ -79,9 +79,9 @@ class SwDrawTextInfo
xub_StrLen nNumberOfBlanks;
BYTE nCursorBidiLevel;
BOOL bBullet : 1;
- BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag
- BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung
- BOOL bGreyWave : 1; // Graue Wellenlinie beim extended TextInput
+ BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag
+ BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung
+ BOOL bGreyWave : 1; // Graue Wellenlinie beim extended TextInput
BOOL bSpaceStop : 1; // For underlining we need to know, if a portion
// is right in front of a hole portion or a
// fix margin portion.
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 90df8fd4ccbb..17916c50f6fa 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -2,7 +2,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
@@ -26,7 +26,7 @@
*
************************************************************************/
#ifndef _DVIEW_HXX
-#define _DVIEW_HXX
+#define _DVIEW_HXX
#include <svx/fmview.hxx>
@@ -40,8 +40,8 @@ class SwAnchoredObject;
class SwDrawView : public FmFormView
{
//Fuer den Anker
- Point aAnchorPoint; //Ankerposition
- SwViewImp &rImp; //Die View gehoert immer zu einer Shell
+ Point aAnchorPoint; //Ankerposition
+ SwViewImp &rImp; //Die View gehoert immer zu einer Shell
const SwFrm *CalcAnchor();
@@ -104,14 +104,14 @@ public:
// Overload to resue edit background color in active text edit view (OutlinerView)
virtual void ModelHasChanged();
- virtual void ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
+ virtual void ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
ULONG nNewPos );
virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
virtual void MakeVisible( const Rectangle&, Window &rWin );
virtual void CheckPossibilities();
const SwViewImp &Imp() const { return rImp; }
- SwViewImp &Imp() { return rImp; }
+ SwViewImp &Imp() { return rImp; }
//Anker und Xor fuer das Draggen.
void ShowDragAnchor();
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index e76a3604097a..87b6bfae4759 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index 19e902c53a37..87f82b0750e0 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 1b4a5fd82968..aa18ceead560 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -2,7 +2,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
@@ -124,14 +124,14 @@ protected:
SwFlowFrm *pFollow;
- BOOL bIsFollow :1; //Ist's ein Follow
- BOOL bLockJoin :1; //Join (und damit deleten) verboten wenn TRUE!
+ BOOL bIsFollow :1; //Ist's ein Follow
+ BOOL bLockJoin :1; //Join (und damit deleten) verboten wenn TRUE!
BOOL bUndersized:1; // wir sind kleiner als gewuenscht
- BOOL bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of section
- BOOL bEndnAtEnd :1; // " " " : endnotes at the end of section
- BOOL bCntntLock :1; // " " " : content locked
- BOOL bOwnFtnNum :1; // " " " : special numbering of footnotes
- BOOL bFtnLock :1; // " " " : ftn, don't leave this section bwd
+ BOOL bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of section
+ BOOL bEndnAtEnd :1; // " " " : endnotes at the end of section
+ BOOL bCntntLock :1; // " " " : content locked
+ BOOL bOwnFtnNum :1; // " " " : special numbering of footnotes
+ BOOL bFtnLock :1; // " " " : ftn, don't leave this section bwd
BOOL bFlyLock :1; // Stop positioning of at-character flyframes
//Prueft ob Vorwaertsfluss noch Sinn macht Endloswanderschaften (unterbinden)
@@ -139,7 +139,7 @@ protected:
// --> OD 2005-03-08 #i44049# - method <CalcCntnt(..)> has to check this property.
friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
// <--
- BOOL IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep.
+ BOOL IsKeepFwdMoveAllowed(); //Wie oben, Move fuer Keep.
//Prueft ob ein Obj das Umlauf wuenscht ueberlappt.
//eine Null bedeutet, kein Objekt ueberlappt,
@@ -159,14 +159,14 @@ protected:
public:
SwFlowFrm( SwFrm &rFrm );
- const SwFrm *GetFrm() const { return &rThis; }
- SwFrm *GetFrm() { return &rThis; }
+ const SwFrm *GetFrm() const { return &rThis; }
+ SwFrm *GetFrm() { return &rThis; }
- static BOOL IsMoveBwdJump() { return bMoveBwdJump; }
+ static BOOL IsMoveBwdJump() { return bMoveBwdJump; }
static void SetMoveBwdJump( BOOL bNew ){ bMoveBwdJump = bNew; }
inline void SetUndersized( const BOOL bNew ) { bUndersized = bNew; }
- inline BOOL IsUndersized() const { return bUndersized; }
+ inline BOOL IsUndersized() const { return bUndersized; }
BOOL IsPrevObjMove() const;
@@ -174,18 +174,18 @@ public:
//neuen Parent Moven.
void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 );
- BOOL HasFollow() const { return pFollow ? TRUE : FALSE; }
- BOOL IsFollow() const { return bIsFollow; }
- inline void _SetIsFollow( BOOL bSet ) { bIsFollow = bSet; }
- const SwFlowFrm *GetFollow() const { return pFollow; }
- SwFlowFrm *GetFollow() { return pFollow; }
- BOOL IsAnFollow( const SwFlowFrm *pFlow ) const;
- inline void SetFollow( SwFlowFrm *pNew ) { pFollow = pNew; }
+ BOOL HasFollow() const { return pFollow ? TRUE : FALSE; }
+ BOOL IsFollow() const { return bIsFollow; }
+ inline void _SetIsFollow( BOOL bSet ) { bIsFollow = bSet; }
+ const SwFlowFrm *GetFollow() const { return pFollow; }
+ SwFlowFrm *GetFollow() { return pFollow; }
+ BOOL IsAnFollow( const SwFlowFrm *pFlow ) const;
+ inline void SetFollow( SwFlowFrm *pNew ) { pFollow = pNew; }
sal_Bool IsJoinLocked() const { return bLockJoin; }
sal_Bool IsAnyJoinLocked() const { return bLockJoin || HasLockedFollow(); }
- BOOL IsFtnAtEnd() const { return bFtnAtEnd; }
- BOOL IsEndnAtEnd() const { return bEndnAtEnd; }
+ BOOL IsFtnAtEnd() const { return bFtnAtEnd; }
+ BOOL IsEndnAtEnd() const { return bEndnAtEnd; }
BOOL IsAnyNoteAtEnd() const { return bFtnAtEnd || bEndnAtEnd; }
BOOL AreNotesAtEnd() const { return bFtnAtEnd && bEndnAtEnd; }
@@ -249,17 +249,17 @@ public:
void CheckKeep();
void SetFtnLock( BOOL bNew ){ bFtnLock = bNew; }
- BOOL IsFtnLock() const { return bFtnLock; }
+ BOOL IsFtnLock() const { return bFtnLock; }
void SetFlyLock( BOOL bNew ){ bFlyLock = bNew; }
BOOL IsFlyLock() const { return bFlyLock; }
void SetOwnFtnNum( BOOL bNew ){ bOwnFtnNum = bNew; }
- BOOL IsOwnFtnNum() const { return bOwnFtnNum; }
+ BOOL IsOwnFtnNum() const { return bOwnFtnNum; }
void SetCntntLock( BOOL bNew ){ bCntntLock = bNew; }
- BOOL IsCntntLocked() const { return bCntntLock; }
+ BOOL IsCntntLocked() const { return bCntntLock; }
//casten einen Frm auf einen FlowFrm - wenns denn einer ist, sonst 0
//Diese Methoden muessen fuer neue Ableitungen geaendert werden!
- static SwFlowFrm *CastFlowFrm( SwFrm *pFrm );
+ static SwFlowFrm *CastFlowFrm( SwFrm *pFrm );
static const SwFlowFrm *CastFlowFrm( const SwFrm *pFrm );
};
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 699d90d3816e..0a5cad49bc23 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -2,7 +2,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
@@ -63,8 +63,8 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld,
const SwRect* pOldPrt );
- void InitDrawObj( BOOL bNotify ); //Wird von den CToren gerufen.
- void FinitDrawObj(); //Wird vom CTor gerufen.
+ void InitDrawObj( BOOL bNotify ); //Wird von den CToren gerufen.
+ void FinitDrawObj(); //Wird vom CTor gerufen.
void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, BYTE &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
@@ -74,13 +74,13 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
protected:
SwFlyFrm *pPrevLink, // Vorgaenger/Nachfolger fuer Verkettung mit
- *pNextLink; // Textfluss
+ *pNextLink; // Textfluss
// OD 2004-05-27 #i26791# - moved to <SwAnchoredObject>
// Point aRelPos; //Die Relative Position zum Master
private:
- BOOL bLocked :1; //Cntnt-gebundene Flys muessen derart blockiert werden
+ BOOL bLocked :1; //Cntnt-gebundene Flys muessen derart blockiert werden
//koennen, dass sie nicht Formatiert werden; :MakeAll
//returnt dann sofort. Dies ist bei Seitenwechseln
//waehrend der Formatierung notwendig.
@@ -88,22 +88,22 @@ private:
//sonst der Anker formatiert wird obwohl die Root noch
//nicht korrekt an der Shell haengt und weil sonst
//initial zuviel Formatiert wuerde.
- BOOL bNotifyBack:1; //TRUE wenn am Ende eines MakeAll() der Background
+ BOOL bNotifyBack:1; //TRUE wenn am Ende eines MakeAll() der Background
//vom NotifyDTor benachrichtigt werden muss.
protected:
- BOOL bInvalid :1; //Pos, PrtArea od. SSize wurden Invalidiert, sie werden
+ BOOL bInvalid :1; //Pos, PrtArea od. SSize wurden Invalidiert, sie werden
//gleich wieder Validiert, denn sie muessen _immer_
//gueltig sein. Damit in LayAction korrekt gearbeitet
//werden kann muss hier festgehalten werden, dass sie
//invalidiert wurden. Ausnahmen bestaetigen die Regelt!
- BOOL bMinHeight:1; //TRUE wenn die vom Attribut vorgegebene Hoehe eine
+ BOOL bMinHeight:1; //TRUE wenn die vom Attribut vorgegebene Hoehe eine
//eine Minimalhoehe ist (der Frm also bei Bedarf
//darueberhinaus wachsen kann).
- BOOL bHeightClipped :1; //TRUE wenn der Fly nicht die Pos/Size anhand der Attrs
- BOOL bWidthClipped :1; //formatieren konnte, weil z.B. nicht genug Raum vorh.
+ BOOL bHeightClipped :1; //TRUE wenn der Fly nicht die Pos/Size anhand der Attrs
+ BOOL bWidthClipped :1; //formatieren konnte, weil z.B. nicht genug Raum vorh.
//war.
- BOOL bFormatHeightOnly :1; //Damit nach einer Anpassung der Breite
+ BOOL bFormatHeightOnly :1; //Damit nach einer Anpassung der Breite
//(CheckClip) nur das Format aufgerufen wird;
//nicht aber die Breite anhand der Attribute
//wieder bestimmt wird.
@@ -123,10 +123,10 @@ protected:
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
void MakePrtArea( const SwBorderAttrs &rAttrs );
- void Lock() { bLocked = TRUE; }
- void Unlock() { bLocked = FALSE; }
+ void Lock() { bLocked = TRUE; }
+ void Unlock() { bLocked = FALSE; }
- void SetMinHeight() { bMinHeight = TRUE; }
+ void SetMinHeight() { bMinHeight = TRUE; }
void ResetMinHeight(){ bMinHeight = FALSE; }
Size CalcRel( const SwFmtFrmSize &rSz ) const;
@@ -156,7 +156,7 @@ public:
TYPEINFO();
virtual ~SwFlyFrm();
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
// erfrage vom Client Informationen
virtual BOOL GetInfo( SfxPoolItem& ) const;
virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
@@ -172,14 +172,14 @@ public:
SwTwips _Shrink( SwTwips, BOOL bTst );
SwTwips _Grow ( SwTwips, BOOL bTst );
- void _Invalidate( SwPageFrm *pPage = 0 );
+ void _Invalidate( SwPageFrm *pPage = 0 );
BOOL FrmSizeChg( const SwFmtFrmSize & );
SwFlyFrm *GetPrevLink() const { return pPrevLink; }
SwFlyFrm *GetNextLink() const { return pNextLink; }
- static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
+ static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
static void UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow );
SwFlyFrm *FindChainNeighbour( SwFrmFmt &rFmt, SwFrm *pAnch = 0 );
@@ -194,26 +194,26 @@ public:
void Invalidate() const { ((SwFlyFrm*)this)->bInvalid = TRUE; }
void Validate() const { ((SwFlyFrm*)this)->bInvalid = FALSE; }
- BOOL IsMinHeight() const { return bMinHeight; }
- BOOL IsLocked() const { return bLocked; }
- BOOL IsAutoPos() const { return bAutoPosition; }
+ BOOL IsMinHeight() const { return bMinHeight; }
+ BOOL IsLocked() const { return bLocked; }
+ BOOL IsAutoPos() const { return bAutoPosition; }
BOOL IsFlyInCntFrm() const { return bInCnt; }
BOOL IsFlyFreeFrm() const { return bAtCnt || bLayout; }
BOOL IsFlyLayFrm() const { return bLayout; }
BOOL IsFlyAtCntFrm() const { return bAtCnt; }
- BOOL IsNotifyBack() const { return bNotifyBack; }
- void SetNotifyBack() { bNotifyBack = TRUE; }
- void ResetNotifyBack() { bNotifyBack = FALSE; }
+ BOOL IsNotifyBack() const { return bNotifyBack; }
+ void SetNotifyBack() { bNotifyBack = TRUE; }
+ void ResetNotifyBack() { bNotifyBack = FALSE; }
BOOL IsNoShrink() const { return bNoShrink; }
void SetNoShrink( BOOL bNew ) { bNoShrink = bNew; }
BOOL IsLockDeleteContent() const { return bLockDeleteContent; }
void SetLockDeleteContent( BOOL bNew ) { bLockDeleteContent = bNew; }
- BOOL IsClipped() const { return bHeightClipped || bWidthClipped; }
- BOOL IsHeightClipped() const { return bHeightClipped; }
- BOOL IsWidthClipped() const { return bWidthClipped; }
+ BOOL IsClipped() const { return bHeightClipped || bWidthClipped; }
+ BOOL IsHeightClipped() const { return bHeightClipped; }
+ BOOL IsWidthClipped() const { return bWidthClipped; }
BOOL IsLowerOf( const SwLayoutFrm* pUpper ) const;
inline BOOL IsUpperOf( const SwFlyFrm& _rLower ) const
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 92ed657729f8..7ec9f1e8631d 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -2,7 +2,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
@@ -134,7 +134,7 @@ public:
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
SwFlyLayFrm( SwFlyLayFrm& );
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
};
@@ -162,7 +162,7 @@ public:
SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
void SetAbsPos( const Point &rNew );
@@ -188,7 +188,7 @@ class SwFlyInCntFrm : public SwFlyFrm
long nLine; //Zeilenhoehe, Ref.Y() - nLine == Zeilenanfang.
BOOL bInvalidLayout :1;
- BOOL bInvalidCntnt :1;
+ BOOL bInvalidCntnt :1;
protected:
virtual void NotifyBackground( SwPageFrm *pPage,
@@ -203,7 +203,7 @@ public:
virtual ~SwFlyInCntFrm();
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
void SetRefPoint( const Point& rPoint, const Point &rRelAttr,
const Point &rRelPos );
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index caca5826484a..9df70d757cb2 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ class Printer;
class OutputDevice;
class FontMetric;
class SwFntObj;
-class SwDrawTextInfo; // DrawText
+class SwDrawTextInfo; // DrawText
class ViewShell;
class SwSubFont;
class MapMode;
@@ -112,8 +112,8 @@ public:
virtual ~SwFntObj();
- inline Font *GetScrFont() { return pScrFont; }
- inline Font *GetFont() { return &aFont; }
+ inline Font *GetScrFont() { return pScrFont; }
+ inline Font *GetFont() { return &aFont; }
inline const Font *GetFont() const { return &aFont; }
inline USHORT GetGuessedLeading() const { return nGuessedLeading; }
@@ -127,9 +127,9 @@ public:
void SetDevFont( const ViewShell *pSh, OutputDevice& rOut );
inline OutputDevice* GetPrt() const { return pPrinter; }
- inline USHORT GetZoom() const { return nZoom; }
- inline USHORT GetPropWidth() const { return nPropWidth; }
- inline BOOL IsSymbol() const { return bSymbol; }
+ inline USHORT GetZoom() const { return nZoom; }
+ inline USHORT GetPropWidth() const { return nPropWidth; }
+ inline BOOL IsSymbol() const { return bSymbol; }
void DrawText( SwDrawTextInfo &rInf );
Size GetTextSize( SwDrawTextInfo &rInf );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 00f21add8b20..20aaf569b9db 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -2,7 +2,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
@@ -29,9 +29,9 @@
#define _FRAME_HXX
#include <svl/svarray.hxx>
#include <editeng/borderline.hxx>
-#include "swtypes.hxx" // fuer SwTwips
+#include "swtypes.hxx" // fuer SwTwips
#include "swrect.hxx"
-#include "calbck.hxx" // fuer SwClient
+#include "calbck.hxx" // fuer SwClient
#if OSL_DEBUG_LEVEL > 1
#include <libxml/encoding.h>
@@ -73,46 +73,46 @@ class SwAnchoredObject;
//sie abgeleitet ist.
//Der Frm hat in der Basisklasse einen Member der von den CToren der
//einzelnen Frms entsprechend gesetzt werden muss.
-#define FRM_ROOT 0x0001
-#define FRM_PAGE 0x0002
-#define FRM_COLUMN 0x0004
-#define FRM_HEADER 0x0008
-#define FRM_FOOTER 0x0010
-#define FRM_FTNCONT 0x0020
-#define FRM_FTN 0x0040
-#define FRM_BODY 0x0080
-#define FRM_FLY 0x0100
-#define FRM_SECTION 0x0200
-#define FRM_UNUSED 0x0400
-#define FRM_TAB 0x0800
-#define FRM_ROW 0x1000
-#define FRM_CELL 0x2000
-#define FRM_TXT 0x4000
-#define FRM_NOTXT 0x8000
+#define FRM_ROOT 0x0001
+#define FRM_PAGE 0x0002
+#define FRM_COLUMN 0x0004
+#define FRM_HEADER 0x0008
+#define FRM_FOOTER 0x0010
+#define FRM_FTNCONT 0x0020
+#define FRM_FTN 0x0040
+#define FRM_BODY 0x0080
+#define FRM_FLY 0x0100
+#define FRM_SECTION 0x0200
+#define FRM_UNUSED 0x0400
+#define FRM_TAB 0x0800
+#define FRM_ROW 0x1000
+#define FRM_CELL 0x2000
+#define FRM_TXT 0x4000
+#define FRM_NOTXT 0x8000
//Fuer den internen Gebrauch ein paar gebraeuchliche Verknuepfungen.
-#define FRM_LAYOUT 0x3FFF
-#define FRM_CNTNT 0xC000
-#define FRM_FTNBOSS 0x0006
+#define FRM_LAYOUT 0x3FFF
+#define FRM_CNTNT 0xC000
+#define FRM_FTNBOSS 0x0006
#define FRM_ACCESSIBLE (FRM_HEADER|FRM_FOOTER|FRM_FTN|FRM_TXT|FRM_ROOT|FRM_FLY|FRM_TAB|FRM_CELL|FRM_PAGE)
//Weils so schon ist das ganze als Bitfeld....
-//0000 0000 0000 0001 ROOT
-//0000 0000 0000 0010 PAGE
-//0000 0000 0000 0100 COLUMN
-//0000 0000 0000 1000 HEADER
-//0000 0000 0001 0000 FOOTER
-//0000 0000 0010 0000 FTNCONT
-//0000 0000 0100 0000 FTN
-//0000 0000 1000 0000 BODY
-//0000 0001 0000 0000 FLY
-//0000 0010 0000 0000 SECTION
-//0000 0100 0000 0000 UNUSED
-//0000 1000 0000 0000 TAB
-//0001 0000 0000 0000 ROW
-//0010 0000 0000 0000 CELL
-//0100 0000 0000 0000 TXT
-//1000 0000 0000 0000 NOTXT
+//0000 0000 0000 0001 ROOT
+//0000 0000 0000 0010 PAGE
+//0000 0000 0000 0100 COLUMN
+//0000 0000 0000 1000 HEADER
+//0000 0000 0001 0000 FOOTER
+//0000 0000 0010 0000 FTNCONT
+//0000 0000 0100 0000 FTN
+//0000 0000 1000 0000 BODY
+//0000 0001 0000 0000 FLY
+//0000 0010 0000 0000 SECTION
+//0000 0100 0000 0000 UNUSED
+//0000 1000 0000 0000 TAB
+//0001 0000 0000 0000 ROW
+//0010 0000 0000 0000 CELL
+//0100 0000 0000 0000 TXT
+//1000 0000 0000 0000 NOTXT
// The type of the frame is internal represented by the 4-bit value nType,
// which can expanded to the types above by shifting a bit (0x1 << nType)
@@ -235,11 +235,11 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R;
//Fuer GetNextLeaf/GetPrevLeaf.
enum MakePageType
{
- MAKEPAGE_NONE, //Keine Seite bzw. Fussnote anlegen
- MAKEPAGE_APPEND, //Nur ggf. Seite anhaengen
- MAKEPAGE_INSERT, //Seite ggf. anhaengen oder einfuegen.
- MAKEPAGE_FTN, //Fussnote ggf. einfuegen.
- MAKEPAGE_NOSECTION // Don't create section frames
+ MAKEPAGE_NONE, //Keine Seite bzw. Fussnote anlegen
+ MAKEPAGE_APPEND, //Nur ggf. Seite anhaengen
+ MAKEPAGE_INSERT, //Seite ggf. anhaengen oder einfuegen.
+ MAKEPAGE_FTN, //Fussnote ggf. einfuegen.
+ MAKEPAGE_NOSECTION // Don't create section frames
};
// OD 2004-05-06 #i28701# - replaced by new class <SwSortedObjs>
@@ -250,7 +250,7 @@ class SwFrm: public SwClient
{
//Der verkappte Frm
friend class SwFlowFrm;
- friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev
+ friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev
friend class SwLooping; // LoopControlling (layouter.cxx)
//Hebt die Lower waehrend eines Spaltenumbaus auf.
@@ -267,7 +267,7 @@ class SwFrm: public SwClient
// Implementiert in text/txtftn.cxx, verhindert Ftn-Oszillation
friend void ValidateTxt( SwFrm *pFrm );
-// friend void CalcAnchorAndKeep( SwFlyFrm * );
+// friend void CalcAnchorAndKeep( SwFlyFrm * );
friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );
@@ -354,15 +354,15 @@ class SwFrm: public SwClient
SwFrm* _GetIndNext();
void SetDirFlags( BOOL bVert );
- SwFrm( SwFrm & ); //Kopieren ist nicht erlaubt.
+ SwFrm( SwFrm & ); //Kopieren ist nicht erlaubt.
const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const;
protected:
SwSortedObjs* pDrawObjs; //Hier haengen die DrawObjs, kann 0 sein
- SwRect aFrm; //Absolute Dokumentposition und groesse des Frm
- SwRect aPrt; //Position der PrtArea rel zum Frm und groesse der PrtArea
+ SwRect aFrm; //Absolute Dokumentposition und groesse des Frm
+ SwRect aPrt; //Position der PrtArea rel zum Frm und groesse der PrtArea
USHORT bFlag01: 1;
USHORT bFlag02: 1;
@@ -379,32 +379,32 @@ protected:
USHORT bVertical: 1;
USHORT nType: 4; //Who am I?
- BOOL bValidPos: 1;
- BOOL bValidPrtArea: 1;
- BOOL bValidSize: 1;
- BOOL bValidLineNum: 1;
+ BOOL bValidPos: 1;
+ BOOL bValidPrtArea: 1;
+ BOOL bValidSize: 1;
+ BOOL bValidLineNum: 1;
BOOL bFixSize: 1;
BOOL bUnUsed1: 1;
- BOOL bCompletePaint: 1; //Frame wird ganz gepaintet wenn TRUE, auch
+ BOOL bCompletePaint: 1; //Frame wird ganz gepaintet wenn TRUE, auch
//wenn der Inhalt nur teilw. veraendert ist;
//Bei CntntFrms wird ausschliesslich wenn TRUE
//der Border (von Action) gemalt.
- BOOL bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich
+ BOOL bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich
//wenn TRUE.
public:
BOOL bUnUsed2: 1;
protected:
- BOOL bInfInvalid: 1; //InfoFlags sind Invalid.
- BOOL bInfBody: 1; //Frm steht im DokumentBody.
- BOOL bInfTab: 1; //Frm steht in einer Tabelle.
- BOOL bInfFly: 1; //Frm steht in einem Fly.
- BOOL bInfFtn: 1; //Frm steht in einer Fussnote.
- BOOL bInfSct: 1; //Frm steht in einem Bereich.
- BOOL bColLocked: 1; //Grow/Shrink sperren bei spaltigen Section-
+ BOOL bInfInvalid: 1; //InfoFlags sind Invalid.
+ BOOL bInfBody: 1; //Frm steht im DokumentBody.
+ BOOL bInfTab: 1; //Frm steht in einer Tabelle.
+ BOOL bInfFly: 1; //Frm steht in einem Fly.
+ BOOL bInfFtn: 1; //Frm steht in einer Fussnote.
+ BOOL bInfSct: 1; //Frm steht in einem Bereich.
+ BOOL bColLocked: 1; //Grow/Shrink sperren bei spaltigen Section-
//oder Fly-Frames, wird im Format gesetzt
- void ColLock() { bColLocked = TRUE; }
- void ColUnlock() { bColLocked = FALSE; }
+ void ColLock() { bColLocked = TRUE; }
+ void ColUnlock() { bColLocked = FALSE; }
SwPageFrm *InsertPage( SwPageFrm *pSibling, BOOL bFtn );
void PrepareMake();
@@ -425,8 +425,8 @@ protected:
virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0;
virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ) = 0;
- SwModify *GetDep() { return pRegisteredIn; }
- const SwModify *GetDep() const { return pRegisteredIn; }
+ SwModify *GetDep() { return pRegisteredIn; }
+ const SwModify *GetDep() const { return pRegisteredIn; }
SwFrm( SwModify* );
@@ -465,13 +465,13 @@ protected:
void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const;
public:
- TYPEINFO(); //Bereits in Basisklasse Client drin.
+ TYPEINFO(); //Bereits in Basisklasse Client drin.
USHORT GetType() const { return 0x1 << nType; }
- static SwCache &GetCache() { return *pCache; }
- static SwCache *GetCachePtr() { return pCache; }
- static void SetCache( SwCache *pNew ) { pCache = pNew; }
+ static SwCache &GetCache() { return *pCache; }
+ static SwCache *GetCachePtr() { return pCache; }
+ static void SetCache( SwCache *pNew ) { pCache = pNew; }
//Aendern die PrtArea-SSize und die FrmSize.
SwTwips Shrink( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
@@ -520,7 +520,7 @@ public:
void InvalidateObjs( const bool _bInvaPosOnly,
const bool _bNoInvaOfAsCharAnchoredObjs = true );
- virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage,
+ virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage,
const SwBorderAttrs & ) const;
void PaintBaBo( const SwRect&, const SwPageFrm *pPage = 0,
const BOOL bLowerBorder = FALSE ) const;
@@ -547,10 +547,10 @@ public:
inline void ResetRetouche() const;
inline BOOL IsRetouche() const { return bRetouche; }
- void SetInfFlags(); //Setzen der InfoFlags
+ void SetInfFlags(); //Setzen der InfoFlags
inline void InvalidateInfFlags() { bInfInvalid = TRUE; }
- inline BOOL IsInDocBody() const; //Benutzen die InfoFlags.
- inline BOOL IsInFtn() const; //ggf. werden die Flags ermittelt.
+ inline BOOL IsInDocBody() const; //Benutzen die InfoFlags.
+ inline BOOL IsInFtn() const; //ggf. werden die Flags ermittelt.
inline BOOL IsInTab() const;
inline BOOL IsInFly() const;
inline BOOL IsInSct() const;
@@ -605,14 +605,14 @@ public:
//Fussnote einzufuegen (nicht z.B. in wiederholten TabellenHeadlines).
BOOL IsFtnAllowed() const;
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void CheckDirection( BOOL bVert );
void ReinitializeFrmSizeAttrFlags();
- const SwAttrSet *GetAttrSet() const;
+ const SwAttrSet *GetAttrSet() const;
inline BOOL HasFixSize() const { return bFixSize; }
inline void SetFixSize( BOOL bNew ) { bFixSize = bNew; }
@@ -625,32 +625,32 @@ public:
static void CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields = TRUE );
//Koennen 0 liefern, einmal const einmal nicht
- SwFrm *GetNext() { return pNext; }
- SwFrm *GetPrev() { return pPrev; }
- SwLayoutFrm *GetUpper() { return pUpper; }
- SwRootFrm *FindRootFrm();
- SwPageFrm *FindPageFrm();
- SwFrm *FindColFrm();
- SwRowFrm *FindRowFrm();
- SwFtnBossFrm *FindFtnBossFrm( BOOL bFootnotes = FALSE );
- SwTabFrm *ImplFindTabFrm();
- SwFtnFrm *ImplFindFtnFrm();
- SwFlyFrm *ImplFindFlyFrm();
- SwSectionFrm *ImplFindSctFrm();
- SwFrm *FindFooterOrHeader();
- SwFrm *GetLower();
- const SwFrm *GetNext() const { return pNext; }
- const SwFrm *GetPrev() const { return pPrev; }
- const SwLayoutFrm *GetUpper() const { return pUpper; }
- inline SwTabFrm *FindTabFrm();
- inline SwFtnFrm *FindFtnFrm();
- inline SwFlyFrm *FindFlyFrm();
- inline SwSectionFrm *FindSctFrm();
- inline SwFrm *FindNext();
+ SwFrm *GetNext() { return pNext; }
+ SwFrm *GetPrev() { return pPrev; }
+ SwLayoutFrm *GetUpper() { return pUpper; }
+ SwRootFrm *FindRootFrm();
+ SwPageFrm *FindPageFrm();
+ SwFrm *FindColFrm();
+ SwRowFrm *FindRowFrm();
+ SwFtnBossFrm *FindFtnBossFrm( BOOL bFootnotes = FALSE );
+ SwTabFrm *ImplFindTabFrm();
+ SwFtnFrm *ImplFindFtnFrm();
+ SwFlyFrm *ImplFindFlyFrm();
+ SwSectionFrm *ImplFindSctFrm();
+ SwFrm *FindFooterOrHeader();
+ SwFrm *GetLower();
+ const SwFrm *GetNext() const { return pNext; }
+ const SwFrm *GetPrev() const { return pPrev; }
+ const SwLayoutFrm *GetUpper() const { return pUpper; }
+ inline SwTabFrm *FindTabFrm();
+ inline SwFtnFrm *FindFtnFrm();
+ inline SwFlyFrm *FindFlyFrm();
+ inline SwSectionFrm *FindSctFrm();
+ inline SwFrm *FindNext();
// --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
inline SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false );
// <--
- inline SwFrm *FindPrev();
+ inline SwFrm *FindPrev();
inline const SwPageFrm *FindPageFrm() const;
inline const SwRootFrm *FindRootFrm() const;
inline const SwFtnBossFrm *FindFtnBossFrm( BOOL bFtn = FALSE ) const;
@@ -660,12 +660,12 @@ public:
inline const SwFtnFrm *FindFtnFrm() const;
inline const SwFlyFrm *FindFlyFrm() const;
inline const SwSectionFrm *FindSctFrm() const;
- inline const SwFrm *FindNext() const;
+ inline const SwFrm *FindNext() const;
// --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
inline const SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false ) const;
// <--
- inline const SwFrm *FindPrev() const;
- const SwFrm *GetLower() const;
+ inline const SwFrm *FindPrev() const;
+ const SwFrm *GetLower() const;
/** inline wrapper method for <_FindPrevCnt(..)>
@@ -705,8 +705,8 @@ public:
{ return ( pNext || !IsInSct() ) ? pNext : _GetIndNext(); }
const SwFrm* GetIndNext() const { return ((SwFrm*)this)->GetIndNext(); }
- USHORT GetPhyPageNum() const; //Seitennummer ohne Offset
- USHORT GetVirtPageNum() const; //Seitenummer mit Offset
+ USHORT GetPhyPageNum() const; //Seitennummer ohne Offset
+ USHORT GetVirtPageNum() const; //Seitenummer mit Offset
BOOL OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
BOOL WannaRightPage() const;
@@ -745,9 +745,9 @@ public:
void ValidateLineNum() { bValidLineNum = TRUE; }
- BOOL GetValidPosFlag() const { return bValidPos; }
+ BOOL GetValidPosFlag() const { return bValidPos; }
BOOL GetValidPrtAreaFlag()const { return bValidPrtArea; }
- BOOL GetValidSizeFlag() const { return bValidSize; }
+ BOOL GetValidSizeFlag() const { return bValidSize; }
BOOL GetValidLineNumFlag()const { return bValidLineNum; }
BOOL IsValid() const { return bValidPos && bValidSize && bValidPrtArea; }
@@ -826,11 +826,11 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
- virtual BOOL GetCrsrOfst( SwPosition *, Point&,
+ virtual BOOL GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0 ) const;
- virtual BOOL GetCharRect( SwRect &, const SwPosition&,
+ virtual BOOL GetCharRect( SwRect &, const SwPosition&,
SwCrsrMoveState* = 0 ) const;
- virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
+ virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
// der "kurze Dienstweg" zwischen den Frames und der Formatierung.
// Wer den void* falsch Casted ist selbst schuld!
@@ -849,7 +849,7 @@ public:
inline BOOL IsFtnContFrm() const;
inline BOOL IsFtnFrm() const;
inline BOOL IsBodyFrm() const;
- inline BOOL IsColBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb ColumnFrm
+ inline BOOL IsColBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb ColumnFrm
inline BOOL IsPageBodyFrm() const; // in layfrm.hxx implementiert, BodyFrm unterhalb PageFrm
inline BOOL IsFlyFrm() const;
inline BOOL IsSctFrm() const;
@@ -859,20 +859,20 @@ public:
inline BOOL IsCntntFrm() const;
inline BOOL IsTxtFrm() const;
inline BOOL IsNoTxtFrm() const;
- inline BOOL IsFlowFrm() const; //Frms deren PrtArea von den Nachbarn
+ inline BOOL IsFlowFrm() const; //Frms deren PrtArea von den Nachbarn
//abhaengen und die halt im Inhaltsfluss
//stehen.
- inline BOOL IsRetoucheFrm() const; //Frms die Retouchefaehig sind bzw. die
+ inline BOOL IsRetoucheFrm() const; //Frms die Retouchefaehig sind bzw. die
//u.U. hinter sich Retouchieren muessen.
inline BOOL IsAccessibleFrm() const;
- void PrepareCrsr(); //Die CrsrShell darf.
+ void PrepareCrsr(); //Die CrsrShell darf.
//Ist der Frm (bzw. die Section in der er steht) geschuetzt?
//Auch Fly in Fly in ... und Fussnoten
BOOL IsProtected() const;
- BOOL IsColLocked() const { return bColLocked; }
+ BOOL IsColLocked() const { return bColLocked; }
virtual ~SwFrm();
@@ -928,13 +928,13 @@ public:
bool IsCollapse() const;
};
-inline BOOL SwFrm::IsInDocBody() const
+inline BOOL SwFrm::IsInDocBody() const
{
if ( bInfInvalid )
((SwFrm*)this)->SetInfFlags();
return bInfBody;
}
-inline BOOL SwFrm::IsInFtn() const
+inline BOOL SwFrm::IsInFtn() const
{
if ( bInfInvalid )
((SwFrm*)this)->SetInfFlags();
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index b965dabd816f..de1f5f0d8ef0 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -2,7 +2,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
@@ -30,13 +30,13 @@
#include "swtypes.hxx"
-class SwTxtFrm; // SwTxtFrmInfo
-class SwPaM; // SwTxtFrmInfo
-class SwTxtCursor; // SwTxtFrmInfo
+class SwTxtFrm; // SwTxtFrmInfo
+class SwPaM; // SwTxtFrmInfo
+class SwTxtCursor; // SwTxtFrmInfo
/*************************************************************************
- * class SwTxtFrmInfo
+ * class SwTxtFrmInfo
*************************************************************************/
class SwTxtFrmInfo
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index d91d77a5425d..844fbbfe5bc9 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ struct SwFindRowSpanCacheObj;
#define MA_FASTCALL
#endif
-#define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys.
+#define WEIT_WECH LONG_MAX - 20000 //Initale Position der Flys.
#define BROWSE_HEIGHT 56700L * 10L //10 Meter
//#define BROWSE_HEIGHT 1440L * 45L // 45 inch, maximum size for pdf files
@@ -107,7 +107,7 @@ extern BOOL bSetCompletePaintOnInvalidate;
//Fuer Tabelleneinstellung per Tastatur.
long MA_FASTCALL CalcRowRstHeight( SwLayoutFrm *pRow );
-long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ); //MA_FLY_HEIGHT
+long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ); //MA_FLY_HEIGHT
//Neue Seite einsetzen
SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
@@ -138,7 +138,7 @@ BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage );
// JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
-// gerufen
+// gerufen
SwFrm* GetFrmOfModify( SwModify const&, USHORT const nFrmType, const Point* = 0,
const SwPosition *pPos = 0,
const BOOL bCalcFrm = FALSE );
@@ -164,8 +164,8 @@ protected:
SwTwips mnFlyAnchorOfst;
SwTwips mnFlyAnchorOfstNoWrap;
BOOL bHadFollow;
- BOOL bInvaKeep;
- BOOL bValidSize;
+ BOOL bInvaKeep;
+ BOOL bValidSize;
protected:
// --> OD 2005-07-29 #i49383#
bool mbFrmDeleted;
@@ -196,7 +196,7 @@ public:
~SwLayNotify();
void SetLowersComplete( BOOL b ) { bLowersComplete = b; }
- BOOL IsLowersComplete() { return bLowersComplete; }
+ BOOL IsLowersComplete() { return bLowersComplete; }
};
class SwFlyNotify : public SwLayNotify
@@ -251,32 +251,32 @@ public:
// the stuff that belongs to it.
class SwBorderAttrs : public SwCacheObj
{
- const SwAttrSet &rAttrSet;
+ const SwAttrSet &rAttrSet;
const SvxULSpaceItem &rUL;
// --> OD 2008-12-04 #i96772#
SvxLRSpaceItem rLR;
// <--
- const SvxBoxItem &rBox;
+ const SvxBoxItem &rBox;
const SvxShadowItem &rShadow;
- const Size aFrmSize; //Die FrmSize
+ const Size aFrmSize; //Die FrmSize
- BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie
+ BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie
//einen Abstand haben kann?
//Mit den Folgenden Bools werden die gecache'ten Werte fuer UNgueltig
//erklaert - bis sie einmal berechnet wurden.
- BOOL bTopLine :1;
- BOOL bBottomLine :1;
- BOOL bLeftLine :1;
- BOOL bRightLine :1;
- BOOL bTop :1;
- BOOL bBottom :1;
- BOOL bLine :1;
-
- BOOL bIsLine :1; //Umrandung an mind. einer Kante?
-
- BOOL bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen?
- BOOL bCachedGetTopLine :1; //GetTopLine() gecached?
+ BOOL bTopLine :1;
+ BOOL bBottomLine :1;
+ BOOL bLeftLine :1;
+ BOOL bRightLine :1;
+ BOOL bTop :1;
+ BOOL bBottom :1;
+ BOOL bLine :1;
+
+ BOOL bIsLine :1; //Umrandung an mind. einer Kante?
+
+ BOOL bCacheGetLine :1; //GetTopLine(), GetBottomLine() cachen?
+ BOOL bCachedGetTopLine :1; //GetTopLine() gecached?
BOOL bCachedGetBottomLine :1; //GetBottomLine() gecached?
// OD 21.05.2003 #108789# - booleans indicating, if values <bJoinedWithPrev>
// and <bJoinedWithNext> are cached and valid.
@@ -343,11 +343,11 @@ public:
SwBorderAttrs( const SwModify *pOwner, const SwFrm *pConstructor );
~SwBorderAttrs();
- inline const SwAttrSet &GetAttrSet() const { return rAttrSet; }
- inline const SvxULSpaceItem &GetULSpace() const { return rUL; }
- inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; }
- inline const SvxBoxItem &GetBox() const { return rBox; }
- inline const SvxShadowItem &GetShadow() const { return rShadow; }
+ inline const SwAttrSet &GetAttrSet() const { return rAttrSet; }
+ inline const SvxULSpaceItem &GetULSpace() const { return rUL; }
+ inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; }
+ inline const SvxBoxItem &GetBox() const { return rBox; }
+ inline const SvxShadowItem &GetShadow() const { return rShadow; }
inline USHORT CalcTopLine() const;
inline USHORT CalcBottomLine() const;
@@ -360,7 +360,7 @@ public:
inline BOOL IsLine() const;
- inline const Size &GetSize() const { return aFrmSize; }
+ inline const Size &GetSize() const { return aFrmSize; }
inline BOOL IsBorderDist() const { return bBorderDist; }
@@ -371,7 +371,7 @@ public:
inline USHORT GetTopLine ( const SwFrm& _rFrm,
const SwFrm* _pPrevFrm = 0L ) const;
inline USHORT GetBottomLine( const SwFrm& _rFrm ) const;
- inline void SetGetCacheLine( BOOL bNew ) const;
+ inline void SetGetCacheLine( BOOL bNew ) const;
// OD 21.05.2003 #108789# - accessors for cached values <bJoinedWithPrev>
// and <bJoinedWithPrev>
// OD 2004-02-26 #i25029# - add optional 2nd parameter <_pPrevFrm>
@@ -384,7 +384,7 @@ public:
class SwBorderAttrAccess : public SwCacheAccess
{
- const SwFrm *pConstructor; //opt: Zur weitergabe an SwBorderAttrs
+ const SwFrm *pConstructor; //opt: Zur weitergabe an SwBorderAttrs
protected:
virtual SwCacheObj *NewObj();
@@ -407,8 +407,8 @@ class SwOrderIter
public:
SwOrderIter( const SwPageFrm *pPage, BOOL bFlysOnly = TRUE );
- void Current( const SdrObject *pNew ) { pCurrent = pNew; }
- const SdrObject *Current() const { return pCurrent; }
+ void Current( const SdrObject *pNew ) { pCurrent = pNew; }
+ const SdrObject *Current() const { return pCurrent; }
const SdrObject *operator()() const { return pCurrent; }
const SdrObject *Top();
const SdrObject *Bottom();
@@ -433,8 +433,8 @@ public:
StackHack::bLocked = FALSE;
}
- static BOOL IsLocked() { return StackHack::bLocked; }
- static BYTE Count() { return StackHack::nCnt; }
+ static BOOL IsLocked() { return StackHack::bLocked; }
+ static BYTE Count() { return StackHack::nCnt; }
};
@@ -457,7 +457,7 @@ inline USHORT SwBorderAttrs::GetBottomLine( const SwFrm& _rFrm ) const
const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrm );
return nGetBottomLine;
}
-inline void SwBorderAttrs::SetGetCacheLine( BOOL bNew ) const
+inline void SwBorderAttrs::SetGetCacheLine( BOOL bNew ) const
{
((SwBorderAttrs*)this)->bCacheGetLine = bNew;
((SwBorderAttrs*)this)->bCachedGetBottomLine =
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 427673fdeb20..c732011dd109 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -2,7 +2,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
@@ -64,12 +64,12 @@ class SwFtnBossFrm: public SwLayoutFrm
SwTwips nMaxFtnHeight;
SwFtnContFrm *MakeFtnCont();
- SwFtnFrm *FindFirstFtn();
+ SwFtnFrm *FindFirstFtn();
BYTE _NeighbourhoodAdjustment( const SwFrm* pFrm ) const;
protected:
- void InsertFtn( SwFtnFrm * );
- static void ResetFtn( const SwFtnFrm *pAssumed );
+ void InsertFtn( SwFtnFrm * );
+ static void ResetFtn( const SwFtnFrm *pAssumed );
public:
inline SwFtnBossFrm( SwFrmFmt* pFmt) : SwLayoutFrm( pFmt ) {}
@@ -80,10 +80,10 @@ public:
//Fussnotenschnittstelle
void AppendFtn( SwCntntFrm *, SwTxtFtn * );
void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, BOOL bPrep = TRUE );
- static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * );
+ static SwFtnFrm *FindFtn( const SwCntntFrm *, const SwTxtFtn * );
SwFtnContFrm *FindFtnCont();
inline const SwFtnContFrm *FindFtnCont() const;
- const SwFtnFrm *FindFirstFtn( SwCntntFrm* ) const;
+ const SwFtnFrm *FindFirstFtn( SwCntntFrm* ) const;
SwFtnContFrm *FindNearestFtnCont( BOOL bDontLeave = FALSE );
void ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *,
@@ -93,7 +93,7 @@ public:
//SS damit der Textformatierer Temporaer die Fussnotenhoehe begrenzen
//kann. DeadLine in Dokumentkoordinaten.
- void SetFtnDeadLine( const SwTwips nDeadLine );
+ void SetFtnDeadLine( const SwTwips nDeadLine );
SwTwips GetMaxFtnHeight() const { return nMaxFtnHeight; }
//Liefert den Wert, der noch uebrig ist, bis der Body seine minimale
@@ -118,8 +118,8 @@ public:
SwFtnBossFrm* _pOld,
SvPtrarr& _rFtnArr,
const sal_Bool _bCollectOnlyPreviousFtns = sal_False );
- void _MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc = FALSE );
- void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
+ void _MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc = FALSE );
+ void MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
SwTxtFtn *pAttr );
// Sollte AdjustNeighbourhood gerufen werden (oder Grow/Shrink)?
BYTE NeighbourhoodAdjustment( const SwFrm* pFrm ) const
@@ -135,6 +135,6 @@ inline const SwFtnContFrm *SwFtnBossFrm::FindFtnCont() const
return ((SwFtnBossFrm*)this)->FindFtnCont();
}
-#endif //_FTNBOSS_HXX
+#endif //_FTNBOSS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index b1543e5c4383..b171dce38c4b 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -2,7 +2,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
@@ -62,10 +62,10 @@ class SwFtnFrm: public SwLayoutFrm
// 0 wenn kein Follow vorhanden,
// this beim letzten
// der Follow sonst.
- SwFtnFrm *pFollow;
- SwFtnFrm *pMaster; //Der FtnFrm dessen Follow ich bin.
- SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref.
- SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen)
+ SwFtnFrm *pFollow;
+ SwFtnFrm *pMaster; //Der FtnFrm dessen Follow ich bin.
+ SwCntntFrm *pRef; //In diesem CntntFrm steht die Fussnotenref.
+ SwTxtFtn *pAttr; //Fussnotenattribut (zum wiedererkennen)
BOOL bBackMoveLocked : 1; //Absaetze in dieser Fussnote duerfen derzeit
//nicht rueckwaerts fliessen.
@@ -93,20 +93,20 @@ public:
const SwCntntFrm *GetRef() const;
SwCntntFrm *GetRef();
#else
- const SwCntntFrm *GetRef() const { return pRef; }
- SwCntntFrm *GetRef() { return pRef; }
+ const SwCntntFrm *GetRef() const { return pRef; }
+ SwCntntFrm *GetRef() { return pRef; }
#endif
const SwCntntFrm *GetRefFromAttr() const;
SwCntntFrm *GetRefFromAttr();
- const SwFtnFrm *GetFollow() const { return pFollow; }
- SwFtnFrm *GetFollow() { return pFollow; }
+ const SwFtnFrm *GetFollow() const { return pFollow; }
+ SwFtnFrm *GetFollow() { return pFollow; }
- const SwFtnFrm *GetMaster() const { return pMaster; }
- SwFtnFrm *GetMaster() { return pMaster; }
+ const SwFtnFrm *GetMaster() const { return pMaster; }
+ SwFtnFrm *GetMaster() { return pMaster; }
- const SwTxtFtn *GetAttr() const { return pAttr; }
- SwTxtFtn *GetAttr() { return pAttr; }
+ const SwTxtFtn *GetAttr() const { return pAttr; }
+ SwTxtFtn *GetAttr() { return pAttr; }
void SetFollow( SwFtnFrm *pNew ) { pFollow = pNew; }
void SetMaster( SwFtnFrm *pNew ) { pMaster = pNew; }
@@ -114,13 +114,13 @@ public:
void InvalidateNxtFtnCnts( SwPageFrm* pPage );
- void LockBackMove() { bBackMoveLocked = TRUE; }
+ void LockBackMove() { bBackMoveLocked = TRUE; }
void UnlockBackMove() { bBackMoveLocked = FALSE;}
BOOL IsBackMoveLocked() { return bBackMoveLocked; }
// Verhindert, dass der letzte Inhalt den SwFtnFrm mitloescht (Cut())
- inline void ColLock() { bColLocked = TRUE; }
- inline void ColUnlock() { bColLocked = FALSE; }
+ inline void ColLock() { bColLocked = TRUE; }
+ inline void ColUnlock() { bColLocked = FALSE; }
// --> OD 2005-05-18 #i49383#
inline void UnlockPosOfLowerObjs()
@@ -148,6 +148,6 @@ public:
SwCntntFrm* FindLastCntnt();
};
-#endif //_FTNFRM_HXX
+#endif //_FTNFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 50b41717a3f9..2b1570a1a9e8 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -2,7 +2,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
@@ -42,9 +42,9 @@ protected:
public:
SwHeadFootFrm(SwFrmFmt * pFrm, USHORT aType);
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual SwTwips GrowFrm( SwTwips,
+ virtual SwTwips GrowFrm( SwTwips,
BOOL bTst = FALSE, BOOL bInfo = FALSE );
- virtual SwTwips ShrinkFrm( SwTwips,
+ virtual SwTwips ShrinkFrm( SwTwips,
BOOL bTst = FALSE, BOOL bInfo = FALSE );
};
@@ -64,6 +64,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm)
};
-#endif //_HFFRM_HXX
+#endif //_HFFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx
index fbf6099f8456..ecba5e554684 100644
--- a/sw/source/core/inc/ifinishedthreadlistener.hxx
+++ b/sw/source/core/inc/ifinishedthreadlistener.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx
index 8ba165774ee7..224844465189 100644
--- a/sw/source/core/inc/ithreadlistenerowner.hxx
+++ b/sw/source/core/inc/ithreadlistenerowner.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 2a0a01be4461..65247852f9f6 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ class SfxProgress;
class SwLayAction
{
SwRootFrm *pRoot;
- SwViewImp *pImp; //Hier Meldet sich die Action an und ab.
+ SwViewImp *pImp; //Hier Meldet sich die Action an und ab.
//Zur Optimierung, damit die Tabellen etwas besser am Crsr kleben beim
//Return/Backspace davor.
@@ -74,33 +74,33 @@ class SwLayAction
//hier ein. Die Steuerung der InternalAction kann dann geeignet reagieren.
USHORT nPreInvaPage;
- ULONG nStartTicks; //Startzeitpunkt der Aktion, vergeht zu viel Zeit kann
+ ULONG nStartTicks; //Startzeitpunkt der Aktion, vergeht zu viel Zeit kann
//der WaitCrsr per CheckWaitCrsr() eingeschaltet werden.
- USHORT nInputType; //Bei welchem Input soll die Verarbeitung abgebrochen
+ USHORT nInputType; //Bei welchem Input soll die Verarbeitung abgebrochen
//werden?
- USHORT nEndPage; //StatBar Steuerung.
+ USHORT nEndPage; //StatBar Steuerung.
USHORT nCheckPageNum; //CheckPageDesc() wurde verzoegert wenn != USHRT_MAX
//ab dieser Seite Checken.
- BOOL bPaint; //Painten oder nur Formatieren?
- BOOL bComplete; //Alles bis zum sichtbaren Bereich Formatieren oder
+ BOOL bPaint; //Painten oder nur Formatieren?
+ BOOL bComplete; //Alles bis zum sichtbaren Bereich Formatieren oder
//oder nur den sichtbaren Bereich?
- BOOL bCalcLayout; //Vollstaendige Reformatierung?
- BOOL bAgain; //Zur automatisch wiederholten Action wenn Seiten
+ BOOL bCalcLayout; //Vollstaendige Reformatierung?
+ BOOL bAgain; //Zur automatisch wiederholten Action wenn Seiten
//geloscht werden.
- BOOL bNextCycle; //Wiederaufsetzen bei der ersten Ungueltigen Seite.
- BOOL bInput; //Zum Abbrechen der Verarbeitung wenn ein Input anliegt.
- BOOL bIdle; //True wenn die Layaction vom Idler ausgeloest wurde.
- BOOL bReschedule; //Soll das Reschedule - abhaengig vom Progress -
+ BOOL bNextCycle; //Wiederaufsetzen bei der ersten Ungueltigen Seite.
+ BOOL bInput; //Zum Abbrechen der Verarbeitung wenn ein Input anliegt.
+ BOOL bIdle; //True wenn die Layaction vom Idler ausgeloest wurde.
+ BOOL bReschedule; //Soll das Reschedule - abhaengig vom Progress -
//gerufen werden?
BOOL bCheckPages; //CheckPageDescs() ausfuehren oder verzoegern.
BOOL bUpdateExpFlds;//Wird gesetzt wenn nach dem Formatierien noch eine
//Runde fuer den ExpFld laufen muss.
BOOL bBrowseActionStop; //Action fruehzeitig beenden (per bInput) und den
//Rest dem Idler ueberlassen.
- BOOL bWaitAllowed; //Wartecursor erlaubt?
- BOOL bPaintExtraData; //Anzeige von Zeilennumerierung o. ae. eingeschaltet?
+ BOOL bWaitAllowed; //Wartecursor erlaubt?
+ BOOL bPaintExtraData; //Anzeige von Zeilennumerierung o. ae. eingeschaltet?
BOOL bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht
// OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
@@ -140,52 +140,52 @@ public:
~SwLayAction();
#ifdef _LAYACT_CXX
- void SetIdle ( BOOL bNew ) { bIdle = bNew; }
- void SetCheckPages ( BOOL bNew ) { bCheckPages = bNew; }
- void SetBrowseActionStop(BOOL bNew ) { bBrowseActionStop = bNew; }
- void SetNextCycle ( BOOL bNew ) { bNextCycle = bNew; }
-
- BOOL IsWaitAllowed() const { return bWaitAllowed; }
- BOOL IsNextCycle() const { return bNextCycle; }
- BOOL IsInput() const { return bInput; }
- BOOL IsWait() const { return 0 != pWait; }
- BOOL IsPaint() const { return bPaint; }
- BOOL IsIdle() const { return bIdle; }
- BOOL IsReschedule() const { return bReschedule; }
- BOOL IsPaintExtraData() const { return bPaintExtraData;}
+ void SetIdle ( BOOL bNew ) { bIdle = bNew; }
+ void SetCheckPages ( BOOL bNew ) { bCheckPages = bNew; }
+ void SetBrowseActionStop(BOOL bNew ) { bBrowseActionStop = bNew; }
+ void SetNextCycle ( BOOL bNew ) { bNextCycle = bNew; }
+
+ BOOL IsWaitAllowed() const { return bWaitAllowed; }
+ BOOL IsNextCycle() const { return bNextCycle; }
+ BOOL IsInput() const { return bInput; }
+ BOOL IsWait() const { return 0 != pWait; }
+ BOOL IsPaint() const { return bPaint; }
+ BOOL IsIdle() const { return bIdle; }
+ BOOL IsReschedule() const { return bReschedule; }
+ BOOL IsPaintExtraData() const { return bPaintExtraData;}
BOOL IsStopPrt() const;
BOOL IsInterrupt() const { return IsInput() || IsStopPrt(); }
- USHORT GetInputType() const { return nInputType; }
+ USHORT GetInputType() const { return nInputType; }
#endif
//Einstellen der Action auf das gewuenschte Verhalten.
- void SetPaint ( BOOL bNew ) { bPaint = bNew; }
- void SetComplete ( BOOL bNew ) { bComplete = bNew; }
- void SetStatBar ( BOOL bNew );
- void SetInputType ( USHORT nNew ) { nInputType = nNew; }
- void SetCalcLayout ( BOOL bNew ) { bCalcLayout = bNew; }
- void SetReschedule ( BOOL bNew ) { bReschedule = bNew; }
- void SetWaitAllowed ( BOOL bNew ) { bWaitAllowed = bNew; }
-
- void SetAgain() { bAgain = TRUE; }
- void SetUpdateExpFlds() {bUpdateExpFlds = TRUE; }
+ void SetPaint ( BOOL bNew ) { bPaint = bNew; }
+ void SetComplete ( BOOL bNew ) { bComplete = bNew; }
+ void SetStatBar ( BOOL bNew );
+ void SetInputType ( USHORT nNew ) { nInputType = nNew; }
+ void SetCalcLayout ( BOOL bNew ) { bCalcLayout = bNew; }
+ void SetReschedule ( BOOL bNew ) { bReschedule = bNew; }
+ void SetWaitAllowed ( BOOL bNew ) { bWaitAllowed = bNew; }
+
+ void SetAgain() { bAgain = TRUE; }
+ void SetUpdateExpFlds() {bUpdateExpFlds = TRUE; }
void SetProgress(SfxProgress * _pProgress = NULL)
{ pProgress = _pProgress; }
inline void SetCheckPageNum( USHORT nNew );
inline void SetCheckPageNumDirect( USHORT nNew ) { nCheckPageNum = nNew; }
- void Action(); //Jetzt gehts loos...
- void Reset(); //Zurueck auf CTor-Defaults.
+ void Action(); //Jetzt gehts loos...
+ void Reset(); //Zurueck auf CTor-Defaults.
- BOOL IsAgain() const { return bAgain; }
- BOOL IsComplete() const { return bComplete; }
- BOOL IsExpFlds() const { return bUpdateExpFlds; }
+ BOOL IsAgain() const { return bAgain; }
+ BOOL IsComplete() const { return bComplete; }
+ BOOL IsExpFlds() const { return bUpdateExpFlds; }
BOOL IsCalcLayout() const { return bCalcLayout; }
BOOL IsCheckPages() const { return bCheckPages; }
- BOOL IsBrowseActionStop() const { return bBrowseActionStop; }
- BOOL IsActionInProgress() const { return bActionInProgress; }
+ BOOL IsBrowseActionStop() const { return bBrowseActionStop; }
+ BOOL IsActionInProgress() const { return bActionInProgress; }
USHORT GetCheckPageNum() const { return nCheckPageNum; }
@@ -204,11 +204,11 @@ class SwLayIdle
{
SwRootFrm *pRoot;
- SwViewImp *pImp; // Hier Meldet sich der Idler an und ab.
- SwCntntNode *pCntntNode; // Hier wird die aktuelle Cursorposition
- xub_StrLen nTxtPos; // zwischengespeichert.
- BOOL bPageValid; // Konnte die Seite alles validiert werden?
- BOOL bAllValid; // Konnte alles validiert werden?
+ SwViewImp *pImp; // Hier Meldet sich der Idler an und ab.
+ SwCntntNode *pCntntNode; // Hier wird die aktuelle Cursorposition
+ xub_StrLen nTxtPos; // zwischengespeichert.
+ BOOL bPageValid; // Konnte die Seite alles validiert werden?
+ BOOL bAllValid; // Konnte alles validiert werden?
#if OSL_DEBUG_LEVEL > 1
BOOL bIndicator;
@@ -237,6 +237,6 @@ inline void SwLayAction::SetCheckPageNum( USHORT nNew )
nCheckPageNum = nNew;
}
-#endif //_LAYACT_HXX
+#endif //_LAYACT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index 71a2ec530196..894550be3e29 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index a832464c1f8d..f4684e56f06d 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@ protected:
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void MakeAll();
- SwFrm *pLower;
+ SwFrm *pLower;
virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
@@ -106,7 +106,7 @@ public:
SwLayoutFrm( SwFrmFmt* );
~SwLayoutFrm();
- virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
+ virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
const SwFrm *Lower() const { return pLower; }
SwFrm *Lower() { return pLower; }
const SwCntntFrm *ContainsCntnt() const;
@@ -125,8 +125,8 @@ public:
BOOL IsAnLower( const SwFrm * ) const;
const SwFrmFmt *GetFmt() const { return (const SwFrmFmt*)GetDep(); }
- SwFrmFmt *GetFmt() { return (SwFrmFmt*)GetDep(); }
- void SetFrmFmt( SwFrmFmt* );
+ SwFrmFmt *GetFmt() { return (SwFrmFmt*)GetDep(); }
+ void SetFrmFmt( SwFrmFmt* );
//Verschieben der Ftns aller Lower - ab dem StartCntnt.
//TRUE wenn mindestens eine Ftn verschoben wurde.
@@ -207,6 +207,6 @@ inline SwFrm* SwLayoutFrm::GetLastLower()
return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->GetLastLower());
}
-#endif //_LAYFRM_HXX
+#endif //_LAYFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 3c4da1a97046..8e19f9a128bc 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index 6e4f55e228b7..83a594a748ca 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index ec9b4dcebbb5..da9a4389d56b 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -2,7 +2,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
@@ -133,15 +133,15 @@ class SwDataChanged
SwDoc* pDoc;
ULONG nNode;
xub_StrLen nCntnt;
- USHORT nType; // Insert/Move/Delete/... (UndoIds)
+ USHORT nType; // Insert/Move/Delete/... (UndoIds)
public:
SwDataChanged( const SwPaM& rPam, USHORT nType );
SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, USHORT nType );
~SwDataChanged();
- ULONG GetNode() const { return nNode; }
- xub_StrLen GetCntnt() const { return nCntnt; }
+ ULONG GetNode() const { return nNode; }
+ xub_StrLen GetCntnt() const { return nCntnt; }
};
@@ -196,8 +196,8 @@ public:
int operator<( const _ZSortFly& rCmp ) const
{ return nOrdNum < rCmp.nOrdNum; }
- const SwFrmFmt* GetFmt() const { return pFmt; }
- const SwFmtAnchor* GetAnchor() const { return pAnchor; }
+ const SwFrmFmt* GetFmt() const { return pFmt; }
+ const SwFmtAnchor* GetAnchor() const { return pAnchor; }
};
SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0, 10 )
@@ -226,6 +226,6 @@ public:
};
-#endif // _MVSAVE_HXX
+#endif // _MVSAVE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 4b02278e5a40..c74e8b632502 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -2,7 +2,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
@@ -46,10 +46,10 @@
* je nach Aufgabenstellung.
* Die Aufgabenstellung wird durch die Wahl des Ctors bestimmt.
* 1. Das Einsammeln der UpperFrms, damit spaeter RestoreUpperFrms wird,
- * wird von MakeFrms gerufen, wenn es keinen PrevNext gibt, vor/hinter den
- * die Frames gehaengt werden koennen.
+ * wird von MakeFrms gerufen, wenn es keinen PrevNext gibt, vor/hinter den
+ * die Frames gehaengt werden koennen.
* 2. Die Lieferung der Frames hinter/vor die die neuen Frames eines Nodes
- * gehaengt werden muessen, ebenfalls von MakeFrms gerufen.
+ * gehaengt werden muessen, ebenfalls von MakeFrms gerufen.
* --------------------------------------------------*/
class SwNode2LayImpl;
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 66e5ac515a3e..f07009e2ef18 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -2,7 +2,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
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _NOTEURL_HXX
-#define _NOTEURL_HXX
+#ifndef _NOTEURL_HXX
+#define _NOTEURL_HXX
#include <svl/svarray.hxx>
@@ -46,9 +46,9 @@ public:
SwURLNote( const String& rURL, const String& rTarget, const SwRect& rRect )
: aURL( rURL ), aTarget( rTarget ), aRect( rRect )
{}
- const String& GetURL() const { return aURL; }
- const String& GetTarget() const { return aTarget; }
- const SwRect& GetRect() const { return aRect; }
+ const String& GetURL() const { return aURL; }
+ const String& GetTarget() const { return aTarget; }
+ const SwRect& GetRect() const { return aRect; }
BOOL operator==( const SwURLNote& rSwURLNote ) const
{ return aRect == rSwURLNote.aRect; }
};
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 4353b90a52f8..394149a5d85f 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ class SwNoTxtFrm: public SwCntntFrm
{
friend void _FrmFinit();
- short nWeight; // "Wichtigkeit" der Grafik
+ short nWeight; // "Wichtigkeit" der Grafik
const Size& GetSize() const;
@@ -63,7 +63,7 @@ public:
BOOL GetCrsrOfst(SwPosition* pPos, Point& aPoint,
SwCrsrMoveState* = 0) const;
- const Size &GetGrfSize() const { return GetSize(); }
+ const Size &GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
BOOL IsTransparent() const;
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 551d01f6d10f..6fccce3ef11b 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index e51a06e76420..b2c11c8b2da6 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 28ec5b7e5bdf..61a4bcdd2d8e 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -67,17 +67,17 @@ class SwPageFrm: public SwFtnBossFrm
// OD 2004-05-07 #i28701# - use <SwSortedObjs>
SwSortedObjs *pSortedObjs;
- SwPageDesc *pDesc; //PageDesc der die Seite beschreibt.
+ SwPageDesc *pDesc; //PageDesc der die Seite beschreibt.
- USHORT nPhyPageNum; //Physikalische Seitennummer.
+ USHORT nPhyPageNum; //Physikalische Seitennummer.
- BOOL bInvalidCntnt :1;
- BOOL bInvalidLayout :1;
- BOOL bInvalidFlyCntnt :1;
- BOOL bInvalidFlyLayout :1;
- BOOL bInvalidFlyInCnt :1;
- BOOL bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
- BOOL bEmptyPage :1; //Dies ist eine explizite Leerseite
+ BOOL bInvalidCntnt :1;
+ BOOL bInvalidLayout :1;
+ BOOL bInvalidFlyCntnt :1;
+ BOOL bInvalidFlyLayout :1;
+ BOOL bInvalidFlyInCnt :1;
+ BOOL bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
+ BOOL bEmptyPage :1; //Dies ist eine explizite Leerseite
BOOL bEndNotePage :1; //'Fussnotenseite' fuer Endnoten
BOOL bInvalidSpelling :1; //Das Online-Spelling ist gefordert
BOOL bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS
@@ -201,7 +201,7 @@ public:
//public, damit die ViewShell beim Umschalten vom BrowseMode darauf
//zugreifen kann.
- void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen.
+ void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen.
void PrepareFooter();
const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; }
@@ -222,7 +222,7 @@ public:
SwPageDesc *FindPageDesc();
SwCntntFrm *FindLastBodyCntnt();
- inline SwCntntFrm *FindFirstBodyCntnt();
+ inline SwCntntFrm *FindFirstBodyCntnt();
inline const SwCntntFrm *FindFirstBodyCntnt() const;
inline const SwCntntFrm *FindLastBodyCntnt() const;
@@ -231,7 +231,7 @@ public:
BOOL IsEmptyPage() const { return bEmptyPage; } //explizite Leerseite.
- void UpdateFtnNum();
+ void UpdateFtnNum();
//Immer nach dem Paste rufen. Erzeugt die Seitengeb. Rahmen und Formatiert
//generischen Inhalt.
@@ -270,33 +270,33 @@ public:
void RefreshSubsidiary( const SwRect& ) const;
//Fussnotenschnittstelle
- BOOL IsFtnPage() const { return bFtnPage; }
- BOOL IsEndNotePage() const { return bEndNotePage; }
- void SetFtnPage( BOOL b ) { bFtnPage = b; }
- void SetEndNotePage( BOOL b ) { bEndNotePage = b; }
+ BOOL IsFtnPage() const { return bFtnPage; }
+ BOOL IsEndNotePage() const { return bEndNotePage; }
+ void SetFtnPage( BOOL b ) { bFtnPage = b; }
+ void SetEndNotePage( BOOL b ) { bEndNotePage = b; }
- inline USHORT GetPhyPageNum() const { return nPhyPageNum;}
- inline void SetPhyPageNum( USHORT nNum ) { nPhyPageNum = nNum;}
- inline void DecrPhyPageNum() { --nPhyPageNum; }
- inline void IncrPhyPageNum() { ++nPhyPageNum; }
+ inline USHORT GetPhyPageNum() const { return nPhyPageNum;}
+ inline void SetPhyPageNum( USHORT nNum ) { nPhyPageNum = nNum;}
+ inline void DecrPhyPageNum() { --nPhyPageNum; }
+ inline void IncrPhyPageNum() { ++nPhyPageNum; }
//Validieren, invalidieren und abfragen des Status der Seite.
//Layout/Cntnt und jeweils Fly/nicht Fly werden getrennt betrachtet.
inline void InvalidateFlyLayout() const;
inline void InvalidateFlyCntnt() const;
inline void InvalidateFlyInCnt() const;
- inline void InvalidateLayout() const;
- inline void InvalidateCntnt() const;
- inline void InvalidateSpelling() const;
+ inline void InvalidateLayout() const;
+ inline void InvalidateCntnt() const;
+ inline void InvalidateSpelling() const;
inline void InvalidateSmartTags() const;
- inline void InvalidateAutoCompleteWords() const;
+ inline void InvalidateAutoCompleteWords() const;
inline void InvalidateWordCount() const;
inline void ValidateFlyLayout() const;
inline void ValidateFlyCntnt() const;
inline void ValidateFlyInCnt() const;
- inline void ValidateLayout() const;
- inline void ValidateCntnt() const;
- inline void ValidateSpelling() const;
+ inline void ValidateLayout() const;
+ inline void ValidateCntnt() const;
+ inline void ValidateSpelling() const;
inline void ValidateSmartTags() const; // SMARTTAGS
inline void ValidateAutoCompleteWords() const;
inline void ValidateWordCount() const;
@@ -446,11 +446,11 @@ inline const SwCntntFrm *SwPageFrm::FindLastBodyCntnt() const
{
return ((SwPageFrm*)this)->FindLastBodyCntnt();
}
-inline void SwPageFrm::InvalidateFlyLayout() const
+inline void SwPageFrm::InvalidateFlyLayout() const
{
((SwPageFrm*)this)->bInvalidFlyLayout = TRUE;
}
-inline void SwPageFrm::InvalidateFlyCntnt() const
+inline void SwPageFrm::InvalidateFlyCntnt() const
{
((SwPageFrm*)this)->bInvalidFlyCntnt = TRUE;
}
@@ -458,15 +458,15 @@ inline void SwPageFrm::InvalidateFlyInCnt() const
{
((SwPageFrm*)this)->bInvalidFlyInCnt = TRUE;
}
-inline void SwPageFrm::InvalidateLayout() const
+inline void SwPageFrm::InvalidateLayout() const
{
((SwPageFrm*)this)->bInvalidLayout = TRUE;
}
-inline void SwPageFrm::InvalidateCntnt() const
+inline void SwPageFrm::InvalidateCntnt() const
{
((SwPageFrm*)this)->bInvalidCntnt = TRUE;
}
-inline void SwPageFrm::InvalidateSpelling() const
+inline void SwPageFrm::InvalidateSpelling() const
{
((SwPageFrm*)this)->bInvalidSpelling = TRUE;
}
@@ -475,7 +475,7 @@ inline void SwPageFrm::InvalidateSmartTags() const
{
((SwPageFrm*)this)->bInvalidSmartTags = TRUE;
}
-inline void SwPageFrm::InvalidateAutoCompleteWords() const
+inline void SwPageFrm::InvalidateAutoCompleteWords() const
{
((SwPageFrm*)this)->bInvalidAutoCmplWrds = TRUE;
}
@@ -483,11 +483,11 @@ inline void SwPageFrm::InvalidateWordCount() const
{
((SwPageFrm*)this)->bInvalidWordCount = TRUE;
}
-inline void SwPageFrm::ValidateFlyLayout() const
+inline void SwPageFrm::ValidateFlyLayout() const
{
((SwPageFrm*)this)->bInvalidFlyLayout = FALSE;
}
-inline void SwPageFrm::ValidateFlyCntnt() const
+inline void SwPageFrm::ValidateFlyCntnt() const
{
((SwPageFrm*)this)->bInvalidFlyCntnt = FALSE;
}
@@ -495,15 +495,15 @@ inline void SwPageFrm::ValidateFlyInCnt() const
{
((SwPageFrm*)this)->bInvalidFlyInCnt = FALSE;
}
-inline void SwPageFrm::ValidateLayout() const
+inline void SwPageFrm::ValidateLayout() const
{
((SwPageFrm*)this)->bInvalidLayout = FALSE;
}
-inline void SwPageFrm::ValidateCntnt() const
+inline void SwPageFrm::ValidateCntnt() const
{
((SwPageFrm*)this)->bInvalidCntnt = FALSE;
}
-inline void SwPageFrm::ValidateSpelling() const
+inline void SwPageFrm::ValidateSpelling() const
{
((SwPageFrm*)this)->bInvalidSpelling = FALSE;
}
@@ -540,6 +540,6 @@ inline BOOL SwPageFrm::IsInvalidFly() const
-#endif //_PAGEFRM_HXX
+#endif //_PAGEFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 9b4367feb4b0..96118218c8ef 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -2,7 +2,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
@@ -85,11 +85,11 @@ typedef void (SwNodes:: *MvSection)( SwNodeIndex * ) const;
struct SwMoveFnCollection
{
- GoNd fnNd;
- GoNds fnNds;
- GoDoc fnDoc;
+ GoNd fnNd;
+ GoNds fnNds;
+ GoDoc fnDoc;
GoSection fnSections;
- CmpOp fnCmpOp;
+ CmpOp fnCmpOp;
GetHint fnGetHint;
SearchTxt fnSearch;
MvSection fnSection;
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 9ef7c2017822..84768311ad91 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 652e14633061..96eec31b72a8 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index 29e0fb532bca..eeaae8558a36 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 8bcd72022345..5c2171c1f1b7 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 266d669e91cf..2d85886f09fc 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -2,7 +2,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
@@ -45,17 +45,17 @@ class SwSelectionList;
struct SwPosition;
struct SwCrsrMoveState;
-#define HACK_TABLEMODE_INIT 0
-#define HACK_TABLEMODE_LOCKLINES 1
-#define HACK_TABLEMODE_PAINTLINES 2
-#define HACK_TABLEMODE_UNLOCKLINES 3
-#define HACK_TABLEMODE_EXIT 4
-
-#define INV_SIZE 1
-#define INV_PRTAREA 2
-#define INV_POS 4
-#define INV_TABLE 8
-#define INV_SECTION 16
+#define HACK_TABLEMODE_INIT 0
+#define HACK_TABLEMODE_LOCKLINES 1
+#define HACK_TABLEMODE_PAINTLINES 2
+#define HACK_TABLEMODE_UNLOCKLINES 3
+#define HACK_TABLEMODE_EXIT 4
+
+#define INV_SIZE 1
+#define INV_PRTAREA 2
+#define INV_POS 4
+#define INV_TABLE 8
+#define INV_SECTION 16
#define INV_LINENUM 32
#define INV_DIRECTION 64
@@ -70,8 +70,8 @@ class SwRootFrm: public SwLayoutFrm
friend inline void SetLastPage( SwPageFrm* );
// Fuer das Anlegen und Zerstoeren des virtuellen Outputdevice-Managers
- friend void _FrmInit(); //erzeugt pVout
- friend void _FrmFinit(); //loescht pVout
+ friend void _FrmInit(); //erzeugt pVout
+ friend void _FrmFinit(); //loescht pVout
// PAGES01
std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame
@@ -86,20 +86,20 @@ class SwRootFrm: public SwLayoutFrm
bool mbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!)
- static SwLayVout *pVout;
- static BOOL bInPaint; //Schutz gegen doppelte Paints.
- static BOOL bNoVirDev; //Bei SystemPaints kein virt. Device
-
- BOOL bCheckSuperfluous :1; //Leere Seiten suchen?
- BOOL bIdleFormat :1; //Idle-Formatierer anwerfen?
- BOOL bBrowseWidthValid :1; //Ist nBrowseWidth gueltig?
- BOOL bDummy2 :1; //Unbenutzt
- BOOL bTurboAllowed :1;
- BOOL bAssertFlyPages :1; //Ggf. weitere Seiten fuer Flys einfuegen?
- BOOL bDummy :1; //Unbenutzt
- BOOL bIsVirtPageNum :1; //gibt es eine virtuelle Seitennummer ?
- BOOL bIsNewLayout :1; //Layout geladen oder neu erzeugt.
- BOOL bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht
+ static SwLayVout *pVout;
+ static BOOL bInPaint; //Schutz gegen doppelte Paints.
+ static BOOL bNoVirDev; //Bei SystemPaints kein virt. Device
+
+ BOOL bCheckSuperfluous :1; //Leere Seiten suchen?
+ BOOL bIdleFormat :1; //Idle-Formatierer anwerfen?
+ BOOL bBrowseWidthValid :1; //Ist nBrowseWidth gueltig?
+ BOOL bDummy2 :1; //Unbenutzt
+ BOOL bTurboAllowed :1;
+ BOOL bAssertFlyPages :1; //Ggf. weitere Seiten fuer Flys einfuegen?
+ BOOL bDummy :1; //Unbenutzt
+ BOOL bIsVirtPageNum :1; //gibt es eine virtuelle Seitennummer ?
+ BOOL bIsNewLayout :1; //Layout geladen oder neu erzeugt.
+ BOOL bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht
//siehe dcontact.cxx, ::Changed()
//Fuer den BrowseMode. nBrowseWidth ist die Aeussere Kante des am weitesten
@@ -148,7 +148,7 @@ class SwRootFrm: public SwLayoutFrm
SwDestroyList* pDestroy;
- USHORT nPhyPageNums; //Anzahl der Seiten.
+ USHORT nPhyPageNums; //Anzahl der Seiten.
sal_uInt16 nAccessibleShells; // Number of accessible shells
void ImplCalcBrowseWidth();
@@ -192,8 +192,8 @@ public:
void UnoRestoreAllActions();
const SdrPage* GetDrawPage() const { return pDrawPage; }
- SdrPage* GetDrawPage() { return pDrawPage; }
- void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; }
+ SdrPage* GetDrawPage() { return pDrawPage; }
+ void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; }
virtual BOOL GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0 ) const;
@@ -242,20 +242,20 @@ public:
void InvalidateAllObjPos();
//Ueberfluessige Seiten entfernen.
- void SetSuperfluous() { bCheckSuperfluous = TRUE; }
+ void SetSuperfluous() { bCheckSuperfluous = TRUE; }
BOOL IsSuperfluous() const { return bCheckSuperfluous; }
void RemoveSuperfluous();
//abfragen/setzen der aktuellen Seite und der Gesamtzahl der Seiten.
//Es wird soweit wie notwendig Formatiert.
- USHORT GetCurrPage( const SwPaM* ) const;
- USHORT SetCurrPage( SwCursor*, USHORT nPageNum );
- Point GetPagePos( USHORT nPageNum ) const;
- USHORT GetPageNum() const { return nPhyPageNums; }
- void DecrPhyPageNums() { --nPhyPageNums; }
- void IncrPhyPageNums() { ++nPhyPageNums; }
- BOOL IsVirtPageNum() const { return bIsVirtPageNum; }
- inline void SetVirtPageNum( const BOOL bOf ) const;
+ USHORT GetCurrPage( const SwPaM* ) const;
+ USHORT SetCurrPage( SwCursor*, USHORT nPageNum );
+ Point GetPagePos( USHORT nPageNum ) const;
+ USHORT GetPageNum() const { return nPhyPageNums; }
+ void DecrPhyPageNums() { --nPhyPageNums; }
+ void IncrPhyPageNums() { ++nPhyPageNums; }
+ BOOL IsVirtPageNum() const { return bIsVirtPageNum; }
+ inline void SetVirtPageNum( const BOOL bOf ) const;
BOOL IsDummyPage( USHORT nPageNum ) const;
// Point rPt: The point that should be used to find the page
@@ -281,7 +281,7 @@ public:
const SwCntntFrm *GetTurbo() { return pTurbo; }
//Fussnotennummern aller Seiten auf den neuesten Stand bringen.
- void UpdateFtnNums(); //nur bei Seitenweiser Nummerierung!
+ void UpdateFtnNums(); //nur bei Seitenweiser Nummerierung!
//Alle Fussnoten (nicht etwa die Referenzen) entfernen.
void RemoveFtns( SwPageFrm *pPage = 0, BOOL bPageOnly = FALSE,
@@ -289,7 +289,7 @@ public:
void CheckFtnPageDescs( BOOL bEndNote );
const SwPageFrm *GetLastPage() const { return pLastPage; }
- SwPageFrm *GetLastPage() { return pLastPage; }
+ SwPageFrm *GetLastPage() { return pLastPage; }
static BOOL IsInPaint() { return bInPaint; }
@@ -304,7 +304,7 @@ public:
#endif
BOOL IsNewLayout() const { return bIsNewLayout; }
- void ResetNewLayout() { bIsNewLayout = FALSE;}
+ void ResetNewLayout() { bIsNewLayout = FALSE;}
// Hier werden leere SwSectionFrms zur Zerstoerung angemeldet
// und spaeter zerstoert oder wieder abgemeldet
@@ -318,7 +318,7 @@ public:
void SetCallbackActionEnabled( BOOL b ) { bCallbackActionEnabled = b; }
- BOOL IsCallbackActionEnabled() const { return bCallbackActionEnabled; }
+ BOOL IsCallbackActionEnabled() const { return bCallbackActionEnabled; }
sal_Bool IsAnyShellAccessible() const { return nAccessibleShells > 0; }
void AddAccessibleShell() { ++nAccessibleShells; }
@@ -361,11 +361,11 @@ inline void SwRootFrm::InvalidateBrowseWidth()
ImplInvalidateBrowseWidth();
}
-inline void SwRootFrm::SetVirtPageNum( const BOOL bOf) const
+inline void SwRootFrm::SetVirtPageNum( const BOOL bOf) const
{
((SwRootFrm*)this)->bIsVirtPageNum = bOf;
}
-#endif //_ROOTFRM_HXX
+#endif //_ROOTFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 659e3ee6c28d..fbf39a2d99ef 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ public:
~SwRowFrm();
virtual void Cut();
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
//Zum Anmelden der Flys nachdem eine Zeile erzeugt _und_ eingefuegt wurde.
//Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 71eea577f4e3..5b46b8d078fe 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -2,7 +2,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
@@ -49,7 +49,7 @@ typedef std::list< xub_StrLen > PositionList;
#define SPACING_PRECISION_FACTOR 100
/*************************************************************************
- * class SwScanner
+ * class SwScanner
* Hilfsklasse, die beim Spellen die Worte im gewuenschten Bereich
* nacheinander zur Verfuegung stellt.
*************************************************************************/
@@ -91,7 +91,7 @@ public:
};
/*************************************************************************
- * class SwScriptInfo
+ * class SwScriptInfo
*
* encapsultes information about script changes
*************************************************************************/
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 7cf0b8b43659..16e16c05c558 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ protected:
virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat );
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
public:
- SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt!
+ SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt!
SwSectionFrm( SwSectionFrm &, BOOL bMaster );//_Nur_ zum Erzeugen von Master/Follows
~SwSectionFrm();
@@ -70,18 +70,18 @@ public:
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
inline const SwSectionFrm *GetFollow() const;
- inline SwSectionFrm *GetFollow();
+ inline SwSectionFrm *GetFollow();
SwSectionFrm* FindMaster() const;
SwCntntFrm *FindLastCntnt( BYTE nMode = 0 );
inline const SwCntntFrm *FindLastCntnt( BYTE nMode = 0 ) const;
inline SwSection* GetSection() { return pSection; }
inline const SwSection* GetSection() const { return pSection; }
- inline void ColLock() { bColLocked = TRUE; }
- inline void ColUnlock() { bColLocked = FALSE; }
+ inline void ColLock() { bColLocked = TRUE; }
+ inline void ColUnlock() { bColLocked = FALSE; }
void CalcFtnCntnt();
void SimpleFormat();
@@ -91,8 +91,8 @@ public:
//Zerlegt den pFrm umgebenden SectionFrm in zwei Teile,
//pFrm an den Anfang des 2. Teils
BOOL SplitSect( SwFrm* pFrm, BOOL bApres );
- void DelEmpty( BOOL bRemove ); // wie Cut(), Follow-Verkettung wird aber mitgepflegt
- BOOL IsToIgnore() const // Keine Groesse, kein Inhalt, muss ignoriert werden
+ void DelEmpty( BOOL bRemove ); // wie Cut(), Follow-Verkettung wird aber mitgepflegt
+ BOOL IsToIgnore() const // Keine Groesse, kein Inhalt, muss ignoriert werden
{ return !Frm().Height() && !ContainsCntnt(); }
SwFtnContFrm* ContainsFtnCont( const SwFtnContFrm* pCont = NULL ) const;
BOOL Growable() const;
@@ -104,7 +104,7 @@ public:
// if bCheckFollow is set.
BOOL ToMaximize( BOOL bCheckFollow ) const;
inline BOOL _ToMaximize() const
- { if( !pSection ) return FALSE; return ToMaximize( FALSE ); }
+ { if( !pSection ) return FALSE; return ToMaximize( FALSE ); }
BOOL MoveAllowed( const SwFrm* ) const;
BOOL CalcMinDiff( SwTwips& rMinDiff ) const;
// Uebergibt man kein bOverSize bzw. FALSE, so ist der Returnwert
@@ -146,6 +146,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( BYTE nMode ) const
}
-#endif //_SECTFRM_HXX
+#endif //_SECTFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx
index c3b6cdf7fea7..6e4b4ed675ee 100644
--- a/sw/source/core/inc/setmapvirtdev.hxx
+++ b/sw/source/core/inc/setmapvirtdev.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx
index 7afd6ecb5619..e4fe2713c96a 100644
--- a/sw/source/core/inc/sortedobjs.hxx
+++ b/sw/source/core/inc/sortedobjs.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/sortedobjsimpl.hxx b/sw/source/core/inc/sortedobjsimpl.hxx
index 1b23cd194ac9..e46f2266eba4 100644
--- a/sw/source/core/inc/sortedobjsimpl.hxx
+++ b/sw/source/core/inc/sortedobjsimpl.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 4d70cfc75e45..bdc1ccd7af7d 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -2,7 +2,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
@@ -45,15 +45,15 @@ class SwBlockName
{
friend class SwImpBlocks;
friend class Sw2TextBlocks;
- USHORT nHashS, nHashL; // Hash-Codes zum Checken
- long nPos; // Dateiposition (SW2-Format)
+ USHORT nHashS, nHashL; // Hash-Codes zum Checken
+ long nPos; // Dateiposition (SW2-Format)
public:
- String aShort; // Short name
- String aLong; // Long name
- String aPackageName; // Package name
- BOOL bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig?
- BOOL bIsOnlyTxt : 1; // unformatted text
- BOOL bInPutMuchBlocks : 1; // put serveral block entries
+ String aShort; // Short name
+ String aLong; // Long name
+ String aPackageName; // Package name
+ BOOL bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig?
+ BOOL bIsOnlyTxt : 1; // unformatted text
+ BOOL bInPutMuchBlocks : 1; // put serveral block entries
SwBlockName( const String& rShort, const String& rLong, long n );
SwBlockName( const String& rShort, const String& rLong, const String& rPackageName );
@@ -70,48 +70,48 @@ class SwImpBlocks
{
friend class SwTextBlocks;
protected:
- String aFile; // physikalischer Dateiname
- String aName; // logischer Name der Datei
- String aCur; // aktueller Text
- String aShort, aLong; // Kurz- und Langname (PutDoc)
+ String aFile; // physikalischer Dateiname
+ String aName; // logischer Name der Datei
+ String aCur; // aktueller Text
+ String aShort, aLong; // Kurz- und Langname (PutDoc)
String sBaseURL; // base URL - has to be set at the Readers and Writers
- SwBlockNames aNames; // Liste aller Bausteine
- Date aDateModified; // fuers abgleichen bei den Aktionen
+ SwBlockNames aNames; // Liste aller Bausteine
+ Date aDateModified; // fuers abgleichen bei den Aktionen
Time aTimeModified;
- SwDoc* pDoc; // Austauschdokument
- USHORT nCur; // aktueller Index
+ SwDoc* pDoc; // Austauschdokument
+ USHORT nCur; // aktueller Index
BOOL bReadOnly : 1;
- BOOL bInPutMuchBlocks : 1; // put serveral block entries
- BOOL bInfoChanged : 1; // any Info of TextBlock is changed
+ BOOL bInPutMuchBlocks : 1; // put serveral block entries
+ BOOL bInfoChanged : 1; // any Info of TextBlock is changed
SwImpBlocks( const String&, BOOL = FALSE );
virtual ~SwImpBlocks();
static short GetFileType( const String& );
virtual short GetFileType() const = 0;
-#define SWBLK_NO_FILE 0 // nicht da
-#define SWBLK_NONE 1 // keine TB-Datei
-#define SWBLK_SW2 2 // SW2-Datei
-#define SWBLK_SW3 3 // SW3-Datei
-#define SWBLK_XML 4 // XML Block List
-
- virtual void ClearDoc(); // Doc-Inhalt loeschen
- SwPaM* MakePaM(); // PaM ueber Doc aufspannen
+#define SWBLK_NO_FILE 0 // nicht da
+#define SWBLK_NONE 1 // keine TB-Datei
+#define SWBLK_SW2 2 // SW2-Datei
+#define SWBLK_SW3 3 // SW3-Datei
+#define SWBLK_XML 4 // XML Block List
+
+ virtual void ClearDoc(); // Doc-Inhalt loeschen
+ SwPaM* MakePaM(); // PaM ueber Doc aufspannen
virtual void AddName( const String&, const String&, BOOL bOnlyTxt = FALSE );
BOOL IsFileChanged() const;
void Touch();
public:
- static USHORT Hash( const String& ); // Hashcode fuer Blocknamen
- USHORT GetCount() const; // Anzahl Textbausteine ermitteln
- USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln
- USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln
- const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck
- const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck
- const String& GetPackageName( USHORT ) const; // Langname fuer Index zurueck
-
- const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern
- void SetName( const String& rName ) // logic name
+ static USHORT Hash( const String& ); // Hashcode fuer Blocknamen
+ USHORT GetCount() const; // Anzahl Textbausteine ermitteln
+ USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln
+ USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln
+ const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck
+ const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck
+ const String& GetPackageName( USHORT ) const; // Langname fuer Index zurueck
+
+ const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern
+ void SetName( const String& rName ) // logic name
{ aName = rName; bInfoChanged = TRUE; }
const String & GetName( void )
{ return aName; }
@@ -162,17 +162,17 @@ class SwSwgReader;
class Sw2TextBlocks : public SwImpBlocks
{
- SvPersistRef refPersist; // Fuer OLE-Objekte
- SwSwgReader* pRdr; // Lese-Routinen
- SfxMedium* pMed; // der logische Input-Stream
- String* pText; // String fuer GetText()
- long nDocStart; // Beginn des Doc-Records
- long nDocSize; // Laenge des Doc-Records
- long nStart; // Beginn des CONTENTS-Records
- long nSize; // Laenge des CONTENTS-Records
- USHORT nNamedFmts; // benannte Formate
- USHORT nColls; // Text-Collections
- USHORT nBlks; // Anzahl Elemente im CONTENTS-Record
+ SvPersistRef refPersist; // Fuer OLE-Objekte
+ SwSwgReader* pRdr; // Lese-Routinen
+ SfxMedium* pMed; // der logische Input-Stream
+ String* pText; // String fuer GetText()
+ long nDocStart; // Beginn des Doc-Records
+ long nDocSize; // Laenge des Doc-Records
+ long nStart; // Beginn des CONTENTS-Records
+ long nSize; // Laenge des CONTENTS-Records
+ USHORT nNamedFmts; // benannte Formate
+ USHORT nColls; // Text-Collections
+ USHORT nBlks; // Anzahl Elemente im CONTENTS-Record
public:
Sw2TextBlocks( const String& );
virtual ~Sw2TextBlocks();
@@ -191,7 +191,7 @@ public:
virtual ULONG OpenFile( BOOL bReadOnly = TRUE );
virtual void CloseFile();
- void StatLineStartPercent(); // zum Anzeigen des Prozessbars
+ void StatLineStartPercent(); // zum Anzeigen des Prozessbars
};
class Sw3Io;
@@ -199,9 +199,9 @@ class Sw3IoImp;
class Sw3TextBlocks : public SwImpBlocks
{
- Sw3Io* pIo3;
+ Sw3Io* pIo3;
Sw3IoImp* pImp;
- BOOL bAutocorrBlock;
+ BOOL bAutocorrBlock;
public:
Sw3TextBlocks( const String& );
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 48cc9ef8a284..56e3b20eadd2 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -2,7 +2,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,40 +73,40 @@ SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1,1)
class SwCache : public SwCacheObjArr
{
- SvUShorts aFreePositions; //Freie Positionen fuer das Insert wenn
+ SvUShorts aFreePositions; //Freie Positionen fuer das Insert wenn
//die Maximalgrenze nicht erreicht ist.
//Immer wenn ein Objekt ausgetragen wird,
//so wird seine Position hier eingetragen.
- SwCacheObj *pRealFirst; //_immer_ der echte LRU-erste
- SwCacheObj *pFirst; //der virtuelle erste.
+ SwCacheObj *pRealFirst; //_immer_ der echte LRU-erste
+ SwCacheObj *pFirst; //der virtuelle erste.
SwCacheObj *pLast;
- const USHORT nMax; //Mehr sollen nicht aufgenommen werden,
+ const USHORT nMax; //Mehr sollen nicht aufgenommen werden,
//der Cache kann aber dynamisch um jeweils
//nMax vergroessert werden.
- USHORT nCurMax; //Mehr werden nicht aufgenommen.
+ USHORT nCurMax; //Mehr werden nicht aufgenommen.
void DeleteObj( SwCacheObj *pObj );
#if OSL_DEBUG_LEVEL > 1
ByteString aName;
- long nAppend; //Anzahl der Eintragungen durch Erweiterung.
- long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze.
- long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt
- long nGetSuccess; //Anzahl der Erfolgreichen Get's
- long nGetFail; //Anzahl der nicht Erfolgreichen Get's
- long nToTop; //Anzahl der Umsortierungen (LRU)
- long nDelete; //Anzahl der Loeschungen (von Aussen)
- long nGetSeek; //Anzahl der Get's ohne Index
- long nAverageSeekCnt; //Anzahl der Seek's fuer alle Get's ohne Index
- long nFlushCnt; //Anzahl von Flush-Aufrufen.
- long nFlushedObjects; //Anzahl der wg. Flush vernichteten Objekte
- long nIncreaseMax; //Anzahl Cache-Erweiterungen
- long nDecreaseMax; //Anzahl Cache-Verkleinerungen
-
- void Check(); //Wird bei swcache.cxx mit DEBUG aktiv!
+ long nAppend; //Anzahl der Eintragungen durch Erweiterung.
+ long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze.
+ long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt
+ long nGetSuccess; //Anzahl der Erfolgreichen Get's
+ long nGetFail; //Anzahl der nicht Erfolgreichen Get's
+ long nToTop; //Anzahl der Umsortierungen (LRU)
+ long nDelete; //Anzahl der Loeschungen (von Aussen)
+ long nGetSeek; //Anzahl der Get's ohne Index
+ long nAverageSeekCnt; //Anzahl der Seek's fuer alle Get's ohne Index
+ long nFlushCnt; //Anzahl von Flush-Aufrufen.
+ long nFlushedObjects; //Anzahl der wg. Flush vernichteten Objekte
+ long nIncreaseMax; //Anzahl Cache-Erweiterungen
+ long nDecreaseMax; //Anzahl Cache-Verkleinerungen
+
+ void Check(); //Wird bei swcache.cxx mit DEBUG aktiv!
#endif
public:
@@ -130,9 +130,9 @@ public:
BOOL Insert( SwCacheObj *pNew );
void Delete( const void *pOwner );
-// void Delete( const void *pOwner, const USHORT nIndex );
+// void Delete( const void *pOwner, const USHORT nIndex );
- void SetLRUOfst( const USHORT nOfst ); //nOfst sagt wieviele unangetastet
+ void SetLRUOfst( const USHORT nOfst ); //nOfst sagt wieviele unangetastet
//bleiben sollen.
void ResetLRUOfst() { pFirst = pRealFirst; }
@@ -150,9 +150,9 @@ class SwSaveSetLRUOfst
SwCache &rCache;
public:
SwSaveSetLRUOfst( SwCache &rC, const USHORT nOfst )
- : rCache( rC ) { rCache.SetLRUOfst( nOfst ); }
+ : rCache( rC ) { rCache.SetLRUOfst( nOfst ); }
- ~SwSaveSetLRUOfst() { rCache.ResetLRUOfst(); }
+ ~SwSaveSetLRUOfst() { rCache.ResetLRUOfst(); }
};
//Das allgemeine CacheObjekt. Anwender des Cache muessen eine Klasse vom
@@ -160,18 +160,18 @@ public:
class SwCacheObj
{
- friend class SwCache; //Der darf alles
+ friend class SwCache; //Der darf alles
- SwCacheObj *pNext; //Fuer die LRU-Verkettung.
+ SwCacheObj *pNext; //Fuer die LRU-Verkettung.
SwCacheObj *pPrev;
- USHORT nCachePos; //Position im Cache-Array.
+ USHORT nCachePos; //Position im Cache-Array.
- BYTE nLock;
+ BYTE nLock;
inline SwCacheObj *GetNext() { return pNext; }
inline SwCacheObj *GetPrev() { return pPrev; }
- inline void SetNext( SwCacheObj *pNew ) { pNext = pNew; }
+ inline void SetNext( SwCacheObj *pNew ) { pNext = pNew; }
inline void SetPrev( SwCacheObj *pNew ) { pPrev = pNew; }
inline void SetCachePos( const USHORT nNew ) { nCachePos = nNew; }
@@ -189,7 +189,7 @@ public:
inline BOOL IsOwner( const void *pNew ) const;
inline USHORT GetCachePos() const { return nCachePos; }
- inline void Invalidate() { pOwner = 0; }
+ inline void Invalidate() { pOwner = 0; }
inline BOOL IsLocked() const { return 0 != nLock; }
@@ -223,7 +223,7 @@ class SwCacheAccess
protected:
SwCacheObj *pObj;
- const void *pOwner; //Kann ggf. in NewObj benutzt werden.
+ const void *pOwner; //Kann ggf. in NewObj benutzt werden.
virtual SwCacheObj *NewObj() = 0;
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index e57b6f7b1a41..beb5f640f178 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -2,7 +2,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
@@ -76,7 +76,7 @@ public:
virtual ~SwFontObj();
- inline SwFont *GetFont() { return &aSwFont; }
+ inline SwFont *GetFont() { return &aSwFont; }
inline const SwFont *GetFont() const { return &aSwFont; }
inline const SfxPoolItem** GetDefault() { return pDefaultArray; }
};
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 9e8d2e15fd5b..898f2fbe0ae5 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -2,7 +2,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
@@ -26,38 +26,38 @@
*
************************************************************************/
#ifndef _SWFONT_HXX
-#define _SWFONT_HXX
+#define _SWFONT_HXX
#include <i18npool/lang.h>
#include <tools/color.hxx>
#include <tools/stream.hxx>
#include <editeng/svxfont.hxx>
#include <swtypes.hxx>
-#include <drawfont.hxx> // SwDrawTextInfo
+#include <drawfont.hxx> // SwDrawTextInfo
class SfxItemSet;
class SwAttrSet;
-class SwDoCapitals; // DoCapitals
+class SwDoCapitals; // DoCapitals
class SwDrawTextInfo; // _DrawText
class SwScriptInfo; // _GetTxtSize
class ViewShell;
class IDocumentSettingAccess;
-const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
-const xub_Unicode CH_BREAK = 0x0A; //
-const xub_Unicode CH_TAB = '\t'; // \t
-const xub_Unicode CH_PAR = 0xB6; // Paragraph
-const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt
+const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
+const xub_Unicode CH_BREAK = 0x0A; //
+const xub_Unicode CH_TAB = '\t'; // \t
+const xub_Unicode CH_PAR = 0xB6; // Paragraph
+const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt
class SwSubFont : public SvxFont
{
friend class SwFont;
- const void *pMagic; // "MagicNumber" innerhalb des Fontcaches
- Size aSize; // Fremde kriegen nur diese Size zu sehen
- USHORT nFntIndex; // Index im Fontcache
- USHORT nOrgHeight; // Hoehe inkl. Escapement/Proportion
- USHORT nOrgAscent; // Ascent inkl. Escapement/Proportion
- USHORT nPropWidth; // proportional width
+ const void *pMagic; // "MagicNumber" innerhalb des Fontcaches
+ Size aSize; // Fremde kriegen nur diese Size zu sehen
+ USHORT nFntIndex; // Index im Fontcache
+ USHORT nOrgHeight; // Hoehe inkl. Escapement/Proportion
+ USHORT nOrgAscent; // Ascent inkl. Escapement/Proportion
+ USHORT nPropWidth; // proportional width
inline SwSubFont() : aSize(0,0)
{ pMagic = NULL; nFntIndex = nOrgHeight = nOrgAscent = 0; nPropWidth =100; }
@@ -131,30 +131,30 @@ public:
class SwFont
{ // CJK == Chinese, Japanese, Korean
// CTL == Complex text layout ( Hebrew, Arabic )
- SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font
- Color* pBackColor; // background color (i.e. at character styles)
- Color aUnderColor; // color of the underlining
- Color aOverColor; // color of the overlining
- BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox
- BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs
+ SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font
+ Color* pBackColor; // background color (i.e. at character styles)
+ Color aUnderColor; // color of the underlining
+ Color aOverColor; // color of the overlining
+ BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox
+ BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs
BYTE m_nMetaCount; // count META/METAFIELD
- BYTE nActual; // actual font (Latin, CJK or CTL)
+ BYTE nActual; // actual font (Latin, CJK or CTL)
// Schalter fuer die Font-Extensions
- BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle
- BOOL bBlink :1; // blinkender Font
+ BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle
+ BOOL bBlink :1; // blinkender Font
BOOL bPaintBlank :1; // Blanks nicht mit DrawRect
- BOOL bFntChg :1;
- BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid
- BOOL bURL :1;
- BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler
- BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
+ BOOL bFntChg :1;
+ BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid
+ BOOL bURL :1;
+ BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler
+ BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
BOOL bNoColReplace :1; // Replacement without colormanipulation
BOOL operator==( const SwFont &rFnt ) const;
protected:
- inline SwFont() { pBackColor = NULL; nActual = SW_LATIN; }
+ inline SwFont() { pBackColor = NULL; nActual = SW_LATIN; }
public:
SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess );
@@ -167,7 +167,7 @@ public:
SwFont& operator=( const SwFont &rFont );
- inline BYTE GetActual() const { return nActual; }
+ inline BYTE GetActual() const { return nActual; }
inline void SetActual( BYTE nNew );
inline const SvxFont& GetActualFont() const { return aSub[nActual]; }
@@ -287,7 +287,7 @@ public:
const XubString& GetStyleName() const {return aSub[nActual].GetStyleName();}
FontFamily GetFamily() const { return aSub[nActual].GetFamily(); }
FontPitch GetPitch() const { return aSub[nActual].GetPitch(); }
- rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); }
+ rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); }
long GetHeight() const { return aSub[nActual].GetSize().Height(); }
FontWeight GetWeight() const { return aSub[nActual].GetWeight(); }
FontEmphasisMark GetEmphasisMark() const
@@ -841,7 +841,7 @@ public:
/*************************************************************************
- * class SvStatistics
+ * class SvStatistics
*************************************************************************/
#if OSL_DEBUG_LEVEL > 1
@@ -882,17 +882,17 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream
if( IsEmpty() )
return;
- rOS << "{ SV called:" << '\n';
+ rOS << "{ SV called:" << '\n';
if( nGetTextSize )
- rOS << "\tnGetTextSize: " << nGetTextSize << '\n'; if( nDrawText )
- rOS << "\tnDrawText: " << nDrawText << '\n'; if( nGetStretchTextSize )
- rOS << "\tnGetStretchTextSize: " << nGetStretchTextSize << '\n'; if( nDrawStretchText )
- rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont )
- rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric )
- rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; }
+ rOS << "\tnGetTextSize: " << nGetTextSize << '\n'; if( nDrawText )
+ rOS << "\tnDrawText: " << nDrawText << '\n'; if( nGetStretchTextSize )
+ rOS << "\tnGetStretchTextSize: " << nGetStretchTextSize << '\n'; if( nDrawStretchText )
+ rOS << "\tnDrawStretchText: " << nDrawStretchText << '\n'; if( nChangeFont )
+ rOS << "\tnChangeFont: " << nChangeFont << '\n'; if( nGetFontMetric )
+ rOS << "\tnGetFontMetric: " << nGetFontMetric << '\n'; rOS << "}" << '\n'; }
#else
#define SV_STAT(nWhich)
-#endif /* DEBUG */
+#endif /* DEBUG */
#endif
diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx
index a3deb52ce66f..0263d658cccc 100644
--- a/sw/source/core/inc/swselectionlist.hxx
+++ b/sw/source/core/inc/swselectionlist.hxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@ class SwFrm;
/** This class is used as parameter for creation of a block cursor selection
- This class will be created by a block cursor. Its responsibility is
+ This class will be created by a block cursor. Its responsibility is
to collect a group of selected text portions which are part of a common
context.
Definition of context:
@@ -95,6 +95,6 @@ public:
bool checkContext( const SwFrm* pCheck );
};
-#endif //_SWSELECTIONLIST_HXX
+#endif //_SWSELECTIONLIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index e997e6dadc26..950479f865af 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index 57f8ba4497d2..21db2cccc5e2 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 3ec749617aba..fda31c5f3b4e 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -2,7 +2,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
@@ -48,19 +48,19 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
SwTable* pTable;
- BOOL bComplete :1; //Eintrage als Repaint ohne das CompletePaint
+ BOOL bComplete :1; //Eintrage als Repaint ohne das CompletePaint
//der Basisklasse gesetzt werden muss. Damit
//sollen unertraegliche Tabellen-Repaints
//vermieden werden.
- BOOL bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
+ BOOL bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
//des Inhaltes sorgen.
- BOOL bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact
- BOOL bLockBackMove :1; //BackMove-Test hat der Master erledigt.
- BOOL bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll
+ BOOL bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact
+ BOOL bLockBackMove :1; //BackMove-Test hat der Master erledigt.
+ BOOL bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll
//Zur Optimierung, damit dies nicht im
//CntntFrm::Grow gerufen werden muss, denn dann
//wird es ggf. fuer jede Zelle gerufen #47483#
- BOOL bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
+ BOOL bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
//die Cntnts auf jedenfall per Calc() formatiert.
//es finden keine zusaetzlichen Invalidierungen
//statt und dieser Weg kann auch kaum garantien
@@ -114,21 +114,21 @@ protected:
//Aendert nur die Framesize, nicht die PrtArea-SSize
virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
public:
- SwTabFrm( SwTable & ); //Immer nach dem erzeugen _und_ pasten das
+ SwTabFrm( SwTable & ); //Immer nach dem erzeugen _und_ pasten das
//Regist Flys rufen!
- SwTabFrm( SwTabFrm & ); //_Nur_ zum erzeugen von Follows
+ SwTabFrm( SwTabFrm & ); //_Nur_ zum erzeugen von Follows
~SwTabFrm();
- void JoinAndDelFollows(); //Fuer DelFrms des TableNodes!
+ void JoinAndDelFollows(); //Fuer DelFrms des TableNodes!
//Ruft das RegistFlys der Zeilen.
void RegistFlys();
inline const SwTabFrm *GetFollow() const;
- inline SwTabFrm *GetFollow();
+ inline SwTabFrm *GetFollow();
SwTabFrm* FindMaster( bool bFirstMaster = false ) const;
- virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+ virtual void Modify( SfxPoolItem*, SfxPoolItem* );
virtual BOOL GetInfo( SfxPoolItem &rHnt ) const;
virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
virtual void CheckDirection( BOOL bVert );
@@ -143,18 +143,18 @@ public:
inline const SwCntntFrm *FindLastCntnt() const;
const SwTable *GetTable() const { return pTable; }
- SwTable *GetTable() { return pTable; }
+ SwTable *GetTable() { return pTable; }
BOOL IsComplete() { return bComplete; }
void SetComplete() { bComplete = TRUE; }
void ResetComplete() { bComplete = FALSE; }
- BOOL IsLowersFormatted() const { return bLowersFormatted; }
- void SetLowersFormatted( BOOL b ) { bLowersFormatted = b; }
+ BOOL IsLowersFormatted() const { return bLowersFormatted; }
+ void SetLowersFormatted( BOOL b ) { bLowersFormatted = b; }
- void SetCalcLowers() { bCalcLowers = TRUE; } //Sparsam einsetzen!
+ void SetCalcLowers() { bCalcLowers = TRUE; } //Sparsam einsetzen!
void SetResizeHTMLTable() { bResizeHTMLTable = TRUE; } //dito
- void SetONECalcLowers() { bONECalcLowers = TRUE; }
+ void SetONECalcLowers() { bONECalcLowers = TRUE; }
//
// Start: New stuff for breaking table rows
@@ -231,6 +231,6 @@ inline SwTabFrm *SwTabFrm::GetFollow()
return (SwTabFrm*)SwFlowFrm::GetFollow();
}
-#endif //_TABFRM_HXX
+#endif //_TABFRM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index d4dae4dc4435..d558c1547e1d 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -2,7 +2,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
@@ -105,7 +105,7 @@ public:
const SwTableBox* GetBoxOfPos( const SwTableBox& rBox );
void AddToUndoHistory( const SwCntntNode& rNd );
- USHORT Count() const { return aBoxes.Count(); }
+ USHORT Count() const { return aBoxes.Count(); }
const SwTableBox& GetBox( USHORT nPos, USHORT* pWidth = 0 ) const
{
// hier wird die EndPos der Spalte benoetigt!
@@ -115,11 +115,11 @@ public:
return *aBoxes[ nPos ];
}
- BOOL IsGetFromTop() const { return bGetFromTop; }
- BOOL IsGetValues() const { return bGetValues; }
+ BOOL IsGetFromTop() const { return bGetFromTop; }
+ BOOL IsGetValues() const { return bGetValues; }
- USHORT GetMode() const { return nMode; }
- void SetValues( BOOL bFlag ) { bGetValues = FALSE; nWidth = 0;
+ USHORT GetMode() const { return nMode; }
+ void SetValues( BOOL bFlag ) { bGetValues = FALSE; nWidth = 0;
bGetFromTop = bFlag; }
BOOL Resize( USHORT nOffset, USHORT nWidth );
};
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index 5692c7ae3c7f..ddcc5daeb63c 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -2,7 +2,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
@@ -41,20 +41,20 @@ class SwTextAPIEditSource : public SvxEditSource
{
SwTextAPIEditSource_Impl* pImpl;
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual void UpdateData();
- explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource );
+ virtual SvxEditSource* Clone() const;
+ virtual SvxTextForwarder* GetTextForwarder();
+ virtual void UpdateData();
+ explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource );
public:
SwTextAPIEditSource(SwDoc* pDoc);
- virtual ~SwTextAPIEditSource();
+ virtual ~SwTextAPIEditSource();
- void Dispose();
- void SetText( OutlinerParaObject& rText );
- void SetString( const String& rText );
+ void Dispose();
+ void SetText( OutlinerParaObject& rText );
+ void SetString( const String& rText );
OutlinerParaObject* CreateText();
- String GetText();
+ String GetText();
};
class SwTextAPIObject : public SvxUnoText
@@ -62,12 +62,12 @@ class SwTextAPIObject : public SvxUnoText
SwTextAPIEditSource* pSource;
public:
SwTextAPIObject( SwTextAPIEditSource* p);
- virtual ~SwTextAPIObject() throw();
- void DisposeEditSource() { pSource->Dispose(); }
+ virtual ~SwTextAPIObject() throw();
+ void DisposeEditSource() { pSource->Dispose(); }
OutlinerParaObject* CreateText() { return pSource->CreateText(); }
- void SetString( const String& rText ) { pSource->SetString( rText ); }
- void SetText( OutlinerParaObject& rText ) { pSource->SetText( rText ); }
- String GetText() { return pSource->GetText(); }
+ void SetString( const String& rText ) { pSource->SetString( rText ); }
+ void SetText( OutlinerParaObject& rText ) { pSource->SetText( rText ); }
+ String GetText() { return pSource->GetText(); }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index f6bc5edf8895..8100353bef3c 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 53ea5f7c689f..326447b3bd5f 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 38ced251596b..32a632110514 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 20f942b708a3..9f8001028bba 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/toxhlp.hxx b/sw/source/core/inc/toxhlp.hxx
index d3739196ddcd..c6e1c0d3746e 100644
--- a/sw/source/core/inc/toxhlp.hxx
+++ b/sw/source/core/inc/toxhlp.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index dc65ace860f8..f6459b4b55fd 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -2,7 +2,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
@@ -137,15 +137,15 @@ struct SwTOXSortTabBase
const ::com::sun::star::lang::Locale* pLocale = NULL );
virtual ~SwTOXSortTabBase() {}
- USHORT GetType() const { return nType; }
- USHORT GetOptions() const { return nOpt; }
+ USHORT GetType() const { return nType; }
+ USHORT GetOptions() const { return nOpt; }
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0) const;
- virtual USHORT GetLevel() const = 0;
- virtual BOOL operator==( const SwTOXSortTabBase& );
- virtual BOOL operator<( const SwTOXSortTabBase& );
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0) const;
+ virtual USHORT GetLevel() const = 0;
+ virtual BOOL operator==( const SwTOXSortTabBase& );
+ virtual BOOL operator<( const SwTOXSortTabBase& );
- virtual String GetURL() const;
+ virtual String GetURL() const;
inline void GetTxt( String&, String& ) const;
inline const ::com::sun::star::lang::Locale& GetLocale() const;
@@ -189,15 +189,15 @@ struct SwTOXIndex : public SwTOXSortTabBase
virtual ~SwTOXIndex() {}
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
virtual USHORT GetLevel() const;
- virtual BOOL operator==( const SwTOXSortTabBase& );
- virtual BOOL operator<( const SwTOXSortTabBase& );
+ virtual BOOL operator==( const SwTOXSortTabBase& );
+ virtual BOOL operator<( const SwTOXSortTabBase& );
private:
virtual void _GetText( String&, String& );
- BYTE nKeyLevel;
+ BYTE nKeyLevel;
};
struct SwTOXCustom : public SwTOXSortTabBase
@@ -229,7 +229,7 @@ struct SwTOXContent : public SwTOXSortTabBase
const SwTOXInternational& rIntl );
virtual ~SwTOXContent() {}
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
virtual USHORT GetLevel() const;
private:
virtual void _GetText( String&, String& );
@@ -241,13 +241,13 @@ struct SwTOXPara : public SwTOXSortTabBase
SwTOXPara( const SwCntntNode&, SwTOXElement, USHORT nLevel = FORM_ALPHA_DELIMITTER );
virtual ~SwTOXPara() {}
- void SetStartIndex( xub_StrLen nSet) { nStartIndex = nSet;}
- void SetEndIndex( xub_StrLen nSet ) { nEndIndex = nSet;}
+ void SetStartIndex( xub_StrLen nSet) { nStartIndex = nSet;}
+ void SetEndIndex( xub_StrLen nSet ) { nEndIndex = nSet;}
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
virtual USHORT GetLevel() const;
- virtual String GetURL() const;
+ virtual String GetURL() const;
private:
virtual void _GetText( String&, String& );
@@ -262,11 +262,11 @@ struct SwTOXTable : public SwTOXSortTabBase
SwTOXTable( const SwCntntNode& rNd );
virtual ~SwTOXTable() {}
- void SetLevel(USHORT nSet){nLevel = nSet;}
+ void SetLevel(USHORT nSet){nLevel = nSet;}
virtual USHORT GetLevel() const;
- virtual String GetURL() const;
+ virtual String GetURL() const;
private:
virtual void _GetText( String&, String& );
@@ -277,7 +277,7 @@ struct SwTOXAuthority : public SwTOXSortTabBase
{
private:
SwFmtFld& m_rField;
- virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
+ virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0 ) const;
virtual void _GetText( String&, String& );
public:
@@ -286,8 +286,8 @@ public:
SwFmtFld& GetFldFmt() {return m_rField;}
- virtual BOOL operator==( const SwTOXSortTabBase& );
- virtual BOOL operator<( const SwTOXSortTabBase& );
+ virtual BOOL operator==( const SwTOXSortTabBase& );
+ virtual BOOL operator<( const SwTOXSortTabBase& );
virtual USHORT GetLevel() const;
};
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3ff4c6d47332..475278a0833f 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ class SwParaPortion;
class WidowsAndOrphans;
class SwBodyFrm;
class SwTxtFtn;
-class SwInterHyphInfo; // Hyphenate()
+class SwInterHyphInfo; // Hyphenate()
class SwCache;
class SwBorderAttrs;
class SwFrmFmt;
@@ -65,15 +65,15 @@ class SwTxtFrm: public SwCntntFrm
friend class SwTxtIter;
friend class SwTestFormat;
friend class WidowsAndOrphans;
- friend class SwTxtFrmLocker; // duerfen Lock()/Unlock()
+ friend class SwTxtFrmLocker; // duerfen Lock()/Unlock()
friend sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, USHORT nNew );
- static SwCache *pTxtCache; //Pointer auf den Line-Cache
- static long nMinPrtLine; //Diese Linie darf beim Drucken nicht
+ static SwCache *pTxtCache; //Pointer auf den Line-Cache
+ static long nMinPrtLine; //Diese Linie darf beim Drucken nicht
//unterschritten werden, Hack fuer Tabellenzellen ueber mehrere Seiten
- ULONG nAllLines :24;//Anzahl der Zeilen fuer das Paint (inkl. nThisLines)
- ULONG nThisLines :8; //Anzahl der Zeilen dieses Frames
+ ULONG nAllLines :24;//Anzahl der Zeilen fuer das Paint (inkl. nThisLines)
+ ULONG nThisLines :8; //Anzahl der Zeilen dieses Frames
// The x position for flys anchored at this paragraph.
// These values are calculated in SwTxtFrm::CalcBaseOfstForFly()
@@ -93,9 +93,9 @@ class SwTxtFrm: public SwCntntFrm
// <--
- xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an.
+ xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an.
- USHORT nCacheIdx; //Index in den Cache, USHRT_MAX wenn definitiv
+ USHORT nCacheIdx; //Index in den Cache, USHRT_MAX wenn definitiv
//kein passendes Objekt im Cache steht.
//Teilt den Master ab und erzeugt einen Follow oder passt die
@@ -109,7 +109,7 @@ class SwTxtFrm: public SwCntntFrm
//entsprechend dem Attribut ein.
void CalcLineSpace();
- void InitCtor(); // Wird in beiden Ctoren gerufen
+ void InitCtor(); // Wird in beiden Ctoren gerufen
// Wird nur in Format gerufen:
void AdjustFrm( const SwTwips nChgHeight, sal_Bool bHasToFit = sal_False );
@@ -124,17 +124,17 @@ class SwTxtFrm: public SwCntntFrm
void FormatAdjust( SwTxtFormatter &rLine, WidowsAndOrphans &rFrmBreak,
const xub_StrLen nStrLen, const sal_Bool bDummy );
- sal_Bool bLocked : 1; // im Format?
- sal_Bool bFormatted : 1; // nach Format auf sal_True
- sal_Bool bWidow : 1; // sind wir ein Widow
- sal_Bool bJustWidow : 1; // haben wir soeben Widow angefordert
- sal_Bool bEmpty : 1; // sind wir ein leerer Absatz
- sal_Bool bInFtnConnect : 1; // Steht gerade im Connect
- sal_Bool bFtn : 1; // Hat mindestens eine Fussnote
- sal_Bool bRepaint : 1; // TxtFrm: Repaint steht zur Abholung bereit
- sal_Bool bBlinkPor : 1; // enthaelt Blink-Portions
- sal_Bool bFieldFollow : 1; // beginne mit Feldrest des Masters
- sal_Bool bHasAnimation : 1; // enthaelt animierte SwGrfNumPortion
+ sal_Bool bLocked : 1; // im Format?
+ sal_Bool bFormatted : 1; // nach Format auf sal_True
+ sal_Bool bWidow : 1; // sind wir ein Widow
+ sal_Bool bJustWidow : 1; // haben wir soeben Widow angefordert
+ sal_Bool bEmpty : 1; // sind wir ein leerer Absatz
+ sal_Bool bInFtnConnect : 1; // Steht gerade im Connect
+ sal_Bool bFtn : 1; // Hat mindestens eine Fussnote
+ sal_Bool bRepaint : 1; // TxtFrm: Repaint steht zur Abholung bereit
+ sal_Bool bBlinkPor : 1; // enthaelt Blink-Portions
+ sal_Bool bFieldFollow : 1; // beginne mit Feldrest des Masters
+ sal_Bool bHasAnimation : 1; // enthaelt animierte SwGrfNumPortion
sal_Bool bIsSwapped : 1; // during text formatting we swap the
// width and height for vertical formatting
// OD 14.03.2003 #i11760# - flag to control, if follow is formatted in
@@ -288,7 +288,7 @@ public:
// GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird
// (z.B. Wechsel in den zeichengebundenen Frame).
- inline sal_Bool GetKeyCrsrOfst(SwPosition *pPos, const Point &rPoint ) const
+ inline sal_Bool GetKeyCrsrOfst(SwPosition *pPos, const Point &rPoint ) const
{ return _GetCrsrOfst( pPos, rPoint, sal_False ); }
void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw.
@@ -319,10 +319,10 @@ public:
// Methoden zur Verwaltung von FolgeFrames
SwCntntFrm *SplitFrm( const xub_StrLen nTxtPos );
SwCntntFrm *JoinFrm();
- inline USHORT GetOfst() const { return nOfst; }
- void _SetOfst( const USHORT nNewOfst );
- inline void SetOfst ( const USHORT nNewOfst );
- inline void ManipOfst ( const USHORT nNewOfst ){ nOfst = nNewOfst; }
+ inline USHORT GetOfst() const { return nOfst; }
+ void _SetOfst( const USHORT nNewOfst );
+ inline void SetOfst ( const USHORT nNewOfst );
+ inline void ManipOfst ( const USHORT nNewOfst ){ nOfst = nNewOfst; }
SwTxtFrm *GetFrmAtPos ( const SwPosition &rPos);
inline const SwTxtFrm *GetFrmAtPos ( const SwPosition &rPos) const;
// OD 07.10.2003 #110978# - return <reference> instead of <pointer>
@@ -379,13 +379,13 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtFrm)
// Locking
- inline sal_Bool IsLocked() const { return bLocked; }
- inline sal_Bool IsFormatted() const { return bFormatted; }
+ inline sal_Bool IsLocked() const { return bLocked; }
+ inline sal_Bool IsFormatted() const { return bFormatted; }
- inline sal_Bool IsWidow() const { return bWidow; }
- inline sal_Bool IsJustWidow() const { return bJustWidow; }
- inline sal_Bool IsEmpty() const { return bEmpty; }
- inline sal_Bool HasFtn() const { return bFtn; }
+ inline sal_Bool IsWidow() const { return bWidow; }
+ inline sal_Bool IsJustWidow() const { return bJustWidow; }
+ inline sal_Bool IsEmpty() const { return bEmpty; }
+ inline sal_Bool HasFtn() const { return bFtn; }
inline sal_Bool IsInFtnConnect()const { return bInFtnConnect;}
inline sal_Bool IsFieldFollow() const { return bFieldFollow;}
@@ -409,8 +409,8 @@ public:
#endif
// Hidden
- sal_Bool IsHiddenNow() const; // bHidden && pOut == pPrt
- void HideHidden(); // Anhaengsel entfernen wenn Hidden
+ sal_Bool IsHiddenNow() const; // bHidden && pOut == pPrt
+ void HideHidden(); // Anhaengsel entfernen wenn Hidden
void HideFootnotes( xub_StrLen nStart, xub_StrLen nEnd );
/** method to hide/show objects
@@ -451,7 +451,7 @@ public:
// Liefert die Resthoehe zurueck
inline SwTwips GetRstHeight() const;
- inline SwTxtFrm *GetFollow();
+ inline SwTxtFrm *GetFollow();
inline const SwTxtFrm *GetFollow() const;
// Suche die Seitennummer von ErgoSum und QuoVadis
@@ -478,13 +478,13 @@ public:
{ return HasPara() ? _GetDropRect( rRect ) : sal_False; }
static SwCache *GetTxtCache() { return pTxtCache; }
- static void SetTxtCache( SwCache *pNew ) { pTxtCache = pNew; }
+ static void SetTxtCache( SwCache *pNew ) { pTxtCache = pNew; }
static long GetMinPrtLine() { return nMinPrtLine; }
- static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; }
+ static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; }
inline USHORT GetCacheIdx() const { return nCacheIdx; }
- inline void SetCacheIdx( const USHORT nNew ) { nCacheIdx = nNew; }
+ inline void SetCacheIdx( const USHORT nNew ) { nCacheIdx = nNew; }
//Entfert die Line-Informationen aus dem Cache.
void ClearPara();
@@ -534,7 +534,7 @@ public:
sal_Bool FillRegister( SwTwips& rRegStart, USHORT& rRegDiff );
- USHORT GetLineCount( USHORT nPos ); //Ermittelt die Zeilenanzahl
+ USHORT GetLineCount( USHORT nPos ); //Ermittelt die Zeilenanzahl
//Fuer die Anzeige der Zeilennummern.
ULONG GetAllLines() const { return nAllLines; }
@@ -617,7 +617,7 @@ public:
};
/*************************************************************************
- * class SwTxtFrmLocker
+ * class SwTxtFrmLocker
*************************************************************************/
class SwTxtFrmLocker
@@ -632,7 +632,7 @@ public:
};
/*************************************************************************
- * Inline-Implementierung
+ * Inline-Implementierung
*************************************************************************/
inline const SwParaPortion *SwTxtFrm::GetPara() const
@@ -745,8 +745,8 @@ inline void SwTxtFrm::ResetBlinkPor() const
class SwLinguStatistik
{
public:
- long nWords; // gepruefte Worte
- long nFlushCnt; // zaehlt die Messungen
+ long nWords; // gepruefte Worte
+ long nFlushCnt; // zaehlt die Messungen
long nWrong; // als falsch erkannt
long nAlter; // Alternativvorschlaege
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 748ea9334a62..df403278a509 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -2,7 +2,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
@@ -39,68 +39,68 @@
#define KSHRT_MAX USHRT_MAX
// Portiontypen
-#define POR_LIN 0x0000
-#define POR_FLYCNT 0x0001
-
-#define POR_HOLE 0x0080
-#define POR_TMPEND 0x0081
-#define POR_BRK 0x0082
-#define POR_KERN 0x0083
-#define POR_ARROW 0x0084
-#define POR_MULTI 0x0085
+#define POR_LIN 0x0000
+#define POR_FLYCNT 0x0001
+
+#define POR_HOLE 0x0080
+#define POR_TMPEND 0x0081
+#define POR_BRK 0x0082
+#define POR_KERN 0x0083
+#define POR_ARROW 0x0084
+#define POR_MULTI 0x0085
#define POR_HIDDEN_TXT 0x0086
#define POR_CONTROLCHAR 0x0087
-#define POR_TXT 0x8000
-#define POR_LAY 0x8001
-#define POR_PARA 0x8002
-#define POR_URL 0x8003
-#define POR_HNG 0x8004
-
-#define POR_DROP 0x8080
-#define POR_TOX 0x8089
-#define POR_ISOTOX 0x808a
-#define POR_REF 0x808b
-#define POR_ISOREF 0x808c
+#define POR_TXT 0x8000
+#define POR_LAY 0x8001
+#define POR_PARA 0x8002
+#define POR_URL 0x8003
+#define POR_HNG 0x8004
+
+#define POR_DROP 0x8080
+#define POR_TOX 0x8089
+#define POR_ISOTOX 0x808a
+#define POR_REF 0x808b
+#define POR_ISOREF 0x808c
#define POR_META 0x808d
-#define POR_EXP 0xc080
-#define POR_BLANK 0xc081
+#define POR_EXP 0xc080
+#define POR_BLANK 0xc081
#define POR_POSTITS 0xc082
-#define POR_HYPH 0xd080
-#define POR_HYPHSTR 0xd081
-#define POR_SOFTHYPH 0xd082
-#define POR_SOFTHYPHSTR 0xd083
+#define POR_HYPH 0xd080
+#define POR_HYPHSTR 0xd081
+#define POR_SOFTHYPH 0xd082
+#define POR_SOFTHYPHSTR 0xd083
#define POR_SOFTHYPH_COMP 0xd084
-#define POR_FLD 0xe080
-#define POR_HIDDEN 0xe081
-#define POR_QUOVADIS 0xe082
-#define POR_ERGOSUM 0xe083
-#define POR_COMBINED 0xe084
+#define POR_FLD 0xe080
+#define POR_HIDDEN 0xe081
+#define POR_QUOVADIS 0xe082
+#define POR_ERGOSUM 0xe083
+#define POR_COMBINED 0xe084
#define POR_FTN 0xe085
-#define POR_FTNNUM 0xe880
-#define POR_NUMBER 0xe881
-#define POR_BULLET 0xe882
-#define POR_GRFNUM 0xe883
+#define POR_FTNNUM 0xe880
+#define POR_NUMBER 0xe881
+#define POR_BULLET 0xe882
+#define POR_GRFNUM 0xe883
-#define POR_GLUE 0x0480
+#define POR_GLUE 0x0480
-#define POR_MARGIN 0x04c0
+#define POR_MARGIN 0x04c0
-#define POR_FIX 0x06c0
-#define POR_FLY 0x06c1
+#define POR_FIX 0x06c0
+#define POR_FLY 0x06c1
-#define POR_TAB 0x0750
+#define POR_TAB 0x0750
-#define POR_TABRIGHT 0x07d0
-#define POR_TABCENTER 0x07d1
-#define POR_TABDECIMAL 0x07d2
+#define POR_TABRIGHT 0x07d0
+#define POR_TABCENTER 0x07d1
+#define POR_TABDECIMAL 0x07d2
-#define POR_TABLEFT 0x0740
+#define POR_TABLEFT 0x0740
-#endif //_TXTTYPES_HXX
+#endif //_TXTTYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx
index c0fe45013246..30bf165e9a81 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 09c91e4021b4..7e61c50c22ab 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -2,7 +2,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
@@ -39,24 +39,24 @@ namespace com { namespace sun { namespace star { namespace uno {
*
******************************************************************************/
//Abbildung der Properties auf den Descriptor
-#define FIELD_PROP_PAR1 10
+#define FIELD_PROP_PAR1 10
#define FIELD_PROP_PAR2 11
#define FIELD_PROP_PAR3 12
#define FIELD_PROP_FORMAT 13
#define FIELD_PROP_SUBTYPE 14
-#define FIELD_PROP_BOOL1 15
-#define FIELD_PROP_BOOL2 16
-#define FIELD_PROP_DATE 17
+#define FIELD_PROP_BOOL1 15
+#define FIELD_PROP_BOOL2 16
+#define FIELD_PROP_DATE 17
#define FIELD_PROP_USHORT1 18
#define FIELD_PROP_USHORT2 19
-#define FIELD_PROP_BYTE1 20
+#define FIELD_PROP_BYTE1 20
#define FIELD_PROP_DOUBLE 21
-#define FIELD_PROP_BOOL3 22
+#define FIELD_PROP_BOOL3 22
#define FIELD_PROP_PAR4 23
#define FIELD_PROP_SHORT1 24
-#define FIELD_PROP_DATE_TIME 25
-#define FIELD_PROP_PROP_SEQ 26
-#define FIELD_PROP_LOCALE 27
+#define FIELD_PROP_DATE_TIME 25
+#define FIELD_PROP_PROP_SEQ 26
+#define FIELD_PROP_LOCALE 27
#define FIELD_PROP_BOOL4 28
#define FIELD_PROP_STRINGS 29
#define FIELD_PROP_PAR5 30
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 391515bcf267..b7c73f793092 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 5a1bec7803ea..c235c2f61c7d 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -64,40 +64,40 @@ class SwViewImp
{
friend class ViewShell;
- friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus.
+ friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus.
friend class SwLayIdle;
// OD 12.12.2002 #103492# - for paint of page preview
friend class SwPagePreviewLayout;
- ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch
+ ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch
//mal eine ViewShell braucht hier die
//Rueckwaertsverkettung.
- SwDrawView *pDrawView; //Unsere DrawView
- SdrPageView *pSdrPageView; //Genau eine Seite fuer unsere DrawView
+ SwDrawView *pDrawView; //Unsere DrawView
+ SdrPageView *pSdrPageView; //Genau eine Seite fuer unsere DrawView
- SwPageFrm *pFirstVisPage;//Zeigt immer auf die erste sichtbare Seite.
+ SwPageFrm *pFirstVisPage;//Zeigt immer auf die erste sichtbare Seite.
SwRegionRects *pRegion; //Sammler fuer Paintrects aus der LayAction.
- SwLayAction *pLayAct; //Ist gesetzt wenn ein Action-Objekt existiert
+ SwLayAction *pLayAct; //Ist gesetzt wenn ein Action-Objekt existiert
//Wird vom SwLayAction-CTor ein- und vom DTor
//ausgetragen.
- SwLayIdle *pIdleAct; //Analog zur SwLayAction fuer SwLayIdle.
+ SwLayIdle *pIdleAct; //Analog zur SwLayAction fuer SwLayIdle.
- SwAccessibleMap *pAccMap; // Accessible Wrappers
+ SwAccessibleMap *pAccMap; // Accessible Wrappers
mutable const SdrObject * pSdrObjCached;
mutable String sSdrObjCachedComment;
- BOOL bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig?
+ BOOL bFirstPageInvalid :1; //Pointer auf erste Seite ungueltig?
//BOOL bResetXorVisibility:1; //StartAction/EndAction
- //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint
+ //HMHBOOL bShowHdlPaint :1; //LockPaint/UnlockPaint
BOOL bResetHdlHiddenPaint:1;// -- "" --
- BOOL bSmoothUpdate :1; //Meber fuer SmoothScroll
- BOOL bStopSmooth :1;
+ BOOL bSmoothUpdate :1; //Meber fuer SmoothScroll
+ BOOL bStopSmooth :1;
BOOL bStopPrt :1; // Stop Printing
USHORT nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO)
@@ -127,11 +127,11 @@ class SwViewImp
*/
void ResetStopPrt() { bStopPrt = FALSE; }
- void SetFirstVisPage(); //Neue Ermittlung der ersten sichtbaren Seite
+ void SetFirstVisPage(); //Neue Ermittlung der ersten sichtbaren Seite
- void StartAction(); //Henkel Anzeigen und verstecken.
- void EndAction(); //gerufen von ViewShell::ImplXXXAction
- void LockPaint(); //dito, gerufen von ViewShell::ImplLockPaint
+ void StartAction(); //Henkel Anzeigen und verstecken.
+ void EndAction(); //gerufen von ViewShell::ImplXXXAction
+ void LockPaint(); //dito, gerufen von ViewShell::ImplLockPaint
void UnlockPaint();
private:
@@ -182,27 +182,27 @@ private:
public:
SwViewImp( ViewShell * );
~SwViewImp();
- void Init( const SwViewOption * ); //nur fuer ViewShell::Init()
+ void Init( const SwViewOption * ); //nur fuer ViewShell::Init()
const ViewShell *GetShell() const { return pSh; }
- ViewShell *GetShell() { return pSh; }
+ ViewShell *GetShell() { return pSh; }
Color GetRetoucheColor() const;
//Verwaltung zur ersten sichtbaren Seite
inline const SwPageFrm *GetFirstVisPage() const;
- inline SwPageFrm *GetFirstVisPage();
+ inline SwPageFrm *GetFirstVisPage();
void SetFirstVisPageInvalid() { bFirstPageInvalid = TRUE; }
BOOL AddPaintRect( const SwRect &rRect );
- SwRegionRects *GetRegion() { return pRegion; }
+ SwRegionRects *GetRegion() { return pRegion; }
void DelRegion();
// neues Interface fuer StarView Drawing
inline BOOL HasDrawView() const { return 0 != pDrawView; }
- SwDrawView* GetDrawView() { return pDrawView; }
+ SwDrawView* GetDrawView() { return pDrawView; }
const SwDrawView* GetDrawView() const { return pDrawView; }
- SdrPageView*GetPageView() { return pSdrPageView; }
+ SdrPageView*GetPageView() { return pSdrPageView; }
const SdrPageView*GetPageView() const { return pSdrPageView; }
void MakeDrawView();
@@ -231,23 +231,23 @@ public:
void NotifySizeChg( const Size &rNewSz );
//SS Fuer die Lay- bzw. IdleAction und verwandtes
- BOOL IsAction() const { return pLayAct != 0; }
- BOOL IsIdleAction() const { return pIdleAct != 0; }
- SwLayAction &GetLayAction() { return *pLayAct; }
+ BOOL IsAction() const { return pLayAct != 0; }
+ BOOL IsIdleAction() const { return pIdleAct != 0; }
+ SwLayAction &GetLayAction() { return *pLayAct; }
const SwLayAction &GetLayAction() const { return *pLayAct; }
- SwLayIdle &GetIdleAction() { return *pIdleAct;}
+ SwLayIdle &GetIdleAction() { return *pIdleAct;}
const SwLayIdle &GetIdleAction() const { return *pIdleAct;}
//Wenn eine Aktion laueft wird diese gebeten zu pruefen ob es
//an der zeit ist den WaitCrsr einzuschalten.
void CheckWaitCrsr();
- BOOL IsCalcLayoutProgress() const; //Fragt die LayAction wenn vorhanden.
+ BOOL IsCalcLayoutProgress() const; //Fragt die LayAction wenn vorhanden.
//TRUE wenn eine LayAction laeuft, dort wird dann auch das Flag fuer
//ExpressionFields gesetzt.
BOOL IsUpdateExpFlds();
- void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;}
- USHORT GetRestoreActions() const{return nRestoreActions;}
+ void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;}
+ USHORT GetRestoreActions() const{return nRestoreActions;}
// OD 12.12.2002 #103492#
void InitPagePreviewLayout();
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index b0d63c2baa9c..c5a50cc37bdb 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -2,7 +2,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
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _VISITURL_HXX
-#define _VISITURL_HXX
+#ifndef _VISITURL_HXX
+#define _VISITURL_HXX
#include <svl/lstner.hxx>
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 1de852514a74..4341af9b3c5c 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#ifndef _WRONG_HXX
-#define _WRONG_HXX
+#ifndef _WRONG_HXX
+#define _WRONG_HXX
#include <com/sun/star/container/XStringKeyMap.hpp>
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 501511f14f33..dee2376219b5 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index ebbe5e4f3e0d..9370ed76254c 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 91c653d7cb99..290f1d673889 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2,7 +2,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
@@ -129,7 +129,7 @@ TYPEINIT2(SwFmtPageDesc, SfxPoolItem, SwClient );
TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem);
/* -----------------19.05.98 09:26-------------------
- * Umwandlung fuer QueryValue
+ * Umwandlung fuer QueryValue
* --------------------------------------------------*/
sal_Int16 lcl_RelToINT(sal_Int16 eRelation)
{
@@ -256,8 +256,8 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
}
}
-// class SwFmtFrmSize
-// Implementierung teilweise inline im hxx
+// class SwFmtFrmSize
+// Implementierung teilweise inline im hxx
SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
: SfxPoolItem( RES_FRM_SIZE ),
@@ -283,9 +283,9 @@ int SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
return( eFrmHeightType == ((SwFmtFrmSize&)rAttr).eFrmHeightType &&
eFrmWidthType == ((SwFmtFrmSize&)rAttr).eFrmWidthType &&
- aSize == ((SwFmtFrmSize&)rAttr).GetSize()&&
- nWidthPercent == ((SwFmtFrmSize&)rAttr).GetWidthPercent() &&
- nHeightPercent == ((SwFmtFrmSize&)rAttr).GetHeightPercent() );
+ aSize == ((SwFmtFrmSize&)rAttr).GetSize()&&
+ nWidthPercent == ((SwFmtFrmSize&)rAttr).GetWidthPercent() &&
+ nHeightPercent == ((SwFmtFrmSize&)rAttr).GetHeightPercent() );
}
SfxPoolItem* SwFmtFrmSize::Clone( SfxItemPool* ) const
@@ -487,8 +487,8 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
return bRet;
}
-// class SwFmtFillOrder
-// Implementierung teilweise inline im hxx
+// class SwFmtFillOrder
+// Implementierung teilweise inline im hxx
SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
: SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
@@ -504,8 +504,8 @@ sal_uInt16 SwFmtFillOrder::GetValueCount() const
return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN;
}
-// class SwFmtHeader
-// Implementierung teilweise inline im hxx
+// class SwFmtHeader
+// Implementierung teilweise inline im hxx
SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt )
: SfxPoolItem( RES_HEADER ),
@@ -546,8 +546,8 @@ SfxPoolItem* SwFmtHeader::Clone( SfxItemPool* ) const
return new SwFmtHeader( *this );
}
-// class SwFmtFooter
-// Implementierung teilweise inline im hxx
+// class SwFmtFooter
+// Implementierung teilweise inline im hxx
SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt )
: SfxPoolItem( RES_FOOTER ),
@@ -588,8 +588,8 @@ SfxPoolItem* SwFmtFooter::Clone( SfxItemPool* ) const
return new SwFmtFooter( *this );
}
-// class SwFmtCntnt
-// Implementierung teilweise inline im hxx
+// class SwFmtCntnt
+// Implementierung teilweise inline im hxx
SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy )
: SfxPoolItem( RES_CNTNT )
@@ -630,8 +630,8 @@ SfxPoolItem* SwFmtCntnt::Clone( SfxItemPool* ) const
return new SwFmtCntnt( *this );
}
-// class SwFmtPageDesc
-// Implementierung teilweise inline im hxx
+// class SwFmtPageDesc
+// Implementierung teilweise inline im hxx
SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
: SfxPoolItem( RES_PAGEDESC ),
@@ -656,7 +656,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
int SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
- return ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) &&
+ return ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) &&
( nNumOffset == ((SwFmtPageDesc&)rAttr).nNumOffset ) &&
( GetPageDesc() == ((SwFmtPageDesc&)rAttr).GetPageDesc() );
}
@@ -707,7 +707,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// hier wird immer konvertiert!
nMemberId &= ~CONVERT_TWIPS;
- bool bRet = true;
+ bool bRet = true;
switch ( nMemberId )
{
case MID_PAGEDESC_PAGENUMOFFSET:
@@ -764,8 +764,8 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
-// class SwFmtCol
-// Implementierung teilweise inline im hxx
+// class SwFmtCol
+// Implementierung teilweise inline im hxx
SwColumn::SwColumn() :
nWish ( 0 ),
@@ -808,10 +808,10 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
{
nLineWidth = rCpy.nLineWidth;
aLineColor = rCpy.aLineColor;
- nLineHeight = rCpy.GetLineHeight();
- eAdj = rCpy.GetLineAdj();
- nWidth = rCpy.GetWishWidth();
- bOrtho = rCpy.IsOrtho();
+ nLineHeight = rCpy.GetLineHeight();
+ eAdj = rCpy.GetLineAdj();
+ nWidth = rCpy.GetWishWidth();
+ bOrtho = rCpy.IsOrtho();
if ( aColumns.Count() )
aColumns.DeleteAndDestroy( 0, aColumns.Count() );
@@ -837,12 +837,12 @@ int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
const SwFmtCol &rCmp = (const SwFmtCol&)rAttr;
- if( !(nLineWidth == rCmp.nLineWidth &&
- aLineColor == rCmp.aLineColor &&
- nLineHeight == rCmp.GetLineHeight() &&
- eAdj == rCmp.GetLineAdj() &&
- nWidth == rCmp.GetWishWidth() &&
- bOrtho == rCmp.IsOrtho() &&
+ if( !(nLineWidth == rCmp.nLineWidth &&
+ aLineColor == rCmp.aLineColor &&
+ nLineHeight == rCmp.GetLineHeight() &&
+ eAdj == rCmp.GetLineAdj() &&
+ nWidth == rCmp.GetWishWidth() &&
+ bOrtho == rCmp.IsOrtho() &&
aColumns.Count() == rCmp.GetNumCols()) )
return 0;
@@ -880,7 +880,7 @@ sal_uInt16 SwFmtCol::GetGutterWidth( sal_Bool bMin ) const
}
}
else
- { bSet = sal_True;
+ { bSet = sal_True;
nRet = nTmp;
}
}
@@ -896,7 +896,7 @@ void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct )
{
sal_uInt16 nHalf = nNew / 2;
for ( sal_uInt16 i = 0; i < aColumns.Count(); ++i )
- { SwColumn *pCol = aColumns[i];
+ { SwColumn *pCol = aColumns[i];
pCol->SetLeft ( nHalf );
pCol->SetRight( nHalf );
if ( i == 0 )
@@ -915,7 +915,7 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA
if ( aColumns.Count() )
aColumns.DeleteAndDestroy( 0, aColumns.Count() );
for ( sal_uInt16 i = 0; i < nNumCols; ++i )
- { SwColumn *pCol = new SwColumn;
+ { SwColumn *pCol = new SwColumn;
aColumns.Insert( pCol, i );
}
bOrtho = sal_True;
@@ -1081,9 +1081,9 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
eAdj = COLADJ_NONE;
else switch(pSwColums->GetSepLineVertAlign())
{
- case 0: eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP
+ case 0: eAdj = COLADJ_TOP; break; //VerticalAlignment_TOP
case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
- case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
+ case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
default: OSL_ENSURE( !this, "unknown alignment" ); break;
}
}
@@ -1093,8 +1093,8 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
-// class SwFmtSurround
-// Implementierung teilweise inline im hxx
+// class SwFmtSurround
+// Implementierung teilweise inline im hxx
SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
@@ -1200,8 +1200,8 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
return bRet;
}
-// class SwFmtVertOrient
-// Implementierung teilweise inline im hxx
+// class SwFmtVertOrient
+// Implementierung teilweise inline im hxx
SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
sal_Int16 eRel )
@@ -1312,8 +1312,8 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
-// class SwFmtHoriOrient
-// Implementierung teilweise inline im hxx
+// class SwFmtHoriOrient
+// Implementierung teilweise inline im hxx
SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
sal_Int16 eRel, sal_Bool bPos )
@@ -1438,8 +1438,8 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
-// class SwFmtAnchor
-// Implementierung teilweise inline im hxx
+// class SwFmtAnchor
+// Implementierung teilweise inline im hxx
SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
: SfxPoolItem( RES_ANCHOR ),
@@ -1586,7 +1586,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
case MID_ANCHOR_ANCHORTYPE:
{
- RndStdIds eAnchor;
+ RndStdIds eAnchor;
switch( SWUnoHelper::GetEnumAsInt32( rVal ) )
{
case text::TextContentAnchorType_AS_CHARACTER:
@@ -1647,8 +1647,8 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
return bRet;
}
-// class SwFmtURL
-// Implementierung teilweise inline im hxx
+// class SwFmtURL
+// Implementierung teilweise inline im hxx
SwFmtURL::SwFmtURL() :
SfxPoolItem( RES_URL ),
@@ -1677,10 +1677,10 @@ int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
const SwFmtURL &rCmp = (SwFmtURL&)rAttr;
- sal_Bool bRet = bIsServerMap == rCmp.IsServerMap() &&
- sURL == rCmp.GetURL() &&
+ sal_Bool bRet = bIsServerMap == rCmp.IsServerMap() &&
+ sURL == rCmp.GetURL() &&
sTargetFrameName == rCmp.GetTargetFrameName() &&
- sName == rCmp.GetName();
+ sName == rCmp.GetName();
if ( bRet )
{
if ( pMap && rCmp.GetMap() )
@@ -1877,7 +1877,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
{
- case MID_COLLECT :
+ case MID_COLLECT :
{
sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND;
rVal.setValue(&bVal, ::getBooleanCppuType());
@@ -1910,7 +1910,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
{
- case MID_COLLECT :
+ case MID_COLLECT :
{
sal_Bool bVal = *(sal_Bool*)rVal.getValue();
if(!bVal && GetValue() >= FTNEND_ATTXTEND)
@@ -2082,8 +2082,8 @@ int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
- return nStartValue == ((SwFmtLineNumber&)rAttr).GetStartValue() &&
- bCountLines == ((SwFmtLineNumber&)rAttr).IsCount();
+ return nStartValue == ((SwFmtLineNumber&)rAttr).GetStartValue() &&
+ bCountLines == ((SwFmtLineNumber&)rAttr).IsCount();
}
SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const
@@ -2423,8 +2423,8 @@ void SwTextGridItem::Init()
//if grid type change.
//if(SvtCJKOptions().IsAsianTypographyEnabled())
//{
- // bDisplayGrid = 0;
- // eGridType = GRID_LINES_ONLY;
+ // bDisplayGrid = 0;
+ // eGridType = GRID_LINES_ONLY;
//}
}
}
@@ -2437,7 +2437,7 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
// class SwFrmFmt
-// Implementierung teilweise inline im hxx
+// Implementierung teilweise inline im hxx
TYPEINIT1( SwFrmFmt, SwFmt );
IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt, 20, 20 )
@@ -2462,20 +2462,20 @@ void SwFrmFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
pF = (SwFmtFooter*)pNew;
if( pH && pH->IsActive() && !pH->GetHeaderFmt() )
- { //Hat er keinen, mach ich ihm einen
+ { //Hat er keinen, mach ich ihm einen
SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_HEADER, 0 );
pFmt->Add( pH );
}
if( pF && pF->IsActive() && !pF->GetFooterFmt() )
- { //Hat er keinen, mach ich ihm einen
+ { //Hat er keinen, mach ich ihm einen
SwFrmFmt *pFmt = GetDoc()->MakeLayoutFmt( RND_STD_FOOTER, 0 );
pFmt->Add( pF );
}
// MIB 24.3.98: Modify der Basisklasse muss immer gerufen werden, z.B.
// wegen RESET_FMTWRITTEN.
-// if ( GetDepends() )
+// if ( GetDepends() )
SwFmt::Modify( pOld, pNew );
if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
@@ -2528,7 +2528,7 @@ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
// noch implementier werden, in dem sich vom Ende noch
// der entsprechende frame::Frame besorgt wird.
// PROBLEM: was passiert bei SectionFrames, die auf unter-
- // schiedlichen Seiten stehen??
+ // schiedlichen Seiten stehen??
if( bPrtArea )
aRet = pFrm->Prt();
else
@@ -2536,7 +2536,7 @@ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
aRet = pFrm->Frm();
--aRet.Pos().Y();
}
- pFrm = 0; // das Rect ist ja jetzt fertig
+ pFrm = 0; // das Rect ist ja jetzt fertig
}
}
}
@@ -2668,11 +2668,11 @@ String SwFrmFmt::GetDescription() const
return SW_RES(STR_FRAME);
}
-// class SwFlyFrmFmt
-// Implementierung teilweise inline im hxx
+// class SwFlyFrmFmt
+// Implementierung teilweise inline im hxx
TYPEINIT1( SwFlyFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 )
SwFlyFrmFmt::~SwFlyFrmFmt()
{
@@ -3121,11 +3121,11 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
}
}
// <--
-// class SwDrawFrmFmt
-// Implementierung teilweise inline im hxx
+// class SwDrawFrmFmt
+// Implementierung teilweise inline im hxx
TYPEINIT1( SwDrawFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 )
SwDrawFrmFmt::~SwDrawFrmFmt()
{
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 21fa4b60cf39..93827189fa1a 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -2,7 +2,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
@@ -67,16 +67,16 @@
#include <ndtxt.hxx>
//------------------------------------------------------------------------
-// Move-Methoden
+// Move-Methoden
//------------------------------------------------------------------------
/*************************************************************************
|*
-|* SwCntntFrm::ShouldBwdMoved()
+|* SwCntntFrm::ShouldBwdMoved()
|*
-|* Beschreibung Returnwert sagt, ob der Frm verschoben werden sollte.
-|* Ersterstellung MA 05. Dec. 96
-|* Letzte Aenderung MA 05. Dec. 96
+|* Beschreibung Returnwert sagt, ob der Frm verschoben werden sollte.
+|* Ersterstellung MA 05. Dec. 96
+|* Letzte Aenderung MA 05. Dec. 96
|*
|*************************************************************************/
@@ -241,26 +241,26 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & )
}
//------------------------------------------------------------------------
-// Calc-Methoden
+// Calc-Methoden
//------------------------------------------------------------------------
/*************************************************************************
|*
-|* SwFrm::Prepare()
+|* SwFrm::Prepare()
|*
-|* Beschreibung Bereitet den Frm auf die 'Formatierung' (MakeAll())
-|* vor. Diese Methode dient dazu auf dem Stack Platz einzusparen,
-|* denn zur Positionsberechnung des Frm muss sichergestellt sein, dass
-|* die Position von Upper und Prev gueltig sind, mithin also ein
-|* rekursiver Aufruf (Schleife waere relativ teuer, da selten notwendig).
-|* Jeder Aufruf von MakeAll verbraucht aber ca. 500Byte Stack -
-|* das Ende ist leicht abzusehen. _Prepare benoetigt nur wenig Stack,
-|* deshalb solle der Rekursive Aufruf hier kein Problem sein.
-|* Ein weiterer Vorteil ist, das eines schoenen Tages das _Prepare und
-|* damit die Formatierung von Vorgaengern umgangen werden kann.
-|* So kann evtl. mal 'schnell' an's Dokumentende gesprungen werden.
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 13. Dec. 93
+|* Beschreibung Bereitet den Frm auf die 'Formatierung' (MakeAll())
+|* vor. Diese Methode dient dazu auf dem Stack Platz einzusparen,
+|* denn zur Positionsberechnung des Frm muss sichergestellt sein, dass
+|* die Position von Upper und Prev gueltig sind, mithin also ein
+|* rekursiver Aufruf (Schleife waere relativ teuer, da selten notwendig).
+|* Jeder Aufruf von MakeAll verbraucht aber ca. 500Byte Stack -
+|* das Ende ist leicht abzusehen. _Prepare benoetigt nur wenig Stack,
+|* deshalb solle der Rekursive Aufruf hier kein Problem sein.
+|* Ein weiterer Vorteil ist, das eines schoenen Tages das _Prepare und
+|* damit die Formatierung von Vorgaengern umgangen werden kann.
+|* So kann evtl. mal 'schnell' an's Dokumentende gesprungen werden.
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 13. Dec. 93
|*
|*************************************************************************/
//Zwei kleine Freundschaften werden hier zu einem Geheimbund.
@@ -454,7 +454,7 @@ void SwFrm::PrepareCrsr()
{
OSL_ENSURE( pFrm, ":-( Layoutgeruest wackelig (this not found)." );
if ( !pFrm )
- return; //Oioioioi ...
+ return; //Oioioioi ...
if ( !pFrm->IsValid() )
{
@@ -498,10 +498,10 @@ void SwFrm::PrepareCrsr()
/*************************************************************************
|*
-|* SwFrm::MakePos()
+|* SwFrm::MakePos()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 24. May. 93
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 24. May. 93
|*
|*************************************************************************/
@@ -547,7 +547,7 @@ void SwFrm::MakePos()
!pPrv->GetAttrSet()->GetKeep().GetValue()
)
{
- pPrv->Calc(); //hierbei kann der Prev verschwinden!
+ pPrv->Calc(); //hierbei kann der Prev verschwinden!
}
else if ( pPrv->Frm().Top() == 0 )
{
@@ -662,10 +662,10 @@ void SwFrm::MakePos()
/*************************************************************************
|*
-|* SwPageFrm::MakeAll()
+|* SwPageFrm::MakeAll()
|*
-|* Ersterstellung MA 23. Feb. 93
-|* Letzte Aenderung MA 20. Jul. 98
+|* Ersterstellung MA 23. Feb. 93
+|* Letzte Aenderung MA 20. Jul. 98
|*
|*************************************************************************/
// --> OD 2004-07-01 #i28701# - new type <SwSortedObjs>
@@ -705,8 +705,8 @@ void SwPageFrm::MakeAll()
{
PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
- const SwRect aOldRect( Frm() ); //Anpassung der Root-Groesse
- const SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung
+ const SwRect aOldRect( Frm() ); //Anpassung der Root-Groesse
+ const SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung
SwBorderAttrAccess *pAccess = 0;
const SwBorderAttrs*pAttrs = 0;
@@ -835,7 +835,7 @@ void SwPageFrm::MakeAll()
bValidSize = bValidPrtArea = TRUE;
}
else
- { //FixSize einstellen, bei Seiten nicht vom Upper sondern vom
+ { //FixSize einstellen, bei Seiten nicht vom Upper sondern vom
//Attribut vorgegeben.
Frm().SSize( pAttrs->GetSize() );
Format( pAttrs );
@@ -861,10 +861,10 @@ void SwPageFrm::MakeAll()
/*************************************************************************
|*
-|* SwLayoutFrm::MakeAll()
+|* SwLayoutFrm::MakeAll()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 28. Nov. 95
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 28. Nov. 95
|*
|*************************************************************************/
@@ -949,10 +949,10 @@ void SwLayoutFrm::MakeAll()
/*************************************************************************
|*
-|* SwCntntFrm::MakePrtArea()
+|* SwCntntFrm::MakePrtArea()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 03. Mar. 96
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 03. Mar. 96
|*
|*************************************************************************/
bool SwTxtNode::IsCollapse() const
@@ -1083,7 +1083,7 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
//1. Der erste einer Kette hat keinen Rand nach oben
//2. Nach unten gibt es nie einen Rand
//3. Der Rand nach oben ist das Maximum aus dem Abstand des
- // Prev nach unten und dem eigenen Abstand nach oben.
+ // Prev nach unten und dem eigenen Abstand nach oben.
//Die drei Regeln werden auf die Berechnung der Freiraeume, die von
//UL- bzw. LRSpace vorgegeben werden, angewand. Es gibt in alle
//Richtungen jedoch ggf. trotzdem einen Abstand; dieser wird durch
@@ -1130,10 +1130,10 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
/*************************************************************************
|*
-|* SwCntntFrm::MakeAll()
+|* SwCntntFrm::MakeAll()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 16. Dec. 96
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 16. Dec. 96
|*
|*************************************************************************/
@@ -1197,33 +1197,33 @@ void SwCntntFrm::MakeAll()
//uebernimmt im DTor die Benachrichtigung
SwCntntNotify *pNotify = new SwCntntNotify( this );
- BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite
+ BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite
//angelegt werden (genau einmal)
- BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst
- BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck-
+ BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst
+ BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck-
//fliessen (solange, bis er einmal
//vorwaerts ge'moved wurde).
- BOOL bFormatted = FALSE; //Fuer die Witwen und Waisen Regelung
+ BOOL bFormatted = FALSE; //Fuer die Witwen und Waisen Regelung
//wird der letzte CntntFrm einer Kette
//u.U. zum Formatieren angeregt, dies
//braucht nur einmal zu passieren.
//Immer wenn der Frm gemoved wird muss
//das Flag zurueckgesetzt werden.
- BOOL bMustFit = FALSE; //Wenn einmal die Notbremse gezogen wurde,
+ BOOL bMustFit = FALSE; //Wenn einmal die Notbremse gezogen wurde,
//werden keine anderen Prepares mehr
//abgesetzt.
- BOOL bFitPromise = FALSE; //Wenn ein Absatz nicht passte, mit WouldFit
+ BOOL bFitPromise = FALSE; //Wenn ein Absatz nicht passte, mit WouldFit
//aber verspricht, dass er sich passend
//einstellt wird dieses Flag gesetzt.
//Wenn er dann sein Versprechen nicht haelt,
//kann kontrolliert verfahren werden.
BOOL bMoveable;
- const BOOL bFly = IsInFly();
+ const BOOL bFly = IsInFly();
const BOOL bTab = IsInTab();
const BOOL bFtn = IsInFtn();
const BOOL bSct = IsInSct();
- Point aOldFrmPos; //Damit bei Turnarounds jew. mit der
- Point aOldPrtPos; //letzten Pos verglichen und geprueft
+ Point aOldFrmPos; //Damit bei Turnarounds jew. mit der
+ Point aOldPrtPos; //letzten Pos verglichen und geprueft
//werden kann, ob ein Prepare sinnvoll ist.
SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
@@ -1445,7 +1445,7 @@ void SwCntntFrm::MakeAll()
// bValidSize wird FALSE und das Format() wird gerufen.
Prepare( PREP_POS_CHGD, (const void*)&bFormatted, FALSE );
if ( bWidow && GetFollow() )
- { Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE );
+ { Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE );
bValidSize = FALSE;
}
}
@@ -1750,8 +1750,8 @@ void SwCntntFrm::MakeAll()
/* MA 13. Oct. 98: Was soll das denn sein!?
* AMA 14. Dec 98: Wenn ein spaltiger Bereich keinen Platz mehr fuer seinen ersten ContentFrm
- * bietet, so soll dieser nicht nur in die naechste Spalte, sondern ggf. bis zur naechsten
- * Seite wandern und dort einen Section-Follow erzeugen.
+ * bietet, so soll dieser nicht nur in die naechste Spalte, sondern ggf. bis zur naechsten
+ * Seite wandern und dort einen Section-Follow erzeugen.
*/
if( IsInSct() && bMovedFwd && bMakePage && pOldUp->IsColBodyFrm() &&
pOldUp->GetUpper()->GetUpper()->IsSctFrm() &&
@@ -1795,7 +1795,7 @@ void SwCntntFrm::MakeAll()
#endif
}
if ( bMovedBwd && GetUpper() )
- { //Unuetz gewordene Invalidierungen zuruecknehmen.
+ { //Unuetz gewordene Invalidierungen zuruecknehmen.
GetUpper()->ResetCompletePaint();
if( pPre && !pPre->IsSctFrm() )
::ValidateSz( pPre );
@@ -1840,10 +1840,10 @@ void SwCntntFrm::MakeAll()
/*************************************************************************
|*
-|* SwCntntFrm::_WouldFit()
+|* SwCntntFrm::_WouldFit()
|*
-|* Ersterstellung MA 28. Feb. 95
-|* Letzte Aenderung AMA 15. Feb. 99
+|* Ersterstellung MA 28. Feb. 95
+|* Letzte Aenderung AMA 15. Feb. 99
|*
|*************************************************************************/
@@ -1893,8 +1893,8 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
pNxt->Format( &rAttrs );
}
- pFrm->bValidPos = bOldPos;
- pFrm->bValidSize = bOldSz;
+ pFrm->bValidPos = bOldPos;
+ pFrm->bValidSize = bOldSz;
pFrm->bValidPrtArea = bOldPrt;
}
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index e40fd45a5065..9ae58a45aae1 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -2,7 +2,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
@@ -43,9 +43,9 @@
#include "frmtool.hxx"
#include "colfrm.hxx"
#include "pagefrm.hxx"
-#include "bodyfrm.hxx" // ColumnFrms jetzt mit BodyFrm
+#include "bodyfrm.hxx" // ColumnFrms jetzt mit BodyFrm
#include "rootfrm.hxx" // wg. RemoveFtns
-#include "sectfrm.hxx" // wg. FtnAtEnd-Flag
+#include "sectfrm.hxx" // wg. FtnAtEnd-Flag
// ftnfrm.cxx:
void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes );
@@ -53,10 +53,10 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes );
/*************************************************************************
|*
-|* SwColumnFrm::SwColumnFrm()
+|* SwColumnFrm::SwColumnFrm()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung AMA 30. Oct 98
+|* Ersterstellung MA ??
+|* Letzte Aenderung AMA 30. Oct 98
|*
|*************************************************************************/
SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt ):
@@ -83,10 +83,10 @@ SwColumnFrm::~SwColumnFrm()
/*************************************************************************
|*
-|* SwLayoutFrm::ChgColumns()
+|* SwLayoutFrm::ChgColumns()
|*
-|* Ersterstellung MA 11. Feb. 93
-|* Letzte Aenderung MA 12. Oct. 98
+|* Ersterstellung MA 11. Feb. 93
+|* Letzte Aenderung MA 12. Oct. 98
|*
|*************************************************************************/
@@ -107,7 +107,7 @@ void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, USHORT nCnt )
{
SwColumnFrm *pTmp = (SwColumnFrm*)pColumn->GetPrev();
pColumn->Cut();
- delete pColumn; //Format wird ggf. im DTor mit vernichtet.
+ delete pColumn; //Format wird ggf. im DTor mit vernichtet.
pColumn = pTmp;
}
}
@@ -220,7 +220,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
}
// <--
- USHORT nNewNum, nOldNum = 1;
+ USHORT nNewNum, nOldNum = 1;
if( Lower() && Lower()->IsColumnFrm() )
{
SwFrm* pCol = Lower();
@@ -288,9 +288,9 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
if ( !bAdjustAttributes )
{
- if ( rOld.GetLineWidth() != rNew.GetLineWidth() ||
- rOld.GetWishWidth() != rNew.GetWishWidth() ||
- rOld.IsOrtho() != rNew.IsOrtho() )
+ if ( rOld.GetLineWidth() != rNew.GetLineWidth() ||
+ rOld.GetWishWidth() != rNew.GetWishWidth() ||
+ rOld.IsOrtho() != rNew.IsOrtho() )
bAdjustAttributes = TRUE;
else
{
@@ -321,10 +321,10 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
/*************************************************************************
|*
-|* SwLayoutFrm::AdjustColumns()
+|* SwLayoutFrm::AdjustColumns()
|*
-|* Ersterstellung MA 19. Jan. 99
-|* Letzte Aenderung MA 19. Jan. 99
+|* Ersterstellung MA 19. Jan. 99
+|* Letzte Aenderung MA 19. Jan. 99
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 8ab8220de3fe..eeff8a954e83 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -2,7 +2,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
@@ -37,67 +37,67 @@
* bei denen auch das Verlassen der Methode mitprotokolliert werden soll, ein PROTOCOL_ENTER(...)-Makro
* stehen.
* Die Parameter der PROTOCOL-Makros sind
- * 1. Ein Pointer auf einen SwFrm, also meist "this" oder "rThis"
- * 2. Die Funktionsgruppe z.B. PROT_MAKEALL, hierueber wird (inline) entschieden, ob dies
- * zur Zeit protokolliert werden soll oder nicht.
- * 3. Die Aktion, im Normalfall 0, aber z.B. ein ACT_START bewirkt eine Einrueckung in der
- * Ausgabedatei, ein ACT_END nimmt dies wieder zurueck. Auf diese Art wird z.B. durch
- * PROTOCOL_ENTER am Anfang einer Methode eingerueckt und beim Verlassen wieder zurueck.
- * 4. Der vierte Parameter ist ein void-Pointer, damit man irgendetwas uebergeben kann,
- * was in das Protokoll einfliessen kann, typesches Beispiel bei PROT_GROW muss man
- * einen Pointer auf den Wert, um den gegrowt werden soll, uebergeben.
+ * 1. Ein Pointer auf einen SwFrm, also meist "this" oder "rThis"
+ * 2. Die Funktionsgruppe z.B. PROT_MAKEALL, hierueber wird (inline) entschieden, ob dies
+ * zur Zeit protokolliert werden soll oder nicht.
+ * 3. Die Aktion, im Normalfall 0, aber z.B. ein ACT_START bewirkt eine Einrueckung in der
+ * Ausgabedatei, ein ACT_END nimmt dies wieder zurueck. Auf diese Art wird z.B. durch
+ * PROTOCOL_ENTER am Anfang einer Methode eingerueckt und beim Verlassen wieder zurueck.
+ * 4. Der vierte Parameter ist ein void-Pointer, damit man irgendetwas uebergeben kann,
+ * was in das Protokoll einfliessen kann, typesches Beispiel bei PROT_GROW muss man
+ * einen Pointer auf den Wert, um den gegrowt werden soll, uebergeben.
*
*
* Das Protokoll ist die Datei "dbg_lay.out" im aktuellen (BIN-)Verzeichnis.
* Es enthaelt Zeilen mit FrmId, Funktionsgruppe sowie weiteren Infos.
*
* Was genau protokolliert wird, kann auf folgende Arten eingestellt werden:
- * 1. Die statische Variable SwProtokoll::nRecord enthaelt die Funktionsgruppen,
- * die aufgezeichnet werden sollen.
- * Ein Wert von z.B. PROT_GROW bewirkt, das Aufrufe von SwFrm::Grow dokumentiert werden,
- * PROT_MAKEALL protokolliert Aufrufe von xxx::MakeAll.
- * Die PROT_XY-Werte koennen oderiert werden.
- * Default ist Null, es wird keine Methode aufgezeichnet.
- * 2. In der SwImplProtocol-Klasse gibt es einen Filter fuer Frame-Typen,
- * nur die Methodenaufrufe von Frame-Typen, die dort gesetzt sind, werden protokolliert.
- * Der Member nTypes kann auf Werte wie FRM_PAGE, FRM_SECTION gesetzt und oderiert werden.
- * Default ist 0xFFFF, d.h. alle Frame-Typen.
- * 3. In der SwImplProtocol-Klasse gibt es einen ArrayPointer auf FrmIds, die zu ueberwachen sind.
- * Ist der Pointer Null, so werden alle Frames protokolliert, ansonsten nur Frames,
- * die in dem Array vermerkt sind.
+ * 1. Die statische Variable SwProtokoll::nRecord enthaelt die Funktionsgruppen,
+ * die aufgezeichnet werden sollen.
+ * Ein Wert von z.B. PROT_GROW bewirkt, das Aufrufe von SwFrm::Grow dokumentiert werden,
+ * PROT_MAKEALL protokolliert Aufrufe von xxx::MakeAll.
+ * Die PROT_XY-Werte koennen oderiert werden.
+ * Default ist Null, es wird keine Methode aufgezeichnet.
+ * 2. In der SwImplProtocol-Klasse gibt es einen Filter fuer Frame-Typen,
+ * nur die Methodenaufrufe von Frame-Typen, die dort gesetzt sind, werden protokolliert.
+ * Der Member nTypes kann auf Werte wie FRM_PAGE, FRM_SECTION gesetzt und oderiert werden.
+ * Default ist 0xFFFF, d.h. alle Frame-Typen.
+ * 3. In der SwImplProtocol-Klasse gibt es einen ArrayPointer auf FrmIds, die zu ueberwachen sind.
+ * Ist der Pointer Null, so werden alle Frames protokolliert, ansonsten nur Frames,
+ * die in dem Array vermerkt sind.
*
* Eine Aufzeichnung in Gang zu setzen, erfordert entweder Codemanipulation, z.B. in
* SwProtocol::Init() einen anderen Default fuer nRecord setzen oder Debuggermanipulation.
* Im Debugger gibt verschiedene, sich anbietende Stellen:
- * 1. In SwProtocol::Init() einen Breakpoint setzen und dort nRecord manipulieren, ggf.
- * FrmIds eintragen, dann beginnt die Aufzeichnung bereits beim Programmstart.
- * 2. Waehrend des Programmlaufs einen Breakpoint vor irgendein PROTOCOL oder PROTOCOL_ENTER-
- * Makro setzen, dann am SwProtocol::nRecord das unterste Bit setzen (PROT_INIT). Dies
- * bewirkt, dass die Funktionsgruppe des folgenden Makros aktiviert und in Zukunft
- * protokolliert wird.
- * 3. Spezialfall von 2.: Wenn man 2. in der Methode SwRootFrm::Paint(..) anwendet, werden
- * die Aufzeichnungseinstellung aus der Datei "dbg_lay.ini" ausgelesen!
- * In dieser INI-Datei kann es Kommentarzeilen geben, diese beginnen mit '#', dann
- * sind die Sektionen "[frmid]", "[frmtype]" und "[record]" relevant.
- * Nach [frmid] koennen die FrameIds der zu protokollierenden Frames folgen. Gibt es
- * dort keine Eintraege, werden alle Frames aufgezeichnet.
- * Nach [frmtype] koennen FrameTypen folgen, die aufgezeichnet werden sollen, da der
- * Default hier allerdings USHRT_MAX ist, werden sowieso alle aufgezeichnet. Man kann
- * allerdings auch Typen entfernen, in dem man ein '!' vor den Wert setzt, z.B.
- * !0xC000 nimmt die SwCntntFrms aus der Aufzeichnung heraus.
- * Nach [record] folgen die Funktionsgruppen, die aufgezeichnet werden sollen, Default
- * ist hier 0, also keine. Auch hier kann man mit einem vorgestellten '!' Funktionen
- * wieder entfernen.
- * Hier mal ein Beispiel fuer eine INI-Datei:
- * ------------------------------------------
- * #Funktionen: Alle, ausser PRTAREA
- * [record] 0xFFFFFFE !0x200
- * [frmid]
- * #folgende FrmIds:
- * 1 2 12 13 14 15
- * #keine Layoutframes ausser ColumnFrms
- * [frmtype] !0x3FFF 0x4
- * ------------------------------------------
+ * 1. In SwProtocol::Init() einen Breakpoint setzen und dort nRecord manipulieren, ggf.
+ * FrmIds eintragen, dann beginnt die Aufzeichnung bereits beim Programmstart.
+ * 2. Waehrend des Programmlaufs einen Breakpoint vor irgendein PROTOCOL oder PROTOCOL_ENTER-
+ * Makro setzen, dann am SwProtocol::nRecord das unterste Bit setzen (PROT_INIT). Dies
+ * bewirkt, dass die Funktionsgruppe des folgenden Makros aktiviert und in Zukunft
+ * protokolliert wird.
+ * 3. Spezialfall von 2.: Wenn man 2. in der Methode SwRootFrm::Paint(..) anwendet, werden
+ * die Aufzeichnungseinstellung aus der Datei "dbg_lay.ini" ausgelesen!
+ * In dieser INI-Datei kann es Kommentarzeilen geben, diese beginnen mit '#', dann
+ * sind die Sektionen "[frmid]", "[frmtype]" und "[record]" relevant.
+ * Nach [frmid] koennen die FrameIds der zu protokollierenden Frames folgen. Gibt es
+ * dort keine Eintraege, werden alle Frames aufgezeichnet.
+ * Nach [frmtype] koennen FrameTypen folgen, die aufgezeichnet werden sollen, da der
+ * Default hier allerdings USHRT_MAX ist, werden sowieso alle aufgezeichnet. Man kann
+ * allerdings auch Typen entfernen, in dem man ein '!' vor den Wert setzt, z.B.
+ * !0xC000 nimmt die SwCntntFrms aus der Aufzeichnung heraus.
+ * Nach [record] folgen die Funktionsgruppen, die aufgezeichnet werden sollen, Default
+ * ist hier 0, also keine. Auch hier kann man mit einem vorgestellten '!' Funktionen
+ * wieder entfernen.
+ * Hier mal ein Beispiel fuer eine INI-Datei:
+ * ------------------------------------------
+ * #Funktionen: Alle, ausser PRTAREA
+ * [record] 0xFFFFFFE !0x200
+ * [frmid]
+ * #folgende FrmIds:
+ * 1 2 12 13 14 15
+ * #keine Layoutframes ausser ColumnFrms
+ * [frmtype] !0x3FFF 0x4
+ * ------------------------------------------
*
* Wenn die Aufzeichnung erstmal laeuft, kann man in SwImplProtocol::_Record(...) mittels
* Debugger vielfaeltige Manipulationen vornehmen, z.B. bezueglich FrameTypen oder FrmIds.
@@ -149,15 +149,15 @@ ULONG lcl_GetFrameId( const SwFrm* pFrm )
class SwImplProtocol
{
- SvFileStream *pStream; // Ausgabestream
- SvUShortsSort *pFrmIds; // welche FrmIds sollen aufgezeichnet werden ( NULL == alle )
+ SvFileStream *pStream; // Ausgabestream
+ SvUShortsSort *pFrmIds; // welche FrmIds sollen aufgezeichnet werden ( NULL == alle )
SvLongs *pVar; // Variables
ByteString aLayer; // Einrueckung der Ausgabe (" " pro Start/End)
- USHORT nTypes; // welche Typen sollen aufgezeichnet werden
- USHORT nLineCount; // Ausgegebene Zeilen
- USHORT nMaxLines; // Maximal auszugebende Zeilen
- BYTE nInitFile; // Bereich (FrmId,FrmType,Record) beim Einlesen der INI-Datei
- BYTE nTestMode; // Special fuer Testformatierung, es wird ggf. nur
+ USHORT nTypes; // welche Typen sollen aufgezeichnet werden
+ USHORT nLineCount; // Ausgegebene Zeilen
+ USHORT nMaxLines; // Maximal auszugebende Zeilen
+ BYTE nInitFile; // Bereich (FrmId,FrmType,Record) beim Einlesen der INI-Datei
+ BYTE nTestMode; // Special fuer Testformatierung, es wird ggf. nur
// innerhalb einer Testformatierung aufgezeichnet.
void _Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam );
BOOL NewStream();
@@ -169,9 +169,9 @@ public:
// Aufzeichnen
void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam )
{ if( pStream ) _Record( pFrm, nFunction, nAct, pParam ); }
- BOOL InsertFrm( USHORT nFrmId ); // FrmId aufnehmen zum Aufzeichnen
- BOOL DeleteFrm( USHORT nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen
- void FileInit(); // Auslesen der INI-Datei
+ BOOL InsertFrm( USHORT nFrmId ); // FrmId aufnehmen zum Aufzeichnen
+ BOOL DeleteFrm( USHORT nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen
+ void FileInit(); // Auslesen der INI-Datei
void ChkStream() { if( !pStream ) NewStream(); }
void SnapShot( const SwFrm* pFrm, ULONG nFlags );
void GetVar( const USHORT nNo, long& rVar )
@@ -196,14 +196,14 @@ public:
class SwImplEnterLeave
{
protected:
- const SwFrm* pFrm; // Der Frame,
- ULONG nFunction, nAction; // die Funktion, ggf. die Aktion
- void* pParam; // und weitere Parameter
+ const SwFrm* pFrm; // Der Frame,
+ ULONG nFunction, nAction; // die Funktion, ggf. die Aktion
+ void* pParam; // und weitere Parameter
public:
SwImplEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar )
: pFrm( pF ), nFunction( nFunct ), nAction( nAct ), pParam( pPar ) {}
- virtual void Enter(); // Ausgabe beim Eintritt
- virtual void Leave(); // Ausgabe beim Verlassen
+ virtual void Enter(); // Ausgabe beim Eintritt
+ virtual void Leave(); // Ausgabe beim Verlassen
};
class SwSizeEnterLeave : public SwImplEnterLeave
@@ -212,7 +212,7 @@ class SwSizeEnterLeave : public SwImplEnterLeave
public:
SwSizeEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmHeight( pF->Frm().Height() ) {}
- virtual void Leave(); // Ausgabe der Groessenaenderung
+ virtual void Leave(); // Ausgabe der Groessenaenderung
};
class SwUpperEnterLeave : public SwImplEnterLeave
@@ -221,8 +221,8 @@ class SwUpperEnterLeave : public SwImplEnterLeave
public:
SwUpperEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmId( 0 ) {}
- virtual void Enter(); // Ausgabe
- virtual void Leave(); // Ausgabe der FrmId des Uppers
+ virtual void Enter(); // Ausgabe
+ virtual void Leave(); // Ausgabe der FrmId des Uppers
};
class SwFrmChangesLeave : public SwImplEnterLeave
@@ -231,29 +231,29 @@ class SwFrmChangesLeave : public SwImplEnterLeave
public:
SwFrmChangesLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar )
: SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrm( pF->Frm() ) {}
- virtual void Enter(); // keine Ausgabe
- virtual void Leave(); // Ausgabe bei Aenderung der Frm-Area
+ virtual void Enter(); // keine Ausgabe
+ virtual void Leave(); // Ausgabe bei Aenderung der Frm-Area
};
void SwProtocol::Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam )
{
if( Start() )
- { // Hier landen wir, wenn im Debugger SwProtocol::nRecord mit PROT_INIT(0x1) oderiert wurde
+ { // Hier landen wir, wenn im Debugger SwProtocol::nRecord mit PROT_INIT(0x1) oderiert wurde
BOOL bFinit = FALSE; // Dies bietet im Debugger die Moeglichkeit,
- if( bFinit ) // die Aufzeichnung dieser Action zu beenden
+ if( bFinit ) // die Aufzeichnung dieser Action zu beenden
{
- nRecord &= ~nFunction; // Diese Funktion nicht mehr aufzeichnen
- nRecord &= ~PROT_INIT; // PROT_INIT stets zuruecksetzen
+ nRecord &= ~nFunction; // Diese Funktion nicht mehr aufzeichnen
+ nRecord &= ~PROT_INIT; // PROT_INIT stets zuruecksetzen
return;
}
- nRecord |= nFunction; // Aufzeichnung dieser Funktion freischalten
- nRecord &= ~PROT_INIT; // PROT_INIT stets zuruecksetzen
+ nRecord |= nFunction; // Aufzeichnung dieser Funktion freischalten
+ nRecord &= ~PROT_INIT; // PROT_INIT stets zuruecksetzen
if( pImpl )
pImpl->ChkStream();
}
- if( !pImpl ) // Impl-Object anlegen, wenn noetig
+ if( !pImpl ) // Impl-Object anlegen, wenn noetig
pImpl = new SwImplProtocol();
- pImpl->Record( pFrm, nFunction, nAct, pParam ); // ...und Aufzeichnen
+ pImpl->Record( pFrm, nFunction, nAct, pParam ); // ...und Aufzeichnen
}
// Die folgende Funktion wird beim Anziehen der Writer-DLL durch TxtInit(..) aufgerufen
@@ -339,13 +339,13 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
{
rLine = rLine.ToLowerAscii(); // Gross/Kleinschreibung ist einerlei
while( STRING_LEN > rLine.SearchAndReplace( '\t', ' ' ) )
- ; //nothing // Tabs werden durch Blanks ersetzt
- if( '#' == rLine.GetChar(0) ) // Kommentarzeilen beginnen mit '#'
+ ; //nothing // Tabs werden durch Blanks ersetzt
+ if( '#' == rLine.GetChar(0) ) // Kommentarzeilen beginnen mit '#'
return;
- if( '[' == rLine.GetChar(0) ) // Bereiche: FrmIds, Typen oder Funktionen
+ if( '[' == rLine.GetChar(0) ) // Bereiche: FrmIds, Typen oder Funktionen
{
ByteString aTmp = rLine.GetToken( 0, ']' );
- if( "[frmid" == aTmp ) // Bereich FrmIds
+ if( "[frmid" == aTmp ) // Bereich FrmIds
{
nInitFile = 1;
delete pFrmIds;
@@ -354,7 +354,7 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
else if( "[frmtype" == aTmp )// Bereich Typen
{
nInitFile = 2;
- nTypes = USHRT_MAX; // Default: Alle FrmaeTypen aufzeichnen
+ nTypes = USHRT_MAX; // Default: Alle FrmaeTypen aufzeichnen
}
else if( "[record" == aTmp )// Bereich Funktionen
{
@@ -378,17 +378,17 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
pVar = new SvLongs( 5, 5 );
}
else
- nInitFile = 0; // Nanu: Unbekannter Bereich?
+ nInitFile = 0; // Nanu: Unbekannter Bereich?
rLine.Erase( 0, aTmp.Len() + 1 );
}
- USHORT nToks = rLine.GetTokenCount( ' ' ); // Blanks (oder Tabs) sind die Trenner
+ USHORT nToks = rLine.GetTokenCount( ' ' ); // Blanks (oder Tabs) sind die Trenner
for( USHORT i=0; i < nToks; ++i )
{
ByteString aTok = rLine.GetToken( i, ' ' );
BOOL bNo = FALSE;
if( '!' == aTok.GetChar(0) )
{
- bNo = TRUE; // Diese(n) Funktion/Typ entfernen
+ bNo = TRUE; // Diese(n) Funktion/Typ entfernen
aTok.Erase( 0, 1 );
}
if( aTok.Len() )
@@ -397,31 +397,31 @@ void SwImplProtocol::CheckLine( ByteString& rLine )
sscanf( aTok.GetBuffer(), "%li", &nVal );
switch ( nInitFile )
{
- case 1: InsertFrm( USHORT( nVal ) ); // FrmId aufnehmen
+ case 1: InsertFrm( USHORT( nVal ) ); // FrmId aufnehmen
break;
case 2: {
USHORT nNew = (USHORT)nVal;
if( bNo )
- nTypes &= ~nNew; // Typ entfernen
+ nTypes &= ~nNew; // Typ entfernen
else
- nTypes |= nNew; // Typ aufnehmen
+ nTypes |= nNew; // Typ aufnehmen
}
break;
case 3: {
ULONG nOld = SwProtocol::Record();
if( bNo )
- nOld &= ~nVal; // Funktion entfernen
+ nOld &= ~nVal; // Funktion entfernen
else
- nOld |= nVal; // Funktion aufnehmen
+ nOld |= nVal; // Funktion aufnehmen
SwProtocol::SetRecord( nOld );
}
break;
case 4: {
BYTE nNew = (BYTE)nVal;
if( bNo )
- nTestMode &= ~nNew; // TestMode zuruecksetzen
+ nTestMode &= ~nNew; // TestMode zuruecksetzen
else
- nTestMode |= nNew; // TestMode setzen
+ nTestMode |= nNew; // TestMode setzen
}
break;
case 5: nMaxLines = (USHORT)nVal;
@@ -449,19 +449,19 @@ void SwImplProtocol::FileInit()
{
sal_Char c;
aStream >> c;
- if( '\n' == c || '\r' == c ) // Zeilenende
+ if( '\n' == c || '\r' == c ) // Zeilenende
{
aLine.EraseLeadingChars();
aLine.EraseTrailingChars();
if( aLine.Len() )
- CheckLine( aLine ); // Zeile auswerten
+ CheckLine( aLine ); // Zeile auswerten
aLine.Erase();
}
else
aLine += c;
}
if( aLine.Len() )
- CheckLine( aLine ); // letzte Zeile auswerten
+ CheckLine( aLine ); // letzte Zeile auswerten
}
aStream.Close();
}
@@ -562,7 +562,7 @@ void lcl_FrameType( ByteString& rOut, const SwFrm* pFrm )
void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam )
{
USHORT nSpecial = 0;
- if( nSpecial ) // Debugger-Manipulationsmoeglichkeit
+ if( nSpecial ) // Debugger-Manipulationsmoeglichkeit
{
USHORT nId = USHORT(lcl_GetFrameId( pFrm ));
switch ( nSpecial )
@@ -589,12 +589,12 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo
ByteString aOut = aLayer;
aOut += ByteString::CreateFromInt64( lcl_GetFrameId( pFrm ) );
aOut += ' ';
- lcl_FrameType( aOut, pFrm ); // dann den FrameType
- switch ( nFunction ) // und die Funktion
+ lcl_FrameType( aOut, pFrm ); // dann den FrameType
+ switch ( nFunction ) // und die Funktion
{
case PROT_SNAPSHOT: lcl_Flags( aOut, pFrm );
break;
- case PROT_MAKEALL: aOut += "MakeAll";
+ case PROT_MAKEALL: aOut += "MakeAll";
lcl_Start( aOut, aLayer, nAct );
if( nAct == ACT_START )
lcl_Flags( aOut, pFrm );
@@ -618,7 +618,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo
break;
case PROT_ADJUSTN :
case PROT_SHRINK: bTmp = TRUE; // NoBreak
- case PROT_GROW: aOut += !bTmp ? "Grow" :
+ case PROT_GROW: aOut += !bTmp ? "Grow" :
( nFunction == PROT_SHRINK ? "Shrink" : "AdjustNgbhd" );
lcl_Start( aOut, aLayer, nAct );
if( pParam )
@@ -627,16 +627,16 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo
aOut += ByteString::CreateFromInt64( *((long*)pParam) );
}
break;
- case PROT_POS: break;
- case PROT_PRTAREA: aOut += "PrtArea";
+ case PROT_POS: break;
+ case PROT_PRTAREA: aOut += "PrtArea";
lcl_Start( aOut, aLayer, nAct );
break;
- case PROT_SIZE: aOut += "Size";
+ case PROT_SIZE: aOut += "Size";
lcl_Start( aOut, aLayer, nAct );
aOut += ' ';
aOut += ByteString::CreateFromInt64( pFrm->Frm().Height() );
break;
- case PROT_LEAF: aOut += "Prev/NextLeaf";
+ case PROT_LEAF: aOut += "Prev/NextLeaf";
lcl_Start( aOut, aLayer, nAct );
aOut += ' ';
if( pParam )
@@ -650,8 +650,8 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo
break;
case PROT_SECTION: SectFunc( aOut, pFrm, nAct, pParam );
break;
- case PROT_CUT: bTmp = TRUE; // NoBreak
- case PROT_PASTE: aOut += bTmp ? "Cut from " : "Paste to ";
+ case PROT_CUT: bTmp = TRUE; // NoBreak
+ case PROT_PASTE: aOut += bTmp ? "Cut from " : "Paste to ";
aOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) );
break;
case PROT_TESTFORMAT: aOut += "Test";
@@ -695,8 +695,8 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo
break;
}
}
- *pStream << aOut.GetBuffer() << endl; // Ausgabe
- pStream->Flush(); // Gleich auf die Platte, damit man mitlesen kann
+ *pStream << aOut.GetBuffer() << endl; // Ausgabe
+ pStream->Flush(); // Gleich auf die Platte, damit man mitlesen kann
if( ++nLineCount >= nMaxLines ) // Maximale Ausgabe erreicht?
SwProtocol::SetRecord( 0 ); // => Ende der Aufzeichnung
}
@@ -711,7 +711,7 @@ void SwImplProtocol::SectFunc( ByteString &rOut, const SwFrm* , ULONG nAct, void
BOOL bTmp = FALSE;
switch( nAct )
{
- case ACT_MERGE: rOut += "Merge Section ";
+ case ACT_MERGE: rOut += "Merge Section ";
rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) );
break;
case ACT_CREATE_MASTER: bTmp = TRUE; // NoBreak
@@ -719,8 +719,8 @@ void SwImplProtocol::SectFunc( ByteString &rOut, const SwFrm* , ULONG nAct, void
rOut += bTmp ? "Master to " : "Follow from ";
rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) );
break;
- case ACT_DEL_MASTER: bTmp = TRUE; // NoBreak
- case ACT_DEL_FOLLOW: rOut += "Delete Section ";
+ case ACT_DEL_MASTER: bTmp = TRUE; // NoBreak
+ case ACT_DEL_FOLLOW: rOut += "Delete Section ";
rOut += bTmp ? "Master to " : "Follow from ";
rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) );
break;
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 9944ccce1a4b..34a715952cbe 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -2,7 +2,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
@@ -53,12 +53,12 @@
/*************************************************************************
|*
-|* FindBodyCont, FindLastBodyCntnt()
+|* FindBodyCont, FindLastBodyCntnt()
|*
-|* Beschreibung Sucht den ersten/letzten CntntFrm im BodyText unterhalb
-|* der Seite.
-|* Ersterstellung MA 15. Feb. 93
-|* Letzte Aenderung MA 18. Apr. 94
+|* Beschreibung Sucht den ersten/letzten CntntFrm im BodyText unterhalb
+|* der Seite.
+|* Ersterstellung MA 15. Feb. 93
+|* Letzte Aenderung MA 18. Apr. 94
|*
|*************************************************************************/
SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
@@ -74,7 +74,7 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
SwCntntFrm *pRet = FindFirstBodyCntnt();
SwCntntFrm *pNxt = pRet;
while ( pNxt && pNxt->IsInDocBody() && IsAnLower( pNxt ) )
- { pRet = pNxt;
+ { pRet = pNxt;
pNxt = pNxt->FindNextCnt();
}
return pRet;
@@ -82,14 +82,14 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
/*************************************************************************
|*
-|* SwLayoutFrm::ContainsCntnt
+|* SwLayoutFrm::ContainsCntnt
|*
-|* Beschreibung Prueft, ob der Frame irgendwo in seiner
-|* untergeordneten Struktur einen oder mehrere CntntFrm's enthaelt;
-|* Falls ja wird der erste gefundene CntntFrm zurueckgegeben.
+|* Beschreibung Prueft, ob der Frame irgendwo in seiner
+|* untergeordneten Struktur einen oder mehrere CntntFrm's enthaelt;
+|* Falls ja wird der erste gefundene CntntFrm zurueckgegeben.
|*
-|* Ersterstellung MA 13. May. 92
-|* Letzte Aenderung MA 20. Apr. 94
+|* Ersterstellung MA 13. May. 92
+|* Letzte Aenderung MA 20. Apr. 94
|*
|*************************************************************************/
@@ -137,14 +137,14 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
/*************************************************************************
|*
-|* SwLayoutFrm::FirstCell
+|* SwLayoutFrm::FirstCell
|*
-|* Beschreibung ruft zunaechst ContainsAny auf, um in die innerste Zelle
-|* hineinzukommen. Dort hangelt es sich wieder hoch zum
-|* ersten SwCellFrm, seit es SectionFrms gibt, reicht kein
-|* ContainsCntnt()->GetUpper() mehr...
-|* Ersterstellung AMA 17. Mar. 99
-|* Letzte Aenderung AMA 17. Mar. 99
+|* Beschreibung ruft zunaechst ContainsAny auf, um in die innerste Zelle
+|* hineinzukommen. Dort hangelt es sich wieder hoch zum
+|* ersten SwCellFrm, seit es SectionFrms gibt, reicht kein
+|* ContainsCntnt()->GetUpper() mehr...
+|* Ersterstellung AMA 17. Mar. 99
+|* Letzte Aenderung AMA 17. Mar. 99
|*
|*************************************************************************/
@@ -158,12 +158,12 @@ const SwCellFrm *SwLayoutFrm::FirstCell() const
/*************************************************************************
|*
-|* SwLayoutFrm::ContainsAny
+|* SwLayoutFrm::ContainsAny
|*
-|* Beschreibung wie ContainsCntnt, nur dass nicht nur CntntFrms, sondern auch
-|* Bereiche und Tabellen zurueckgegeben werden.
-|* Ersterstellung AMA 10. Mar. 99
-|* Letzte Aenderung AMA 10. Mar. 99
+|* Beschreibung wie ContainsCntnt, nur dass nicht nur CntntFrms, sondern auch
+|* Bereiche und Tabellen zurueckgegeben werden.
+|* Ersterstellung AMA 10. Mar. 99
+|* Letzte Aenderung AMA 10. Mar. 99
|*
|*************************************************************************/
@@ -215,10 +215,10 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
/*************************************************************************
|*
-|* SwFrm::GetLower()
+|* SwFrm::GetLower()
|*
-|* Ersterstellung MA 27. Jul. 92
-|* Letzte Aenderung MA 09. Oct. 97
+|* Ersterstellung MA 27. Jul. 92
+|* Letzte Aenderung MA 09. Oct. 97
|*
|*************************************************************************/
const SwFrm* SwFrm::GetLower() const
@@ -233,10 +233,10 @@ SwFrm* SwFrm::GetLower()
/*************************************************************************
|*
-|* SwLayoutFrm::IsAnLower()
+|* SwLayoutFrm::IsAnLower()
|*
-|* Ersterstellung MA 18. Mar. 93
-|* Letzte Aenderung MA 18. Mar. 93
+|* Ersterstellung MA 18. Mar. 93
+|* Letzte Aenderung MA 18. Mar. 93
|*
|*************************************************************************/
BOOL SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
@@ -462,11 +462,11 @@ const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const
/*************************************************************************
|*
-|* SwFrm::FindRootFrm(), FindTabFrm(), FindFtnFrm(), FindFlyFrm(),
-|* FindPageFrm(), FindColFrm()
+|* SwFrm::FindRootFrm(), FindTabFrm(), FindFtnFrm(), FindFlyFrm(),
+|* FindPageFrm(), FindColFrm()
|*
-|* Ersterstellung ??
-|* Letzte Aenderung MA 05. Sep. 93
+|* Ersterstellung ??
+|* Letzte Aenderung MA 05. Sep. 93
|*
|*************************************************************************/
SwRootFrm* SwFrm::FindRootFrm()
@@ -592,7 +592,7 @@ SwFrm *SwFrm::FindColFrm()
{
SwFrm *pFrm = this;
do
- { pFrm = pFrm->GetUpper();
+ { pFrm = pFrm->GetUpper();
} while ( pFrm && !pFrm->IsColumnFrm() );
return pFrm;
}
@@ -601,7 +601,7 @@ SwRowFrm *SwFrm::FindRowFrm()
{
SwFrm *pFrm = this;
do
- { pFrm = pFrm->GetUpper();
+ { pFrm = pFrm->GetUpper();
} while ( pFrm && !pFrm->IsRowFrm() );
return dynamic_cast< SwRowFrm* >( pFrm );
}
@@ -610,7 +610,7 @@ SwFrm* SwFrm::FindFooterOrHeader()
{
SwFrm* pRet = this;
do
- { if ( pRet->GetType() & 0x0018 ) //Header und Footer
+ { if ( pRet->GetType() & 0x0018 ) //Header und Footer
return pRet;
else if ( pRet->GetUpper() )
pRet = pRet->GetUpper();
@@ -674,10 +674,10 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
/*************************************************************************
|*
-|* SwFrmFrm::GetAttrSet()
+|* SwFrmFrm::GetAttrSet()
|*
-|* Ersterstellung MA 02. Aug. 93
-|* Letzte Aenderung MA 02. Aug. 93
+|* Ersterstellung MA 02. Aug. 93
+|* Letzte Aenderung MA 02. Aug. 93
|*
|*************************************************************************/
const SwAttrSet* SwFrm::GetAttrSet() const
@@ -690,24 +690,24 @@ const SwAttrSet* SwFrm::GetAttrSet() const
/*************************************************************************
|*
-|* SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos()
-|* _FindNextCnt() geht in Tabellen und Bereiche hineinund liefert
+|* SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos()
+|* _FindNextCnt() geht in Tabellen und Bereiche hineinund liefert
|* nur SwCntntFrms.
|*
-|* Beschreibung Invalidiert die Position des Naechsten Frames.
-|* Dies ist der direkte Nachfolger, oder bei CntntFrm's der naechste
-|* CntntFrm der im gleichen Fluss liegt wie ich:
-|* - Body,
-|* - Fussnoten,
-|* - Bei Kopf-/Fussbereichen ist die Benachrichtigung nur innerhalb des
-|* Bereiches weiterzuleiten.
-|* - dito fuer Flys.
-|* - Cntnts in Tabs halten sich ausschliesslich innerhalb ihrer Zelle
-|* auf.
-|* - Tabellen verhalten sich prinzipiell analog zu den Cntnts
-|* - Bereiche ebenfalls
-|* Ersterstellung AK 14-Feb-1991
-|* Letzte Aenderung AMA 10. Mar. 99
+|* Beschreibung Invalidiert die Position des Naechsten Frames.
+|* Dies ist der direkte Nachfolger, oder bei CntntFrm's der naechste
+|* CntntFrm der im gleichen Fluss liegt wie ich:
+|* - Body,
+|* - Fussnoten,
+|* - Bei Kopf-/Fussbereichen ist die Benachrichtigung nur innerhalb des
+|* Bereiches weiterzuleiten.
+|* - dito fuer Flys.
+|* - Cntnts in Tabs halten sich ausschliesslich innerhalb ihrer Zelle
+|* auf.
+|* - Tabellen verhalten sich prinzipiell analog zu den Cntnts
+|* - Bereiche ebenfalls
+|* Ersterstellung AK 14-Feb-1991
+|* Letzte Aenderung AMA 10. Mar. 99
|*
|*************************************************************************/
@@ -843,7 +843,7 @@ SwFrm *SwFrm::_FindNext()
pRet = pNxtCnt->IsInTab() ? pNxtCnt->FindTabFrm()
: (SwFrm*)pNxtCnt;
}
- else //Fuss-/oder Kopfbereich
+ else //Fuss-/oder Kopfbereich
{
const SwFrm *pUp = pThis->GetUpper();
const SwFrm *pCntUp = pNxtCnt->GetUpper();
@@ -920,7 +920,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
while ( pNxtCnt )
{
if ( (bBody && pNxtCnt->IsInDocBody()) ||
- (bFtn && pNxtCnt->IsInFtn()) )
+ (bFtn && pNxtCnt->IsInFtn()) )
return pNxtCnt;
pNxtCnt = pNxtCnt->GetNextCntntFrm();
}
@@ -1171,7 +1171,7 @@ SwFrm *SwFrm::_FindPrev()
while ( pPrvCnt )
{
if ( (bBody && pPrvCnt->IsInDocBody()) ||
- (bFtn && pPrvCnt->IsInFtn()) )
+ (bFtn && pPrvCnt->IsInFtn()) )
{
pRet = pPrvCnt->IsInTab() ? pPrvCnt->FindTabFrm()
: (SwFrm*)pPrvCnt;
@@ -1186,7 +1186,7 @@ SwFrm *SwFrm::_FindPrev()
: (SwFrm*)pPrvCnt;
return pRet;
}
- else //Fuss-/oder Kopfbereich oder Fly
+ else //Fuss-/oder Kopfbereich oder Fly
{
const SwFrm *pUp = pThis->GetUpper();
const SwFrm *pCntUp = pPrvCnt->GetUpper();
@@ -1304,9 +1304,9 @@ void SwFrm::InvalidateNextPrtArea()
/*************************************************************************
|*
-|* lcl_IsInColSect()
-|* liefert nur TRUE, wenn der Frame _direkt_ in einem spaltigen Bereich steht,
-|* nicht etwa, wenn er in einer Tabelle steht, die in einem spaltigen Bereich ist.
+|* lcl_IsInColSect()
+|* liefert nur TRUE, wenn der Frame _direkt_ in einem spaltigen Bereich steht,
+|* nicht etwa, wenn er in einer Tabelle steht, die in einem spaltigen Bereich ist.
|*
|*************************************************************************/
@@ -1328,10 +1328,10 @@ BOOL lcl_IsInColSct( const SwFrm *pUp )
/*************************************************************************
|*
-|* SwFrm::IsMoveable();
+|* SwFrm::IsMoveable();
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 05. May. 95
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 05. May. 95
|*
|*************************************************************************/
/** determine, if frame is moveable in given environment
@@ -1409,16 +1409,16 @@ bool SwFrm::IsMoveable( const SwLayoutFrm* _pLayoutFrm ) const
/*************************************************************************
|*
-|* SwFrm::SetInfFlags();
+|* SwFrm::SetInfFlags();
|*
-|* Ersterstellung MA 05. Apr. 94
-|* Letzte Aenderung MA 05. Apr. 94
+|* Ersterstellung MA 05. Apr. 94
+|* Letzte Aenderung MA 05. Apr. 94
|*
|*************************************************************************/
void SwFrm::SetInfFlags()
{
if ( !IsFlyFrm() && !GetUpper() ) //noch nicht gepastet, keine Informationen
- return; //lieferbar
+ return; //lieferbar
bInfInvalid = bInfBody = bInfTab = bInfFly = bInfFtn = bInfSct = FALSE;
@@ -1689,7 +1689,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
if ( bStart )
{
// do not enter a repeated headline:
- if ( bDoNotEnterHeadline && pTableFrm->IsFollow() &&
+ if ( bDoNotEnterHeadline && pTableFrm->IsFollow() &&
pTableFrm->IsInHeadline( *pCurrentRow->GetPrev() ) )
break;
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 89c7a26d7e5f..aefff7ebe3f6 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -77,10 +77,10 @@ BOOL SwFlowFrm::bMoveBwdJump = FALSE;
/*************************************************************************
|*
-|* SwFlowFrm::SwFlowFrm()
+|* SwFlowFrm::SwFlowFrm()
|*
-|* Ersterstellung MA 26. Apr. 95
-|* Letzte Aenderung MA 26. Apr. 95
+|* Ersterstellung MA 26. Apr. 95
+|* Letzte Aenderung MA 26. Apr. 95
|*
|*************************************************************************/
@@ -115,10 +115,10 @@ sal_Bool SwFlowFrm::HasLockedFollow() const
/*************************************************************************
|*
-|* SwFlowFrm::IsKeepFwdMoveAllowed()
+|* SwFlowFrm::IsKeepFwdMoveAllowed()
|*
-|* Ersterstellung MA 20. Jul. 94
-|* Letzte Aenderung MA 16. May. 95
+|* Ersterstellung MA 20. Jul. 94
+|* Letzte Aenderung MA 16. May. 95
|*
|*************************************************************************/
@@ -131,7 +131,7 @@ BOOL SwFlowFrm::IsKeepFwdMoveAllowed()
SwFrm *pFrm = &rThis;
if ( !pFrm->IsInFtn() )
do
- { if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
+ { if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
pFrm = pFrm->GetIndPrev();
else
return TRUE;
@@ -146,11 +146,11 @@ BOOL SwFlowFrm::IsKeepFwdMoveAllowed()
/*************************************************************************
|*
-|* SwFlowFrm::CheckKeep()
+|* SwFlowFrm::CheckKeep()
|*
-|* Beschreibung
-|* Ersterstellung MA 20. Jun. 95
-|* Letzte Aenderung MA 09. Apr. 97
+|* Beschreibung
+|* Ersterstellung MA 20. Jun. 95
+|* Letzte Aenderung MA 09. Apr. 97
|*
|*************************************************************************/
@@ -189,10 +189,10 @@ void SwFlowFrm::CheckKeep()
/*************************************************************************
|*
-|* SwFlowFrm::IsKeep()
+|* SwFlowFrm::IsKeep()
|*
-|* Ersterstellung MA 09. Apr. 97
-|* Letzte Aenderung MA 09. Apr. 97
+|* Ersterstellung MA 09. Apr. 97
+|* Letzte Aenderung MA 09. Apr. 97
|*
|*************************************************************************/
@@ -289,10 +289,10 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep
/*************************************************************************
|*
-|* SwFlowFrm::BwdMoveNecessary()
+|* SwFlowFrm::BwdMoveNecessary()
|*
-|* Ersterstellung MA 20. Jul. 94
-|* Letzte Aenderung MA 02. May. 96
+|* Ersterstellung MA 20. Jul. 94
+|* Letzte Aenderung MA 02. May. 96
|*
|*************************************************************************/
@@ -405,13 +405,13 @@ BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect )
/*************************************************************************
|*
-|* SwFlowFrm::CutTree(), PasteTree(), MoveSubTree()
+|* SwFlowFrm::CutTree(), PasteTree(), MoveSubTree()
|*
-|* Beschreibung Eine Spezialisierte Form des Cut() und Paste(), die
-|* eine ganze Kette umhaengt (naehmlich this und folgende). Dabei werden
-|* nur minimale Operationen und Benachrichtigungen ausgefuehrt.
-|* Ersterstellung MA 18. Mar. 93
-|* Letzte Aenderung MA 18. May. 95
+|* Beschreibung Eine Spezialisierte Form des Cut() und Paste(), die
+|* eine ganze Kette umhaengt (naehmlich this und folgende). Dabei werden
+|* nur minimale Operationen und Benachrichtigungen ausgefuehrt.
+|* Ersterstellung MA 18. Mar. 93
+|* Letzte Aenderung MA 18. May. 95
|*
|*************************************************************************/
@@ -549,7 +549,7 @@ BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
SWRECTFN( pParent )
SwTwips nGrowVal = 0;
do
- { pFloat->pUpper = pParent;
+ { pFloat->pUpper = pParent;
pFloat->_InvalidateAll();
pFloat->CheckDirChange();
@@ -558,7 +558,7 @@ BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
if ( pFloat->IsTxtFrm() )
{
if ( ((SwTxtFrm*)pFloat)->GetCacheIdx() != USHRT_MAX )
- ((SwTxtFrm*)pFloat)->Init(); //Ich bin sein Freund.
+ ((SwTxtFrm*)pFloat)->Init(); //Ich bin sein Freund.
}
else
bRet = TRUE;
@@ -625,7 +625,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
pPre->InvalidatePage();
}
else
- { rThis.GetUpper()->SetCompletePaint();
+ { rThis.GetUpper()->SetCompletePaint();
rThis.GetUpper()->InvalidatePage();
}
}
@@ -685,10 +685,10 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
/*************************************************************************
|*
-|* SwFlowFrm::IsAnFollow()
+|* SwFlowFrm::IsAnFollow()
|*
-|* Ersterstellung MA 26. Apr. 95
-|* Letzte Aenderung MA 26. Apr. 95
+|* Ersterstellung MA 26. Apr. 95
+|* Letzte Aenderung MA 26. Apr. 95
|*
|*************************************************************************/
@@ -697,7 +697,7 @@ BOOL SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
{
const SwFlowFrm *pFoll = this;
do
- { if ( pAssumed == pFoll )
+ { if ( pAssumed == pFoll )
return TRUE;
pFoll = pFoll->GetFollow();
} while ( pFoll );
@@ -707,10 +707,10 @@ BOOL SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
/*************************************************************************
|*
-|* SwFlowFrm::FindMaster()
+|* SwFlowFrm::FindMaster()
|*
-|* Ersterstellung MA 26. Apr. 95
-|* Letzte Aenderung MA 26. Apr. 95
+|* Ersterstellung MA 26. Apr. 95
+|* Letzte Aenderung MA 26. Apr. 95
|*
|*************************************************************************/
@@ -806,14 +806,14 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
/*************************************************************************
|*
-|* SwFrm::GetLeaf()
+|* SwFrm::GetLeaf()
|*
-|* Beschreibung Liefert das naechste/vorhergehende LayoutBlatt,
-|* das _nicht_ unterhalb von this liegt (oder gar this selbst ist).
-|* Ausserdem muss dieses LayoutBlatt im gleichen Textfluss wie
-|* pAnch Ausgangsfrm liegen (Body, Ftn)
-|* Ersterstellung MA 25. Nov. 92
-|* Letzte Aenderung MA 25. Apr. 95
+|* Beschreibung Liefert das naechste/vorhergehende LayoutBlatt,
+|* das _nicht_ unterhalb von this liegt (oder gar this selbst ist).
+|* Ausserdem muss dieses LayoutBlatt im gleichen Textfluss wie
+|* pAnch Ausgangsfrm liegen (Body, Ftn)
+|* Ersterstellung MA 25. Nov. 92
+|* Letzte Aenderung MA 25. Apr. 95
|*
|*************************************************************************/
@@ -829,13 +829,13 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd,
BOOL bFound = FALSE;
do
- { pLeaf = ((SwFrm*)pLeaf)->GetLeaf( eMakePage, bFwd );
+ { pLeaf = ((SwFrm*)pLeaf)->GetLeaf( eMakePage, bFwd );
if ( pLeaf &&
(!IsLayoutFrm() || !((SwLayoutFrm*)this)->IsAnLower( pLeaf )))
{
if ( pAnch->IsInDocBody() == pLeaf->IsInDocBody() &&
- pAnch->IsInFtn() == pLeaf->IsInFtn() )
+ pAnch->IsInFtn() == pLeaf->IsInFtn() )
{
bFound = TRUE;
}
@@ -847,12 +847,12 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd,
/*************************************************************************
|*
-|* SwFrm::GetLeaf()
+|* SwFrm::GetLeaf()
|*
-|* Beschreibung Ruft Get[Next|Prev]Leaf
+|* Beschreibung Ruft Get[Next|Prev]Leaf
|*
-|* Ersterstellung MA 20. Mar. 93
-|* Letzte Aenderung MA 25. Apr. 95
+|* Ersterstellung MA 20. Mar. 93
+|* Letzte Aenderung MA 25. Apr. 95
|*
|*************************************************************************/
@@ -971,13 +971,13 @@ BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew )
/*************************************************************************
|*
-|* SwFrm::GetNextLeaf()
+|* SwFrm::GetNextLeaf()
|*
-|* Beschreibung Liefert das naechste LayoutBlatt in den das
-|* Frame gemoved werden kann.
+|* Beschreibung Liefert das naechste LayoutBlatt in den das
+|* Frame gemoved werden kann.
|*
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 05. Dec. 96
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 05. Dec. 96
|*
|*************************************************************************/
@@ -986,7 +986,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
OSL_ENSURE( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
- const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
+ const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
//Will ich auch im Body landen.
// Bei Flys macht es keinen Sinn, Seiten einzufuegen, wir wollen lediglich
@@ -1007,10 +1007,10 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
if ( !pLayLeaf )
pLayLeaf = GetNextLayoutLeaf();
- SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten
+ SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten
//nicht wieder vom Anfang gesucht
//wird.
- BOOL bNewPg = FALSE; //nur einmal eine neue Seite einfuegen.
+ BOOL bNewPg = FALSE; //nur einmal eine neue Seite einfuegen.
while ( TRUE )
{
@@ -1021,7 +1021,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
//Dazu braucht er nur von der gleichen Art wie mein Ausgangspunkt
//sein (DocBody bzw. Footnote.)
if ( pLayLeaf->FindPageFrm()->IsFtnPage() )
- { //Wenn ich bei den Endnotenseiten angelangt bin hat sichs.
+ { //Wenn ich bei den Endnotenseiten angelangt bin hat sichs.
pLayLeaf = 0;
continue;
}
@@ -1115,12 +1115,12 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
/*************************************************************************
|*
-|* SwFrm::GetPrevLeaf()
+|* SwFrm::GetPrevLeaf()
|*
-|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
-|* Frame gemoved werden kann.
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung MA 25. Apr. 95
+|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
+|* Frame gemoved werden kann.
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung MA 25. Apr. 95
|*
|*************************************************************************/
@@ -1129,7 +1129,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
{
OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
- const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
+ const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
//will ich auch im Body landen.
const BOOL bFly = IsInFly();
@@ -1138,8 +1138,8 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
while ( pLayLeaf )
{
- if ( pLayLeaf->IsInTab() || //In Tabellen geht's niemals hinein.
- pLayLeaf->IsInSct() ) //In Bereiche natuerlich auch nicht!
+ if ( pLayLeaf->IsInTab() || //In Tabellen geht's niemals hinein.
+ pLayLeaf->IsInSct() ) //In Bereiche natuerlich auch nicht!
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
else if ( bBody && pLayLeaf->IsInDocBody() )
{
@@ -1151,7 +1151,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
SwFlowFrm::SetMoveBwdJump( TRUE );
}
else if ( bFly )
- break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein.
+ break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein.
else
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
}
@@ -1160,10 +1160,10 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
/*************************************************************************
|*
-|* SwFlowFrm::IsPrevObjMove()
+|* SwFlowFrm::IsPrevObjMove()
|*
-|* Ersterstellung MA 20. Feb. 96
-|* Letzte Aenderung MA 22. Feb. 96
+|* Ersterstellung MA 20. Feb. 96
+|* Letzte Aenderung MA 22. Feb. 96
|*
|*************************************************************************/
@@ -1181,8 +1181,8 @@ BOOL SwFlowFrm::IsPrevObjMove() const
if ( pPre && pPre->GetDrawObjs() )
{
- OSL_ENSURE( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
- if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) )
+ OSL_ENSURE( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
+ if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) )
return FALSE;
SwLayoutFrm* pPreUp = pPre->GetUpper();
// Wenn der Upper ein SectionFrm oder die Spalte eines SectionFrms ist,
@@ -1228,24 +1228,24 @@ BOOL SwFlowFrm::IsPrevObjMove() const
/*************************************************************************
|*
-|* BOOL SwFlowFrm::IsPageBreak()
+|* BOOL SwFlowFrm::IsPageBreak()
|*
-|* Beschreibung Wenn vor dem Frm ein harter Seitenumbruch steht UND
-|* es einen Vorgaenger auf der gleichen Seite gibt, wird TRUE
-|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
-|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
-|* zurueck, wenn ein PageBreak besteht.
-|* Fuer Follows wird der harte Seitenumbruch natuerlich nicht
-|* ausgewertet.
-|* Der Seitenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
-|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger auf der Seite
-|* gibt ist jede weitere Ueberlegung ueberfluessig.
-|* Ein Seitenumbruch (oder der Bedarf) liegt auch dann vor, wenn
-|* im FrmFmt ein PageDesc angegeben wird.
-|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
-|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 21. Mar. 95
+|* Beschreibung Wenn vor dem Frm ein harter Seitenumbruch steht UND
+|* es einen Vorgaenger auf der gleichen Seite gibt, wird TRUE
+|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
+|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
+|* zurueck, wenn ein PageBreak besteht.
+|* Fuer Follows wird der harte Seitenumbruch natuerlich nicht
+|* ausgewertet.
+|* Der Seitenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
+|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger auf der Seite
+|* gibt ist jede weitere Ueberlegung ueberfluessig.
+|* Ein Seitenumbruch (oder der Bedarf) liegt auch dann vor, wenn
+|* im FrmFmt ein PageDesc angegeben wird.
+|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
+|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 21. Mar. 95
|*
|*************************************************************************/
@@ -1268,11 +1268,11 @@ BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const
{
OSL_ENSURE( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
if ( bAct )
- { if ( rThis.FindPageFrm() == pPrev->FindPageFrm() )
+ { if ( rThis.FindPageFrm() == pPrev->FindPageFrm() )
return FALSE;
}
else
- { if ( rThis.FindPageFrm() != pPrev->FindPageFrm() )
+ { if ( rThis.FindPageFrm() != pPrev->FindPageFrm() )
return FALSE;
}
@@ -1294,22 +1294,22 @@ BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const
/*************************************************************************
|*
-|* BOOL SwFlowFrm::IsColBreak()
+|* BOOL SwFlowFrm::IsColBreak()
|*
-|* Beschreibung Wenn vor dem Frm ein harter Spaltenumbruch steht UND
-|* es einen Vorgaenger in der gleichen Spalte gibt, wird TRUE
-|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
-|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
-|* zurueck, wenn ein ColBreak besteht.
-|* Fuer Follows wird der harte Spaltenumbruch natuerlich nicht
-|* ausgewertet.
-|* Der Spaltenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
-|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger in der Spalte
-|* gibt ist jede weitere Ueberlegung ueberfluessig.
-|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
-|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
-|* Ersterstellung MA 11. Jun. 93
-|* Letzte Aenderung MA 21. Mar. 95
+|* Beschreibung Wenn vor dem Frm ein harter Spaltenumbruch steht UND
+|* es einen Vorgaenger in der gleichen Spalte gibt, wird TRUE
+|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
+|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
+|* zurueck, wenn ein ColBreak besteht.
+|* Fuer Follows wird der harte Spaltenumbruch natuerlich nicht
+|* ausgewertet.
+|* Der Spaltenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
+|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger in der Spalte
+|* gibt ist jede weitere Ueberlegung ueberfluessig.
+|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
+|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
+|* Ersterstellung MA 11. Jun. 93
+|* Letzte Aenderung MA 21. Mar. 95
|*
|*************************************************************************/
@@ -1329,11 +1329,11 @@ BOOL SwFlowFrm::IsColBreak( BOOL bAct ) const
if ( pPrev )
{
if ( bAct )
- { if ( pCol == pPrev->FindColFrm() )
+ { if ( pCol == pPrev->FindColFrm() )
return FALSE;
}
else
- { if ( pCol != pPrev->FindColFrm() )
+ { if ( pCol != pPrev->FindColFrm() )
return FALSE;
}
@@ -1843,12 +1843,12 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
/*************************************************************************
|*
-|* BOOL SwFlowFrm::CheckMoveFwd()
+|* BOOL SwFlowFrm::CheckMoveFwd()
|*
-|* Beschreibung Moved den Frm vorwaerts wenn es durch die aktuellen
-|* Bedingungen und Attribute notwendig erscheint.
-|* Ersterstellung MA 05. Dec. 96
-|* Letzte Aenderung MA 09. Mar. 98
+|* Beschreibung Moved den Frm vorwaerts wenn es durch die aktuellen
+|* Bedingungen und Attribute notwendig erscheint.
+|* Ersterstellung MA 05. Dec. 96
+|* Letzte Aenderung MA 09. Mar. 98
|*
|*************************************************************************/
@@ -1919,7 +1919,7 @@ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL )
const SwPageFrm *pPage = rThis.FindPageFrm();
SwFrm *pCol = rThis.FindColFrm();
do
- { MoveFwd( rbMakePage, FALSE );
+ { MoveFwd( rbMakePage, FALSE );
SwFrm *pTmp = rThis.FindColFrm();
if( pTmp != pCol )
{
@@ -1939,11 +1939,11 @@ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL )
/*************************************************************************
|*
-|* BOOL SwFlowFrm::MoveFwd()
+|* BOOL SwFlowFrm::MoveFwd()
|*
-|* Beschreibung Returnwert sagt, ob der Frm die Seite gewechselt hat.
-|* Ersterstellung MA 05. Dec. 96
-|* Letzte Aenderung MA 05. Dec. 96
+|* Beschreibung Returnwert sagt, ob der Frm die Seite gewechselt hat.
+|* Ersterstellung MA 05. Dec. 96
+|* Letzte Aenderung MA 05. Dec. 96
|*
|*************************************************************************/
@@ -2145,13 +2145,13 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
/*************************************************************************
|*
-|* BOOL SwFlowFrm::MoveBwd()
+|* BOOL SwFlowFrm::MoveBwd()
|*
-|* Beschreibung Returnwert sagt, ob der Frm die Seite wechseln soll.
-|* Sollte von abgeleiteten Klassen gerufen werden.
-|* Das moven selbst muessen die abgeleiteten uebernehmen.
-|* Ersterstellung MA 05. Dec. 96
-|* Letzte Aenderung MA 05. Dec. 96
+|* Beschreibung Returnwert sagt, ob der Frm die Seite wechseln soll.
+|* Sollte von abgeleiteten Klassen gerufen werden.
+|* Das moven selbst muessen die abgeleiteten uebernehmen.
+|* Ersterstellung MA 05. Dec. 96
+|* Letzte Aenderung MA 05. Dec. 96
|*
|*************************************************************************/
@@ -2221,7 +2221,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
)
pNewUpper = rThis.GetLeaf( MAKEPAGE_FTN, FALSE );
}
- else if ( IsPageBreak( TRUE ) ) //PageBreak zu beachten?
+ else if ( IsPageBreak( TRUE ) ) //PageBreak zu beachten?
{
//Wenn auf der vorhergehenden Seite kein Frm im Body steht,
//so ist das Zurueckfliessen trotz Pagebreak sinnvoll
@@ -2707,10 +2707,10 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
/*************************************************************************
|*
-|* SwFlowFrm::CastFlowFrm
+|* SwFlowFrm::CastFlowFrm
|*
-|* Ersterstellung MA 03. May. 95
-|* Letzte Aenderung AMA 02. Dec. 97
+|* Ersterstellung MA 03. May. 95
+|* Letzte Aenderung AMA 02. Dec. 97
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 03607d8a3ad0..7543804483ff 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2,7 +2,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
@@ -98,7 +98,7 @@
#include "ndindex.hxx" // GetGrfArea
#include "sectfrm.hxx"
#include <vcl/svapp.hxx>
-#include <vcl/salbtype.hxx> // FRound
+#include <vcl/salbtype.hxx> // FRound
using namespace ::com::sun::star;
@@ -108,10 +108,10 @@ TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
/*************************************************************************
|*
-|* SwFlyFrm::SwFlyFrm()
+|* SwFlyFrm::SwFlyFrm()
|*
-|* Ersterstellung MA 28. Sep. 92
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 28. Sep. 92
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
@@ -277,10 +277,10 @@ void SwFlyFrm::InsertCnt()
/*************************************************************************
|*
-|* SwFlyFrm::~SwFlyFrm()
+|* SwFlyFrm::~SwFlyFrm()
|*
-|* Ersterstellung MA 28. Sep. 92
-|* Letzte Aenderung MA 07. Jul. 95
+|* Ersterstellung MA 28. Sep. 92
+|* Letzte Aenderung MA 07. Jul. 95
|*
|*************************************************************************/
@@ -377,10 +377,10 @@ void SwFlyFrm::DeleteCnt()
/*************************************************************************
|*
-|* SwFlyFrm::InitDrawObj()
+|* SwFlyFrm::InitDrawObj()
|*
-|* Ersterstellung MA 02. Dec. 94
-|* Letzte Aenderung MA 30. Nov. 95
+|* Ersterstellung MA 02. Dec. 94
+|* Letzte Aenderung MA 30. Nov. 95
|*
|*************************************************************************/
void SwFlyFrm::InitDrawObj( BOOL bNotify )
@@ -417,10 +417,10 @@ void SwFlyFrm::InitDrawObj( BOOL bNotify )
/*************************************************************************
|*
-|* SwFlyFrm::FinitDrawObj()
+|* SwFlyFrm::FinitDrawObj()
|*
-|* Ersterstellung MA 12. Dec. 94
-|* Letzte Aenderung MA 15. May. 95
+|* Ersterstellung MA 12. Dec. 94
+|* Letzte Aenderung MA 15. May. 95
|*
|*************************************************************************/
@@ -437,7 +437,7 @@ void SwFlyFrm::FinitDrawObj()
{
ViewShell *pSh = p1St;
do
- { //z.Zt. kann das Drawing nur ein Unmark auf alles, weil das
+ { //z.Zt. kann das Drawing nur ein Unmark auf alles, weil das
//Objekt bereits Removed wurde.
if( pSh->HasDrawView() )
pSh->Imp()->GetDrawView()->UnmarkAll();
@@ -475,17 +475,17 @@ void SwFlyFrm::FinitDrawObj()
pMyContact->GetMaster()->SetUserCall( 0 );
}
GetVirtDrawObj()->SetUserCall( 0 ); //Ruft sonst Delete des ContactObj
- delete GetVirtDrawObj(); //Meldet sich selbst beim Master ab.
+ delete GetVirtDrawObj(); //Meldet sich selbst beim Master ab.
if ( pMyContact )
- delete pMyContact; //zerstoert den Master selbst.
+ delete pMyContact; //zerstoert den Master selbst.
}
/*************************************************************************
|*
-|* SwFlyFrm::ChainFrames()
+|* SwFlyFrm::ChainFrames()
|*
-|* Ersterstellung MA 29. Oct. 97
-|* Letzte Aenderung MA 20. Jan. 98
+|* Ersterstellung MA 29. Oct. 97
+|* Letzte Aenderung MA 20. Jan. 98
|*
|*************************************************************************/
@@ -578,10 +578,10 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
/*************************************************************************
|*
-|* SwFlyFrm::FindChainNeighbour()
+|* SwFlyFrm::FindChainNeighbour()
|*
-|* Ersterstellung MA 11. Nov. 97
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 11. Nov. 97
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
@@ -590,7 +590,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
//Wir suchen denjenigen Fly, der in dem selben Bereich steht.
//Bereiche koennen zunaechst nur Kopf-/Fusszeilen oder Flys sein.
- if ( !pAnch ) //Wenn ein Anchor uebergeben Wurde zaehlt dieser: Ctor!
+ if ( !pAnch ) //Wenn ein Anchor uebergeben Wurde zaehlt dieser: Ctor!
pAnch = AnchorFrm();
SwLayoutFrm *pLay;
@@ -634,10 +634,10 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
/*************************************************************************
|*
-|* SwFlyFrm::FindLastLower()
+|* SwFlyFrm::FindLastLower()
|*
-|* Ersterstellung MA 29. Oct. 97
-|* Letzte Aenderung MA 29. Oct. 97
+|* Ersterstellung MA 29. Oct. 97
+|* Letzte Aenderung MA 29. Oct. 97
|*
|*************************************************************************/
@@ -648,7 +648,7 @@ SwFrm *SwFlyFrm::FindLastLower()
pRet = pRet->FindTabFrm();
SwFrm *pNxt = pRet;
while ( pNxt && IsAnLower( pNxt ) )
- { pRet = pNxt;
+ { pRet = pNxt;
pNxt = pNxt->FindNext();
}
return pRet;
@@ -657,10 +657,10 @@ SwFrm *SwFlyFrm::FindLastLower()
/*************************************************************************
|*
-|* SwFlyFrm::FrmSizeChg()
+|* SwFlyFrm::FrmSizeChg()
|*
-|* Ersterstellung MA 17. Dec. 92
-|* Letzte Aenderung MA 24. Jul. 96
+|* Ersterstellung MA 17. Dec. 92
+|* Letzte Aenderung MA 24. Jul. 96
|*
|*************************************************************************/
@@ -692,7 +692,7 @@ BOOL SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
if ( Lower()->IsColumnFrm() )
{
const SwRect aOld( GetObjRectWithSpaces() );
- const Size aOldSz( Prt().SSize() );
+ const Size aOldSz( Prt().SSize() );
const SwTwips nDiffWidth = Frm().Width() - rFrmSize.GetWidth();
aFrm.Height( aFrm.Height() - nDiffHeight );
aFrm.Width ( aFrm.Width() - nDiffWidth );
@@ -717,10 +717,10 @@ BOOL SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
/*************************************************************************
|*
-|* SwFlyFrm::Modify()
+|* SwFlyFrm::Modify()
|*
-|* Ersterstellung MA 17. Dec. 92
-|* Letzte Aenderung MA 17. Jan. 97
+|* Ersterstellung MA 17. Dec. 92
+|* Letzte Aenderung MA 17. Jan. 97
|*
|*************************************************************************/
@@ -895,7 +895,7 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
USHORT nCol = 0;
SwFrm *pTmp = Lower();
do
- { ++nCol;
+ { ++nCol;
pTmp = pTmp->GetNext();
} while ( pTmp );
aCol.Init( nCol, 0, 1000 );
@@ -1096,11 +1096,11 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
/*************************************************************************
|*
-|* SwFlyFrm::GetInfo()
+|* SwFlyFrm::GetInfo()
|*
-|* Beschreibung erfragt Informationen
-|* Ersterstellung JP 31.03.94
-|* Letzte Aenderung JP 31.03.94
+|* Beschreibung erfragt Informationen
+|* Ersterstellung JP 31.03.94
+|* Letzte Aenderung JP 31.03.94
|*
*************************************************************************/
@@ -1108,16 +1108,16 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
BOOL SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const
{
if( RES_AUTOFMT_DOCNODE == rInfo.Which() )
- return FALSE; // es gibt einen FlyFrm also wird er benutzt
- return TRUE; // weiter suchen
+ return FALSE; // es gibt einen FlyFrm also wird er benutzt
+ return TRUE; // weiter suchen
}
/*************************************************************************
|*
-|* SwFlyFrm::_Invalidate()
+|* SwFlyFrm::_Invalidate()
|*
-|* Ersterstellung MA 15. Oct. 92
-|* Letzte Aenderung MA 26. Jun. 96
+|* Ersterstellung MA 15. Oct. 92
+|* Letzte Aenderung MA 26. Jun. 96
|*
|*************************************************************************/
@@ -1154,12 +1154,12 @@ void SwFlyFrm::_Invalidate( SwPageFrm *pPage )
/*************************************************************************
|*
-|* SwFlyFrm::ChgRelPos()
+|* SwFlyFrm::ChgRelPos()
|*
-|* Beschreibung Aenderung der relativen Position, die Position wird
-|* damit automatisch Fix, das Attribut wird entprechend angepasst.
-|* Ersterstellung MA 25. Aug. 92
-|* Letzte Aenderung MA 09. Aug. 95
+|* Beschreibung Aenderung der relativen Position, die Position wird
+|* damit automatisch Fix, das Attribut wird entprechend angepasst.
+|* Ersterstellung MA 25. Aug. 92
+|* Letzte Aenderung MA 09. Aug. 95
|*
|*************************************************************************/
@@ -1279,12 +1279,12 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
}
/*************************************************************************
|*
-|* SwFlyFrm::Format()
+|* SwFlyFrm::Format()
|*
-|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
-|* Die Fixsize wird hier nicht eingestellt.
-|* Ersterstellung MA 14. Jun. 93
-|* Letzte Aenderung MA 13. Jun. 96
+|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
+|* Die Fixsize wird hier nicht eingestellt.
+|* Ersterstellung MA 14. Jun. 93
+|* Letzte Aenderung MA 13. Jun. 96
|*
|*************************************************************************/
@@ -1409,7 +1409,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
}
else
{
- bValidSize = TRUE; //Fixe Frms formatieren sich nicht.
+ bValidSize = TRUE; //Fixe Frms formatieren sich nicht.
//Flys stellen ihre Groesse anhand des Attr ein.
SwTwips nNewSize = bVert ? aRelSize.Width() : aRelSize.Height();
nNewSize -= nUL;
@@ -1790,10 +1790,10 @@ void CalcCntnt( SwLayoutFrm *pLay,
/*************************************************************************
|*
-|* SwFlyFrm::MakeFlyPos()
+|* SwFlyFrm::MakeFlyPos()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 14. Nov. 96
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 14. Nov. 96
|*
|*************************************************************************/
// OD 2004-03-23 #i26791#
@@ -1826,10 +1826,10 @@ void SwFlyFrm::MakeObjPos()
/*************************************************************************
|*
-|* SwFlyFrm::MakePrtArea()
+|* SwFlyFrm::MakePrtArea()
|*
-|* Ersterstellung MA 23. Jun. 93
-|* Letzte Aenderung MA 23. Jun. 93
+|* Ersterstellung MA 23. Jun. 93
+|* Letzte Aenderung MA 23. Jun. 93
|*
|*************************************************************************/
void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
@@ -1850,10 +1850,10 @@ void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
/*************************************************************************
|*
-|* SwFlyFrm::_Grow(), _Shrink()
+|* SwFlyFrm::_Grow(), _Shrink()
|*
-|* Ersterstellung MA 05. Oct. 92
-|* Letzte Aenderung MA 05. Sep. 96
+|* Ersterstellung MA 05. Oct. 92
+|* Letzte Aenderung MA 05. Sep. 96
|*
|*************************************************************************/
@@ -1870,7 +1870,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, BOOL bTst )
return 0L;
if ( Lower()->IsColumnFrm() )
- { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
+ { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
//das Wachstum (wg. des Ausgleichs).
if ( !bTst )
{
@@ -1957,7 +1957,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, BOOL bTst )
return 0L;
if ( Lower()->IsColumnFrm() )
- { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
+ { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
//das Wachstum (wg. des Ausgleichs).
if ( !bTst )
{
@@ -2041,10 +2041,10 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, BOOL bTst )
/*************************************************************************
|*
-|* SwFlyFrm::ChgSize()
+|* SwFlyFrm::ChgSize()
|*
-|* Ersterstellung MA 05. Oct. 92
-|* Letzte Aenderung MA 04. Sep. 96
+|* Ersterstellung MA 05. Oct. 92
+|* Letzte Aenderung MA 04. Sep. 96
|*
|*************************************************************************/
@@ -2094,10 +2094,10 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
/*************************************************************************
|*
-|* SwFlyFrm::IsLowerOf()
+|* SwFlyFrm::IsLowerOf()
|*
-|* Ersterstellung MA 27. Dec. 93
-|* Letzte Aenderung MA 27. Dec. 93
+|* Ersterstellung MA 27. Dec. 93
+|* Letzte Aenderung MA 27. Dec. 93
|*
|*************************************************************************/
@@ -2118,10 +2118,10 @@ BOOL SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const
/*************************************************************************
|*
-|* SwFlyFrm::Cut()
+|* SwFlyFrm::Cut()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 23. Feb. 94
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 23. Feb. 94
|*
|*************************************************************************/
@@ -2131,10 +2131,10 @@ void SwFlyFrm::Cut()
/*************************************************************************
|*
-|* SwFrm::AppendFly(), RemoveFly()
+|* SwFrm::AppendFly(), RemoveFly()
|*
-|* Ersterstellung MA 25. Aug. 92
-|* Letzte Aenderung MA 09. Jun. 95
+|* Ersterstellung MA 25. Aug. 92
+|* Letzte Aenderung MA 09. Jun. 95
|*
|*************************************************************************/
@@ -2223,7 +2223,7 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove )
/*************************************************************************
|*
-|* SwFrm::AppendDrawObj(), RemoveDrawObj()
+|* SwFrm::AppendDrawObj(), RemoveDrawObj()
|*
|* --> OD 2004-07-06 #i28701# - new methods
|*
@@ -2271,7 +2271,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
_rNewObj.DrawObj()->SetLayer(aInvisibleControlLayerID);
}
else
- {
+ {
_rNewObj.DrawObj()->SetLayer(aControlLayerID);
}
}
@@ -2321,8 +2321,8 @@ void SwFrm::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj )
|*
|* SwFrm::InvalidateObjs()
|*
-|* Ersterstellung MA 29. Nov. 96
-|* Letzte Aenderung MA 29. Nov. 96
+|* Ersterstellung MA 29. Nov. 96
+|* Letzte Aenderung MA 29. Nov. 96
|*
|*************************************************************************/
// --> OD 2004-07-01 #i28701# - change purpose of method and adjust its name
@@ -2486,10 +2486,10 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs )
/*************************************************************************
|*
-|* SwFlyFrm::NotifyDrawObj()
+|* SwFlyFrm::NotifyDrawObj()
|*
-|* Ersterstellung OK 22. Nov. 94
-|* Letzte Aenderung MA 10. Jan. 97
+|* Ersterstellung OK 22. Nov. 94
+|* Letzte Aenderung MA 10. Jan. 97
|*
|*************************************************************************/
@@ -2508,8 +2508,8 @@ void SwFlyFrm::NotifyDrawObj()
|*
|* SwFlyFrm::CalcRel()
|*
-|* Ersterstellung MA 13. Jun. 96
-|* Letzte Aenderung MA 10. Oct. 96
+|* Ersterstellung MA 13. Jun. 96
+|* Letzte Aenderung MA 10. Oct. 96
|*
|*************************************************************************/
@@ -2631,10 +2631,10 @@ SwTwips SwFlyFrm::CalcAutoWidth() const
/*************************************************************************
|*
-|* SwFlyFrm::AddSpacesToFrm
+|* SwFlyFrm::AddSpacesToFrm
|*
-|* Ersterstellung MA 11. Nov. 96
-|* Letzte Aenderung MA 10. Mar. 97
+|* Ersterstellung MA 11. Nov. 96
+|* Letzte Aenderung MA 10. Mar. 97
|*
|*************************************************************************/
@@ -2652,10 +2652,10 @@ SwTwips SwFlyFrm::CalcAutoWidth() const
/*************************************************************************
|*
-|* SwFlyFrm::GetContour()
+|* SwFlyFrm::GetContour()
|*
-|* Ersterstellung MA 09. Jan. 97
-|* Letzte Aenderung MA 10. Jan. 97
+|* Ersterstellung MA 09. Jan. 97
+|* Letzte Aenderung MA 10. Jan. 97
|*
|*************************************************************************/
/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 02e917dc42ad..5d0b90152306 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -2,7 +2,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
@@ -77,10 +77,10 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwFlyAtCntFrm::SwFlyAtCntFrm()
+|* SwFlyAtCntFrm::SwFlyAtCntFrm()
|*
-|* Ersterstellung MA 11. Nov. 92
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 11. Nov. 92
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
@@ -96,10 +96,10 @@ TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
// <--
/*************************************************************************
|*
-|* SwFlyAtCntFrm::Modify()
+|* SwFlyAtCntFrm::Modify()
|*
-|* Ersterstellung MA 08. Feb. 93
-|* Letzte Aenderung MA 23. Nov. 94
+|* Ersterstellung MA 08. Feb. 93
+|* Letzte Aenderung MA 23. Nov. 94
|*
|*************************************************************************/
@@ -111,7 +111,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET ==
((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, FALSE,
(const SfxPoolItem**)&pAnch ))
- ; // Beim GetItemState wird der AnkerPointer gesetzt !
+ ; // Beim GetItemState wird der AnkerPointer gesetzt !
else if( RES_ANCHOR == nWhich )
{
@@ -224,29 +224,29 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
/*************************************************************************
|*
-|* SwFlyAtCntFrm::MakeAll()
+|* SwFlyAtCntFrm::MakeAll()
|*
-|* Beschreibung Bei einem Absatzgebunden Fly kann es durchaus sein,
-|* das der Anker auf die Veraenderung des Flys reagiert. Auf diese
-|* Reaktion hat der Fly natuerlich auch wieder zu reagieren.
-|* Leider kann dies zu Oszillationen fuehren z.b. Der Fly will nach
-|* unten, dadurch kann der Inhalt nach oben, der TxtFrm wird kleiner,
-|* der Fly muss wieder hoeher woduch der Text wieder nach unten
-|* verdraengt wird...
-|* Um derartige Oszillationen zu vermeiden, wird ein kleiner Positions-
-|* stack aufgebaut. Wenn der Fly ein Position erreicht, die er bereits
-|* einmal einnahm, so brechen wir den Vorgang ab. Um keine Risiken
-|* einzugehen, wird der Positionsstack so aufgebaut, dass er fuenf
-|* Positionen zurueckblickt.
-|* Wenn der Stack ueberlaeuft, wird ebenfalls abgebrochen.
-|* Der Abbruch fuer dazu, dass der Fly am Ende eine unguenste Position
-|* einnimmt. Damit es nicht durch einen wiederholten Aufruf von
-|* Aussen zu einer 'grossen Oszillation' kommen kann wird im Abbruch-
-|* fall das Attribut des Rahmens auf automatische Ausrichtung oben
-|* eingestellt.
+|* Beschreibung Bei einem Absatzgebunden Fly kann es durchaus sein,
+|* das der Anker auf die Veraenderung des Flys reagiert. Auf diese
+|* Reaktion hat der Fly natuerlich auch wieder zu reagieren.
+|* Leider kann dies zu Oszillationen fuehren z.b. Der Fly will nach
+|* unten, dadurch kann der Inhalt nach oben, der TxtFrm wird kleiner,
+|* der Fly muss wieder hoeher woduch der Text wieder nach unten
+|* verdraengt wird...
+|* Um derartige Oszillationen zu vermeiden, wird ein kleiner Positions-
+|* stack aufgebaut. Wenn der Fly ein Position erreicht, die er bereits
+|* einmal einnahm, so brechen wir den Vorgang ab. Um keine Risiken
+|* einzugehen, wird der Positionsstack so aufgebaut, dass er fuenf
+|* Positionen zurueckblickt.
+|* Wenn der Stack ueberlaeuft, wird ebenfalls abgebrochen.
+|* Der Abbruch fuer dazu, dass der Fly am Ende eine unguenste Position
+|* einnimmt. Damit es nicht durch einen wiederholten Aufruf von
+|* Aussen zu einer 'grossen Oszillation' kommen kann wird im Abbruch-
+|* fall das Attribut des Rahmens auf automatische Ausrichtung oben
+|* eingestellt.
|*
-|* Ersterstellung MA 12. Nov. 92
-|* Letzte Aenderung MA 20. Sep. 96
+|* Ersterstellung MA 12. Nov. 92
+|* Letzte Aenderung MA 20. Sep. 96
|*
|*************************************************************************/
//Wir brauchen ein Paar Hilfsklassen zur Kontrolle der Ozillation und ein paar
@@ -615,14 +615,14 @@ bool SwFlyAtCntFrm::IsFormatPossible() const
/*************************************************************************
|*
-|* FindAnchor() und Hilfsfunktionen.
+|* FindAnchor() und Hilfsfunktionen.
|*
-|* Beschreibung: Sucht ausgehend von pOldAnch einen Anker fuer
-|* Absatzgebundene Objekte.
-|* Wird beim Draggen von Absatzgebundenen Objekten zur Ankeranzeige sowie
-|* fuer Ankerwechsel benoetigt.
-|* Ersterstellung MA 22. Jun. 93
-|* Letzte Aenderung MA 30. Jan. 95
+|* Beschreibung: Sucht ausgehend von pOldAnch einen Anker fuer
+|* Absatzgebundene Objekte.
+|* Wird beim Draggen von Absatzgebundenen Objekten zur Ankeranzeige sowie
+|* fuer Ankerwechsel benoetigt.
+|* Ersterstellung MA 22. Jun. 93
+|* Letzte Aenderung MA 30. Jan. 95
|*
|*************************************************************************/
@@ -899,7 +899,7 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
rpCnt = 0;
ULONG nDistance = ULONG_MAX;
- ULONG nNearest = ULONG_MAX;
+ ULONG nNearest = ULONG_MAX;
const SwCntntFrm *pCnt = pLay->ContainsCntnt();
while ( pCnt && (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn()))
@@ -925,7 +925,7 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
if ( pCnt->Frm().Top() <= rPt.Y() )
{
if ( nDiff < nDistance )
- { //Der ist dichter dran
+ { //Der ist dichter dran
nDistance = nNearest = nDiff;
rpCnt = pNearest = pCnt;
}
@@ -943,7 +943,7 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
} while ( pCnt && pLay->IsAnLower( pCnt ) );
}
if ( nDistance == ULONG_MAX )
- { rpCnt = pNearest;
+ { rpCnt = pNearest;
return nNearest;
}
return nDistance;
@@ -970,7 +970,7 @@ const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm *
if ( pNew )
pRet = pNew;
else
- { pRet = pCnt;
+ { pRet = pCnt;
nDist = ULONG_MAX;
}
const SwCntntFrm *pNearest = pRet;
@@ -1142,7 +1142,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
bNegAllowed = FALSE;
if ( nUpLst.nMain < 0 ) //nicht den falschen erwischen, wenn der Wert
//gerade von negativ auf positiv gekippt ist.
- { pUpLst = pUpFrm;
+ { pUpLst = pUpFrm;
nUpLst = nUp;
}
}
@@ -1206,10 +1206,10 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
/*************************************************************************
|*
-|* SwFlyAtCntFrm::SetAbsPos()
+|* SwFlyAtCntFrm::SetAbsPos()
|*
-|* Ersterstellung MA 22. Jun. 93
-|* Letzte Aenderung MA 11. Sep. 98
+|* Ersterstellung MA 22. Jun. 93
+|* Letzte Aenderung MA 11. Sep. 98
|*
|*************************************************************************/
@@ -1293,13 +1293,13 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
while ( pCnt->IsFollow() )
{
do
- { pCnt = pCnt->GetPrevCntntFrm();
+ { pCnt = pCnt->GetPrevCntntFrm();
} while ( pCnt->GetFollow() != pFollow );
pFollow = pCnt;
}
SwTwips nDiff = 0;
do
- { const SwFrm *pUp = pFollow->GetUpper();
+ { const SwFrm *pUp = pFollow->GetUpper();
if( pUp->IsVertical() )
nDiff += pFollow->Frm().Left() + pFollow->Frm().Width()
- pUp->Frm().Left() - pUp->Prt().Left();
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 51f1d3a0929c..fba14fdef241 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
#include "hints.hxx"
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
-#include "txtfrm.hxx" //fuer IsLocked()
+#include "txtfrm.hxx" //fuer IsLocked()
#include "flyfrms.hxx"
// OD 2004-01-19 #110582#
#include <dflyobj.hxx>
@@ -47,10 +47,10 @@ void DeepCalc( const SwFrm *pFrm );
/*************************************************************************
|*
-|* SwFlyInCntFrm::SwFlyInCntFrm(), ~SwFlyInCntFrm()
+|* SwFlyInCntFrm::SwFlyInCntFrm(), ~SwFlyInCntFrm()
|*
-|* Ersterstellung MA 01. Dec. 92
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 01. Dec. 92
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
@@ -82,10 +82,10 @@ TYPEINIT1(SwFlyInCntFrm,SwFlyFrm);
// <--
/*************************************************************************
|*
-|* SwFlyInCntFrm::SetRefPoint(),
+|* SwFlyInCntFrm::SetRefPoint(),
|*
-|* Ersterstellung MA 01. Dec. 92
-|* Letzte Aenderung MA 06. Aug. 95
+|* Ersterstellung MA 01. Dec. 92
+|* Letzte Aenderung MA 06. Aug. 95
|*
|*************************************************************************/
void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
@@ -118,10 +118,10 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
/*************************************************************************
|*
-|* SwFlyInCntFrm::Modify()
+|* SwFlyInCntFrm::Modify()
|*
-|* Ersterstellung MA 16. Dec. 92
-|* Letzte Aenderung MA 02. Sep. 93
+|* Ersterstellung MA 16. Dec. 92
+|* Letzte Aenderung MA 02. Sep. 93
|*
|*************************************************************************/
void SwFlyInCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
@@ -165,21 +165,21 @@ void SwFlyInCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
}
/*************************************************************************
|*
-|* SwFlyInCntFrm::Format()
+|* SwFlyInCntFrm::Format()
|*
-|* Beschreibung: Hier wird der Inhalt initial mit Formatiert.
-|* Ersterstellung MA 16. Dec. 92
-|* Letzte Aenderung MA 19. May. 93
+|* Beschreibung: Hier wird der Inhalt initial mit Formatiert.
+|* Ersterstellung MA 16. Dec. 92
+|* Letzte Aenderung MA 19. May. 93
|*
|*************************************************************************/
void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs )
{
if ( !Frm().Height() )
{
- Lock(); //nicht hintenherum den Anker formatieren.
+ Lock(); //nicht hintenherum den Anker formatieren.
SwCntntFrm *pCntnt = ContainsCntnt();
while ( pCntnt )
- { pCntnt->Calc();
+ { pCntnt->Calc();
pCntnt = pCntnt->GetNextCntntFrm();
}
Unlock();
@@ -188,13 +188,13 @@ void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs )
}
/*************************************************************************
|*
-|* SwFlyInCntFrm::MakeFlyPos()
+|* SwFlyInCntFrm::MakeFlyPos()
|*
-|* Beschreibung Im Unterschied zu anderen Frms wird hier nur die
-|* die RelPos berechnet. Die absolute Position wird ausschliesslich
-|* per SetAbsPos errechnet.
-|* Ersterstellung MA 03. Dec. 92
-|* Letzte Aenderung MA 12. Apr. 96
+|* Beschreibung Im Unterschied zu anderen Frms wird hier nur die
+|* die RelPos berechnet. Die absolute Position wird ausschliesslich
+|* per SetAbsPos errechnet.
+|* Ersterstellung MA 03. Dec. 92
+|* Letzte Aenderung MA 12. Apr. 96
|*
|*************************************************************************/
// OD 2004-03-23 #i26791#
@@ -234,10 +234,10 @@ void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid )
// <--
/*************************************************************************
|*
-|* SwFlyInCntFrm::NotifyBackground()
+|* SwFlyInCntFrm::NotifyBackground()
|*
-|* Ersterstellung MA 03. Dec. 92
-|* Letzte Aenderung MA 26. Aug. 93
+|* Ersterstellung MA 03. Dec. 92
+|* Letzte Aenderung MA 26. Aug. 93
|*
|*************************************************************************/
void SwFlyInCntFrm::NotifyBackground( SwPageFrm *, const SwRect& rRect,
@@ -251,10 +251,10 @@ void SwFlyInCntFrm::NotifyBackground( SwPageFrm *, const SwRect& rRect,
/*************************************************************************
|*
-|* SwFlyInCntFrm::GetRelPos()
+|* SwFlyInCntFrm::GetRelPos()
|*
-|* Ersterstellung MA 04. Dec. 92
-|* Letzte Aenderung MA 04. Dec. 92
+|* Ersterstellung MA 04. Dec. 92
+|* Letzte Aenderung MA 04. Dec. 92
|*
|*************************************************************************/
const Point SwFlyInCntFrm::GetRelPos() const
@@ -265,10 +265,10 @@ const Point SwFlyInCntFrm::GetRelPos() const
/*************************************************************************
|*
-|* SwFlyInCntFrm::RegistFlys()
+|* SwFlyInCntFrm::RegistFlys()
|*
-|* Ersterstellung MA 26. Nov. 93
-|* Letzte Aenderung MA 26. Nov. 93
+|* Ersterstellung MA 26. Nov. 93
+|* Letzte Aenderung MA 26. Nov. 93
|*
|*************************************************************************/
void SwFlyInCntFrm::RegistFlys()
@@ -281,10 +281,10 @@ void SwFlyInCntFrm::RegistFlys()
/*************************************************************************
|*
-|* SwFlyInCntFrm::MakeAll()
+|* SwFlyInCntFrm::MakeAll()
|*
-|* Ersterstellung MA 18. Feb. 94
-|* Letzte Aenderung MA 13. Jun. 96
+|* Ersterstellung MA 18. Feb. 94
+|* Letzte Aenderung MA 13. Jun. 96
|*
|*************************************************************************/
void SwFlyInCntFrm::MakeAll()
@@ -298,7 +298,7 @@ void SwFlyInCntFrm::MakeAll()
if ( !GetAnchorFrm() || IsLocked() || IsColLocked() || !FindPageFrm() )
return;
- Lock(); //Der Vorhang faellt
+ Lock(); //Der Vorhang faellt
//uebernimmt im DTor die Benachrichtigung
const SwFlyNotify aNotify( this );
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 52d1bf24e24e..1c5f19d2fc93 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -2,7 +2,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
@@ -68,10 +68,10 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwFlyFreeFrm::SwFlyFreeFrm(), ~SwFlyFreeFrm()
+|* SwFlyFreeFrm::SwFlyFreeFrm(), ~SwFlyFreeFrm()
|*
-|* Ersterstellung MA 03. Dec. 92
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 03. Dec. 92
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
@@ -119,16 +119,16 @@ TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
// <--
/*************************************************************************
|*
-|* SwFlyFreeFrm::NotifyBackground()
+|* SwFlyFreeFrm::NotifyBackground()
|*
-|* Beschreibung Benachrichtigt den Hintergrund (alle CntntFrms die
-|* gerade ueberlappt werden. Ausserdem wird das Window in einigen
-|* Faellen direkt invalidiert (vor allem dort, wo keine CntntFrms
-|* ueberlappt werden.
-|* Es werden auch die CntntFrms innerhalb von anderen Flys
-|* beruecksichtigt.
-|* Ersterstellung MA 03. Dec. 92
-|* Letzte Aenderung MA 26. Aug. 93
+|* Beschreibung Benachrichtigt den Hintergrund (alle CntntFrms die
+|* gerade ueberlappt werden. Ausserdem wird das Window in einigen
+|* Faellen direkt invalidiert (vor allem dort, wo keine CntntFrms
+|* ueberlappt werden.
+|* Es werden auch die CntntFrms innerhalb von anderen Flys
+|* beruecksichtigt.
+|* Ersterstellung MA 03. Dec. 92
+|* Letzte Aenderung MA 26. Aug. 93
|*
|*************************************************************************/
@@ -140,10 +140,10 @@ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm,
/*************************************************************************
|*
-|* SwFlyFreeFrm::MakeAll()
+|* SwFlyFreeFrm::MakeAll()
|*
-|* Ersterstellung MA 18. Feb. 94
-|* Letzte Aenderung MA 03. Mar. 97
+|* Ersterstellung MA 18. Feb. 94
+|* Letzte Aenderung MA 03. Mar. 97
|*
|*************************************************************************/
@@ -168,7 +168,7 @@ void SwFlyFreeFrm::MakeAll()
if( !GetPageFrm() )
return;
- Lock(); //Der Vorhang faellt
+ Lock(); //Der Vorhang faellt
//uebernimmt im DTor die Benachrichtigung
const SwFlyNotify aNotify( this );
@@ -200,7 +200,7 @@ void SwFlyFreeFrm::MakeAll()
{
SWRECTFN( this )
const SwFmtFrmSize *pSz;
- { //Zusaetzlicher Scope, damit aAccess vor dem Check zerstoert wird!
+ { //Zusaetzlicher Scope, damit aAccess vor dem Check zerstoert wird!
SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
const SwBorderAttrs &rAttrs = *aAccess.Get();
@@ -324,10 +324,10 @@ bool SwFlyFreeFrm::HasEnvironmentAutoSize() const
/*************************************************************************
|*
-|* SwFlyFreeFrm::CheckClip()
+|* SwFlyFreeFrm::CheckClip()
|*
-|* Ersterstellung MA 21. Feb. 94
-|* Letzte Aenderung MA 03. Mar. 97
+|* Ersterstellung MA 21. Feb. 94
+|* Letzte Aenderung MA 03. Mar. 97
|*
|*************************************************************************/
@@ -444,7 +444,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
aFrmRect.Height()!= aOldSize.Height() )
{
if ( (aOldSize.Width() - aFrmRect.Width()) >
- (aOldSize.Height()- aFrmRect.Height()) )
+ (aOldSize.Height()- aFrmRect.Height()) )
aFrmRect.Height( aOldSize.Height() );
else
aFrmRect.Width( aOldSize.Width() );
@@ -496,14 +496,14 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
Frm().Width ( Max( long(MINLAY), aFrmRect.Width() ) );
if ( Lower() && Lower()->IsColumnFrm() )
{
- ColLock(); //Grow/Shrink locken.
+ ColLock(); //Grow/Shrink locken.
const Size aTmpOldSize( Prt().SSize() );
Prt().Height( Frm().Height() - nPrtHeightDiff );
Prt().Width ( Frm().Width() - nPrtWidthDiff );
ChgLowersProp( aTmpOldSize );
SwFrm *pLow = Lower();
do
- { pLow->Calc();
+ { pLow->Calc();
// auch den (Column)BodyFrm mitkalkulieren
((SwLayoutFrm*)pLow)->Lower()->Calc();
pLow = pLow->GetNext();
@@ -542,10 +542,10 @@ bool SwFlyFreeFrm::IsFormatPossible() const
/*************************************************************************
|*
-|* SwFlyLayFrm::SwFlyLayFrm()
+|* SwFlyLayFrm::SwFlyLayFrm()
|*
-|* Ersterstellung MA 25. Aug. 92
-|* Letzte Aenderung MA 09. Apr. 99
+|* Ersterstellung MA 25. Aug. 92
+|* Letzte Aenderung MA 09. Apr. 99
|*
|*************************************************************************/
@@ -560,10 +560,10 @@ TYPEINIT1(SwFlyLayFrm,SwFlyFreeFrm);
// <--
/*************************************************************************
|*
-|* SwFlyLayFrm::Modify()
+|* SwFlyLayFrm::Modify()
|*
-|* Ersterstellung MA 08. Feb. 93
-|* Letzte Aenderung MA 28. Aug. 93
+|* Ersterstellung MA 08. Feb. 93
+|* Letzte Aenderung MA 28. Aug. 93
|*
|*************************************************************************/
@@ -575,7 +575,7 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET ==
((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, FALSE,
(const SfxPoolItem**)&pAnch ))
- ; // Beim GetItemState wird der AnkerPointer gesetzt !
+ ; // Beim GetItemState wird der AnkerPointer gesetzt !
else if( RES_ANCHOR == nWhich )
{
@@ -644,10 +644,10 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
/*************************************************************************
|*
-|* SwPageFrm::AppendFly()
+|* SwPageFrm::AppendFly()
|*
-|* Ersterstellung MA 10. Oct. 92
-|* Letzte Aenderung MA 08. Jun. 96
+|* Ersterstellung MA 10. Oct. 92
+|* Letzte Aenderung MA 08. Jun. 96
|*
|*************************************************************************/
@@ -756,10 +756,10 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
/*************************************************************************
|*
-|* SwPageFrm::RemoveFly()
+|* SwPageFrm::RemoveFly()
|*
-|* Ersterstellung MA 10. Oct. 92
-|* Letzte Aenderung MA 26. Aug. 96
+|* Ersterstellung MA 10. Oct. 92
+|* Letzte Aenderung MA 26. Aug. 96
|*
|*************************************************************************/
@@ -800,7 +800,7 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
{
pSortedObjs->Remove( *pToRemove );
if ( !pSortedObjs->Count() )
- { DELETEZ( pSortedObjs );
+ { DELETEZ( pSortedObjs );
}
}
// --> OD 2004-06-30 #i28701# - use new method <SetPageFrm(..)>
@@ -809,10 +809,10 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
/*************************************************************************
|*
-|* SwPageFrm::MoveFly
+|* SwPageFrm::MoveFly
|*
-|* Ersterstellung MA 25. Jan. 97
-|* Letzte Aenderung MA 25. Jan. 97
+|* Ersterstellung MA 25. Jan. 97
+|* Letzte Aenderung MA 25. Jan. 97
|*
|*************************************************************************/
@@ -854,7 +854,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
{
pSortedObjs->Remove( *pToMove );
if ( !pSortedObjs->Count() )
- { DELETEZ( pSortedObjs );
+ { DELETEZ( pSortedObjs );
}
}
@@ -1011,10 +1011,10 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
/*************************************************************************
|*
-|* SwPageFrm::PlaceFly
+|* SwPageFrm::PlaceFly
|*
-|* Ersterstellung MA 08. Feb. 93
-|* Letzte Aenderung MA 27. Feb. 93
+|* Ersterstellung MA 08. Feb. 93
+|* Letzte Aenderung MA 27. Feb. 93
|*
|*************************************************************************/
@@ -1047,10 +1047,10 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
/*************************************************************************
|*
-|* ::CalcClipRect
+|* ::CalcClipRect
|*
-|* Ersterstellung AMA 24. Sep. 96
-|* Letzte Aenderung MA 18. Dec. 96
+|* Ersterstellung AMA 24. Sep. 96
+|* Letzte Aenderung MA 18. Dec. 96
|*
|*************************************************************************/
// OD 22.09.2003 #i18732# - adjustments for following text flow or not
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index 8cb2d5a7fccd..77898e233a7c 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -2,7 +2,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
@@ -96,7 +96,7 @@ SwPosFlyFrm::~SwPosFlyFrm()
BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& )
{
- return FALSE; // FlyFrames koennen auf der gleichen Position stehen
+ return FALSE; // FlyFrames koennen auf der gleichen Position stehen
}
BOOL SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 992e09afce22..94ca3ac8e1ba 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2,7 +2,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
@@ -109,10 +109,10 @@ BOOL StackHack::bLocked = FALSE;
/*************************************************************************
|*
-|* SwFrmNotify::SwFrmNotify()
+|* SwFrmNotify::SwFrmNotify()
|*
-|* Ersterstellung MA 27. Nov. 92
-|* Letzte Aenderung MA 09. Apr. 97
+|* Ersterstellung MA 27. Nov. 92
+|* Letzte Aenderung MA 09. Apr. 97
|*
|*************************************************************************/
@@ -144,10 +144,10 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
/*************************************************************************
|*
-|* SwFrmNotify::~SwFrmNotify()
+|* SwFrmNotify::~SwFrmNotify()
|*
-|* Ersterstellung MA 27. Nov. 92
-|* Letzte Aenderung MA 09. Apr. 97
+|* Ersterstellung MA 27. Nov. 92
+|* Letzte Aenderung MA 09. Apr. 97
|*
|*************************************************************************/
@@ -459,10 +459,10 @@ SwFrmNotify::~SwFrmNotify()
/*************************************************************************
|*
-|* SwLayNotify::SwLayNotify()
+|* SwLayNotify::SwLayNotify()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 03. Jun. 93
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 03. Jun. 93
|*
|*************************************************************************/
@@ -475,10 +475,10 @@ SwLayNotify::SwLayNotify( SwLayoutFrm *pLayFrm ) :
/*************************************************************************
|*
-|* SwLayNotify::~SwLayNotify()
+|* SwLayNotify::~SwLayNotify()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 13. Jun. 96
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 13. Jun. 96
|*
|*************************************************************************/
@@ -545,7 +545,7 @@ SwLayNotify::~SwLayNotify()
//1. Wenn der Formatierte kein Fly ist
//2. Wenn er keine Spalten enthaelt
//3. Wenn der Fly eine feste Hoehe hat und die Spalten in der
- // Hoehe danebenliegen.
+ // Hoehe danebenliegen.
//4. niemals bei SectionFrms.
BOOL bLow;
if( pLay->IsFlyFrm() )
@@ -691,10 +691,10 @@ SwLayNotify::~SwLayNotify()
/*************************************************************************
|*
-|* SwFlyNotify::SwFlyNotify()
+|* SwFlyNotify::SwFlyNotify()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 26. Aug. 93
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 26. Aug. 93
|*
|*************************************************************************/
@@ -710,10 +710,10 @@ SwFlyNotify::SwFlyNotify( SwFlyFrm *pFlyFrm ) :
/*************************************************************************
|*
-|* SwFlyNotify::~SwFlyNotify()
+|* SwFlyNotify::~SwFlyNotify()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 09. Nov. 95
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 09. Nov. 95
|*
|*************************************************************************/
@@ -826,10 +826,10 @@ SwFlyNotify::~SwFlyNotify()
/*************************************************************************
|*
-|* SwCntntNotify::SwCntntNotify()
+|* SwCntntNotify::SwCntntNotify()
|*
-|* Ersterstellung MA 24. Nov. 92
-|* Letzte Aenderung MA 16. May. 95
+|* Ersterstellung MA 24. Nov. 92
+|* Letzte Aenderung MA 16. May. 95
|*
|*************************************************************************/
@@ -861,10 +861,10 @@ SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) :
/*************************************************************************
|*
-|* SwCntntNotify::~SwCntntNotify()
+|* SwCntntNotify::~SwCntntNotify()
|*
-|* Ersterstellung MA 24. Nov. 92
-|* Letzte Aenderung MA 09. Apr. 97
+|* Ersterstellung MA 24. Nov. 92
+|* Letzte Aenderung MA 09. Apr. 97
|*
|*************************************************************************/
@@ -890,7 +890,7 @@ SwCntntNotify::~SwCntntNotify()
pCell = pCell->GetUpper();
OSL_ENSURE( pCell->IsCellFrm(), "Where's my cell?" );
if ( text::VertOrientation::NONE != pCell->GetFmt()->GetVertOrient().GetVertOrient() )
- pCell->InvalidatePrt(); //fuer vertikale Ausrichtung.
+ pCell->InvalidatePrt(); //fuer vertikale Ausrichtung.
}
// OD 2004-02-26 #i25029#
@@ -960,7 +960,7 @@ SwCntntNotify::~SwCntntNotify()
SwFEShell *pFESh = 0;
ViewShell *pTmp = pSh;
do
- { if ( pTmp->ISA( SwCrsrShell ) )
+ { if ( pTmp->ISA( SwCrsrShell ) )
{
pFESh = (SwFEShell*)pTmp;
// #108369#: Here used to be the condition if (!bFirst).
@@ -1004,7 +1004,7 @@ SwCntntNotify::~SwCntntNotify()
if ( bFirst )
{
- pCnt->SetRetouche(); //fix(13870)
+ pCnt->SetRetouche(); //fix(13870)
SwDoc *pDoc = pCnt->GetNode()->GetDoc();
if ( pDoc->GetSpzFrmFmts()->Count() &&
@@ -1034,7 +1034,7 @@ SwCntntNotify::~SwCntntNotify()
if ((FLY_AT_PAGE != rAnch.GetAnchorId()) &&
(FLY_AT_PARA != rAnch.GetAnchorId()))
{
- continue; //#60878# nicht etwa zeichengebundene.
+ continue; //#60878# nicht etwa zeichengebundene.
}
BOOL bCheckPos = FALSE;
@@ -1109,13 +1109,13 @@ SwCntntNotify::~SwCntntNotify()
/*************************************************************************
|*
-|* InsertCnt
+|* InsertCnt
|*
-|* Beschreibung Hilfsfunktionen, die friend von irgendwem sind, damit
-|* nicht immer gleich 'ne ganze Klasse befreundet werden
-|* muss.
-|* Ersterstellung MA 13. Apr. 93
-|* Letzte Aenderung MA 11. May. 95
+|* Beschreibung Hilfsfunktionen, die friend von irgendwem sind, damit
+|* nicht immer gleich 'ne ganze Klasse befreundet werden
+|* muss.
+|* Ersterstellung MA 13. Apr. 93
+|* Letzte Aenderung MA 11. May. 95
|*
|*************************************************************************/
@@ -1332,8 +1332,8 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
SwPageFrm *pPage = pLay->FindPageFrm();
const SwSpzFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
- SwFrm *pFrm = 0;
- BOOL bBreakAfter = FALSE;
+ SwFrm *pFrm = 0;
+ BOOL bBreakAfter = FALSE;
SwActualSection *pActualSection = 0;
SwLayHelper *pPageMaker;
@@ -1433,7 +1433,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
AppendObjs( pTbl, nIndex, pFrm, pPage );
}
else if ( pNd->IsTableNode() )
- { //Sollten wir auf eine Tabelle gestossen sein?
+ { //Sollten wir auf eine Tabelle gestossen sein?
SwTableNode *pTblNode = (SwTableNode*)pNd;
// #108116# loading may produce table structures that GCLines
@@ -1647,7 +1647,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
}
}
else if( pNd->IsStartNode() &&
- SwFlyStartNode == ((SwStartNode*)pNd)->GetStartNodeType() )
+ SwFlyStartNode == ((SwStartNode*)pNd)->GetStartNodeType() )
{
if ( pTbl->Count() && bObjsDirect && !bDontCreateObjects )
{
@@ -1680,7 +1680,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
delete pActualSection;
}
- if ( bPages ) //Jetzt noch die Flys verbinden lassen.
+ if ( bPages ) //Jetzt noch die Flys verbinden lassen.
{
if ( !bDontCreateObjects )
AppendAllObjs( pTbl );
@@ -1926,10 +1926,10 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
/*************************************************************************
|*
-|* SwBorderAttrs::Ctor, DTor
+|* SwBorderAttrs::Ctor, DTor
|*
-|* Ersterstellung MA 19. May. 93
-|* Letzte Aenderung MA 25. Jan. 97
+|* Ersterstellung MA 19. May. 93
+|* Letzte Aenderung MA 25. Jan. 97
|*
|*************************************************************************/
@@ -1938,13 +1938,13 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor )
rAttrSet( pConstructor->IsCntntFrm()
? ((SwCntntFrm*)pConstructor)->GetNode()->GetSwAttrSet()
: ((SwLayoutFrm*)pConstructor)->GetFmt()->GetAttrSet() ),
- rUL ( rAttrSet.GetULSpace() ),
+ rUL ( rAttrSet.GetULSpace() ),
// --> OD 2008-12-04 #i96772#
// LRSpaceItem is copied due to the possibility that it is adjusted - see below
rLR ( rAttrSet.GetLRSpace() ),
// <--
- rBox ( rAttrSet.GetBox() ),
- rShadow ( rAttrSet.GetShadow() ),
+ rBox ( rAttrSet.GetBox() ),
+ rShadow ( rAttrSet.GetShadow() ),
aFrmSize( rAttrSet.GetFrmSize().GetSize() )
{
// --> OD 2008-12-02 #i96772#
@@ -1977,15 +1977,15 @@ SwBorderAttrs::~SwBorderAttrs()
/*************************************************************************
|*
-|* SwBorderAttrs::CalcTop(), CalcBottom(), CalcLeft(), CalcRight()
+|* SwBorderAttrs::CalcTop(), CalcBottom(), CalcLeft(), CalcRight()
|*
-|* Beschreibung Die Calc-Methoden errechnen zusaetzlich zu den
-|* von den Attributen vorgegebenen Groessen einen Sicherheitsabstand.
-|* der Sicherheitsabstand wird nur einkalkuliert, wenn Umrandung und/oder
-|* Schatten im Spiel sind; er soll vermeiden, dass aufgrund der
-|* groben physikalischen Gegebenheiten Raender usw. uebermalt werden.
-|* Ersterstellung MA 19. May. 93
-|* Letzte Aenderung MA 08. Jul. 93
+|* Beschreibung Die Calc-Methoden errechnen zusaetzlich zu den
+|* von den Attributen vorgegebenen Groessen einen Sicherheitsabstand.
+|* der Sicherheitsabstand wird nur einkalkuliert, wenn Umrandung und/oder
+|* Schatten im Spiel sind; er soll vermeiden, dass aufgrund der
+|* groben physikalischen Gegebenheiten Raender usw. uebermalt werden.
+|* Ersterstellung MA 19. May. 93
+|* Letzte Aenderung MA 08. Jul. 93
|*
|*************************************************************************/
@@ -2065,15 +2065,15 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
/*************************************************************************
|*
-|* SwBorderAttrs::CalcTopLine(), CalcBottomLine(),
-|* CalcLeftLine(), CalcRightLine()
+|* SwBorderAttrs::CalcTopLine(), CalcBottomLine(),
+|* CalcLeftLine(), CalcRightLine()
|*
-|* Beschreibung Berechnung der Groessen fuer Umrandung und Schatten.
-|* Es kann auch ohne Linien ein Abstand erwuenscht sein,
-|* dieser wird dann nicht vom Attribut sondern hier
-|* beruecksichtigt (bBorderDist, z.B. fuer Zellen).
-|* Ersterstellung MA 21. May. 93
-|* Letzte Aenderung MA 07. Jun. 99
+|* Beschreibung Berechnung der Groessen fuer Umrandung und Schatten.
+|* Es kann auch ohne Linien ein Abstand erwuenscht sein,
+|* dieser wird dann nicht vom Attribut sondern hier
+|* beruecksichtigt (bBorderDist, z.B. fuer Zellen).
+|* Ersterstellung MA 21. May. 93
+|* Letzte Aenderung MA 07. Jun. 99
|*
|*************************************************************************/
@@ -2115,10 +2115,10 @@ void SwBorderAttrs::_CalcRightLine()
/*************************************************************************
|*
-|* SwBorderAttrs::_IsLine()
+|* SwBorderAttrs::_IsLine()
|*
-|* Ersterstellung MA 29. Sep. 94
-|* Letzte Aenderung MA 29. Sep. 94
+|* Ersterstellung MA 29. Sep. 94
+|* Letzte Aenderung MA 29. Sep. 94
|*
|*************************************************************************/
@@ -2131,24 +2131,24 @@ void SwBorderAttrs::_IsLine()
/*************************************************************************
|*
-|* SwBorderAttrs::CmpLeftRightLine(), IsTopLine(), IsBottomLine()
+|* SwBorderAttrs::CmpLeftRightLine(), IsTopLine(), IsBottomLine()
|*
-|* Die Umrandungen benachbarter Absaetze werden nach folgendem
-|* Algorithmus zusammengefasst:
+|* Die Umrandungen benachbarter Absaetze werden nach folgendem
+|* Algorithmus zusammengefasst:
|*
-|* 1. Die Umrandung oben faellt weg, wenn der Vorgaenger dieselbe
-|* Umrandung oben aufweist und 3. Zutrifft.
-|* Zusaetzlich muss der Absatz mindestens rechts oder links oder
-|* unten eine Umrandung haben.
-|* 2. Die Umrandung unten faellt weg, wenn der Nachfolger dieselbe
-|* Umrandung untern aufweist und 3. Zustrifft.
-|* Zusaetzlich muss der Absatz mindestens rechts oder links oder
-|* oben eine Umrandung haben.
-|* 3. Die Umrandungen links und rechts vor Vorgaenger bzw. Nachfolger
-|* sind identisch.
+|* 1. Die Umrandung oben faellt weg, wenn der Vorgaenger dieselbe
+|* Umrandung oben aufweist und 3. Zutrifft.
+|* Zusaetzlich muss der Absatz mindestens rechts oder links oder
+|* unten eine Umrandung haben.
+|* 2. Die Umrandung unten faellt weg, wenn der Nachfolger dieselbe
+|* Umrandung untern aufweist und 3. Zustrifft.
+|* Zusaetzlich muss der Absatz mindestens rechts oder links oder
+|* oben eine Umrandung haben.
+|* 3. Die Umrandungen links und rechts vor Vorgaenger bzw. Nachfolger
+|* sind identisch.
|*
-|* Ersterstellung MA 22. Mar. 95
-|* Letzte Aenderung MA 22. May. 95
+|* Ersterstellung MA 22. Mar. 95
+|* Letzte Aenderung MA 22. May. 95
|*
|*************************************************************************/
inline int CmpLines( const SvxBorderLine *pL1, const SvxBorderLine *pL2 )
@@ -2317,10 +2317,10 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm )
/*************************************************************************
|*
-|* SwBorderAttrAccess::CTor
+|* SwBorderAttrAccess::CTor
|*
-|* Ersterstellung MA 20. Mar. 95
-|* Letzte Aenderung MA 29. Nov. 95
+|* Ersterstellung MA 20. Mar. 95
+|* Letzte Aenderung MA 29. Nov. 95
|*
|*************************************************************************/
@@ -2337,10 +2337,10 @@ SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) :
/*************************************************************************
|*
-|* SwBorderAttrAccess::NewObj, Get
+|* SwBorderAttrAccess::NewObj, Get
|*
-|* Ersterstellung MA 20. Mar. 95
-|* Letzte Aenderung MA 20. Mar. 95
+|* Ersterstellung MA 20. Mar. 95
+|* Letzte Aenderung MA 20. Mar. 95
|*
|*************************************************************************/
@@ -2357,10 +2357,10 @@ SwBorderAttrs *SwBorderAttrAccess::Get()
/*************************************************************************
|*
-|* SwOrderIter::Ctor
+|* SwOrderIter::Ctor
|*
-|* Ersterstellung MA 06. Jan. 95
-|* Letzte Aenderung MA 22. Nov. 95
+|* Ersterstellung MA 06. Jan. 95
+|* Letzte Aenderung MA 22. Nov. 95
|*
|*************************************************************************/
@@ -2373,10 +2373,10 @@ SwOrderIter::SwOrderIter( const SwPageFrm *pPg, BOOL bFlys ) :
/*************************************************************************
|*
-|* SwOrderIter::Top()
+|* SwOrderIter::Top()
|*
-|* Ersterstellung MA 06. Jan. 95
-|* Letzte Aenderung MA 22. Nov. 95
+|* Ersterstellung MA 06. Jan. 95
+|* Letzte Aenderung MA 22. Nov. 95
|*
|*************************************************************************/
@@ -2409,10 +2409,10 @@ const SdrObject *SwOrderIter::Top()
/*************************************************************************
|*
-|* SwOrderIter::Bottom()
+|* SwOrderIter::Bottom()
|*
-|* Ersterstellung MA 06. Jan. 95
-|* Letzte Aenderung MA 22. Nov. 95
+|* Ersterstellung MA 06. Jan. 95
+|* Letzte Aenderung MA 22. Nov. 95
|*
|*************************************************************************/
@@ -2445,10 +2445,10 @@ const SdrObject *SwOrderIter::Bottom()
/*************************************************************************
|*
-|* SwOrderIter::Next()
+|* SwOrderIter::Next()
|*
-|* Ersterstellung MA 06. Jan. 95
-|* Letzte Aenderung MA 22. Nov. 95
+|* Ersterstellung MA 06. Jan. 95
+|* Letzte Aenderung MA 22. Nov. 95
|*
|*************************************************************************/
@@ -2482,10 +2482,10 @@ const SdrObject *SwOrderIter::Next()
/*************************************************************************
|*
-|* SwOrderIter::Prev()
+|* SwOrderIter::Prev()
|*
-|* Ersterstellung MA 06. Jan. 95
-|* Letzte Aenderung MA 22. Nov. 95
+|* Ersterstellung MA 06. Jan. 95
+|* Letzte Aenderung MA 22. Nov. 95
|*
|*************************************************************************/
@@ -2519,10 +2519,10 @@ const SdrObject *SwOrderIter::Prev()
/*************************************************************************
|*
-|* SaveCntnt(), RestoreCntnt()
+|* SaveCntnt(), RestoreCntnt()
|*
-|* Ersterstellung MA 10. Jun. 93
-|* Letzte Aenderung MA 07. Mar. 95
+|* Ersterstellung MA 10. Jun. 93
+|* Letzte Aenderung MA 07. Mar. 95
|*
|*************************************************************************/
@@ -2638,7 +2638,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
do
{
if( bGo )
- pFloat->GetUpper()->pLower = 0; //Die Teilkette ausklinken.
+ pFloat->GetUpper()->pLower = 0; //Die Teilkette ausklinken.
//Das Ende der Teilkette suchen, unterwegs die Flys abmelden.
do
@@ -2656,7 +2656,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
if( pCnt )
{
do
- { if ( pCnt->GetDrawObjs() )
+ { if ( pCnt->GetDrawObjs() )
::lcl_RemoveObjsFromPage( pCnt );
pCnt = pCnt->GetNextCntntFrm();
} while ( pCnt && ((SwLayoutFrm*)pFloat)->IsAnLower( pCnt ) );
@@ -2666,7 +2666,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
OSL_ENSURE( !pFloat, "Neuer Float-Frame?" );
}
}
- if ( pFloat->GetNext() )
+ if ( pFloat->GetNext() )
{
if( bGo )
pFloat->pUpper = NULL;
@@ -2697,7 +2697,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
if ( pTmp && bGo )
{
- pFloat->pNext = pTmp; //Die beiden Ketten verbinden.
+ pFloat->pNext = pTmp; //Die beiden Ketten verbinden.
pFloat->pNext->pPrev = pFloat;
}
pFloat = pTmp;
@@ -2793,9 +2793,9 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
pSibling->Prepare( PREP_CLEAR, 0, sal_False );
}
else
- { pNxt = pParent->pLower;
+ { pNxt = pParent->pLower;
pParent->pLower = pSav;
- pSav->pUpper = pParent; //Schon mal setzen, sonst ist fuer das
+ pSav->pUpper = pParent; //Schon mal setzen, sonst ist fuer das
//invalidate der Parent (z.B. ein Fly) nicht klar.
//Invaliden Cntnt anmelden.
if ( pSav->IsCntntFrm() )
@@ -2812,7 +2812,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
SwTwips nGrowVal = 0;
SwFrm* pLast;
do
- { pSav->pUpper = pParent;
+ { pSav->pUpper = pParent;
nGrowVal += (pSav->Frm().*fnRect->fnGetHeight)();
pSav->_InvalidateAll();
@@ -2821,21 +2821,21 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
{
if ( pSav->IsTxtFrm() &&
((SwTxtFrm*)pSav)->GetCacheIdx() != USHRT_MAX )
- ((SwTxtFrm*)pSav)->Init(); //Ich bin sein Freund.
+ ((SwTxtFrm*)pSav)->Init(); //Ich bin sein Freund.
if ( pPage && pSav->GetDrawObjs() )
::lcl_AddObjsToPage( (SwCntntFrm*)pSav, pPage );
}
else
- { SwCntntFrm *pBlub = ((SwLayoutFrm*)pSav)->ContainsCntnt();
+ { SwCntntFrm *pBlub = ((SwLayoutFrm*)pSav)->ContainsCntnt();
if( pBlub )
{
do
- { if ( pPage && pBlub->GetDrawObjs() )
+ { if ( pPage && pBlub->GetDrawObjs() )
::lcl_AddObjsToPage( pBlub, pPage );
if( pBlub->IsTxtFrm() && ((SwTxtFrm*)pBlub)->HasFtn() &&
((SwTxtFrm*)pBlub)->GetCacheIdx() != USHRT_MAX )
- ((SwTxtFrm*)pBlub)->Init(); //Ich bin sein Freund.
+ ((SwTxtFrm*)pBlub)->Init(); //Ich bin sein Freund.
pBlub = pBlub->GetNextCntntFrm();
} while ( pBlub && ((SwLayoutFrm*)pSav)->IsAnLower( pBlub ));
}
@@ -2857,11 +2857,11 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
/*************************************************************************
|*
-|* SqRt() Berechnung der Quadratwurzel, damit die math.lib
-|* nicht auch noch dazugelinkt werden muss.
+|* SqRt() Berechnung der Quadratwurzel, damit die math.lib
+|* nicht auch noch dazugelinkt werden muss.
|*
-|* Ersterstellung OK ??
-|* Letzte Aenderung MA 09. Jan. 97
+|* Ersterstellung OK ??
+|* Letzte Aenderung MA 09. Jan. 97
|*
|*************************************************************************/
@@ -2883,10 +2883,10 @@ ULONG MA_FASTCALL SqRt( BigInt nX )
/*************************************************************************
|*
-|* InsertNewPage() Einsetzen einer neuen Seite.
+|* InsertNewPage() Einsetzen einer neuen Seite.
|*
-|* Ersterstellung MA 01. Jul. 93
-|* Letzte Aenderung MA 31. Jul. 95
+|* Ersterstellung MA 01. Jul. 93
+|* Letzte Aenderung MA 31. Jul. 95
|*
|*************************************************************************/
@@ -2924,12 +2924,12 @@ SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
/*************************************************************************
|*
-|* RegistFlys(), Regist() Die beiden folgenden Methoden durchsuchen rekursiv
-|* eine Layoutstruktur und melden alle FlyFrms, die einen beliebigen Frm
-|* innerhalb der Struktur als Anker haben bei der Seite an.
+|* RegistFlys(), Regist() Die beiden folgenden Methoden durchsuchen rekursiv
+|* eine Layoutstruktur und melden alle FlyFrms, die einen beliebigen Frm
+|* innerhalb der Struktur als Anker haben bei der Seite an.
|*
-|* Ersterstellung MA 08. Jul. 93
-|* Letzte Aenderung MA 07. Jul. 95
+|* Ersterstellung MA 08. Jul. 93
+|* Letzte Aenderung MA 07. Jul. 95
|*
|*************************************************************************/
@@ -2997,12 +2997,12 @@ void RegistFlys( SwPageFrm *pPage, const SwLayoutFrm *pLay )
/*************************************************************************
|*
-|* void Notify()
+|* void Notify()
|*
-|* Beschreibung Benachrichtigt den Hintergrund je nach der
-|* Veraenderung zwischen altem und neuem Rechteckt.
-|* Ersterstellung MA 18. Jun. 93
-|* Letzte Aenderung MA 06. Jun. 96
+|* Beschreibung Benachrichtigt den Hintergrund je nach der
+|* Veraenderung zwischen altem und neuem Rechteckt.
+|* Ersterstellung MA 18. Jun. 93
+|* Letzte Aenderung MA 06. Jun. 96
|*
|*************************************************************************/
@@ -3011,7 +3011,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
{
const SwRect aFrm( pFly->GetObjRectWithSpaces() );
if ( rOld.Pos() != aFrm.Pos() )
- { //Positionsaenderung, alten und neuen Bereich invalidieren
+ { //Positionsaenderung, alten und neuen Bereich invalidieren
if ( rOld.HasArea() &&
rOld.Left()+pFly->GetFmt()->GetLRSpace().GetLeft() < WEIT_WECH )
{
@@ -3020,7 +3020,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
pFly->NotifyBackground( pFly->FindPageFrm(), aFrm, PREP_FLY_ARRIVE );
}
else if ( rOld.SSize() != aFrm.SSize() )
- { //Groessenaenderung, den Bereich der Verlassen wurde bzw. jetzt
+ { //Groessenaenderung, den Bereich der Verlassen wurde bzw. jetzt
//ueberdeckt wird invalidieren.
//Der Einfachheit halber wird hier bewusst jeweils ein Twip
//unnoetig invalidiert.
@@ -3042,7 +3042,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
{
SwRect aTmp( rOld );
aTmp.Union( aFrm );
- aTmp.Left( Min(aFrm.Left(), rOld.Left()) );
+ aTmp.Left( Min(aFrm.Left(), rOld.Left()) );
aTmp.Right( Max(aFrm.Left(), rOld.Left()) );
pFly->NotifyBackground( pOld, aTmp, PREP_FLY_CHGD );
}
@@ -3052,7 +3052,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
{
SwRect aTmp( rOld );
aTmp.Union( aFrm );
- aTmp.Left( Min(nNew, nOld) );
+ aTmp.Left( Min(nNew, nOld) );
aTmp.Right( Max(nNew, nOld) );
pFly->NotifyBackground( pOld, aTmp, PREP_FLY_CHGD );
}
@@ -3060,7 +3060,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
{
SwRect aTmp( rOld );
aTmp.Union( aFrm );
- aTmp.Top( Min(aFrm.Top(), rOld.Top()) );
+ aTmp.Top( Min(aFrm.Top(), rOld.Top()) );
aTmp.Bottom( Max(aFrm.Top(), rOld.Top()) );
pFly->NotifyBackground( pOld, aTmp, PREP_FLY_CHGD );
}
@@ -3070,7 +3070,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
{
SwRect aTmp( rOld );
aTmp.Union( aFrm );
- aTmp.Top( Min(nNew, nOld) );
+ aTmp.Top( Min(nNew, nOld) );
aTmp.Bottom( Max(nNew, nOld) );
pFly->NotifyBackground( pOld, aTmp, PREP_FLY_CHGD );
}
@@ -3085,7 +3085,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld,
/*************************************************************************
|*
-|* NotifyBackground()
+|* NotifyBackground()
|*
|*************************************************************************/
@@ -3332,9 +3332,9 @@ void Notify_Background( const SdrObject* pObj,
/*************************************************************************
|*
-|* GetVirtualUpper() liefert bei absatzgebundenen Objekten den Upper
+|* GetVirtualUpper() liefert bei absatzgebundenen Objekten den Upper
|* des Ankers. Falls es sich dabei um verkettete Rahmen oder
-|* Fussnoten handelt, wird ggf. der "virtuelle" Upper ermittelt.
+|* Fussnoten handelt, wird ggf. der "virtuelle" Upper ermittelt.
|*
|*************************************************************************/
@@ -3372,7 +3372,7 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos )
/*************************************************************************
|*
-|* IsLowerOf()
+|* IsLowerOf()
|*
|*************************************************************************/
@@ -3394,7 +3394,7 @@ BOOL Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
OSL_ENSURE( pFrm, "8-( Fly is lost in Space." );
pFrm = GetVirtualUpper( pFrm, aPos );
do
- { if ( pFrm == pCurrFrm )
+ { if ( pFrm == pCurrFrm )
return TRUE;
if( pFrm->IsFlyFrm() )
{
@@ -3413,10 +3413,10 @@ const SwFrm *FindKontext( const SwFrm *pFrm, USHORT nAdditionalKontextTyp )
//Umgebung hineinragen kann.
const USHORT nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT |
FRM_FTN | FRM_FLY |
- FRM_TAB | FRM_ROW | FRM_CELL |
+ FRM_TAB | FRM_ROW | FRM_CELL |
nAdditionalKontextTyp;
do
- { if ( pFrm->GetType() & nTyp )
+ { if ( pFrm->GetType() & nTyp )
break;
pFrm = pFrm->GetUpper();
} while( pFrm );
@@ -3429,9 +3429,9 @@ BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
const USHORT nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT |
FRM_FTN | FRM_FLY |
- FRM_TAB | FRM_ROW | FRM_CELL;
+ FRM_TAB | FRM_ROW | FRM_CELL;
do
- { if ( pFrm->GetType() & nTyp )
+ { if ( pFrm->GetType() & nTyp )
{
if( pFrm == pKontext )
return TRUE;
@@ -3488,7 +3488,7 @@ SwTwips MA_FASTCALL lcl_CalcCellRstHeight( SwLayoutFrm *pCell )
long nRstHeight = 0;
SwFrm *pLow = pCell->Lower();
do
- { nRstHeight += ::CalcRowRstHeight( (SwLayoutFrm*)pLow );
+ { nRstHeight += ::CalcRowRstHeight( (SwLayoutFrm*)pLow );
pLow = pLow->GetNext();
} while ( pLow );
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 4683db4e5ac5..bb7675091f93 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2,7 +2,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
@@ -55,12 +55,12 @@
/*************************************************************************
|*
-|* lcl_FindFtnPos() Sucht die Position des Attributes im FtnArray am
-|* Dokument, dort stehen die Fussnoten gluecklicherweise nach ihrem
-|* Index sortiert.
+|* lcl_FindFtnPos() Sucht die Position des Attributes im FtnArray am
+|* Dokument, dort stehen die Fussnoten gluecklicherweise nach ihrem
+|* Index sortiert.
|*
-|* Ersterstellung MA 29. Jun. 93
-|* Letzte Aenderung MA 13. Dec. 93
+|* Ersterstellung MA 29. Jun. 93
+|* Letzte Aenderung MA 13. Dec. 93
|*
|*************************************************************************/
@@ -115,13 +115,13 @@ BOOL SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
/*************************************************************************
|*
-|* BOOL lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage)
+|* BOOL lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage)
|* setzt pBoss auf den naechsten SwFtnBossFrm, das kann entweder eine Spalte
|* oder eine Seite (ohne Spalten) sein. Wenn die Seite dabei gewechselt wird
|* enthaelt pPage die neue Seite und die Funktion liefert TRUE.
|*
-|* Ersterstellung AMA 06. Nov. 98
-|* Letzte Aenderung AMA 06. Nov. 98
+|* Ersterstellung AMA 06. Nov. 98
+|* Letzte Aenderung AMA 06. Nov. 98
|*
|*************************************************************************/
@@ -168,12 +168,12 @@ BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
/*************************************************************************
|*
-|* USHORT lcl_ColumnNum( SwFrm* pBoss )
+|* USHORT lcl_ColumnNum( SwFrm* pBoss )
|* liefert die Spaltennummer, wenn pBoss eine Spalte ist,
|* sonst eine Null (bei Seiten).
|*
-|* Ersterstellung AMA 06. Nov. 98
-|* Letzte Aenderung AMA 06. Nov. 98
+|* Ersterstellung AMA 06. Nov. 98
+|* Letzte Aenderung AMA 06. Nov. 98
|*
|*************************************************************************/
@@ -199,7 +199,7 @@ USHORT lcl_ColumnNum( const SwFrm* pBoss )
pCol = pBoss;
while( pCol )
{
- nRet += 256; // Page columns
+ nRet += 256; // Page columns
pCol = pCol->GetPrev();
}
return nRet;
@@ -207,10 +207,10 @@ USHORT lcl_ColumnNum( const SwFrm* pBoss )
/*************************************************************************
|*
-|* SwFtnContFrm::SwFtnContFrm()
+|* SwFtnContFrm::SwFtnContFrm()
|*
-|* Ersterstellung MA 24. Feb. 93
-|* Letzte Aenderung MA 02. Mar. 93
+|* Ersterstellung MA 24. Feb. 93
+|* Letzte Aenderung MA 02. Mar. 93
|*
|*************************************************************************/
@@ -254,12 +254,12 @@ long lcl_Undersize( const SwFrm* pFrm )
/*************************************************************************
|*
-|* SwFtnContFrm::Format()
+|* SwFtnContFrm::Format()
|*
-|* Beschreibung: "Formatiert" den Frame;
-|* Die Fixsize wird hier nicht eingestellt.
-|* Ersterstellung MA 01. Mar. 93
-|* Letzte Aenderung MA 17. Nov. 98
+|* Beschreibung: "Formatiert" den Frame;
+|* Die Fixsize wird hier nicht eingestellt.
+|* Ersterstellung MA 01. Mar. 93
+|* Letzte Aenderung MA 17. Nov. 98
|*
|*************************************************************************/
@@ -339,10 +339,10 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
}
/*************************************************************************
|*
-|* SwFtnContFrm::GrowFrm(), ShrinkFrm()
+|* SwFtnContFrm::GrowFrm(), ShrinkFrm()
|*
-|* Ersterstellung MA 24. Feb. 93
-|* Letzte Aenderung AMA 05. Nov. 98
+|* Ersterstellung MA 24. Feb. 93
+|* Letzte Aenderung AMA 05. Nov. 98
|*
|*************************************************************************/
@@ -504,10 +504,10 @@ SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwFtnFrm::SwFtnFrm()
+|* SwFtnFrm::SwFtnFrm()
|*
-|* Ersterstellung MA 24. Feb. 93
-|* Letzte Aenderung MA 11. Oct. 93
+|* Ersterstellung MA 24. Feb. 93
+|* Letzte Aenderung MA 11. Oct. 93
|*
|*************************************************************************/
@@ -528,10 +528,10 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwCntntFrm *pCnt, SwTxtFtn *pAt ):
/*************************************************************************
|*
-|* SwFtnFrm::InvalidateNxtFtnCnts()
+|* SwFtnFrm::InvalidateNxtFtnCnts()
|*
-|* Ersterstellung MA 29. Jun. 93
-|* Letzte Aenderung MA 29. Jun. 93
+|* Ersterstellung MA 29. Jun. 93
+|* Letzte Aenderung MA 29. Jun. 93
|*
|*************************************************************************/
@@ -546,7 +546,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
pCnt->InvalidatePage( pPage );
pCnt->_InvalidatePrt();
do
- { pCnt->_InvalidatePos();
+ { pCnt->_InvalidatePos();
if( pCnt->IsSctFrm() )
{
SwFrm* pTmp = ((SwSectionFrm*)pCnt)->ContainsAny();
@@ -598,10 +598,10 @@ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwFtnFrm::Cut()
+|* SwFtnFrm::Cut()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 24. Jul. 95
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 24. Jul. 95
|*
|*************************************************************************/
@@ -649,7 +649,7 @@ void SwFtnFrm::Cut()
pSect->_InvalidateSize();
}
else
- { if ( Frm().Height() )
+ { if ( Frm().Height() )
pUp->Shrink( Frm().Height() );
pUp->SetCompletePaint();
pUp->InvalidatePage();
@@ -659,10 +659,10 @@ void SwFtnFrm::Cut()
/*************************************************************************
|*
-|* SwFtnFrm::Paste()
+|* SwFtnFrm::Paste()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 23. Feb. 94
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 23. Feb. 94
|*
|*************************************************************************/
@@ -728,13 +728,13 @@ void SwFtnFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
/*************************************************************************
|*
-|* SwFrm::GetNextFtnLeaf()
+|* SwFrm::GetNextFtnLeaf()
|*
-|* Beschreibung Liefert das naechste LayoutBlatt in den das
-|* Frame gemoved werden kann.
-|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist.
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung AMA 09. Nov. 98
+|* Beschreibung Liefert das naechste LayoutBlatt in den das
+|* Frame gemoved werden kann.
+|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist.
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung AMA 09. Nov. 98
|*
|*************************************************************************/
@@ -768,7 +768,7 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
pPage = (SwPageFrm*)pOldPage->GetNext();
// Leerseiten ueberspringen
if( pPage && pPage->IsEmptyPage() )
- pPage = (SwPageFrm*)pPage->GetNext();
+ pPage = (SwPageFrm*)pPage->GetNext();
pBoss = pPage;
}
}
@@ -808,7 +808,7 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
return 0;
}
if( pBoss->IsPageFrm() )
- { // Wenn wir auf einer spaltigen Seite gelandet sind,
+ { // Wenn wir auf einer spaltigen Seite gelandet sind,
// gehen wir in die erste Spalte
SwLayoutFrm* pLay = pBoss->FindBodyCont();
if( pLay && pLay->Lower() && pLay->Lower()->IsColumnFrm() )
@@ -824,12 +824,12 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
/*************************************************************************
|*
-|* SwFrm::GetPrevFtnLeaf()
+|* SwFrm::GetPrevFtnLeaf()
|*
-|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
-|* Frame gemoved werden kann.
-|* Ersterstellung MA 16. Nov. 92
-|* Letzte Aenderung AMA 06. Nov. 98
+|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
+|* Frame gemoved werden kann.
+|* Ersterstellung MA 16. Nov. 92
+|* Letzte Aenderung AMA 06. Nov. 98
|*
|*************************************************************************/
@@ -876,8 +876,8 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
do
{
if( pNxtBoss->IsColumnFrm() && pNxtBoss->GetPrev() )
- pNxtBoss = (SwFtnBossFrm*)pNxtBoss->GetPrev(); // eine Spalte zurueck
- else // oder eine Seite zurueck
+ pNxtBoss = (SwFtnBossFrm*)pNxtBoss->GetPrev(); // eine Spalte zurueck
+ else // oder eine Seite zurueck
{
SwLayoutFrm* pBody = 0;
if( pSect )
@@ -925,7 +925,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
break;
}
if ( pStop == pNxtBoss )
- { //Die Seite/Spalte auf der sich auch die Referenz tummelt, ist erreicht.
+ { //Die Seite/Spalte auf der sich auch die Referenz tummelt, ist erreicht.
//Wir koennen jetzt probehalber mal einen Container erzeugen und
//uns hineinpasten.
if ( eMakeFtn == MAKEPAGE_FTN && pNxtBoss->GetMaxFtnHeight() )
@@ -939,12 +939,12 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
const SwFtnBossFrm* pNewBoss = pRet->FindFtnBossFrm();
BOOL bJump = FALSE;
if( pOldBoss->IsColumnFrm() && pOldBoss->GetPrev() ) // es gibt eine vorherige Spalte
- bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss; // sind wir darin gelandet?
+ bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss; // sind wir darin gelandet?
else if( pNewBoss->IsColumnFrm() && pNewBoss->GetNext() )
bJump = TRUE; // es gibt hinter dem neuen Boss noch eine Spalte, die aber nicht
// der alte Boss sein kann, das haben wir ja bereits geprueft.
else // hier landen wir nur, wenn neuer und alter Boss entweder Seiten oder letzte (neu)
- { // bzw. erste (alt) Spalten einer Seite sind. In diesem Fall muss noch geprueft
+ { // bzw. erste (alt) Spalten einer Seite sind. In diesem Fall muss noch geprueft
// werden, ob Seiten ueberspringen wurden.
USHORT nDiff = pOldPage->GetPhyPageNum() - pRet->FindPageFrm()->GetPhyPageNum();
if ( nDiff > 2 ||
@@ -959,10 +959,10 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
/*************************************************************************
|*
-|* SwFrm::IsFtnAllowed()
+|* SwFrm::IsFtnAllowed()
|*
-|* Ersterstellung MA 22. Mar. 94
-|* Letzte Aenderung MA 01. Dec. 94
+|* Ersterstellung MA 22. Mar. 94
+|* Letzte Aenderung MA 01. Dec. 94
|*
|*************************************************************************/
@@ -984,10 +984,10 @@ BOOL SwFrm::IsFtnAllowed() const
/*************************************************************************
|*
-|* SwRootFrm::UpdateFtnNums()
+|* SwRootFrm::UpdateFtnNums()
|*
-|* Ersterstellung MA 02. Mar. 93
-|* Letzte Aenderung MA 09. Dec. 97
+|* Ersterstellung MA 02. Mar. 93
+|* Letzte Aenderung MA 09. Dec. 97
|*
|*************************************************************************/
@@ -1008,11 +1008,11 @@ void SwRootFrm::UpdateFtnNums()
/*************************************************************************
|*
-|* RemoveFtns() Entfernen aller Fussnoten (nicht etwa die Referenzen)
-|* und Entfernen aller Fussnotenseiten.
+|* RemoveFtns() Entfernen aller Fussnoten (nicht etwa die Referenzen)
+|* und Entfernen aller Fussnotenseiten.
|*
-|* Ersterstellung MA 05. Dec. 97
-|* Letzte Aenderung AMA 06. Nov. 98
+|* Ersterstellung MA 05. Dec. 97
+|* Letzte Aenderung AMA 06. Nov. 98
|*
|*************************************************************************/
@@ -1055,7 +1055,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes )
SwFrm* pLow = pBody->Lower();
while( pLow->GetNext() )
{
- if( pLow->IsSctFrm() && ( !pLow->GetNext() ||
+ if( pLow->IsSctFrm() && ( !pLow->GetNext() ||
((SwSectionFrm*)pLow)->IsAnyNoteAtEnd() ) &&
((SwSectionFrm*)pLow)->Lower() &&
((SwSectionFrm*)pLow)->Lower()->IsColumnFrm() )
@@ -1076,7 +1076,7 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, BOOL bPageOnly, BOOL bEndNotes )
pPage = (SwPageFrm*)Lower();
do
- { // Bei spaltigen Seiten muessen wir in allen Spalten aufraeumen
+ { // Bei spaltigen Seiten muessen wir in allen Spalten aufraeumen
SwFtnBossFrm* pBoss;
SwLayoutFrm* pBody = pPage->FindBodyCont();
if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
@@ -1105,10 +1105,10 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, BOOL bPageOnly, BOOL bEndNotes )
/*************************************************************************
|*
-|* SetFtnPageDescs() Seitenvorlagen der Fussnotenseiten aendern
+|* SetFtnPageDescs() Seitenvorlagen der Fussnotenseiten aendern
|*
-|* Ersterstellung MA 11. Dec. 97
-|* Letzte Aenderung MA 11. Dec. 97
+|* Ersterstellung MA 11. Dec. 97
+|* Letzte Aenderung MA 11. Dec. 97
|*
|*************************************************************************/
@@ -1126,10 +1126,10 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote )
/*************************************************************************
|*
-|* SwFtnBossFrm::MakeFtnCont()
+|* SwFtnBossFrm::MakeFtnCont()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1155,10 +1155,10 @@ SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
/*************************************************************************
|*
-|* SwFtnBossFrm::FindFtnCont()
+|* SwFtnBossFrm::FindFtnCont()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1187,10 +1187,10 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
/*************************************************************************
|*
-|* SwFtnBossFrm::FindNearestFtnCont() Sucht den naechst greifbaren Fussnotencontainer.
+|* SwFtnBossFrm::FindNearestFtnCont() Sucht den naechst greifbaren Fussnotencontainer.
|*
-|* Ersterstellung MA 02. Aug. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 02. Aug. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1221,11 +1221,11 @@ SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( BOOL bDontLeave )
/*************************************************************************
|*
-|* SwFtnBossFrm::FindFirstFtn()
+|* SwFtnBossFrm::FindFirstFtn()
|*
-|* Beschreibung Erste Fussnote des Fussnotenbosses suchen.
-|* Ersterstellung MA 26. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 99
+|* Beschreibung Erste Fussnote des Fussnotenbosses suchen.
+|* Ersterstellung MA 26. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 99
|*
|*************************************************************************/
@@ -1263,7 +1263,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
return NULL; //mind. eine Spalte zu weit.
}
else if ( nPgNum > nRefNum )
- return NULL; //mind. eine Seite zu weit.
+ return NULL; //mind. eine Seite zu weit.
}
else
return NULL;
@@ -1300,21 +1300,21 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
pRet = 0; //mind. eine Spalte zu weit.
}
else if ( nPgNum > nRefNum )
- pRet = 0; //mind. eine Seite zu weit.
+ pRet = 0; //mind. eine Seite zu weit.
}
else
- pRet = 0; //Gibt eben keinen.
+ pRet = 0; //Gibt eben keinen.
} while( pRet );
return pRet;
}
/*************************************************************************
|*
-|* SwFtnBossFrm::FindFirstFtn()
+|* SwFtnBossFrm::FindFirstFtn()
|*
-|* Beschreibunt Erste Fussnote zum Cnt suchen.
-|* Ersterstellung MA 04. Mar. 93
-|* Letzte Aenderung AMA 28. Oct. 98
+|* Beschreibunt Erste Fussnote zum Cnt suchen.
+|* Ersterstellung MA 04. Mar. 93
+|* Letzte Aenderung AMA 28. Oct. 98
|*
|*************************************************************************/
@@ -1334,7 +1334,7 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
if ( pRet->GetNext() )
pRet = (const SwFtnFrm*)pRet->GetNext();
else
- { SwFtnBossFrm *pBoss = (SwFtnBossFrm*)pRet->FindFtnBossFrm();
+ { SwFtnBossFrm *pBoss = (SwFtnBossFrm*)pRet->FindFtnBossFrm();
SwPageFrm *pPage = pBoss->FindPageFrm();
lcl_NextFtnBoss( pBoss, pPage, FALSE ); // naechster FtnBoss
SwFtnContFrm *pCont = pBoss ? pBoss->FindNearestFtnCont() : 0;
@@ -1354,10 +1354,10 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
/*************************************************************************
|*
-|* SwFtnBossFrm::ResetFtn()
+|* SwFtnBossFrm::ResetFtn()
|*
-|* Ersterstellung MA 11. May. 95
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 11. May. 95
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1404,10 +1404,10 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
/*************************************************************************
|*
-|* SwFtnBossFrm::InsertFtn()
+|* SwFtnBossFrm::InsertFtn()
|*
-|* Ersterstellung MA 26. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 26. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1485,7 +1485,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
}
if ( !pSibling )
- { pParent = FindFtnCont();
+ { pParent = FindFtnCont();
if ( !pParent )
{
//Es gibt noch keinen FussnotenContainer, also machen wir einen.
@@ -1524,8 +1524,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
}
nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
- SwFtnBossFrm *pNxtB = this; //Immer den letzten merken, damit wir nicht
- SwFtnFrm *pLastSib = 0; //ueber das Ziel hinausschiessen.
+ SwFtnBossFrm *pNxtB = this; //Immer den letzten merken, damit wir nicht
+ SwFtnFrm *pLastSib = 0; //ueber das Ziel hinausschiessen.
while ( pSibling && nCmpPos <= nStPos )
{
@@ -1566,12 +1566,12 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
// pLastSib ist jetzt die letzte Fussnote vor uns,
// pSibling leer oder die erste nach uns.
if ( pSibling && pLastSib && (pSibling != pLastSib) )
- { //Sind wir vielleicht bereits ueber das Ziel hinausgeschossen?
+ { //Sind wir vielleicht bereits ueber das Ziel hinausgeschossen?
if ( nCmpPos > nStPos )
pSibling = pLastSib;
}
else if ( !pSibling )
- { //Eine Chance haben wir noch: wir nehmen einfach die letzte
+ { //Eine Chance haben wir noch: wir nehmen einfach die letzte
//Fussnote im Parent. Ein Sonderfall, der z.B. beim
//zurueckfliessen von Absaetzen mit mehreren Fussnoten
//vorkommt.
@@ -1585,13 +1585,13 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
}
}
else
- { //Die erste Fussnote der Spalte/Seite haben wir an der Hand, jetzt ausgehend
+ { //Die erste Fussnote der Spalte/Seite haben wir an der Hand, jetzt ausgehend
//von dieser die erste zur selben Spalte/Seite suchen deren Index hinter
//den uebergebenen zeigt, die letzte, die wir an der Hand hatten, ist
//dann der Vorgaenger.
SwFtnBossFrm* pBoss = pNew->GetRef()->FindFtnBossFrm(
!pNew->GetAttr()->GetFtn().IsEndNote() );
- USHORT nRefNum = pBoss->GetPhyPageNum(); // Die Seiten- und
+ USHORT nRefNum = pBoss->GetPhyPageNum(); // Die Seiten- und
USHORT nRefCol = lcl_ColumnNum( pBoss ); // Spaltennummer der neuen Fussnote
BOOL bEnd = FALSE;
SwFtnFrm *pLastSib = 0;
@@ -1634,7 +1634,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
if ( !bEnd && pSibling )
nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
if ( pSibling && pLastSib && (pSibling != pLastSib) )
- { //Sind wir vielleicht bereits ueber das Ziel hinausgeschossen?
+ { //Sind wir vielleicht bereits ueber das Ziel hinausgeschossen?
if ( (nLastPos < nCmpPos) && (nCmpPos > nStPos) )
{
pSibling = pLastSib;
@@ -1674,10 +1674,10 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
/*************************************************************************
|*
-|* SwFtnBossFrm::AppendFtn()
+|* SwFtnBossFrm::AppendFtn()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1840,7 +1840,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
pBoss = pPage; // bei nichtspaltigen Seiten auf die Seite selbst
}
pBoss->InsertFtn( pNew );
- if ( pNew->GetUpper() ) //Eingesetzt oder nicht?
+ if ( pNew->GetUpper() ) //Eingesetzt oder nicht?
{
::RegistFlys( pNew->FindPageFrm(), pNew );
SwSectionFrm* pSect = FindSctFrm();
@@ -1862,7 +1862,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
// SwLayNotify* pFtnFrmNotitfy = new SwLayNotify( pNew );
// <--
SwCntntFrm *pCnt = pNew->ContainsCntnt();
- while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
+ while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
{
pCnt->Calc();
// --> OD 2005-05-17 #i49383# - format anchored objects
@@ -1909,10 +1909,10 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
}
/*************************************************************************
|*
-|* SwFtnBossFrm::FindFtn()
+|* SwFtnBossFrm::FindFtn()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1960,10 +1960,10 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr )
}
/*************************************************************************
|*
-|* SwFtnBossFrm::RemoveFtn()
+|* SwFtnBossFrm::RemoveFtn()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -1994,10 +1994,10 @@ void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr,
/*************************************************************************
|*
-|* SwFtnBossFrm::ChangeFtnRef()
+|* SwFtnBossFrm::ChangeFtnRef()
|*
-|* Ersterstellung MA 25. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 25. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2015,10 +2015,10 @@ void SwFtnBossFrm::ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *pAttr,
/*************************************************************************
|*
-|* SwFtnBossFrm::CollectFtns()
+|* SwFtnBossFrm::CollectFtns()
|*
-|* Ersterstellung MA 24. Jul. 95
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 24. Jul. 95
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2083,10 +2083,10 @@ void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef,
/*************************************************************************
|*
-|* SwFtnBossFrm::_CollectFtns()
+|* SwFtnBossFrm::_CollectFtns()
|*
-|* Ersterstellung MA 24. Jul. 95
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 24. Jul. 95
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
inline void FtnInArr( SvPtrarr& rFtnArr, SwFtnFrm* pFtn )
@@ -2118,7 +2118,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef,
//(der Inhalt zu einem Attribut kann ueber mehrere Seiten verteilt sein)
//und ausschneiden.
- SvPtrarr aNotFtnArr( 20, 20 ); //Zur Robustheit werden hier die nicht
+ SvPtrarr aNotFtnArr( 20, 20 ); //Zur Robustheit werden hier die nicht
//dazugehoerigen Fussnoten eingetragen.
//Wenn eine Fussnote zweimal angefasst wird
//ists vorbei! So kommt die Funktion auch
@@ -2175,7 +2175,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef,
}
if ( pNxtFtn == _pFtn )
{
- OSL_ENSURE( FALSE, "_CollectFtn: Devil's circle" );
+ OSL_ENSURE( FALSE, "_CollectFtn: Devil's circle" );
pNxtFtn = 0;
}
@@ -2209,9 +2209,9 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef,
{
SwFrm *pCnt = pNxt->ContainsAny();
if ( pCnt )
- { //Unterwegs wird der Follow zerstoert weil er leer wird!
+ { //Unterwegs wird der Follow zerstoert weil er leer wird!
do
- { SwFrm *pNxtCnt = pCnt->GetNext();
+ { SwFrm *pNxtCnt = pCnt->GetNext();
pCnt->Cut();
pCnt->Paste( _pFtn );
pCnt = pNxtCnt;
@@ -2245,10 +2245,10 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef,
/*************************************************************************
|*
-|* SwFtnBossFrm::_MoveFtns()
+|* SwFtnBossFrm::_MoveFtns()
|*
-|* Ersterstellung MA 26. Feb. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 26. Feb. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2325,7 +2325,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc )
// SwLayNotify aFtnFrmNotitfy( pFtn );
// <--
- while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
+ while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
{
pCnt->_InvalidatePos();
pCnt->Calc();
@@ -2463,10 +2463,10 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc )
/*************************************************************************
|*
-|* SwFtnBossFrm::MoveFtns()
+|* SwFtnBossFrm::MoveFtns()
|*
-|* Ersterstellung BP 05. Aug. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung BP 05. Aug. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2488,7 +2488,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
ChangeFtnRef( pSrc, pAttr, pDest );
SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( TRUE );
OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" );
- if( pDestBoss ) // robust
+ if( pDestBoss ) // robust
{
SvPtrarr aFtnArr( 5, 5 );
pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr );
@@ -2511,10 +2511,10 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
/*************************************************************************
|*
-|* SwFtnBossFrm::RearrangeFtns()
+|* SwFtnBossFrm::RearrangeFtns()
|*
-|* Ersterstellung MA 20. Jan. 94
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 20. Jan. 94
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2755,10 +2755,10 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock,
/*************************************************************************
|*
-|* SwPageFrm::UpdateFtnNum()
+|* SwPageFrm::UpdateFtnNum()
|*
-|* Ersterstellung MA 02. Mar. 93
-|* Letzte Aenderung AMA 29. Oct. 98
+|* Ersterstellung MA 02. Mar. 93
+|* Letzte Aenderung AMA 29. Oct. 98
|*
|*************************************************************************/
@@ -2820,10 +2820,10 @@ void SwPageFrm::UpdateFtnNum()
/*************************************************************************
|*
-|* SwFtnBossFrm::SetFtnDeadLine()
+|* SwFtnBossFrm::SetFtnDeadLine()
|*
-|* Ersterstellung MA 02. Aug. 93
-|* Letzte Aenderung MA 16. Nov. 98
+|* Ersterstellung MA 02. Aug. 93
+|* Letzte Aenderung MA 16. Nov. 98
|*
|*************************************************************************/
@@ -2856,10 +2856,10 @@ void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine )
/*************************************************************************
|*
-|* SwFtnBossFrm::GetVarSpace()
+|* SwFtnBossFrm::GetVarSpace()
|*
-|* Ersterstellung MA 03. Apr. 95
-|* Letzte Aenderung MA 16. Nov. 98
+|* Ersterstellung MA 03. Apr. 95
+|* Letzte Aenderung MA 16. Nov. 98
|*
|*************************************************************************/
SwTwips SwFtnBossFrm::GetVarSpace() const
@@ -2933,18 +2933,18 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
/*************************************************************************
|*
-|* SwFtnBossFrm::NeighbourhoodAdjustment(SwFrm*)
+|* SwFtnBossFrm::NeighbourhoodAdjustment(SwFrm*)
|*
-|* gibt Auskunft, ob die Groessenveraenderung von pFrm von AdjustNeighbourhood(...)
-|* oder von Grow/Shrink(..) verarbeitet werden sollte.
-|* Bei einem PageFrm oder in Spalten direkt unterhalb der Seite muss AdjustNei..
+|* gibt Auskunft, ob die Groessenveraenderung von pFrm von AdjustNeighbourhood(...)
+|* oder von Grow/Shrink(..) verarbeitet werden sollte.
+|* Bei einem PageFrm oder in Spalten direkt unterhalb der Seite muss AdjustNei..
|* gerufen werden, in Rahmenspalten Grow/Shrink.
-|* Spannend sind die spaltigen Bereiche: Wenn es in der Spalte einen Fussnotencontainer
-|* gibt und die Fussnoten nicht vom Bereich eingesammelt werden, ist ein Adjust..,
-|* ansonsten ein Grow/Shrink notwendig.
+|* Spannend sind die spaltigen Bereiche: Wenn es in der Spalte einen Fussnotencontainer
+|* gibt und die Fussnoten nicht vom Bereich eingesammelt werden, ist ein Adjust..,
+|* ansonsten ein Grow/Shrink notwendig.
|*
-|* Ersterstellung AMA 09. Dec 98
-|* Letzte Aenderung AMA 09. Dec 98
+|* Ersterstellung AMA 09. Dec 98
+|* Letzte Aenderung AMA 09. Dec 98
|*
|*************************************************************************/
@@ -2979,10 +2979,10 @@ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
/*************************************************************************
|*
-|* SwPageFrm::SetColMaxFtnHeight()
+|* SwPageFrm::SetColMaxFtnHeight()
|*
-|* Ersterstellung AMA 29. Oct 98
-|* Letzte Aenderung AMA 29. Oct 98
+|* Ersterstellung AMA 29. Oct 98
+|* Letzte Aenderung AMA 29. Oct 98
|*
|*************************************************************************/
void SwPageFrm::SetColMaxFtnHeight()
@@ -3001,10 +3001,10 @@ void SwPageFrm::SetColMaxFtnHeight()
/*************************************************************************
|*
-|* SwLayoutFrm::MoveLowerFtns
+|* SwLayoutFrm::MoveLowerFtns
|*
-|* Ersterstellung MA 01. Sep. 94
-|* Letzte Aenderung MA 05. Sep. 95
+|* Ersterstellung MA 01. Sep. 94
+|* Letzte Aenderung MA 05. Sep. 95
|*
|*************************************************************************/
@@ -3099,10 +3099,10 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
/*************************************************************************
|*
-|* SwLayoutFrm::MoveFtnCntFwd()
+|* SwLayoutFrm::MoveFtnCntFwd()
|*
-|* Ersterstellung MA 24. Nov. 94
-|* Letzte Aenderung MA 15. Jun. 95
+|* Ersterstellung MA 24. Nov. 94
+|* Letzte Aenderung MA 15. Jun. 95
|*
|*************************************************************************/
@@ -3134,7 +3134,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
if ( pNxt == pLst )
pNxt = 0;
else
- { pLst = pNxt;
+ { pLst = pNxt;
SwCntntFrm *pCnt = pNxt->ContainsCntnt();
if( pCnt )
pCnt->MoveFtnCntFwd( TRUE, pOldBoss );
@@ -3241,10 +3241,10 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
/*************************************************************************
|*
-|* class SwSaveFtnHeight
+|* class SwSaveFtnHeight
|*
-|* Ersterstellung MA 19. Jan. 94
-|* Letzte Aenderung MA 19. Jan. 94
+|* Ersterstellung MA 19. Jan. 94
+|* Letzte Aenderung MA 19. Jan. 94
|*
|*************************************************************************/
@@ -3270,7 +3270,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
#if OSL_DEBUG_LEVEL > 1
//JP 15.10.2001: in a non pro version test if the attribute has the same
-// meaning which his reference is
+// meaning which his reference is
// Normally, the pRef member and the GetRefFromAttr() result has to be
// identically. Sometimes footnote will be moved from a master to its follow,
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 1af53c9ab927..f962c0ffddee 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@
#include <objectformatter.hxx>
// <--
-extern BOOL bObjsDirect; //frmtool.cxx
+extern BOOL bObjsDirect; //frmtool.cxx
static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm)
{
@@ -673,11 +673,11 @@ BOOL SwHeadFootFrm::GetEatSpacing() const
/*************************************************************************
|*
-|* SwPageFrm::PrepareHeader()
+|* SwPageFrm::PrepareHeader()
|*
-|* Beschreibung Erzeugt oder Entfernt Header
-|* Ersterstellung MA 04. Feb. 93
-|* Letzte Aenderung MA 12. May. 96
+|* Beschreibung Erzeugt oder Entfernt Header
+|* Ersterstellung MA 04. Feb. 93
+|* Letzte Aenderung MA 12. May. 96
|*
|*************************************************************************/
@@ -714,14 +714,14 @@ void SwPageFrm::PrepareHeader()
const BOOL bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
if ( bOn && rH.IsActive() )
- { //Header einsetzen, vorher entfernen falls vorhanden.
+ { //Header einsetzen, vorher entfernen falls vorhanden.
OSL_ENSURE( rH.GetHeaderFmt(), "FrmFmt fuer Header nicht gefunden." );
if ( pLay->GetFmt() == (SwFrmFmt*)rH.GetHeaderFmt() )
- return; //Der Footer ist bereits der richtige
+ return; //Der Footer ist bereits der richtige
if ( pLay->IsHeaderFrm() )
- { SwLayoutFrm *pDel = pLay;
+ { SwLayoutFrm *pDel = pLay;
pLay = (SwLayoutFrm*)pLay->GetNext();
::DelFlys( pDel, this );
pDel->Cut();
@@ -734,7 +734,7 @@ void SwPageFrm::PrepareHeader()
::RegistFlys( this, pH );
}
else if ( pLay && pLay->IsHeaderFrm() )
- { //Header entfernen falls vorhanden.
+ { //Header entfernen falls vorhanden.
::DelFlys( pLay, this );
pLay->Cut();
delete pLay;
@@ -742,11 +742,11 @@ void SwPageFrm::PrepareHeader()
}
/*************************************************************************
|*
-|* SwPageFrm::PrepareFooter()
+|* SwPageFrm::PrepareFooter()
|*
-|* Beschreibung Erzeugt oder Entfernt Footer
-|* Ersterstellung MA 04. Feb. 93
-|* Letzte Aenderung MA 12. May. 96
+|* Beschreibung Erzeugt oder Entfernt Footer
+|* Ersterstellung MA 04. Feb. 93
+|* Letzte Aenderung MA 12. May. 96
|*
|*************************************************************************/
@@ -764,14 +764,14 @@ void SwPageFrm::PrepareFooter()
const BOOL bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
if ( bOn && rF.IsActive() )
- { //Footer einsetzen, vorher entfernen falls vorhanden.
+ { //Footer einsetzen, vorher entfernen falls vorhanden.
OSL_ENSURE( rF.GetFooterFmt(), "FrmFmt fuer Footer nicht gefunden." );
if ( pLay->GetFmt() == (SwFrmFmt*)rF.GetFooterFmt() )
return; //Der Footer ist bereits der richtige.
if ( pLay->IsFooterFrm() )
- { ::DelFlys( pLay, this );
+ { ::DelFlys( pLay, this );
pLay->Cut();
delete pLay;
}
@@ -781,7 +781,7 @@ void SwPageFrm::PrepareFooter()
::RegistFlys( this, pF );
}
else if ( pLay && pLay->IsFooterFrm() )
- { //Footer entfernen falls vorhanden.
+ { //Footer entfernen falls vorhanden.
::DelFlys( pLay, this );
ViewShell *pSh;
if ( pLay->GetPrev() && 0 != (pSh = GetShell()) &&
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ed0ffef89ea3..5099e9c239bb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@
#include "frmfmt.hxx"
#include "swregion.hxx"
#include "viewopt.hxx" // OnlineSpelling ueber Internal-TabPage testen.
-#include "pam.hxx" // OnlineSpelling wg. der aktuellen Cursorposition
+#include "pam.hxx" // OnlineSpelling wg. der aktuellen Cursorposition
#include "dbg_lay.hxx"
#include "layouter.hxx" // LoopControlling
#include "docstat.hxx"
@@ -100,10 +100,10 @@
/*************************************************************************
|*
-|* SwLayAction Statisches Geraffel
+|* SwLayAction Statisches Geraffel
|*
-|* Ersterstellung MA 22. Dec. 93
-|* Letzte Aenderung MA 22. Dec. 93
+|* Ersterstellung MA 22. Dec. 93
+|* Letzte Aenderung MA 22. Dec. 93
|*
|*************************************************************************/
@@ -120,15 +120,15 @@ static void BreakPoint()
}
#define CHECKPAGE \
- { if ( IsAgain() ) \
- { BreakPoint(); \
+ { if ( IsAgain() ) \
+ { BreakPoint(); \
return; \
} \
}
#define XCHECKPAGE \
- { if ( IsAgain() ) \
- { BreakPoint(); \
+ { if ( IsAgain() ) \
+ { BreakPoint(); \
if( bNoLoop ) \
pLayoutAccess->GetLayouter()->EndLoopControl(); \
return; \
@@ -136,12 +136,12 @@ static void BreakPoint()
}
#else
#define CHECKPAGE \
- { if ( IsAgain() ) \
+ { if ( IsAgain() ) \
return; \
}
#define XCHECKPAGE \
- { if ( IsAgain() ) \
+ { if ( IsAgain() ) \
{ \
if( bNoLoop ) \
pLayoutAccess->GetLayouter()->EndLoopControl(); \
@@ -176,10 +176,10 @@ void SwLayAction::CheckWaitCrsr()
/*************************************************************************
|*
-|* SwLayAction::CheckIdleEnd()
+|* SwLayAction::CheckIdleEnd()
|*
-|* Ersterstellung MA 12. Aug. 94
-|* Letzte Aenderung MA 24. Jun. 96
+|* Ersterstellung MA 12. Aug. 94
+|* Letzte Aenderung MA 24. Jun. 96
|*
|*************************************************************************/
//Ist es wirklich schon soweit...
@@ -191,10 +191,10 @@ inline void SwLayAction::CheckIdleEnd()
/*************************************************************************
|*
-|* SwLayAction::SetStatBar()
+|* SwLayAction::SetStatBar()
|*
-|* Ersterstellung MA 10. Aug. 94
-|* Letzte Aenderung MA 06. Aug. 95
+|* Ersterstellung MA 10. Aug. 94
+|* Letzte Aenderung MA 06. Aug. 95
|*
|*************************************************************************/
void SwLayAction::SetStatBar( BOOL bNew )
@@ -210,14 +210,14 @@ void SwLayAction::SetStatBar( BOOL bNew )
/*************************************************************************
|*
-|* SwLayAction::PaintCntnt()
+|* SwLayAction::PaintCntnt()
|*
-|* Beschreibung Je nach Typ wird der Cntnt entsprechend seinen
-|* Veraenderungen ausgegeben bzw. wird die auszugebende Flaeche in der
-|* Region eingetragen.
-|* PaintCntnt: fuellt die Region,
-|* Ersterstellung BP 19. Jan. 92
-|* Letzte Aenderung MA 10. Sep. 96
+|* Beschreibung Je nach Typ wird der Cntnt entsprechend seinen
+|* Veraenderungen ausgegeben bzw. wird die auszugebende Flaeche in der
+|* Region eingetragen.
+|* PaintCntnt: fuellt die Region,
+|* Ersterstellung BP 19. Jan. 92
+|* Letzte Aenderung MA 10. Sep. 96
|*
|*************************************************************************/
BOOL SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
@@ -370,10 +370,10 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt,
/*************************************************************************
|*
-|* SwLayAction::SwLayAction()
+|* SwLayAction::SwLayAction()
|*
-|* Ersterstellung MA 30. Oct. 92
-|* Letzte Aenderung MA 09. Jun. 95
+|* Ersterstellung MA 30. Oct. 92
+|* Letzte Aenderung MA 09. Jun. 95
|*
|*************************************************************************/
SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
@@ -401,15 +401,15 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
SwLayAction::~SwLayAction()
{
OSL_ENSURE( !pWait, "Wait object not destroyed" );
- pImp->pLayAct = 0; //Abmelden
+ pImp->pLayAct = 0; //Abmelden
}
/*************************************************************************
|*
-|* SwLayAction::Reset()
+|* SwLayAction::Reset()
|*
-|* Ersterstellung MA 11. Aug. 94
-|* Letzte Aenderung MA 09. Jun. 95
+|* Ersterstellung MA 11. Aug. 94
+|* Letzte Aenderung MA 09. Jun. 95
|*
|*************************************************************************/
void SwLayAction::Reset()
@@ -425,10 +425,10 @@ void SwLayAction::Reset()
/*************************************************************************
|*
-|* SwLayAction::RemoveEmptyBrowserPages()
+|* SwLayAction::RemoveEmptyBrowserPages()
|*
-|* Ersterstellung MA 10. Sep. 97
-|* Letzte Aenderung MA 10. Sep. 97
+|* Ersterstellung MA 10. Sep. 97
+|* Letzte Aenderung MA 10. Sep. 97
|*
|*************************************************************************/
@@ -461,10 +461,10 @@ BOOL SwLayAction::RemoveEmptyBrowserPages()
/*************************************************************************
|*
-|* SwLayAction::Action()
+|* SwLayAction::Action()
|*
-|* Ersterstellung MA 10. Aug. 94
-|* Letzte Aenderung MA 06. Aug. 95
+|* Ersterstellung MA 10. Aug. 94
+|* Letzte Aenderung MA 06. Aug. 95
|*
|*************************************************************************/
void SwLayAction::Action()
@@ -521,7 +521,7 @@ SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage )
while ( pCnt && pCnt->IsFollow() )
pCnt = static_cast<SwCntntFrm*>(pCnt)->FindMaster();
if ( pCnt && pChk != pCnt )
- { bPageChgd = TRUE;
+ { bPageChgd = TRUE;
pPage = pCnt->FindPageFrm();
}
@@ -976,10 +976,10 @@ void SwLayAction::InternalAction()
}
/*************************************************************************
|*
-|* SwLayAction::TurboAction(), _TurboAction()
+|* SwLayAction::TurboAction(), _TurboAction()
|*
-|* Ersterstellung MA 04. Dec. 92
-|* Letzte Aenderung MA 15. Aug. 93
+|* Ersterstellung MA 04. Dec. 92
+|* Letzte Aenderung MA 15. Aug. 93
|*
|*************************************************************************/
BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
@@ -989,7 +989,7 @@ BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
if ( !pCnt->IsValid() || pCnt->IsCompletePaint() || pCnt->IsRetouche() )
{
const SwRect aOldRect( pCnt->UnionFrm( TRUE ) );
- const long nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom();
+ const long nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom();
pCnt->Calc();
if ( pCnt->Frm().Bottom() < aOldRect.Bottom() )
pCnt->SetRetouche();
@@ -1058,19 +1058,19 @@ BOOL SwLayAction::TurboAction()
}
/*************************************************************************
|*
-|* SwLayAction::IsShortCut()
+|* SwLayAction::IsShortCut()
|*
-|* Beschreibung: Liefert ein True, wenn die Seite vollstaendig unter
-|* oder rechts neben dem sichbaren Bereich liegt.
-|* Es kann passieren, dass sich die Verhaeltnisse derart aendern, dass
-|* die Verarbeitung (des Aufrufers!) mit der Vorgaengerseite der
-|* uebergebenen Seite weitergefuehrt werden muss. Der Paramter wird also
-|* ggf. veraendert!
-|* Fuer den BrowseMode kann auch dann der ShortCut aktiviert werden,
-|* wenn der ungueltige Inhalt der Seite unterhalb des sichbaren
-|* bereiches liegt.
-|* Ersterstellung MA 30. Oct. 92
-|* Letzte Aenderung MA 18. Jul. 96
+|* Beschreibung: Liefert ein True, wenn die Seite vollstaendig unter
+|* oder rechts neben dem sichbaren Bereich liegt.
+|* Es kann passieren, dass sich die Verhaeltnisse derart aendern, dass
+|* die Verarbeitung (des Aufrufers!) mit der Vorgaengerseite der
+|* uebergebenen Seite weitergefuehrt werden muss. Der Paramter wird also
+|* ggf. veraendert!
+|* Fuer den BrowseMode kann auch dann der ShortCut aktiviert werden,
+|* wenn der ungueltige Inhalt der Seite unterhalb des sichbaren
+|* bereiches liegt.
+|* Ersterstellung MA 30. Oct. 92
+|* Letzte Aenderung MA 18. Jul. 96
|*
|*************************************************************************/
static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom )
@@ -1409,10 +1409,10 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage )
/*************************************************************************
|*
-|* SwLayAction::FormatLayout(), FormatLayoutFly, FormatLayoutTab()
+|* SwLayAction::FormatLayout(), FormatLayoutFly, FormatLayoutTab()
|*
-|* Ersterstellung MA 30. Oct. 92
-|* Letzte Aenderung MA 18. May. 98
+|* Ersterstellung MA 30. Oct. 92
+|* Letzte Aenderung MA 18. May. 98
|*
|*************************************************************************/
// OD 15.11.2002 #105155# - introduce support for vertical layout
@@ -1594,7 +1594,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect )
//Jetzt noch diejenigen Lowers versorgen die LayoutFrm's sind
- if ( pLay->IsFtnFrm() ) //Hat keine LayFrms als Lower.
+ if ( pLay->IsFtnFrm() ) //Hat keine LayFrms als Lower.
return bChanged;
SwFrm *pLow = pLay->Lower();
@@ -1831,10 +1831,10 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect )
/*************************************************************************
|*
-|* SwLayAction::FormatCntnt()
+|* SwLayAction::FormatCntnt()
|*
-|* Ersterstellung MA 30. Oct. 92
-|* Letzte Aenderung MA 16. Nov. 95
+|* Ersterstellung MA 30. Oct. 92
+|* Letzte Aenderung MA 16. Nov. 95
|*
|*************************************************************************/
BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage )
@@ -2022,12 +2022,12 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage )
}
/*************************************************************************
|*
-|* SwLayAction::_FormatCntnt()
+|* SwLayAction::_FormatCntnt()
|*
-|* Beschreibung Returnt TRUE wenn der Absatz verarbeitet wurde,
-|* FALSE wenn es nichts zu verarbeiten gab.
-|* Ersterstellung MA 07. Dec. 92
-|* Letzte Aenderung MA 11. Mar. 98
+|* Beschreibung Returnt TRUE wenn der Absatz verarbeitet wurde,
+|* FALSE wenn es nichts zu verarbeiten gab.
+|* Ersterstellung MA 07. Dec. 92
+|* Letzte Aenderung MA 11. Mar. 98
|*
|*************************************************************************/
void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt,
@@ -2062,13 +2062,13 @@ void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt,
/*************************************************************************
|*
-|* SwLayAction::_FormatFlyCntnt()
+|* SwLayAction::_FormatFlyCntnt()
|*
-|* Beschreibung:
-|* - Returnt TRUE wenn alle Cntnts des Flys vollstaendig verarbeitet
-|* wurden. FALSE wenn vorzeitig unterbrochen wurde.
-|* Ersterstellung MA 02. Dec. 92
-|* Letzte Aenderung MA 24. Jun. 96
+|* Beschreibung:
+|* - Returnt TRUE wenn alle Cntnts des Flys vollstaendig verarbeitet
+|* wurden. FALSE wenn vorzeitig unterbrochen wurde.
+|* Ersterstellung MA 02. Dec. 92
+|* Letzte Aenderung MA 24. Jun. 96
|*
|*************************************************************************/
BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
@@ -2135,10 +2135,10 @@ BOOL SwLayAction::IsStopPrt() const
/*************************************************************************
|*
-|* SwLayAction::FormatSpelling(), _FormatSpelling()
+|* SwLayAction::FormatSpelling(), _FormatSpelling()
|*
-|* Ersterstellung AMA 01. Feb. 96
-|* Letzte Aenderung AMA 01. Feb. 96
+|* Ersterstellung AMA 01. Feb. 96
+|* Letzte Aenderung AMA 01. Feb. 96
|*
|*************************************************************************/
BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
@@ -2351,10 +2351,10 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
/*************************************************************************
|*
-|* void SwLayIdle::SwLayIdle()
+|* void SwLayIdle::SwLayIdle()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 09. Jun. 94
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 09. Jun. 94
|*
|*************************************************************************/
void SwLayIdle::ShowIdle( ColorData eColorData )
@@ -2386,10 +2386,10 @@ void SwLayIdle::ShowIdle( ColorData eColorData )
/*************************************************************************
|*
-|* void SwLayIdle::SwLayIdle()
+|* void SwLayIdle::SwLayIdle()
|*
-|* Ersterstellung MA 30. Oct. 92
-|* Letzte Aenderung MA 23. May. 95
+|* Ersterstellung MA 30. Oct. 92
+|* Letzte Aenderung MA 23. May. 95
|*
|*************************************************************************/
SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
@@ -2421,7 +2421,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
SvBools aBools;
ViewShell *pSh = pImp->GetShell();
do
- { ++pSh->nStartAction;
+ { ++pSh->nStartAction;
BOOL bVis = FALSE;
if ( pSh->ISA(SwCrsrShell) )
{
@@ -2485,8 +2485,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
if ( bCrsrShell )
((SwCrsrShell*)pSh)->SttCrsrMove();
-// else
-// pSh->StartAction();
+// else
+// pSh->StartAction();
//Wenn Paints aufgelaufen sind, ist es am sinnvollsten schlicht das
//gesamte Window zu invalidieren. Anderfalls gibt es Paintprobleme
@@ -2507,8 +2507,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
//Wenn der Crsr sichbar war wieder sichbar machen, sonst
//EndCrsrMove mit TRUE fuer IdleEnd.
((SwCrsrShell*)pSh)->EndCrsrMove( TRUE^aBools[nBoolIdx] );
-// else
-// pSh->EndAction();
+// else
+// pSh->EndAction();
if( bUnlock )
{
if( bCrsrShell )
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index b0cc88545c20..9166c67c9fb6 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -2,7 +2,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
@@ -483,8 +483,8 @@ SwLayoutCache::~SwLayoutCache()
* --------------------------------------------------*/
SwActualSection::SwActualSection( SwActualSection *pUp,
- SwSectionFrm *pSect,
- SwSectionNode *pNd ) :
+ SwSectionFrm *pSect,
+ SwSectionNode *pNd ) :
pUpper( pUp ),
pSectFrm( pSect ),
pSectNode( pNd )
@@ -661,7 +661,7 @@ BOOL SwLayHelper::CheckInsertPage()
{
OSL_ENSURE( rpPage->GetNext(), "Keine neue Seite?" );
do
- { rpPage = (SwPageFrm*)rpPage->GetNext();
+ { rpPage = (SwPageFrm*)rpPage->GetNext();
} while ( rpPage->GetNext() );
}
else
@@ -1229,11 +1229,11 @@ SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd ) :
{
if( bWriteMode )
*pStream << nMajorVersion
- << nMinorVersion;
+ << nMinorVersion;
else
*pStream >> nMajorVersion
- >> nMinorVersion;
+ >> nMinorVersion;
}
BOOL SwLayCacheIoImpl::OpenRec( BYTE cType )
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 6b5edac673d4..71f74a2d7aad 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -2,7 +2,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
@@ -94,17 +94,17 @@ public:
class SwActualSection
{
SwActualSection *pUpper;
- SwSectionFrm *pSectFrm;
- SwSectionNode *pSectNode;
+ SwSectionFrm *pSectFrm;
+ SwSectionNode *pSectNode;
public:
SwActualSection( SwActualSection *pUpper,
- SwSectionFrm *pSect,
- SwSectionNode *pNd );
+ SwSectionFrm *pSect,
+ SwSectionNode *pNd );
- SwSectionFrm *GetSectionFrm() { return pSectFrm; }
- void SetSectionFrm( SwSectionFrm *p ) { pSectFrm = p; }
- SwSectionNode *GetSectionNode() { return pSectNode;}
- SwActualSection *GetUpper() { return pUpper; }
+ SwSectionFrm *GetSectionFrm() { return pSectFrm; }
+ void SetSectionFrm( SwSectionFrm *p ) { pSectFrm = p; }
+ SwSectionNode *GetSectionNode() { return pSectNode;}
+ SwActualSection *GetUpper() { return pUpper; }
};
/*************************************************************************
@@ -157,28 +157,28 @@ public:
* layout cache.
*************************************************************************/
-#define SW_LAYCACHE_IO_REC_PAGES 'p'
-#define SW_LAYCACHE_IO_REC_PARA 'P'
-#define SW_LAYCACHE_IO_REC_TABLE 'T'
+#define SW_LAYCACHE_IO_REC_PAGES 'p'
+#define SW_LAYCACHE_IO_REC_PARA 'P'
+#define SW_LAYCACHE_IO_REC_TABLE 'T'
#define SW_LAYCACHE_IO_REC_FLY 'F'
-#define SW_LAYCACHE_IO_VERSION_MAJOR 1
+#define SW_LAYCACHE_IO_VERSION_MAJOR 1
#define SW_LAYCACHE_IO_VERSION_MINOR 1
class SwLayCacheIoImpl
{
- SvBytes aRecTypes;
- SvULongs aRecSizes;
+ SvBytes aRecTypes;
+ SvULongs aRecSizes;
- SvStream *pStream;
+ SvStream *pStream;
- ULONG nFlagRecEnd;
+ ULONG nFlagRecEnd;
- USHORT nMajorVersion;
- USHORT nMinorVersion;
+ USHORT nMajorVersion;
+ USHORT nMinorVersion;
- BOOL bWriteMode : 1;
- BOOL bError : 1;
+ BOOL bWriteMode : 1;
+ BOOL bError : 1;
public:
SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd );
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index ceea99885a5e..9ae1482b4536 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -2,7 +2,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
@@ -70,10 +70,10 @@ class SwEndnoter
public:
SwEndnoter( SwLayouter* pLay )
: pMaster( pLay ), pSect( NULL ), pEndArr( NULL ) {}
- ~SwEndnoter() { delete pEndArr; }
+ ~SwEndnoter() { delete pEndArr; }
void CollectEndnotes( SwSectionFrm* pSct );
void CollectEndnote( SwFtnFrm* pFtn );
- const SwSectionFrm* GetSect() { return pSect; }
+ const SwSectionFrm* GetSect() { return pSect; }
void InsertEndnotes();
BOOL HasEndnotes() const { return pEndArr && pEndArr->Count(); }
};
@@ -103,7 +103,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn )
if ( pCnt )
{
do
- { SwFrm *pNxtCnt = pCnt->GetNext();
+ { SwFrm *pNxtCnt = pCnt->GetNext();
pCnt->Cut();
pCnt->Paste( pFtn );
pCnt = pNxtCnt;
@@ -227,10 +227,10 @@ void SwLooping::Control( SwPageFrm* pPage )
/*************************************************************************
|*
-|* SwLayouter::SwLayouter()
+|* SwLayouter::SwLayouter()
|*
-|* Ersterstellung AMA 02. Nov. 99
-|* Letzte Aenderung AMA 02. Nov. 99
+|* Ersterstellung AMA 02. Nov. 99
+|* Letzte Aenderung AMA 02. Nov. 99
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index 04802ae8710e..b612041b4e6c 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index e3deaad3569e..48d422f2bd15 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -2,7 +2,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
@@ -58,8 +58,8 @@
#include <viewopt.hxx>
SwLayVout *SwRootFrm::pVout = 0;
-BOOL SwRootFrm::bInPaint = FALSE;
-BOOL SwRootFrm::bNoVirDev = FALSE;
+BOOL SwRootFrm::bInPaint = FALSE;
+BOOL SwRootFrm::bNoVirDev = FALSE;
SwCache *SwFrm::pCache = 0;
@@ -301,8 +301,8 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft;
sal_uInt32 SwFrm::mnLastFrmId=0;
// <--
-TYPEINIT1(SwFrm,SwClient); //rtti fuer SwFrm
-TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm
+TYPEINIT1(SwFrm,SwClient); //rtti fuer SwFrm
+TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm
void _FrmInit()
@@ -335,10 +335,10 @@ void _FrmFinit()
/*************************************************************************
|*
-|* RootFrm::Alles was so zur CurrShell gehoert
+|* RootFrm::Alles was so zur CurrShell gehoert
|*
-|* Ersterstellung MA 09. Sep. 98
-|* Letzte Aenderung MA 18. Feb. 99
+|* Ersterstellung MA 09. Sep. 98
+|* Letzte Aenderung MA 18. Feb. 99
|*
|*************************************************************************/
@@ -411,14 +411,14 @@ void InitCurrShells( SwRootFrm *pRoot )
/*************************************************************************
|*
-|* SwRootFrm::SwRootFrm()
+|* SwRootFrm::SwRootFrm()
|*
-|* Beschreibung:
-|* Der RootFrm laesst sich grundsaetzlich vom Dokument ein eigenes
-|* FrmFmt geben. Dieses loescht er dann selbst im DTor.
-|* Das eigene FrmFmt wird vom uebergebenen Format abgeleitet.
-|* Ersterstellung SS 05-Apr-1991
-|* Letzte Aenderung MA 12. Dec. 94
+|* Beschreibung:
+|* Der RootFrm laesst sich grundsaetzlich vom Dokument ein eigenes
+|* FrmFmt geben. Dieses loescht er dann selbst im DTor.
+|* Das eigene FrmFmt wird vom uebergebenen Format abgeleitet.
+|* Ersterstellung SS 05-Apr-1991
+|* Letzte Aenderung MA 12. Dec. 94
|*
|*************************************************************************/
@@ -455,8 +455,8 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess();
const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess();
pTimerAccess->StopIdling();
- pLayoutAccess->SetRootFrm( this ); //Fuer das Erzeugen der Flys durch MakeFrms()
- bCallbackActionEnabled = FALSE; //vor Verlassen auf TRUE setzen!
+ pLayoutAccess->SetRootFrm( this ); //Fuer das Erzeugen der Flys durch MakeFrms()
+ bCallbackActionEnabled = FALSE; //vor Verlassen auf TRUE setzen!
SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel();
@@ -537,10 +537,10 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
/*************************************************************************
|*
-|* SwRootFrm::~SwRootFrm()
+|* SwRootFrm::~SwRootFrm()
|*
-|* Ersterstellung SS 05-Apr-1991
-|* Letzte Aenderung MA 12. Dec. 94
+|* Ersterstellung SS 05-Apr-1991
+|* Letzte Aenderung MA 12. Dec. 94
|*
|*************************************************************************/
@@ -566,10 +566,10 @@ SwRootFrm::~SwRootFrm()
/*************************************************************************
|*
-|* SwRootFrm::RemoveMasterObjs()
+|* SwRootFrm::RemoveMasterObjs()
|*
-|* Ersterstellung MA 19.10.95
-|* Letzte Aenderung MA 19.10.95
+|* Ersterstellung MA 19.10.95
+|* Letzte Aenderung MA 19.10.95
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 9832d5c8a242..a393127c080d 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx
index b8c0086fb542..f147fb2576ba 100644
--- a/sw/source/core/layout/objectformatterlayfrm.cxx
+++ b/sw/source/core/layout/objectformatterlayfrm.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx
index a2199030a61c..10f12a53a652 100644
--- a/sw/source/core/layout/objectformatterlayfrm.hxx
+++ b/sw/source/core/layout/objectformatterlayfrm.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index b71529f97739..db6343176715 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index 173ad024e9a5..9ee71979c140 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
index 1c32c9c75f26..902121265e84 100644
--- a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
+++ b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
index f5fd89b3b435..2da1897d5750 100644
--- a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
+++ b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 4336fc658c79..4591c8f687ec 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2,7 +2,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 "pagedesc.hxx"
#include "poolfmt.hxx"
#include <editeng/frmdiritem.hxx>
-#include <swfntcch.hxx> // SwFontAccess
+#include <swfntcch.hxx> // SwFontAccess
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
@@ -84,10 +84,10 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwBodyFrm::SwBodyFrm()
+|* SwBodyFrm::SwBodyFrm()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 01. Aug. 93
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 01. Aug. 93
|*
|*************************************************************************/
SwBodyFrm::SwBodyFrm( SwFrmFmt *pFmt ):
@@ -98,10 +98,10 @@ SwBodyFrm::SwBodyFrm( SwFrmFmt *pFmt ):
/*************************************************************************
|*
-|* SwBodyFrm::Format()
+|* SwBodyFrm::Format()
|*
-|* Ersterstellung MA 30. May. 94
-|* Letzte Aenderung MA 20. Jan. 99
+|* Ersterstellung MA 30. May. 94
+|* Letzte Aenderung MA 20. Jan. 99
|*
|*************************************************************************/
void SwBodyFrm::Format( const SwBorderAttrs * )
@@ -207,10 +207,10 @@ void SwBodyFrm::Paint( const SwRect& rRect, const SwPrtOptions* ) const
/*************************************************************************
|*
-|* SwPageFrm::SwPageFrm(), ~SwPageFrm()
+|* SwPageFrm::SwPageFrm(), ~SwPageFrm()
|*
-|* Ersterstellung MA 20. Oct. 92
-|* Letzte Aenderung MA 08. Dec. 97
+|* Ersterstellung MA 20. Oct. 92
+|* Letzte Aenderung MA 08. Dec. 97
|*
|*************************************************************************/
SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwPageDesc *pPgDsc ) :
@@ -245,7 +245,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwPageDesc *pPgDsc ) :
ViewShell *pSh = GetShell();
long nWidth = pSh ? pSh->VisArea().Width():0;
if ( !nWidth )
- nWidth = 5000L; //aendert sich sowieso
+ nWidth = 5000L; //aendert sich sowieso
Frm().Width ( nWidth );
}
else
@@ -257,16 +257,16 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwPageDesc *pPgDsc ) :
if ( FALSE == (bEmptyPage = pFmt == pDoc->GetEmptyPageFmt()) )
{
bEmptyPage = FALSE;
- Calc(); //Damit die PrtArea stimmt.
+ Calc(); //Damit die PrtArea stimmt.
SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrmFmt() );
pBodyFrm->ChgSize( Prt().SSize() );
pBodyFrm->Paste( this );
- pBodyFrm->Calc(); //Damit die Spalten korrekt
+ pBodyFrm->Calc(); //Damit die Spalten korrekt
//eingesetzt werden koennen.
pBodyFrm->InvalidatePos();
if ( bBrowseMode )
- _InvalidateSize(); //Alles nur gelogen
+ _InvalidateSize(); //Alles nur gelogen
//Header/Footer einsetzen, nur rufen wenn aktiv.
if ( pFmt->GetHeader().IsActive() )
@@ -299,7 +299,7 @@ SwPageFrm::~SwPageFrm()
pAnchoredObj->SetPageFrm( 0L );
}
delete pSortedObjs;
- pSortedObjs = 0; //Auf 0 setzen, sonst rauchts beim Abmdelden von Flys!
+ pSortedObjs = 0; //Auf 0 setzen, sonst rauchts beim Abmdelden von Flys!
}
//Damit der Zugriff auf zerstoerte Seiten verhindert werden kann.
@@ -382,12 +382,12 @@ void SwPageFrm::CheckDirection( BOOL bVert )
/*************************************************************************
|*
-|* SwPageFrm::PreparePage()
+|* SwPageFrm::PreparePage()
|*
-|* Beschreibung Erzeugt die Spezifischen Flys zur Seite und formatiert
-|* generischen Cntnt
-|* Ersterstellung MA 20. Oct. 92
-|* Letzte Aenderung MA 09. Nov. 95
+|* Beschreibung Erzeugt die Spezifischen Flys zur Seite und formatiert
+|* generischen Cntnt
+|* Ersterstellung MA 20. Oct. 92
+|* Letzte Aenderung MA 09. Nov. 95
|*
|*************************************************************************/
void MA_FASTCALL lcl_FormatLay( SwLayoutFrm *pLay )
@@ -530,7 +530,7 @@ void SwPageFrm::PreparePage( BOOL bFtn )
SwCntntFrm *pCntnt = pLow->ContainsCntnt();
while ( pCntnt && pLow->IsAnLower( pCntnt ) )
{
- pCntnt->OptCalc(); //Nicht die Vorgaenger
+ pCntnt->OptCalc(); //Nicht die Vorgaenger
pCntnt = pCntnt->GetNextCntntFrm();
}
}
@@ -541,10 +541,10 @@ void SwPageFrm::PreparePage( BOOL bFtn )
/*************************************************************************
|*
-|* SwPageFrm::Modify()
+|* SwPageFrm::Modify()
|*
-|* Ersterstellung MA 20. Oct. 92
-|* Letzte Aenderung MA 03. Mar. 96
+|* Ersterstellung MA 20. Oct. 92
+|* Letzte Aenderung MA 03. Mar. 96
|*
|*************************************************************************/
void SwPageFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
@@ -660,7 +660,7 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
(const SwFmtFrmSize&)*pNew;
Frm().Height( Max( rSz.GetHeight(), long(MINLAY) ) );
- Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) );
+ Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) );
// PAGES01
if ( GetUpper() )
@@ -736,11 +736,11 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
/*************************************************************************
|*
-|* SwPageFrm::GetInfo()
+|* SwPageFrm::GetInfo()
|*
-|* Beschreibung erfragt Informationen
-|* Ersterstellung JP 31.03.94
-|* Letzte Aenderung JP 31.03.94
+|* Beschreibung erfragt Informationen
+|* Ersterstellung JP 31.03.94
+|* Letzte Aenderung JP 31.03.94
|*
*************************************************************************/
// erfrage vom Modify Informationen
@@ -751,15 +751,15 @@ BOOL SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const
// es gibt einen PageFrm also wird er benutzt
return FALSE;
}
- return TRUE; // weiter suchen
+ return TRUE; // weiter suchen
}
/*************************************************************************
|*
-|* SwPageFrm::SetPageDesc()
+|* SwPageFrm::SetPageDesc()
|*
-|* Ersterstellung MA 02. Nov. 94
-|* Letzte Aenderung MA 02. Nov. 94
+|* Ersterstellung MA 02. Nov. 94
+|* Letzte Aenderung MA 02. Nov. 94
|*
|*************************************************************************/
void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt )
@@ -771,21 +771,21 @@ void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt )
/*************************************************************************
|*
-|* SwPageFrm::FindPageDesc()
-|*
-|* Beschreibung Der richtige PageDesc wird bestimmt:
-|* 0. Vom Dokument bei Fussnotenseiten und Endnotenseiten
-|* 1. vom ersten BodyCntnt unterhalb der Seite.
-|* 2. vom PageDesc der vorstehenden Seite.
-|* 3. bei Leerseiten vom PageDesc der vorigen Seite.
-|* 3.1 vom PageDesc der folgenden Seite wenn es keinen Vorgaenger gibt.
-|* 4. es ist der Default-PageDesc sonst.
-|* 5. Im BrowseMode ist der Pagedesc immer der vom ersten Absatz im
-|* Dokument oder Standard (der 0-te) wenn der erste Absatz keinen
-|* wuenscht.
-|* (6. Im HTML-Mode ist der Pagedesc immer die HTML-Seitenvorlage.)
-|* Ersterstellung MA 15. Feb. 93
-|* Letzte Aenderung MA 17. Jun. 99
+|* SwPageFrm::FindPageDesc()
+|*
+|* Beschreibung Der richtige PageDesc wird bestimmt:
+|* 0. Vom Dokument bei Fussnotenseiten und Endnotenseiten
+|* 1. vom ersten BodyCntnt unterhalb der Seite.
+|* 2. vom PageDesc der vorstehenden Seite.
+|* 3. bei Leerseiten vom PageDesc der vorigen Seite.
+|* 3.1 vom PageDesc der folgenden Seite wenn es keinen Vorgaenger gibt.
+|* 4. es ist der Default-PageDesc sonst.
+|* 5. Im BrowseMode ist der Pagedesc immer der vom ersten Absatz im
+|* Dokument oder Standard (der 0-te) wenn der erste Absatz keinen
+|* wuenscht.
+|* (6. Im HTML-Mode ist der Pagedesc immer die HTML-Seitenvorlage.)
+|* Ersterstellung MA 15. Feb. 93
+|* Letzte Aenderung MA 17. Jun. 99
|*
|*************************************************************************/
SwPageDesc *SwPageFrm::FindPageDesc()
@@ -802,7 +802,7 @@ SwPageDesc *SwPageFrm::FindPageDesc()
//6.
//if ( GetFmt()->GetDoc()->IsHTMLMode() )
- // return GetFmt()->GetDoc()->GetPageDescFromPool( RES_POOLPAGE_HTML );
+ // return GetFmt()->GetDoc()->GetPageDescFromPool( RES_POOLPAGE_HTML );
SwPageDesc *pRet = 0;
@@ -882,10 +882,10 @@ inline void SetLastPage( SwPageFrm *pPage )
/*************************************************************************
|*
-|* SwPageFrm::Cut()
+|* SwPageFrm::Cut()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 22. Jun. 95
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 22. Jun. 95
|*
|*************************************************************************/
void SwPageFrm::Cut()
@@ -937,7 +937,7 @@ void SwPageFrm::Cut()
{
while ( pPg )
{
- pPg->DecrPhyPageNum(); //inline --nPhyPageNum
+ pPg->DecrPhyPageNum(); //inline --nPhyPageNum
pPg = (SwPageFrm*)pPg->GetNext();
}
}
@@ -956,10 +956,10 @@ void SwPageFrm::Cut()
/*************************************************************************
|*
-|* SwPageFrm::Paste()
+|* SwPageFrm::Paste()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 07. Dec. 94
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 07. Dec. 94
|*
|*************************************************************************/
void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
@@ -985,7 +985,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
{
while ( pPg )
{
- pPg->IncrPhyPageNum(); //inline ++nPhyPageNum
+ pPg->IncrPhyPageNum(); //inline ++nPhyPageNum
pPg->_InvalidatePos();
pPg->InvalidateLayout();
pPg = (SwPageFrm*)pPg->GetNext();
@@ -1006,10 +1006,10 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
/*************************************************************************
|*
-|* SwPageFrm::PrepareRegisterChg()
+|* SwPageFrm::PrepareRegisterChg()
|*
-|* Ersterstellung AMA 22. Jul. 96
-|* Letzte Aenderung AMA 22. Jul. 96
+|* Ersterstellung AMA 22. Jul. 96
+|* Letzte Aenderung AMA 22. Jul. 96
|*
|*************************************************************************/
void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm )
@@ -1068,22 +1068,22 @@ void SwPageFrm::PrepareRegisterChg()
/*************************************************************************
|*
-|* SwFrm::CheckPageDescs()
+|* SwFrm::CheckPageDescs()
|*
-|* Beschreibung Prueft alle Seiten ab der uebergebenen, daraufhin,
-|* ob sie das richtige FrmFmt verwenden. Wenn 'falsche' Seiten
-|* aufgespuehrt werden, so wird versucht die Situation moeglichst
-|* einfache zu bereinigen.
+|* Beschreibung Prueft alle Seiten ab der uebergebenen, daraufhin,
+|* ob sie das richtige FrmFmt verwenden. Wenn 'falsche' Seiten
+|* aufgespuehrt werden, so wird versucht die Situation moeglichst
+|* einfache zu bereinigen.
|*
-|* Ersterstellung MA 10. Feb. 93
-|* Letzte Aenderung MA 18. Apr. 96
+|* Ersterstellung MA 10. Feb. 93
+|* Letzte Aenderung MA 18. Apr. 96
|*
|*************************************************************************/
void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
{
OSL_ENSURE( pStart, "Keine Startpage." );
- ViewShell *pSh = pStart->GetShell();
+ ViewShell *pSh = pStart->GetShell();
SwViewImp *pImp = pSh ? pSh->Imp() : 0;
if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() )
@@ -1097,7 +1097,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
SwTwips nDocPos = LONG_MAX;
SwRootFrm *pRoot = (SwRootFrm*)pStart->GetUpper();
- SwDoc* pDoc = pStart->GetFmt()->GetDoc();
+ SwDoc* pDoc = pStart->GetFmt()->GetDoc();
const BOOL bFtns = 0 != pDoc->GetFtnIdxs().Count();
SwPageFrm *pPage = pStart;
@@ -1114,7 +1114,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
: pDesc->GetLeftFmt();
if ( bActOdd != bOdd ||
- pDesc != pPage->GetPageDesc() || //falscher Desc
+ pDesc != pPage->GetPageDesc() || //falscher Desc
( pFmtWish != pPage->GetFmt() && //falsches Format und
( !pPage->IsEmptyPage() || pFmtWish ) //nicht Leerseite
)
@@ -1128,27 +1128,27 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
//Ab hier muessen die Felder invalidiert werden!
if ( nDocPos == LONG_MAX )
nDocPos = pPage->GetPrev() ?
- pPage->GetPrev()->Frm().Top() : pPage->Frm().Top();
+ pPage->GetPrev()->Frm().Top() : pPage->Frm().Top();
//Faelle:
//1. Wir haben eine EmptyPage und wollen eine "Normalseite".
- // ->EmptyPage wegwerfen und weiter mit der naechsten.
+ // ->EmptyPage wegwerfen und weiter mit der naechsten.
//2. Wir haben eine EmptyPage und wollen eine EmptyPage mit
- // anderem Descriptor.
- // ->Descriptor austauschen.
+ // anderem Descriptor.
+ // ->Descriptor austauschen.
//3. Wir haben eine "Normalseite" und wollen eine EmptyPage.
- // ->Emptypage einfuegen, nicht aber wenn die Vorseite
- // bereits eine EmptyPage ist -> 6.
+ // ->Emptypage einfuegen, nicht aber wenn die Vorseite
+ // bereits eine EmptyPage ist -> 6.
//4. Wir haben eine "Normalseite" und wollen eine "Normalseite"
- // mit anderem Descriptor
- // ->Descriptor und Format austauschen
+ // mit anderem Descriptor
+ // ->Descriptor und Format austauschen
//5. Wir haben eine "Normalseite" und wollen eine "Normalseite"
- // mit anderem Format
- // ->Format austauschen.
+ // mit anderem Format
+ // ->Format austauschen.
//6. Wir haben kein Wunschformat erhalten, also nehmen wir das
- // 'andere' Format (rechts/links) des PageDesc.
+ // 'andere' Format (rechts/links) des PageDesc.
- if ( pPage->IsEmptyPage() && ( pFmtWish || //1.
+ if ( pPage->IsEmptyPage() && ( pFmtWish || //1.
( !bOdd && !pPage->GetPrev() ) ) )
{
SwPageFrm *pTmp = (SwPageFrm*)pPage->GetNext();
@@ -1159,7 +1159,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
pPage = pTmp;
continue;
}
- else if ( pPage->IsEmptyPage() && !pFmtWish && //2.
+ else if ( pPage->IsEmptyPage() && !pFmtWish && //2.
pDesc != pPage->GetPageDesc() )
{
pPage->SetPageDesc( pDesc, 0 );
@@ -1179,7 +1179,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
pTmp->PreparePage( FALSE );
pPage = pTmp;
}
- else if ( pPage->GetPageDesc() != pDesc ) //4.
+ else if ( pPage->GetPageDesc() != pDesc ) //4.
{
SwPageDesc *pOld = pPage->GetPageDesc();
pPage->SetPageDesc( pDesc, pFmtWish );
@@ -1197,11 +1197,11 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
pCont->_InvalidateAll();
}
}
- else if ( pFmtWish && pPage->GetFmt() != pFmtWish ) //5.
+ else if ( pFmtWish && pPage->GetFmt() != pFmtWish ) //5.
{
pPage->SetFrmFmt( pFmtWish );
}
- else if ( !pFmtWish ) //6.
+ else if ( !pFmtWish ) //6.
{
//Format mit verdrehter Logic besorgen.
pFmtWish = bOdd ? pDesc->GetLeftFmt() : pDesc->GetRightFmt();
@@ -1265,7 +1265,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
if ( bEmpty )
{
OSL_ENSURE( FALSE, "Doppelte Leerseiten." );
- break; //Einmal reicht.
+ break; //Einmal reicht.
}
bEmpty = TRUE;
}
@@ -1276,8 +1276,8 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
//moeglich: Ein paar Seiten, auf der ersten 'erste Seite' anwenden,
//rechte als folge der ersten, linke als folge der rechten, rechte als
//folge der linken.
-// OSL_ENSURE( pPg->GetPageDesc() == pPg->FindPageDesc(),
-// "Seite mit falschem Descriptor." );
+// OSL_ENSURE( pPg->GetPageDesc() == pPg->FindPageDesc(),
+// "Seite mit falschem Descriptor." );
pPg = (SwPageFrm*)pPg->GetNext();
}
@@ -1286,11 +1286,11 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
/*************************************************************************
|*
-|* SwFrm::InsertPage()
+|* SwFrm::InsertPage()
|*
-|* Beschreibung
-|* Ersterstellung MA 10. Feb. 93
-|* Letzte Aenderung MA 27. Jul. 93
+|* Beschreibung
+|* Ersterstellung MA 10. Feb. 93
+|* Letzte Aenderung MA 27. Jul. 93
|*
|*************************************************************************/
SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
@@ -1309,7 +1309,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
//der Follow vom bereits in der PrevPage gueltigen sonst.
pDesc = 0;
if ( IsFlowFrm() && !SwFlowFrm::CastFlowFrm( this )->IsFollow() )
- { SwFmtPageDesc &rDesc = (SwFmtPageDesc&)GetAttrSet()->GetPageDesc();
+ { SwFmtPageDesc &rDesc = (SwFmtPageDesc&)GetAttrSet()->GetPageDesc();
pDesc = rDesc.GetPageDesc();
if ( rDesc.GetNumOffset() )
{
@@ -1331,7 +1331,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
//Wenn ich kein FrmFmt fuer die Seite gefunden habe, muss ich eben eine
//Leerseite einfuegen.
if( bWishedOdd != bNextOdd )
- { pFmt = pDoc->GetEmptyPageFmt();
+ { pFmt = pDoc->GetEmptyPageFmt();
SwPageDesc *pTmpDesc = pPrevPage->GetPageDesc();
SwPageFrm *pPage = new SwPageFrm( pFmt, pTmpDesc );
pPage->Paste( pRoot, pSibling );
@@ -1404,7 +1404,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
sw::sidebarwindows::SidebarPosition SwPageFrm::SidebarPosition() const
{
- if ( !GetShell() ||
+ if ( !GetShell() ||
GetShell()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
{
// --> OD 2010-06-03 #i111964# - provide default sidebar position
@@ -1425,10 +1425,10 @@ sw::sidebarwindows::SidebarPosition SwPageFrm::SidebarPosition() const
/*************************************************************************
|*
-|* SwRootFrm::GrowFrm()
+|* SwRootFrm::GrowFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
@@ -1440,10 +1440,10 @@ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
}
/*************************************************************************
|*
-|* SwRootFrm::ShrinkFrm()
+|* SwRootFrm::ShrinkFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL )
@@ -1458,21 +1458,21 @@ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL )
/*************************************************************************
|*
-|* SwRootFrm::RemoveSuperfluous()
+|* SwRootFrm::RemoveSuperfluous()
|*
-|* Beschreibung: Entfernung von ueberfluessigen Seiten.
-|* Arbeitet nur wenn das Flag bCheckSuperfluous gesetzt ist.
-|* Definition: Eine Seite ist genau dann leer, wenn der
-|* Body-Textbereich keinen CntntFrm enthaelt, aber nicht, wenn noch
-|* mindestens ein Fly an der Seite klebt.
-|* Die Seite ist auch dann nicht leer, wenn sie noch eine
-|* Fussnote enthaelt.
-|* Es muss zweimal angesetzt werden um leeren Seiten aufzuspueren:
-|* - einmal fuer die Endnotenseiten.
-|* - und einmal fuer die Seiten des Bodytextes.
+|* Beschreibung: Entfernung von ueberfluessigen Seiten.
+|* Arbeitet nur wenn das Flag bCheckSuperfluous gesetzt ist.
+|* Definition: Eine Seite ist genau dann leer, wenn der
+|* Body-Textbereich keinen CntntFrm enthaelt, aber nicht, wenn noch
+|* mindestens ein Fly an der Seite klebt.
+|* Die Seite ist auch dann nicht leer, wenn sie noch eine
+|* Fussnote enthaelt.
+|* Es muss zweimal angesetzt werden um leeren Seiten aufzuspueren:
+|* - einmal fuer die Endnotenseiten.
+|* - und einmal fuer die Seiten des Bodytextes.
|*
-|* Ersterstellung MA 20. May. 92
-|* Letzte Aenderung MA 10. Jan. 95
+|* Ersterstellung MA 20. May. 92
+|* Letzte Aenderung MA 10. Jan. 95
|*
|*************************************************************************/
void SwRootFrm::RemoveSuperfluous()
@@ -1566,14 +1566,14 @@ void SwRootFrm::RemoveSuperfluous()
/*************************************************************************
|*
-|* SwRootFrm::AssertFlyPages()
+|* SwRootFrm::AssertFlyPages()
|*
-|* Beschreibung Stellt sicher, dass genuegend Seiten vorhanden
-|* sind, damit alle Seitengebundenen Rahmen und DrawObject
-|* untergebracht sind.
+|* Beschreibung Stellt sicher, dass genuegend Seiten vorhanden
+|* sind, damit alle Seitengebundenen Rahmen und DrawObject
+|* untergebracht sind.
|*
-|* Ersterstellung MA 27. Jul. 93
-|* Letzte Aenderung MA 24. Apr. 97
+|* Ersterstellung MA 27. Jul. 93
+|* Letzte Aenderung MA 24. Apr. 97
|*
|*************************************************************************/
void SwRootFrm::AssertFlyPages()
@@ -1652,14 +1652,14 @@ void SwRootFrm::AssertFlyPages()
/*************************************************************************
|*
-|* SwRootFrm::AssertPageFlys()
+|* SwRootFrm::AssertPageFlys()
|*
-|* Beschreibung Stellt sicher, dass ab der uebergebenen Seite
-|* auf allen Seiten die Seitengebunden Objecte auf der richtigen
-|* Seite (Seitennummer stehen).
+|* Beschreibung Stellt sicher, dass ab der uebergebenen Seite
+|* auf allen Seiten die Seitengebunden Objecte auf der richtigen
+|* Seite (Seitennummer stehen).
|*
-|* Ersterstellung MA 02. Nov. 94
-|* Letzte Aenderung MA 10. Aug. 95
+|* Ersterstellung MA 02. Nov. 94
+|* Letzte Aenderung MA 10. Aug. 95
|*
|*************************************************************************/
void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
@@ -1708,10 +1708,10 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
/*************************************************************************
|*
-|* SwRootFrm::ChgSize()
+|* SwRootFrm::ChgSize()
|*
-|* Ersterstellung MA 24. Jul. 92
-|* Letzte Aenderung MA 13. Aug. 93
+|* Ersterstellung MA 24. Jul. 92
+|* Letzte Aenderung MA 13. Aug. 93
|*
|*************************************************************************/
Size SwRootFrm::ChgSize( const Size& aNewSize )
@@ -1724,20 +1724,20 @@ Size SwRootFrm::ChgSize( const Size& aNewSize )
/*************************************************************************
|*
-|* SwRootFrm::MakeAll()
+|* SwRootFrm::MakeAll()
|*
-|* Ersterstellung MA 17. Nov. 92
-|* Letzte Aenderung MA 19. Apr. 93
+|* Ersterstellung MA 17. Nov. 92
+|* Letzte Aenderung MA 19. Apr. 93
|*
|*************************************************************************/
void SwRootFrm::MakeAll()
{
if ( !bValidPos )
- { bValidPos = TRUE;
+ { bValidPos = TRUE;
aFrm.Pos().X() = aFrm.Pos().Y() = DOCUMENTBORDER;
}
if ( !bValidPrtArea )
- { bValidPrtArea = TRUE;
+ { bValidPrtArea = TRUE;
aPrt.Pos().X() = aPrt.Pos().Y() = 0;
aPrt.SSize( aFrm.SSize() );
}
@@ -1748,10 +1748,10 @@ void SwRootFrm::MakeAll()
/*************************************************************************
|*
-|* SwRootFrm::ImplInvalidateBrowseWidth()
+|* SwRootFrm::ImplInvalidateBrowseWidth()
|*
-|* Ersterstellung MA 08. Jun. 96
-|* Letzte Aenderung MA 08. Jun. 96
+|* Ersterstellung MA 08. Jun. 96
+|* Letzte Aenderung MA 08. Jun. 96
|*
|*************************************************************************/
void SwRootFrm::ImplInvalidateBrowseWidth()
@@ -1767,10 +1767,10 @@ void SwRootFrm::ImplInvalidateBrowseWidth()
/*************************************************************************
|*
-|* SwRootFrm::ImplCalcBrowseWidth()
+|* SwRootFrm::ImplCalcBrowseWidth()
|*
-|* Ersterstellung MA 07. Jun. 96
-|* Letzte Aenderung MA 13. Jun. 96
+|* Ersterstellung MA 07. Jun. 96
+|* Letzte Aenderung MA 13. Jun. 96
|*
|*************************************************************************/
void SwRootFrm::ImplCalcBrowseWidth()
@@ -1891,7 +1891,7 @@ void SwRootFrm::ImplCalcBrowseWidth()
// <--
}
break;
- default: /* do nothing */;
+ default: /* do nothing */;
}
nBrowseWidth = Max( nBrowseWidth, nWidth );
}
@@ -1902,10 +1902,10 @@ void SwRootFrm::ImplCalcBrowseWidth()
/*************************************************************************
|*
-|* SwRootFrm::StartAllAction()
+|* SwRootFrm::StartAllAction()
|*
-|* Ersterstellung MA 08. Mar. 98
-|* Letzte Aenderung MA 08. Mar. 98
+|* Ersterstellung MA 08. Mar. 98
+|* Letzte Aenderung MA 08. Mar. 98
|*
|*************************************************************************/
@@ -1914,7 +1914,7 @@ void SwRootFrm::StartAllAction()
ViewShell *pSh = GetCurrShell();
if ( pSh )
do
- { if ( pSh->ISA( SwCrsrShell ) )
+ { if ( pSh->ISA( SwCrsrShell ) )
((SwCrsrShell*)pSh)->StartAction();
else
pSh->StartAction();
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index ea06d1e5c24f..9f6bc1d8dc18 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -2,7 +2,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
@@ -45,19 +45,19 @@
#include <pagefrm.hxx>
#include <pagedesc.hxx>
#include <frmfmt.hxx>
-#include <fmtcol.hxx> // SwTxtFmtColl
+#include <fmtcol.hxx> // SwTxtFmtColl
#include <node.hxx>
#include <swtable.hxx>
#include <frmtool.hxx>
-#include <doc.hxx> // fuer GetAttrPool
+#include <doc.hxx> // fuer GetAttrPool
#include <poolfmt.hxx>
/*************************************************************************
|*
-|* SwPageDesc::SwPageDesc()
+|* SwPageDesc::SwPageDesc()
|*
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung MA 16. Feb. 94
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung MA 16. Feb. 94
|*
|*************************************************************************/
@@ -119,12 +119,12 @@ SwPageDesc::~SwPageDesc()
/*************************************************************************
|*
-|* SwPageDesc::Mirror()
+|* SwPageDesc::Mirror()
|*
-|* Beschreibung Gespiegelt werden nur die Raender.
-|* Attribute wie Umrandung und dergleichen werden 1:1 kopiert.
-|* Ersterstellung MA 25. Jan. 93
-|* Letzte Aenderung 01. Nov. 94
+|* Beschreibung Gespiegelt werden nur die Raender.
+|* Attribute wie Umrandung und dergleichen werden 1:1 kopiert.
+|* Ersterstellung MA 25. Jan. 93
+|* Letzte Aenderung 01. Nov. 94
|*
|*************************************************************************/
@@ -169,7 +169,7 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
|*
|* Beschreibung erfragt Informationen
|* Ersterstellung JP 31.03.94
-|* Letzte Aenderung JP 31.03.94
+|* Letzte Aenderung JP 31.03.94
|*
*************************************************************************/
@@ -181,7 +181,7 @@ BOOL SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
// {
// dann weiter zum Format
if( !aMaster.GetInfo( rInfo ) )
- return FALSE; // gefunden
+ return FALSE; // gefunden
return aLeft.GetInfo( rInfo );
// }
// return TRUE; // weiter suchen
@@ -193,7 +193,7 @@ BOOL SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
|*
|* Beschreibung setzt die Vorlage fuer die Registerhaltigkeit
|* Ersterstellung AMA 22.07.96
-|* Letzte Aenderung AMA 22.07.96
+|* Letzte Aenderung AMA 22.07.96
|*
*************************************************************************/
@@ -217,7 +217,7 @@ void SwPageDesc::SetRegisterFmtColl( const SwTxtFmtColl* pFmt )
|*
|* Beschreibung holt die Vorlage fuer die Registerhaltigkeit
|* Ersterstellung AMA 22.07.96
-|* Letzte Aenderung AMA 22.07.96
+|* Letzte Aenderung AMA 22.07.96
|*
*************************************************************************/
@@ -234,7 +234,7 @@ const SwTxtFmtColl* SwPageDesc::GetRegisterFmtColl() const
|*
|* Beschreibung benachrichtigt alle betroffenen PageFrames
|* Ersterstellung AMA 22.07.96
-|* Letzte Aenderung AMA 22.07.96
+|* Letzte Aenderung AMA 22.07.96
|*
*************************************************************************/
@@ -282,9 +282,9 @@ void SwPageDesc::RegisterChange()
|* SwPageDesc::Modify()
|*
|* Beschreibung reagiert insbesondere auf Aenderungen
-|* der Vorlage fuer die Registerhaltigkeit
+|* der Vorlage fuer die Registerhaltigkeit
|* Ersterstellung AMA 22.07.96
-|* Letzte Aenderung AMA 22.07.96
+|* Letzte Aenderung AMA 22.07.96
|*
*************************************************************************/
@@ -377,10 +377,10 @@ BOOL SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
/*************************************************************************
|*
-|* SwPageFtnInfo::SwPageFtnInfo()
+|* SwPageFtnInfo::SwPageFtnInfo()
|*
-|* Ersterstellung MA 24. Feb. 93
-|* Letzte Aenderung MA 24. Feb. 93
+|* Ersterstellung MA 24. Feb. 93
+|* Letzte Aenderung MA 24. Feb. 93
|*
|*************************************************************************/
@@ -388,7 +388,7 @@ BOOL SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
SwPageFtnInfo::SwPageFtnInfo() :
nMaxHeight( 0 ),
-// aPen( PEN_SOLID ),
+// aPen( PEN_SOLID ),
nLineWidth(10),
aWidth( 25, 100 ),
nTopDist( 57 ), //1mm
@@ -397,7 +397,7 @@ SwPageFtnInfo::SwPageFtnInfo() :
eAdj = FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage()) ?
FTNADJ_RIGHT :
FTNADJ_LEFT;
-// aPen.SetWidth( 10 );
+// aPen.SetWidth( 10 );
}
@@ -415,10 +415,10 @@ SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) :
/*************************************************************************
|*
-|* SwPageFtnInfo::operator=
+|* SwPageFtnInfo::operator=
|*
-|* Ersterstellung MA 24. Feb. 93
-|* Letzte Aenderung MA 24. Feb. 93
+|* Ersterstellung MA 24. Feb. 93
+|* Letzte Aenderung MA 24. Feb. 93
|*
|*************************************************************************/
@@ -426,21 +426,21 @@ SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) :
SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
{
- nMaxHeight = rCpy.GetHeight();
- nLineWidth = rCpy.nLineWidth;
- aLineColor = rCpy.aLineColor;
- aWidth = rCpy.GetWidth();
- eAdj = rCpy.GetAdj();
- nTopDist = rCpy.GetTopDist();
+ nMaxHeight = rCpy.GetHeight();
+ nLineWidth = rCpy.nLineWidth;
+ aLineColor = rCpy.aLineColor;
+ aWidth = rCpy.GetWidth();
+ eAdj = rCpy.GetAdj();
+ nTopDist = rCpy.GetTopDist();
nBottomDist = rCpy.GetBottomDist();
return *this;
}
/*************************************************************************
|*
-|* SwPageFtnInfo::operator==
+|* SwPageFtnInfo::operator==
|*
-|* Ersterstellung MA 01. Mar. 93
-|* Letzte Aenderung MA 01. Mar. 93
+|* Ersterstellung MA 01. Mar. 93
+|* Letzte Aenderung MA 01. Mar. 93
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 08d6d5f9bff9..9443507cb9f2 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2,7 +2,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
@@ -105,9 +105,9 @@
#include <PostItMgr.hxx>
#include <tools/color.hxx>
-#define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230)
-#define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200)
-#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
+#define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230)
+#define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200)
+#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
#include <vcl/svapp.hxx>
#include <svtools/borderhelper.hxx>
@@ -115,7 +115,7 @@
using namespace ::com::sun::star;
-#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell())
+#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell())
//Tabellenhilfslinien an?
#define IS_SUBS_TABLE \
@@ -153,28 +153,28 @@ using namespace ::com::sun::star;
//----- Klassen zum Sammeln von Umrandungen und Hilfslinien ---
class SwLineRect : public SwRect
{
- const Color *pColor;
+ const Color *pColor;
SvxBorderStyle nStyle;
const SwTabFrm *pTab;
- BYTE nSubColor; //Hilfslinien einfaerben
- BOOL bPainted; //schon gepaintet?
- BYTE nLock; //Um die Linien zum Hell-Layer abzugrenzen.
+ BYTE nSubColor; //Hilfslinien einfaerben
+ BOOL bPainted; //schon gepaintet?
+ BYTE nLock; //Um die Linien zum Hell-Layer abzugrenzen.
public:
SwLineRect( const SwRect &rRect, const Color *pCol, const SvxBorderStyle nStyle,
const SwTabFrm *pT , const BYTE nSCol );
- const Color *GetColor() const { return pColor;}
+ const Color *GetColor() const { return pColor;}
SvxBorderStyle GetStyle() const { return nStyle; }
- const SwTabFrm *GetTab() const { return pTab; }
- void SetPainted() { bPainted = TRUE; }
- void Lock( BOOL bLock ) { if ( bLock )
+ const SwTabFrm *GetTab() const { return pTab; }
+ void SetPainted() { bPainted = TRUE; }
+ void Lock( BOOL bLock ) { if ( bLock )
++nLock;
else if ( nLock )
--nLock;
}
- BOOL IsPainted() const { return bPainted; }
- BOOL IsLocked() const { return nLock != 0; }
- BYTE GetSubColor() const { return nSubColor;}
+ BOOL IsPainted() const { return bPainted; }
+ BOOL IsLocked() const { return nLock != 0; }
+ BYTE GetSubColor() const { return nSubColor;}
BOOL MakeUnion( const SwRect &rRect );
};
@@ -183,10 +183,10 @@ SV_DECL_VARARR( SwLRects, SwLineRect, 100, 100 )
class SwLineRects : public SwLRects
{
- USHORT nLastCount; //unuetze Durchlaeufe im PaintLines verhindern.
+ USHORT nLastCount; //unuetze Durchlaeufe im PaintLines verhindern.
public:
SwLineRects() : nLastCount( 0 ) {}
- void AddLineRect( const SwRect& rRect, const Color *pColor, const SvxBorderStyle nStyle,
+ void AddLineRect( const SwRect& rRect, const Color *pColor, const SvxBorderStyle nStyle,
const SwTabFrm *pTab, const BYTE nSCol );
void ConnectEdges( OutputDevice *pOut );
void PaintLines ( OutputDevice *pOut );
@@ -319,27 +319,27 @@ void SwCalcPixStatics( OutputDevice *pOut )
//Zum Sichern der statics, damit das Paint (quasi) reentrant wird.
class SwSavePaintStatics
{
- BOOL bSFlyMetafile,
+ BOOL bSFlyMetafile,
bSPageOnly;
- ViewShell *pSGlobalShell;
- OutputDevice *pSFlyMetafileOut;
- SwFlyFrm *pSRetoucheFly,
+ ViewShell *pSGlobalShell;
+ OutputDevice *pSFlyMetafileOut;
+ SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2,
*pSFlyOnlyDraw;
- SwLineRects *pSLines;
- SwSubsRects *pSSubsLines;
+ SwLineRects *pSLines;
+ SwSubsRects *pSSubsLines;
// --> OD 2005-07-04 #123196#
SwSubsRects* pSSpecSubsLines;
// <--
- SfxProgress *pSProgress;
- long nSPixelSzW,
+ SfxProgress *pSProgress;
+ long nSPixelSzW,
nSPixelSzH,
nSHalfPixelSzW,
nSHalfPixelSzH,
nSMinDistPixelW,
nSMinDistPixelH;
- Color aSGlobalRetoucheColor;
- double aSScaleX,
+ Color aSGlobalRetoucheColor;
+ double aSScaleX,
aSScaleY;
public:
SwSavePaintStatics();
@@ -389,7 +389,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
SwSavePaintStatics::~SwSavePaintStatics()
{
- pGlobalShell = pSGlobalShell;
+ pGlobalShell = pSGlobalShell;
bFlyMetafile = bSFlyMetafile;
pFlyMetafileOut = pSFlyMetafileOut;
pRetoucheFly = pSRetoucheFly;
@@ -440,17 +440,17 @@ BOOL SwLineRect::MakeUnion( const SwRect &rRect )
//Zusammenfassen wenn kein Luecke zwischen den Linien ist.
const long nAdd = nPixelSzW + nHalfPixelSzW;
if ( Bottom() + nAdd >= rRect.Top() &&
- Top() - nAdd <= rRect.Bottom() )
+ Top() - nAdd <= rRect.Bottom() )
{
Bottom( Max( Bottom(), rRect.Bottom() ) );
- Top ( Min( Top(), rRect.Top() ) );
+ Top ( Min( Top(), rRect.Top() ) );
return TRUE;
}
}
}
else
{
- if ( Top() == rRect.Top() && Height() == rRect.Height() )
+ if ( Top() == rRect.Top() && Height() == rRect.Height() )
{
//Zusammenfassen wenn kein Luecke zwischen den Linien ist.
const long nAdd = nPixelSzW + nHalfPixelSzW;
@@ -528,8 +528,8 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
{
SwLineRect &rL2 = operator[](i2);
if ( rL2.GetTab() != rL1.GetTab() ||
- rL2.IsPainted() ||
- rL2.IsLocked() ||
+ rL2.IsPainted() ||
+ rL2.IsLocked() ||
bVert == rL2.Height() > rL2.Width() )
continue;
@@ -546,7 +546,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( (nL1a - nAdd < nL2d && nL1d + nAdd > nL2a) &&
- ((nL1b > nL2b && nL1c < nL2c) ||
+ ((nL1b > nL2b && nL1c < nL2c) ||
(nL1c >= nL2c && nL1b - nAdd < nL2c) ||
(nL1b <= nL2b && nL1c + nAdd > nL2b)) )
{
@@ -585,7 +585,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( rL1.Top() < pLA->Top() )
{
if ( rL1.Bottom() == pLA->Bottom() )
- continue; //kleiner Irrtum (woher?)
+ continue; //kleiner Irrtum (woher?)
SwRect aIns( rL1 );
aIns.Bottom( pLA->Bottom() );
@@ -603,9 +603,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( rL1.Bottom() > pLB->Bottom() )
- rL1.Top( pLB->Top() ); //i1 nach oben verlaengern
+ rL1.Top( pLB->Top() ); //i1 nach oben verlaengern
else
- bRemove = TRUE; //abbrechen, i1 entfernen
+ bRemove = TRUE; //abbrechen, i1 entfernen
}
}
else
@@ -626,7 +626,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( rL1.Left() < pLA->Left() )
{
if ( rL1.Right() == pLA->Right() )
- continue; //kleiner irrtum
+ continue; //kleiner irrtum
SwRect aIns( rL1 );
aIns.Right( pLA->Right() );
@@ -653,7 +653,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( bRemove )
{
Remove( static_cast<USHORT>(i), 1 );
- --i; //keinen auslassen!
+ --i; //keinen auslassen!
}
}
}
@@ -735,7 +735,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
break;
}
}
- else //Horizontal
+ else //Horizontal
{
if ( aSubsRect.Top() <= rLine.Bottom() &&
aSubsRect.Bottom() >= rLine.Top() )
@@ -852,21 +852,21 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
if ( rLRect.Height() > rLRect.Width() )
{
//Senkrechte Kante, ueberlappt sie mit der TabellenKante?
- SwTwips nLLeft = rLRect.Left() - 30,
+ SwTwips nLLeft = rLRect.Left() - 30,
nLRight = rLRect.Right() + 30,
- nTLeft = rLRect.GetTab()->Frm().Left() + rLRect.GetTab()->Prt().Left(),
+ nTLeft = rLRect.GetTab()->Frm().Left() + rLRect.GetTab()->Prt().Left(),
nTRight = rLRect.GetTab()->Frm().Left() + rLRect.GetTab()->Prt().Right();
if ( (nTLeft >= nLLeft && nTLeft <= nLRight) ||
(nTRight>= nLLeft && nTRight<= nLRight) )
bPaint = FALSE;
}
else
- { //Waagerechte Kante, ueberlappt sie mit der Tabellenkante?
- SwTwips nLTop = rLRect.Top() - 30,
+ { //Waagerechte Kante, ueberlappt sie mit der Tabellenkante?
+ SwTwips nLTop = rLRect.Top() - 30,
nLBottom = rLRect.Bottom() + 30,
- nTTop = rLRect.GetTab()->Frm().Top() + rLRect.GetTab()->Prt().Top(),
+ nTTop = rLRect.GetTab()->Frm().Top() + rLRect.GetTab()->Prt().Top(),
nTBottom = rLRect.GetTab()->Frm().Top() + rLRect.GetTab()->Prt().Bottom();
- if ( (nTTop >= nLTop && nTTop <= nLBottom) ||
+ if ( (nTTop >= nLTop && nTTop <= nLBottom) ||
(nTBottom >= nLTop && nTBottom <= nLBottom) )
bPaint = FALSE;
}
@@ -2757,18 +2757,18 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori )
/*************************************************************************
|*
-|* SwRootFrm::Paint()
+|* SwRootFrm::Paint()
|*
-|* Beschreibung
-|* Fuer jede sichtbare Seite, die von Rect ber?hrt wird einmal Painten.
-|* 1. Umrandungen und Hintergruende Painten.
-|* 2. Den Draw Layer (Ramen und Zeichenobjekte) der unter dem Dokument
-|* liegt painten (Hoelle).
-|* 3. Den Dokumentinhalt (Text) Painten.
-|* 4. Den Drawlayer der ueber dem Dokuemnt liegt painten.
+|* Beschreibung
+|* Fuer jede sichtbare Seite, die von Rect ber?hrt wird einmal Painten.
+|* 1. Umrandungen und Hintergruende Painten.
+|* 2. Den Draw Layer (Ramen und Zeichenobjekte) der unter dem Dokument
+|* liegt painten (Hoelle).
+|* 3. Den Dokumentinhalt (Text) Painten.
+|* 4. Den Drawlayer der ueber dem Dokuemnt liegt painten.
|*
-|* Ersterstellung MA 01. Jun. 92
-|* Letzte Aenderung MA 10. Oct. 97
+|* Ersterstellung MA 01. Jun. 92
+|* Letzte Aenderung MA 10. Oct. 97
|*
|*************************************************************************/
@@ -2849,7 +2849,7 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
const BOOL bExtraData = ::IsExtraData( GetFmt()->GetDoc() );
- pLines = new SwLineRects; //Sammler fuer Umrandungen.
+ pLines = new SwLineRects; //Sammler fuer Umrandungen.
// #104289#. During painting, something (OLE) can
// load the linguistic, which in turn can cause a reformat
@@ -3131,10 +3131,10 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
/*************************************************************************
|*
-|* SwRootFrm::HackPrepareLongTblPaint()
+|* SwRootFrm::HackPrepareLongTblPaint()
|*
-|* Ersterstellung MA 27. Sep. 96
-|* Letzte Aenderung MA 18. Nov. 97
+|* Ersterstellung MA 27. Sep. 96
+|* Letzte Aenderung MA 18. Nov. 97
|*
|*************************************************************************/
@@ -3165,10 +3165,10 @@ void SwRootFrm::HackPrepareLongTblPaint( int nMode )
/*************************************************************************
|*
-|* SwLayoutFrm::Paint()
+|* SwLayoutFrm::Paint()
|*
-|* Ersterstellung MA 19. May. 92
-|* Letzte Aenderung MA 19. Apr. 95
+|* Ersterstellung MA 19. May. 92
+|* Letzte Aenderung MA 19. Apr. 95
|*
|*************************************************************************/
@@ -3263,7 +3263,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData
if ( pFrm->IsRetouche() )
{
if ( pFrm->IsRetoucheFrm() && bWin && !pFrm->GetNext() )
- { if ( !pPage )
+ { if ( !pPage )
pPage = FindPageFrm();
pFrm->Retouche( pPage, rRect );
}
@@ -3283,7 +3283,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData
//Um es nicht alzu Heftig werden zu lassen versuche ich hier
//das Rechteck zu begrenzen indem der gewuenschte Teil gepaintet
//und nur die uebrigen Absatzanteile invalidiert werden.
- if ( aPaintRect.Left() == rRect.Left() &&
+ if ( aPaintRect.Left() == rRect.Left() &&
aPaintRect.Right() == rRect.Right() )
{
aPaintRect.Bottom( rRect.Top() - 1 );
@@ -3409,10 +3409,10 @@ sal_Bool SwFlyFrm::IsShadowTransparent() const
/*************************************************************************
|*
-|* SwFlyFrm::IsPaint()
+|* SwFlyFrm::IsPaint()
|*
-|* Ersterstellung MA 16. Jan. 97
-|* Letzte Aenderung MA 16. Jan. 97
+|* Ersterstellung MA 16. Jan. 97
+|* Letzte Aenderung MA 16. Jan. 97
|*
|*************************************************************************/
@@ -3518,10 +3518,10 @@ void SwCellFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
/*************************************************************************
|*
-|* SwFlyFrm::Paint()
+|* SwFlyFrm::Paint()
|*
-|* Ersterstellung MA ??
-|* Letzte Aenderung MA 16. Jan. 97
+|* Ersterstellung MA ??
+|* Letzte Aenderung MA 16. Jan. 97
|*
|*************************************************************************/
@@ -3757,10 +3757,10 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
}
/*************************************************************************
|*
-|* SwTabFrm::Paint()
+|* SwTabFrm::Paint()
|*
-|* Ersterstellung MA 11. May. 93
-|* Letzte Aenderung MA 23. Mar. 95
+|* Ersterstellung MA 11. May. 93
+|* Letzte Aenderung MA 23. Mar. 95
|*
|*************************************************************************/
@@ -3806,14 +3806,14 @@ void SwTabFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
/*************************************************************************
|*
-|* SwFrm::PaintShadow()
+|* SwFrm::PaintShadow()
|*
-|* Beschreibung Malt einen Schatten wenns das FrmFormat fordert.
-|* Der Schatten wird immer an den auesseren Rand des OutRect gemalt.
-|* Das OutRect wird ggf. so verkleinert, dass auf diesem das
-|* malen der Umrandung stattfinden kann.
-|* Ersterstellung MA 21. Dec. 92
-|* Letzte Aenderung MA 29. May. 97
+|* Beschreibung Malt einen Schatten wenns das FrmFormat fordert.
+|* Der Schatten wird immer an den auesseren Rand des OutRect gemalt.
+|* Das OutRect wird ggf. so verkleinert, dass auf diesem das
+|* malen der Umrandung stattfinden kann.
+|* Ersterstellung MA 21. Dec. 92
+|* Letzte Aenderung MA 29. May. 97
|*
|*************************************************************************/
/// OD 23.08.2002 #99657#
@@ -3828,7 +3828,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
SwRects aRegion( 2, 2 );
SwRect aOut( rOutRect );
- const BOOL bCnt = IsCntntFrm();
+ const BOOL bCnt = IsCntntFrm();
const BOOL bTop = !bCnt || rAttrs.GetTopLine ( *(this) ) ? TRUE : FALSE;
const BOOL bBottom = !bCnt || rAttrs.GetBottomLine( *(this) ) ? TRUE : FALSE;
@@ -4019,10 +4019,10 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
/*************************************************************************
|*
-|* SwFrm::PaintBorderLine()
+|* SwFrm::PaintBorderLine()
|*
-|* Ersterstellung MA 22. Dec. 92
-|* Letzte Aenderung MA 22. Jan. 95
+|* Ersterstellung MA 22. Dec. 92
+|* Letzte Aenderung MA 22. Jan. 95
|*
|*************************************************************************/
@@ -4061,11 +4061,11 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
/*************************************************************************
|*
-|* SwFrm::PaintBorderLines()
+|* SwFrm::PaintBorderLines()
|*
-|* Beschreibung Nur alle Linien einfach oder alle Linien doppelt!!!!
-|* Ersterstellung MA 22. Dec. 92
-|* Letzte Aenderung MA 22. Mar. 95
+|* Beschreibung Nur alle Linien einfach oder alle Linien doppelt!!!!
+|* Ersterstellung MA 22. Dec. 92
+|* Letzte Aenderung MA 22. Mar. 95
|*
|*************************************************************************/
@@ -4529,11 +4529,11 @@ const SwFrm* lcl_HasNextCell( const SwFrm& rFrm )
/*************************************************************************
|*
-|* SwFrm::PaintBorder()
+|* SwFrm::PaintBorder()
|*
-|* Beschreibung Malt Schatten und Umrandung
-|* Ersterstellung MA 23.01.92
-|* Letzte Aenderung MA 29. Jul. 96
+|* Beschreibung Malt Schatten und Umrandung
+|* Ersterstellung MA 23.01.92
+|* Letzte Aenderung MA 29. Jul. 96
|*
|*************************************************************************/
@@ -4707,7 +4707,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
if ( (GetType() & 0x90C5) )
return;
- if ( (GetType() & 0x2000) && //Cell
+ if ( (GetType() & 0x2000) && //Cell
!pGlobalShell->GetViewOptions()->IsTable() )
return;
@@ -4849,13 +4849,13 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
}
/*************************************************************************
|*
-|* SwFtnContFrm::PaintBorder()
+|* SwFtnContFrm::PaintBorder()
|*
-|* Beschreibung Spezialimplementierung wg. der Fussnotenlinie.
-|* Derzeit braucht nur der obere Rand beruecksichtigt werden.
-|* Auf andere Linien und Schatten wird verzichtet.
-|* Ersterstellung MA 27. Feb. 93
-|* Letzte Aenderung MA 08. Sep. 93
+|* Beschreibung Spezialimplementierung wg. der Fussnotenlinie.
+|* Derzeit braucht nur der obere Rand beruecksichtigt werden.
+|* Auf andere Linien und Schatten wird verzichtet.
+|* Ersterstellung MA 27. Feb. 93
+|* Letzte Aenderung MA 08. Sep. 93
|*
|*************************************************************************/
@@ -4871,11 +4871,11 @@ void SwFtnContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
}
/*************************************************************************
|*
-|* SwFtnContFrm::PaintLine()
+|* SwFtnContFrm::PaintLine()
|*
-|* Beschreibung Fussnotenline malen.
-|* Ersterstellung MA 02. Mar. 93
-|* Letzte Aenderung MA 28. Mar. 94
+|* Beschreibung Fussnotenline malen.
+|* Ersterstellung MA 02. Mar. 93
+|* Letzte Aenderung MA 28. Mar. 94
|*
|*************************************************************************/
@@ -4919,12 +4919,12 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
/*************************************************************************
|*
-|* SwLayoutFrm::PaintColLines()
+|* SwLayoutFrm::PaintColLines()
|*
-|* Beschreibung Painted die Trennlinien fuer die innenliegenden
-|* Spalten.
-|* Ersterstellung MA 21. Jun. 93
-|* Letzte Aenderung MA 28. Mar. 94
+|* Beschreibung Painted die Trennlinien fuer die innenliegenden
+|* Spalten.
+|* Ersterstellung MA 21. Jun. 93
+|* Letzte Aenderung MA 28. Mar. 94
|*
|*************************************************************************/
@@ -5171,7 +5171,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
while( aVert.Left() <= nRight )
{
PaintBorderLine(rRect,aVert,this,pCol);
- aVert.Pos().X() += nGridWidth; //for textgrid refactor
+ aVert.Pos().X() += nGridWidth; //for textgrid refactor
}
}
else if ( bBorder )
@@ -5228,7 +5228,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
while( aVert.Left() <= nRight )
{
PaintBorderLine( rRect, aVert, this, pCol);
- aVert.Pos().X() += nGridWidth; //for textgrid refactor
+ aVert.Pos().X() += nGridWidth; //for textgrid refactor
}
}
else if( bBorder )
@@ -5642,10 +5642,10 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 2;
/*************************************************************************
|*
-|* SwFrm::PaintBaBo()
+|* SwFrm::PaintBaBo()
|*
-|* Ersterstellung MA 22. Oct. 93
-|* Letzte Aenderung MA 19. Jun. 96
+|* Ersterstellung MA 22. Oct. 93
+|* Letzte Aenderung MA 19. Jun. 96
|*
|*************************************************************************/
@@ -5695,10 +5695,10 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
/*************************************************************************
|*
-|* SwFrm::PaintBackground()
+|* SwFrm::PaintBackground()
|*
-|* Ersterstellung MA 04. Jan. 93
-|* Letzte Aenderung MA 06. Feb. 97
+|* Ersterstellung MA 04. Jan. 93
+|* Letzte Aenderung MA 06. Feb. 97
|*
|*************************************************************************/
/// OD 05.09.2002 #102912#
@@ -5889,11 +5889,11 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
/*************************************************************************
|*
-|* SwPageFrm::RefreshSubsidiary()
+|* SwPageFrm::RefreshSubsidiary()
|*
-|* Beschreibung Erneuert alle Hilfslinien der Seite.
-|* Ersterstellung MA 04. Nov. 92
-|* Letzte Aenderung MA 10. May. 95
+|* Beschreibung Erneuert alle Hilfslinien der Seite.
+|* Ersterstellung MA 04. Nov. 92
+|* Letzte Aenderung MA 10. May. 95
|*
|*************************************************************************/
@@ -5936,17 +5936,17 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const
/*************************************************************************
|*
-|* SwLayoutFrm::RefreshLaySubsidiary()
+|* SwLayoutFrm::RefreshLaySubsidiary()
|*
-|* Ersterstellung MA 04. Nov. 92
-|* Letzte Aenderung MA 22. Jan. 95
+|* Ersterstellung MA 04. Nov. 92
+|* Letzte Aenderung MA 22. Jan. 95
|*
|*************************************************************************/
void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
const SwRect &rRect ) const
{
const BOOL bNoLowerColumn = !Lower() || !Lower()->IsColumnFrm();
- const BOOL bSubsOpt = IS_SUBS;
+ const BOOL bSubsOpt = IS_SUBS;
const BOOL bSubsTable = ((GetType() & (FRM_ROW | FRM_CELL)) && IS_SUBS_TABLE);
const BOOL bSubsOther = (GetType() & (FRM_HEADER | FRM_FOOTER | FRM_FTN )) && bSubsOpt;
const BOOL bSubsSect = IsSctFrm() &&
@@ -5961,7 +5961,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
if ( GetType() & FRM_BODY )
{
if ( IsPageBodyFrm() )
- bSubsBody = bSubsOpt && bNoLowerColumn; //nur ohne Spalten
+ bSubsBody = bSubsOpt && bNoLowerColumn; //nur ohne Spalten
else //Spaltenbody
{
if ( GetUpper()->GetUpper()->IsSctFrm() )
@@ -6012,12 +6012,12 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
/*************************************************************************
|*
-|* SwLayoutFrm::PaintSubsidiaryLines()
+|* SwLayoutFrm::PaintSubsidiaryLines()
|*
-|* Beschreibung Hilfslinien um die PrtAreas malen
-|* Nur die LayoutFrm's die direkt Cntnt enthalten.
-|* Ersterstellung MA 21. May. 92
-|* Letzte Aenderung MA 22. Jan. 95
+|* Beschreibung Hilfslinien um die PrtAreas malen
+|* Nur die LayoutFrm's die direkt Cntnt enthalten.
+|* Ersterstellung MA 21. May. 92
+|* Letzte Aenderung MA 22. Jan. 95
|*
|*************************************************************************/
@@ -6050,7 +6050,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
aP2( rP2 );
while ( aP1.*pDirPt < aP2.*pDirPt )
- { //Der Startpunkt wird jetzt, falls er in einem Fly sitzt, direkt
+ { //Der Startpunkt wird jetzt, falls er in einem Fly sitzt, direkt
//hinter den Fly gesetzt.
//Wenn der Endpunkt in einem Fly sitzt oder zwischen Start und Endpunkt
//ein Fly sitzt, so wird der Endpunkt eben an den Start herangezogen.
@@ -6292,13 +6292,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
/*************************************************************************
|*
-|* SwPageFrm::RefreshExtraData(), SwLayoutFrm::RefreshExtraData()
+|* SwPageFrm::RefreshExtraData(), SwLayoutFrm::RefreshExtraData()
|*
-|* Beschreibung Erneuert alle Extradaten (Zeilennummern usw) der Seite.
-|* Grundsaetzlich sind nur diejenigen Objekte beruecksichtig,
-|* die in die seitliche Ausdehnung des Rects ragen.
-|* Ersterstellung MA 20. Jan. 98
-|* Letzte Aenderung MA 18. Feb. 98
+|* Beschreibung Erneuert alle Extradaten (Zeilennummern usw) der Seite.
+|* Grundsaetzlich sind nur diejenigen Objekte beruecksichtig,
+|* die in die seitliche Ausdehnung des Rects ragen.
+|* Ersterstellung MA 20. Jan. 98
+|* Letzte Aenderung MA 18. Feb. 98
|*
|*************************************************************************/
@@ -6418,14 +6418,14 @@ const Font& SwPageFrm::GetEmptyPageFont()
/*************************************************************************
|*
-|* SwFrm::Retouche
+|* SwFrm::Retouche
|*
-|* Beschreibung Retouche fuer einen Bereich.
-|* Retouche wird nur dann durchgefuehrt, wenn der Frm der letzte seiner
-|* Kette ist. Der Gesamte Bereich des Upper unterhalb des Frm wird
-|* per PaintBackground gecleared.
-|* Ersterstellung MA 13. Apr. 93
-|* Letzte Aenderung MA 25. Jul. 96
+|* Beschreibung Retouche fuer einen Bereich.
+|* Retouche wird nur dann durchgefuehrt, wenn der Frm der letzte seiner
+|* Kette ist. Der Gesamte Bereich des Upper unterhalb des Frm wird
+|* per PaintBackground gecleared.
+|* Ersterstellung MA 13. Apr. 93
+|* Letzte Aenderung MA 25. Jul. 96
|*
|*************************************************************************/
@@ -6549,7 +6549,7 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
rpBrush = 0;
rpCol = NULL;
do
- { if ( pFrm->IsPageFrm() && !pOpt->IsPageBack() )
+ { if ( pFrm->IsPageFrm() && !pOpt->IsPageBack() )
return FALSE;
const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground();
@@ -6638,10 +6638,10 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
/*************************************************************************
|*
-|* SwFrmFmt::GetGraphic()
+|* SwFrmFmt::GetGraphic()
|*
-|* Ersterstellung MA 23. Jul. 96
-|* Letzte Aenderung MA 23. Jul. 96
+|* Ersterstellung MA 23. Jul. 96
+|* Letzte Aenderung MA 23. Jul. 96
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index d93f614957b7..a3a5f2528cd0 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2,7 +2,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
@@ -36,23 +36,23 @@
#include <fmtftn.hxx>
#include <fmtclbl.hxx>
#include "sectfrm.hxx"
-#include "section.hxx" // SwSection
-#include "frmtool.hxx" // StackHack
-#include "doc.hxx" // SwDoc
-#include "cntfrm.hxx" // SwCntntFrm
-#include "rootfrm.hxx" // SwRootFrm
-#include "pagefrm.hxx" // SwPageFrm
-#include "fmtpdsc.hxx" // SwFmtPageDesc
-#include "fmtcntnt.hxx" // SwFmtCntnt
-#include "ndindex.hxx" // SwNodeIndex
+#include "section.hxx" // SwSection
+#include "frmtool.hxx" // StackHack
+#include "doc.hxx" // SwDoc
+#include "cntfrm.hxx" // SwCntntFrm
+#include "rootfrm.hxx" // SwRootFrm
+#include "pagefrm.hxx" // SwPageFrm
+#include "fmtpdsc.hxx" // SwFmtPageDesc
+#include "fmtcntnt.hxx" // SwFmtCntnt
+#include "ndindex.hxx" // SwNodeIndex
#include "ftnidx.hxx"
-#include "txtfrm.hxx" // SwTxtFrm
-#include "fmtclds.hxx" // SwFmtCol
-#include "colfrm.hxx" // SwColumnFrm
-#include "tabfrm.hxx" // SwTabFrm
-#include "flyfrm.hxx" // SwFlyFrm
-#include "ftnfrm.hxx" // SwFtnFrm
-#include "layouter.hxx" // SwLayouter
+#include "txtfrm.hxx" // SwTxtFrm
+#include "fmtclds.hxx" // SwFmtCol
+#include "colfrm.hxx" // SwColumnFrm
+#include "tabfrm.hxx" // SwTabFrm
+#include "flyfrm.hxx" // SwFlyFrm
+#include "ftnfrm.hxx" // SwFtnFrm
+#include "layouter.hxx" // SwLayouter
#include "dbg_lay.hxx"
#include "viewsh.hxx"
#include "viewimp.hxx"
@@ -69,10 +69,10 @@ SV_IMPL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr )
/*************************************************************************
|*
-|* SwSectionFrm::SwSectionFrm(), ~SwSectionFrm()
+|* SwSectionFrm::SwSectionFrm(), ~SwSectionFrm()
|*
-|* Ersterstellung AMA 26. Nov. 97
-|* Letzte Aenderung AMA 26. Nov. 97
+|* Ersterstellung AMA 26. Nov. 97
+|* Letzte Aenderung AMA 26. Nov. 97
|*
|*************************************************************************/
SwSectionFrm::SwSectionFrm( SwSection &rSect ) :
@@ -181,10 +181,10 @@ SwSectionFrm::~SwSectionFrm()
/*************************************************************************
|*
-|* SwSectionFrm::DelEmpty()
+|* SwSectionFrm::DelEmpty()
|*
-|* Ersterstellung AMA 17. Dec. 97
-|* Letzte Aenderung AMA 17. Dec. 97
+|* Ersterstellung AMA 17. Dec. 97
+|* Letzte Aenderung AMA 17. Dec. 97
|*
|*************************************************************************/
void SwSectionFrm::DelEmpty( BOOL bRemove )
@@ -249,10 +249,10 @@ void SwSectionFrm::DelEmpty( BOOL bRemove )
/*************************************************************************
|*
-|* SwSectionFrm::Cut()
+|* SwSectionFrm::Cut()
|*
-|* Ersterstellung AMA 02. Dec. 97
-|* Letzte Aenderung AMA 02. Dec. 97
+|* Ersterstellung AMA 02. Dec. 97
+|* Letzte Aenderung AMA 02. Dec. 97
|*
|*************************************************************************/
void SwSectionFrm::Cut()
@@ -273,7 +273,7 @@ void SwSectionFrm::_Cut( BOOL bRemove )
while( pFrm && pFrm->IsSctFrm() && !((SwSectionFrm*)pFrm)->GetSection() )
pFrm = pFrm->GetNext();
if( pFrm )
- { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
+ { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
//berechnet der ist jetzt wo er der erste wird obsolete
pFrm->_InvalidatePrt();
pFrm->_InvalidatePos();
@@ -291,7 +291,7 @@ void SwSectionFrm::_Cut( BOOL bRemove )
InvalidateNextPos();
//Einer muss die Retusche uebernehmen: Vorgaenger oder Upper
if ( 0 != (pFrm = GetPrev()) )
- { pFrm->SetRetouche();
+ { pFrm->SetRetouche();
pFrm->Prepare( PREP_WIDOWS_ORPHANS );
if ( pFrm->IsCntntFrm() )
pFrm->InvalidatePage( pPage );
@@ -300,7 +300,7 @@ void SwSectionFrm::_Cut( BOOL bRemove )
//er die Retouche uebernehmen.
//Ausserdem kann eine Leerseite entstanden sein.
else
- { SwRootFrm *pRoot = (SwRootFrm*)pPage->GetUpper();
+ { SwRootFrm *pRoot = (SwRootFrm*)pPage->GetUpper();
pRoot->SetSuperfluous();
GetUpper()->SetCompletePaint();
}
@@ -338,10 +338,10 @@ void SwSectionFrm::_Cut( BOOL bRemove )
/*************************************************************************
|*
-|* SwSectionFrm::Paste()
+|* SwSectionFrm::Paste()
|*
-|* Ersterstellung AMA 04. Dec. 97
-|* Letzte Aenderung AMA 04. Dec. 97
+|* Ersterstellung AMA 04. Dec. 97
+|* Letzte Aenderung AMA 04. Dec. 97
|*
|*************************************************************************/
@@ -449,15 +449,15 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
/*************************************************************************
|*
-|* SwSectionFrm::HasToBreak()
+|* SwSectionFrm::HasToBreak()
|*
|* Hier wird entschieden, ob der this-SectionFrm den uebergebenen
|* (Section)Frm aufbrechen soll oder nicht.
|* Zunaechst werden uebergeordnete Bereiche immer aufgebrochen,
|* spaeter koennte man es einstellbar machen.
|*
-|* Ersterstellung AMA 12. Dec. 97
-|* Letzte Aenderung AMA 12. Dec. 97
+|* Ersterstellung AMA 12. Dec. 97
+|* Letzte Aenderung AMA 12. Dec. 97
|*
|*************************************************************************/
@@ -467,8 +467,8 @@ BOOL SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
return FALSE;
SwSectionFmt *pTmp = (SwSectionFmt*)GetFmt();
-// if( !pTmp->GetSect().GetValue() )
-// return FALSE;
+// if( !pTmp->GetSect().GetValue() )
+// return FALSE;
const SwFrmFmt *pOtherFmt = ((SwSectionFrm*)pFrm)->GetFmt();
do
@@ -478,15 +478,15 @@ BOOL SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
return FALSE;
if( pTmp == pOtherFmt )
return TRUE;
- } while( TRUE ); // ( pTmp->GetSect().GetValue() );
+ } while( TRUE ); // ( pTmp->GetSect().GetValue() );
}
/*************************************************************************
|*
-|* SwSectionFrm::MergeNext()
+|* SwSectionFrm::MergeNext()
|*
-|* Ersterstellung AMA 04. Dec. 97
-|* Letzte Aenderung AMA 04. Dec. 97
+|* Ersterstellung AMA 04. Dec. 97
+|* Letzte Aenderung AMA 04. Dec. 97
|*
|* Verschmilzt zwei SectionFrms, falls es sich um den
|* gleichen Bereich handelt.
@@ -532,10 +532,10 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt )
/*************************************************************************
|*
-|* SwSectionFrm::SplitSect()
+|* SwSectionFrm::SplitSect()
|*
-|* Ersterstellung AMA 29. Apr. 99
-|* Letzte Aenderung AMA 29. Apr. 99
+|* Ersterstellung AMA 29. Apr. 99
+|* Letzte Aenderung AMA 29. Apr. 99
|*
|* Zerteilt einen SectionFrm in zwei Teile, der zweite Teil beginnt mit dem
|* uebergebenen Frame.
@@ -558,7 +558,7 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres )
SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm );
OSL_ENSURE( pSav, "SplitSect: What's on?" );
if( pSav ) // Robust
- { // Einen neuen SctFrm anlegen, nicht als Follow/Master
+ { // Einen neuen SctFrm anlegen, nicht als Follow/Master
SwSectionFrm* pNew = new SwSectionFrm( *pSect->GetSection() );
pNew->InsertBehind( pSect->GetUpper(), pSect );
pNew->Init();
@@ -588,10 +588,10 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres )
/*************************************************************************
|*
-|* SwSectionFrm::MoveCntntAndDelete()
+|* SwSectionFrm::MoveCntntAndDelete()
|*
-|* Ersterstellung AMA 29. Jan 99
-|* Letzte Aenderung AMA 29. Jan 99
+|* Ersterstellung AMA 29. Jan 99
+|* Letzte Aenderung AMA 29. Jan 99
|*
|* MoveCntnt wird zur Zerstoerung eines SectionFrms wg. Aufhebung oder
|* Verstecken des Bereichs gerufen, um den Inhalt umzuhaengen.
@@ -723,7 +723,7 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave )
pDel->DelEmpty( TRUE );
delete pDel;
if( pParent )
- { // Hier wird die geeignete Einfuegeposition gesucht
+ { // Hier wird die geeignete Einfuegeposition gesucht
if( pNxtSct && pNxtSct->GetFmt() == pParent )
{ // Hier koennen wir uns am Anfang einfuegen
pUp = FIRSTLEAF( pNxtSct );
@@ -747,7 +747,7 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave )
else
{
if( pSave )
- { // Folgende Situationen: Vor und hinter dem zu loeschenden Bereich
+ { // Folgende Situationen: Vor und hinter dem zu loeschenden Bereich
// ist entweder die Bereichsgrenze des umfassenden Bereichs oder
// es schliesst ein anderer (Geschwister-)Bereich direkt an, der
// vom gleichen Parent abgeleitet ist.
@@ -801,7 +801,7 @@ void SwSectionFrm::MakeAll()
bValidSize = bValidPos = bValidPrtArea = TRUE;
return;
}
- LockJoin(); //Ich lass mich nicht unterwegs vernichten.
+ LockJoin(); //Ich lass mich nicht unterwegs vernichten.
while( GetNext() && GetNext() == GetFollow() )
{
@@ -940,10 +940,10 @@ BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const
/*************************************************************************
*
- * SwSectionFrm::CollectEndnotes( )
+ * SwSectionFrm::CollectEndnotes( )
*
- * Ersterstellung AMA 03. Nov 99
- * Letzte Aenderung AMA 03. Nov 99
+ * Ersterstellung AMA 03. Nov 99
+ * Letzte Aenderung AMA 03. Nov 99
*
* CollectEndnotes looks for endnotes in the sectionfrm and his follows,
* the endnotes will cut off the layout and put into the array.
@@ -1009,7 +1009,7 @@ void lcl_ColumnRefresh( SwSectionFrm* pSect, BOOL bFollow )
{
SwColumnFrm *pCol = (SwColumnFrm*)pSect->Lower();
do
- { pCol->_InvalidateSize();
+ { pCol->_InvalidateSize();
pCol->_InvalidatePos();
((SwLayoutFrm*)pCol)->Lower()->_InvalidateSize();
pCol->Calc(); // calculation of column and
@@ -1046,13 +1046,13 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter )
/*************************************************************************
|*
-|* SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize )
+|* SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize )
|*
-|* Beschreibung: Passt die Groesse an die Umgebung an.
-|* Wer einen Follow oder Fussnoten besitzt, soll bis zur Unterkante
+|* Beschreibung: Passt die Groesse an die Umgebung an.
+|* Wer einen Follow oder Fussnoten besitzt, soll bis zur Unterkante
|* des Uppers gehen (bMaximize).
-|* Niemand darf ueber den Upper hinausgehen, ggf. darf man versuchen (bGrow)
-|* seinen Upper zu growen.
+|* Niemand darf ueber den Upper hinausgehen, ggf. darf man versuchen (bGrow)
+|* seinen Upper zu growen.
|* Wenn die Groesse veraendert werden musste, wird der Inhalt kalkuliert.
|*
|*************************************************************************/
@@ -1323,11 +1323,11 @@ class ExtraFormatToPositionObjs
/*************************************************************************
|*
-|* SwSectionFrm::Format()
+|* SwSectionFrm::Format()
|*
-|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
-|* Ersterstellung AMA 03. Dec. 97
-|* Letzte Aenderung MA 09. Oct. 98
+|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
+|* Ersterstellung AMA 03. Dec. 97
+|* Letzte Aenderung MA 09. Oct. 98
|*
|*************************************************************************/
@@ -1554,13 +1554,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
/*************************************************************************
|*
-|* SwFrm::GetNextSctLeaf()
+|* SwFrm::GetNextSctLeaf()
|*
-|* Beschreibung Liefert das naechste Layoutblatt in das der Frame
-|* gemoved werden kann.
-|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist.
-|* Ersterstellung AMA 07. Jan. 98
-|* Letzte Aenderung AMA 07. Jan. 98
+|* Beschreibung Liefert das naechste Layoutblatt in das der Frame
+|* gemoved werden kann.
+|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist.
+|* Ersterstellung AMA 07. Jan. 98
+|* Letzte Aenderung AMA 07. Jan. 98
|*
|*************************************************************************/
@@ -1585,7 +1585,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
//MA 03. Feb. 99: Warum GetUpper()? Das knallt mit Buch.sgl weil im
//FlyAtCnt::MakeFlyPos ein Orient der SectionFrm ist und auf diesen ein
//GetLeaf gerufen wird.
-// SwSectionFrm *pSect = GetUpper()->FindSctFrm();
+// SwSectionFrm *pSect = GetUpper()->FindSctFrm();
SwSectionFrm *pSect = FindSctFrm();
BOOL bWrongPage = FALSE;
OSL_ENSURE( pSect, "GetNextSctLeaf: Missing SectionFrm" );
@@ -1659,7 +1659,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
}
}
- SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten
+ SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten
//nicht wieder vom Anfang gesucht
//wird.
@@ -1672,7 +1672,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
// oder ob wir weitersuchen muessen.
SwPageFrm* pNxtPg = pLayLeaf->FindPageFrm();
if ( !bFtnPage && pNxtPg->IsFtnPage() )
- { //Wenn ich bei den Endnotenseiten angelangt bin hat sichs.
+ { //Wenn ich bei den Endnotenseiten angelangt bin hat sichs.
pLayLeaf = 0;
continue;
}
@@ -1726,7 +1726,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
// Auch hier muessen zum Loeschen angemeldete SectionFrms ignoriert werden
while( pFirst && pFirst->IsSctFrm() && !((SwSectionFrm*)pFirst)->GetSection() )
pFirst = pFirst->GetNext();
- if( pFirst && pFirst->IsSctFrm() && pSect->GetFollow() == pFirst )
+ if( pFirst && pFirst->IsSctFrm() && pSect->GetFollow() == pFirst )
pNew = pSect->GetFollow();
else if( MAKEPAGE_NOSECTION == eMakePage )
return pLayLeaf;
@@ -1792,12 +1792,12 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
/*************************************************************************
|*
-|* SwFrm::GetPrevSctLeaf()
+|* SwFrm::GetPrevSctLeaf()
|*
-|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
-|* Frame gemoved werden kann.
-|* Ersterstellung AMA 07. Jan. 98
-|* Letzte Aenderung AMA 07. Jan. 98
+|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
+|* Frame gemoved werden kann.
+|* Ersterstellung AMA 07. Jan. 98
+|* Letzte Aenderung AMA 07. Jan. 98
|*
|*************************************************************************/
@@ -1825,7 +1825,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
// Gibt es dort Inhalt?
if( ((SwLayoutFrm*)pCol->Lower())->Lower() )
{
- if( bJump ) // Haben wir eine leere Spalte uebersprungen?
+ if( bJump ) // Haben wir eine leere Spalte uebersprungen?
SwFlowFrm::SetMoveBwdJump( TRUE );
return (SwLayoutFrm*)pCol->Lower(); // Der Spaltenbody
}
@@ -1840,7 +1840,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
pCol = NULL;
}
- if( bJump ) // Haben wir eine leere Spalte uebersprungen?
+ if( bJump ) // Haben wir eine leere Spalte uebersprungen?
SwFlowFrm::SetMoveBwdJump( TRUE );
// Innerhalb von Bereichen in Tabellen oder Bereichen in Kopf/Fusszeilen kann
@@ -1922,7 +1922,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
SwFlowFrm::SetMoveBwdJump( TRUE );
}
else if ( bFly )
- break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein. Warum?
+ break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein. Warum?
else
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
}
@@ -2025,10 +2025,10 @@ BOOL SwSectionFrm::Growable() const
/*************************************************************************
|*
-|* SwSectionFrm::_Grow(), _Shrink()
+|* SwSectionFrm::_Grow(), _Shrink()
|*
-|* Ersterstellung AMA 14. Jan. 98
-|* Letzte Aenderung AMA 14. Jan. 98
+|* Ersterstellung AMA 14. Jan. 98
+|* Letzte Aenderung AMA 14. Jan. 98
|*
|*************************************************************************/
@@ -2164,7 +2164,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst )
if ( Lower()->IsColumnFrm() && Lower()->GetNext() && // FtnAtEnd
!GetSection()->GetFmt()->GetBalancedColumns().GetValue() )
- { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
+ { //Bei Spaltigkeit ubernimmt das Format die Kontrolle ueber
//das Wachstum (wg. des Ausgleichs).
if ( !bTst )
InvalidateSize();
@@ -2231,22 +2231,22 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst )
/*************************************************************************
|*
-|* SwSectionFrm::MoveAllowed()
+|* SwSectionFrm::MoveAllowed()
|*
-|* Ersterstellung MA 08. Oct. 98
-|* Letzte Aenderung MA 08. Oct. 98
+|* Ersterstellung MA 08. Oct. 98
+|* Letzte Aenderung MA 08. Oct. 98
|*
-|* Wann sind Frms innerhalb eines SectionFrms moveable?
+|* Wann sind Frms innerhalb eines SectionFrms moveable?
|* Wenn sie noch nicht in der letzten Spalte des SectionFrms sind,
-|* wenn es einen Follow gibt,
+|* wenn es einen Follow gibt,
|* wenn der SectionFrm nicht mehr wachsen kann, wird es komplizierter,
|* dann kommt es darauf an, ob der SectionFrm ein naechstes Layoutblatt
|* finden kann. In (spaltigen/verketteten) Flys wird dies via GetNextLayout
-|* geprueft, in Tabellen und in Kopf/Fusszeilen gibt es keins, im DocBody
+|* geprueft, in Tabellen und in Kopf/Fusszeilen gibt es keins, im DocBody
|* und auch im Fussnoten dagegen immer.
|*
|* Benutzt wird diese Routine im TxtFormatter, um zu entscheiden, ob ein
-|* (Absatz-)Follow erzeugt werden darf oder ob der Absatz zusammenhalten muss.
+|* (Absatz-)Follow erzeugt werden darf oder ob der Absatz zusammenhalten muss.
|*
|*************************************************************************/
@@ -2292,7 +2292,7 @@ BOOL SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
}
}
// Oder kann der Bereich noch wachsen?
- if( !IsColLocked() && Growable() )
+ if( !IsColLocked() && Growable() )
return FALSE;
// Jetzt muss untersucht werden, ob es ein Layoutblatt gibt, in dem
// ein Bereichsfollow erzeugt werden kann.
@@ -2357,7 +2357,7 @@ SwFrm* SwFrm::_GetIndNext()
if( pSct->IsSctFrm() )
return pSct->GetIndNext();
if( pSct->IsColBodyFrm() && (pSct = pSct->GetUpper()->GetUpper())->IsSctFrm() )
- { // Wir duerfen nur den Nachfolger des SectionFrms zurueckliefern,
+ { // Wir duerfen nur den Nachfolger des SectionFrms zurueckliefern,
// wenn in keiner folgenden Spalte mehr Inhalt ist
SwFrm* pCol = GetUpper()->GetUpper()->GetNext();
while( pCol )
@@ -2433,10 +2433,10 @@ void SwSectionFrm::CalcEndAtEndFlag()
/*************************************************************************
|*
-|* SwSectionFrm::Modify()
+|* SwSectionFrm::Modify()
|*
-|* Ersterstellung MA 08. Oct. 98
-|* Letzte Aenderung MA 08. Oct. 98
+|* Ersterstellung MA 08. Oct. 98
+|* Letzte Aenderung MA 08. Oct. 98
|*
|*************************************************************************/
@@ -2498,7 +2498,7 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
USHORT nCol = 0;
SwFrm *pTmp = Lower();
do
- { ++nCol;
+ { ++nCol;
pTmp = pTmp->GetNext();
} while ( pTmp );
aCol.Init( nCol, 0, 1000 );
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 5248c0a4785e..5dabb7923a51 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
const SwLayoutFrm *pRow = pFrm->GetUpper();
// Looking for the "most upper" row frame,
// skipping sub tables and/or table in table
- while( !pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm() ||
+ while( !pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm() ||
pRow->GetUpper()->GetUpper()->IsInTab() )
pRow = pRow->GetUpper();
const SwTabFrm *pTab = pRow->FindTabFrm();
@@ -140,7 +140,7 @@ bool SwTableLine::hasSoftPageBreak() const
// The row which could get a soft page break must be either the first
// row of a master table frame or the first "non-headline-row" of a
// follow table frame...
- const SwFrm* pRow = pTab->IsFollow() ?
+ const SwFrm* pRow = pTab->IsFollow() ?
pTab->GetFirstNonHeadlineRow() : pTab->Lower();
if( pRow == pLast )
{
diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx
index e984d278f4e7..cd88f95c8441 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx
index 10ed749e840b..25b1968fd879 100644
--- a/sw/source/core/layout/sortedobjsimpl.cxx
+++ b/sw/source/core/layout/sortedobjsimpl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 357844aacc4d..d801beffd71d 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@
#include <dcontact.hxx>
#include <dflyobj.hxx>
#include <flyfrm.hxx>
-#include <txtfrm.hxx> // ClearPara()
+#include <txtfrm.hxx> // ClearPara()
#include <cellfrm.hxx>
#include <swtable.hxx>
#include <fmtfsize.hxx>
@@ -359,10 +359,10 @@ Point SwFrm::GetFrmAnchorPos( sal_Bool bIgnoreFlysAnchoredAtThisFrame ) const
/*************************************************************************
|*
-|* SwFrm::~SwFrm()
+|* SwFrm::~SwFrm()
|*
-|* Ersterstellung MA 02. Mar. 94
-|* Letzte Aenderung MA 25. Jun. 95
+|* Ersterstellung MA 02. Mar. 94
+|* Letzte Aenderung MA 25. Jun. 95
|*
|*************************************************************************/
@@ -417,9 +417,9 @@ SwFrm::~SwFrm()
/*************************************************************************
|*
-|* SwLayoutFrm::SetFrmFmt()
-|* Ersterstellung MA 22. Apr. 93
-|* Letzte Aenderung MA 02. Nov. 94
+|* SwLayoutFrm::SetFrmFmt()
+|* Ersterstellung MA 22. Apr. 93
+|* Letzte Aenderung MA 02. Nov. 94
|*
|*************************************************************************/
@@ -489,10 +489,10 @@ SwCntntFrm::~SwCntntFrm()
/*************************************************************************
|*
-|* SwLayoutFrm::~SwLayoutFrm
+|* SwLayoutFrm::~SwLayoutFrm
|*
-|* Ersterstellung AK 28-Feb-1991
-|* Letzte Aenderung MA 11. Jan. 95
+|* Ersterstellung AK 28-Feb-1991
+|* Letzte Aenderung MA 11. Jan. 95
|*
|*************************************************************************/
@@ -583,10 +583,10 @@ SwLayoutFrm::~SwLayoutFrm()
/*************************************************************************
|*
-|* SwFrm::PaintArea()
+|* SwFrm::PaintArea()
|*
-|* Created AMA 08/22/2000
-|* Last change AMA 08/23/2000
+|* Created AMA 08/22/2000
+|* Last change AMA 08/23/2000
|*
|* The paintarea is the area, in which the content of a frame is allowed
|* to be displayed. This region could be larger than the printarea (Prt())
@@ -686,10 +686,10 @@ const SwRect SwFrm::PaintArea() const
/*************************************************************************
|*
-|* SwFrm::UnionFrm()
+|* SwFrm::UnionFrm()
|*
-|* Created AMA 08/22/2000
-|* Last change AMA 08/23/2000
+|* Created AMA 08/22/2000
+|* Last change AMA 08/23/2000
|*
|* The unionframe is the framearea (Frm()) of a frame expanded by the
|* printarea, if there's a negative margin at the left or right side.
diff --git a/sw/source/core/layout/swselectionlist.cxx b/sw/source/core/layout/swselectionlist.cxx
index e2997db0a6bc..aaf6a51f964b 100644
--- a/sw/source/core/layout/swselectionlist.cxx
+++ b/sw/source/core/layout/swselectionlist.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
*/
namespace {
-
+
/** Find the context of a given frame
A context is the environment where text is allowed to flow.
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 3bddaa473d05..1d966931e45e 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2,7 +2,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
@@ -69,9 +69,9 @@
#include "rowfrm.hxx"
#include "cellfrm.hxx"
#include "flyfrms.hxx"
-#include "txtfrm.hxx" //HasFtn()
+#include "txtfrm.hxx" //HasFtn()
#include "htmltbl.hxx"
-#include "sectfrm.hxx" //SwSectionFrm
+#include "sectfrm.hxx" //SwSectionFrm
// OD 30.09.2003 #i18732#
#include <fmtfollowtextflow.hxx>
// --> OD 2004-06-28 #i28701#
@@ -90,10 +90,10 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwTabFrm::SwTabFrm(), ~SwTabFrm()
+|* SwTabFrm::SwTabFrm(), ~SwTabFrm()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 30. May. 96
|*
|*************************************************************************/
SwTabFrm::SwTabFrm( SwTable &rTab ):
@@ -174,10 +174,10 @@ SwTabFrm::~SwTabFrm()
/*************************************************************************
|*
-|* SwTabFrm::JoinAndDelFollows()
+|* SwTabFrm::JoinAndDelFollows()
|*
-|* Ersterstellung MA 30. May. 96
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 30. May. 96
+|* Letzte Aenderung MA 30. May. 96
|*
|*************************************************************************/
void SwTabFrm::JoinAndDelFollows()
@@ -192,10 +192,10 @@ void SwTabFrm::JoinAndDelFollows()
/*************************************************************************
|*
-|* SwTabFrm::RegistFlys()
+|* SwTabFrm::RegistFlys()
|*
-|* Ersterstellung MA 08. Jul. 93
-|* Letzte Aenderung MA 27. Jan. 99
+|* Ersterstellung MA 08. Jul. 93
+|* Letzte Aenderung MA 27. Jan. 99
|*
|*************************************************************************/
void SwTabFrm::RegistFlys()
@@ -1042,10 +1042,10 @@ bool lcl_FindSectionsInRow( const SwRowFrm& rRow )
/*************************************************************************
|*
-|* SwTabFrm::Split(), Join()
+|* SwTabFrm::Split(), Join()
|*
-|* Ersterstellung MA 03. Jun. 93
-|* Letzte Aenderung MA 03. Sep. 96
+|* Ersterstellung MA 03. Jun. 93
+|* Letzte Aenderung MA 03. Sep. 96
|*
|*************************************************************************/
bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep )
@@ -1413,12 +1413,12 @@ bool SwTabFrm::Join()
OSL_ENSURE( !HasFollowFlowLine(), "Joining follow flow line" );
SwTabFrm *pFoll = GetFollow();
- SwTwips nHeight = 0; //Gesamthoehe der eingefuegten Zeilen als Return.
+ SwTwips nHeight = 0; //Gesamthoehe der eingefuegten Zeilen als Return.
if ( !pFoll->IsJoinLocked() )
{
SWRECTFN( this )
- pFoll->Cut(); //Erst ausschneiden um unuetze Benachrichtigungen zu
+ pFoll->Cut(); //Erst ausschneiden um unuetze Benachrichtigungen zu
//minimieren.
SwFrm *pRow = pFoll->GetFirstNonHeadlineRow(),
@@ -1450,10 +1450,10 @@ bool SwTabFrm::Join()
/*************************************************************************
|*
-|* SwTabFrm::MakeAll()
+|* SwTabFrm::MakeAll()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 10. Apr. 97
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 10. Apr. 97
|*
|*************************************************************************/
void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom )
@@ -1462,7 +1462,7 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom )
BOOL bAll = LONG_MAX == nBottom;
SWRECTFN( pFrm )
do
- { pFrm->_InvalidatePos();
+ { pFrm->_InvalidatePos();
pFrm->_InvalidateSize();
if( pFrm->IsLayoutFrm() )
{
@@ -1905,7 +1905,7 @@ void SwTabFrm::MakeAll()
PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
LockJoin(); //Ich lass mich nicht unterwegs vernichten.
- SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung
+ SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung
// If pos is invalid, we have to call a SetInvaKeep at aNotify.
// Otherwise the keep atribute would not work in front of a table.
const BOOL bOldValidPos = GetValidPosFlag();
@@ -1935,7 +1935,7 @@ void SwTabFrm::MakeAll()
SetRemoveFollowFlowLinePending( FALSE );
}
- if ( bResizeHTMLTable ) //Optimiertes Zusammenspiel mit Grow/Shrink des Inhaltes
+ if ( bResizeHTMLTable ) //Optimiertes Zusammenspiel mit Grow/Shrink des Inhaltes
{
bResizeHTMLTable = FALSE;
SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
@@ -1945,16 +1945,16 @@ void SwTabFrm::MakeAll()
}
- BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite
+ BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite
//angelegt werden (genau einmal)
- BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst
- BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck-
+ BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst
+ BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck-
//fliessen (solange, bis er einmal
//vorwaerts ge'moved wurde).
- BOOL bSplit = FALSE; //Wird TRUE wenn der Frm gesplittet wurde.
+ BOOL bSplit = FALSE; //Wird TRUE wenn der Frm gesplittet wurde.
const BOOL bFtnsInDoc = 0 != GetFmt()->GetDoc()->GetFtnIdxs().Count();
BOOL bMoveable;
- const BOOL bFly = IsInFly();
+ const BOOL bFly = IsInFly();
SwBorderAttrAccess *pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
const SwBorderAttrs *pAttrs = pAccess->Get();
@@ -2109,7 +2109,7 @@ void SwTabFrm::MakeAll()
delete pAccess;
bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrm( *this ), FALSE );
-// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE );
+// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE );
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
pAttrs = pAccess->Get();
}
@@ -2679,7 +2679,7 @@ void SwTabFrm::MakeAll()
bMovedFwd = bCalcLowers = TRUE;
aNotify.SetLowersComplete( FALSE );
if ( IsFollow() )
- { //Um Oszillationen zu vermeiden sollte kein ungueltiger Master
+ { //Um Oszillationen zu vermeiden sollte kein ungueltiger Master
//zurueckbleiben.
SwTabFrm *pTab = FindMaster();
if ( pTab->GetUpper() )
@@ -2746,12 +2746,12 @@ void SwTabFrm::MakeAll()
/*************************************************************************
|*
-|* SwTabFrm::CalcFlyOffsets()
+|* SwTabFrm::CalcFlyOffsets()
|*
-|* Beschreibung: Berechnet die Offsets, die durch FlyFrames
-|* entstehen.
-|* Ersterstellung MA/MIB 14. Apr. 99
-|* Letzte Aenderung
+|* Beschreibung: Berechnet die Offsets, die durch FlyFrames
+|* entstehen.
+|* Ersterstellung MA/MIB 14. Apr. 99
+|* Letzte Aenderung
|*
|*************************************************************************/
BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
@@ -2875,7 +2875,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
nPrtPos = nBottom;
bInvalidatePrtArea = TRUE;
}
- if ( (SURROUND_RIGHT == rSur.GetSurround() ||
+ if ( (SURROUND_RIGHT == rSur.GetSurround() ||
SURROUND_PARALLEL == rSur.GetSurround())&&
text::HoriOrientation::LEFT == rHori.GetHoriOrient() )
{
@@ -2885,7 +2885,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
rLeftOffset = Max( rLeftOffset, nWidth );
bInvalidatePrtArea = TRUE;
}
- if ( (SURROUND_LEFT == rSur.GetSurround() ||
+ if ( (SURROUND_LEFT == rSur.GetSurround() ||
SURROUND_PARALLEL == rSur.GetSurround())&&
text::HoriOrientation::RIGHT == rHori.GetHoriOrient() )
{
@@ -2906,12 +2906,12 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
/*************************************************************************
|*
-|* SwTabFrm::Format()
+|* SwTabFrm::Format()
|*
-|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea
-|* Die Fixsize wird hier nicht eingestellt.
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 18. Jun. 97
+|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea
+|* Die Fixsize wird hier nicht eingestellt.
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 18. Jun. 97
|*
|*************************************************************************/
void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
@@ -2937,7 +2937,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
//1. Es gibt Rahmen mit SurroundNone, diesen wird vollsaendig ausgewichen
//2. Es gibt Rahmen mit Umlauf nur rechts bzw. nur links und diese sind
// rechts bzw. links ausgerichtet, diese geben ein Minimum fuer die
- // Raender vor.
+ // Raender vor.
long nTmpRight = -1000000,
nLeftOffset = 0;
if( CalcFlyOffsets( nUpper, nLeftOffset, nTmpRight ) )
@@ -2951,7 +2951,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
// <-- collapsing
if ( !bValidPrtArea )
- { bValidPrtArea = TRUE;
+ { bValidPrtArea = TRUE;
//Die Breite der PrtArea wird vom FrmFmt vorgegeben, die Raender
//sind entsprechend einzustellen.
@@ -3181,10 +3181,10 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
}
/*************************************************************************
|*
-|* SwTabFrm::GrowFrm()
+|* SwTabFrm::GrowFrm()
|*
-|* Ersterstellung MA 12. Mar. 93
-|* Letzte Aenderung MA 23. Sep. 96
+|* Ersterstellung MA 12. Mar. 93
+|* Letzte Aenderung MA 23. Sep. 96
|*
|*************************************************************************/
SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -3268,10 +3268,10 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
}
/*************************************************************************
|*
-|* SwTabFrm::Modify()
+|* SwTabFrm::Modify()
|*
-|* Ersterstellung MA 14. Mar. 93
-|* Letzte Aenderung MA 06. Dec. 96
+|* Ersterstellung MA 14. Mar. 93
+|* Letzte Aenderung MA 06. Dec. 96
|*
|*************************************************************************/
void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
@@ -3305,8 +3305,8 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
{
SwPageFrm *pPage = FindPageFrm();
InvalidatePage( pPage );
-// if ( nInvFlags & 0x01 )
-// SetCompletePaint();
+// if ( nInvFlags & 0x01 )
+// SetCompletePaint();
if ( nInvFlags & 0x02 )
_InvalidatePrt();
if ( nInvFlags & 0x40 )
@@ -3377,7 +3377,7 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
rInvFlags |= 0x22;
break;
- case RES_PAGEDESC: //Attributaenderung (an/aus)
+ case RES_PAGEDESC: //Attributaenderung (an/aus)
if ( IsInDocBody() )
{
rInvFlags |= 0x40;
@@ -3430,10 +3430,10 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
/*************************************************************************
|*
-|* SwTabFrm::GetInfo()
+|* SwTabFrm::GetInfo()
|*
-|* Ersterstellung MA 06. Dec. 96
-|* Letzte Aenderung MA 26. Jun. 98
+|* Ersterstellung MA 06. Dec. 96
+|* Letzte Aenderung MA 26. Jun. 98
|*
|*************************************************************************/
BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
@@ -3447,7 +3447,7 @@ BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
if ( pPage == rInfo.GetOrigPage() && !GetPrev() )
{
//Das sollte er sein (kann allenfalls temporaer anders sein,
- // sollte uns das beunruhigen?)
+ // sollte uns das beunruhigen?)
rInfo.SetInfo( pPage, this );
return FALSE;
}
@@ -3464,10 +3464,10 @@ BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
/*************************************************************************
|*
-|* SwTabFrm::FindLastCntnt()
+|* SwTabFrm::FindLastCntnt()
|*
-|* Ersterstellung MA 13. Apr. 93
-|* Letzte Aenderung MA 15. May. 98
+|* Ersterstellung MA 13. Apr. 93
+|* Letzte Aenderung MA 15. May. 98
|*
|*************************************************************************/
SwCntntFrm *SwTabFrm::FindLastCntnt()
@@ -3542,10 +3542,10 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
/*************************************************************************
|*
-|* SwTabFrm::GetLeaf()
+|* SwTabFrm::GetLeaf()
|*
-|* Ersterstellung MA 19. Mar. 93
-|* Letzte Aenderung MA 25. Apr. 95
+|* Ersterstellung MA 19. Mar. 93
+|* Letzte Aenderung MA 25. Apr. 95
|*
|*************************************************************************/
SwLayoutFrm *SwTabFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd )
@@ -3566,11 +3566,11 @@ SwLayoutFrm *SwTabFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd )
/*************************************************************************
|*
-|* SwTabFrm::ShouldBwdMoved()
+|* SwTabFrm::ShouldBwdMoved()
|*
-|* Beschreibung Returnwert sagt ob der Frm verschoben werden sollte
-|* Ersterstellung MA 10. Jul. 95
-|* Letzte Aenderung MA 04. Mar. 97
+|* Beschreibung Returnwert sagt ob der Frm verschoben werden sollte
+|* Ersterstellung MA 10. Jul. 95
+|* Letzte Aenderung MA 04. Mar. 97
|*
|*************************************************************************/
BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat )
@@ -3677,10 +3677,10 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat )
/*************************************************************************
|*
-|* SwTabFrm::Cut()
+|* SwTabFrm::Cut()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 09. Sep. 98
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 09. Sep. 98
|*
|*************************************************************************/
void SwTabFrm::Cut()
@@ -3691,7 +3691,7 @@ void SwTabFrm::Cut()
InvalidatePage( pPage );
SwFrm *pFrm = GetNext();
if( pFrm )
- { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
+ { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
//berechnet der ist jetzt wo er der erste wird obsolete
pFrm->_InvalidatePrt();
pFrm->_InvalidatePos();
@@ -3712,7 +3712,7 @@ void SwTabFrm::Cut()
InvalidateNextPos();
//Einer muss die Retusche uebernehmen: Vorgaenger oder Upper
if ( 0 != (pFrm = GetPrev()) )
- { pFrm->SetRetouche();
+ { pFrm->SetRetouche();
pFrm->Prepare( PREP_WIDOWS_ORPHANS );
pFrm->_InvalidatePos();
if ( pFrm->IsCntntFrm() )
@@ -3722,7 +3722,7 @@ void SwTabFrm::Cut()
//er die Retouche uebernehmen.
//Ausserdem kann eine Leerseite entstanden sein.
else
- { SwRootFrm *pRoot = (SwRootFrm*)pPage->GetUpper();
+ { SwRootFrm *pRoot = (SwRootFrm*)pPage->GetUpper();
pRoot->SetSuperfluous();
GetUpper()->SetCompletePaint();
if( IsInSct() )
@@ -3772,10 +3772,10 @@ void SwTabFrm::Cut()
/*************************************************************************
|*
-|* SwTabFrm::Paste()
+|* SwTabFrm::Paste()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 09. Sep. 98
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 09. Sep. 98
|*
|*************************************************************************/
void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
@@ -3857,10 +3857,10 @@ void SwTabFrm::Prepare( const PrepareHint eHint, const void *, BOOL )
/*************************************************************************
|*
-|* SwRowFrm::SwRowFrm(), ~SwRowFrm()
+|* SwRowFrm::SwRowFrm(), ~SwRowFrm()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 30. May. 96
|*
|*************************************************************************/
SwRowFrm::SwRowFrm( const SwTableLine &rLine, bool bInsertContent ):
@@ -3896,18 +3896,18 @@ SwRowFrm::~SwRowFrm()
SwModify* pMod = GetFmt();
if( pMod )
{
- pMod->Remove( this ); // austragen,
+ pMod->Remove( this ); // austragen,
if( !pMod->GetDepends() )
- delete pMod; // und loeschen
+ delete pMod; // und loeschen
}
}
/*************************************************************************
|*
-|* SwRowFrm::RegistFlys()
+|* SwRowFrm::RegistFlys()
|*
-|* Ersterstellung MA 08. Jul. 93
-|* Letzte Aenderung MA 08. Jul. 93
+|* Ersterstellung MA 08. Jul. 93
+|* Letzte Aenderung MA 08. Jul. 93
|*
|*************************************************************************/
void SwRowFrm::RegistFlys( SwPageFrm *pPage )
@@ -3917,10 +3917,10 @@ void SwRowFrm::RegistFlys( SwPageFrm *pPage )
/*************************************************************************
|*
-|* SwRowFrm::Modify()
+|* SwRowFrm::Modify()
|*
-|* Ersterstellung MA 12. Nov. 97
-|* Letzte Aenderung MA 12. Nov. 97
+|* Ersterstellung MA 12. Nov. 97
+|* Letzte Aenderung MA 12. Nov. 97
|*
|*************************************************************************/
void SwRowFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
@@ -3964,10 +3964,10 @@ void SwRowFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
/*************************************************************************
|*
-|* SwRowFrm::MakeAll()
+|* SwRowFrm::MakeAll()
|*
-|* Ersterstellung MA 01. Mar. 94
-|* Letzte Aenderung MA 01. Mar. 94
+|* Ersterstellung MA 01. Mar. 94
+|* Letzte Aenderung MA 01. Mar. 94
|*
|*************************************************************************/
void SwRowFrm::MakeAll()
@@ -3979,10 +3979,10 @@ void SwRowFrm::MakeAll()
/*************************************************************************
|*
-|* SwRowFrm::Format()
+|* SwRowFrm::Format()
|*
-|* Ersterstellung MA 13. Mar. 93
-|* Letzte Aenderung MA 20. Jun. 96
+|* Ersterstellung MA 13. Mar. 93
+|* Letzte Aenderung MA 20. Jun. 96
|*
|*************************************************************************/
long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm )
@@ -4510,10 +4510,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
/*************************************************************************
|*
-|* SwRowFrm::AdjustCells()
+|* SwRowFrm::AdjustCells()
|*
-|* Ersterstellung MA 10. Aug. 93
-|* Letzte Aenderung MA 16. Dec. 96
+|* Ersterstellung MA 10. Aug. 93
+|* Letzte Aenderung MA 16. Dec. 96
|*
|*************************************************************************/
void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight )
@@ -4603,7 +4603,7 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight )
}
}
else
- { while ( pFrm )
+ { while ( pFrm )
{
pFrm->_InvalidateAll();
pFrm = pFrm->GetNext();
@@ -4614,10 +4614,10 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight )
/*************************************************************************
|*
-|* SwRowFrm::Cut()
+|* SwRowFrm::Cut()
|*
-|* Ersterstellung MA 12. Nov. 97
-|* Letzte Aenderung MA 12. Nov. 97
+|* Ersterstellung MA 12. Nov. 97
+|* Letzte Aenderung MA 12. Nov. 97
|*
|*************************************************************************/
void SwRowFrm::Cut()
@@ -4656,10 +4656,10 @@ void SwRowFrm::Cut()
/*************************************************************************
|*
-|* SwRowFrm::GrowFrm()
+|* SwRowFrm::GrowFrm()
|*
-|* Ersterstellung MA 15. Mar. 93
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung MA 15. Mar. 93
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
@@ -4732,10 +4732,10 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwRowFrm::ShrinkFrm()
+|* SwRowFrm::ShrinkFrm()
|*
-|* Ersterstellung MA 15. Mar. 93
-|* Letzte Aenderung MA 20. Jun. 96
+|* Ersterstellung MA 15. Mar. 93
+|* Letzte Aenderung MA 20. Jun. 96
|*
|*************************************************************************/
SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -4875,10 +4875,10 @@ bool SwRowFrm::ShouldRowKeepWithNext() const
/*************************************************************************
|*
-|* SwCellFrm::SwCellFrm(), ~SwCellFrm()
+|* SwCellFrm::SwCellFrm(), ~SwCellFrm()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 30. May. 96
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 30. May. 96
|*
|*************************************************************************/
SwCellFrm::SwCellFrm( const SwTableBox &rBox, bool bInsertContent ) :
@@ -4927,16 +4927,16 @@ SwCellFrm::~SwCellFrm()
pMod->Remove( this ); // austragen,
if( !pMod->GetDepends() )
- delete pMod; // und loeschen
+ delete pMod; // und loeschen
}
}
/*************************************************************************
|*
-|* SwCellFrm::Format()
+|* SwCellFrm::Format()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 29. Jan. 98
+|* Ersterstellung MA 09. Mar. 93
+|* Letzte Aenderung MA 29. Jan. 98
|*
|*************************************************************************/
BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva )
@@ -5436,10 +5436,10 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
/*************************************************************************
|*
-|* SwCellFrm::Modify()
+|* SwCellFrm::Modify()
|*
-|* Ersterstellung MA 20. Dec. 96
-|* Letzte Aenderung MA 20. Dec. 96
+|* Ersterstellung MA 20. Dec. 96
+|* Letzte Aenderung MA 20. Dec. 96
|*
|*************************************************************************/
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 36dfbb3b9fce..41867fa24402 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2,7 +2,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
@@ -105,12 +105,12 @@ static SwCrsrOszControl aOszCtrl = { 0, 0, 0 };
/*************************************************************************
|*
-|* SwLayoutFrm::GetCrsrOfst()
+|* SwLayoutFrm::GetCrsrOfst()
|*
-|* Beschreibung: Sucht denjenigen CntntFrm, innerhalb dessen
-|* PrtArea der Point liegt.
-|* Ersterstellung MA 20. Jul. 92
-|* Letzte Aenderung MA 23. May. 95
+|* Beschreibung: Sucht denjenigen CntntFrm, innerhalb dessen
+|* PrtArea der Point liegt.
+|* Ersterstellung MA 20. Jul. 92
+|* Letzte Aenderung MA 23. May. 95
|*
|*************************************************************************/
BOOL SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
@@ -142,19 +142,19 @@ BOOL SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
/*************************************************************************
|*
-|* SwPageFrm::GetCrsrOfst()
+|* SwPageFrm::GetCrsrOfst()
|*
-|* Beschreibung: Sucht die Seite, innerhalb der der gesuchte Point
-|* liegt.
-|* Ersterstellung MA 20. Jul. 92
-|* Letzte Aenderung MA 18. Jul. 96
+|* Beschreibung: Sucht die Seite, innerhalb der der gesuchte Point
+|* liegt.
+|* Ersterstellung MA 20. Jul. 92
+|* Letzte Aenderung MA 18. Jul. 96
|*
|*************************************************************************/
BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS ) const
{
- BOOL bRet = FALSE;
+ BOOL bRet = FALSE;
Point aPoint( rPoint );
// check, if we have to adjust the point
@@ -291,13 +291,13 @@ bool SwRootFrm::FillSelection( SwSelectionList& aSelList, const SwRect& rRect) c
/*************************************************************************
|*
-|* SwRootFrm::GetCrsrOfst()
+|* SwRootFrm::GetCrsrOfst()
|*
-|* Beschreibung: Reicht Primaer den Aufruf an die erste Seite weiter.
-|* Wenn der 'reingereichte Point veraendert wird,
-|* so wird FALSE zurueckgegeben.
-|* Ersterstellung MA 01. Jun. 92
-|* Letzte Aenderung MA 30. Nov. 94
+|* Beschreibung: Reicht Primaer den Aufruf an die erste Seite weiter.
+|* Wenn der 'reingereichte Point veraendert wird,
+|* so wird FALSE zurueckgegeben.
+|* Ersterstellung MA 01. Jun. 92
+|* Letzte Aenderung MA 30. Nov. 94
|*
|*************************************************************************/
BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
@@ -345,14 +345,14 @@ BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
/*************************************************************************
|*
-|* SwCellFrm::GetCrsrOfst()
+|* SwCellFrm::GetCrsrOfst()
|*
-|* Beschreibung Wenn es sich um eine Cntnt-tragende Cell handelt wird
-|* der Crsr notfalls mit Gewalt in einen der CntntFrms
-|* gesetzt.
-|* In geschuetzte Zellen gibt es hier keinen Eingang.
-|* Ersterstellung MA 04. Jun. 93
-|* Letzte Aenderung MA 23. May. 95
+|* Beschreibung Wenn es sich um eine Cntnt-tragende Cell handelt wird
+|* der Crsr notfalls mit Gewalt in einen der CntntFrms
+|* gesetzt.
+|* In geschuetzte Zellen gibt es hier keinen Eingang.
+|* Ersterstellung MA 04. Jun. 93
+|* Letzte Aenderung MA 23. May. 95
|*
|*************************************************************************/
BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
@@ -419,10 +419,10 @@ BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
/*************************************************************************
|*
-|* SwFlyFrm::GetCrsrOfst()
+|* SwFlyFrm::GetCrsrOfst()
|*
-|* Ersterstellung MA 15. Dec. 92
-|* Letzte Aenderung MA 23. May. 95
+|* Ersterstellung MA 15. Dec. 92
+|* Letzte Aenderung MA 23. May. 95
|*
|*************************************************************************/
//Problem: Wenn zwei Flys genau gleich gross sind und auf derselben
@@ -515,9 +515,9 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
/*************************************************************************
|*
-|* Beschreibung Layoutabhaengiges Cursortravelling
-|* Ersterstellung MA 23. Jul. 92
-|* Letzte Aenderung MA 06. Sep. 93
+|* Beschreibung Layoutabhaengiges Cursortravelling
+|* Ersterstellung MA 23. Jul. 92
+|* Letzte Aenderung MA 06. Sep. 93
|*
|*************************************************************************/
BOOL SwCntntFrm::LeftMargin(SwPaM *pPam) const
@@ -755,13 +755,13 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
//verlassen.
else if ( pCnt )
{
- const SwFrm *pUp = pStart->GetUpper(); //Head/Foot
+ const SwFrm *pUp = pStart->GetUpper(); //Head/Foot
while ( pUp && pUp->GetUpper() && !(pUp->GetType() & 0x0018 ) )
pUp = pUp->GetUpper();
BOOL bSame = FALSE;
const SwFrm *pCntUp = pCnt->GetUpper();
while ( pCntUp && !bSame )
- { if ( pUp == pCntUp )
+ { if ( pUp == pCntUp )
bSame = TRUE;
else
pCntUp = pCntUp->GetUpper();
@@ -780,7 +780,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
if ( !pCnt )
bEnd = TRUE;
else
- { const SwTabFrm *pTab = pCnt->FindTabFrm();
+ { const SwTabFrm *pTab = pCnt->FindTabFrm();
if( !pTab )
bEnd = TRUE;
else
@@ -855,7 +855,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
(pCnt && pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow()));
if( pCnt )
- { // setze den Point auf den Content-Node
+ { // setze den Point auf den Content-Node
SwCntntNode *pCNd = (SwCntntNode*)pCnt->GetNode();
pPam->GetPoint()->nNode = *pCNd;
if ( fnNxtPrv == lcl_GetPrvCnt )
@@ -879,15 +879,15 @@ BOOL SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, BOOL bInReadOnly ) const
/*************************************************************************
|*
-|* SwRootFrm::GetCurrPage()
+|* SwRootFrm::GetCurrPage()
|*
-|* Beschreibung: Liefert die Nummer der aktuellen Seite.
-|* Wenn die Methode einen PaM bekommt, so ist die aktuelle Seite
-|* diejenige in der der PaM sitzt. Anderfalls ist die aktuelle
-|* Seite die erste Seite innerhalb der VisibleArea.
-|* Es wird nur auf den vorhandenen Seiten gearbeitet!
-|* Ersterstellung MA 20. May. 92
-|* Letzte Aenderung MA 09. Oct. 97
+|* Beschreibung: Liefert die Nummer der aktuellen Seite.
+|* Wenn die Methode einen PaM bekommt, so ist die aktuelle Seite
+|* diejenige in der der PaM sitzt. Anderfalls ist die aktuelle
+|* Seite die erste Seite innerhalb der VisibleArea.
+|* Es wird nur auf den vorhandenen Seiten gearbeitet!
+|* Ersterstellung MA 20. May. 92
+|* Letzte Aenderung MA 09. Oct. 97
|*
|*************************************************************************/
USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const
@@ -902,16 +902,16 @@ USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const
/*************************************************************************
|*
-|* SwRootFrm::SetCurrPage()
+|* SwRootFrm::SetCurrPage()
|*
-|* Beschreibung: Liefert einen PaM der am Anfang der gewuenschten
-|* Seite sitzt.
-|* Formatiert wird soweit notwendig
-|* Liefert Null, wenn die Operation nicht moeglich ist.
-|* Der PaM sitzt in der letzten Seite, wenn die Seitenzahl zu gross
-|* gewaehlt wurde.
-|* Ersterstellung MA 20. May. 92
-|* Letzte Aenderung MA 09. Oct. 97
+|* Beschreibung: Liefert einen PaM der am Anfang der gewuenschten
+|* Seite sitzt.
+|* Formatiert wird soweit notwendig
+|* Liefert Null, wenn die Operation nicht moeglich ist.
+|* Der PaM sitzt in der letzten Seite, wenn die Seitenzahl zu gross
+|* gewaehlt wurde.
+|* Ersterstellung MA 20. May. 92
+|* Letzte Aenderung MA 09. Oct. 97
|*
|*************************************************************************/
USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum )
@@ -921,10 +921,10 @@ USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum )
SwPageFrm *pPage = (SwPageFrm*)Lower();
BOOL bEnd =FALSE;
while ( !bEnd && pPage->GetPhyPageNum() != nPageNum )
- { if ( pPage->GetNext() )
+ { if ( pPage->GetNext() )
pPage = (SwPageFrm*)pPage->GetNext();
else
- { //Ersten CntntFrm Suchen, und solange Formatieren bis
+ { //Ersten CntntFrm Suchen, und solange Formatieren bis
//eine neue Seite angefangen wird oder bis die CntntFrm's alle
//sind.
const SwCntntFrm *pCntnt = pPage->ContainsCntnt();
@@ -973,17 +973,17 @@ USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum )
/*************************************************************************
|*
-|* SwCntntFrm::StartxxPage(), EndxxPage()
+|* SwCntntFrm::StartxxPage(), EndxxPage()
|*
-|* Beschreibung Cursor an Anfang/Ende der aktuellen/vorherigen/
-|* naechsten Seite. Alle sechs Methoden rufen GetFrmInPage() mit der
-|* entsprechenden Parametrisierung.
-|* Zwei Parameter steuern die Richtung: einer bestimmt die Seite, der
-|* andere Anfang/Ende.
-|* Fuer die Bestimmung der Seite und des Cntnt (Anfang/Ende) werden
-|* die im folgenden definierten Funktionen benutzt.
-|* Ersterstellung MA 15. Oct. 92
-|* Letzte Aenderung MA 28. Feb. 93
+|* Beschreibung Cursor an Anfang/Ende der aktuellen/vorherigen/
+|* naechsten Seite. Alle sechs Methoden rufen GetFrmInPage() mit der
+|* entsprechenden Parametrisierung.
+|* Zwei Parameter steuern die Richtung: einer bestimmt die Seite, der
+|* andere Anfang/Ende.
+|* Fuer die Bestimmung der Seite und des Cntnt (Anfang/Ende) werden
+|* die im folgenden definierten Funktionen benutzt.
+|* Ersterstellung MA 15. Oct. 92
+|* Letzte Aenderung MA 28. Feb. 93
|*
|*************************************************************************/
SwCntntFrm *GetFirstSub( const SwLayoutFrm *pLayout )
@@ -1089,17 +1089,17 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
/*************************************************************************
|*
-|* SwLayoutFrm::GetCntntPos()
+|* SwLayoutFrm::GetCntntPos()
|*
-|* Beschreibung Es wird der nachstliegende Cntnt zum uebergebenen
-|* gesucht. Betrachtet werden die vorhergehende, die
-|* aktuelle und die folgende Seite.
-|* Wenn kein Inhalt gefunden wird, so wird der Bereich
- * erweitert bis einer gefunden wird.
-|* Zurueckgegeben wird die 'Semantisch richtige' Position
-|* innerhalb der PrtArea des gefundenen CntntFrm
-|* Ersterstellung MA 15. Jul. 92
-|* Letzte Aenderung MA 09. Jan. 97
+|* Beschreibung Es wird der nachstliegende Cntnt zum uebergebenen
+|* gesucht. Betrachtet werden die vorhergehende, die
+|* aktuelle und die folgende Seite.
+|* Wenn kein Inhalt gefunden wird, so wird der Bereich
+ * erweitert bis einer gefunden wird.
+|* Zurueckgegeben wird die 'Semantisch richtige' Position
+|* innerhalb der PrtArea des gefundenen CntntFrm
+|* Ersterstellung MA 15. Jul. 92
+|* Letzte Aenderung MA 09. Jan. 97
|*
|*************************************************************************/
ULONG CalcDiff( const Point &rPt1, const Point &rPt2 )
@@ -1165,7 +1165,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
Point aPoint = rPoint;
ULONG nDistance = ULONG_MAX;
- while ( TRUE ) //Sicherheitsschleifchen, damit immer einer gefunden wird.
+ while ( TRUE ) //Sicherheitsschleifchen, damit immer einer gefunden wird.
{
while ( pCntnt &&
((!bDontLeave || IsAnLower( pCntnt )) &&
@@ -1239,7 +1239,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
pCntnt = pCntnt->GetNextCntntFrm();
}
if ( !pActual )
- { //Wenn noch keiner gefunden wurde muss der Suchbereich erweitert
+ { //Wenn noch keiner gefunden wurde muss der Suchbereich erweitert
//werden, irgenwann muessen wir einen Finden!
//MA 09. Jan. 97: Opt fuer viele leere Seiten, wenn wir nur im
//Body suchen, koennen wir den Suchbereich gleich in einem
@@ -1256,13 +1256,13 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
? pStart->ContainsCntnt()
: pStart->FindPageFrm()->FindFirstBodyCntnt();
}
- if ( !pCntnt ) //irgendwann muessen wir mit irgendeinem Anfangen!
+ if ( !pCntnt ) //irgendwann muessen wir mit irgendeinem Anfangen!
{
pCntnt = pStart->FindPageFrm()->GetUpper()->ContainsCntnt();
while ( pCntnt && !pCntnt->IsInDocBody() )
pCntnt = pCntnt->GetNextCntntFrm();
if ( !pCntnt )
- return 0; //Es gibt noch keine Dokumentinhalt!
+ return 0; //Es gibt noch keine Dokumentinhalt!
}
}
else
@@ -1348,13 +1348,13 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
/*************************************************************************
|*
-|* SwPageFrm::GetCntntPosition()
+|* SwPageFrm::GetCntntPosition()
|*
-|* Beschreibung Analog zu SwLayoutFrm::GetCntntPos().
-|* Spezialisiert fuer Felder in Rahmen.
+|* Beschreibung Analog zu SwLayoutFrm::GetCntntPos().
+|* Spezialisiert fuer Felder in Rahmen.
|*
-|* Ersterstellung MA 22. Mar. 95
-|* Letzte Aenderung MA 07. Nov. 95
+|* Ersterstellung MA 22. Mar. 95
+|* Letzte Aenderung MA 07. Nov. 95
|*
|*************************************************************************/
void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
@@ -1374,8 +1374,8 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
pCntnt = GetUpper()->ContainsCntnt();
const SwCntntFrm *pAct = pCntnt;
- Point aAct = rPt;
- ULONG nDist = ULONG_MAX;
+ Point aAct = rPt;
+ ULONG nDist = ULONG_MAX;
while ( pCntnt )
{
@@ -1405,9 +1405,9 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
const ULONG nDiff = ::CalcDiff( aPoint, rPt );
if ( nDiff < nDist )
{
- aAct = aPoint;
- nDist = nDiff;
- pAct = pCntnt;
+ aAct = aPoint;
+ nDist = nDiff;
+ pAct = pCntnt;
}
else if ( aCntFrm.Top() > Frm().Bottom() )
//Dichter wirds im Sinne der Felder nicht mehr!
@@ -1446,12 +1446,12 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
/*************************************************************************
|*
-|* SwRootFrm::GetNextPrevCntntPos()
+|* SwRootFrm::GetNextPrevCntntPos()
|*
-|* Beschreibung Es wird der naechstliegende Cntnt zum uebergebenen
-|* Point gesucht. Es wird nur im BodyText gesucht.
-|* Ersterstellung MA 15. Jul. 92
-|* Letzte Aenderung JP 11.10.2001
+|* Beschreibung Es wird der naechstliegende Cntnt zum uebergebenen
+|* Point gesucht. Es wird nur im BodyText gesucht.
+|* Ersterstellung MA 15. Jul. 92
+|* Letzte Aenderung JP 11.10.2001
|*
|*************************************************************************/
@@ -1564,16 +1564,16 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, BOOL bNext ) const
/*************************************************************************
|*
-|* SwRootFrm::GetPagePos()
+|* SwRootFrm::GetPagePos()
|*
-|* Beschreibung: Liefert die absolute Dokumentpositon der gewuenschten
-|* Seite.
-|* Formatiert wird nur soweit notwendig und nur dann wenn bFormat=TRUE
-|* Liefert Null, wenn die Operation nicht moeglich ist.
-|* Die Pos ist die der letzten Seite, wenn die Seitenzahl zu gross
-|* gewaehlt wurde.
-|* Ersterstellung MA 01. Jun. 92
-|* Letzte Aenderung MA 09. Oct. 97
+|* Beschreibung: Liefert die absolute Dokumentpositon der gewuenschten
+|* Seite.
+|* Formatiert wird nur soweit notwendig und nur dann wenn bFormat=TRUE
+|* Liefert Null, wenn die Operation nicht moeglich ist.
+|* Die Pos ist die der letzten Seite, wenn die Seitenzahl zu gross
+|* gewaehlt wurde.
+|* Ersterstellung MA 01. Jun. 92
+|* Letzte Aenderung MA 09. Oct. 97
|*
|*************************************************************************/
Point SwRootFrm::GetPagePos( USHORT nPageNum ) const
@@ -1635,14 +1635,14 @@ BOOL SwRootFrm::IsDummyPage( USHORT nPageNum ) const
/*************************************************************************
|*
-|* SwFrm::IsProtected()
+|* SwFrm::IsProtected()
|*
-|* Beschreibung Ist der Frm bzw. die Section in der er steht
-|* geschuetzt?
-|* Auch Fly in Fly in ... und Fussnoten
+|* Beschreibung Ist der Frm bzw. die Section in der er steht
+|* geschuetzt?
+|* Auch Fly in Fly in ... und Fussnoten
|*
-|* Ersterstellung MA 28. Jul. 93
-|* Letzte Aenderung MA 06. Nov. 97
+|* Ersterstellung MA 28. Jul. 93
+|* Letzte Aenderung MA 06. Nov. 97
|*
|*************************************************************************/
BOOL SwFrm::IsProtected() const
@@ -1703,11 +1703,11 @@ BOOL SwFrm::IsProtected() const
/*************************************************************************
|*
-|* SwFrm::GetPhyPageNum()
-|* Beschreibung: Liefert die physikalische Seitennummer
+|* SwFrm::GetPhyPageNum()
+|* Beschreibung: Liefert die physikalische Seitennummer
|*
-|* Ersterstellung OK 06.07.93 08:35
-|* Letzte Aenderung MA 30. Nov. 94
+|* Ersterstellung OK 06.07.93 08:35
+|* Letzte Aenderung MA 30. Nov. 94
|*
|*************************************************************************/
USHORT SwFrm::GetPhyPageNum() const
@@ -1786,11 +1786,11 @@ BOOL SwFrm::WannaRightPage() const
/*************************************************************************
|*
-|* SwFrm::GetVirtPageNum()
-|* Beschreibung: Liefert die virtuelle Seitennummer mit Offset
+|* SwFrm::GetVirtPageNum()
+|* Beschreibung: Liefert die virtuelle Seitennummer mit Offset
|*
-|* Ersterstellung OK 06.07.93 08:35
-|* Letzte Aenderung MA 30. Nov. 94
+|* Ersterstellung OK 06.07.93 08:35
+|* Letzte Aenderung MA 30. Nov. 94
|*
|*************************************************************************/
USHORT SwFrm::GetVirtPageNum() const
@@ -1843,10 +1843,10 @@ USHORT SwFrm::GetVirtPageNum() const
/*************************************************************************
|*
-|* SwRootFrm::MakeTblCrsrs()
+|* SwRootFrm::MakeTblCrsrs()
|*
-|* Ersterstellung MA 14. May. 93
-|* Letzte Aenderung MA 02. Feb. 94
+|* Ersterstellung MA 14. May. 93
+|* Letzte Aenderung MA 02. Feb. 94
|*
|*************************************************************************/
//Ermitteln und einstellen derjenigen Zellen die von der Selektion
@@ -1966,41 +1966,41 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
/*************************************************************************
|*
-|* SwRootFrm::CalcFrmRects
+|* SwRootFrm::CalcFrmRects
|*
-|* Ersterstellung MA 24. Aug. 92
-|* Letzte Aenderung MA 24. Aug. 93
+|* Ersterstellung MA 24. Aug. 92
+|* Letzte Aenderung MA 24. Aug. 93
|*
|*************************************************************************/
/*
* nun koennen folgende Situationen auftreten:
- * 1. Start und Ende liegen in einer Bildschirm - Zeile und im
- * gleichen Node
- * -> aus Start und End ein Rectangle, dann Ok
- * 2. Start und Ende liegen in einem Frame (dadurch im gleichen Node!)
- * -> Start nach rechts, End nach links erweitern,
- * und bei mehr als 2 Bildschirm - Zeilen, das dazwischen
- * liegende berechnen
- * 3. Start und Ende liegen in verschiedenen Frames
- * -> Start nach rechts erweitern, bis Frame-Ende Rect berechnen
- * Ende nach links erweitern, bis Frame-Start Rect berechnen
- * und bei mehr als 2 Frames von allen dazwischen liegenden
- * Frames die PrtArea dazu.
- * 4. Wenn es sich um eine Tabellenselektion handelt wird fuer jeden
- * PaM im Ring der CellFrm besorgt, dessen PrtArea wird zu den
- * Rechtecken addiert.
+ * 1. Start und Ende liegen in einer Bildschirm - Zeile und im
+ * gleichen Node
+ * -> aus Start und End ein Rectangle, dann Ok
+ * 2. Start und Ende liegen in einem Frame (dadurch im gleichen Node!)
+ * -> Start nach rechts, End nach links erweitern,
+ * und bei mehr als 2 Bildschirm - Zeilen, das dazwischen
+ * liegende berechnen
+ * 3. Start und Ende liegen in verschiedenen Frames
+ * -> Start nach rechts erweitern, bis Frame-Ende Rect berechnen
+ * Ende nach links erweitern, bis Frame-Start Rect berechnen
+ * und bei mehr als 2 Frames von allen dazwischen liegenden
+ * Frames die PrtArea dazu.
+ * 4. Wenn es sich um eine Tabellenselektion handelt wird fuer jeden
+ * PaM im Ring der CellFrm besorgt, dessen PrtArea wird zu den
+ * Rechtecken addiert.
*
* Grosser Umbau wg. der FlyFrm; denn diese muessen ausgespart werden.
* Ausnahmen: - Der Fly in dem die Selektion stattfindet (wenn sie in einem Fly
- * stattfindet).
- * - Die Flys, die vom Text unterlaufen werden.
+ * stattfindet).
+ * - Die Flys, die vom Text unterlaufen werden.
* Arbeitsweise: Zuerst wird eine SwRegion mit der Root initialisiert.
- * Aus der Region werden die zu invertierenden Bereiche
- * ausgestantzt. Die Region wird Komprimiert und letztlich
- * invertiert. Damit liegen dann die zu invertierenden
- * Rechtecke vor.
- * Am Ende werden die Flys aus der Region ausgestanzt.
+ * Aus der Region werden die zu invertierenden Bereiche
+ * ausgestantzt. Die Region wird Komprimiert und letztlich
+ * invertiert. Damit liegen dann die zu invertierenden
+ * Rechtecke vor.
+ * Am Ende werden die Flys aus der Region ausgestanzt.
*/
inline void Sub( SwRegionRects& rRegion, const SwRect& rRect )
@@ -2051,7 +2051,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
const SwCntntFrm *pStartFrm = rNds[ pStartPos->nNode ]->
GetCntntNode()->GetFrm( &rCrsr.GetSttPos(), pStartPos );
- const SwCntntFrm *pEndFrm = rNds[ pEndPos->nNode ]->
+ const SwCntntFrm *pEndFrm = rNds[ pEndPos->nNode ]->
GetCntntNode()->GetFrm( &rCrsr.GetEndPos(), pEndPos );
OSL_ENSURE( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." );
@@ -2085,7 +2085,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
{
// falls eine nicht erlaubte Selection besteht, dann korrigiere das
// nicht erlaubt ist Header/Footer/TableHeadline ueber 2 Seiten
- do { // middle check loop
+ do { // middle check loop
const SwLayoutFrm* pSttLFrm = pStartFrm->GetUpper();
const USHORT cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
while( pSttLFrm &&
@@ -2423,8 +2423,8 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
SwRect aTmp = SwRect( aTmpSt, aTmpEnd );
// Bug 34888: falls Inhalt selektiert ist, der keinen Platz
- // einnimmt (z.B. PostIts,RefMarks, TOXMarks),
- // dann mindestens die Breite des Crsr setzen.
+ // einnimmt (z.B. PostIts,RefMarks, TOXMarks),
+ // dann mindestens die Breite des Crsr setzen.
if( 1 == (aTmp.*fnRect->fnGetWidth)() &&
pStartPos->nContent.GetIndex() !=
pEndPos->nContent.GetIndex() )
@@ -2583,7 +2583,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
Sub( aRegion, aSubRect );
}
-// aRegion.Compress( FALSE );
+// aRegion.Compress( FALSE );
aRegion.Invert();
delete pSt2Pos;
delete pEnd2Pos;
@@ -2591,11 +2591,11 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
//Flys mit Durchlauf ausstanzen. Nicht ausgestanzt werden Flys:
//- die Lower des StartFrm/EndFrm sind (FlyInCnt und alle Flys die wiederum
- // darin sitzen)
+ // darin sitzen)
//- in der Z-Order ueber denjenigen Flys stehen in denen sich der StartFrm
- // befindet.
- const SwPageFrm *pPage = pStartFrm->FindPageFrm();
- const SwPageFrm *pEndPage = pEndFrm->FindPageFrm();
+ // befindet.
+ const SwPageFrm *pPage = pStartFrm->FindPageFrm();
+ const SwPageFrm *pEndPage = pEndFrm->FindPageFrm();
while ( pPage )
{
@@ -2625,7 +2625,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
"<SwRootFrm::CalcFrmRects(..)> - object in <aSortObjs> of unexcepted type" );
const SwFlyFrm* pTmp = static_cast<SwFlyFrm*>(aSortObjs[k]);
do
- { if ( nPos < pTmp->GetVirtDrawObj()->GetOrdNumDirect() )
+ { if ( nPos < pTmp->GetVirtDrawObj()->GetOrdNumDirect() )
bSub = FALSE;
else
pTmp = pTmp->GetAnchorFrm()->FindFlyFrm();
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index d231535c5c87..db056e5edf67 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 4a56c37497c2..3bb6231e4ee2 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * class DbgRect
+ * class DbgRect
*************************************************************************/
class DbgRect
@@ -135,7 +135,7 @@ void SetMappingForVirtDev( const Point& _rNewOrigin,
/*************************************************************************
- * SwVOut::DoesFit()
+ * SwVOut::DoesFit()
*************************************************************************/
// rSize muss in Pixel-Koordinaten vorliegen!
@@ -173,7 +173,7 @@ BOOL SwLayVout::DoesFit( const Size &rNew )
}
/*************************************************************************
- * SwLayVout::Enter
+ * SwLayVout::Enter
*************************************************************************/
/// OD 27.09.2002 #103636# - change 2nd parameter <rRect> - no longer <const>
/// in order to return value of class member variable <aRect>, if virtual
@@ -241,7 +241,7 @@ void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, BOOL bOn )
}
/*************************************************************************
- * SwLayVout::Flush()
+ * SwLayVout::Flush()
*************************************************************************/
void SwLayVout::_Flush()
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 04f6a67031de..58f570866b0b 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -2,7 +2,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
@@ -30,27 +30,27 @@
#include <vcl/virdev.hxx>
-#include "swtypes.hxx" // UCHAR
-#include "swrect.hxx" // SwRect
+#include "swtypes.hxx" // UCHAR
+#include "swrect.hxx" // SwRect
class ViewShell;
#define VIRTUALHEIGHT 64
/*************************************************************************
- * class SwTxtVout
+ * class SwTxtVout
*************************************************************************/
class SwLayVout
{
- friend void _FrmFinit(); //loescht das Vout
+ friend void _FrmFinit(); //loescht das Vout
private:
- ViewShell* pSh;
- OutputDevice* pOut;
- VirtualDevice* pVirDev;
- SwRect aRect;
- SwRect aOrgRect;
- Size aSize;
- USHORT nCount;
+ ViewShell* pSh;
+ OutputDevice* pOut;
+ VirtualDevice* pVirDev;
+ SwRect aRect;
+ SwRect aOrgRect;
+ Size aSize;
+ USHORT nCount;
BOOL DoesFit( const Size &rOut );
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 25e5abaae9a2..077314e166e4 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -81,10 +81,10 @@ using namespace ::com::sun::star;
/*************************************************************************
|*
-|* SwFrm::SwFrm()
+|* SwFrm::SwFrm()
|*
-|* Ersterstellung AK 12-Feb-1991
-|* Letzte Aenderung MA 05. Apr. 94
+|* Ersterstellung AK 12-Feb-1991
+|* Letzte Aenderung MA 05. Apr. 94
|*
|*************************************************************************/
@@ -230,10 +230,10 @@ void SwTxtFrm::CheckDirection( BOOL bVert )
/*************************************************************************
|*
-|* SwFrm::Modify()
+|* SwFrm::Modify()
|*
-|* Ersterstellung AK 01-Mar-1991
-|* Letzte Aenderung MA 20. Jun. 96
+|* Ersterstellung AK 01-Mar-1991
+|* Letzte Aenderung MA 20. Jun. 96
|*
|*************************************************************************/
void SwFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
@@ -347,9 +347,9 @@ void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew,
/*************************************************************************
|*
-|* SwFrm::Prepare()
-|* Ersterstellung MA 13. Apr. 93
-|* Letzte Aenderung MA 26. Jun. 96
+|* SwFrm::Prepare()
+|* Ersterstellung MA 13. Apr. 93
+|* Letzte Aenderung MA 26. Jun. 96
|*
|*************************************************************************/
void SwFrm::Prepare( const PrepareHint, const void *, BOOL )
@@ -359,12 +359,12 @@ void SwFrm::Prepare( const PrepareHint, const void *, BOOL )
/*************************************************************************
|*
-|* SwFrm::InvalidatePage()
-|* Beschreibung: Invalidiert die Seite, in der der Frm gerade steht.
-|* Je nachdem ob es ein Layout, Cntnt oder FlyFrm ist wird die Seite
-|* entsprechend Invalidiert.
-|* Ersterstellung MA 22. Jul. 92
-|* Letzte Aenderung MA 14. Oct. 94
+|* SwFrm::InvalidatePage()
+|* Beschreibung: Invalidiert die Seite, in der der Frm gerade steht.
+|* Je nachdem ob es ein Layout, Cntnt oder FlyFrm ist wird die Seite
+|* entsprechend Invalidiert.
+|* Ersterstellung MA 22. Jul. 92
+|* Letzte Aenderung MA 14. Oct. 94
|*
|*************************************************************************/
void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
@@ -407,8 +407,8 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
if ( pRoot->IsTurboAllowed() )
{
// JP 21.09.95: wenn sich der ContentFrame 2 mal eintragen
- // will, kann es doch eine TurboAction bleiben.
- // ODER????
+ // will, kann es doch eine TurboAction bleiben.
+ // ODER????
if ( !pRoot->GetTurbo() || this == pRoot->GetTurbo() )
pRoot->SetTurbo( (const SwCntntFrm*)this );
else
@@ -424,10 +424,10 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
if ( !pRoot->GetTurbo() )
{
if ( pFly )
- { if( !pFly->IsLocked() )
+ { if( !pFly->IsLocked() )
{
if ( pFly->IsFlyInCntFrm() )
- { pPage->InvalidateFlyInCnt();
+ { pPage->InvalidateFlyInCnt();
((SwFlyInCntFrm*)pFly)->InvalidateCntnt();
pFly->GetAnchorFrm()->InvalidatePage();
}
@@ -460,7 +460,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
pPage->InvalidateLayout();
if ( pRoot->GetTurbo() )
- { const SwFrm *pTmp = pRoot->GetTurbo();
+ { const SwFrm *pTmp = pRoot->GetTurbo();
pRoot->ResetTurbo();
pTmp->InvalidatePage();
}
@@ -479,10 +479,10 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
/*************************************************************************
|*
-|* SwFrm::ChgSize()
+|* SwFrm::ChgSize()
|*
-|* Ersterstellung AK 15-Feb-1991
-|* Letzte Aenderung MA 18. Nov. 98
+|* Ersterstellung AK 15-Feb-1991
+|* Letzte Aenderung MA 18. Nov. 98
|*
|*************************************************************************/
Size SwFrm::ChgSize( const Size& aNewSize )
@@ -560,13 +560,13 @@ Size SwFrm::ChgSize( const Size& aNewSize )
/*************************************************************************
|*
-|* SwFrm::InsertBefore()
+|* SwFrm::InsertBefore()
|*
-|* Beschreibung SwFrm wird in eine bestehende Struktur eingefuegt
-|* Eingefuegt wird unterhalb des Parent und entweder
-|* vor pBehind oder am Ende der Kette wenn pBehind
-|* leer ist.
-|* Letzte Aenderung MA 06. Aug. 99
+|* Beschreibung SwFrm wird in eine bestehende Struktur eingefuegt
+|* Eingefuegt wird unterhalb des Parent und entweder
+|* vor pBehind oder am Ende der Kette wenn pBehind
+|* leer ist.
+|* Letzte Aenderung MA 06. Aug. 99
|*
|*************************************************************************/
void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
@@ -578,7 +578,7 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
pUpper = pParent;
pNext = pBehind;
if( pBehind )
- { //Einfuegen vor pBehind.
+ { //Einfuegen vor pBehind.
if( 0 != (pPrev = pBehind->pPrev) )
pPrev->pNext = this;
else
@@ -586,7 +586,7 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
pBehind->pPrev = this;
}
else
- { //Einfuegen am Ende, oder als ersten Node im Unterbaum
+ { //Einfuegen am Ende, oder als ersten Node im Unterbaum
pPrev = pUpper->Lower();
if ( pPrev )
{
@@ -601,13 +601,13 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
/*************************************************************************
|*
-|* SwFrm::InsertBehind()
+|* SwFrm::InsertBehind()
|*
-|* Beschreibung SwFrm wird in eine bestehende Struktur eingefuegt
-|* Eingefuegt wird unterhalb des Parent und entweder
-|* hinter pBefore oder am Anfang der Kette wenn pBefore
-|* leer ist.
-|* Letzte Aenderung MA 06. Aug. 99
+|* Beschreibung SwFrm wird in eine bestehende Struktur eingefuegt
+|* Eingefuegt wird unterhalb des Parent und entweder
+|* hinter pBefore oder am Anfang der Kette wenn pBefore
+|* leer ist.
+|* Letzte Aenderung MA 06. Aug. 99
|*
|*************************************************************************/
void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
@@ -637,14 +637,14 @@ void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
/*************************************************************************
|*
-|* SwFrm::InsertGroup()
+|* SwFrm::InsertGroup()
|*
-|* Beschreibung Eine Kette von SwFrms wird in eine bestehende Struktur
-|* eingefuegt
-|* Letzte Aenderung AMA 9. Dec. 97
+|* Beschreibung Eine Kette von SwFrms wird in eine bestehende Struktur
+|* eingefuegt
+|* Letzte Aenderung AMA 9. Dec. 97
|*
|* Bisher wird dies genutzt, um einen SectionFrame, der ggf. schon Geschwister
-|* mit sich bringt, in eine bestehende Struktur einzufuegen.
+|* mit sich bringt, in eine bestehende Struktur einzufuegen.
|*
|* Wenn man den dritten Parameter als NULL uebergibt, entspricht
|* diese Methode dem SwFrm::InsertBefore(..), nur eben mit Geschwistern.
@@ -653,9 +653,9 @@ void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
|* this wird pNext von pParent,
|* pSct wird pNext vom Letzten der this-Kette,
|* pBehind wird vom pParent an den pSct umgehaengt.
-|* Dies dient dazu: ein SectionFrm (this) wird nicht als
-|* Kind an einen anderen SectionFrm (pParent) gehaengt, sondern pParent
-|* wird in zwei Geschwister aufgespalten (pParent+pSct) und this dazwischen
+|* Dies dient dazu: ein SectionFrm (this) wird nicht als
+|* Kind an einen anderen SectionFrm (pParent) gehaengt, sondern pParent
+|* wird in zwei Geschwister aufgespalten (pParent+pSct) und this dazwischen
|* eingebaut.
|*
|*************************************************************************/
@@ -696,7 +696,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
pLast->pUpper = GetUpper();
}
if( pBehind )
- { //Einfuegen vor pBehind.
+ { //Einfuegen vor pBehind.
if( pBehind->GetPrev() )
pBehind->GetPrev()->pNext = NULL;
else
@@ -735,7 +735,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
}
pLast->pNext = pBehind;
if( pBehind )
- { //Einfuegen vor pBehind.
+ { //Einfuegen vor pBehind.
if( 0 != (pPrev = pBehind->pPrev) )
pPrev->pNext = this;
else
@@ -743,7 +743,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
pBehind->pPrev = pLast;
}
else
- { //Einfuegen am Ende, oder des ersten Nodes im Unterbaum
+ { //Einfuegen am Ende, oder des ersten Nodes im Unterbaum
pPrev = pUpper->Lower();
if ( pPrev )
{
@@ -759,10 +759,10 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
/*************************************************************************
|*
-|* SwFrm::Remove()
+|* SwFrm::Remove()
|*
-|* Ersterstellung AK 01-Mar-1991
-|* Letzte Aenderung MA 07. Dec. 95
+|* Ersterstellung AK 01-Mar-1991
+|* Letzte Aenderung MA 07. Dec. 95
|*
|*************************************************************************/
void SwFrm::Remove()
@@ -773,7 +773,7 @@ void SwFrm::Remove()
// einer aus der Mitte wird removed
pPrev->pNext = pNext;
else
- { // der erste in einer Folge wird removed
+ { // der erste in einer Folge wird removed
OSL_ENSURE( pUpper->pLower == this, "Layout inkonsistent." );
pUpper->pLower = pNext;
}
@@ -786,10 +786,10 @@ void SwFrm::Remove()
}
/*************************************************************************
|*
-|* SwCntntFrm::Paste()
+|* SwCntntFrm::Paste()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 09. Sep. 98
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 09. Sep. 98
|*
|*************************************************************************/
void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
@@ -894,10 +894,10 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
/*************************************************************************
|*
-|* SwCntntFrm::Cut()
+|* SwCntntFrm::Cut()
|*
-|* Ersterstellung AK 14-Feb-1991
-|* Letzte Aenderung MA 09. Sep. 98
+|* Ersterstellung AK 14-Feb-1991
+|* Letzte Aenderung MA 09. Sep. 98
|*
|*************************************************************************/
void SwCntntFrm::Cut()
@@ -943,7 +943,7 @@ void SwCntntFrm::Cut()
}
if( 0 != (pFrm = GetIndNext()) )
- { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
+ { //Der alte Nachfolger hat evtl. einen Abstand zum Vorgaenger
//berechnet, der ist jetzt, wo er der erste wird obsolet bzw. anders.
pFrm->_InvalidatePrt();
pFrm->_InvalidatePos();
@@ -975,7 +975,7 @@ void SwCntntFrm::Cut()
InvalidateNextPos();
//Einer muss die Retusche uebernehmen: Vorgaenger oder Upper
if ( 0 != (pFrm = GetPrev()) )
- { pFrm->SetRetouche();
+ { pFrm->SetRetouche();
pFrm->Prepare( PREP_WIDOWS_ORPHANS );
pFrm->_InvalidatePos();
pFrm->InvalidatePage( pPage );
@@ -984,7 +984,7 @@ void SwCntntFrm::Cut()
//er die Retouche uebernehmen.
//Ausserdem kann eine Leerseite entstanden sein.
else
- { SwRootFrm *pRoot = FindRootFrm();
+ { SwRootFrm *pRoot = FindRootFrm();
if ( pRoot )
{
pRoot->SetSuperfluous();
@@ -1087,10 +1087,10 @@ void SwCntntFrm::Cut()
/*************************************************************************
|*
-|* SwLayoutFrm::Paste()
+|* SwLayoutFrm::Paste()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 23. Feb. 94
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 23. Feb. 94
|*
|*************************************************************************/
void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
@@ -1192,10 +1192,10 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
/*************************************************************************
|*
-|* SwLayoutFrm::Cut()
+|* SwLayoutFrm::Cut()
|*
-|* Ersterstellung MA 23. Feb. 94
-|* Letzte Aenderung MA 23. Feb. 94
+|* Ersterstellung MA 23. Feb. 94
+|* Letzte Aenderung MA 23. Feb. 94
|*
|*************************************************************************/
void SwLayoutFrm::Cut()
@@ -1257,10 +1257,10 @@ void SwLayoutFrm::Cut()
/*************************************************************************
|*
-|* SwFrm::Grow()
+|* SwFrm::Grow()
|*
-|* Ersterstellung AK 19-Feb-1991
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung AK 19-Feb-1991
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -1309,10 +1309,10 @@ SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwFrm::Shrink()
+|* SwFrm::Shrink()
|*
-|* Ersterstellung AK 14-Feb-1991
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung AK 14-Feb-1991
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
SwTwips SwFrm::Shrink( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -1358,32 +1358,32 @@ SwTwips SwFrm::Shrink( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwFrm::AdjustNeighbourhood()
-|*
-|* Beschreibung Wenn sich die Groesse eines Frm's direkt unterhalb
-|* eines Fussnotenbosses (Seite/Spalte) veraendert hat, so muss dieser
-|* "Normalisiert" werden.
-|* Es gibt dort immer einen Frame, der den "maximal moeglichen" Raum
-|* einnimmt (der Frame, der den Body.Text enhaelt) und keinen oder
-|* mehrere Frames die den Platz einnehmen den sie halt brauchen
-|* (Kopf-/Fussbereich, Fussnoten).
-|* Hat sich einer der Frames veraendert, so muss der Body-Text-Frame
-|* entsprechen wachsen oder schrumpfen; unabhaegig davon, dass er fix ist.
-|* !! Ist es moeglich dies allgemeiner zu loesen, also nicht auf die
-|* Seite beschraenkt und nicht auf einen Speziellen Frame, der den
-|* maximalen Platz einnimmt (gesteuert ueber Attribut FrmSize)? Probleme:
-|* Was ist wenn mehrere Frames nebeneinander stehen, die den maximalen
-|* Platz einnehmen?
-|* Wie wird der Maximale Platz berechnet?
-|* Wie klein duerfen diese Frames werden?
-|*
-|* Es wird auf jeden Fall nur so viel Platz genehmigt, dass ein
-|* Minimalwert fuer die Hoehe des Bodys nicht unterschritten wird.
-|*
-|* Parameter: nDiff ist der Betrag, um den Platz geschaffen werden muss
-|*
-|* Ersterstellung MA 07. May. 92
-|* Letzte Aenderung AMA 02. Nov. 98
+|* SwFrm::AdjustNeighbourhood()
+|*
+|* Beschreibung Wenn sich die Groesse eines Frm's direkt unterhalb
+|* eines Fussnotenbosses (Seite/Spalte) veraendert hat, so muss dieser
+|* "Normalisiert" werden.
+|* Es gibt dort immer einen Frame, der den "maximal moeglichen" Raum
+|* einnimmt (der Frame, der den Body.Text enhaelt) und keinen oder
+|* mehrere Frames die den Platz einnehmen den sie halt brauchen
+|* (Kopf-/Fussbereich, Fussnoten).
+|* Hat sich einer der Frames veraendert, so muss der Body-Text-Frame
+|* entsprechen wachsen oder schrumpfen; unabhaegig davon, dass er fix ist.
+|* !! Ist es moeglich dies allgemeiner zu loesen, also nicht auf die
+|* Seite beschraenkt und nicht auf einen Speziellen Frame, der den
+|* maximalen Platz einnimmt (gesteuert ueber Attribut FrmSize)? Probleme:
+|* Was ist wenn mehrere Frames nebeneinander stehen, die den maximalen
+|* Platz einnehmen?
+|* Wie wird der Maximale Platz berechnet?
+|* Wie klein duerfen diese Frames werden?
+|*
+|* Es wird auf jeden Fall nur so viel Platz genehmigt, dass ein
+|* Minimalwert fuer die Hoehe des Bodys nicht unterschritten wird.
+|*
+|* Parameter: nDiff ist der Betrag, um den Platz geschaffen werden muss
+|*
+|* Ersterstellung MA 07. May. 92
+|* Letzte Aenderung AMA 02. Nov. 98
|*
|*************************************************************************/
SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst )
@@ -1684,11 +1684,11 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst )
/*************************************************************************
|*
-|* SwFrm::ImplInvalidateSize(), ImplInvalidatePrt(), ImplInvalidatePos(),
-|* ImplInvalidateLineNum()
+|* SwFrm::ImplInvalidateSize(), ImplInvalidatePrt(), ImplInvalidatePos(),
+|* ImplInvalidateLineNum()
|*
-|* Ersterstellung MA 15. Oct. 92
-|* Letzte Aenderung MA 24. Mar. 94
+|* Ersterstellung MA 15. Oct. 92
+|* Letzte Aenderung MA 24. Mar. 94
|*
|*************************************************************************/
/** method to perform additional actions on an invalidation
@@ -1778,10 +1778,10 @@ void SwFrm::ImplInvalidateLineNum()
/*************************************************************************
|*
-|* SwFrm::ReinitializeFrmSizeAttrFlags
+|* SwFrm::ReinitializeFrmSizeAttrFlags
|*
-|* Ersterstellung MA 15. Oct. 96
-|* Letzte Aenderung MA 15. Oct. 96
+|* Ersterstellung MA 15. Oct. 96
+|* Letzte Aenderung MA 15. Oct. 96
|*
|*************************************************************************/
void SwFrm::ReinitializeFrmSizeAttrFlags()
@@ -1795,7 +1795,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags()
{
SwFrm *pFrm = ((SwLayoutFrm*)this)->Lower();
while ( pFrm )
- { pFrm->_InvalidateSize();
+ { pFrm->_InvalidateSize();
pFrm->_InvalidatePrt();
pFrm = pFrm->GetNext();
}
@@ -1875,10 +1875,10 @@ void SwFrm::ValidateThisAndAllLowers( const USHORT nStage )
/*************************************************************************
|*
-|* SwCntntFrm::GrowFrm()
+|* SwCntntFrm::GrowFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 25. Mar. 99
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 25. Mar. 99
|*
|*************************************************************************/
SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -1987,10 +1987,10 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwCntntFrm::ShrinkFrm()
+|* SwCntntFrm::ShrinkFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 05. May. 94
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -2109,11 +2109,11 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwCntntFrm::Modify()
+|* SwCntntFrm::Modify()
|*
-|* Beschreibung
-|* Ersterstellung AK 05-Mar-1991
-|* Letzte Aenderung MA 13. Oct. 95
+|* Beschreibung
+|* Ersterstellung AK 05-Mar-1991
+|* Letzte Aenderung MA 13. Oct. 95
|*
|*************************************************************************/
void SwCntntFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
@@ -2201,7 +2201,7 @@ void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew,
rInvFlags = 0xFF;
/* kein break hier */
- case RES_PAGEDESC: //Attributaenderung (an/aus)
+ case RES_PAGEDESC: //Attributaenderung (an/aus)
if ( IsInDocBody() && !IsInTab() )
{
rInvFlags |= 0x02;
@@ -2342,10 +2342,10 @@ void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew,
/*************************************************************************
|*
-|* SwLayoutFrm::SwLayoutFrm()
+|* SwLayoutFrm::SwLayoutFrm()
|*
-|* Ersterstellung AK 14-Feb-1991
-|* Letzte Aenderung MA 12. May. 95
+|* Ersterstellung AK 14-Feb-1991
+|* Letzte Aenderung MA 12. May. 95
|*
|*************************************************************************/
SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt ):
@@ -2404,10 +2404,10 @@ SwTwips SwLayoutFrm::InnerHeight() const
/*************************************************************************
|*
-|* SwLayoutFrm::GrowFrm()
+|* SwLayoutFrm::GrowFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 23. Sep. 96
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 23. Sep. 96
|*
|*************************************************************************/
SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -2570,10 +2570,10 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*************************************************************************
|*
-|* SwLayoutFrm::ShrinkFrm()
+|* SwLayoutFrm::ShrinkFrm()
|*
-|* Ersterstellung MA 30. Jul. 92
-|* Letzte Aenderung MA 25. Mar. 99
+|* Ersterstellung MA 30. Jul. 92
+|* Letzte Aenderung MA 25. Mar. 99
|*
|*************************************************************************/
SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
@@ -2631,7 +2631,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
if ( IsPageBodyFrm() && !bBrowse )
nReal = nDist;
else
- { nReal = AdjustNeighbourhood( -nReal, bTst );
+ { nReal = AdjustNeighbourhood( -nReal, bTst );
nReal *= -1;
if ( !bTst && IsBodyFrm() && nReal < nRealDist )
{
@@ -2695,13 +2695,13 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
((SwTabFrm*)this)->SetComplete();
}
else
- { if ( IsRetoucheFrm() )
+ { if ( IsRetoucheFrm() )
SetRetouche();
if ( IsTabFrm() )
{
if( IsTabFrm() )
((SwTabFrm*)this)->SetComplete();
- if ( Lower() ) //Kann auch im Join stehen und leer sein!
+ if ( Lower() ) //Kann auch im Join stehen und leer sein!
InvalidateNextPos();
}
}
@@ -2743,15 +2743,15 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
}
/*************************************************************************
|*
-|* SwLayoutFrm::ChgLowersProp()
+|* SwLayoutFrm::ChgLowersProp()
|*
-|* Beschreibung Aendert die Grosse der direkt untergeordneten Frm's
-|* die eine Fixe Groesse haben, proportional zur Groessenaenderung der
-|* PrtArea des Frm's.
-|* Die Variablen Frm's werden auch proportional angepasst; sie werden
-|* sich schon wieder zurechtwachsen/-schrumpfen.
-|* Ersterstellung MA 11.03.92
-|* Letzte Aenderung AMA 2. Nov. 98
+|* Beschreibung Aendert die Grosse der direkt untergeordneten Frm's
+|* die eine Fixe Groesse haben, proportional zur Groessenaenderung der
+|* PrtArea des Frm's.
+|* Die Variablen Frm's werden auch proportional angepasst; sie werden
+|* sich schon wieder zurechtwachsen/-schrumpfen.
+|* Ersterstellung MA 11.03.92
+|* Letzte Aenderung AMA 2. Nov. 98
|*
|*************************************************************************/
void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
@@ -3149,12 +3149,12 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
/*************************************************************************
|*
-|* SwLayoutFrm::Format()
+|* SwLayoutFrm::Format()
|*
-|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
-|* Die Fixsize wird hier nicht eingestellt.
-|* Ersterstellung MA 28. Jul. 92
-|* Letzte Aenderung MA 21. Mar. 95
+|* Beschreibung: "Formatiert" den Frame; Frm und PrtArea.
+|* Die Fixsize wird hier nicht eingestellt.
+|* Ersterstellung MA 28. Jul. 92
+|* Letzte Aenderung MA 21. Mar. 95
|*
|*************************************************************************/
void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
@@ -3186,7 +3186,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0;
do
- { bValidSize = TRUE;
+ { bValidSize = TRUE;
//Die Groesse in der VarSize wird durch den Inhalt plus den
//Raendern bestimmt.
@@ -3230,7 +3230,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
else if ( GetType() & 0x0018 )
{
do
- { if ( Frm().Height() != pAttrs->GetSize().Height() )
+ { if ( Frm().Height() != pAttrs->GetSize().Height() )
ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height()));
bValidSize = TRUE;
MakePos();
@@ -3243,10 +3243,10 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
/*************************************************************************
|*
-|* SwLayoutFrm::InvalidatePercentLowers()
+|* SwLayoutFrm::InvalidatePercentLowers()
|*
-|* Ersterstellung MA 13. Jun. 96
-|* Letzte Aenderung MA 13. Jun. 96
+|* Ersterstellung MA 13. Jun. 96
+|* Letzte Aenderung MA 13. Jun. 96
|*
|*************************************************************************/
static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff )
@@ -3316,10 +3316,10 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
/*************************************************************************
|*
-|* SwLayoutFrm::CalcRel()
+|* SwLayoutFrm::CalcRel()
|*
-|* Ersterstellung MA 13. Jun. 96
-|* Letzte Aenderung MA 10. Oct. 96
+|* Ersterstellung MA 13. Jun. 96
+|* Letzte Aenderung MA 10. Oct. 96
|*
|*************************************************************************/
long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, BOOL ) const
@@ -3419,15 +3419,15 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
//letzten Spalte ausgerichtet.
//1. Inhalt formatieren.
//2. Hoehe der letzten Spalte ermitteln, wenn diese zu
- // zu gross ist muss der Fly wachsen.
- // Der Betrag um den der Fly waechst ist aber nicht etwa
- // der Betrag des Ueberhangs, denn wir muessen davon
- // ausgehen, dass etwas Masse zurueckfliesst und so
- // zusaetzlicher Platz geschaffen wird.
- // Im Ersten Ansatz ist der Betrag um den gewachsen wird
- // der Ueberhang geteilt durch die Spaltenanzahl oder
- // der Ueberhang selbst wenn er kleiner als die Spalten-
- // anzahl ist.
+ // zu gross ist muss der Fly wachsen.
+ // Der Betrag um den der Fly waechst ist aber nicht etwa
+ // der Betrag des Ueberhangs, denn wir muessen davon
+ // ausgehen, dass etwas Masse zurueckfliesst und so
+ // zusaetzlicher Platz geschaffen wird.
+ // Im Ersten Ansatz ist der Betrag um den gewachsen wird
+ // der Ueberhang geteilt durch die Spaltenanzahl oder
+ // der Ueberhang selbst wenn er kleiner als die Spalten-
+ // anzahl ist.
//3. Weiter mit 1. bis zur Stabilitaet.
const SwFmtCol &rCol = rAttrs.GetAttrSet().GetCol();
@@ -3741,7 +3741,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
//Es muss geeignet invalidiert werden, damit
//sich die Frms huebsch ausbalancieren
//- Der jeweils erste ab der zweiten Spalte bekommt
- // ein InvalidatePos();
+ // ein InvalidatePos();
pCol = (SwLayoutFrm*)Lower()->GetNext();
while ( pCol )
{
@@ -3784,10 +3784,10 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
/*************************************************************************
|*
-|* SwRootFrm::InvalidateAllCntnt()
+|* SwRootFrm::InvalidateAllCntnt()
|*
-|* Ersterstellung MA 13. Feb. 98
-|* Letzte Aenderung MA 12. Aug. 00
+|* Ersterstellung MA 13. Feb. 98
+|* Letzte Aenderung MA 12. Aug. 00
|*
|*************************************************************************/
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index f3df1223f718..78b9ba86e362 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index a5facaf474b9..be6723d5bafa 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
index a6585414f92b..e9ad9ce59415 100644
--- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
+++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 63169790f317..b1a96bf97078 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index 69f457f3d44d..c98e773b2f21 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 8cc24529919a..c303f3487bfb 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -2,7 +2,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
@@ -86,7 +86,7 @@ public:
virtual void Commit();
void Load();
- void SetInUnload( BOOL bFlag ) { bInUnload = bFlag; }
+ void SetInUnload( BOOL bFlag ) { bInUnload = bFlag; }
using SvPtrarr::Count;
void InsertObj( SwOLEObj& rObj );
@@ -163,17 +163,17 @@ void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (u
class SwEmbedObjectLink : public sfx2::SvBaseLink
{
- SwOLENode* pOleNode;
+ SwOLENode* pOleNode;
public:
SwEmbedObjectLink(SwOLENode* pNode);
- virtual ~SwEmbedObjectLink();
+ virtual ~SwEmbedObjectLink();
- virtual void Closed();
- virtual void DataChanged( const String& rMimeType,
+ virtual void Closed();
+ virtual void DataChanged( const String& rMimeType,
const uno::Any & rValue );
- sal_Bool Connect() { return GetRealObject() != NULL; }
+ sal_Bool Connect() { return GetRealObject() != NULL; }
};
// -----------------------------------------------------------------------------
@@ -510,7 +510,7 @@ BOOL SwOLENode::IsOLEObjectDeleted() const
if( aOLEObj.xOLERef.is() )
{
SfxObjectShell* p = GetDoc()->GetPersist();
- if( p ) // muss da sein
+ if( p ) // muss da sein
{
return !p->GetEmbeddedObjectContainer().HasEmbeddedObject( aOLEObj.aName );
//SvInfoObjectRef aRef( p->Find( aOLEObj.aName ) );
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index cdbed13e5286..b5e309331880 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -2,7 +2,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
@@ -61,9 +61,9 @@ TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
/*************************************************************************
-|* Beschreibung Methoden von SwFmtDrop
-|* Ersterstellung MS 19.02.91
-|* Letzte Aenderung JP 08.08.94
+|* Beschreibung Methoden von SwFmtDrop
+|* Ersterstellung MS 19.02.91
+|* Letzte Aenderung JP 08.08.94
*************************************************************************/
@@ -128,10 +128,10 @@ void SwFmtDrop::Modify( SfxPoolItem *, SfxPoolItem * )
// die Abpruefung nicht hinauskommt.
SwClientIter aIter( *pDefinedIn );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
pLast->Modify( this, this );
- if( !pDefinedIn->GetDepends() ) // Baum schon Weg ??
+ if( !pDefinedIn->GetDepends() ) // Baum schon Weg ??
break;
} while( 0 != ( pLast = aIter++ ));
}
@@ -169,9 +169,9 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case MID_DROPCAP_FORMAT:
{
style::DropCapFormat aDrop;
- aDrop.Lines = nLines ;
- aDrop.Count = nChars ;
- aDrop.Distance = TWIP_TO_MM100_UNSIGNED(nDistance);
+ aDrop.Lines = nLines ;
+ aDrop.Count = nChars ;
+ aDrop.Distance = TWIP_TO_MM100_UNSIGNED(nDistance);
rVal.setValue(&aDrop, ::getCppuType((const style::DropCapFormat*)0));
}
break;
@@ -225,9 +225,9 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if(rVal.getValueType() == ::getCppuType((const style::DropCapFormat*)0))
{
const style::DropCapFormat* pDrop = (const style::DropCapFormat*)rVal.getValue();
- nLines = pDrop->Lines;
- nChars = pDrop->Count;
- nDistance = MM100_TO_TWIP(pDrop->Distance);
+ nLines = pDrop->Lines;
+ nChars = pDrop->Count;
+ nDistance = MM100_TO_TWIP(pDrop->Distance);
}
else {
//exception( wrong_type)
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 8702e58a8ab5..4a2bdde4512a 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -2,7 +2,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
@@ -74,124 +74,124 @@ using namespace nsSwDocInfoSubType;
struct OldFormats
{
- NfIndexTableOffset eFormatIdx;
- USHORT nOldFormat;
+ NfIndexTableOffset eFormatIdx;
+ USHORT nOldFormat;
};
static OldFormats aOldDateFmt40[] =
{
// Datumsfelder:
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
- { NF_DATE_SYS_DMMMYYYY, DFF_DMMYY }, // 06. Okt 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY }, // 06. Oktober 1964
- { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY }, // 06. Oktober 64
- { NF_DATE_SYS_NNDMMMYY, DFF_DDMMY }, // Di, 06. Okt 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY }, // Di, 06. Oktober 64
- { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY }, // Di, 06. Oktober 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY }, // Dienstag, 06. Oktober 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY }, // Dienstag, 06. Oktober 64
- { NF_DATE_SYS_MMYY, DFF_MY }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // Tabellenende
+ { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
+ { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
+ { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
+ { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
+ { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
+ { NF_DATE_SYS_DMMMYYYY, DFF_DMMYY }, // 06. Okt 1964
+ { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY }, // 06. Oktober 1964
+ { NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY }, // 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMYY, DFF_DDMMY }, // Di, 06. Okt 64
+ { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY }, // Di, 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY }, // Di, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY }, // Dienstag, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY }, // Dienstag, 06. Oktober 64
+ { NF_DATE_SYS_MMYY, DFF_MY }, // 10.64
+ { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
+ { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
+ { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
+
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldDateFmt30[] =
{
// Datumsfelder:
- { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
- { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
- { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
- { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
- { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
- { NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/ }, // 06. Okt 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/ }, // 06. Oktober 1964
- { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/ }, // 06. Oktober 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/ }, // Di, 06. Oktober 1964
- { NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/ }, // Di, 06. Okt 64
- { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/ }, // Di, 06. Oktober 64
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/ }, // Dienstag, 06. Oktober 1964
- { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/ }, // Dienstag, 06. Oktober 64
- { NF_DATE_SYS_MMYY, 2 /*DFF_MY*/ }, // 10.64
- { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
- { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
- { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
-
- { NF_NUMERIC_START, 0 } // Tabellenende
+ { NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
+ { NF_DATE_SYSTEM_LONG, DFF_LSYS }, // Langes Systemdatum
+ { NF_DATE_SYS_DDMMYY, DFF_DMY }, // 06.10.64
+ { NF_DATE_SYS_DDMMYYYY, DFF_DMYY }, // 06.10.1964
+ { NF_DATE_SYS_DMMMYY, DFF_DMMY }, // 06. Okt 64
+ { NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/ }, // 06. Okt 1964
+ { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/ }, // 06. Oktober 1964
+ { NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/ }, // 06. Oktober 64
+ { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/ }, // Di, 06. Oktober 1964
+ { NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/ }, // Di, 06. Okt 64
+ { NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/ }, // Di, 06. Oktober 64
+ { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/ }, // Dienstag, 06. Oktober 1964
+ { NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/ }, // Dienstag, 06. Oktober 64
+ { NF_DATE_SYS_MMYY, 2 /*DFF_MY*/ }, // 10.64
+ { NF_DATE_DIN_MMDD, DFF_MD }, // 10-06
+ { NF_DATE_DIN_YYMMDD, DFF_YMD }, // 64-10-06
+ { NF_DATE_DIN_YYYYMMDD, DFF_YYMD }, // 1964-10-06
+
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldTimeFmt[] =
{
// Zeitfelder:
- { NF_TIME_HHMMSS, TF_SYSTEM }, // Systemzeit
- { NF_TIME_HHMM, TF_SSMM_24 }, // 23:25
- { NF_TIME_HHMMAMPM, TF_SSMM_12 }, // 11:25 PM
+ { NF_TIME_HHMMSS, TF_SYSTEM }, // Systemzeit
+ { NF_TIME_HHMM, TF_SSMM_24 }, // 23:25
+ { NF_TIME_HHMMAMPM, TF_SSMM_12 }, // 11:25 PM
- { NF_NUMERIC_START, 0 } // Tabellenende
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldGetSetExpFmt40[] =
{
- { NF_TEXT, VVF_CMD }, // Kommando anzeigen
- { NF_TEXT, VVF_INVISIBLE }, // unsichtbar
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
+ { NF_TEXT, VVF_CMD }, // Kommando anzeigen
+ { NF_TEXT, VVF_INVISIBLE }, // unsichtbar
+ { NF_PERCENT_INT, VVF_XXP }, // 1234%
+ { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
+ { NF_TEXT, VVF_CLEAR }, // ???
- { NF_NUMBER_SYSTEM, VVF_SYS }, // Zahlenformat aus der
+ { NF_NUMBER_SYSTEM, VVF_SYS }, // Zahlenformat aus der
// Systemeinstellung
- { NF_NUMBER_INT, VVF_X }, // 1234
- { NF_NUMBER_DEC2, VVF_X_X }, // 1234,5
- { NF_NUMBER_DEC2, VVF_X_XX }, // 1245,56
- { NF_NUMBER_1000DEC2, VVF_XX_XX }, // 1.234,56
- { NF_NUMBER_1000DEC2, VVF_XX_X }, // 1.234,5
- { NF_NUMBER_1000DEC2, VVF_XX_XXX }, // 1.234,567
- { NF_CURRENCY_1000DEC2, VVF_SYS_CUR }, // W?hrungsformat aus der
+ { NF_NUMBER_INT, VVF_X }, // 1234
+ { NF_NUMBER_DEC2, VVF_X_X }, // 1234,5
+ { NF_NUMBER_DEC2, VVF_X_XX }, // 1245,56
+ { NF_NUMBER_1000DEC2, VVF_XX_XX }, // 1.234,56
+ { NF_NUMBER_1000DEC2, VVF_XX_X }, // 1.234,5
+ { NF_NUMBER_1000DEC2, VVF_XX_XXX }, // 1.234,567
+ { NF_CURRENCY_1000DEC2, VVF_SYS_CUR }, // W?hrungsformat aus der
// Systemeinstellung
// (1.234,00 DM)
- { NF_CURRENCY_1000INT, VVF_X_CUR }, // 1234 DM
- { NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR }, // 1234,56 DM 1234,00 DM
- { NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR }, // 1234,56 DM 1234,-- DM
- { NF_CURRENCY_1000INT, VVF_CUR_X }, // DM 1234
- { NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX }, // DM 1234,56 DM 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0 }, // DM 1234,56 DM 1234,--
-
- { NF_NUMERIC_START, 0 } // Tabellenende
+ { NF_CURRENCY_1000INT, VVF_X_CUR }, // 1234 DM
+ { NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR }, // 1234,56 DM 1234,00 DM
+ { NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR }, // 1234,56 DM 1234,-- DM
+ { NF_CURRENCY_1000INT, VVF_CUR_X }, // DM 1234
+ { NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX }, // DM 1234,56 DM 1234,00
+ { NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0 }, // DM 1234,56 DM 1234,--
+
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
static OldFormats aOldGetSetExpFmt30[] =
{
- { NF_TEXT, VVF_CMD }, // Kommando anzeigen
- { NF_TEXT, VVF_INVISIBLE }, // unsichtbar
- { NF_PERCENT_INT, VVF_XXP }, // 1234%
- { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
- { NF_TEXT, VVF_CLEAR }, // ???
+ { NF_TEXT, VVF_CMD }, // Kommando anzeigen
+ { NF_TEXT, VVF_INVISIBLE }, // unsichtbar
+ { NF_PERCENT_INT, VVF_XXP }, // 1234%
+ { NF_PERCENT_DEC2, VVF_XX_XXP }, // 1.234,56%
+ { NF_TEXT, VVF_CLEAR }, // ???
- { NF_NUMBER_SYSTEM, 0x0020 }, // Zahlenformat aus der
+ { NF_NUMBER_SYSTEM, 0x0020 }, // Zahlenformat aus der
// Systemeinstellung
- { NF_NUMBER_INT, 0x0080 }, // 1234
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,56
- { NF_NUMBER_DEC2, 0x0100 }, // 1234,5
- { NF_NUMBER_DEC2, 0x0100 }, // 1245,56
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,5
- { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,567
- { NF_CURRENCY_1000DEC2, 0x0200 }, // W?hrungsformat aus der
+ { NF_NUMBER_INT, 0x0080 }, // 1234
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,56
+ { NF_NUMBER_DEC2, 0x0100 }, // 1234,5
+ { NF_NUMBER_DEC2, 0x0100 }, // 1245,56
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,5
+ { NF_NUMBER_1000DEC2, 0x0100 }, // 1.234,567
+ { NF_CURRENCY_1000DEC2, 0x0200 }, // W?hrungsformat aus der
// Systemeinstellung
// (1.234,00 DM)
- { NF_CURRENCY_1000INT, 0x1000 }, // 1234 DM
- { NF_CURRENCY_1000DEC2, 0x1000 }, // 1234,56 DM 1234,00 DM
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // 1234,56 DM 1234,-- DM
- { NF_CURRENCY_1000INT, 0x1000 }, // DM 1234
- { NF_CURRENCY_1000DEC2, 0x1000 }, // DM 1234,56 DM 1234,00
- { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // DM 1234,56 DM 1234,--
-
- { NF_NUMERIC_START, 0 } // Tabellenende
+ { NF_CURRENCY_1000INT, 0x1000 }, // 1234 DM
+ { NF_CURRENCY_1000DEC2, 0x1000 }, // 1234,56 DM 1234,00 DM
+ { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // 1234,56 DM 1234,-- DM
+ { NF_CURRENCY_1000INT, 0x1000 }, // DM 1234
+ { NF_CURRENCY_1000DEC2, 0x1000 }, // DM 1234,56 DM 1234,00
+ { NF_CURRENCY_1000DEC2_DASHED, 0x1000 }, // DM 1234,56 DM 1234,--
+
+ { NF_NUMERIC_START, 0 } // Tabellenende
};
SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
@@ -274,10 +274,10 @@ SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
{
switch( rFmt )
{
- case RF_AUTHOR: rSubType = DI_SUB_AUTHOR; break;
- case RF_TIME: rSubType = DI_SUB_TIME; break;
- case RF_DATE: rSubType = DI_SUB_DATE; break;
- case RF_ALL: rSubType = DI_SUB_DATE; break;
+ case RF_AUTHOR: rSubType = DI_SUB_AUTHOR; break;
+ case RF_TIME: rSubType = DI_SUB_TIME; break;
+ case RF_DATE: rSubType = DI_SUB_DATE; break;
+ case RF_ALL: rSubType = DI_SUB_DATE; break;
}
rFmt = 0;
}
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index b5377cb5345f..30dc2fc5ad5e 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -2,7 +2,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
@@ -45,9 +45,9 @@ using namespace ::com::sun::star;
TYPEINIT1( SwAutoCorrect, SvxAutoCorrect );
- // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
- // koennen aus der Wortliste herausgeholt werden!)
- // rShort ist der Stream-Name - gecryptet!
+ // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
+ // koennen aus der Wortliste herausgeholt werden!)
+ // rShort ist der Stream-Name - gecryptet!
BOOL SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong )
{
@@ -64,8 +64,8 @@ BOOL SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg,
return !IsError( nRet ) && rLong.Len();
}
- // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
- // rShort ist der Stream-Name - gecryptet!
+ // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
+ // rShort ist der Stream-Name - gecryptet!
BOOL SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, const String& rFileName, const String& rShort,
SfxObjectShell& rObjSh, String& rLong )
{
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index 674a33fe2c4f..f27ccc3e9c76 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ SwXMLBlockListExport::SwXMLBlockListExport(
SwXMLTextBlocks & rBlocks,
const rtl::OUString &rFileName,
uno::Reference< xml::sax::XDocumentHandler> &rHandler)
-: SvXMLExport( xServiceFactory, rFileName, rHandler ),
+: SvXMLExport( xServiceFactory, rFileName, rHandler ),
rBlockList(rBlocks)
{
_GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
@@ -92,7 +92,7 @@ SwXMLTextBlockExport::SwXMLTextBlockExport(
SwXMLTextBlocks & rBlocks,
const rtl::OUString &rFileName,
uno::Reference< xml::sax::XDocumentHandler> &rHandler)
-: SvXMLExport( xServiceFactory, rFileName, rHandler ),
+: SvXMLExport( xServiceFactory, rFileName, rHandler ),
rBlockList(rBlocks)
{
_GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 6e1d67fcef9f..b3e60d2df91d 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ sal_Char __READONLY_DATA sXML_np__text[] = "_otext";
SwXMLBlockListImport::SwXMLBlockListImport(
const uno::Reference< lang::XMultiServiceFactory > xServiceFactory,
SwXMLTextBlocks &rBlocks )
-: SvXMLImport( xServiceFactory, 0 ),
+: SvXMLImport( xServiceFactory, 0 ),
rBlockList (rBlocks)
{
GetNamespaceMap().Add( OUString ( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__block_list ) ),
@@ -80,7 +80,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport(
SwXMLTextBlocks &rBlocks,
String & rNewText,
sal_Bool bNewTextOnly )
-: SvXMLImport(xServiceFactory, IMPORT_ALL ),
+: SvXMLImport(xServiceFactory, IMPORT_ALL ),
rBlockList ( rBlocks ),
bTextOnly ( bNewTextOnly ),
m_rText ( rNewText )
diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx
index 23aa3b54370c..7cc1804f52f4 100644
--- a/sw/source/core/swg/SwXMLBlockListContext.cxx
+++ b/sw/source/core/swg/SwXMLBlockListContext.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 6473bdbc3e4f..d32852ff59d1 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ sal_Char __READONLY_DATA sXML_np__text[] = "_otext";
SwXMLSectionList::SwXMLSectionList(
const uno::Reference< lang::XMultiServiceFactory > xServiceFactory,
SvStrings & rNewSectionList)
-: SvXMLImport( xServiceFactory ),
+: SvXMLImport( xServiceFactory ),
rSectionList ( rNewSectionList )
{
GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ),
@@ -84,7 +84,7 @@ SvXMLImportContext *SwXMLSectionList::CreateContext(
)
{
pContext = new SvXMLSectionListContext (*this, nPrefix, rLocalName, xAttrList);
- }
+ }
else
pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList );
return pContext;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 9a807fd8ff11..4563b4a7056c 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -2,7 +2,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
@@ -80,11 +80,11 @@ SwXMLTextBlocks::SwXMLTextBlocks( const String& rFile )
pDoc = pDocSh->GetDoc();
xDocShellRef = pDocSh;
pDoc->SetOle2Link( Link() );
- pDoc->DoUndo( FALSE ); // always FALSE
+ pDoc->DoUndo( FALSE ); // always FALSE
pDoc->acquire();
uno::Reference< embed::XStorage > refStg;
if( !aDateModified.GetDate() || !aTimeModified.GetTime() )
- Touch(); // falls neu angelegt -> neuen ZeitStempel besorgen
+ Touch(); // falls neu angelegt -> neuen ZeitStempel besorgen
try
{
refStg = comphelper::OStorageHelper::GetStorageFromURL( rFile, embed::ElementModes::READWRITE );
@@ -184,7 +184,7 @@ ULONG SwXMLTextBlocks::Delete( USHORT n )
{
String aPckName (aNames[ n ]->aPackageName);
uno::Reference < container::XNameAccess > xAccess( xBlkRoot, uno::UNO_QUERY );
- if ( xAccess.is() &&
+ if ( xAccess.is() &&
xAccess->hasByName( aPckName ) && xBlkRoot->isStreamElement( aPckName ) )
{
try
@@ -375,7 +375,7 @@ ULONG SwXMLTextBlocks::PutBlock( SwPaM& , const String& )
sal_Bool bHasChildren = pDocSh && pDocSh->GetEmbeddedObjectContainer().HasEmbeddedObjects();
if( !nRes && bHasChildren )
{
- // we have to write to the temporary storage first, since the used below functions are optimized
+ // we have to write to the temporary storage first, since the used below functions are optimized
// TODO/LATER: it is only a temporary solution, that should be changed soon, the used methods should be
// called without optimization
@@ -386,7 +386,7 @@ ULONG SwXMLTextBlocks::PutBlock( SwPaM& , const String& )
SfxMedium* pTmpMedium = NULL;
try
{
- uno::Reference< embed::XStorage > xTempStorage =
+ uno::Reference< embed::XStorage > xTempStorage =
::comphelper::OStorageHelper::GetTemporaryStorage();
xRoot->copyToStorage( xTempStorage );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 4a90f3006c70..1b50c5aa8a23 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
ReadXML->SetBlockMode( sal_True );
aReader.Read( *ReadXML );
ReadXML->SetBlockMode( sal_False );
- // Ole objects fails to display when inserted into document
+ // Ole objects fails to display when inserted into document
// because the ObjectReplacement folder ( and contents are missing )
rtl::OUString sObjReplacements( RTL_CONSTASCII_USTRINGPARAM( "ObjectReplacements" ) );
if ( xRoot->hasByName( sObjReplacements ) )
@@ -174,8 +174,8 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
// taken from unocore/unoevents.cxx or ui/unotxt.cxx
const struct SvEventDescription aAutotextEvents[] =
{
- { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
- { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
+ { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
+ { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
{ 0, NULL }
};
@@ -472,7 +472,7 @@ ULONG SwXMLTextBlocks::PutBlockText( const String& rShort, const String& ,
else if( nErr != SVSTREAM_OK )
nRes = ERR_SWG_WRITE_ERROR;
*/
- if( !nRes ) // damit ueber GetText & nCur aufs Doc zugegriffen
+ if( !nRes ) // damit ueber GetText & nCur aufs Doc zugegriffen
MakeBlockText( rText );
return nRes;
@@ -633,7 +633,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
// open stream in proper sub-storage
if( !bFileAlreadyOpen )
{
- CloseFile(); // close (it may be open in read-only-mode)
+ CloseFile(); // close (it may be open in read-only-mode)
nRes = OpenFile ( FALSE );
}
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 5ac253e82a51..4415c3bae337 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@
#include <shellio.hxx>
#include <swblocks.hxx>
#include <ndtxt.hxx>
-#include <mdiexp.hxx> // Progress
+#include <mdiexp.hxx> // Progress
#include <SwXMLTextBlocks.hxx>
#include <docsh.hxx>
#include <swunohelper.hxx>
@@ -263,8 +263,8 @@ SwTextBlocks::SwTextBlocks( const String& rFile )
{
//case SWBLK_SW2: pImp = new Sw2TextBlocks( sFileName ); break;
//case SWBLK_SW3: pImp = new Sw3TextBlocks( sFileName ); break;
- case SWBLK_XML: pImp = new SwXMLTextBlocks( sFileName ); break;
- case SWBLK_NO_FILE: pImp = new SwXMLTextBlocks( sFileName ); break;
+ case SWBLK_XML: pImp = new SwXMLTextBlocks( sFileName ); break;
+ case SWBLK_NO_FILE: pImp = new SwXMLTextBlocks( sFileName ); break;
}
if( !pImp )
nErr = ERR_SWG_FILE_FORMAT_ERROR;
@@ -528,7 +528,7 @@ USHORT SwTextBlocks::Rename( USHORT n, const String* s, const String* l )
if( pImp->IsFileChanged() )
nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
- else if( 0 == ( nErr = pImp->OpenFile( FALSE )))
+ else if( 0 == ( nErr = pImp->OpenFile( FALSE )))
{
// Vorher den neuen Eintrag in die Liste setzen!
GetAppCharClass().toUpper( aNew );
@@ -574,12 +574,12 @@ BOOL SwTextBlocks::BeginGetDoc( USHORT n )
{
// diese Optimierierung darf es nicht mehr geben. OLE-Objecte muessen auf
// ihre SubStorages zugreifem koennen!
-// if( n == pImp->nCur )
-// return TRUE;
+// if( n == pImp->nCur )
+// return TRUE;
if( pImp->IsFileChanged() )
nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
- else if( 0 == ( nErr = pImp->OpenFile( TRUE )))
+ else if( 0 == ( nErr = pImp->OpenFile( TRUE )))
{
pImp->ClearDoc();
nErr = pImp->GetDoc( n );
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index ed3cafb5dd65..79d6f41ccb17 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2,7 +2,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
@@ -691,7 +691,7 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
_FndBox aFndBox( 0, 0 );
aFndBox.SetTableLines( rBoxes, *this );
aFndBox.DelFrms( *this );
-// aFndBox.SaveChartData( *this );
+// aFndBox.SaveChartData( *this );
SwTableNode* pTblNd = GetTableNode();
std::vector<SwTableBoxFmt*> aInsFormat( nCnt, 0 );
@@ -772,7 +772,7 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
}
aFndBox.MakeFrms( *this );
-// aFndBox.RestoreChartData( *this );
+// aFndBox.RestoreChartData( *this );
#if OSL_DEBUG_LEVEL > 1
{
const SwTableBoxes &rTabBoxes = aLines[0]->GetTabBoxes();
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 8ac153130547..a28dd7060d6f 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <ctype.h>
#include <float.h>
#include <hintids.hxx>
-#include <hints.hxx> // fuer SwAttrSetChg
+#include <hints.hxx> // fuer SwAttrSetChg
#include <editeng/lrspitem.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/adjitem.hxx>
@@ -52,7 +52,7 @@
#include <fmtfld.hxx>
#include <frmatr.hxx>
#include <doc.hxx>
-#include <docary.hxx> // fuer RedlineTbl()
+#include <docary.hxx> // fuer RedlineTbl()
#include <frame.hxx>
#include <swtable.hxx>
#include <ndtxt.hxx>
@@ -113,10 +113,10 @@ public:
mbDummyFlag( false ) {}
~SwTableBox_Impl() { delete mpUserColor; delete mpNumFmtColor; }
- const Color* GetSaveUserColor() const { return mpUserColor; }
- const Color* GetSaveNumFmtColor() const { return mpNumFmtColor; }
- void SetSaveUserColor(const Color* p ) { SetNewCol( &mpUserColor, p ); }
- void SetSaveNumFmtColor( const Color* p ) { SetNewCol( &mpNumFmtColor, p ); }
+ const Color* GetSaveUserColor() const { return mpUserColor; }
+ const Color* GetSaveNumFmtColor() const { return mpNumFmtColor; }
+ void SetSaveUserColor(const Color* p ) { SetNewCol( &mpUserColor, p ); }
+ void SetSaveNumFmtColor( const Color* p ) { SetNewCol( &mpNumFmtColor, p ); }
long getRowSpan() const { return mnRowSpan; }
void setRowSpan( long nNewRowSpan ) { mnRowSpan = nNewRowSpan; }
bool getDummyFlag() const { return mbDummyFlag; }
@@ -262,7 +262,7 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
/*************************************************************************
|*
-|* SwTable::SwTable()
+|* SwTable::SwTable()
|*
|*
|*************************************************************************/
@@ -302,7 +302,7 @@ SwTable::~SwTable()
if( refObj.Is() )
{
SwDoc* pDoc = GetFrmFmt()->GetDoc();
- if( !pDoc->IsInDtor() ) // then remove from the list
+ if( !pDoc->IsInDtor() ) // then remove from the list
pDoc->GetLinkManager().RemoveServer( &refObj );
refObj->Closed();
@@ -311,16 +311,16 @@ SwTable::~SwTable()
// ist die Tabelle der letzte Client im FrameFormat, kann dieses
// geloescht werden
SwTableFmt* pFmt = (SwTableFmt*)GetFrmFmt();
- pFmt->Remove( this ); // austragen,
+ pFmt->Remove( this ); // austragen,
if( !pFmt->GetDepends() )
- pFmt->GetDoc()->DelTblFrmFmt( pFmt ); // und loeschen
+ pFmt->GetDoc()->DelTblFrmFmt( pFmt ); // und loeschen
// Loesche die Pointer aus dem SortArray der Boxen, die
// Objecte bleiben erhalten und werden vom DTOR der Lines/Boxes
// Arrays geloescht.
//JP: reicht leider nicht, es muessen die Pointer auf den StartNode
- // der Section geloescht werden
+ // der Section geloescht werden
DelBoxNode( aSortCntBoxes );
aSortCntBoxes.Remove( (USHORT)0, aSortCntBoxes.Count() );
delete pHTMLLayout;
@@ -329,7 +329,7 @@ SwTable::~SwTable()
/*************************************************************************
|*
-|* SwTable::Modify()
+|* SwTable::Modify()
|*
|*
|*************************************************************************/
@@ -437,7 +437,7 @@ void SwTable::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
}
}
else
- SwClient::Modify( pOld, pNew ); // fuers ObjectDying
+ SwClient::Modify( pOld, pNew ); // fuers ObjectDying
}
void SwTable::AdjustWidths( const long nOld, const long nNew )
@@ -448,7 +448,7 @@ void SwTable::AdjustWidths( const long nOld, const long nNew )
/*************************************************************************
|*
-|* SwTable::GetTabCols()
+|* SwTable::GetTabCols()
|*
|*
|*************************************************************************/
@@ -480,7 +480,7 @@ void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
const SwTableBox *pCur = pBox;
const SwTableLine *pLine = pBox->GetUpper();
while ( pLine )
- { const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
+ { const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
for ( USHORT i = 0; i < rBoxes.Count(); ++i )
{
SwTwips nWidth = rBoxes[i]->GetFrmFmt()->GetFrmSize().GetWidth();
@@ -513,7 +513,7 @@ void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
if ( (nPos >= ((nCmp >= COLFUZZY) ? nCmp - COLFUZZY : nCmp)) &&
(nPos <= (nCmp + COLFUZZY)) )
{
- bInsert = FALSE; //Hat ihn schon.
+ bInsert = FALSE; //Hat ihn schon.
}
else if ( nPos < nCmp )
{
@@ -575,7 +575,7 @@ void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill,
{
const SwTableLines &rLines = pBox->GetTabLines();
for ( USHORT i = 0; i < rLines.Count(); ++i )
- { const SwTableBoxes &rBoxes = rLines[i]->GetTabBoxes();
+ { const SwTableBoxes &rBoxes = rLines[i]->GetTabBoxes();
for ( USHORT j = 0; j < rBoxes.Count(); ++j )
::lcl_ProcessBoxGet( rBoxes[j], rToFill, pTabFmt, bRefreshHidden);
}
@@ -632,11 +632,11 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
//Eingetragen werden:
//1. Alle Boxen unterhalb der dem Start uebergeordneten Line sowie
- // deren untergeordnete Boxen falls vorhanden.
+ // deren untergeordnete Boxen falls vorhanden.
//2. Ausgehend von der Line die uebergeordnete Box sowie deren Nachbarn;
- // nicht aber deren untergeordnete.
+ // nicht aber deren untergeordnete.
//3. Mit der der Boxenkette uebergeordneten Line wieder wie 2. bis einer
- // Line keine Box (sondern die Table) uebergeordnet ist.
+ // Line keine Box (sondern die Table) uebergeordnet ist.
//Es werden nur diejenigen Boxen eingetragen, die keine weiteren Zeilen
//enhalten. Die eintragende Funktion sorgt dafuer, dass keine doppelten
//eingetragen werden. Um dies zu gewaehrleisten wird mit einer gewissen
@@ -646,7 +646,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
//Rand abgedeckt.
//4. Nochmalige abscannen der Tabelle und eintragen _aller_ Boxen,
- // jetzt aber als Hidden.
+ // jetzt aber als Hidden.
const SwFrmFmt *pTabFmt = GetFrmFmt();
@@ -700,7 +700,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
/*************************************************************************
|*
-|* SwTable::SetTabCols()
+|* SwTable::SetTabCols()
|*
|*
|*************************************************************************/
@@ -737,7 +737,7 @@ void lcl_ProcessLine( SwTableLine *pLine, Parm &rParm )
void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
{
if ( pBox->GetTabLines().Count() )
- { SwTableLines &rLines = pBox->GetTabLines();
+ { SwTableLines &rLines = pBox->GetTabLines();
for ( int i = rLines.Count()-1; i >= 0; --i )
lcl_ProcessLine( rLines[ static_cast< USHORT >(i) ], rParm );
}
@@ -759,7 +759,7 @@ void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
const SwTableLine *pLine = pBox->GetUpper();
while ( pLine )
- { const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
+ { const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
for ( USHORT i = 0; (i < rBoxes.Count()) && (rBoxes[i] != pCur); ++i)
{
sal_uInt64 nWidth = rBoxes[i]->GetFrmFmt()->
@@ -796,7 +796,7 @@ void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
nRightDiff= nRightPos!= USHRT_MAX ?
(int)rParm.rNew[nRightPos] - (int)rParm.rOld[nRightPos] : 0;
}
- else //Die erste Box.
+ else //Die erste Box.
{
nLeftDiff = (long)rParm.rOld.GetLeft() - (long)rParm.rNew.GetLeft();
if ( rParm.rOld.Count() )
@@ -822,9 +822,9 @@ void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
}
//MA 11. Feb. 99: #61577# 0 sollte doch gerade richtig sein, weil die
//Kante doch schon in SetTabCols() korrigiert wurde.
-// else
-// nRightDiff = (long)rParm.rNew.GetRight() -
-// (long)rParm.rOld.GetRight();
+// else
+// nRightDiff = (long)rParm.rNew.GetRight() -
+// (long)rParm.rOld.GetRight();
}
if( pBox->getRowSpan() == 1 )
@@ -926,8 +926,8 @@ void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm )
//Groesse der Box anpassen.
SwFmtFrmSize aFmtFrmSize( pBox->GetFrmFmt()->GetFrmSize() );
aFmtFrmSize.SetWidth( aFmtFrmSize.GetWidth() + nDiff );
-//#30009# if ( aFmtFrmSize.GetWidth() < 0 )
-// aFmtFrmSize.SetWidth( -aFmtFrmSize.GetWidth() );
+//#30009# if ( aFmtFrmSize.GetWidth() < 0 )
+// aFmtFrmSize.SetWidth( -aFmtFrmSize.GetWidth() );
rParm.aShareFmts.SetSize( *pBox, aFmtFrmSize );
}
@@ -937,7 +937,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
{
CHECK_TABLE( *this )
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
+ SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
// FME: Made rOld const. The caller is responsible for passing correct
// values of rOld. Therefore we do not have to call GetTabCols anymore:
@@ -1012,7 +1012,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
{
aParm.nNewWish += nTabDiff;
if ( aParm.nNewWish < 0 )
- aParm.nNewWish = USHRT_MAX; //Uuups! Eine Rolle rueckwaerts.
+ aParm.nNewWish = USHRT_MAX; //Uuups! Eine Rolle rueckwaerts.
SwFmtFrmSize aSz( pFmt->GetFrmSize() );
if ( aSz.GetWidth() != aParm.nNewWish )
{
@@ -1069,7 +1069,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
}
}
else
- { //Die gesamte Tabelle anzupassen ist 'einfach'.
+ { //Die gesamte Tabelle anzupassen ist 'einfach'.
//Es werden alle Boxen, die keine Lines mehr enthalten angepasst.
//Diese Boxen passen alle uebergeordneten Boxen entsprechend mit an.
//Um uns nicht selbst hereinzulegen muss natuerlich rueckwaerst
@@ -1393,8 +1393,8 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
/*************************************************************************
|*
-|* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const
-|* gebe den Pointer auf die benannte Box zurueck.
+|* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const
+|* gebe den Pointer auf die benannte Box zurueck.
|*
|*
|*************************************************************************/
@@ -1437,7 +1437,7 @@ USHORT SwTable::_GetBoxNum( String& rStr, BOOL bFirstPart,
nRet = nRet * 52 + cChar;
++nPos;
}
- rStr.Erase( 0, nPos ); // Zeichen aus dem String loeschen
+ rStr.Erase( 0, nPos ); // Zeichen aus dem String loeschen
}
else if( STRING_NOTFOUND == ( nPos = rStr.Search( aDotStr ) ))
{
@@ -1580,7 +1580,7 @@ BOOL SwTable::IsTblComplex() const
/*************************************************************************
|*
-|* SwTableLine::SwTableLine()
+|* SwTableLine::SwTableLine()
|*
|*
|*************************************************************************/
@@ -1597,14 +1597,14 @@ SwTableLine::~SwTableLine()
// ist die TabelleLine der letzte Client im FrameFormat, kann dieses
// geloescht werden
SwModify* pMod = GetFrmFmt();
- pMod->Remove( this ); // austragen,
+ pMod->Remove( this ); // austragen,
if( !pMod->GetDepends() )
- delete pMod; // und loeschen
+ delete pMod; // und loeschen
}
/*************************************************************************
|*
-|* SwTableLine::ClaimFrmFmt(), ChgFrmFmt()
+|* SwTableLine::ClaimFrmFmt(), ChgFrmFmt()
|*
|*
|*************************************************************************/
@@ -1729,7 +1729,7 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const
/*************************************************************************
|*
-|* SwTableBox::SwTableBox()
+|* SwTableBox::SwTableBox()
|*
|*
|*************************************************************************/
@@ -1760,8 +1760,8 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx,
OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
GetTabSortBoxes();
- SwTableBox* p = this; // error: &this
- rSrtArr.Insert( p ); // eintragen
+ SwTableBox* p = this; // error: &this
+ rSrtArr.Insert( p ); // eintragen
}
SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp ) :
@@ -1778,8 +1778,8 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableL
OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
GetTabSortBoxes();
- SwTableBox* p = this; // error: &this
- rSrtArr.Insert( p ); // eintragen
+ SwTableBox* p = this; // error: &this
+ rSrtArr.Insert( p ); // eintragen
}
SwTableBox::~SwTableBox()
@@ -1792,16 +1792,16 @@ SwTableBox::~SwTableBox()
OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
GetTabSortBoxes();
- SwTableBox *p = this; // error: &this
- rSrtArr.Remove( p ); // austragen
+ SwTableBox *p = this; // error: &this
+ rSrtArr.Remove( p ); // austragen
}
// ist die TabelleBox der letzte Client im FrameFormat, kann dieses
// geloescht werden
SwModify* pMod = GetFrmFmt();
- pMod->Remove( this ); // austragen,
+ pMod->Remove( this ); // austragen,
if( !pMod->GetDepends() )
- delete pMod; // und loeschen
+ delete pMod; // und loeschen
delete pImpl;
}
@@ -1832,7 +1832,7 @@ SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt )
/*************************************************************************
|*
-|* SwTableBox::ClaimFrmFmt(), ChgFrmFmt()
+|* SwTableBox::ClaimFrmFmt(), ChgFrmFmt()
|*
|*
|*************************************************************************/
@@ -1915,15 +1915,15 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
/*************************************************************************
|*
-|* String SwTableBox::GetName() const
-|* gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt
-|* und ergibt sich aus der Position in den Lines/Boxen/Tabelle
+|* String SwTableBox::GetName() const
+|* gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt
+|* und ergibt sich aus der Position in den Lines/Boxen/Tabelle
|*
|*
|*************************************************************************/
void lcl_GetTblBoxColStr( USHORT nCol, String& rNm )
{
- const USHORT coDiff = 52; // 'A'-'Z' 'a' - 'z'
+ const USHORT coDiff = 52; // 'A'-'Z' 'a' - 'z'
USHORT nCalc;
do {
@@ -1942,7 +1942,7 @@ void lcl_GetTblBoxColStr( USHORT nCol, String& rNm )
String SwTableBox::GetName() const
{
- if( !pSttNd ) // keine Content Box ??
+ if( !pSttNd ) // keine Content Box ??
{
// die naechste erste Box suchen ??
return aEmptyStr;
@@ -1977,7 +1977,7 @@ String SwTableBox::GetName() const
BOOL SwTableBox::IsInHeadline( const SwTable* pTbl ) const
{
- if( !GetUpper() ) // sollte nur beim Merge vorkommen.
+ if( !GetUpper() ) // sollte nur beim Merge vorkommen.
return FALSE;
if( !pTbl )
@@ -2076,7 +2076,7 @@ void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
BOOL bChgAlign,ULONG nNdPos )
{
-
+
if( ULONG_MAX != nNdPos )
{
SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
@@ -2372,16 +2372,16 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
}
// Logik:
- // ValueAenderung: -> "simuliere" eine FormatAenderung!
+ // ValueAenderung: -> "simuliere" eine FormatAenderung!
// FormatAenderung:
// Text -> !Text oder FormatAenderung:
- // - Ausrichtung auf RECHTS, wenn LINKS oder Blocksatz
- // - vertikale Ausrichtung auf UNTEN wenn OBEN oder nicht
- // gesetzt ist.
- // - Text ersetzen (Farbe?? neg. Zahlen ROT??)
+ // - Ausrichtung auf RECHTS, wenn LINKS oder Blocksatz
+ // - vertikale Ausrichtung auf UNTEN wenn OBEN oder nicht
+ // gesetzt ist.
+ // - Text ersetzen (Farbe?? neg. Zahlen ROT??)
// !Text -> Text:
- // - Ausrichtung auf LINKS, wenn RECHTS
- // - vertikale Ausrichtung auf OEBN, wenn UNTEN gesetzt ist
+ // - Ausrichtung auf LINKS, wenn RECHTS
+ // - vertikale Ausrichtung auf OEBN, wenn UNTEN gesetzt ist
SvNumberFormatter* pNumFmtr = GetDoc()->GetNumberFormatter();
BOOL bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
@@ -2410,7 +2410,7 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
lcl_TabToBlankAtSttEnd( aTxt );
// JP 22.04.98: Bug 49659 -
- // Sonderbehandlung fuer Prozent
+ // Sonderbehandlung fuer Prozent
BOOL bIsNumFmt = FALSE;
if( NUMBERFORMAT_PERCENT ==
pNumFmtr->GetType( nNewFmt ))
@@ -2470,9 +2470,9 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
// auf jedenfall muessen jetzt die Formeln/Values
// geloescht werden!
- // LockModify();
- // ResetAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
- // UnlockModify();
+ // LockModify();
+ // ResetAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
+ // UnlockModify();
ChgNumToText( *pBox, nNewFmt );
@@ -2716,22 +2716,22 @@ public:
: m_pTable(NULL), m_pCellFrm(NULL), m_pTabFrm(NULL)
{
}
-
+
~Impl() {}
- void setTable(const SwTable * pTable) {
- m_pTable = pTable;
+ void setTable(const SwTable * pTable) {
+ m_pTable = pTable;
SwFrmFmt * pFrmFmt = m_pTable->GetFrmFmt();
SwClientIter aIter(*pFrmFmt);
-
- m_pTabFrm =
+
+ m_pTabFrm =
static_cast<const SwTabFrm *>(aIter.First(TYPE(SwTabFrm)));
if (m_pTabFrm->IsFollow())
m_pTabFrm = m_pTabFrm->FindMaster(true);
}
const SwTable * getTable() const { return m_pTable; }
-
+
const SwCellFrm * getCellFrm() const { return m_pCellFrm; }
const SwFrm * getNextFrmInTable(const SwFrm * pFrm);
@@ -2748,12 +2748,12 @@ const SwFrm * SwTableCellInfo::Impl::getNextFrmInTable(const SwFrm * pFrm)
pResult = pFrm->GetLower();
else if (pFrm->GetNext())
pResult = pFrm->GetNext();
- else
+ else
{
while (pFrm->GetUpper() != NULL)
{
pFrm = pFrm->GetUpper();
-
+
if (pFrm->IsTabFrm())
{
m_pTabFrm = static_cast<const SwTabFrm *>(pFrm)->GetFollow();
@@ -2793,7 +2793,7 @@ const SwCellFrm * SwTableCellInfo::Impl::getNextTableBoxsCellFrm(const SwFrm * p
while ((pFrm = getNextCellFrm(pFrm)) != NULL)
{
- const SwCellFrm * pCellFrm = static_cast<const SwCellFrm *>(pFrm);
+ const SwCellFrm * pCellFrm = static_cast<const SwCellFrm *>(pFrm);
const SwTableBox * pTabBox = pCellFrm->GetTabBox();
TableBoxes_t::const_iterator aIt = m_HandledTableBoxes.find(pTabBox);
@@ -2833,7 +2833,7 @@ SwTableCellInfo::SwTableCellInfo(const SwTable * pTable)
}
SwTableCellInfo::~SwTableCellInfo()
-{
+{
}
bool SwTableCellInfo::getNext()
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index dbe781de1e0d..3aefbe097d06 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -2,7 +2,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
@@ -1159,8 +1159,8 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
//
if ( pTxtNd->IsOutline() )
{
- //int nRealLevel = pTxtNd->GetOutlineLevel(); //#outline level,zhaojianwei
- int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
+ //int nRealLevel = pTxtNd->GetOutlineLevel(); //#outline level,zhaojianwei
+ int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
nRealLevel = nRealLevel > 5 ? 5 : nRealLevel;
nPDFType = static_cast<USHORT>(vcl::PDFWriter::H1 + nRealLevel);
diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx b/sw/source/core/text/SwGrammarMarkUp.cxx
index b3873d6b7ff9..3e91700a83ea 100644
--- a/sw/source/core/text/SwGrammarMarkUp.cxx
+++ b/sw/source/core/text/SwGrammarMarkUp.cxx
@@ -2,7 +2,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
@@ -60,7 +60,7 @@ void SwGrammarMarkUp::MoveGrammar( xub_StrLen nPos, long nDiff )
xub_StrLen nEnd = nDiff < 0 ? xub_StrLen(nPos - nDiff) : nPos;
while( pIter != maSentence.end() )
{
- if( *pIter >= nEnd )
+ if( *pIter >= nEnd )
*pIter = xub_StrLen( *pIter + nDiff );
else
*pIter = nPos;
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index c22dbeef3e9e..513ca18f972c 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index c950e57942db..d212a5356fac 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -2,7 +2,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
@@ -82,7 +82,7 @@
* Also adjust NUM_ATTRIBUTE_STACKS in atrhndl.hxx.
*************************************************************************/
-const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) -
+const BYTE StackPos[ static_cast<USHORT>(RES_TXTATR_WITHEND_END) -
static_cast<USHORT>(RES_CHRATR_BEGIN) + 1 ] =
{
0, // // 0
@@ -747,12 +747,12 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
{
const USHORT nStackPos = StackPos[ RES_CHRATR_HIDDEN ];
const SwTxtAttr* pTopAt = aAttrStack[ nStackPos ].Top();
-
- const SfxPoolItem* pTmpItem = pTopAt ?
+
+ const SfxPoolItem* pTmpItem = pTopAt ?
CharFmt::GetItem( *pTopAt, RES_CHRATR_HIDDEN ) :
pDefaultArray[ nStackPos ];
-
- if( (mpShell && !mpShell->GetWin()) ||
+
+ if( (mpShell && !mpShell->GetWin()) ||
(pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue()) )
{
rFnt.SetUnderline( ((SvxUnderlineItem&)rItem).GetLineStyle() );
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 3c22e748608e..ee138a4a9d68 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -2,7 +2,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
@@ -33,15 +33,15 @@
#include <tools/debug.hxx>
#include "viewsh.hxx"
#include "rootfrm.hxx" // GetOleShell()
-#include "txtfrm.hxx" // FindRootFrm()
+#include "txtfrm.hxx" // FindRootFrm()
#include "blink.hxx"
#include "porlin.hxx"
#include "porlay.hxx" // SwLineLayout
// Sichtbare Zeit:
-#define BLINK_ON_TIME 2400L
+#define BLINK_ON_TIME 2400L
// Nihct sichtbare Zeit:
-#define BLINK_OFF_TIME 800L
+#define BLINK_OFF_TIME 800L
/*************************************************************************
* pBlink zeigt auf die Instanz, bei der sich blinkende Portions anmelden
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index fcc1815c6764..8c8296fb39b4 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -2,7 +2,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
@@ -30,8 +30,8 @@
#include "precompiled_sw.hxx"
-#include "ndtxt.hxx" // GetNode()
-#include "pam.hxx" // SwPosition
+#include "ndtxt.hxx" // GetNode()
+#include "pam.hxx" // SwPosition
#include "frmtool.hxx"
#include "viewopt.hxx"
#include "paratr.hxx"
@@ -50,12 +50,12 @@
#include <unicode/ubidi.h>
#include "txtcfg.hxx"
-#include "txtfrm.hxx" // SwTxtFrm
-#include "inftxt.hxx" // SwTxtSizeInfo
-#include "itrtxt.hxx" // SwTxtCursor
-#include "crstate.hxx" // SwTxtCursor
-#include "viewsh.hxx" // InvalidateWindows
-#include "swfntcch.hxx" // SwFontAccess
+#include "txtfrm.hxx" // SwTxtFrm
+#include "inftxt.hxx" // SwTxtSizeInfo
+#include "itrtxt.hxx" // SwTxtCursor
+#include "crstate.hxx" // SwTxtCursor
+#include "viewsh.hxx" // InvalidateWindows
+#include "swfntcch.hxx" // SwFontAccess
#include "flyfrm.hxx"
#if OSL_DEBUG_LEVEL > 1
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
*/
/*************************************************************************
- * GetAdjFrmAtPos()
+ * GetAdjFrmAtPos()
*************************************************************************/
SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
@@ -155,7 +155,7 @@ sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
}
/*************************************************************************
- * GetFrmAtOfst(), GetFrmAtPos()
+ * GetFrmAtOfst(), GetFrmAtPos()
*************************************************************************/
// OD 07.10.2003 #110978#
@@ -187,7 +187,7 @@ SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
}
/*************************************************************************
- * SwTxtFrm::GetCharRect()
+ * SwTxtFrm::GetCharRect()
*************************************************************************/
/*
@@ -210,7 +210,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
//- die gecachten Informationen verworfen sein koennen (GetPara() == 0)
//- das ein Follow gemeint sein kann
//- das die Kette der Follows dynamisch waechst; der in den wir
- // schliesslich gelangen muss aber Formatiert sein.
+ // schliesslich gelangen muss aber Formatiert sein.
// opt: reading ahead erspart uns ein GetAdjFrmAtPos
const sal_Bool bRightMargin = pCMS && ( MV_RIGHTMARGIN == pCMS->eState );
@@ -374,7 +374,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
}
/*************************************************************************
- * SwTxtFrm::GetAutoPos()
+ * SwTxtFrm::GetAutoPos()
*************************************************************************/
/*
@@ -535,7 +535,7 @@ bool SwTxtFrm::GetTopOfLine( SwTwips& _onTopOfLine,
}
/*************************************************************************
- * SwTxtFrm::_GetCrsrOfst()
+ * SwTxtFrm::_GetCrsrOfst()
*************************************************************************/
// Minimaler Abstand von nichtleeren Zeilen etwas weniger als 2 cm
@@ -549,9 +549,9 @@ struct SwFillData
const Point& rPoint;
SwTwips nLineWidth;
sal_Bool bFirstLine : 1;
- sal_Bool bInner : 1;
- sal_Bool bColumn : 1;
- sal_Bool bEmpty : 1;
+ sal_Bool bInner : 1;
+ sal_Bool bColumn : 1;
+ sal_Bool bEmpty : 1;
SwFillData( const SwCrsrMoveState *pC, SwPosition* pP, const SwRect& rR,
const Point& rPt ) : aFrm( rR ), pCMS( pC ), pPos( pP ), rPoint( rPt ),
nLineWidth( 0 ), bFirstLine( sal_True ), bInner( sal_False ), bColumn( sal_False ),
@@ -687,7 +687,7 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
}
/*************************************************************************
- * virtual SwTxtFrm::GetCrsrOfst()
+ * virtual SwTxtFrm::GetCrsrOfst()
*************************************************************************/
sal_Bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
@@ -706,7 +706,7 @@ sal_Bool SwTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& rPoint,
}
/*************************************************************************
- * SwTxtFrm::LeftMargin()
+ * SwTxtFrm::LeftMargin()
*************************************************************************/
/*
@@ -747,7 +747,7 @@ sal_Bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
}
/*************************************************************************
- * SwTxtFrm::RightMargin()
+ * SwTxtFrm::RightMargin()
*************************************************************************/
/*
@@ -794,7 +794,7 @@ sal_Bool SwTxtFrm::RightMargin(SwPaM *pPam, sal_Bool bAPI) const
}
/*************************************************************************
- * SwTxtFrm::_UnitUp()
+ * SwTxtFrm::_UnitUp()
*************************************************************************/
//Die beiden folgenden Methoden versuchen zunaechst den Crsr in die
@@ -1148,7 +1148,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel,
UErrorCode nError = U_ZERO_ERROR;
UBiDi* pBidi = ubidi_openSized( nLen, 0, &nError );
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), nLen, nDefaultDir, NULL, &nError ); // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), nLen, nDefaultDir, NULL, &nError ); // UChar != sal_Unicode in MinGW
xub_StrLen nTmpPos;
sal_Bool bOutOfBounds = sal_False;
@@ -1206,7 +1206,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel,
}
/*************************************************************************
- * SwTxtFrm::_UnitDown()
+ * SwTxtFrm::_UnitDown()
*************************************************************************/
sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
@@ -1335,7 +1335,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
}
/*************************************************************************
- * virtual SwTxtFrm::UnitUp()
+ * virtual SwTxtFrm::UnitUp()
*************************************************************************/
sal_Bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
@@ -1358,7 +1358,7 @@ sal_Bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
}
/*************************************************************************
- * virtual SwTxtFrm::UnitDown()
+ * virtual SwTxtFrm::UnitDown()
*************************************************************************/
sal_Bool SwTxtFrm::UnitDown(SwPaM *pPam, const SwTwips nOffset,
@@ -1552,7 +1552,7 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
if( rFill.X() >= nRight )
{
if( FILL_INDENT != rFill.Mode() && ( rFill.bEmpty ||
- rFill.X() > rFill.nLineWidth + FILL_MIN_DIST ) )
+ rFill.X() > rFill.nLineWidth + FILL_MIN_DIST ) )
{
rFill.SetOrient( text::HoriOrientation::RIGHT );
rRect.Left( nRight );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 73f788ab6bbe..930f80cfd682 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -2,7 +2,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
@@ -33,33 +33,33 @@
#include <hintids.hxx>
#include <editeng/keepitem.hxx>
#include <editeng/hyznitem.hxx>
-#include <pagefrm.hxx> // ChangeFtnRef
-#include <ndtxt.hxx> // MakeFrm()
-#include <dcontact.hxx> // SwDrawContact
-#include <dflyobj.hxx> // SwVirtFlyDrawObj
+#include <pagefrm.hxx> // ChangeFtnRef
+#include <ndtxt.hxx> // MakeFrm()
+#include <dcontact.hxx> // SwDrawContact
+#include <dflyobj.hxx> // SwVirtFlyDrawObj
#include <flyfrm.hxx>
-#include <ftnfrm.hxx> // SwFtnFrm
+#include <ftnfrm.hxx> // SwFtnFrm
#include <txtftn.hxx>
#include <fmtftn.hxx>
#include <paratr.hxx>
-#include <viewopt.hxx> // SwViewOptions
-#include <viewsh.hxx> // ViewShell
+#include <viewopt.hxx> // SwViewOptions
+#include <viewsh.hxx> // ViewShell
#include <frmatr.hxx>
#include <pam.hxx>
#include <flyfrms.hxx>
#include <fmtanchr.hxx>
#include <txtcfg.hxx>
-#include <itrform2.hxx> // SwTxtFormatter
-#include <widorp.hxx> // Widows and Orphans
+#include <itrform2.hxx> // SwTxtFormatter
+#include <widorp.hxx> // Widows and Orphans
#include <txtcache.hxx>
-#include <porrst.hxx> // SwEmptyPortion
-#include <blink.hxx> // pBlink
-#include <porfld.hxx> // SwFldPortion
-#include <sectfrm.hxx> // SwSectionFrm
-#include <pormulti.hxx> // SwMultiPortion
+#include <porrst.hxx> // SwEmptyPortion
+#include <blink.hxx> // pBlink
+#include <porfld.hxx> // SwFldPortion
+#include <sectfrm.hxx> // SwSectionFrm
+#include <pormulti.hxx> // SwMultiPortion
#include <rootfrm.hxx>
-#include <frmfmt.hxx> // SwFrmFmt
+#include <frmfmt.hxx> // SwFrmFmt
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
@@ -75,10 +75,10 @@ public:
MSHORT FormatLevel::nLevel = 0;
/*************************************************************************
- * ValidateTxt/Frm()
+ * ValidateTxt/Frm()
*************************************************************************/
-void ValidateTxt( SwFrm *pFrm ) // Freund vom Frame
+void ValidateTxt( SwFrm *pFrm ) // Freund vom Frame
{
if ( ( ! pFrm->IsVertical() &&
pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
@@ -110,7 +110,7 @@ void SwTxtFrm::ValidateFrm()
SWAP_IF_SWAPPED( this )
if ( !IsInFly() && !IsInTab() )
- { //Innerhalb eines Flys nur this validieren, der Rest sollte eigentlich
+ { //Innerhalb eines Flys nur this validieren, der Rest sollte eigentlich
//nur fuer Fussnoten notwendig sein und die gibt es innerhalb von
//Flys nicht. Fix fuer 5544
SwSectionFrm* pSct = FindSctFrm();
@@ -140,7 +140,7 @@ void SwTxtFrm::ValidateFrm()
}
/*************************************************************************
- * ValidateBodyFrm()
+ * ValidateBodyFrm()
*************************************************************************/
// nach einem RemoveFtn muss der BodyFrm und alle innenliegenden kalkuliert
@@ -179,7 +179,7 @@ void SwTxtFrm::ValidateBodyFrm()
}
/*************************************************************************
- * SwTxtFrm::FindBodyFrm()
+ * SwTxtFrm::FindBodyFrm()
*************************************************************************/
sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
@@ -211,7 +211,7 @@ sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
}
/*************************************************************************
- * SwTxtFrm::FindBodyFrm()
+ * SwTxtFrm::FindBodyFrm()
*************************************************************************/
const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
@@ -227,7 +227,7 @@ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
}
/*************************************************************************
- * SwTxtFrm::CalcFollow()
+ * SwTxtFrm::CalcFollow()
*************************************************************************/
sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
@@ -397,7 +397,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
}
/*************************************************************************
- * SwTxtFrm::AdjustFrm()
+ * SwTxtFrm::AdjustFrm()
*************************************************************************/
void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
@@ -458,7 +458,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
{
SwFrm *pPre = GetUpper()->Lower();
do
- { pPre->Calc();
+ { pPre->Calc();
pPre = pPre->GetNext();
} while ( pPre && pPre != this );
}
@@ -529,7 +529,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
// Spaltengroesse ermitteln kann.
if ( nRstHeight < nFrmHeight )
{
- if( bHasToFit || !IsMoveable() ||
+ if( bHasToFit || !IsMoveable() ||
( IsInSct() && !FindSctFrm()->MoveAllowed(this) ) )
{
SetUndersized( sal_True );
@@ -554,7 +554,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
}
/*************************************************************************
- * SwTxtFrm::AdjustFollow()
+ * SwTxtFrm::AdjustFollow()
*************************************************************************/
/* AdjustFollow erwartet folgende Situation:
@@ -616,13 +616,13 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
if ( nMode )
GetFollow()->ManipOfst( 0 );
- if ( CalcFollow( nNewOfst ) ) // CalcFollow erst zum Schluss, dort erfolgt ein SetOfst
+ if ( CalcFollow( nNewOfst ) ) // CalcFollow erst zum Schluss, dort erfolgt ein SetOfst
rLine.SetOnceMore( sal_True );
}
}
/*************************************************************************
- * SwTxtFrm::JoinFrm()
+ * SwTxtFrm::JoinFrm()
*************************************************************************/
SwCntntFrm *SwTxtFrm::JoinFrm()
@@ -699,7 +699,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
}
/*************************************************************************
- * SwTxtFrm::SplitFrm()
+ * SwTxtFrm::SplitFrm()
*************************************************************************/
SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
@@ -785,7 +785,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
/*************************************************************************
- * virtual SwTxtFrm::SetOfst()
+ * virtual SwTxtFrm::SetOfst()
*************************************************************************/
void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
@@ -812,7 +812,7 @@ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
}
/*************************************************************************
- * SwTxtFrm::CalcPreps
+ * SwTxtFrm::CalcPreps
*************************************************************************/
sal_Bool SwTxtFrm::CalcPreps()
@@ -1003,7 +1003,7 @@ sal_Bool SwTxtFrm::CalcPreps()
/*************************************************************************
- * SwTxtFrm::FormatAdjust()
+ * SwTxtFrm::FormatAdjust()
*************************************************************************/
// Hier werden die Fussnoten und "als Zeichen"-gebundenen Objekte umgehaengt
@@ -1200,7 +1200,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
}
/*************************************************************************
- * SwTxtFrm::FormatLine()
+ * SwTxtFrm::FormatLine()
*************************************************************************/
// bPrev zeigt an, ob Reformat.Start() wegen Prev() vorgezogen wurde.
@@ -1220,7 +1220,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
const xub_StrLen nOldLen = pOldCur->GetLen();
const KSHORT nOldAscent = pOldCur->GetAscent();
const KSHORT nOldHeight = pOldCur->Height();
- const SwTwips nOldWidth = pOldCur->Width() + pOldCur->GetHangingMargin();
+ const SwTwips nOldWidth = pOldCur->Width() + pOldCur->GetHangingMargin();
const sal_Bool bOldHyph = pOldCur->IsEndHyph();
SwTwips nOldTop = 0;
SwTwips nOldBottom = 0;
@@ -1349,7 +1349,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
}
/*************************************************************************
- * SwTxtFrm::_Format()
+ * SwTxtFrm::_Format()
*************************************************************************/
void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
@@ -1365,7 +1365,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
const xub_StrLen nStrLen = rString.Len();
SwCharRange &rReformat = *(pPara->GetReformat());
- SwRepaint &rRepaint = *(pPara->GetRepaint());
+ SwRepaint &rRepaint = *(pPara->GetRepaint());
SwRepaint *pFreeze = NULL;
// Aus Performancegruenden wird in Init() rReformat auf STRING_LEN gesetzt.
@@ -1485,7 +1485,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
( !pPara->IsPrepMustFit() || rLine.GetLineNr() > 1 );
}
- /* Bedeutung der folgenden Flags:
+ /* Bedeutung der folgenden Flags:
Ist das Watch(End/Mid)Hyph-Flag gesetzt, so muss formatiert werden, wenn
eine Trennung am (Zeilenende/Fly) vorliegt, sofern MaxHyph erreicht ist.
Das Jump(End/Mid)Flag bedeutet, dass die naechste Zeile, bei der keine
@@ -1559,7 +1559,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
if( !bFormat )
{
SwLinePortion* pRest =
- rLine.MakeRestPortion( rLine.GetCurr(), rLine.GetEnd() );
+ rLine.MakeRestPortion( rLine.GetCurr(), rLine.GetEnd() );
if( pRest )
rInf.SetRest( pRest );
}
@@ -1670,7 +1670,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
rLine.SetTruncLines( sal_False );
if( nOldBottom ) // Bei "gescollten" Absaetzen wird
{ // noch ueberprueft, ob durch Schrumpfen
- rLine.Bottom(); // das Scrolling ueberfluessig wurde.
+ rLine.Bottom(); // das Scrolling ueberfluessig wurde.
SwTwips nNewBottom = rLine.Y();
if( nNewBottom < nOldBottom )
_SetOfst( 0 );
@@ -1679,7 +1679,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
}
/*************************************************************************
- * SwTxtFrm::Format()
+ * SwTxtFrm::Format()
*************************************************************************/
void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
@@ -1696,7 +1696,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
sal_Bool bShrink = sal_False,
bGrow = sal_False,
bGoOn = rLine.IsOnceMore();
- sal_uInt8 nGo = 0;
+ sal_uInt8 nGo = 0;
while( bGoOn )
{
#ifdef DBGTXT
@@ -1748,7 +1748,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFrm::_Format()
+ * SwTxtFrm::_Format()
*************************************************************************/
@@ -1758,9 +1758,9 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
// AMA: Wozu soll das gut sein? Scheint mir zuoft zu einem kompletten
// Formatieren und Repainten zu fuehren???
-// if ( !(*pPara->GetDelta()) )
-// *(pPara->GetDelta()) = nStrLen;
-// else
+// if ( !(*pPara->GetDelta()) )
+// *(pPara->GetDelta()) = nStrLen;
+// else
if ( !nStrLen )
{
// Leere Zeilen werden nicht lange gequaelt:
@@ -1785,7 +1785,7 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
SwapWidthAndHeight();
SwTxtFormatInfo aInf( this );
- SwTxtFormatter aLine( this, &aInf );
+ SwTxtFormatter aLine( this, &aInf );
// OD 2004-01-15 #110582#
HideAndShowObjects();
@@ -1818,7 +1818,7 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
}
/*************************************************************************
- * SwTxtFrm::Format()
+ * SwTxtFrm::Format()
*************************************************************************/
/*
@@ -2065,7 +2065,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
}
/*************************************************************************
- * SwTxtFrm::FormatQuick()
+ * SwTxtFrm::FormatQuick()
*
* bForceQuickFormat is set if GetFormatted() has been called during the
* painting process. Actually I cannot imagine a situation which requires
@@ -2116,10 +2116,10 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
SwTxtFrmLocker aLock(this);
SwTxtFormatInfo aInf( this, sal_False, sal_True );
- if( 0 != aInf.MaxHyph() ) // 27483: MaxHyphen beachten!
+ if( 0 != aInf.MaxHyph() ) // 27483: MaxHyphen beachten!
return sal_False;
- SwTxtFormatter aLine( this, &aInf );
+ SwTxtFormatter aLine( this, &aInf );
// DropCaps sind zu kompliziert...
if( aLine.GetDropFmt() )
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 453cd5189046..31f578be05a2 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -2,7 +2,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
@@ -32,11 +32,11 @@
#include <pam.hxx> // GetSpaces
#include <txtcfg.hxx>
-#include <frminf.hxx> // SwTxtFrminfo
+#include <frminf.hxx> // SwTxtFrminfo
#include <itrtxt.hxx> // SwTxtMargin
/*************************************************************************
- * SwTxtMargin::GetTxtStart()
+ * SwTxtMargin::GetTxtStart()
*************************************************************************/
xub_StrLen SwTxtMargin::GetTxtStart() const
@@ -56,7 +56,7 @@ xub_StrLen SwTxtMargin::GetTxtStart() const
}
/*************************************************************************
- * SwTxtMargin::GetTxtEnd()
+ * SwTxtMargin::GetTxtEnd()
*************************************************************************/
xub_StrLen SwTxtMargin::GetTxtEnd() const
@@ -75,7 +75,7 @@ xub_StrLen SwTxtMargin::GetTxtEnd() const
}
/*************************************************************************
- * SwTxtFrmInfo::IsOneLine()
+ * SwTxtFrmInfo::IsOneLine()
*************************************************************************/
// Passt der Absatz in eine Zeile?
@@ -101,7 +101,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const
}
/*************************************************************************
- * SwTxtFrmInfo::IsFilled()
+ * SwTxtFrmInfo::IsFilled()
*************************************************************************/
// Ist die Zeile zu X% gefuellt?
@@ -120,7 +120,7 @@ sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
}
/*************************************************************************
- * SwTxtFrmInfo::GetLineStart()
+ * SwTxtFrmInfo::GetLineStart()
*************************************************************************/
// Wo beginnt der Text (ohne whitespaces)? ( Dokument global )
@@ -143,7 +143,7 @@ SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const
/*************************************************************************
- * SwTxtFrmInfo::GetLineStart()
+ * SwTxtFrmInfo::GetLineStart()
*************************************************************************/
// Wo beginnt der Text (ohne whitespaces)? (rel. im Frame)
@@ -151,7 +151,7 @@ SwTwips SwTxtFrmInfo::GetLineStart() const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
SwTxtCursor aLine( (SwTxtFrm*)pFrm, &aInf );
- return GetLineStart( aLine ) - pFrm->Frm().Left() - pFrm->Prt().Left();
+ return GetLineStart( aLine ) - pFrm->Frm().Left() - pFrm->Prt().Left();
}
// errechne die Position des Zeichens und gebe die Mittelposition zurueck
@@ -192,7 +192,7 @@ SwTwips SwTxtFrmInfo::GetCharPos( xub_StrLen nChar, sal_Bool bCenter ) const
}
/*************************************************************************
- * SwTxtFrmInfo::GetSpaces()
+ * SwTxtFrmInfo::GetSpaces()
*************************************************************************/
SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
@@ -234,13 +234,13 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
{
xub_StrLen nPos = aLine.GetTxtStart();
// Bug 49649: von der ersten Line die Blanks/Tabs NICHT
- // mit selektieren
+ // mit selektieren
if( !bFirstLine && nPos > aLine.GetStart() )
pPam = AddPam( pPam, pFrm, aLine.GetStart(),
nPos - aLine.GetStart() );
// Bug 49649: von der letzten Line die Blanks/Tabs NICHT
- // mit selektieren
+ // mit selektieren
if( aLine.GetNext() )
{
nPos = aLine.GetTxtEnd();
@@ -260,7 +260,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
}
/*************************************************************************
- * SwTxtFrmInfo::IsBullet()
+ * SwTxtFrmInfo::IsBullet()
*************************************************************************/
// Ist an der Textposition ein Bullet/Symbol etc?
@@ -274,7 +274,7 @@ sal_Bool SwTxtFrmInfo::IsBullet( xub_StrLen nTxtStart ) const
}
/*************************************************************************
- * SwTxtFrmInfo::GetFirstIndent()
+ * SwTxtFrmInfo::GetFirstIndent()
*************************************************************************/
// Ermittelt Erstzeileneinzug
@@ -316,7 +316,7 @@ SwTwips SwTxtFrmInfo::GetFirstIndent() const
}
/*************************************************************************
- * SwTxtFrmInfo::GetBigIndent()
+ * SwTxtFrmInfo::GetBigIndent()
*************************************************************************/
KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index d8da5de1351e..f53af9a68e69 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -2,7 +2,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
@@ -43,19 +43,19 @@
#include <lineinfo.hxx>
#include <charfmt.hxx>
#include <pagefrm.hxx>
-#include <viewsh.hxx> // ViewShell
-#include <viewimp.hxx> // SwViewImp
-#include <viewopt.hxx> // SwViewOption
-#include <frmtool.hxx> // DrawGraphic
+#include <viewsh.hxx> // ViewShell
+#include <viewimp.hxx> // SwViewImp
+#include <viewopt.hxx> // SwViewOption
+#include <frmtool.hxx> // DrawGraphic
#include <txtcfg.hxx>
#include <txtfrm.hxx> // SwTxtFrm
#include <itrpaint.hxx> // SwTxtPainter
#include <txtpaint.hxx> // SwSaveClip
-#include <txtcache.hxx> // SwTxtLineAccess
-#include <flyfrm.hxx> // SwFlyFrm
-#include <redlnitr.hxx> // SwRedlineItr
+#include <txtcache.hxx> // SwTxtLineAccess
+#include <flyfrm.hxx> // SwFlyFrm
+#include <redlnitr.hxx> // SwRedlineItr
#include <swmodule.hxx> // SW_MOD
-#include <tabfrm.hxx> // SwTabFrm (Redlining)
+#include <tabfrm.hxx> // SwTabFrm (Redlining)
#include <SwGrammarMarkUp.hxx>
// --> FME 2004-06-08 #i12836# enhanced pdf export
@@ -133,10 +133,10 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
if( bLineNum )
{ /* initialisiert die Member, die bei Zeilennumerierung notwendig sind:
- nDivider, wie oft ist ein Teilerstring gewuenscht, 0 == nie;
- nX, X-Position der Zeilennummern;
- pFnt, der Font der Zeilennummern;
- nLineNr, die erste Zeilennummer;
+ nDivider, wie oft ist ein Teilerstring gewuenscht, 0 == nie;
+ nX, X-Position der Zeilennummern;
+ pFnt, der Font der Zeilennummern;
+ nLineNr, die erste Zeilennummer;
bLineNum wird ggf.wieder auf sal_False gesetzt, wenn die Numerierung sich
komplett ausserhalb des Paint-Rechtecks aufhaelt. */
nDivider = rLineInf.GetDivider().Len() ? rLineInf.GetDividerCountBy() : 0;
@@ -446,7 +446,7 @@ SwRect SwTxtFrm::Paint()
else
{
// AMA: Wir liefern jetzt mal das richtige Repaintrechteck zurueck,
- // d.h. als linken Rand den berechneten PaintOfst!
+ // d.h. als linken Rand den berechneten PaintOfst!
SwRepaint *pRepaint = GetPara()->GetRepaint();
long l;
if( pRepaint->GetOfst() )
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index f145a8e7c1cc..952d6912f3a5 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -2,7 +2,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
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::linguistic2;
#define CH_FULL_BLANK 0x3000
/*************************************************************************
- * SwTxtGuess::Guess
+ * SwTxtGuess::Guess
*
* provides information for line break calculation
* returns true if no line break has to be performed
@@ -519,7 +519,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
}
/*************************************************************************
- * SwTxtGuess::AlternativeSpelling
+ * SwTxtGuess::AlternativeSpelling
*************************************************************************/
// returns true if word at position nPos has a diffenrent spelling
@@ -547,7 +547,7 @@ sal_Bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
Reference< XHyphenator > xHyph( ::GetHyphenator() );
OSL_ENSURE( xHyph.is(), "Hyphenator is missing");
//! subtract 1 since the UNO-interface is 0 based
- xHyphWord = xHyph->queryAlternativeSpelling( OUString(aTxt),
+ xHyphWord = xHyph->queryAlternativeSpelling( OUString(aTxt),
pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
nPos - nBreakStart, rInf.GetHyphValues() );
return xHyphWord.is() && xHyphWord->isAlternativeSpelling();
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 3f2e457a609e..a89f41c6bc6a 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -2,7 +2,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
@@ -31,29 +31,29 @@
#include "txttypes.hxx"
#include "breakit.hxx"
-#include "porrst.hxx" // SwHangingPortion
+#include "porrst.hxx" // SwHangingPortion
class SwTxtFormatInfo;
/*************************************************************************
- * class SwTxtGuess
+ * class SwTxtGuess
*************************************************************************/
class SwTxtGuess
{
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
SwHangingPortion *pHanging; // for hanging punctuation
- xub_StrLen nCutPos; // this character doesn't fit
+ xub_StrLen nCutPos; // this character doesn't fit
xub_StrLen nBreakStart; // start index of word containing line break
- xub_StrLen nBreakPos; // start index of break position
+ xub_StrLen nBreakPos; // start index of break position
xub_StrLen nFieldDiff; // absolut positions can be wrong if we
// a field in the text has been expanded
- KSHORT nBreakWidth; // width of the broken portion
+ KSHORT nBreakWidth; // width of the broken portion
public:
inline SwTxtGuess(): pHanging( NULL ), nCutPos(0), nBreakStart(0),
nBreakPos(0), nFieldDiff(0), nBreakWidth(0)
{ }
- ~SwTxtGuess() { delete pHanging; }
+ ~SwTxtGuess() { delete pHanging; }
// true, if current portion still fits to current line
sal_Bool Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index c0d9709fdd35..cda537082792 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -2,7 +2,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
@@ -56,18 +56,18 @@
#include <swmodule.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <viewsh.hxx> // ViewShell
-#include <viewopt.hxx> // SwViewOptions
-#include <frmtool.hxx> // DrawGraphic
+#include <viewsh.hxx> // ViewShell
+#include <viewopt.hxx> // SwViewOptions
+#include <frmtool.hxx> // DrawGraphic
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDeviceAccess.hxx>
-#include <paratr.hxx> // SwFmtDrop
+#include <paratr.hxx> // SwFmtDrop
#include <rootfrm.hxx> // SwRootFrm
-#include <inftxt.hxx> // SwTxtInfo
-#include <blink.hxx> // SwBlink
-#include <noteurl.hxx> // SwNoteURL
-#include <porftn.hxx> // SwFtnPortion
-#include <porrst.hxx> // SwHangingPortion
+#include <inftxt.hxx> // SwTxtInfo
+#include <blink.hxx> // SwBlink
+#include <noteurl.hxx> // SwNoteURL
+#include <porftn.hxx> // SwFtnPortion
+#include <porrst.hxx> // SwHangingPortion
#include <itratr.hxx>
#include <accessibilityoptions.hxx>
#include <wrong.hxx>
@@ -145,7 +145,7 @@ sal_Bool SwTxtSizeInfo::IsOptTest8() const { return GetOpt().IsTest8(); }
#endif
/*************************************************************************
- * SwLineInfo::SwLineInfo()
+ * SwLineInfo::SwLineInfo()
*************************************************************************/
// --> OD 2008-01-17 #newlistlevelattrs#
@@ -213,7 +213,7 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
}
/*************************************************************************
- * SwTxtInfo::CtorInitTxtInfo()
+ * SwTxtInfo::CtorInitTxtInfo()
*************************************************************************/
void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm )
@@ -236,7 +236,7 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * ChkOutDev()
+ * ChkOutDev()
*************************************************************************/
void ChkOutDev( const SwTxtSizeInfo &rInf )
@@ -248,7 +248,7 @@ void ChkOutDev( const SwTxtSizeInfo &rInf )
const OutputDevice* pRef = rInf.GetRefDev();
OSL_ENSURE( pOut && pRef, "ChkOutDev: invalid output devices" );
}
-#endif // PRODUCT
+#endif // PRODUCT
inline xub_StrLen GetMinLen( const SwTxtSizeInfo &rInf )
@@ -419,7 +419,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
}
/*************************************************************************
- * SwTxtSizeInfo::SelectFont()
+ * SwTxtSizeInfo::SelectFont()
*************************************************************************/
void SwTxtSizeInfo::SelectFont()
@@ -556,7 +556,7 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
}
/*************************************************************************
- * SwTxtPaintInfo::CtorInitTxtPaintInfo()
+ * SwTxtPaintInfo::CtorInitTxtPaintInfo()
*************************************************************************/
void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
@@ -647,7 +647,7 @@ sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
}
/*************************************************************************
- * SwTxtPaintInfo::_DrawText()
+ * SwTxtPaintInfo::_DrawText()
*************************************************************************/
void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPor,
@@ -980,7 +980,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
}
/*************************************************************************
- * SwTxtPaintInfo::DrawRect()
+ * SwTxtPaintInfo::DrawRect()
*************************************************************************/
void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
@@ -1002,7 +1002,7 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
}
/*************************************************************************
- * SwTxtPaintInfo::DrawTab()
+ * SwTxtPaintInfo::DrawTab()
*************************************************************************/
void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
@@ -1024,7 +1024,7 @@ void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const
}
/*************************************************************************
- * SwTxtPaintInfo::DrawLineBreak()
+ * SwTxtPaintInfo::DrawLineBreak()
*************************************************************************/
void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
@@ -1090,7 +1090,7 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
/*************************************************************************
- * SwTxtPaintInfo::DrawPostIts()
+ * SwTxtPaintInfo::DrawPostIts()
*************************************************************************/
void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const
@@ -1144,10 +1144,10 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
{
SwRect aIntersect;
CalcRect( rPor, &aIntersect, 0 );
- if ( aIntersect.HasArea() )
+ if ( aIntersect.HasArea() )
{
- if (OnWin() && SwViewOption::IsFieldShadings() &&
- !GetOpt().IsPagePreview())
+ if (OnWin() && SwViewOption::IsFieldShadings() &&
+ !GetOpt().IsPagePreview())
{
OutputDevice* pOut_ = (OutputDevice*)GetOut();
pOut_->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
@@ -1158,7 +1158,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
}
const int delta=10;
Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta);
- pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+ pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
pOut->SetLineColor( Color(0, 0, 0));
pOut->SetFillColor();
pOut->DrawRect( r );
@@ -1170,7 +1170,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
}
}
/*************************************************************************
- * SwTxtPaintInfo::DrawBackGround()
+ * SwTxtPaintInfo::DrawBackGround()
*************************************************************************/
void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
{
@@ -1268,7 +1268,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
}
/*************************************************************************
- * SwTxtPaintInfo::DrawViewOpt()
+ * SwTxtPaintInfo::DrawViewOpt()
*************************************************************************/
void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
@@ -1296,8 +1296,8 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
pFrm->GetTxtNode()->HasMarkedLabel())) // #i27615#
bDraw = sal_True;
break;
- case POR_TAB: if ( GetOpt().IsTab() ) bDraw = sal_True; break;
- case POR_SOFTHYPH: if ( GetOpt().IsSoftHyph() )bDraw = sal_True; break;
+ case POR_TAB: if ( GetOpt().IsTab() ) bDraw = sal_True; break;
+ case POR_SOFTHYPH: if ( GetOpt().IsSoftHyph() )bDraw = sal_True; break;
case POR_BLANK: if ( GetOpt().IsHardBlank())bDraw = sal_True; break;
default:
{
@@ -1311,7 +1311,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
}
/*************************************************************************
- * SwTxtPaintInfo::_NotifyURL()
+ * SwTxtPaintInfo::_NotifyURL()
*************************************************************************/
void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
@@ -1336,7 +1336,7 @@ void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
}
/*************************************************************************
- * lcl_InitHyphValues()
+ * lcl_InitHyphValues()
*************************************************************************/
static void lcl_InitHyphValues( PropertyValues &rVals,
@@ -1344,20 +1344,20 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
{
INT32 nLen = rVals.getLength();
- if (0 == nLen) // yet to be initialized?
+ if (0 == nLen) // yet to be initialized?
{
rVals.realloc( 2 );
PropertyValue *pVal = rVals.getArray();
- pVal[0].Name = C2U( UPN_HYPH_MIN_LEADING );
- pVal[0].Handle = UPH_HYPH_MIN_LEADING;
- pVal[0].Value <<= nMinLeading;
+ pVal[0].Name = C2U( UPN_HYPH_MIN_LEADING );
+ pVal[0].Handle = UPH_HYPH_MIN_LEADING;
+ pVal[0].Value <<= nMinLeading;
- pVal[1].Name = C2U( UPN_HYPH_MIN_TRAILING );
- pVal[1].Handle = UPH_HYPH_MIN_TRAILING;
- pVal[1].Value <<= nMinTrailing;
+ pVal[1].Name = C2U( UPN_HYPH_MIN_TRAILING );
+ pVal[1].Handle = UPH_HYPH_MIN_TRAILING;
+ pVal[1].Value <<= nMinTrailing;
}
- else if (2 == nLen) // already initialized once?
+ else if (2 == nLen) // already initialized once?
{
PropertyValue *pVal = rVals.getArray();
pVal[0].Value <<= nMinLeading;
@@ -1369,7 +1369,7 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
}
/*************************************************************************
- * SwTxtFormatInfo::GetHyphValues()
+ * SwTxtFormatInfo::GetHyphValues()
*************************************************************************/
const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
@@ -1380,7 +1380,7 @@ const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
}
/*************************************************************************
- * SwTxtFormatInfo::InitHyph()
+ * SwTxtFormatInfo::InitHyph()
*************************************************************************/
sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
@@ -1405,7 +1405,7 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
}
/*************************************************************************
- * SwTxtFormatInfo::CtorInitTxtFormatInfo()
+ * SwTxtFormatInfo::CtorInitTxtFormatInfo()
*************************************************************************/
void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool bNewInterHyph,
@@ -1417,9 +1417,9 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
bInterHyph = bNewInterHyph;
//! needs to be done in this order
- nMinLeading = 2;
- nMinTrailing = 2;
- nMinWordLength = 0;
+ nMinLeading = 2;
+ nMinTrailing = 2;
+ nMinWordLength = 0;
bAutoHyph = InitHyph();
bIgnoreFly = sal_False;
@@ -1440,14 +1440,14 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
}
/*************************************************************************
- * SwTxtFormatInfo::IsHyphenate()
+ * SwTxtFormatInfo::IsHyphenate()
*************************************************************************/
// Trennen oder nicht trennen, das ist hier die Frage:
// - in keinem Fall trennen, wenn der Hyphenator ERROR zurueckliefert,
-// oder wenn als Sprache NOLANGUAGE eingestellt ist.
+// oder wenn als Sprache NOLANGUAGE eingestellt ist.
// - ansonsten immer trennen, wenn interaktive Trennung vorliegt
// - wenn keine interakt. Trennung, dann nur trennen, wenn im ParaFmt
-// automatische Trennung eingestellt ist.
+// automatische Trennung eingestellt ist.
sal_Bool SwTxtFormatInfo::IsHyphenate() const
{
@@ -1468,7 +1468,7 @@ sal_Bool SwTxtFormatInfo::IsHyphenate() const
}
/*************************************************************************
- * SwTxtFormatInfo::GetDropFmt()
+ * SwTxtFormatInfo::GetDropFmt()
*************************************************************************/
// Dropcaps vom SwTxtFormatter::CTOR gerufen.
@@ -1482,7 +1482,7 @@ const SwFmtDrop *SwTxtFormatInfo::GetDropFmt() const
}
/*************************************************************************
- * SwTxtFormatInfo::Init()
+ * SwTxtFormatInfo::Init()
*************************************************************************/
void SwTxtFormatInfo::Init()
@@ -1566,14 +1566,14 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
bArrowDone = TRUE;
bStop = FALSE;
bNewLine = TRUE;
- bShift = FALSE;
+ bShift = FALSE;
bUnderFlow = FALSE;
bInterHyph = FALSE;
bAutoHyph = FALSE;
bDropInit = FALSE;
- bQuick = rInf.bQuick;
- bNoEndHyph = FALSE;
- bNoMidHyph = FALSE;
+ bQuick = rInf.bQuick;
+ bNoEndHyph = FALSE;
+ bNoMidHyph = FALSE;
bIgnoreFly = FALSE;
bFakeLineStart = FALSE;
@@ -1586,7 +1586,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
}
/*************************************************************************
- * SwTxtFormatInfo::_CheckFtnPortion()
+ * SwTxtFormatInfo::_CheckFtnPortion()
*************************************************************************/
sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
@@ -1612,7 +1612,7 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
/*************************************************************************
- * SwTxtFormatInfo::ScanPortionEnd()
+ * SwTxtFormatInfo::ScanPortionEnd()
*************************************************************************/
xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
const xub_StrLen nEnd )
@@ -1839,7 +1839,7 @@ SwTxtSlot::~SwTxtSlot()
}
/*************************************************************************
- * SwFontSave::SwFontSave()
+ * SwFontSave::SwFontSave()
*************************************************************************/
SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
@@ -1879,7 +1879,7 @@ SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
}
/*************************************************************************
- * SwFontSave::~SwFontSave()
+ * SwFontSave::~SwFontSave()
*************************************************************************/
SwFontSave::~SwFontSave()
@@ -1898,7 +1898,7 @@ SwFontSave::~SwFontSave()
}
/*************************************************************************
- * SwDefFontSave::SwDefFontSave()
+ * SwDefFontSave::SwDefFontSave()
*************************************************************************/
SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
@@ -1941,7 +1941,7 @@ SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
}
/*************************************************************************
- * SwDefFontSave::~SwDefFontSave()
+ * SwDefFontSave::~SwDefFontSave()
*************************************************************************/
SwDefFontSave::~SwDefFontSave()
@@ -1956,7 +1956,7 @@ SwDefFontSave::~SwDefFontSave()
}
/*************************************************************************
- * SwTxtFormatInfo::ChgHyph()
+ * SwTxtFormatInfo::ChgHyph()
*************************************************************************/
sal_Bool SwTxtFormatInfo::ChgHyph( const sal_Bool bNew )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index e97389d9d2f3..073b9bfffdcb 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -2,7 +2,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
@@ -69,7 +69,7 @@ class SwWrongList;
/* Minimum: Prozentwert fuers kernen */
#define MINKERNPERCENT 5
-#define ARROW_WIDTH 200
+#define ARROW_WIDTH 200
#define DIR_LEFT2RIGHT 0
#define DIR_BOTTOM2TOP 1
#define DIR_RIGHT2LEFT 2
@@ -77,16 +77,16 @@ class SwWrongList;
#if OSL_DEBUG_LEVEL > 1
#define OPTCALM( rInf ) (rInf).IsOptCalm()
-#define OPTLOW( rInf ) (rInf).IsOptLow()
-#define OPTDBG( rInf ) (rInf).IsOptDbg()
+#define OPTLOW( rInf ) (rInf).IsOptLow()
+#define OPTDBG( rInf ) (rInf).IsOptDbg()
#else
#define OPTCALM( rInf ) sal_True
-#define OPTLOW( rInf ) sal_False
-#define OPTDBG( rInf ) sal_False
+#define OPTLOW( rInf ) sal_False
+#define OPTDBG( rInf ) sal_False
#endif
/*************************************************************************
- * class SwLineInfo
+ * class SwLineInfo
*************************************************************************/
// Beruecksichtigt das Attribut LineSpace bei der Hoehen/Ascentberechnung.
@@ -150,7 +150,7 @@ public:
};
/*************************************************************************
- * class SwTxtInfo
+ * class SwTxtInfo
*************************************************************************/
class SwTxtInfo
@@ -158,7 +158,7 @@ class SwTxtInfo
// Implementation in txthyph.cxx
friend void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot );
SwParaPortion *pPara;
- xub_StrLen nTxtStart; // TxtOfst bei Follows
+ xub_StrLen nTxtStart; // TxtOfst bei Follows
protected:
inline SwTxtInfo() { }
@@ -174,7 +174,7 @@ public:
};
/*************************************************************************
- * class SwTxtSizeInfo
+ * class SwTxtSizeInfo
*************************************************************************/
DECLARE_TABLE( SwTxtPortionTable, sal_IntPtr )
@@ -189,7 +189,7 @@ protected:
// this array is passed over to the info structure
SvUShorts* pKanaComp;
- ViewShell *pVsh;
+ ViewShell *pVsh;
// pOut is the output device, pRef is the device used for formatting
OutputDevice* pOut;
@@ -203,20 +203,20 @@ protected:
xub_StrLen nIdx, nLen;
USHORT nKanaIdx;
sal_Bool bOnWin : 1;
- sal_Bool bNotEOL : 1;
+ sal_Bool bNotEOL : 1;
sal_Bool bURLNotify : 1;
sal_Bool bStopUnderFlow : 1;// Underflow gestoppt z.B. von einer FlyPortion
sal_Bool bFtnInside : 1; // the current line contains a footnote
sal_Bool bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
// needed for checking keep together of footnote portion with previous portion
- sal_Bool bMulti : 1; // inside a multiportion
+ sal_Bool bMulti : 1; // inside a multiportion
sal_Bool bFirstMulti : 1; // this flag is used for two purposes:
// - the multiportion is the first lineportion
// - indicates, if we are currently in second
// line of multi portion
- sal_Bool bRuby : 1; // during the formatting of a phonetic line
- sal_Bool bHanging : 1; // formatting of hanging punctuation allowed
- sal_Bool bScriptSpace : 1; // space between different scripts (Asian/Latin)
+ sal_Bool bRuby : 1; // during the formatting of a phonetic line
+ sal_Bool bHanging : 1; // formatting of hanging punctuation allowed
+ sal_Bool bScriptSpace : 1; // space between different scripts (Asian/Latin)
sal_Bool bForbiddenChars : 1; // Forbidden start/endline characters
sal_Bool bSnapToGrid : 1; // paragraph snaps to grid
sal_uInt8 nDirection : 2; // writing direction: 0/90/180/270 degree
@@ -294,7 +294,7 @@ public:
inline xub_Unicode GetChar( const xub_StrLen nPos ) const
{ return pTxt->GetChar( nPos ); }
- inline KSHORT GetTxtHeight() const;
+ inline KSHORT GetTxtHeight() const;
//
// GetTxtSize
@@ -396,7 +396,7 @@ public:
};
/*************************************************************************
- * class SwTxtPaintInfo
+ * class SwTxtPaintInfo
*************************************************************************/
class SwTxtPaintInfo : public SwTxtSizeInfo
@@ -406,10 +406,10 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
const SwWrongList *pSmartTags; // SMARTTAGS
std::vector<long>* pSpaceAdd;
const SvxBrushItem *pBrushItem; // Fuer den Hintergrund
- SwRect aItemRect; // ebenfalls fuer den Hintergrund
- SwTxtFly aTxtFly; // FlyFrm-Berechnung
- Point aPos; // Ausgabeposition
- SwRect aPaintRect; // Original Ausgaberechteck (aus Layout-Paint)
+ SwRect aItemRect; // ebenfalls fuer den Hintergrund
+ SwTxtFly aTxtFly; // FlyFrm-Berechnung
+ Point aPos; // Ausgabeposition
+ SwRect aPaintRect; // Original Ausgaberechteck (aus Layout-Paint)
MSHORT nSpaceIdx;
void _DrawText( const XubString &rText, const SwLinePortion &rPor,
@@ -518,28 +518,28 @@ public:
};
/*************************************************************************
- * class SwTxtFormatInfo
+ * class SwTxtFormatInfo
*************************************************************************/
class SwTxtFormatInfo : public SwTxtPaintInfo
{
// temporary arguments for hyphenation
- com::sun::star::beans::PropertyValues aHyphVals;
+ com::sun::star::beans::PropertyValues aHyphVals;
- SwLineLayout *pRoot; // die Root der aktuellen Zeile (pCurr)
- SwLinePortion *pLast; // die letzte Portion
- SwFlyPortion *pFly; // die nachfolgende FlyPortion
- SwFldPortion *pLastFld; // umgebrochenes Feld
- SwLinePortion *pUnderFlow; // Unterlaufsituation: letzte Portion
- SwLinePortion *pRest; // Rest ist der Beginn der naechsten Zeile
+ SwLineLayout *pRoot; // die Root der aktuellen Zeile (pCurr)
+ SwLinePortion *pLast; // die letzte Portion
+ SwFlyPortion *pFly; // die nachfolgende FlyPortion
+ SwFldPortion *pLastFld; // umgebrochenes Feld
+ SwLinePortion *pUnderFlow; // Unterlaufsituation: letzte Portion
+ SwLinePortion *pRest; // Rest ist der Beginn der naechsten Zeile
- SwTabPortion *pLastTab; // die _letzte_ TabPortion
+ SwTabPortion *pLastTab; // die _letzte_ TabPortion
xub_StrLen nSoftHyphPos; // SoftHyphPos fuer Hyphenate
- xub_StrLen nHyphStart; // TxtPos, an der die interakt.Tr.z.Z. steht
+ xub_StrLen nHyphStart; // TxtPos, an der die interakt.Tr.z.Z. steht
xub_StrLen nHyphWrdStart; // gefundene Wort-Position
xub_StrLen nHyphWrdLen; // gefundene Wort-Laenge
- xub_StrLen nLineStart; // aktueller Zeilenbeginn im rTxt
+ xub_StrLen nLineStart; // aktueller Zeilenbeginn im rTxt
xub_StrLen nUnderScorePos; // enlarge repaint if underscore has been found
// --> FME 2004-11-25 #i34348# Changed type from USHORT to SwTwips
SwTwips nLeft; // linker Rand
@@ -547,39 +547,39 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
SwTwips nFirst; // EZE
// <--
KSHORT nRealWidth; // "echte" Zeilenbreite
- KSHORT nWidth; // "virtuelle" Zeilenbreite
- KSHORT nLineHeight; // endgueltige Hoehe nach CalcLine
+ KSHORT nWidth; // "virtuelle" Zeilenbreite
+ KSHORT nLineHeight; // endgueltige Hoehe nach CalcLine
KSHORT nLineNettoHeight; // line height without spacing
- KSHORT nForcedLeftMargin; // Verschiebung des linken Rands wg. Rahmen
+ KSHORT nForcedLeftMargin; // Verschiebung des linken Rands wg. Rahmen
- INT16 nMinLeading; // minimum number of chars before hyphenation point
- INT16 nMinTrailing; // minimum number of chars after hyphenation point
- INT16 nMinWordLength; // minimum length of word to be hyphenated
+ INT16 nMinLeading; // minimum number of chars before hyphenation point
+ INT16 nMinTrailing; // minimum number of chars after hyphenation point
+ INT16 nMinWordLength; // minimum length of word to be hyphenated
- sal_Bool bFull : 1; // Zeile ist voll
- sal_Bool bFtnDone : 1; // Ftn bereits formatiert
- sal_Bool bErgoDone : 1; // ErgoDone bereits formatiert
- sal_Bool bNumDone : 1; // bNumDone bereits formatiert
+ sal_Bool bFull : 1; // Zeile ist voll
+ sal_Bool bFtnDone : 1; // Ftn bereits formatiert
+ sal_Bool bErgoDone : 1; // ErgoDone bereits formatiert
+ sal_Bool bNumDone : 1; // bNumDone bereits formatiert
sal_Bool bArrowDone : 1; // Pfeil nach links bei gescrollten Absaetzen
- sal_Bool bStop : 1; // Sofort abbrechen, Zeile verwerfen.
- sal_Bool bNewLine : 1; // Noch eine weitere Zeile formatieren.
- sal_Bool bShift : 1; // Positionsaend.: Repaint bis auf Weiteres
- sal_Bool bUnderFlow : 1; // Kontext: UnderFlow() ?
- sal_Bool bInterHyph: 1; // interaktive Trennung ?
- sal_Bool bAutoHyph : 1; // automatische Trennung ?
- sal_Bool bDropInit : 1; // DropWidth einstellen.
- sal_Bool bQuick : 1; // FormatQuick()
- sal_Bool bNoEndHyph : 1; // Trennung am Zeilenende abgeschaltet wg. MaxHyphens
- sal_Bool bNoMidHyph : 1; // Trennung vor Flies abgeschaltet wg. MaxHyphens
- sal_Bool bIgnoreFly: 1; // FitToContent ignoriert Flies
+ sal_Bool bStop : 1; // Sofort abbrechen, Zeile verwerfen.
+ sal_Bool bNewLine : 1; // Noch eine weitere Zeile formatieren.
+ sal_Bool bShift : 1; // Positionsaend.: Repaint bis auf Weiteres
+ sal_Bool bUnderFlow : 1; // Kontext: UnderFlow() ?
+ sal_Bool bInterHyph: 1; // interaktive Trennung ?
+ sal_Bool bAutoHyph : 1; // automatische Trennung ?
+ sal_Bool bDropInit : 1; // DropWidth einstellen.
+ sal_Bool bQuick : 1; // FormatQuick()
+ sal_Bool bNoEndHyph : 1; // Trennung am Zeilenende abgeschaltet wg. MaxHyphens
+ sal_Bool bNoMidHyph : 1; // Trennung vor Flies abgeschaltet wg. MaxHyphens
+ sal_Bool bIgnoreFly: 1; // FitToContent ignoriert Flies
sal_Bool bFakeLineStart: 1; // String has been replaced by field portion
// info structure only pretends that we are at
// the beginning of a line
- xub_Unicode cTabDecimal; // das _aktuelle_ Dezimalzeichen
- xub_Unicode cHookChar; // fuer Tabs in Feldern etc.
- sal_uInt8 nMaxHyph; // max. Zeilenanz. aufeinanderfolg. Trenn.
- sal_Bool bTestFormat; // Testformatierung aus WouldFit, keine Benachrichtigungen etc.
+ xub_Unicode cTabDecimal; // das _aktuelle_ Dezimalzeichen
+ xub_Unicode cHookChar; // fuer Tabs in Feldern etc.
+ sal_uInt8 nMaxHyph; // max. Zeilenanz. aufeinanderfolg. Trenn.
+ sal_Bool bTestFormat; // Testformatierung aus WouldFit, keine Benachrichtigungen etc.
// Hyphenating ...
sal_Bool InitHyph( const sal_Bool bAuto = sal_False );
@@ -723,7 +723,7 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
HyphWord( const String &rTxt, const USHORT nMinTrail );
- const com::sun::star::beans::PropertyValues &
+ const com::sun::star::beans::PropertyValues &
GetHyphValues() const;
sal_Bool CheckFtnPortion( SwLineLayout* pCurr )
@@ -742,12 +742,12 @@ public:
// Return: gefundene Position, setzt ggf. cHookChar
xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd );
-// friend ostream &operator<<( ostream &rOS, const SwTxtFormatInfo &rInf );
+// friend ostream &operator<<( ostream &rOS, const SwTxtFormatInfo &rInf );
friend SvStream &operator<<( SvStream &rOS, const SwTxtFormatInfo &rInf );
};
/*************************************************************************
- * class SwTxtSlot
+ * class SwTxtSlot
*************************************************************************/
// Fuer die Textersetzung und Restaurierung der SwTxtSizeInfo.
@@ -777,14 +777,14 @@ public:
};
/*************************************************************************
- * class SwFontSave
+ * class SwFontSave
*************************************************************************/
class SwFontSave
{
SwTxtSizeInfo *pInf;
- SwFont *pFnt;
- SwAttrIter *pIter;
+ SwFont *pFnt;
+ SwAttrIter *pIter;
public:
SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pFnt,
SwAttrIter* pItr = NULL );
@@ -792,15 +792,15 @@ public:
};
/*************************************************************************
- * class SwDefFontSave
+ * class SwDefFontSave
*************************************************************************/
class SwDefFontSave
{
SwTxtSizeInfo *pInf;
- SwFont *pFnt;
- SwFont *pNewFnt;
- sal_Bool bAlter;
+ SwFont *pFnt;
+ SwFont *pNewFnt;
+ sal_Bool bAlter;
public:
SwDefFontSave( const SwTxtSizeInfo &rInf );
~SwDefFontSave();
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index d495574a2cfb..a0c3e3d3c296 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 1fc277d439ed..c2212c44e2a2 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -2,7 +2,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
@@ -47,13 +47,13 @@
#include <frmfmt.hxx>
#include <fmtfld.hxx>
#include <doc.hxx>
-#include <viewsh.hxx> // ViewShell
+#include <viewsh.hxx> // ViewShell
#include <rootfrm.hxx>
#include <docary.hxx>
#include <ndtxt.hxx>
#include <dcontact.hxx>
#include <fldbas.hxx> // SwField
-#include <pam.hxx> // SwPosition (lcl_MinMaxNode)
+#include <pam.hxx> // SwPosition (lcl_MinMaxNode)
#include <itratr.hxx>
#include <htmltbl.hxx>
#include <swtable.hxx>
@@ -68,7 +68,7 @@ using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star;
/*************************************************************************
- * SwAttrIter::Chg()
+ * SwAttrIter::Chg()
*************************************************************************/
void SwAttrIter::Chg( SwTxtAttr *pHt )
@@ -82,7 +82,7 @@ void SwAttrIter::Chg( SwTxtAttr *pHt )
}
/*************************************************************************
- * SwAttrIter::Rst()
+ * SwAttrIter::Rst()
*************************************************************************/
void SwAttrIter::Rst( SwTxtAttr *pHt )
@@ -97,7 +97,7 @@ void SwAttrIter::Rst( SwTxtAttr *pHt )
}
/*************************************************************************
- * virtual SwAttrIter::~SwAttrIter()
+ * virtual SwAttrIter::~SwAttrIter()
*************************************************************************/
SwAttrIter::~SwAttrIter()
@@ -107,7 +107,7 @@ SwAttrIter::~SwAttrIter()
}
/*************************************************************************
- * SwAttrIter::GetAttr()
+ * SwAttrIter::GetAttr()
*
* Liefert fuer eine Position das Attribut, wenn das Attribut genau auf
* der Position nPos liegt und kein EndIndex besitzt.
@@ -127,7 +127,7 @@ SwTxtAttr *SwAttrIter::GetAttr( const xub_StrLen nPosition ) const
}
/*************************************************************************
- * SwAttrIter::SeekAndChg()
+ * SwAttrIter::SeekAndChg()
*************************************************************************/
sal_Bool SwAttrIter::SeekAndChgAttrIter( const xub_StrLen nNewPos, OutputDevice* pOut )
@@ -161,7 +161,7 @@ sal_Bool SwAttrIter::IsSymbol( const xub_StrLen nNewPos )
}
/*************************************************************************
- * SwAttrIter::SeekStartAndChg()
+ * SwAttrIter::SeekStartAndChg()
*************************************************************************/
sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool bParaFont )
@@ -219,7 +219,7 @@ sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool
}
/*************************************************************************
- * SwAttrIter::SeekFwd()
+ * SwAttrIter::SeekFwd()
*************************************************************************/
// AMA: Neuer AttrIter Nov 94
@@ -239,7 +239,7 @@ void SwAttrIter::SeekFwd( const xub_StrLen nNewPos )
{
// schliesse die TextAttribute, deren StartPos vor
// oder an der alten nPos lag, die z.Z. geoeffnet sind.
- if (*pTxtAttr->GetStart() <= nPos) Rst( pTxtAttr );
+ if (*pTxtAttr->GetStart() <= nPos) Rst( pTxtAttr );
nEndIndex++;
}
}
@@ -264,7 +264,7 @@ void SwAttrIter::SeekFwd( const xub_StrLen nNewPos )
}
/*************************************************************************
- * SwAttrIter::Seek()
+ * SwAttrIter::Seek()
*************************************************************************/
sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos )
@@ -313,7 +313,7 @@ sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos )
}
/*************************************************************************
- * SwAttrIter::GetNextAttr()
+ * SwAttrIter::GetNextAttr()
*************************************************************************/
xub_StrLen SwAttrIter::GetNextAttr( ) const
@@ -339,7 +339,7 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const
nNext=p;
else
nNext=p+1;
- }
+ }
if( pRedln )
return pRedln->GetNextRedln( nNext );
return nNext;
@@ -347,7 +347,7 @@ xub_StrLen SwAttrIter::GetNextAttr( ) const
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * SwAttrIter::Dump()
+ * SwAttrIter::Dump()
*************************************************************************/
void SwAttrIter::Dump( SvStream &/*rOS*/ ) const
@@ -445,12 +445,12 @@ class SwMinMaxNodeArgs
{
public:
ULONG nMaxWidth; // Summe aller Rahmenbreite
- long nMinWidth; // Breitester Rahmen
+ long nMinWidth; // Breitester Rahmen
long nLeftRest; // noch nicht von Rahmen ueberdeckter Platz im l. Rand
long nRightRest; // noch nicht von Rahmen ueberdeckter Platz im r. Rand
- long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand
+ long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand
long nRightDiff; // Min/Max-Differenz des Rahmens im rechten Rand
- ULONG nIndx; // Indexnummer des Nodes
+ ULONG nIndx; // Indexnummer des Nodes
void Minimum( long nNew ) { if( nNew > nMinWidth ) nMinWidth = nNew; }
};
@@ -772,7 +772,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax,
case RES_TXTATR_FTN :
{
const XubString aTxt = pHint->GetFtn().GetNumStr();
- if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
+ if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
aTxt.Len() ) )
nAdd = 20;
break;
@@ -781,7 +781,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax,
{
SwField *pFld = (SwField*)pHint->GetFld().GetFld();
const String aTxt = pFld->GetCntnt( FALSE );
- if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
+ if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
aTxt.Len() ) )
nAdd = 20;
break;
@@ -817,7 +817,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax,
}
/*************************************************************************
- * SwTxtNode::GetScalingOfSelectedText()
+ * SwTxtNode::GetScalingOfSelectedText()
*
* Calculates the width of the text part specified by nStt and nEnd,
* the height of the line containing nStt is devided by this width,
@@ -828,7 +828,7 @@ void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax,
* changing this method very likely requires changing of "GetMinMaxSize"
*************************************************************************/
-USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd )
+USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd )
const
{
ViewShell* pSh = NULL;
@@ -1012,7 +1012,7 @@ USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd )
SwTxtFrm* pTmpFrm = ( SwTxtFrm* )pLastFrm;
if ( pTmpFrm->GetOfst() <= nStt &&
( !pTmpFrm->GetFollow() ||
- pTmpFrm->GetFollow()->GetOfst() > nStt ) )
+ pTmpFrm->GetFollow()->GetOfst() > nStt ) )
{
pFrm = pTmpFrm;
break;
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 1ae9e43d7f4d..06798408fb0f 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ class ViewShell;
class SwTxtFrm;
/*************************************************************************
- * class SwAttrIter
+ * class SwAttrIter
*************************************************************************/
class SwAttrIter
@@ -60,7 +60,7 @@ protected:
ViewShell *pShell;
SwFont *pFnt;
SwpHints *pHints;
- const SwAttrSet* pAttrSet; // das Char-Attribut-Set
+ const SwAttrSet* pAttrSet; // das Char-Attribut-Set
SwScriptInfo* pScriptInfo;
private:
@@ -79,8 +79,8 @@ protected:
void Chg( SwTxtAttr *pHt );
void Rst( SwTxtAttr *pHt );
void CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm = 0 );
- inline SwAttrIter(SwTxtNode* pTxtNode)
- : pShell(0), pFnt(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0), m_pTxtNode(pTxtNode) {}
+ inline SwAttrIter(SwTxtNode* pTxtNode)
+ : pShell(0), pFnt(0), pLastOut(0), nChgCnt(0), pRedln(0), nPropFont(0), m_pTxtNode(pTxtNode) {}
public:
// Konstruktor, Destruktor
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 6ff7777fd6ff..07f2bdbb299b 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -2,7 +2,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
@@ -52,12 +52,12 @@
#include "itrtxt.hxx"
#include "txtfrm.hxx"
#include "flyfrms.hxx"
-#include "porglue.hxx" // SwFlyCnt
-#include "porfld.hxx" // SwFldPortion::IsFollow()
-#include "porfly.hxx" // GetFlyCrsrOfst()
+#include "porglue.hxx" // SwFlyCnt
+#include "porfld.hxx" // SwFldPortion::IsFollow()
+#include "porfly.hxx" // GetFlyCrsrOfst()
#include "pordrop.hxx"
#include "crstate.hxx" // SwCrsrMoveState
-#include <pormulti.hxx> // SwMultiPortion
+#include <pormulti.hxx> // SwMultiPortion
// --> OD 2010-05-05 #i111284#
#include <numrule.hxx>
// <--
@@ -152,7 +152,7 @@ namespace {
bool AreListLevelIndentsApplicableAndLabelAlignmentActive( const SwTxtNode& rTxtNode )
{
bool bRet( false );
-
+
if ( rTxtNode.AreListLevelIndentsApplicable() )
{
const SwNumFmt& rNumFmt =
@@ -160,16 +160,16 @@ namespace {
if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
{
bRet = true;
- }
- }
-
- return bRet;
+ }
+ }
+
+ return bRet;
}
} // end of anonymous namespace
// <--
-
+
/*************************************************************************
- * SwTxtMargin::CtorInitTxtMargin()
+ * SwTxtMargin::CtorInitTxtMargin()
*************************************************************************/
void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
{
@@ -182,7 +182,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
const SvxLRSpaceItem &rSpace = pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
// --> OD 2009-09-08 #i95907#, #b6879723#
// --> OD 2010-05-05 #i111284#
- const bool bListLevelIndentsApplicableAndLabelAlignmentActive(
+ const bool bListLevelIndentsApplicableAndLabelAlignmentActive(
AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTxtNode()) ) );
// <--
@@ -382,7 +382,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
}
/*************************************************************************
- * SwTxtMargin::DropInit()
+ * SwTxtMargin::DropInit()
*************************************************************************/
void SwTxtMargin::DropInit()
{
@@ -402,7 +402,7 @@ void SwTxtMargin::DropInit()
}
/*************************************************************************
- * SwTxtMargin::GetLineStart()
+ * SwTxtMargin::GetLineStart()
*************************************************************************/
// Unter Beruecksichtigung des Erstzeileneinzuges und der angebenen Breite.
@@ -423,7 +423,7 @@ SwTwips SwTxtMargin::GetLineStart() const
}
/*************************************************************************
- * SwTxtCursor::CtorInitTxtCursor()
+ * SwTxtCursor::CtorInitTxtCursor()
*************************************************************************/
void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
{
@@ -433,7 +433,7 @@ void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
}
/*************************************************************************
- * SwTxtCursor::GetEndCharRect()
+ * SwTxtCursor::GetEndCharRect()
*************************************************************************/
// 1170: Antikbug: Shift-Ende vergisst das letzte Zeichen ...
@@ -507,7 +507,7 @@ sal_Bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const xub_StrLen nOfst,
}
/*************************************************************************
- * void SwTxtCursor::_GetCharRect(..)
+ * void SwTxtCursor::_GetCharRect(..)
* internal function, called by SwTxtCursor::GetCharRect() to calculate
* the relative character position in the current line.
* pOrig referes to x and y coordinates, width and height of the cursor
@@ -523,9 +523,9 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
SwTxtSizeInfo aInf( GetInfo(), rText, nStart );
if( GetPropFont() )
aInf.GetFont()->SetProportion( GetPropFont() );
- KSHORT nTmpAscent, nTmpHeight; // Zeilenhoehe
+ KSHORT nTmpAscent, nTmpHeight; // Zeilenhoehe
CalcAscentAndHeight( nTmpAscent, nTmpHeight );
- const Size aCharSize( 1, nTmpHeight );
+ const Size aCharSize( 1, nTmpHeight );
const Point aCharPos;
pOrig->Pos( aCharPos );
pOrig->SSize( aCharSize );
@@ -1059,7 +1059,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
}
if( pPor && pCMS )
{
- if( pCMS->bFieldInfo && pPor->InFldGrp() && pPor->Width() )
+ if( pCMS->bFieldInfo && pPor->InFldGrp() && pPor->Width() )
pOrig->Width( pPor->Width() );
if( pPor->IsDropPortion() )
{
@@ -1192,7 +1192,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
}
/*************************************************************************
- * SwTxtCursor::GetCharRect()
+ * SwTxtCursor::GetCharRect()
*************************************************************************/
sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
@@ -1256,7 +1256,7 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
if ( pCMS && pCMS->bRealHeight && pCMS->aRealHeight.Y() >= 0 )
{
long nTmp = pCMS->aRealHeight.X() + pOrig->Top();
- if( nTmp >= nMax )
+ if( nTmp >= nMax )
{
pCMS->aRealHeight.X() = nMax - pOrig->Top();
pCMS->aRealHeight.Y() = 0;
@@ -1279,7 +1279,7 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
}
/*************************************************************************
- * SwTxtCursor::GetCrsrOfst()
+ * SwTxtCursor::GetCrsrOfst()
*
* Return: Offset im String
*************************************************************************/
@@ -1692,8 +1692,8 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
&& !( (SwFlyCntPortion*)pPor )->IsDraw() )
{
// JP 24.11.94: liegt die Pos nicht im Fly, dann
- // darf nicht mit STRING_LEN returnt werden!
- // (BugId: 9692 + Aenderung in feshview)
+ // darf nicht mit STRING_LEN returnt werden!
+ // (BugId: 9692 + Aenderung in feshview)
SwFlyInCntFrm *pTmp = ( (SwFlyCntPortion*)pPor )->GetFlyFrm();
sal_Bool bChgNode = 1 < nChgNode;
if( !bChgNode )
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c6ec608a1df1..2c2efa5bf46f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2,7 +2,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
@@ -38,35 +38,35 @@
#include <ftninfo.hxx>
#include <charfmt.hxx>
#include <editeng/charrotateitem.hxx>
-#include <layfrm.hxx> // GetFrmRstHeight, etc
+#include <layfrm.hxx> // GetFrmRstHeight, etc
#include <viewsh.hxx>
-#include <viewopt.hxx> // SwViewOptions
-#include <paratr.hxx> // SwFmtDrop
+#include <viewopt.hxx> // SwViewOptions
+#include <paratr.hxx> // SwFmtDrop
#include <txtcfg.hxx>
#include <itrform2.hxx>
#include <porrst.hxx>
-#include <portab.hxx> // pLastTab->
-#include <porfly.hxx> // CalcFlyWidth
-#include <portox.hxx> // WhichTxtPortion
-#include <porref.hxx> // WhichTxtPortion
-#include <porfld.hxx> // SwNumberPortion fuer CalcAscent()
+#include <portab.hxx> // pLastTab->
+#include <porfly.hxx> // CalcFlyWidth
+#include <portox.hxx> // WhichTxtPortion
+#include <porref.hxx> // WhichTxtPortion
+#include <porfld.hxx> // SwNumberPortion fuer CalcAscent()
#include <porftn.hxx> // SwFtnPortion
#include <porhyph.hxx>
#include <guess.hxx>
-#include <blink.hxx> // pBlink
-#include <ftnfrm.hxx> // WhichFirstPortion() -> mal Verlagern.
-#include <redlnitr.hxx> // SwRedlineItr
+#include <blink.hxx> // pBlink
+#include <ftnfrm.hxx> // WhichFirstPortion() -> mal Verlagern.
+#include <redlnitr.hxx> // SwRedlineItr
#include <pagefrm.hxx>
#include <pagedesc.hxx> // SwPageDesc
#include <tgrditem.hxx>
-#include <doc.hxx> // SwDoc
-#include <pormulti.hxx> // SwMultiPortion
+#include <doc.hxx> // SwDoc
+#include <pormulti.hxx> // SwMultiPortion
#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
#include <unotools/charclass.hxx>
#if OSL_DEBUG_LEVEL > 1
-#include <ndtxt.hxx> // pSwpHints, Ausgabeoperator
+#include <ndtxt.hxx> // pSwpHints, Ausgabeoperator
#endif
using namespace ::com::sun::star;
@@ -86,7 +86,7 @@ inline void ClearFly( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFormatter::CtorInitTxtFormatter()
+ * SwTxtFormatter::CtorInitTxtFormatter()
*************************************************************************/
void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *pNewInf )
@@ -115,7 +115,7 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *p
}
/*************************************************************************
- * SwTxtFormatter::DTOR
+ * SwTxtFormatter::DTOR
*************************************************************************/
SwTxtFormatter::~SwTxtFormatter()
@@ -130,7 +130,7 @@ SwTxtFormatter::~SwTxtFormatter()
}
/*************************************************************************
- * SwTxtFormatter::Insert()
+ * SwTxtFormatter::Insert()
*************************************************************************/
void SwTxtFormatter::Insert( SwLineLayout *pLay )
@@ -146,7 +146,7 @@ void SwTxtFormatter::Insert( SwLineLayout *pLay )
}
/*************************************************************************
- * SwTxtFormatter::GetFrmRstHeight()
+ * SwTxtFormatter::GetFrmRstHeight()
*************************************************************************/
KSHORT SwTxtFormatter::GetFrmRstHeight() const
@@ -167,7 +167,7 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const
}
/*************************************************************************
- * SwTxtFormatter::UnderFlow()
+ * SwTxtFormatter::UnderFlow()
*************************************************************************/
SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
@@ -324,7 +324,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFormatter::InsertPortion()
+ * SwTxtFormatter::InsertPortion()
*************************************************************************/
void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
@@ -335,7 +335,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
if( pPor == pCurr )
{
if ( pCurr->GetPortion() )
- {
+ {
pPor = pCurr->GetPortion();
}
@@ -375,7 +375,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
}
/*************************************************************************
- * SwTxtFormatter::BuildPortion()
+ * SwTxtFormatter::BuildPortion()
*************************************************************************/
void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
@@ -419,7 +419,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
const USHORT nGridWidth = bHasGrid ?
- GETGRIDWIDTH(pGrid,pDoc) : 0; //for textgrid refactor
+ GETGRIDWIDTH(pGrid,pDoc) : 0; //for textgrid refactor
// used for grid mode only:
// the pointer is stored, because after formatting of non-asian text,
@@ -617,7 +617,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
((SwMultiPortion*)pPor)->HasFlyInCntnt() ) )
SetFlyInCntBase();
// 5964: bUnderFlow muss zurueckgesetzt werden, sonst wird beim
- // naechsten Softhyphen wieder umgebrochen!
+ // naechsten Softhyphen wieder umgebrochen!
if ( !bFull )
{
rInf.ClrUnderFlow();
@@ -737,7 +737,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFormatter::CalcAdjustLine()
+ * SwTxtFormatter::CalcAdjustLine()
*************************************************************************/
void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
@@ -756,7 +756,7 @@ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent )
}
/*************************************************************************
- * SwTxtFormatter::CalcAscent()
+ * SwTxtFormatter::CalcAscent()
*************************************************************************/
void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
@@ -861,7 +861,7 @@ void SwMetaPortion::Paint( const SwTxtPaintInfo &rInf ) const
/*************************************************************************
- * SwTxtFormatter::WhichTxtPor()
+ * SwTxtFormatter::WhichTxtPor()
*************************************************************************/
SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
@@ -908,7 +908,7 @@ SwTxtPortion *SwTxtFormatter::WhichTxtPor( SwTxtFormatInfo &rInf ) const
}
/*************************************************************************
- * SwTxtFormatter::NewTxtPortion()
+ * SwTxtFormatter::NewTxtPortion()
*************************************************************************/
// Die Laenge wird ermittelt, folgende Portion-Grenzen sind definiert:
// 1) Tabs
@@ -983,7 +983,7 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf )
/*************************************************************************
- * SwTxtFormatter::WhichFirstPortion()
+ * SwTxtFormatter::WhichFirstPortion()
*************************************************************************/
SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
@@ -1140,7 +1140,7 @@ sal_Bool lcl_OldFieldRest( const SwLineLayout* pCurr )
}
/*************************************************************************
- * SwTxtFormatter::NewPortion()
+ * SwTxtFormatter::NewPortion()
*************************************************************************/
/* NewPortion stellt rInf.nLen ein.
@@ -1148,11 +1148,11 @@ sal_Bool lcl_OldFieldRest( const SwLineLayout* pCurr )
* attrwechsel.
* Drei Faelle koennen eintreten:
* 1) Die Zeile ist voll und der Umbruch wurde nicht emuliert
- * -> return 0;
+ * -> return 0;
* 2) Die Zeile ist voll und es wurde ein Umbruch emuliert
- * -> Breite neu einstellen und return new FlyPortion
+ * -> Breite neu einstellen und return new FlyPortion
* 3) Es muss eine neue Portion gebaut werden.
- * -> CalcFlyWidth emuliert ggf. die Breite und return Portion
+ * -> CalcFlyWidth emuliert ggf. die Breite und return Portion
*/
SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
@@ -1313,10 +1313,10 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
case CH_BREAK:
pPor = new SwBreakPortion( *rInf.GetLast() ); break;
- case CHAR_SOFTHYPHEN: // soft hyphen
+ case CHAR_SOFTHYPHEN: // soft hyphen
pPor = new SwSoftHyphPortion; break;
- case CHAR_HARDBLANK: // no-break space
+ case CHAR_HARDBLANK: // no-break space
pPor = new SwBlankPortion( ' ' ); break;
case CHAR_HARDHYPHEN: // non-breaking hyphen
@@ -1336,7 +1336,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
break;
}
// No break
- default :
+ default :
{
SwTabPortion* pLastTabPortion = rInf.GetLastTab();
if ( pLastTabPortion && cChar == rInf.GetTabDecimal() )
@@ -1477,7 +1477,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFormatter::FormatLine()
+ * SwTxtFormatter::FormatLine()
*************************************************************************/
xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos )
@@ -1837,7 +1837,7 @@ pCurr->GetAscent() )
}
/*************************************************************************
- * SwTxtFormatter::FeedInf()
+ * SwTxtFormatter::FeedInf()
*************************************************************************/
void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const
@@ -1882,7 +1882,7 @@ void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const
}
/*************************************************************************
- * SwTxtFormatter::FormatReset()
+ * SwTxtFormatter::FormatReset()
*************************************************************************/
void SwTxtFormatter::FormatReset( SwTxtFormatInfo &rInf )
@@ -1900,7 +1900,7 @@ void SwTxtFormatter::FormatReset( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFormatter::CalcOnceMore()
+ * SwTxtFormatter::CalcOnceMore()
*************************************************************************/
sal_Bool SwTxtFormatter::CalcOnceMore()
@@ -1917,7 +1917,7 @@ sal_Bool SwTxtFormatter::CalcOnceMore()
}
/*************************************************************************
- * SwTxtFormatter::CalcBottomLine()
+ * SwTxtFormatter::CalcBottomLine()
*************************************************************************/
SwTwips SwTxtFormatter::CalcBottomLine() const
@@ -1945,7 +1945,7 @@ SwTwips SwTxtFormatter::CalcBottomLine() const
}
/*************************************************************************
- * SwTxtFormatter::_CalcFitToContent()
+ * SwTxtFormatter::_CalcFitToContent()
*
* FME/OD: This routine does a limited text formatting.
*************************************************************************/
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index a2a873004a32..05a4d85d7877 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -2,7 +2,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
@@ -42,17 +42,17 @@ class SwFtnPortion;
class SvLongs;
/*************************************************************************
- * class SwTxtFormatter
+ * class SwTxtFormatter
*************************************************************************/
class SwTxtFormatter : public SwTxtPainter
{
const SwFmtDrop *pDropFmt;
- SwMultiPortion* pMulti; // during formatting a multi-portion
- sal_uInt8 nCntEndHyph; // zaehlt aufeinanderfolgende Hyphens am Zeilenende
- sal_uInt8 nCntMidHyph; // zaehlt aufeinanderfolgende Hyphens vor Flies
+ SwMultiPortion* pMulti; // during formatting a multi-portion
+ sal_uInt8 nCntEndHyph; // zaehlt aufeinanderfolgende Hyphens am Zeilenende
+ sal_uInt8 nCntMidHyph; // zaehlt aufeinanderfolgende Hyphens vor Flies
xub_StrLen nLeftScanIdx; // for increasing performance during
- xub_StrLen nRightScanIdx; // scanning for portion ends
+ xub_StrLen nRightScanIdx; // scanning for portion ends
sal_Bool bOnceMore : 1; // noch 'ne Runde?
sal_Bool bFlyInCntBase : 1; // Base-Referenz der zeichengeb. Rahmen setzen
sal_Bool bChanges : 1; // Flag, fuer die Berechnung des Repaint-Rechtecks
@@ -184,19 +184,19 @@ public:
inline SwMultiPortion *GetMulti() const { return pMulti; }
inline sal_Bool IsOnceMore() const { return bOnceMore; }
- inline void SetOnceMore( sal_Bool bNew ) { bOnceMore = bNew; }
+ inline void SetOnceMore( sal_Bool bNew ) { bOnceMore = bNew; }
inline sal_Bool HasChanges() const { return bChanges; }
- inline void SetChanges() { bChanges = sal_True; }
+ inline void SetChanges() { bChanges = sal_True; }
inline sal_Bool HasTruncLines() const { return bTruncLines; }
- inline void SetTruncLines( sal_Bool bNew ) { bTruncLines = bNew; }
+ inline void SetTruncLines( sal_Bool bNew ) { bTruncLines = bNew; }
inline sal_Bool IsUnclipped() const { return bUnclipped; }
- inline void SetUnclipped( sal_Bool bNew ) { bUnclipped = bNew; }
+ inline void SetUnclipped( sal_Bool bNew ) { bUnclipped = bNew; }
inline sal_Bool IsFlyInCntBase() const { return bFlyInCntBase; }
- inline void SetFlyInCntBase( sal_Bool bNew = sal_True ){ bFlyInCntBase = bNew; }
+ inline void SetFlyInCntBase( sal_Bool bNew = sal_True ){ bFlyInCntBase = bNew; }
inline SwTxtFormatInfo &GetInfo()
{ return (SwTxtFormatInfo&)SwTxtIter::GetInfo(); }
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 4383d2827df1..d32534e7ee39 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -2,7 +2,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
@@ -31,8 +31,8 @@
#include "hintids.hxx"
-#include "flyfrm.hxx" // SwFlyInCntFrm
-#include "viewopt.hxx" // SwViewOptions
+#include "flyfrm.hxx" // SwFlyInCntFrm
+#include "viewopt.hxx" // SwViewOptions
#include "errhdl.hxx"
#include "txtatr.hxx" // SwINetFmt
#include <tools/multisel.hxx>
@@ -65,13 +65,13 @@
#include "swfont.hxx"
#include "txtpaint.hxx"
#include "portab.hxx" // SwTabPortion::IsFilled
-#include "porfly.hxx" // SwFlyCntPortion
-#include "porfld.hxx" // SwGrfNumPortion
-#include "frmfmt.hxx" // LRSpace
+#include "porfly.hxx" // SwFlyCntPortion
+#include "porfld.hxx" // SwGrfNumPortion
+#include "frmfmt.hxx" // LRSpace
#include "txatbase.hxx" // SwTxtAttr
#include "charfmt.hxx" // SwFmtCharFmt
#include "redlnitr.hxx" // SwRedlineItr
-#include "porrst.hxx" // SwArrowPortion
+#include "porrst.hxx" // SwArrowPortion
#include "pormulti.hxx"
/*************************************************************************
@@ -93,7 +93,7 @@ sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt )
}
/*************************************************************************
- * SwTxtPainter::CtorInitTxtPainter()
+ * SwTxtPainter::CtorInitTxtPainter()
*************************************************************************/
void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewInf )
{
@@ -114,7 +114,7 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
/*************************************************************************
- * SwTxtPainter::CalcPaintOfst()
+ * SwTxtPainter::CalcPaintOfst()
*************************************************************************/
SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
{
@@ -150,7 +150,7 @@ SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
}
// 7529: bei PostIts auch pLast returnen.
- if( pLast && !pLast->Width() && pLast->IsPostItsPortion() )
+ if( pLast && !pLast->Width() && pLast->IsPostItsPortion() )
{
pPor = pLast;
GetInfo().SetIdx( GetInfo().GetIdx() - pPor->GetLen() );
@@ -164,9 +164,9 @@ SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
*
* Es gibt zwei Moeglichkeiten bei transparenten Font auszugeben:
* 1) DrawRect auf die ganze Zeile und die DrawText hinterher
- * (objektiv schnell, subjektiv langsam).
+ * (objektiv schnell, subjektiv langsam).
* 2) Fuer jede Portion ein DrawRect mit anschliessendem DrawText
- * ausgefuehrt (objektiv langsam, subjektiv schnell).
+ * ausgefuehrt (objektiv langsam, subjektiv schnell).
* Da der User in der Regel subjektiv urteilt, wird die 2. Methode
* als Default eingestellt.
*************************************************************************/
@@ -235,7 +235,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
#if OSL_DEBUG_LEVEL > 1
static sal_Bool bClipAlways = sal_False;
if( bClip && bClipAlways )
- { bClip = sal_False;
+ { bClip = sal_False;
rClip.ChgClip( rPaint );
}
#endif
@@ -365,7 +365,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
else
bSeeked = sal_False;
-// bRest = sal_False;
+// bRest = sal_False;
// Wenn das Ende der Portion hinausragt, wird geclippt.
// Es wird ein Sicherheitsabstand von Height-Halbe aufaddiert,
@@ -462,7 +462,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
if( !GetNextLine() &&
GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreView() &&
- GetInfo().GetOpt().IsParagraph() && !GetTxtFrm()->GetFollow() &&
+ GetInfo().GetOpt().IsParagraph() && !GetTxtFrm()->GetFollow() &&
GetInfo().GetIdx() >= GetInfo().GetTxt().Len() )
{
const SwTmpEndPortion aEnd( *pEndTempl );
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index 4304676f3f97..533b92c48c5e 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 431ee467a595..4b33e4053e99 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@
#endif
/*************************************************************************
- * SwTxtIter::CtorInitTxtIter()
+ * SwTxtIter::CtorInitTxtIter()
*************************************************************************/
void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
@@ -101,7 +101,7 @@ void SwTxtIter::Init()
}
/*************************************************************************
- * SwTxtIter::_GetHeightAndAscent()
+ * SwTxtIter::_GetHeightAndAscent()
*************************************************************************/
void SwTxtIter::CalcAscentAndHeight( KSHORT &rAscent, KSHORT &rHeight ) const
@@ -111,7 +111,7 @@ void SwTxtIter::CalcAscentAndHeight( KSHORT &rAscent, KSHORT &rHeight ) const
}
/*************************************************************************
- * SwTxtIter::_GetPrev()
+ * SwTxtIter::_GetPrev()
*************************************************************************/
SwLineLayout *SwTxtIter::_GetPrev()
@@ -195,7 +195,7 @@ const SwLineLayout *SwTxtIter::NextLine()
}
/*************************************************************************
- * SwTxtIter::GetNextLine()
+ * SwTxtIter::GetNextLine()
*************************************************************************/
const SwLineLayout *SwTxtIter::GetNextLine() const
@@ -210,7 +210,7 @@ const SwLineLayout *SwTxtIter::GetNextLine() const
}
/*************************************************************************
- * SwTxtIter::GetPrevLine()
+ * SwTxtIter::GetPrevLine()
*************************************************************************/
const SwLineLayout *SwTxtIter::GetPrevLine()
@@ -340,7 +340,7 @@ USHORT SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
{
// Portions which are bigger than on grid distance are
// centered inside the whole line.
-
+
//for text refactor
const USHORT nLineNetto = rLine.Height() - nRubyHeight;
//const USHORT nLineNetto = ( nPorHeight > nGridWidth ) ?
@@ -412,7 +412,7 @@ sal_Bool lcl_NeedsFieldRest( const SwLineLayout* pCurr )
}
/*************************************************************************
- * SwTxtIter::TruncLines()
+ * SwTxtIter::TruncLines()
*************************************************************************/
void SwTxtIter::TruncLines( sal_Bool bNoteFollow )
@@ -471,7 +471,7 @@ void SwTxtIter::TruncLines( sal_Bool bNoteFollow )
}
/*************************************************************************
- * SwTxtIter::CntHyphens()
+ * SwTxtIter::CntHyphens()
*************************************************************************/
void SwTxtIter::CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 34736e0477d3..9419a86596c6 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ class SwMarginPortion;
class SwFlyPortion;
/*************************************************************************
- * class SwTxtIter
+ * class SwTxtIter
*************************************************************************/
class SwTxtIter : public SwAttrIter
@@ -51,15 +51,15 @@ protected:
SwLineLayout *pPrev;
SwTwips nFrameStart;
SwTwips nY;
- SwTwips nRegStart; // Anfangsposition (Y) des Registers
- xub_StrLen nStart; // Start im Textstring, Ende = pCurr->GetLen()
- KSHORT nRegDiff; // Zeilenabstand des Registers
- MSHORT nLineNr; // Zeilennummer
- sal_Bool bPrev : 1;
- sal_Bool bRegisterOn : 1; // Registerhaltigkeit
- sal_Bool bOneBlock : 1; // Blocksatz: Einzelwoerter austreiben
- sal_Bool bLastBlock : 1; // Blocksatz: Auch die letzte Zeile
- sal_Bool bLastCenter : 1; // Blocksatz: Letzte Zeile zentrieren
+ SwTwips nRegStart; // Anfangsposition (Y) des Registers
+ xub_StrLen nStart; // Start im Textstring, Ende = pCurr->GetLen()
+ KSHORT nRegDiff; // Zeilenabstand des Registers
+ MSHORT nLineNr; // Zeilennummer
+ sal_Bool bPrev : 1;
+ sal_Bool bRegisterOn : 1; // Registerhaltigkeit
+ sal_Bool bOneBlock : 1; // Blocksatz: Einzelwoerter austreiben
+ sal_Bool bLastBlock : 1; // Blocksatz: Auch die letzte Zeile
+ sal_Bool bLastCenter : 1; // Blocksatz: Letzte Zeile zentrieren
SwLineLayout *_GetPrev();
@@ -305,7 +305,7 @@ public:
};
/*************************************************************************
- * Inline-Implementierungen
+ * Inline-Implementierungen
*************************************************************************/
inline sal_Bool SwTxtIter::SeekAndChg( SwTxtSizeInfo &rInf )
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 2e5cbcc692a7..1761bc1257de 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index fbf17d07f26a..659cf6a41f24 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -2,7 +2,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
@@ -66,7 +66,7 @@ public:
};
/*************************************************************************
- * class SwDropPortion
+ * class SwDropPortion
*************************************************************************/
class SwDropPortion : public SwTxtPortion
@@ -74,11 +74,11 @@ class SwDropPortion : public SwTxtPortion
friend class SwDropCapCache;
SwDropPortionPart* pPart; // due to script / attribute changes
MSHORT nLines; // Anzahl der Zeilen
- KSHORT nDropHeight; // Hoehe
- KSHORT nDropDescent; // Abstand zur naechsten Zeile
- KSHORT nDistance; // Abstand zum Text
- KSHORT nFix; // Fixposition
- short nX; // X-PaintOffset
+ KSHORT nDropHeight; // Hoehe
+ KSHORT nDropDescent; // Abstand zur naechsten Zeile
+ KSHORT nDistance; // Abstand zum Text
+ KSHORT nFix; // Fixposition
+ short nX; // X-PaintOffset
short nY; // Y-Offset
sal_Bool FormatTxt( SwTxtFormatInfo &rInf );
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 344bc25b1f10..5a929901bd01 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -2,7 +2,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
@@ -30,20 +30,20 @@
#include "precompiled_sw.hxx"
-#include <viewopt.hxx> // SwViewOptions
+#include <viewopt.hxx> // SwViewOptions
#include <SwPortionHandler.hxx>
#include <inftxt.hxx>
#include <porexp.hxx>
/*************************************************************************
- * class SwExpandPortion
+ * class SwExpandPortion
*************************************************************************/
xub_StrLen SwExpandPortion::GetCrsrOfst( const MSHORT nOfst ) const
{ return SwLinePortion::GetCrsrOfst( nOfst ); }
/*************************************************************************
- * virtual SwExpandPortion::GetExpTxt()
+ * virtual SwExpandPortion::GetExpTxt()
*************************************************************************/
sal_Bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&,
@@ -66,7 +66,7 @@ void SwExpandPortion::HandlePortion( SwPortionHandler& rPH ) const
}
/*************************************************************************
- * virtual SwExpandPortion::GetTxtSize()
+ * virtual SwExpandPortion::GetTxtSize()
*************************************************************************/
SwPosSize SwExpandPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
@@ -99,7 +99,7 @@ sal_Bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwExpandPortion::Paint()
+ * virtual SwExpandPortion::Paint()
*************************************************************************/
void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -127,7 +127,7 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * class SwBlankPortion
+ * class SwBlankPortion
*************************************************************************/
SwLinePortion *SwBlankPortion::Compress() { return this; }
@@ -188,7 +188,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
}
/*************************************************************************
- * virtual SwBlankPortion::FormatEOL()
+ * virtual SwBlankPortion::FormatEOL()
*************************************************************************/
// Format end of Line
@@ -230,7 +230,7 @@ sal_Bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwBlankPortion::Paint()
+ * virtual SwBlankPortion::Paint()
*************************************************************************/
void SwBlankPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -241,7 +241,7 @@ void SwBlankPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * virtual SwBlankPortion::GetExpTxt()
+ * virtual SwBlankPortion::GetExpTxt()
*************************************************************************/
sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo&, XubString &rTxt ) const
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index f9275b8a92ee..a9f0a92dd6e3 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
class SwExpandPortion : public SwTxtPortion
{
public:
- inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
+ inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual xub_StrLen GetCrsrOfst( const MSHORT nOfst ) const;
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
@@ -53,15 +53,15 @@ public:
/*************************************************************************
- * class SwBlankPortion
+ * class SwBlankPortion
*************************************************************************/
class SwBlankPortion : public SwExpandPortion
{
xub_Unicode cChar;
- BOOL bMulti; // For multiportion brackets
+ BOOL bMulti; // For multiportion brackets
public:
- inline SwBlankPortion( xub_Unicode cCh, BOOL bMult = sal_False )
+ inline SwBlankPortion( xub_Unicode cCh, BOOL bMult = sal_False )
: cChar( cCh ), bMulti( bMult )
{ cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
@@ -88,8 +88,8 @@ public:
class SwPostItsPortion : public SwExpandPortion
{
- KSHORT nViewWidth;
- sal_Bool bScript;
+ KSHORT nViewWidth;
+ sal_Bool bScript;
public:
SwPostItsPortion( sal_Bool bScrpt );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 2d127388b7aa..6b7636c05a97 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -2,7 +2,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
@@ -38,13 +38,13 @@
#include <editeng/brshitem.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
-#include <viewopt.hxx> // SwViewOptions
+#include <viewopt.hxx> // SwViewOptions
#include <txtcfg.hxx>
#include <SwPortionHandler.hxx>
#include <porlay.hxx>
#include <porfld.hxx>
#include <inftxt.hxx>
-#include <blink.hxx> // pBlink
+#include <blink.hxx> // pBlink
#include <frmtool.hxx> // DrawGraphic
#include <viewsh.hxx>
#include <docsh.hxx>
@@ -153,7 +153,7 @@ KSHORT SwFldPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
// 8653: in keinem Fall nur SetLen(0);
/*************************************************************************
- * Hilfsklasse SwFldSlot
+ * Hilfsklasse SwFldSlot
**************************************************************************/
class SwFldSlot
@@ -407,12 +407,12 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
// case CHAR_RLM :
// case CHAR_LRM :
// <--
- // --> OD 2010-06-03 #i111750#
+ // --> OD 2010-06-03 #i111750#
// - Erasing further control characters from field string in
// to avoid loop.
case CH_TXTATR_BREAKWORD:
- case CH_TXTATR_INWORD:
- // <--
+ case CH_TXTATR_INWORD:
+ // <--
{
aNew.Erase( 0, 1 );
++nNextOfst;
@@ -658,8 +658,8 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
{
-/* Ein FormatEOL deutet daraufhin, dass der folgende Text
- * nicht mit auf die Zeile passte. Damit die Numerierung mitwandert,
+/* Ein FormatEOL deutet daraufhin, dass der folgende Text
+ * nicht mit auf die Zeile passte. Damit die Numerierung mitwandert,
* wird diese NumberPortion verborgen.
*/
@@ -676,8 +676,8 @@ void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
-/* Eine verborgene NumberPortion wird nicht angezeigt, es sei denn, es gibt
- * Textportions in dieser Zeile oder es gibt ueberhaupt nur eine einzige Zeile.
+/* Eine verborgene NumberPortion wird nicht angezeigt, es sei denn, es gibt
+ * Textportions in dieser Zeile oder es gibt ueberhaupt nur eine einzige Zeile.
*/
if ( IsHide() && rInf.GetParaPortion() && rInf.GetParaPortion()->GetNext() )
@@ -943,8 +943,8 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
if( DontPaint() )
return;
-/* Eine verborgene NumberPortion wird nicht angezeigt, es sei denn, es gibt
- * Textportions in dieser Zeile oder es gibt ueberhaupt nur eine einzige Zeile.
+/* Eine verborgene NumberPortion wird nicht angezeigt, es sei denn, es gibt
+ * Textportions in dieser Zeile oder es gibt ueberhaupt nur eine einzige Zeile.
*/
if ( IsHide() && rInf.GetParaPortion() && rInf.GetParaPortion()->GetNext() )
{
@@ -1128,7 +1128,7 @@ SwCombinedPortion::SwCombinedPortion( const XubString &rTxt )
aExpand.Erase( 6 );
// Initialization of the scripttype array,
// the arrays of width and position are filled by the format function
- if( pBreakIt->GetBreakIter().is() )
+ if( pBreakIt->GetBreakIter().is() )
{
BYTE nScr = SW_SCRIPTS;
for( USHORT i = 0; i < rTxt.Len(); ++i )
@@ -1175,7 +1175,7 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
USHORT nTop = ( nCount + 1 ) / 2;
SwFont aTmpFont( *rInf.GetFont() );
- aTmpFont.SetProportion( nProportion ); // a smaller font
+ aTmpFont.SetProportion( nProportion ); // a smaller font
SwFontSave aFontSave( rInf, &aTmpFont );
USHORT i = 0;
@@ -1184,9 +1184,9 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
while( i < nCount )
{
if( i == nTop ) // change the row
- aOutPos.Y() = aOldPos.Y() + nLowPos; // Y of the second row
- aOutPos.X() = aOldPos.X() + aPos[i]; // X position
- const BYTE nAct = aScrType[i]; // script type
+ aOutPos.Y() = aOldPos.Y() + nLowPos; // Y of the second row
+ aOutPos.X() = aOldPos.X() + aPos[i]; // X position
+ const BYTE nAct = aScrType[i]; // script type
aTmpFont.SetActual( nAct );
// if there're more than 4 characters to display, we choose fonts
// with 2/3 of the original font width.
@@ -1348,10 +1348,10 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
aPos[0] = 0;
switch( nCount )
{
- case 5: aPos[4] = aPos[3] + nBotDiff; // no break
- case 3: aPos[nTop] = nBotDiff; break;
- case 6: aPos[4] = aPos[3] + nBotDiff; // no break
- case 4: aPos[nTop] = 0; // no break
+ case 5: aPos[4] = aPos[3] + nBotDiff; // no break
+ case 3: aPos[nTop] = nBotDiff; break;
+ case 6: aPos[4] = aPos[3] + nBotDiff; // no break
+ case 4: aPos[nTop] = 0; // no break
case 2: aPos[nCount-1] = Width() - aPos[nCount-1];
}
@@ -1359,7 +1359,7 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
const sal_Bool bFull = rInf.Width() < rInf.X() + Width();
if( bFull )
{
- if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFldGrp()
+ if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFldGrp()
|| !((SwFldPortion*)rInf.GetLast())->IsFollow() ) )
Width( (USHORT)( rInf.Width() - rInf.X() ) );
else
@@ -1380,8 +1380,8 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
KSHORT SwCombinedPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
{
- if( !GetLen() ) // for the dummy part at the end of the line, where
- return 0; // the combined portion doesn't fit.
+ if( !GetLen() ) // for the dummy part at the end of the line, where
+ return 0; // the combined portion doesn't fit.
return SwFldPortion::GetViewWidth( rInf );
}
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 2739f4a2f759..ed18c5dd1d99 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -2,7 +2,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
@@ -47,17 +47,17 @@ class SwFldPortion : public SwExpandPortion
protected:
XubString aExpand; // das expandierte Feld
SwFont *pFnt; // Fuer mehrzeilige Felder
- xub_StrLen nNextOffset; // Offset des Follows im Originalstring
+ xub_StrLen nNextOffset; // Offset des Follows im Originalstring
xub_StrLen nNextScriptChg;
KSHORT nViewWidth; // Screenbreite fuer leere Felder
sal_Bool bFollow : 1; // 2. oder weiterer Teil eines Feldes
- sal_Bool bLeft : 1; // wird von SwNumberPortion benutzt
+ sal_Bool bLeft : 1; // wird von SwNumberPortion benutzt
sal_Bool bHide : 1; // wird von SwNumberPortion benutzt
- sal_Bool bCenter : 1; // wird von SwNumberPortion benutzt
- sal_Bool bHasFollow : 1; // geht in der naechsten Zeile weiter
- sal_Bool bAnimated : 1; // wird von SwGrfNumPortion benutzt
- sal_Bool bNoPaint : 1; // wird von SwGrfNumPortion benutzt
- sal_Bool bReplace : 1; // wird von SwGrfNumPortion benutzt
+ sal_Bool bCenter : 1; // wird von SwNumberPortion benutzt
+ sal_Bool bHasFollow : 1; // geht in der naechsten Zeile weiter
+ sal_Bool bAnimated : 1; // wird von SwGrfNumPortion benutzt
+ sal_Bool bNoPaint : 1; // wird von SwGrfNumPortion benutzt
+ sal_Bool bReplace : 1; // wird von SwGrfNumPortion benutzt
const sal_Bool bPlaceHolder : 1;
sal_Bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR)
@@ -147,7 +147,7 @@ class SwNumberPortion : public SwFldPortion
{
protected:
KSHORT nFixWidth; // vgl. Glues
- KSHORT nMinDist; // minimaler Abstand zum Text
+ KSHORT nMinDist; // minimaler Abstand zum Text
// --> OD 2008-01-23 #newlistlevelattrs#
bool mbLabelAlignmentPosAndSpaceModeActive;
// <--
@@ -198,9 +198,9 @@ public:
class SwGrfNumPortion : public SwNumberPortion
{
SvxBrushItem* pBrush;
- long nId; //fuer StopAnimation
- SwTwips nYPos; //Enthaelt _immer_ die aktuelle RelPos.
- SwTwips nGrfHeight;
+ long nId; //fuer StopAnimation
+ SwTwips nYPos; //Enthaelt _immer_ die aktuelle RelPos.
+ SwTwips nGrfHeight;
sal_Int16 eOrient;
public:
// --> OD 2008-01-23 #newlistlevelattrs#
@@ -250,12 +250,12 @@ public:
class SwCombinedPortion : public SwFldPortion
{
- USHORT aPos[6]; // up to six X positions
- USHORT aWidth[3]; // one width for every scripttype
- BYTE aScrType[6]; // scripttype of every character
- USHORT nUpPos; // the Y position of the upper baseline
- USHORT nLowPos; // the Y position of the lower baseline
- BYTE nProportion; // relative font height
+ USHORT aPos[6]; // up to six X positions
+ USHORT aWidth[3]; // one width for every scripttype
+ BYTE aScrType[6]; // scripttype of every character
+ USHORT nUpPos; // the Y position of the upper baseline
+ USHORT nLowPos; // the Y position of the lower baseline
+ BYTE nProportion; // relative font height
public:
SwCombinedPortion( const XubString &rExpand );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 30e5b231f50a..f38233799b0d 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -2,7 +2,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
@@ -30,11 +30,11 @@
#include "precompiled_sw.hxx"
-#include "dcontact.hxx" // SwDrawContact
-#include "dflyobj.hxx" // SwVirtFlyDrawObj
-#include "pam.hxx" // SwPosition
-#include "flyfrm.hxx" // SwFlyInCntFrm
-#include "frmfmt.hxx" // SwFrmFmt
+#include "dcontact.hxx" // SwDrawContact
+#include "dflyobj.hxx" // SwVirtFlyDrawObj
+#include "pam.hxx" // SwPosition
+#include "flyfrm.hxx" // SwFlyInCntFrm
+#include "frmfmt.hxx" // SwFrmFmt
#include "viewsh.hxx"
#include <vcl/outdev.hxx>
@@ -45,17 +45,17 @@
#include <fmtornt.hxx>
#include <frmatr.hxx>
#include "flyfrms.hxx"
-#include "txatbase.hxx" // SwTxtAttr
+#include "txatbase.hxx" // SwTxtAttr
#include "porfly.hxx"
-#include "porlay.hxx" // SetFly
-#include "inftxt.hxx" // SwTxtPaintInfo
+#include "porlay.hxx" // SetFly
+#include "inftxt.hxx" // SwTxtPaintInfo
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
/*************************************************************************
- * class SwFlyPortion
+ * class SwFlyPortion
*
* Wir erwarten ein framelokales SwRect !
*************************************************************************/
@@ -65,7 +65,7 @@ void SwFlyPortion::Paint( const SwTxtPaintInfo& ) const
}
/*************************************************************************
- * virtual SwFlyPortion::Format()
+ * virtual SwFlyPortion::Format()
*************************************************************************/
sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
{
@@ -89,7 +89,7 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
rInf.GetParaPortion()->SetFly( sal_True );
// trailing blank:
- if( rInf.GetIdx() < rInf.GetTxt().Len() && 1 < rInf.GetIdx()
+ if( rInf.GetIdx() < rInf.GetTxt().Len() && 1 < rInf.GetIdx()
&& !rInf.GetRest()
&& ' ' == rInf.GetChar( rInf.GetIdx() )
&& ' ' != rInf.GetChar( rInf.GetIdx() - 1 )
@@ -114,7 +114,7 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwFlyCntPortion::Format()
+ * virtual SwFlyCntPortion::Format()
*************************************************************************/
sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
{
@@ -159,7 +159,7 @@ sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwTxtFrm::MoveFlyInCnt() haengt jetzt die zeichengebundenen Objekte
+ * SwTxtFrm::MoveFlyInCnt() haengt jetzt die zeichengebundenen Objekte
* innerhalb des angegebenen Bereichs um, damit koennen diese vom Master
* zum Follow oder umgekehrt wandern.
*************************************************************************/
@@ -200,7 +200,7 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, xub_StrLen nStart, xub_StrLen nEnd
}
/*************************************************************************
- * SwTxtFrm::CalcFlyPos()
+ * SwTxtFrm::CalcFlyPos()
*************************************************************************/
xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
{
@@ -226,7 +226,7 @@ xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
}
/*************************************************************************
- * virtual SwFlyCntPortion::Paint()
+ * virtual SwFlyCntPortion::Paint()
*************************************************************************/
void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
@@ -286,7 +286,7 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * SwFlyCntPortion::SwFlyCntPortion()
+ * SwFlyCntPortion::SwFlyCntPortion()
*
* Es werden die Masze vom pFly->OutRect() eingestellt.
* Es erfolgt ein SetBase() !
@@ -340,7 +340,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
/*************************************************************************
- * SwFlyCntPortion::SetBase()
+ * SwFlyCntPortion::SetBase()
*
* Nach dem Setzen des RefPoints muss der Ascent neu berechnet werden,
* da er von der RelPos abhaengt.
@@ -426,7 +426,7 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
}
/*************************************************************************
- * virtual SwFlyCntPortion::GetFlyCrsrOfst()
+ * virtual SwFlyCntPortion::GetFlyCrsrOfst()
*************************************************************************/
xub_StrLen SwFlyCntPortion::GetFlyCrsrOfst( const KSHORT nOfst,
@@ -444,7 +444,7 @@ xub_StrLen SwFlyCntPortion::GetFlyCrsrOfst( const KSHORT nOfst,
}
/*************************************************************************
- * virtual SwFlyCntPortion::GetCrsrOfst()
+ * virtual SwFlyCntPortion::GetCrsrOfst()
*************************************************************************/
xub_StrLen SwFlyCntPortion::GetCrsrOfst( const KSHORT nOfst ) const
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index ed2a7d5d8e65..e2c258d2d58f 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -2,7 +2,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
@@ -38,14 +38,14 @@ class SwTxtFrm;
struct SwCrsrMoveState;
/*************************************************************************
- * class SwFlyPortion
+ * class SwFlyPortion
*************************************************************************/
class SwFlyPortion : public SwFixPortion
{
KSHORT nBlankWidth;
public:
- inline SwFlyPortion( const SwRect &rFlyRect )
+ inline SwFlyPortion( const SwRect &rFlyRect )
: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
@@ -55,13 +55,13 @@ public:
};
/*************************************************************************
- * class SwFlyCntPortion
+ * class SwFlyCntPortion
*************************************************************************/
class SwFlyCntPortion : public SwLinePortion
{
void *pContact; // bDraw ? DrawContact : FlyInCntFrm
- Point aRef; // Relativ zu diesem Point wird die AbsPos berechnet.
+ Point aRef; // Relativ zu diesem Point wird die AbsPos berechnet.
sal_Bool bDraw : 1; // DrawContact?
sal_Bool bMax : 1; // Zeilenausrichtung und Hoehe == Zeilenhoehe
sal_uInt8 nAlign : 3; // Zeilenausrichtung? Nein, oben, mitte, unten
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 468cb4523bcf..606c6c3479c5 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -2,7 +2,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
@@ -34,12 +34,12 @@ class SwTxtFrm;
class SwTxtFtn;
/*************************************************************************
- * class SwFtnPortion
+ * class SwFtnPortion
*************************************************************************/
class SwFtnPortion : public SwFldPortion
{
- SwTxtFrm *pFrm; // um im Dtor RemoveFtn rufen zu koennen.
+ SwTxtFrm *pFrm; // um im Dtor RemoveFtn rufen zu koennen.
SwTxtFtn *pFtn;
KSHORT nOrigHeight;
// --> OD 2009-01-29 #i98418#
@@ -49,7 +49,7 @@ class SwFtnPortion : public SwFldPortion
public:
SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrm, SwTxtFtn *pFtn,
KSHORT nOrig = KSHRT_MAX );
- inline KSHORT& Orig() { return nOrigHeight; }
+ inline KSHORT& Orig() { return nOrigHeight; }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
@@ -65,7 +65,7 @@ public:
};
/*************************************************************************
- * class SwFtnNumPortion
+ * class SwFtnNumPortion
*************************************************************************/
class SwFtnNumPortion : public SwNumberPortion
@@ -81,12 +81,12 @@ public:
};
/*************************************************************************
- * class SwQuoVadisPortion
+ * class SwQuoVadisPortion
*************************************************************************/
class SwQuoVadisPortion : public SwFldPortion
{
- XubString aErgo;
+ XubString aErgo;
public:
SwQuoVadisPortion( const XubString &rExp, const XubString& rStr );
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -107,7 +107,7 @@ public:
};
/*************************************************************************
- * class SwErgoSumPortion
+ * class SwErgoSumPortion
*************************************************************************/
class SwErgoSumPortion : public SwFldPortion
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index cf23eedec633..6bc3e8c8ea04 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -2,7 +2,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
@@ -32,19 +32,19 @@
#include "swrect.hxx"
-#include "paratr.hxx" // pTabStop, ADJ*
-#include "viewopt.hxx" // SwViewOptions
-#include "errhdl.hxx" // ASSERT
+#include "paratr.hxx" // pTabStop, ADJ*
+#include "viewopt.hxx" // SwViewOptions
+#include "errhdl.hxx" // ASSERT
#include <SwPortionHandler.hxx>
#include "txtcfg.hxx"
#include "porglue.hxx"
#include "inftxt.hxx"
-#include "porlay.hxx" // SwParaPortion, SetFull
-#include "porfly.hxx" // SwParaPortion, SetFull
+#include "porlay.hxx" // SwParaPortion, SetFull
+#include "porfly.hxx" // SwParaPortion, SetFull
/*************************************************************************
- * class SwGluePortion
+ * class SwGluePortion
*************************************************************************/
SwGluePortion::SwGluePortion( const KSHORT nInitFixWidth )
@@ -55,7 +55,7 @@ SwGluePortion::SwGluePortion( const KSHORT nInitFixWidth )
}
/*************************************************************************
- * virtual SwGluePortion::GetCrsrOfst()
+ * virtual SwGluePortion::GetCrsrOfst()
*************************************************************************/
xub_StrLen SwGluePortion::GetCrsrOfst( const KSHORT nOfst ) const
@@ -67,7 +67,7 @@ xub_StrLen SwGluePortion::GetCrsrOfst( const KSHORT nOfst ) const
}
/*************************************************************************
- * virtual SwGluePortion::GetTxtSize()
+ * virtual SwGluePortion::GetTxtSize()
*************************************************************************/
SwPosSize SwGluePortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
@@ -79,7 +79,7 @@ SwPosSize SwGluePortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
}
/*************************************************************************
- * virtual SwGluePortion::GetExpTxt()
+ * virtual SwGluePortion::GetExpTxt()
*************************************************************************/
sal_Bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
@@ -94,7 +94,7 @@ sal_Bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt )
}
/*************************************************************************
- * virtual SwGluePortion::Paint()
+ * virtual SwGluePortion::Paint()
*************************************************************************/
void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -140,7 +140,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * SwGluePortion::MoveGlue()
+ * SwGluePortion::MoveGlue()
*************************************************************************/
void SwGluePortion::MoveGlue( SwGluePortion *pTarget, const short nPrtGlue )
@@ -154,7 +154,7 @@ void SwGluePortion::MoveGlue( SwGluePortion *pTarget, const short nPrtGlue )
}
/*************************************************************************
- * void SwGluePortion::Join()
+ * void SwGluePortion::Join()
*************************************************************************/
void SwGluePortion::Join( SwGluePortion *pVictim )
@@ -171,7 +171,7 @@ void SwGluePortion::Join( SwGluePortion *pVictim )
}
/*************************************************************************
- * class SwFixPortion
+ * class SwFixPortion
*************************************************************************/
// Wir erwarten ein framelokales SwRect !
@@ -189,7 +189,7 @@ SwFixPortion::SwFixPortion(const KSHORT nFixedWidth, const KSHORT nFixedPos)
}
/*************************************************************************
- * class SwMarginPortion
+ * class SwMarginPortion
*************************************************************************/
SwMarginPortion::SwMarginPortion( const KSHORT nFixedWidth )
@@ -199,7 +199,7 @@ SwMarginPortion::SwMarginPortion( const KSHORT nFixedWidth )
}
/*************************************************************************
- * SwMarginPortion::AdjustRight()
+ * SwMarginPortion::AdjustRight()
*
* In der umschliessenden Schleife werden alle Portions durchsucht,
* dabei werden erst die am Ende liegenden GluePortions verarbeitet.
@@ -242,7 +242,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
KSHORT nRightGlue = pRight && 0 < pRight->GetPrtGlue()
? KSHORT(pRight->GetPrtGlue()) : 0;
// 2) linken und rechten Glue ausgleichen
- // Bei Tabs haengen wir nix um ...
+ // Bei Tabs haengen wir nix um ...
if( pLeft && nRightGlue && !pRight->InTabGrp() )
{
// pPrev ist die Portion, die unmittelbar vor pRight liegt.
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index a498c46cbb7e..53c4f1aae4bb 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@ class SwRect;
class SwLineLayout;
/*************************************************************************
- * class SwGluePortion
+ * class SwGluePortion
*************************************************************************/
class SwGluePortion : public SwLinePortion
@@ -62,12 +62,12 @@ public:
};
/*************************************************************************
- * class SwFixPortion
+ * class SwFixPortion
*************************************************************************/
class SwFixPortion : public SwGluePortion
{
- KSHORT nFix; // der Width-Offset in der Zeile
+ KSHORT nFix; // der Width-Offset in der Zeile
public:
SwFixPortion( const SwRect &rFlyRect );
SwFixPortion( const KSHORT nFixWidth, const KSHORT nFixPos );
@@ -77,7 +77,7 @@ public:
};
/*************************************************************************
- * class SwMarginPortion
+ * class SwMarginPortion
*************************************************************************/
class SwMarginPortion : public SwGluePortion
@@ -89,14 +89,14 @@ public:
};
/*************************************************************************
- * inline SwGluePortion::GetPrtGlue()
+ * inline SwGluePortion::GetPrtGlue()
*************************************************************************/
inline short SwGluePortion::GetPrtGlue() const
{ return Width() - nFixWidth; }
/*************************************************************************
- * inline SwGluePortion::AdjFixWidth()
+ * inline SwGluePortion::AdjFixWidth()
* Die FixWidth darf niemals groesser sein als die Gesamtbreite !
*************************************************************************/
@@ -107,7 +107,7 @@ inline void SwGluePortion::AdjFixWidth()
}
/*************************************************************************
- * inline SwGluePortion::MoveGlue()
+ * inline SwGluePortion::MoveGlue()
*************************************************************************/
inline void SwGluePortion::MoveAllGlue( SwGluePortion *pTarget )
@@ -116,7 +116,7 @@ inline void SwGluePortion::MoveAllGlue( SwGluePortion *pTarget )
}
/*************************************************************************
- * inline SwGluePortion::MoveHalfGlue()
+ * inline SwGluePortion::MoveHalfGlue()
*************************************************************************/
inline void SwGluePortion::MoveHalfGlue( SwGluePortion *pTarget )
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index c3f2934cedc8..ca13f8dd5f88 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
class SwHyphPortion : public SwExpandPortion
{
public:
- inline SwHyphPortion( ) { SetWhichPor( POR_HYPH ); }
+ inline SwHyphPortion( ) { SetWhichPor( POR_HYPH ); }
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -72,7 +72,7 @@ class SwSoftHyphPortion : public SwHyphPortion
{
sal_Bool bExpand;
KSHORT nViewWidth;
- KSHORT nHyphWidth;
+ KSHORT nHyphWidth;
public:
SwSoftHyphPortion();
@@ -93,7 +93,7 @@ public:
};
/*************************************************************************
- * class SwSoftHyphStrPortion
+ * class SwSoftHyphStrPortion
*************************************************************************/
class SwSoftHyphStrPortion : public SwHyphStrPortion
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 057d0a2a668d..9c68d1140fac 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -2,7 +2,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
@@ -30,18 +30,18 @@
#include "precompiled_sw.hxx"
-#include "errhdl.hxx" // ASSERT
+#include "errhdl.hxx" // ASSERT
#include "txtcfg.hxx"
#include "porlay.hxx"
#include "itrform2.hxx"
#include "porglue.hxx"
-#include "porexp.hxx" // SwQuoVadisPortion
-#include "blink.hxx" // pBlink
+#include "porexp.hxx" // SwQuoVadisPortion
+#include "blink.hxx" // pBlink
#include "redlnitr.hxx" // SwRedlineItr
-#include "porfly.hxx" // SwFlyCntPortion
-#include <porrst.hxx> // SwHangingPortion
-#include <pormulti.hxx> // SwMultiPortion
+#include "porfly.hxx" // SwFlyCntPortion
+#include <porrst.hxx> // SwHangingPortion
+#include <pormulti.hxx> // SwMultiPortion
#include <breakit.hxx>
#include <unicode/uchar.h>
#include <com/sun/star/i18n/ScriptType.hdl>
@@ -227,7 +227,7 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
}
/*************************************************************************
- * SwLineLayout::~SwLineLayout()
+ * SwLineLayout::~SwLineLayout()
*
* class SwLineLayout: Das Layout einer einzelnen Zeile. Dazu
* gehoeren vor allen Dingen die Dimension, die Anzahl der
@@ -251,7 +251,7 @@ SwLineLayout::~SwLineLayout()
}
/*************************************************************************
- * virtual SwLineLayout::Insert()
+ * virtual SwLineLayout::Insert()
*************************************************************************/
SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
@@ -280,7 +280,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
}
/*************************************************************************
- * virtual SwLineLayout::Append()
+ * virtual SwLineLayout::Append()
*************************************************************************/
SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
@@ -294,7 +294,7 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
}
/*************************************************************************
- * virtual SwLineLayout::Format()
+ * virtual SwLineLayout::Format()
*************************************************************************/
// fuer die Sonderbehandlung bei leeren Zeilen
@@ -311,7 +311,7 @@ sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * SwLineLayout::CalcLeftMargin()
+ * SwLineLayout::CalcLeftMargin()
*
* Wir sammeln alle FlyPortions am Anfang der Zeile zu einer MarginPortion.
*************************************************************************/
@@ -369,7 +369,7 @@ void SwLineLayout::InitSpaceAdd()
}
/*************************************************************************
- * SwLineLayout::CreateSpaceAdd()
+ * SwLineLayout::CreateSpaceAdd()
*************************************************************************/
void SwLineLayout::CreateSpaceAdd( const long nInit )
@@ -399,7 +399,7 @@ bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen nStt, xub_StrLen nEnd
}
/*************************************************************************
- * SwLineLayout::CalcLine()
+ * SwLineLayout::CalcLine()
*
* Aus FormatLine() ausgelagert.
*************************************************************************/
@@ -447,9 +447,9 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
SwLinePortion *pLast = this;
KSHORT nMaxDescent = 0;
- // Eine Gruppe ist ein Abschnitt in der Portion-Kette von
- // pCurr oder einer Fix-Portion bis zum Ende bzw. zur naechsten
- // Fix-Portion.
+ // Eine Gruppe ist ein Abschnitt in der Portion-Kette von
+ // pCurr oder einer Fix-Portion bis zum Ende bzw. zur naechsten
+ // Fix-Portion.
while( pPos )
{
DBG_LOOP;
@@ -713,7 +713,7 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
}
/*************************************************************************
- * class SwCharRange
+ * class SwCharRange
*************************************************************************/
SwCharRange &SwCharRange::operator+=(const SwCharRange &rRange)
@@ -781,7 +781,7 @@ BYTE SwScriptInfo::WhichFont( xub_StrLen nIdx, const String* pTxt, const SwScrip
}
/*************************************************************************
- * SwScriptInfo::InitScriptInfo()
+ * SwScriptInfo::InitScriptInfo()
*
* searches for script changes in rTxt and stores them
*************************************************************************/
@@ -1412,7 +1412,7 @@ void SwScriptInfo::UpdateBidiInfo( const String& rTxt )
UBiDi* pBidi = ubidi_openSized( rTxt.Len(), 0, &nError );
nError = U_ZERO_ERROR;
- ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(rTxt.GetBuffer()), rTxt.Len(), // UChar != sal_Unicode in MinGW
+ ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(rTxt.GetBuffer()), rTxt.Len(), // UChar != sal_Unicode in MinGW
nDefaultDir, NULL, &nError );
nError = U_ZERO_ERROR;
long nCount = ubidi_countRuns( pBidi, &nError );
@@ -1435,13 +1435,13 @@ void SwScriptInfo::UpdateBidiInfo( const String& rTxt )
/*************************************************************************
- * SwScriptInfo::NextScriptChg(..)
+ * SwScriptInfo::NextScriptChg(..)
* returns the position of the next character which belongs to another script
* than the character of the actual (input) position.
* If there's no script change until the end of the paragraph, it will return
* STRING_LEN.
* Scripts are Asian (Chinese, Japanese, Korean),
- * Latin ( English etc.)
+ * Latin ( English etc.)
* and Complex ( Hebrew, Arabian )
*************************************************************************/
@@ -1458,7 +1458,7 @@ xub_StrLen SwScriptInfo::NextScriptChg( const xub_StrLen nPos ) const
}
/*************************************************************************
- * SwScriptInfo::ScriptType(..)
+ * SwScriptInfo::ScriptType(..)
* returns the script of the character at the input position
*************************************************************************/
@@ -2278,7 +2278,7 @@ SwParaPortion::~SwParaPortion()
}
/*************************************************************************
- * SwParaPortion::GetParLen()
+ * SwParaPortion::GetParLen()
*************************************************************************/
xub_StrLen SwParaPortion::GetParLen() const
{
@@ -2294,7 +2294,7 @@ xub_StrLen SwParaPortion::GetParLen() const
}
/*************************************************************************
- * SwParaPortion::FindDropPortion()
+ * SwParaPortion::FindDropPortion()
*************************************************************************/
const SwDropPortion *SwParaPortion::FindDropPortion() const
@@ -2315,7 +2315,7 @@ const SwDropPortion *SwParaPortion::FindDropPortion() const
}
/*************************************************************************
- * SwLineLayout::Init()
+ * SwLineLayout::Init()
*************************************************************************/
void SwLineLayout::Init( SwLinePortion* pNextPortion )
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index db11bbc87f31..5a90ac88c6b1 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class SvStream;
class SwTxtFormatter;
/*************************************************************************
- * class SwCharRange
+ * class SwCharRange
*************************************************************************/
class SwCharRange
@@ -52,7 +52,7 @@ class SwCharRange
xub_StrLen nStart, nLen;
public:
inline SwCharRange( const xub_StrLen nInitStart = 0,
- const xub_StrLen nInitLen = 0): nStart( nInitStart ), nLen(nInitLen) {}
+ const xub_StrLen nInitLen = 0): nStart( nInitStart ), nLen(nInitLen) {}
inline xub_StrLen &Start() { return nStart; }
inline const xub_StrLen &Start() const { return nStart; }
inline void LeftMove( xub_StrLen nNew )
@@ -71,7 +71,7 @@ public:
};
/*************************************************************************
- * class SwRepaint
+ * class SwRepaint
*************************************************************************/
// SwRepaint ist ein dokumentglobales SwRect mit einem nOfst der angibt,
@@ -93,7 +93,7 @@ public:
};
/*************************************************************************
- * class SwLineLayout
+ * class SwLineLayout
*************************************************************************/
class SwLineLayout : public SwTxtPortion
@@ -104,17 +104,17 @@ private:
SvUShorts* pKanaComp; // Used for Kana compression.
KSHORT nRealHeight; // Die aus Zeilenabstand/Register resultierende Hoehe.
sal_Bool bFormatAdj : 1;
- sal_Bool bDummy : 1;
- sal_Bool bFntChg : 1;
- sal_Bool bEndHyph : 1;
- sal_Bool bMidHyph : 1;
- sal_Bool bTab : 1;
+ sal_Bool bDummy : 1;
+ sal_Bool bFntChg : 1;
+ sal_Bool bEndHyph : 1;
+ sal_Bool bMidHyph : 1;
+ sal_Bool bTab : 1;
sal_Bool bFly : 1;
- sal_Bool bRest : 1;
- sal_Bool bBlinking : 1;
- sal_Bool bClipping : 1; // Clipping erforderlich wg. exakter Zeilenhoehe
- sal_Bool bContent : 1; // enthaelt Text, fuer Zeilennumerierung
- sal_Bool bRedline : 1; // enthaelt Redlining
+ sal_Bool bRest : 1;
+ sal_Bool bBlinking : 1;
+ sal_Bool bClipping : 1; // Clipping erforderlich wg. exakter Zeilenhoehe
+ sal_Bool bContent : 1; // enthaelt Text, fuer Zeilennumerierung
+ sal_Bool bRedline : 1; // enthaelt Redlining
sal_Bool bForcedLeftMargin : 1; // vom Fly verschobener linker Einzug
sal_Bool bHanging : 1; // contents a hanging portion in the margin
sal_Bool bUnderscore : 1;
@@ -279,24 +279,24 @@ class SwParaPortion : public SwLineLayout
// Wenn ein SwTxtFrm gelocked ist, werden keine Veraenderungen an den
// Formatierungsdaten (unter pLine) vorgenommen (vgl. ORPHANS)
- sal_Bool bFlys : 1; // Ueberlappen Flys ?
- sal_Bool bPrep : 1; // PREP_*
- sal_Bool bPrepWidows : 1; // PREP_WIDOWS
- sal_Bool bPrepAdjust : 1; // PREP_ADJUST_FRM
- sal_Bool bPrepMustFit : 1; // PREP_MUST_FIT
- sal_Bool bFollowField : 1; // Es steht noch ein Feldrest fuer den Follow an.
-
- sal_Bool bFixLineHeight : 1; // Feste Zeilenhoehe
- sal_Bool bFtnNum : 1; // contents a footnotenumberportion
- sal_Bool bMargin : 1; // contents a hanging punctuation in the margin
-
- sal_Bool bFlag00 : 1; //
- sal_Bool bFlag11 : 1; //
- sal_Bool bFlag12 : 1; //
- sal_Bool bFlag13 : 1; //
- sal_Bool bFlag14 : 1; //
- sal_Bool bFlag15 : 1; //
- sal_Bool bFlag16 : 1; //
+ sal_Bool bFlys : 1; // Ueberlappen Flys ?
+ sal_Bool bPrep : 1; // PREP_*
+ sal_Bool bPrepWidows : 1; // PREP_WIDOWS
+ sal_Bool bPrepAdjust : 1; // PREP_ADJUST_FRM
+ sal_Bool bPrepMustFit : 1; // PREP_MUST_FIT
+ sal_Bool bFollowField : 1; // Es steht noch ein Feldrest fuer den Follow an.
+
+ sal_Bool bFixLineHeight : 1; // Feste Zeilenhoehe
+ sal_Bool bFtnNum : 1; // contents a footnotenumberportion
+ sal_Bool bMargin : 1; // contents a hanging punctuation in the margin
+
+ sal_Bool bFlag00 : 1; //
+ sal_Bool bFlag11 : 1; //
+ sal_Bool bFlag12 : 1; //
+ sal_Bool bFlag13 : 1; //
+ sal_Bool bFlag14 : 1; //
+ sal_Bool bFlag15 : 1; //
+ sal_Bool bFlag16 : 1; //
public:
SwParaPortion();
@@ -379,7 +379,7 @@ public:
};
/*************************************************************************
- * Inline-Implementierungen
+ * Inline-Implementierungen
*************************************************************************/
inline void SwLineLayout::ResetFlags()
@@ -406,10 +406,10 @@ inline void SwParaPortion::FormatReset()
{
nDelta = 0;
aReformat = SwCharRange( 0, STRING_LEN );
-// AMA 9916: bFlys muss in SwTxtFrm::_Format() erhalten bleiben, damit
-// leere Absaetze, die Rahmen ohne Umfluss ausweichen mussten, sich
-// neu formatieren, wenn der Rahmen aus dem Bereich verschwindet.
-// bFlys = sal_False;
+// AMA 9916: bFlys muss in SwTxtFrm::_Format() erhalten bleiben, damit
+// leere Absaetze, die Rahmen ohne Umfluss ausweichen mussten, sich
+// neu formatieren, wenn der Rahmen aus dem Bereich verschwindet.
+// bFlys = sal_False;
ResetPreps();
bFollowField = bFixLineHeight = bMargin = sal_False;
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index cf8b4e528c9b..f2537a92fad0 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -2,7 +2,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
@@ -90,7 +90,7 @@ KSHORT SwLinePortion::GetViewWidth( const SwTxtSizeInfo & ) const
}
/*************************************************************************
- * SwLinePortion::SwLinePortion( )
+ * SwLinePortion::SwLinePortion( )
*************************************************************************/
SwLinePortion::SwLinePortion( ) :
@@ -166,7 +166,7 @@ void SwLinePortion::PrePaint( const SwTxtPaintInfo& rInf,
}
/*************************************************************************
- * SwLinePortion::CalcTxtSize()
+ * SwLinePortion::CalcTxtSize()
*************************************************************************/
void SwLinePortion::CalcTxtSize( const SwTxtSizeInfo &rInf )
@@ -182,7 +182,7 @@ void SwLinePortion::CalcTxtSize( const SwTxtSizeInfo &rInf )
}
/*************************************************************************
- * SwLinePortion::Truncate()
+ * SwLinePortion::Truncate()
*
* Es werden alle nachfolgenden Portions geloescht.
*************************************************************************/
@@ -203,7 +203,7 @@ void SwLinePortion::_Truncate()
}
/*************************************************************************
- * virtual SwLinePortion::Insert()
+ * virtual SwLinePortion::Insert()
*
* Es wird immer hinter uns eingefuegt.
*************************************************************************/
@@ -219,7 +219,7 @@ SwLinePortion *SwLinePortion::Insert( SwLinePortion *pIns )
}
/*************************************************************************
- * SwLinePortion::FindLastPortion()
+ * SwLinePortion::FindLastPortion()
*************************************************************************/
SwLinePortion *SwLinePortion::FindLastPortion()
@@ -235,7 +235,7 @@ SwLinePortion *SwLinePortion::FindLastPortion()
}
/*************************************************************************
- * virtual SwLinePortion::Append()
+ * virtual SwLinePortion::Append()
*************************************************************************/
SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
@@ -250,7 +250,7 @@ SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
}
/*************************************************************************
- * virtual SwLinePortion::Cut()
+ * virtual SwLinePortion::Cut()
*************************************************************************/
SwLinePortion *SwLinePortion::Cut( SwLinePortion *pVictim )
@@ -263,7 +263,7 @@ SwLinePortion *SwLinePortion::Cut( SwLinePortion *pVictim )
}
/*************************************************************************
- * SwLinePortion::FindPrevPortion()
+ * SwLinePortion::FindPrevPortion()
*************************************************************************/
SwLinePortion *SwLinePortion::FindPrevPortion( const SwLinePortion *pRoot )
@@ -281,7 +281,7 @@ SwLinePortion *SwLinePortion::FindPrevPortion( const SwLinePortion *pRoot )
}
/*************************************************************************
- * virtual SwLinePortion::GetCrsrOfst()
+ * virtual SwLinePortion::GetCrsrOfst()
*************************************************************************/
xub_StrLen SwLinePortion::GetCrsrOfst( const KSHORT nOfst ) const
@@ -293,7 +293,7 @@ xub_StrLen SwLinePortion::GetCrsrOfst( const KSHORT nOfst ) const
}
/*************************************************************************
- * virtual SwLinePortion::GetTxtSize()
+ * virtual SwLinePortion::GetTxtSize()
*************************************************************************/
SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
@@ -306,7 +306,7 @@ SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * virtual SwLinePortion::Check()
+ * virtual SwLinePortion::Check()
*************************************************************************/
sal_Bool SwLinePortion::Check( SvStream &, SwTxtSizeInfo & ) //$ ostream
@@ -316,7 +316,7 @@ sal_Bool SwLinePortion::Check( SvStream &, SwTxtSizeInfo & ) //$ ostream
#endif
/*************************************************************************
- * virtual SwLinePortion::Format()
+ * virtual SwLinePortion::Format()
*************************************************************************/
sal_Bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
@@ -346,7 +346,7 @@ sal_Bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwLinePortion::FormatEOL()
+ * virtual SwLinePortion::FormatEOL()
*************************************************************************/
// Format end of line
@@ -355,7 +355,7 @@ void SwLinePortion::FormatEOL( SwTxtFormatInfo & )
{ }
/*************************************************************************
- * SwLinePortion::Move()
+ * SwLinePortion::Move()
*************************************************************************/
void SwLinePortion::Move( SwTxtPaintInfo &rInf )
@@ -367,7 +367,7 @@ void SwLinePortion::Move( SwTxtPaintInfo &rInf )
if ( InSpaceGrp() && rInf.GetSpaceAdd() )
{
- SwTwips nTmp = PrtWidth() + CalcSpacing( rInf.GetSpaceAdd(), rInf );
+ SwTwips nTmp = PrtWidth() + CalcSpacing( rInf.GetSpaceAdd(), rInf );
if( rInf.IsRotated() )
rInf.Y( rInf.Y() + ( bB2T ? -nTmp : nTmp ) );
else if ( bCounterDir )
@@ -396,7 +396,7 @@ void SwLinePortion::Move( SwTxtPaintInfo &rInf )
}
/*************************************************************************
- * virtual SwLinePortion::CalcSpacing()
+ * virtual SwLinePortion::CalcSpacing()
*************************************************************************/
long SwLinePortion::CalcSpacing( long , const SwTxtSizeInfo & ) const
@@ -405,7 +405,7 @@ long SwLinePortion::CalcSpacing( long , const SwTxtSizeInfo & ) const
}
/*************************************************************************
- * virtual SwLinePortion::GetExpTxt()
+ * virtual SwLinePortion::GetExpTxt()
*************************************************************************/
sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &, XubString & ) const
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index a57ab1c0e4ef..a3ff1b40feb4 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -2,7 +2,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
@@ -28,7 +28,7 @@
#ifndef _PORLIN_HXX
#define _PORLIN_HXX
-#include "possiz.hxx" // SwPosSize
+#include "possiz.hxx" // SwPosSize
#if OSL_DEBUG_LEVEL > 1
#include <libxml/xmlwriter.h>
@@ -51,23 +51,23 @@ class SwPortionHandler;
#endif
// Portiongruppen
-#define PORGRP_TXT 0x8000
-#define PORGRP_EXP 0x4000
-#define PORGRP_FLD 0x2000
-#define PORGRP_HYPH 0x1000
-#define PORGRP_NUMBER 0x0800
-#define PORGRP_GLUE 0x0400
-#define PORGRP_FIX 0x0200
-#define PORGRP_TAB 0x0100
-#define PORGRP_NOTRECY 0x0080
+#define PORGRP_TXT 0x8000
+#define PORGRP_EXP 0x4000
+#define PORGRP_FLD 0x2000
+#define PORGRP_HYPH 0x1000
+#define PORGRP_NUMBER 0x0800
+#define PORGRP_GLUE 0x0400
+#define PORGRP_FIX 0x0200
+#define PORGRP_TAB 0x0100
+#define PORGRP_NOTRECY 0x0080
// kleine Spezialgruppen
-#define PORGRP_FIXMARG 0x0040
-//#define PORGRP_? 0x0020
+#define PORGRP_FIXMARG 0x0040
+//#define PORGRP_? 0x0020
#define PORGRP_TABNOTLFT 0x0010
-#define PORGRP_TOXREF 0x0008
+#define PORGRP_TOXREF 0x0008
/*************************************************************************
- * class SwLinePortion
+ * class SwLinePortion
*************************************************************************/
class SwLinePortion: public SwPosSize
@@ -77,16 +77,16 @@ protected:
SwLinePortion *pPortion;
// Anzahl der Zeichen und Spaces auf der Zeile
xub_StrLen nLineLength;
- KSHORT nAscent; // Maximaler Ascender
+ KSHORT nAscent; // Maximaler Ascender
SwLinePortion();
private:
- MSHORT nWhichPor; // Who's who?
+ MSHORT nWhichPor; // Who's who?
void _Truncate();
public:
- inline SwLinePortion(const SwLinePortion &rPortion);
+ inline SwLinePortion(const SwLinePortion &rPortion);
virtual ~SwLinePortion();
// Zugriffsmethoden
@@ -110,26 +110,26 @@ public:
virtual SwLinePortion *Insert( SwLinePortion *pPortion );
virtual SwLinePortion *Append( SwLinePortion *pPortion );
SwLinePortion *Cut( SwLinePortion *pVictim );
- inline void Truncate();
+ inline void Truncate();
// liefert 0 zurueck, wenn keine Nutzdaten enthalten sind.
virtual SwLinePortion *Compress();
- inline void SetWhichPor( const MSHORT nNew ) { nWhichPor = nNew; }
+ inline void SetWhichPor( const MSHORT nNew ) { nWhichPor = nNew; }
inline MSHORT GetWhichPor( ) const { return nWhichPor; }
// Gruppenabfragen:
- inline sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; }
- inline sal_Bool InGlueGrp( ) const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;}
- inline sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; }
- inline sal_Bool InHyphGrp( ) const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;}
+ inline sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; }
+ inline sal_Bool InGlueGrp( ) const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;}
+ inline sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; }
+ inline sal_Bool InHyphGrp( ) const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;}
inline sal_Bool InNumberGrp( )const { return nWhichPor & PORGRP_NUMBER ? sal_True : sal_False;}
- inline sal_Bool InFixGrp( ) const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False; }
- inline sal_Bool InFldGrp( ) const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False; }
- inline sal_Bool InToxRefGrp( ) const { return nWhichPor & PORGRP_TOXREF ? sal_True : sal_False; }
- inline sal_Bool InToxRefOrFldGrp( ) const { return nWhichPor &
+ inline sal_Bool InFixGrp( ) const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False; }
+ inline sal_Bool InFldGrp( ) const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False; }
+ inline sal_Bool InToxRefGrp( ) const { return nWhichPor & PORGRP_TOXREF ? sal_True : sal_False; }
+ inline sal_Bool InToxRefOrFldGrp( ) const { return nWhichPor &
( PORGRP_FLD | PORGRP_TOXREF ) ? sal_True : sal_False; }
- inline sal_Bool InExpGrp( ) const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False; }
+ inline sal_Bool InExpGrp( ) const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False; }
inline sal_Bool InTabnLftGrp( ) const
{ return nWhichPor & PORGRP_TABNOTLFT ? sal_True : sal_False; }
inline sal_Bool InFixMargGrp( )const
@@ -139,22 +139,22 @@ public:
// Individuelle Abfragen:
inline sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; }
inline sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; }
- inline sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; }
- inline sal_Bool IsBreakPortion( ) const{ return nWhichPor == POR_BRK; }
+ inline sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; }
+ inline sal_Bool IsBreakPortion( ) const{ return nWhichPor == POR_BRK; }
inline sal_Bool IsErgoSumPortion()const{ return nWhichPor == POR_ERGOSUM;}
inline sal_Bool IsQuoVadisPortion()const{ return nWhichPor==POR_QUOVADIS;}
inline sal_Bool IsTabCntPortion( )const{ return nWhichPor==POR_TABCENTER;}
inline sal_Bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL;}
inline sal_Bool IsTabLeftPortion()const{ return nWhichPor == POR_TABLEFT;}
inline sal_Bool IsFtnNumPortion( )const{ return nWhichPor == POR_FTNNUM; }
- inline sal_Bool IsFtnPortion( ) const{ return nWhichPor == POR_FTN; }
+ inline sal_Bool IsFtnPortion( ) const{ return nWhichPor == POR_FTN; }
inline sal_Bool IsTmpEndPortion( )const{ return nWhichPor == POR_TMPEND; }
- inline sal_Bool IsDropPortion( ) const{ return nWhichPor == POR_DROP; }
- inline sal_Bool IsLayPortion( ) const{ return nWhichPor == POR_LAY; }
- inline sal_Bool IsParaPortion( ) const{ return nWhichPor == POR_PARA; }
+ inline sal_Bool IsDropPortion( ) const{ return nWhichPor == POR_DROP; }
+ inline sal_Bool IsLayPortion( ) const{ return nWhichPor == POR_LAY; }
+ inline sal_Bool IsParaPortion( ) const{ return nWhichPor == POR_PARA; }
inline sal_Bool IsMarginPortion( )const{ return nWhichPor == POR_MARGIN; }
- inline sal_Bool IsFlyPortion( ) const{ return nWhichPor == POR_FLY; }
- inline sal_Bool IsHolePortion( ) const{ return nWhichPor == POR_HOLE; }
+ inline sal_Bool IsFlyPortion( ) const{ return nWhichPor == POR_FLY; }
+ inline sal_Bool IsHolePortion( ) const{ return nWhichPor == POR_HOLE; }
inline sal_Bool IsSoftHyphPortion()const{ return nWhichPor==POR_SOFTHYPH;}
inline sal_Bool IsPostItsPortion()const{ return nWhichPor == POR_POSTITS;}
inline sal_Bool IsCombinedPortion()const{ return nWhichPor==POR_COMBINED;}
@@ -208,7 +208,7 @@ public:
/*************************************************************************
- * inline - Implementations
+ * inline - Implementations
*************************************************************************/
inline SwLinePortion &SwLinePortion::operator=(const SwLinePortion &rPortion)
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index e965f78a3031..3d1ea042cf62 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2,7 +2,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
@@ -39,19 +39,19 @@
#include <fmtfld.hxx>
#include <fldbas.hxx> // SwField
#include <txatbase.hxx>
-#include <fmtruby.hxx> // SwFmtRuby
+#include <fmtruby.hxx> // SwFmtRuby
#include <txtatr.hxx> // SwTxtRuby
#include <charfmt.hxx>
#include <txtinet.hxx>
#include <fchrfmt.hxx>
-#include <layfrm.hxx> // GetUpper()
+#include <layfrm.hxx> // GetUpper()
#include <SwPortionHandler.hxx>
-#include <pormulti.hxx> // SwMultiPortion
-#include <inftxt.hxx> // SwTxtSizeInfo
+#include <pormulti.hxx> // SwMultiPortion
+#include <inftxt.hxx> // SwTxtSizeInfo
#include <itrpaint.hxx> // SwTxtPainter
-#include <viewopt.hxx> // SwViewOptions
-#include <itrform2.hxx> // SwTxtFormatter
-#include <porfld.hxx> // SwFldPortion
+#include <viewopt.hxx> // SwViewOptions
+#include <itrform2.hxx> // SwTxtFormatter
+#include <porfld.hxx> // SwFldPortion
#include <porglue.hxx>
#include <breakit.hxx>
#include <pagefrm.hxx>
@@ -289,7 +289,7 @@ SwDoubleLinePortion::SwDoubleLinePortion( SwDoubleLinePortion& rDouble,
// it contains a note only. In this cases the brackets are okay.
// But if the length and the width are both zero, the portion
// is really empty.
- if( rDouble.Width() == rDouble.BracketWidth() )
+ if( rDouble.Width() == rDouble.BracketWidth() )
rDouble.ClearBrackets();
}
}
@@ -712,8 +712,8 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
pCurr = GetRoot().GetNext();
rInf.SetIdx( nOldIdx + GetRoot().GetLen() );
}
- KSHORT nLeft = 0; // the space in front of the first letter
- KSHORT nRight = 0; // the space at the end of the last letter
+ KSHORT nLeft = 0; // the space in front of the first letter
+ KSHORT nRight = 0; // the space at the end of the last letter
USHORT nSub = 0;
switch ( nAdjustment )
{
@@ -995,7 +995,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
}
}
if( pRuby )
- { // The winner is ... a ruby attribute and so
+ { // The winner is ... a ruby attribute and so
// the end of the multiportion is the end of the ruby attribute.
rPos = *pRuby->GetEnd();
SwMultiCreator *pRet = new SwMultiCreator;
@@ -1007,7 +1007,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
}
if( n2Lines < nCount || ( pItem && pItem == p2Lines &&
rPos < GetTxt().Len() ) )
- { // The winner is a 2-line-attribute,
+ { // The winner is a 2-line-attribute,
// the end of the multiportion depends on the following attributes...
SwMultiCreator *pRet = new SwMultiCreator;
@@ -1050,11 +1050,11 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
// portion, if there's no interrupting attribute.
// There are two kinds of interruptors:
// - ruby attributes stops the 2-line-attribute, the end of the
- // multiline is the start of the ruby attribute
+ // multiline is the start of the ruby attribute
// - 2-line-attributes with value "Off" or with different brackets,
// these attributes may interrupt the winner, but they could be
- // neutralized by another 2-line-attribute starting at the same
- // position with the same brackets as the winner-attribute.
+ // neutralized by another 2-line-attribute starting at the same
+ // position with the same brackets as the winner-attribute.
// In the following loop rPos is the critical position and it will be
// evaluated, if at rPos starts a interrupting or a maintaining
@@ -1123,7 +1123,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
}
if( nRotate < nCount || ( pRotItem && pRotItem == pRotate &&
rPos < GetTxt().Len() ) )
- { // The winner is a rotate-attribute,
+ { // The winner is a rotate-attribute,
// the end of the multiportion depends on the following attributes...
SwMultiCreator *pRet = new SwMultiCreator;
pRet->nId = SW_MC_ROTATE;
@@ -1283,8 +1283,8 @@ class SwSpaceManipulator
std::vector<long>* pOldSpaceAdd;
MSHORT nOldSpIdx;
long nSpaceAdd;
- sal_Bool bSpaceChg : 1;
- sal_uInt8 nOldDir : 2;
+ sal_Bool bSpaceChg : 1;
+ sal_uInt8 nOldDir : 2;
public:
SwSpaceManipulator( SwTxtPaintInfo& rInf, SwMultiPortion& rMult );
~SwSpaceManipulator();
@@ -1310,7 +1310,7 @@ SwSpaceManipulator::SwSpaceManipulator( SwTxtPaintInfo& rInf,
{
rInfo.SetpSpaceAdd( rMulti.GetRoot().GetpLLSpaceAdd() );
rInfo.ResetSpaceIdx();
- bSpaceChg = rMulti.ChgSpaceAdd( &rMulti.GetRoot(), nSpaceAdd );
+ bSpaceChg = rMulti.ChgSpaceAdd( &rMulti.GetRoot(), nSpaceAdd );
}
else if( rMulti.HasTabulator() )
rInfo.SetpSpaceAdd( NULL );
@@ -1552,7 +1552,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
if( bRest && pPor->InFldGrp() && !pPor->GetLen() )
{
- if( ((SwFldPortion*)pPor)->HasFont() )
+ if( ((SwFldPortion*)pPor)->HasFont() )
bSeeked = sal_False;
else
SeekAndChgBefore( GetInfo() );
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 2c7a0d2af37d..649090fe2277 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -2,7 +2,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
@@ -48,9 +48,9 @@ class SwFont;
* the Ctor of the SwMultiPortion uses it.
* --------------------------------------------------*/
-#define SW_MC_DOUBLE 0
-#define SW_MC_RUBY 1
-#define SW_MC_ROTATE 2
+#define SW_MC_DOUBLE 0
+#define SW_MC_RUBY 1
+#define SW_MC_ROTATE 2
#define SW_MC_BIDI 3
struct SwMultiCreator
@@ -68,14 +68,14 @@ struct SwMultiCreator
struct SwBracket
{
- xub_StrLen nStart; // Start of text attribute determins the font
+ xub_StrLen nStart; // Start of text attribute determins the font
KSHORT nAscent; // Ascent of the brackets
- KSHORT nHeight; // Height of them
- KSHORT nPreWidth; // Width of the opening bracket
+ KSHORT nHeight; // Height of them
+ KSHORT nPreWidth; // Width of the opening bracket
KSHORT nPostWidth; // Width of the closing bracket
sal_Unicode cPre; // Initial character, e.g. '('
sal_Unicode cPost; // Final character, e.g. ')'
- BYTE nPreScript; // Script of the initial character
+ BYTE nPreScript; // Script of the initial character
BYTE nPostScript; // Script of the final character
};
@@ -90,12 +90,12 @@ struct SwBracket
class SwMultiPortion : public SwLinePortion
{
- SwLineLayout aRoot; // One or more lines
- SwFldPortion *pFldRest; // Field rest from the previous line
- sal_Bool bTab1 :1; // First line tabulator
- sal_Bool bTab2 :1; // Second line includes tabulator
- sal_Bool bDouble :1; // Double line
- sal_Bool bRuby :1; // Phonetics
+ SwLineLayout aRoot; // One or more lines
+ SwFldPortion *pFldRest; // Field rest from the previous line
+ sal_Bool bTab1 :1; // First line tabulator
+ sal_Bool bTab2 :1; // Second line includes tabulator
+ sal_Bool bDouble :1; // Double line
+ sal_Bool bRuby :1; // Phonetics
sal_Bool bBidi :1;
sal_Bool bTop :1; // Phonetic position
sal_Bool bFormatted :1; // Already formatted
@@ -159,8 +159,8 @@ public:
class SwDoubleLinePortion : public SwMultiPortion
{
- SwBracket* pBracket; // Surrounding brackets
- SwTwips nLineDiff; // Difference of the width of the both lines
+ SwBracket* pBracket; // Surrounding brackets
+ SwTwips nLineDiff; // Difference of the width of the both lines
xub_StrLen nBlank1; // Number of blanks in the first line
xub_StrLen nBlank2; // Number of blanks in the second line
public:
@@ -254,7 +254,7 @@ public:
};
/*************************************************************************
- * inline - Implementations
+ * inline - Implementations
*************************************************************************/
inline sal_Bool SwMultiPortion::HasBrackets() const
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index 4fb886a01b01..4f8e50a90905 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -2,7 +2,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
@@ -31,7 +31,7 @@
#include <SwPortionHandler.hxx>
-#include "viewopt.hxx" // SwViewOptions
+#include "viewopt.hxx" // SwViewOptions
#include "txtcfg.hxx"
#include "porref.hxx"
@@ -63,7 +63,7 @@ SwIsoRefPortion::SwIsoRefPortion() : nViewWidth(0)
}
/*************************************************************************
- * virtual SwIsoRefPortion::GetViewWidth()
+ * virtual SwIsoRefPortion::GetViewWidth()
*************************************************************************/
KSHORT SwIsoRefPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 67c64dad83d0..f08901385a5b 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
class SwRefPortion : public SwTxtPortion
{
public:
- inline SwRefPortion(){ SetWhichPor( POR_REF ); }
+ inline SwRefPortion(){ SetWhichPor( POR_REF ); }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
OUTPUT_OPERATOR
};
@@ -64,7 +64,7 @@ public:
};
/*************************************************************************
- * inline - Implementations
+ * inline - Implementations
*************************************************************************/
CLASSIO( SwRefPortion )
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index e8ac921d3e29..30941f351c3a 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -2,7 +2,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
@@ -37,22 +37,22 @@
#include <editeng/pgrditem.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <viewsh.hxx> // ViewShell
+#include <viewsh.hxx> // ViewShell
#include <viewopt.hxx>
-#include <ndtxt.hxx> // SwTxtNode
+#include <ndtxt.hxx> // SwTxtNode
#include <pagefrm.hxx> // SwPageFrm
#include <paratr.hxx>
#include <SwPortionHandler.hxx>
#include <txtcfg.hxx>
#include <porrst.hxx>
#include <inftxt.hxx>
-#include <txtpaint.hxx> // ClipVout
-#include <swfntcch.hxx> // SwFontAccess
+#include <txtpaint.hxx> // ClipVout
+#include <swfntcch.hxx> // SwFontAccess
#include <tgrditem.hxx>
#include <pagedesc.hxx> // SwPageDesc
#include <frmatr.hxx>
-#include <redlnitr.hxx> // SwRedlineItr
-#include <porfly.hxx> // SwFlyPortion
+#include <redlnitr.hxx> // SwRedlineItr
+#include <porfly.hxx> // SwFlyPortion
#include <atrhndl.hxx>
#include <IDocumentRedlineAccess.hxx>
@@ -73,7 +73,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion )
}
/*************************************************************************
- * virtual SwTmpEndPortion::Paint()
+ * virtual SwTmpEndPortion::Paint()
*************************************************************************/
void SwTmpEndPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -87,7 +87,7 @@ void SwTmpEndPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * class SwBreakPortion
+ * class SwBreakPortion
*************************************************************************/
SwBreakPortion::SwBreakPortion( const SwLinePortion &rPortion )
: SwLinePortion( rPortion )
@@ -112,7 +112,7 @@ void SwBreakPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * virtual SwBreakPortion::Format()
+ * virtual SwBreakPortion::Format()
*************************************************************************/
sal_Bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
@@ -303,7 +303,7 @@ SwTwips SwTxtFrm::EmptyHeight() const
}
/*************************************************************************
- * SwTxtFrm::FormatEmpty()
+ * SwTxtFrm::FormatEmpty()
*************************************************************************/
sal_Bool SwTxtFrm::FormatEmpty()
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index d9b1da7b6807..865ba82666ed 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
class SwTxtFormatInfo;
/*************************************************************************
- * class SwTmpEndPortion
+ * class SwTmpEndPortion
*************************************************************************/
class SwTmpEndPortion : public SwLinePortion
@@ -48,7 +48,7 @@ public:
};
/*************************************************************************
- * class SwBreakPortion
+ * class SwBreakPortion
*************************************************************************/
class SwBreakPortion : public SwLinePortion
@@ -69,7 +69,7 @@ public:
};
/*************************************************************************
- * class SwKernPortion
+ * class SwKernPortion
*************************************************************************/
class SwKernPortion : public SwLinePortion
@@ -99,7 +99,7 @@ public:
};
/*************************************************************************
- * class SwArrowPortion
+ * class SwArrowPortion
*************************************************************************/
class SwArrowPortion : public SwLinePortion
@@ -117,7 +117,7 @@ public:
};
/*************************************************************************
- * class SwHangingPortion
+ * class SwHangingPortion
* The characters which are forbidden at the start of a line like the dot and
* other punctuation marks are allowed to display in the margin of the page
* by a user option.
@@ -177,7 +177,7 @@ public:
/*************************************************************************
- * inline - Implementations
+ * inline - Implementations
*************************************************************************/
CLASSIO( SwBreakPortion )
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 957f1394d6f7..4757aeaa1e2e 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -2,7 +2,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
@@ -91,7 +91,7 @@ class SwTabCenterPortion : public SwTabPortion
public:
inline SwTabCenterPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
- { SetWhichPor( POR_TABCENTER ); }
+ { SetWhichPor( POR_TABCENTER ); }
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index 2afd2c6b67ed..f8056bc0fe0b 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -2,7 +2,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
@@ -31,7 +31,7 @@
#include <SwPortionHandler.hxx>
-#include "viewopt.hxx" // SwViewOptions
+#include "viewopt.hxx" // SwViewOptions
#include "txtcfg.hxx"
#include "portox.hxx"
@@ -63,7 +63,7 @@ SwIsoToxPortion::SwIsoToxPortion() : nViewWidth(0)
}
/*************************************************************************
- * virtual SwIsoToxPortion::GetViewWidth()
+ * virtual SwIsoToxPortion::GetViewWidth()
*************************************************************************/
KSHORT SwIsoToxPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 9c867701d7cc..66d47306817b 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
class SwToxPortion : public SwTxtPortion
{
public:
- inline SwToxPortion(){ SetWhichPor( POR_TOX ); }
+ inline SwToxPortion(){ SetWhichPor( POR_TOX ); }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
OUTPUT_OPERATOR
};
@@ -65,7 +65,7 @@ public:
};
/*************************************************************************
- * inline - Implementations
+ * inline - Implementations
*************************************************************************/
CLASSIO( SwToxPortion )
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index a00b66a7dc21..cd80a7086d46 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 3b00ec7ffedb..2715c6735656 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#ifdef GCC
#include <sys/types.h>
#else
-#include <new.h> //fuer size_t, FIXEDMEM aus tools
+#include <new.h> //fuer size_t, FIXEDMEM aus tools
#endif
#include <tools/mempool.hxx>
@@ -39,7 +39,7 @@
class SwTxtGuess;
/*************************************************************************
- * class SwTxtPortion
+ * class SwTxtPortion
*************************************************************************/
class SwTxtPortion : public SwLinePortion
@@ -76,7 +76,7 @@ public:
};
/*************************************************************************
- * class SwHolePortion
+ * class SwHolePortion
*************************************************************************/
class SwHolePortion : public SwLinePortion
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index c97d122da2ff..28b20b4bab81 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -2,7 +2,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
@@ -56,26 +56,26 @@ public:
inline SwPosSize &SwPosSize::operator=(const SwPosSize &rSize )
{
- nWidth = rSize.Width();
+ nWidth = rSize.Width();
nHeight = rSize.Height();
return *this;
}
inline void SwPosSize::SvLSize( const Size &rSize )
{
- nWidth = KSHORT(rSize.Width());
+ nWidth = KSHORT(rSize.Width());
nHeight = KSHORT(rSize.Height());
}
inline void SwPosSize::SvXSize( const Size &rSize )
{
- nHeight = KSHORT(rSize.Width());
+ nHeight = KSHORT(rSize.Width());
nWidth = KSHORT(rSize.Height());
}
inline SwPosSize &SwPosSize::operator=( const Size &rSize )
{
- nWidth = KSHORT(rSize.Width());
+ nWidth = KSHORT(rSize.Width());
nHeight = KSHORT(rSize.Height());
return *this;
}
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index e94bdc873d5a..343acded1ee3 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -2,7 +2,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
@@ -35,18 +35,18 @@
#include <tools/shl.hxx>
#include <com/sun/star/i18n/ScriptType.hdl>
#include <swmodule.hxx>
-#include <redline.hxx> // SwRedline
-#include <txtatr.hxx> // SwTxt ...
-#include <docary.hxx> // SwRedlineTbl
-#include <itratr.hxx> // SwAttrIter
-#include <ndtxt.hxx> // SwTxtNode
-#include <doc.hxx> // SwDoc
+#include <redline.hxx> // SwRedline
+#include <txtatr.hxx> // SwTxt ...
+#include <docary.hxx> // SwRedlineTbl
+#include <itratr.hxx> // SwAttrIter
+#include <ndtxt.hxx> // SwTxtNode
+#include <doc.hxx> // SwDoc
#include <rootfrm.hxx>
#include <breakit.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/cmdevt.hxx>
#include <vcl/settings.hxx>
-#include <txtfrm.hxx> // SwTxtFrm
+#include <txtfrm.hxx> // SwTxtFrm
#include <vcl/svapp.hxx>
#include <redlnitr.hxx>
#include <extinput.hxx>
@@ -56,7 +56,7 @@
using namespace ::com::sun::star;
/*************************************************************************
- * SwAttrIter::CtorInitAttrIter()
+ * SwAttrIter::CtorInitAttrIter()
*************************************************************************/
void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, SwTxtFrm* pFrm )
{
@@ -221,15 +221,15 @@ short SwRedlineItr::_Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld )
if( nNew >= nEnd )
{
--nRet;
- _Clear( &rFnt ); // Wir gehen hinter den aktuellen Bereich
- ++nAct; // und pruefen gleich den naechsten
+ _Clear( &rFnt ); // Wir gehen hinter den aktuellen Bereich
+ ++nAct; // und pruefen gleich den naechsten
}
else if( nNew < nStart )
{
--nRet;
- _Clear( &rFnt ); // Wir gehen vor den aktuellen Bereich
+ _Clear( &rFnt ); // Wir gehen vor den aktuellen Bereich
if( nAct > nFirst )
- nAct = nFirst; // Die Pruefung muss von vorne beginnen
+ nAct = nFirst; // Die Pruefung muss von vorne beginnen
else
return nRet + EnterExtend( rFnt, nNew ); // Es gibt keinen vor uns.
}
@@ -272,7 +272,7 @@ short SwRedlineItr::_Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld )
{
const SfxPoolItem* pItem;
if( ( nWhich < RES_CHRATR_END ) &&
- ( SFX_ITEM_SET == pSet->GetItemState( nWhich, sal_True, &pItem ) ) )
+ ( SFX_ITEM_SET == pSet->GetItemState( nWhich, sal_True, &pItem ) ) )
{
SwTxtAttr* pAttr = MakeRedlineTxtAttr(
const_cast<SwDoc&>(rDoc),
@@ -463,7 +463,7 @@ sal_Bool SwExtend::_Leave( SwFont& rFnt, xub_StrLen nNew )
MSHORT nOldAttr = rArr[ nPos - nStart ];
nPos = nNew;
if( Inside() )
- { // Wir sind innerhalb des ExtendText-Bereichs geblieben
+ { // Wir sind innerhalb des ExtendText-Bereichs geblieben
MSHORT nAttr = rArr[ nPos - nStart ];
if( nOldAttr != nAttr ) // Gibt es einen (inneren) Attributwechsel?
{
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 13c701ca8d3d..a807cbe484f7 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -2,7 +2,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
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _REDLNITR_HXX
-#define _REDLNITR_HXX
+#ifndef _REDLNITR_HXX
+#define _REDLNITR_HXX
#include "ndhints.hxx"
@@ -46,7 +46,7 @@ class SwAttrHandler;
class SwExtend
{
SwFont *pFnt;
- const SvUShorts &rArr; // XAMA: Array of xub_StrLen
+ const SvUShorts &rArr; // XAMA: Array of xub_StrLen
xub_StrLen nStart;
xub_StrLen nPos;
xub_StrLen nEnd;
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index defef8067aaa..61b17479c86c 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -2,7 +2,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
@@ -39,10 +39,10 @@
/*************************************************************************
|*
-|* SwTxtLine::SwTxtLine(), ~SwTxtLine()
+|* SwTxtLine::SwTxtLine(), ~SwTxtLine()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 16. Mar. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 16. Mar. 94
|*
|*************************************************************************/
@@ -59,10 +59,10 @@ SwTxtLine::~SwTxtLine()
/*************************************************************************
|*
-|* SwTxtLineAccess::NewObj()
+|* SwTxtLineAccess::NewObj()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 16. Mar. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 16. Mar. 94
|*
|*************************************************************************/
@@ -73,10 +73,10 @@ SwCacheObj *SwTxtLineAccess::NewObj()
/*************************************************************************
|*
-|* SwTxtLineAccess::GetPara()
+|* SwTxtLineAccess::GetPara()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 16. Mar. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 16. Mar. 94
|*
|*************************************************************************/
@@ -98,10 +98,10 @@ SwParaPortion *SwTxtLineAccess::GetPara()
/*************************************************************************
|*
-|* SwTxtLineAccess::SwTxtLineAccess()
+|* SwTxtLineAccess::SwTxtLineAccess()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 16. Mar. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 16. Mar. 94
|*
|*************************************************************************/
@@ -112,10 +112,10 @@ SwTxtLineAccess::SwTxtLineAccess( const SwTxtFrm *pOwn ) :
/*************************************************************************
|*
-|* SwTxtLineAccess::IsAvailable
+|* SwTxtLineAccess::IsAvailable
|*
-|* Ersterstellung MA 23. Mar. 94
-|* Letzte Aenderung MA 23. Mar. 94
+|* Ersterstellung MA 23. Mar. 94
+|* Letzte Aenderung MA 23. Mar. 94
|*
|*************************************************************************/
@@ -128,10 +128,10 @@ sal_Bool SwTxtLineAccess::IsAvailable() const
/*************************************************************************
|*
-|* SwTxtFrm::HasPara()
+|* SwTxtFrm::HasPara()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
@@ -152,17 +152,17 @@ sal_Bool SwTxtFrm::_HasPara() const
/*************************************************************************
|*
-|* SwTxtFrm::GetPara()
+|* SwTxtFrm::GetPara()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
SwParaPortion *SwTxtFrm::GetPara()
{
if ( GetCacheIdx() != MSHRT_MAX )
- { SwTxtLine *pLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()->
+ { SwTxtLine *pLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()->
Get( this, GetCacheIdx(), sal_False );
if ( pLine )
return pLine->GetPara();
@@ -175,10 +175,10 @@ SwParaPortion *SwTxtFrm::GetPara()
/*************************************************************************
|*
-|* SwTxtFrm::ClearPara()
+|* SwTxtFrm::ClearPara()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
@@ -201,10 +201,10 @@ void SwTxtFrm::ClearPara()
/*************************************************************************
|*
-|* SwTxtFrm::SetPara()
+|* SwTxtFrm::SetPara()
|*
-|* Ersterstellung MA 16. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 16. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
@@ -228,7 +228,7 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, sal_Bool bDelete )
}
}
else if ( pNew )
- { //Einen neuen einfuegen.
+ { //Einen neuen einfuegen.
SwTxtLine *pTxtLine = new SwTxtLine( this, pNew );
if ( SwTxtFrm::GetTxtCache()->Insert( pTxtLine ) )
nCacheIdx = pTxtLine->GetCachePos();
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 46276d5d9700..9112f7a7f46a 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@ public:
SwTxtLine( SwTxtFrm *pFrm, SwParaPortion *pNew = 0 );
virtual ~SwTxtLine();
- inline SwParaPortion *GetPara() { return pLine; }
+ inline SwParaPortion *GetPara() { return pLine; }
inline const SwParaPortion *GetPara() const { return pLine; }
inline void SetPara( SwParaPortion *pNew ) { pLine = pNew; }
diff --git a/sw/source/core/text/txtcfg.hxx b/sw/source/core/text/txtcfg.hxx
index 3e9bc3f93749..62fe7923e491 100644
--- a/sw/source/core/text/txtcfg.hxx
+++ b/sw/source/core/text/txtcfg.hxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#if OSL_DEBUG_LEVEL > 1
#include "dbgloop.hxx" // DBG_LOOP
#else
-#ifdef DBG_LOOP //kann per precompiled hereinkommen
+#ifdef DBG_LOOP //kann per precompiled hereinkommen
#undef DBG_LOOP
#undef DBG_LOOP_RESET
#endif
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 826ad3848f19..283f1ae70bc2 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -2,7 +2,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
@@ -38,11 +38,11 @@
#include <txtfrm.hxx> // Format()
#include <charfmt.hxx>
#include <viewopt.hxx> // SwViewOption
-#include <viewsh.hxx> // ViewShell
+#include <viewsh.hxx> // ViewShell
#include <pordrop.hxx>
#include <itrform2.hxx>
#include <txtpaint.hxx> // SwSaveClip
-#include <blink.hxx> // pBlink
+#include <blink.hxx> // pBlink
#include <breakit.hxx>
#include <com/sun/star/i18n/ScriptType.hdl>
#include <com/sun/star/i18n/WordType.hpp>
@@ -152,7 +152,7 @@ sal_Bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, xub_StrLen nPos )
}
/*************************************************************************
- * SwTxtNode::GetDropLen()
+ * SwTxtNode::GetDropLen()
*
* nWishLen = 0 indicates that we want a whole word
*************************************************************************/
@@ -282,7 +282,7 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen
}
/*************************************************************************
- * SwDropPortion::PaintTxt()
+ * SwDropPortion::PaintTxt()
*************************************************************************/
// Die Breite manipulieren, sonst werden die Buchstaben gestretcht
@@ -323,7 +323,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * SwDropPortion::Paint()
+ * SwDropPortion::Paint()
*************************************************************************/
void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
@@ -374,7 +374,7 @@ void SwDropPortion::PaintDrop( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * virtual SwDropPortion::Paint()
+ * virtual SwDropPortion::Paint()
*************************************************************************/
void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 5f94c1bed8c1..7b422adfe621 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -2,7 +2,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
@@ -41,8 +41,8 @@
#include "pagefrm.hxx" // NewFldPortion, GetVirtPageNum()
#include "ndtxt.hxx" // NewNumberPortion, pHints->GetNum()
#include "fldbas.hxx" // SwField
-#include "viewopt.hxx" // SwViewOptions
-#include "flyfrm.hxx" //IsInBody()
+#include "viewopt.hxx" // SwViewOptions
+#include "flyfrm.hxx" //IsInBody()
#include "viewimp.hxx"
#include "txtatr.hxx" // SwTxtFld
#include "txtcfg.hxx"
@@ -60,7 +60,7 @@
#include "expfld.hxx"
#include "docufld.hxx"
#include "pagedesc.hxx" // NewFldPortion, GetNum()
-#include <pormulti.hxx> // SwMultiPortion
+#include <pormulti.hxx> // SwMultiPortion
#include "fmtmeta.hxx" // lcl_NewMetaPortion
@@ -103,7 +103,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
pFld->SetLanguage( GetFnt()->GetLanguage() );
// let the visual note know about its new language
if (pFld->GetTyp()->Which()==RES_POSTITFLD)
- const_cast<SwFmtFld*> (&pHint->GetFld())->Broadcast( SwFmtFldHint( &pHint->GetFld(), SWFMTFLD_LANGUAGE ) );
+ const_cast<SwFmtFld*> (&pHint->GetFld())->Broadcast( SwFmtFldHint( &pHint->GetFld(), SWFMTFLD_LANGUAGE ) );
}
ViewShell *pSh = rInf.GetVsh();
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 3ee641cb39e9..c151a6136a37 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -35,14 +35,14 @@
#include "viewsh.hxx"
#include "pagefrm.hxx"
#include "rootfrm.hxx"
-#include "viewimp.hxx" // SwViewImp
-#include "pam.hxx" // SwPosition
-#include "swregion.hxx" // SwRegionRects
-#include "dcontact.hxx" // SwContact
-#include "dflyobj.hxx" // SdrObject
-#include "flyfrm.hxx" // SwFlyFrm
-#include "frmtool.hxx" // ::DrawGraphic
-#include "porfld.hxx" // SwGrfNumPortion
+#include "viewimp.hxx" // SwViewImp
+#include "pam.hxx" // SwPosition
+#include "swregion.hxx" // SwRegionRects
+#include "dcontact.hxx" // SwContact
+#include "dflyobj.hxx" // SdrObject
+#include "flyfrm.hxx" // SwFlyFrm
+#include "frmtool.hxx" // ::DrawGraphic
+#include "porfld.hxx" // SwGrfNumPortion
#include "txtfrm.hxx" // SwTxtFrm
#include "itrform2.hxx" // SwTxtFormatter
#include "porfly.hxx" // NewFlyCntPortion
@@ -54,7 +54,7 @@
#include "notxtfrm.hxx"
#include "flyfrms.hxx"
#include "fmtcnct.hxx" // SwFmtChain
-#include <pormulti.hxx> // SwMultiPortion
+#include <pormulti.hxx> // SwMultiPortion
#include <svx/obj3d.hxx>
#include <editeng/txtrange.hxx>
#include <editeng/lrspitem.hxx>
@@ -83,7 +83,7 @@
#include "doc.hxx"
#if OSL_DEBUG_LEVEL > 1
-#include "viewopt.hxx" // SwViewOptions, nur zum Testen (Test2)
+#include "viewopt.hxx" // SwViewOptions, nur zum Testen (Test2)
#endif
#ifdef VERT_DISTANCE
@@ -114,11 +114,11 @@ using namespace ::com::sun::star;
* Wenn mehrere Frames mit Umlaufattributen in einer Zeile liegen,
* ergeben sich unterschiedliche Auswirkungen fuer den Textfluss:
*
- * L/R P L R K
- * P -P-P- -P-L -P R- -P K
- * L -L P- -L L -L R- -L K
- * R R-P- R-L R R- R K
- * K K P- K L K R- K K
+ * L/R P L R K
+ * P -P-P- -P-L -P R- -P K
+ * L -L P- -L L -L R- -L K
+ * R R-P- R-L R R- R K
+ * K K P- K L K R- K K
*
* (P=parallel, L=links, R=rechts, K=kein Umlauf)
*
@@ -478,7 +478,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
const long nLeftMin = (rInf.X() || GetDropLeft()) ? nLeftMar : GetLeftMin();
SwRect aLine( rInf.X() + nLeftMin, nTop, rInf.RealWidth() - rInf.X()
- + nLeftMar - nLeftMin , nHeight );
+ + nLeftMar - nLeftMin , nHeight );
SwRect aLineVert( aLine );
if ( pFrm->IsRightToLeft() )
@@ -528,7 +528,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
if( !aInter.HasArea() )
return;
- const sal_Bool bFullLine = aLine.Left() == aInter.Left() &&
+ const sal_Bool bFullLine = aLine.Left() == aInter.Left() &&
aLine.Right() == aInter.Right();
// Obwohl kein Text mehr da ist, muss eine weitere Zeile
@@ -620,7 +620,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
(pPageFrm->*fnRect->fnGetPrtLeft)();
const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
- const USHORT nGridWidth = GETGRIDWIDTH( pGrid, pDoc); //for textgrid refactor
+ const USHORT nGridWidth = GETGRIDWIDTH( pGrid, pDoc); //for textgrid refactor
SwTwips nStartX = GetLeftMargin();
if ( bVert )
@@ -664,7 +664,7 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
// aBase bezeichnet die dokumentglobale Position,
// ab der die neue Extraportion plaziert wird.
// aBase.X() = Offset in der Zeile,
- // hinter der aktuellen Portion
+ // hinter der aktuellen Portion
// aBase.Y() = LineIter.Y() + Ascent der aktuellen Portion
long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc;
@@ -749,7 +749,7 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf,
/*************************************************************************
- * SwTxtFly::SwTxtFly()
+ * SwTxtFly::SwTxtFly()
*************************************************************************/
SwTxtFly::SwTxtFly( const SwTxtFly& rTxtFly )
@@ -806,10 +806,10 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm )
}
/*************************************************************************
- * SwTxtFly::_GetFrm()
+ * SwTxtFly::_GetFrm()
*
- * IN: dokumentglobal (rRect)
- * OUT: framelokal (return-Wert)
+ * IN: dokumentglobal (rRect)
+ * OUT: framelokal (return-Wert)
* Diese Methode wird waehrend der Formatierung vom LineIter gerufen.
* 1. um die naechste FlyPortion vorzubereiten
* 2. um nach Aenderung der Zeilenhoehe neue Ueberlappungen festzustellen
@@ -835,7 +835,7 @@ SwRect SwTxtFly::_GetFrm( const SwRect &rRect, sal_Bool bTop ) const
}
/*************************************************************************
- * SwTxtFly::IsAnyFrm()
+ * SwTxtFly::IsAnyFrm()
*
* IN: dokumentglobal
* fuer die Printarea des aktuellen Frame
@@ -858,7 +858,7 @@ sal_Bool SwTxtFly::IsAnyFrm() const
}
/*************************************************************************
- * SwTxtFly::IsAnyObj()
+ * SwTxtFly::IsAnyObj()
*
* IN: dokumentglobal
* OUT: sal_True Wenn ein Rahmen oder DrawObj beruecksichtigt werden muss
@@ -908,7 +908,7 @@ const SwCntntFrm* SwTxtFly::_GetMaster()
}
/*************************************************************************
- * SwTxtFly::DrawTextOpaque()
+ * SwTxtFly::DrawTextOpaque()
*
* IN: dokumentglobal
* DrawTextOpaque() wird von DrawText() gerufen.
@@ -1050,7 +1050,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
}
/*************************************************************************
- * SwTxtFly::DrawFlyRect()
+ * SwTxtFly::DrawFlyRect()
*
* IN: windowlokal
* Zwei Feinheiten gilt es zu beachten:
@@ -1874,7 +1874,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
}
/*************************************************************************
- * SwContourCache::ShowContour()
+ * SwContourCache::ShowContour()
* zeichnet die PolyPolygone des Caches zu Debugzwecken.
*************************************************************************/
#if OSL_DEBUG_LEVEL > 1
@@ -1925,7 +1925,7 @@ void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
#endif
/*************************************************************************
- * SwTxtFly::ShowContour()
+ * SwTxtFly::ShowContour()
* zeichnet die PolyPolygone des Caches zu Debugzwecken.
*************************************************************************/
#if OSL_DEBUG_LEVEL > 1
@@ -1955,7 +1955,7 @@ void SwTxtFly::ShowContour( OutputDevice* pOut )
#endif
/*************************************************************************
- * SwTxtFly::ForEach()
+ * SwTxtFly::ForEach()
*
* sucht nach dem ersten Objekt, welches mit dem Rechteck ueberlappt
*
@@ -2054,7 +2054,7 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid
}
/*************************************************************************
- * SwTxtFly::GetPos()
+ * SwTxtFly::GetPos()
*
* liefert die Position im sorted Array zurueck
*************************************************************************/
@@ -2071,7 +2071,7 @@ SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchored
// <--
/*************************************************************************
- * SwTxtFly::CalcRightMargin()
+ * SwTxtFly::CalcRightMargin()
*
* pObj ist das Object, der uns gerade ueberlappt.
* pCurrFrm ist der aktuelle Textframe, der ueberlappt wird.
@@ -2176,7 +2176,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly,
// <--
/*************************************************************************
- * SwTxtFly::CalcLeftMargin()
+ * SwTxtFly::CalcLeftMargin()
*
* pFly ist der FlyFrm, der uns gerade ueberlappt.
* pCurrFrm ist der aktuelle Textframe, der ueberlappt wird.
@@ -2255,10 +2255,10 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly,
// <--
/*************************************************************************
- * SwTxtFly::FlyToRect()
+ * SwTxtFly::FlyToRect()
*
- * IN: dokumentglobal (rRect)
- * OUT: dokumentglobal (return-Wert)
+ * IN: dokumentglobal (rRect)
+ * OUT: dokumentglobal (return-Wert)
* Liefert zu einem SwFlyFrm das von ihm in Anspruch genommene Rechteck
* unter Beruecksichtigung der eingestellten Attribute fuer den Abstand
* zum Text zurueck.
@@ -2322,18 +2322,18 @@ SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
// new method <_GetSurroundForTextWrap(..)> replaces methods
// <CalcSmart(..)> and <GetOrder(..)>
/*************************************************************************
- * SwTxtFly::CalcSmart()
+ * SwTxtFly::CalcSmart()
*
* CalcSmart() liefert die Umlaufform zurueck.
*
* Auf beiden Seiten ist weniger als 2 cm Platz fuer den Text
- * => kein Umlauf ( SURROUND_NONE )
+ * => kein Umlauf ( SURROUND_NONE )
* Auf genau einer Seite ist mehr als 2 cm Platz
* => Umlauf auf dieser Seite ( SURROUND_LEFT / SURROUND_RIGHT )
* Auf beiden Seiten ist mehr als 2 cm Platz, das Objekt ist breiter als 1,5 cm
- * => Umlauf auf der breiteren Seite ( SURROUND_LEFT / SURROUND_RIGHT )
+ * => Umlauf auf der breiteren Seite ( SURROUND_LEFT / SURROUND_RIGHT )
* Auf beiden Seiten ist mehr als 2 cm Platz, das Objekt ist schmaler als 1,5 cm
- * => beidseitiger Umlauf ( SURROUND_PARALLEL )
+ * => beidseitiger Umlauf ( SURROUND_PARALLEL )
*
*************************************************************************/
@@ -2410,7 +2410,7 @@ SwSurround SwTxtFly::_GetSurroundForTextWrap( const SwAnchoredObject* pAnchoredO
}
/*************************************************************************
- * SwTxtFly::IsAnyFrm( SwRect )
+ * SwTxtFly::IsAnyFrm( SwRect )
*
* IN: dokumentglobal
*
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index c3708badee1a..d5b6c6eb5372 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -2,7 +2,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
@@ -57,12 +57,12 @@ typedef std::vector< SwAnchoredObject* > SwAnchoredObjList;
// <--
/*************************************************************************
- * class SwFlyIter
+ * class SwFlyIter
*************************************************************************/
enum PAGESIDE { LEFT_SIDE, RIGHT_SIDE, DONTKNOW_SIDE };
/*************************************************************************
- * class SwContourCache
+ * class SwContourCache
*************************************************************************/
class SwDrawTextInfo;
@@ -107,19 +107,19 @@ public:
};
/*************************************************************************
- * class SwTxtFly
+ * class SwTxtFly
*************************************************************************/
class SwTxtFly
{
- const SwPageFrm *pPage;
+ const SwPageFrm *pPage;
// --> OD 2006-08-15 #i68520#
const SwAnchoredObject* mpCurrAnchoredObj;
// <--
const SwTxtFrm *pCurrFrm;
- const SwCntntFrm *pMaster;
+ const SwCntntFrm *pMaster;
// --> OD 2006-08-15 #i68520#
SwAnchoredObjList* mpAnchoredObjList;
// <--
@@ -202,7 +202,7 @@ public:
inline long GetNextTop() const { return nNextTop; }
// Diese temporaere Variable darf auch in const-Methoden manipuliert werden
inline void SetNextTop( long nNew ) const
- { ((SwTxtFly*)this)->nNextTop = nNew; }
+ { ((SwTxtFly*)this)->nNextTop = nNew; }
// --> OD 2006-08-15 #i68520#
// determines the demanded rectangle for an anchored object,
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 2e563c681243..1a3242c4a718 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2,7 +2,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
@@ -41,12 +41,12 @@
#include <editeng/pgrditem.hxx>
#include <swmodule.hxx>
#include <SwSmartTagMgr.hxx>
-#include <doc.hxx> // GetDoc()
-#include <pagefrm.hxx> // InvalidateSpelling
+#include <doc.hxx> // GetDoc()
+#include <pagefrm.hxx> // InvalidateSpelling
#include <rootfrm.hxx>
-#include <viewsh.hxx> // ViewShell
-#include <pam.hxx> // SwPosition
-#include <ndtxt.hxx> // SwTxtNode
+#include <viewsh.hxx> // ViewShell
+#include <pam.hxx> // SwPosition
+#include <ndtxt.hxx> // SwTxtNode
#include <txtatr.hxx>
#include <paratr.hxx>
#include <viewopt.hxx>
@@ -64,11 +64,11 @@
#include <charatr.hxx>
#include <ftninfo.hxx>
#include <fmtline.hxx>
-#include <txtfrm.hxx> // SwTxtFrm
-#include <sectfrm.hxx> // SwSectFrm
-#include <txtcfg.hxx> // DBG_LOOP
-#include <itrform2.hxx> // Iteratoren
-#include <widorp.hxx> // SwFrmBreak
+#include <txtfrm.hxx> // SwTxtFrm
+#include <sectfrm.hxx> // SwSectFrm
+#include <txtcfg.hxx> // DBG_LOOP
+#include <itrform2.hxx> // Iteratoren
+#include <widorp.hxx> // SwFrmBreak
#include <txtcache.hxx>
#include <fntcache.hxx> // GetLineSpace benutzt pLastFont
#include <SwGrammarMarkUp.hxx>
@@ -91,7 +91,7 @@
#include <IGrammarContact.hxx>
#if OSL_DEBUG_LEVEL > 1
-#include <txtpaint.hxx> // DbgRect
+#include <txtpaint.hxx> // DbgRect
extern const sal_Char *GetPrepName( const enum PrepareHint ePrep );
#endif
@@ -307,7 +307,7 @@ SwDigitModeModifier::~SwDigitModeModifier()
}
/*************************************************************************
- * SwTxtFrm::Init()
+ * SwTxtFrm::Init()
*************************************************************************/
void SwTxtFrm::Init()
@@ -325,7 +325,7 @@ void SwTxtFrm::Init()
}
/*************************************************************************
-|* SwTxtFrm::CTORen/DTOR
+|* SwTxtFrm::CTORen/DTOR
|*************************************************************************/
void SwTxtFrm::InitCtor()
@@ -385,7 +385,7 @@ void SwTxtFrm::ResetPreps()
}
/*************************************************************************
- * SwTxtFrm::IsHiddenNow()
+ * SwTxtFrm::IsHiddenNow()
*************************************************************************/
sal_Bool SwTxtFrm::IsHiddenNow() const
{
@@ -420,7 +420,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
/*************************************************************************
- * SwTxtFrm::HideHidden()
+ * SwTxtFrm::HideHidden()
*************************************************************************/
// Entfernt die Anhaengsel des Textfrms wenn dieser hidden ist
@@ -620,7 +620,7 @@ void SwTxtFrm::HideAndShowObjects()
}
/*************************************************************************
- * SwTxtFrm::FindBrk()
+ * SwTxtFrm::FindBrk()
*
* Liefert die erste Trennmoeglichkeit in der aktuellen Zeile zurueck.
* Die Methode wird in SwTxtFrm::Format() benutzt, um festzustellen, ob
@@ -660,7 +660,7 @@ xub_StrLen SwTxtFrm::FindBrk( const XubString &rTxt,
}
/*************************************************************************
- * SwTxtFrm::IsIdxInside()
+ * SwTxtFrm::IsIdxInside()
*************************************************************************/
sal_Bool SwTxtFrm::IsIdxInside( const xub_StrLen nPos, const xub_StrLen nLen ) const
@@ -668,8 +668,8 @@ sal_Bool SwTxtFrm::IsIdxInside( const xub_StrLen nPos, const xub_StrLen nLen ) c
if( GetOfst() > nPos + nLen ) // d.h., der Bereich liegt komplett vor uns.
return sal_False;
- if( !GetFollow() ) // der Bereich liegt nicht komplett vor uns,
- return sal_True; // nach uns kommt niemand mehr.
+ if( !GetFollow() ) // der Bereich liegt nicht komplett vor uns,
+ return sal_True; // nach uns kommt niemand mehr.
const xub_StrLen nMax = GetFollow()->GetOfst();
@@ -684,7 +684,7 @@ sal_Bool SwTxtFrm::IsIdxInside( const xub_StrLen nPos, const xub_StrLen nLen ) c
}
/*************************************************************************
- * SwTxtFrm::InvalidateRange()
+ * SwTxtFrm::InvalidateRange()
*************************************************************************/
inline void SwTxtFrm::InvalidateRange(const SwCharRange &aRange, const long nD)
{
@@ -693,13 +693,13 @@ inline void SwTxtFrm::InvalidateRange(const SwCharRange &aRange, const long nD)
}
/*************************************************************************
- * SwTxtFrm::_InvalidateRange()
+ * SwTxtFrm::_InvalidateRange()
*************************************************************************/
void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
{
if ( !HasPara() )
- { InvalidateSize();
+ { InvalidateSize();
return;
}
@@ -734,7 +734,7 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
}
/*************************************************************************
- * SwTxtFrm::CalcLineSpace()
+ * SwTxtFrm::CalcLineSpace()
*************************************************************************/
void SwTxtFrm::CalcLineSpace()
@@ -902,7 +902,7 @@ void lcl_ModifyOfst( SwTxtFrm* pFrm, xub_StrLen nPos, xub_StrLen nLen )
}
/*************************************************************************
- * SwTxtFrm::Modify()
+ * SwTxtFrm::Modify()
*************************************************************************/
void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
@@ -1131,7 +1131,7 @@ void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
}
sal_Bool bLineSpace = SFX_ITEM_SET == rNewSet.GetItemState(
RES_PARATR_LINESPACING, sal_False ),
- bRegister = SFX_ITEM_SET == rNewSet.GetItemState(
+ bRegister = SFX_ITEM_SET == rNewSet.GetItemState(
RES_PARATR_REGISTER, sal_False );
if ( bLineSpace || bRegister )
{
@@ -1360,7 +1360,7 @@ sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
if ( pPage == rInfo.GetOrigPage() && !GetPrev() )
{
//Das sollte er sein (kann allenfalls temporaer anders sein,
- // sollte uns das beunruhigen?)
+ // sollte uns das beunruhigen?)
rInfo.SetInfo( pPage, this );
return sal_False;
}
@@ -1376,7 +1376,7 @@ sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
}
/*************************************************************************
- * SwTxtFrm::PrepWidows()
+ * SwTxtFrm::PrepWidows()
*************************************************************************/
void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify )
@@ -1420,7 +1420,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify )
if( !nHave )
{
sal_Bool bSplit;
- if( !IsFollow() ) //Nur ein Master entscheidet ueber Orphans
+ if( !IsFollow() ) //Nur ein Master entscheidet ueber Orphans
{
const WidowsAndOrphans aWidOrp( this );
bSplit = ( aLine.GetLineNr() >= aWidOrp.GetOrphansLines() &&
@@ -1447,7 +1447,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify )
}
/*************************************************************************
- * SwTxtFrm::Prepare
+ * SwTxtFrm::Prepare
*************************************************************************/
sal_Bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHint ePrep )
@@ -1491,7 +1491,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
SetInvalidVert( TRUE ); // Test
case PREP_WIDOWS_ORPHANS:
case PREP_WIDOWS:
- case PREP_FTN_GONE : return;
+ case PREP_FTN_GONE : return;
case PREP_POS_CHGD :
{
@@ -1554,7 +1554,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
_InvalidatePrt();
_InvalidateSize();
// KEIN break
- case PREP_ADJUST_FRM : pPara->SetPrepAdjust( sal_True );
+ case PREP_ADJUST_FRM : pPara->SetPrepAdjust( sal_True );
if( IsFtnNumFrm() != pPara->IsFtnNum() ||
IsUndersized() )
{
@@ -1563,9 +1563,9 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
_SetOfst( 0 );
}
break;
- case PREP_MUST_FIT : pPara->SetPrepMustFit( sal_True );
+ case PREP_MUST_FIT : pPara->SetPrepMustFit( sal_True );
/* no break here */
- case PREP_WIDOWS_ORPHANS : pPara->SetPrepAdjust( sal_True );
+ case PREP_WIDOWS_ORPHANS : pPara->SetPrepAdjust( sal_True );
break;
case PREP_WIDOWS :
@@ -1651,7 +1651,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
if( nStart >= GetOfst() )
{
if( nStart >= nEnd )
- i = nSize; // fuehrt das Ende herbei
+ i = nSize; // fuehrt das Ende herbei
else
{
// 4029: wenn wir zurueckfliessen und eine Ftn besitzen, so
@@ -1751,7 +1751,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
_InvalidateSize();
}
else
- return; // damit kein SetPrep() erfolgt.
+ return; // damit kein SetPrep() erfolgt.
}
break;
}
@@ -1831,7 +1831,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
else
_InvalidateSize();
}
- return; // damit kein SetPrep() erfolgt.
+ return; // damit kein SetPrep() erfolgt.
}
}
if( pPara )
@@ -1900,7 +1900,7 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
pFrm->SwapWidthAndHeight();
SwTxtFormatInfo aInf( pFrm, sal_False, sal_True, sal_True );
- SwTxtFormatter aLine( pFrm, &aInf );
+ SwTxtFormatter aLine( pFrm, &aInf );
pFrm->_Format( aLine, aInf );
@@ -1931,7 +1931,7 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool
/*************************************************************************
- * SwTxtFrm::WouldFit()
+ * SwTxtFrm::WouldFit()
*************************************************************************/
/* SwTxtFrm::WouldFit()
@@ -2048,7 +2048,7 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
/*************************************************************************
- * SwTxtFrm::GetParHeight()
+ * SwTxtFrm::GetParHeight()
*************************************************************************/
KSHORT SwTxtFrm::GetParHeight() const
@@ -2087,7 +2087,7 @@ KSHORT SwTxtFrm::GetParHeight() const
/*************************************************************************
- * SwTxtFrm::GetFormatted()
+ * SwTxtFrm::GetFormatted()
*************************************************************************/
// returnt this _immer_ im formatierten Zustand!
@@ -2118,7 +2118,7 @@ SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
}
/*************************************************************************
- * SwTxtFrm::CalcFitToContent()
+ * SwTxtFrm::CalcFitToContent()
*************************************************************************/
SwTwips SwTxtFrm::CalcFitToContent()
@@ -2155,7 +2155,7 @@ SwTwips SwTxtFrm::CalcFitToContent()
SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True );
aInf.SetIgnoreFly( sal_True );
- SwTxtFormatter aLine( this, &aInf );
+ SwTxtFormatter aLine( this, &aInf );
SwHookOut aHook( aInf );
// --> OD 2005-09-06 #i54031# - assure mininum of MINLAY twips.
@@ -2401,7 +2401,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
}
/*************************************************************************
- * SwTxtFrm::GetLineSpace()
+ * SwTxtFrm::GetLineSpace()
*************************************************************************/
// OD 07.01.2004 #i11859# - change return data type
// add default parameter <_bNoPropLineSpacing> to control, if the
@@ -2455,7 +2455,7 @@ long SwTxtFrm::GetLineSpace( const bool _bNoPropLineSpace ) const
}
/*************************************************************************
- * SwTxtFrm::FirstLineHeight()
+ * SwTxtFrm::FirstLineHeight()
*************************************************************************/
KSHORT SwTxtFrm::FirstLineHeight() const
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 70edfdab8e60..a0070cfd55be 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -2,7 +2,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
@@ -50,16 +50,16 @@
#include <sortedobjs.hxx>
#include "txtcfg.hxx"
-#include "swfont.hxx" // new SwFont
+#include "swfont.hxx" // new SwFont
#include "porftn.hxx"
#include "porfly.hxx"
#include "porlay.hxx"
#include "txtfrm.hxx"
#include "itrform2.hxx"
-#include "ftnfrm.hxx" // FindQuoVadisFrm(),
+#include "ftnfrm.hxx" // FindQuoVadisFrm(),
#include "pagedesc.hxx"
#include "redlnitr.hxx" // SwRedlnItr
-#include "sectfrm.hxx" // SwSectionFrm
+#include "sectfrm.hxx" // SwSectionFrm
#include "layouter.hxx" // Endnote-Collection
#include "frmtool.hxx"
#include "ndindex.hxx"
@@ -67,7 +67,7 @@
using namespace ::com::sun::star;
/*************************************************************************
- * _IsFtnNumFrm()
+ * _IsFtnNumFrm()
*************************************************************************/
sal_Bool SwTxtFrm::_IsFtnNumFrm() const
@@ -79,7 +79,7 @@ sal_Bool SwTxtFrm::_IsFtnNumFrm() const
}
/*************************************************************************
- * FindFtn()
+ * FindFtn()
*************************************************************************/
// Sucht innerhalb einer Master-Follow-Kette den richtigen TxtFrm zum SwTxtFtn
@@ -99,7 +99,7 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
}
/*************************************************************************
- * CalcFtnFlag()
+ * CalcFtnFlag()
*************************************************************************/
#if OSL_DEBUG_LEVEL > 1
@@ -141,7 +141,7 @@ void SwTxtFrm::CalcFtnFlag()
}
/*************************************************************************
- * CalcPrepFtnAdjust()
+ * CalcPrepFtnAdjust()
*************************************************************************/
sal_Bool SwTxtFrm::CalcPrepFtnAdjust()
@@ -173,7 +173,7 @@ sal_Bool SwTxtFrm::CalcPrepFtnAdjust()
SwTxtFormatInfo aInf( this );
SwTxtFormatter aLine( this, &aInf );
aLine.TruncLines();
- SetPara( 0 ); //Wird ggf. geloescht!
+ SetPara( 0 ); //Wird ggf. geloescht!
ResetPreps();
return sal_False;
}
@@ -288,7 +288,7 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
/*************************************************************************
- * SwTxtFrm::GetFtnLine()
+ * SwTxtFrm::GetFtnLine()
*************************************************************************/
SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
@@ -327,7 +327,7 @@ SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
}
/*************************************************************************
- * SwTxtFrm::GetFtnRstHeight()
+ * SwTxtFrm::GetFtnRstHeight()
*************************************************************************/
// Ermittelt die max. erreichbare Hoehe des TxtFrm im Ftn-Bereich.
@@ -408,7 +408,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
}
/*************************************************************************
- * SwTxtFrm::FindQuoVadisFrm()
+ * SwTxtFrm::FindQuoVadisFrm()
*************************************************************************/
SwTxtFrm *SwTxtFrm::FindQuoVadisFrm()
@@ -428,14 +428,14 @@ SwTxtFrm *SwTxtFrm::FindQuoVadisFrm()
return NULL;
const SwCntntFrm *pLast;
do
- { pLast = pCnt;
+ { pLast = pCnt;
pCnt = pCnt->GetNextCntntFrm();
} while( pCnt && pFtnFrm->IsAnLower( pCnt ) );
return (SwTxtFrm*)pLast;
}
/*************************************************************************
- * SwTxtFrm::RemoveFtn()
+ * SwTxtFrm::RemoveFtn()
*************************************************************************/
void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
@@ -510,11 +510,11 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
// Wir loeschen nicht, sondern wollen die Ftn verschieben.
// Drei Faelle koennen auftreten:
// 1) Es gibt weder Follow noch PrevFollow
- // -> RemoveFtn() (vielleicht sogar ein OSL_ENSURE(wert)
+ // -> RemoveFtn() (vielleicht sogar ein OSL_ENSURE(wert)
// 2) nStart > GetOfst, ich habe einen Follow
- // -> Ftn wandert in den Follow
+ // -> Ftn wandert in den Follow
// 3) nStart < GetOfst, ich bin ein Follow
- // -> Ftn wandert in den PrevFollow
+ // -> Ftn wandert in den PrevFollow
// beide muessen auf einer Seite/in einer Spalte stehen.
SwFtnFrm *pFtnFrm = bEndn ? pEndBoss->FindFtn( pSource, pFtn ) :
@@ -615,7 +615,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
}
/*************************************************************************
- * SwTxtFormatter::ConnectFtn()
+ * SwTxtFormatter::ConnectFtn()
*************************************************************************/
// sal_False, wenn irgendetwas schief gegangen ist.
// Es gibt eigentlich nur zwei Moeglichkeiten:
@@ -635,7 +635,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
"SwTxtFrm::ConnectFtn with swapped frame" );
bFtn = sal_True;
- bInFtnConnect = sal_True; //Bloss zuruecksetzen!
+ bInFtnConnect = sal_True; //Bloss zuruecksetzen!
sal_Bool bEnd = pFtn->GetFtn().IsEndNote();
//
@@ -725,7 +725,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
SwSaveFtnHeight aHeight( pBoss, nDeadLine );
- if( !pSrcFrm ) // Es wurde ueberhaupt keine Ftn gefunden.
+ if( !pSrcFrm ) // Es wurde ueberhaupt keine Ftn gefunden.
pBoss->AppendFtn( this, pFtn );
else
{
@@ -734,7 +734,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
sal_Bool bBrutal = sal_False;
- if( pFtnBoss == pBoss ) // Ref und Ftn sind auf der selben Seite/Spalte.
+ if( pFtnBoss == pBoss ) // Ref und Ftn sind auf der selben Seite/Spalte.
{
SwFrm *pCont = pFtnFrm->GetUpper();
@@ -842,7 +842,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
/*************************************************************************
- * SwTxtFormatter::NewFtnPortion()
+ * SwTxtFormatter::NewFtnPortion()
*************************************************************************/
// Die Portion fuer die Ftn-Referenz im Text
@@ -989,7 +989,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
}
/*************************************************************************
- * SwTxtFormatter::NewFtnNumPortion()
+ * SwTxtFormatter::NewFtnNumPortion()
*************************************************************************/
// Die Portion fuer die Ftn-Nummerierung im Ftn-Bereich
@@ -1047,7 +1047,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
}
/*************************************************************************
- * SwTxtFormatter::NewErgoSumPortion()
+ * SwTxtFormatter::NewErgoSumPortion()
*************************************************************************/
XubString lcl_GetPageNumber( const SwPageFrm* pPage )
@@ -1088,7 +1088,7 @@ SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) con
}
/*************************************************************************
- * SwTxtFormatter::FormatQuoVadis()
+ * SwTxtFormatter::FormatQuoVadis()
*************************************************************************/
xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
@@ -1129,7 +1129,7 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
// Ein Wort zu QuoVadis/ErgoSum:
// Fuer diese Texte wird der am Absatz eingestellte Font verwendet.
// Wir initialisieren uns also:
-// ResetFont();
+// ResetFont();
FeedInf( rInf );
SeekStartAndChg( rInf, sal_True );
if( GetRedln() && pCurr->HasRedline() )
@@ -1283,8 +1283,8 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
#if OSL_DEBUG_LEVEL > 1
if( OPTDBG( rInf ) )
{
-// aDbstream << "FormatQuoVadis:" << endl;
-// pCurr->DebugPortions( aDbstream, rInf.GetTxt(), nStart );
+// aDbstream << "FormatQuoVadis:" << endl;
+// pCurr->DebugPortions( aDbstream, rInf.GetTxt(), nStart );
}
#endif
@@ -1294,7 +1294,7 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
/*************************************************************************
- * SwTxtFormatter::MakeDummyLine()
+ * SwTxtFormatter::MakeDummyLine()
*************************************************************************/
// MakeDummyLine() erzeugt eine Line, die bis zum unteren Seitenrand
@@ -1372,7 +1372,7 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
pInfo = &pDoc->GetEndNoteInfo();
else
pInfo = &pDoc->GetFtnInfo();
- const SwAttrSet& rSet = pInfo->GetAnchorCharFmt((SwDoc&)*pDoc)->GetAttrSet();
+ const SwAttrSet& rSet = pInfo->GetAnchorCharFmt((SwDoc&)*pDoc)->GetAttrSet();
pFnt->SetDiffFnt( &rSet, rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess() );
// we reduce footnote size, if we are inside a double line portion
@@ -1402,7 +1402,7 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf,
}
/*************************************************************************
- * SwFtnSave::~SwFtnSave()
+ * SwFtnSave::~SwFtnSave()
*************************************************************************/
SwFtnSave::~SwFtnSave()
@@ -1418,7 +1418,7 @@ SwFtnSave::~SwFtnSave()
}
/*************************************************************************
- * SwFtnPortion::SwFtnPortion()
+ * SwFtnPortion::SwFtnPortion()
*************************************************************************/
SwFtnPortion::SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrame,
@@ -1437,7 +1437,7 @@ SwFtnPortion::SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrame,
}
/*************************************************************************
- * SwFtnPortion::GetExpTxt()
+ * SwFtnPortion::GetExpTxt()
*************************************************************************/
sal_Bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, XubString &rTxt ) const
@@ -1447,7 +1447,7 @@ sal_Bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, XubString &rTxt ) const
}
/*************************************************************************
- * virtual SwFtnPortion::Format()
+ * virtual SwFtnPortion::Format()
*************************************************************************/
sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
@@ -1471,7 +1471,7 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwFtnPortion::Paint()
+ * virtual SwFtnPortion::Paint()
*************************************************************************/
void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -1485,7 +1485,7 @@ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * virtual SwFtnPortion::GetTxtSize()
+ * virtual SwFtnPortion::GetTxtSize()
*************************************************************************/
SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const
@@ -1506,7 +1506,7 @@ void SwFtnPortion::SetPreferredScriptType( BYTE nPreferredScriptType )
// <--
/*************************************************************************
- * class SwQuoVadisPortion
+ * class SwQuoVadisPortion
*************************************************************************/
SwFldPortion *SwQuoVadisPortion::Clone( const XubString &rExpand ) const
@@ -1520,7 +1520,7 @@ SwQuoVadisPortion::SwQuoVadisPortion( const XubString &rExp, const XubString& rS
}
/*************************************************************************
- * virtual SwQuoVadisPortion::Format()
+ * virtual SwQuoVadisPortion::Format()
*************************************************************************/
sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
@@ -1551,7 +1551,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwQuoVadisPortion::GetExpTxt()
+ * virtual SwQuoVadisPortion::GetExpTxt()
*************************************************************************/
sal_Bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, XubString &rTxt ) const
@@ -1576,7 +1576,7 @@ void SwQuoVadisPortion::HandlePortion( SwPortionHandler& rPH ) const
}
/*************************************************************************
- * virtual SwQuoVadisPortion::Paint()
+ * virtual SwQuoVadisPortion::Paint()
*************************************************************************/
void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -1593,7 +1593,7 @@ void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
/*************************************************************************
- * class SwErgoSumPortion
+ * class SwErgoSumPortion
*************************************************************************/
SwFldPortion *SwErgoSumPortion::Clone( const XubString &rExpand ) const
@@ -1619,7 +1619,7 @@ xub_StrLen SwErgoSumPortion::GetCrsrOfst( const KSHORT ) const
}
/*************************************************************************
- * virtual SwErgoSumPortion::Format()
+ * virtual SwErgoSumPortion::Format()
*************************************************************************/
sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
@@ -1642,7 +1642,7 @@ sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
/*************************************************************************
- * SwParaPortion::SetErgoSumNum()
+ * SwParaPortion::SetErgoSumNum()
*************************************************************************/
void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
@@ -1653,7 +1653,7 @@ void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
DBG_LOOP;
pLay = pLay->GetNext();
}
- SwLinePortion *pPor = pLay;
+ SwLinePortion *pPor = pLay;
SwQuoVadisPortion *pQuo = 0;
while( pPor && !pQuo )
{
@@ -1666,7 +1666,7 @@ void SwParaPortion::SetErgoSumNum( const XubString& rErgo )
}
/*************************************************************************
- * SwParaPortion::UpdateQuoVadis()
+ * SwParaPortion::UpdateQuoVadis()
*
* Wird im SwTxtFrm::Prepare() gerufen
*************************************************************************/
@@ -1679,7 +1679,7 @@ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString &rQuo )
DBG_LOOP;
pLay = pLay->GetNext();
}
- SwLinePortion *pPor = pLay;
+ SwLinePortion *pPor = pLay;
SwQuoVadisPortion *pQuo = 0;
while( pPor && !pQuo )
{
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index dfba164b9dcc..2612cc67a787 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -2,7 +2,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
@@ -34,16 +34,16 @@
#include <editeng/unolingu.hxx>
#include <com/sun/star/i18n/WordType.hpp>
#include <EnhancedPDFExportHelper.hxx>
-#include <viewopt.hxx> // SwViewOptions
+#include <viewopt.hxx> // SwViewOptions
#include <viewsh.hxx>
#include <errhdl.hxx>
#include <txtcfg.hxx>
#include <SwPortionHandler.hxx>
-#include <porhyph.hxx> //
+#include <porhyph.hxx> //
#include <inftxt.hxx>
#include <itrform2.hxx> //
-#include <guess.hxx> //
-#include <splargs.hxx> // SwInterHyphInfo
+#include <guess.hxx> //
+#include <splargs.hxx> // SwInterHyphInfo
#if OSL_DEBUG_LEVEL > 1
extern const sal_Char *GetLangName( const MSHORT nLang );
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::i18n;
/*************************************************************************
- * SwTxtFormatInfo::HyphWord()
+ * SwTxtFormatInfo::HyphWord()
*************************************************************************/
Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
@@ -78,7 +78,7 @@ Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
}
/*************************************************************************
- * SwTxtFrm::Hyphenate
+ * SwTxtFrm::Hyphenate
*
* Wir formatieren eine Zeile fuer die interaktive Trennung
*************************************************************************/
@@ -137,7 +137,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
}
/*************************************************************************
- * SwTxtFormatter::Hyphenate
+ * SwTxtFormatter::Hyphenate
*
* Wir formatieren eine Zeile fuer die interaktive Trennung
*************************************************************************/
@@ -293,7 +293,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
{
rHyphInf.SetHyphWord( xHyphWord );
rHyphInf.nWordStart = nWrdStart;
- rHyphInf.nWordLen = nLen+nCnt;
+ rHyphInf.nWordLen = nLen+nCnt;
rHyphInf.SetNoLang( sal_False );
rHyphInf.SetCheck( sal_True );
}
@@ -314,7 +314,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
}
/*************************************************************************
- * SwTxtPortion::CreateHyphen()
+ * SwTxtPortion::CreateHyphen()
*************************************************************************/
sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
@@ -557,7 +557,7 @@ sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
sal_Bool bFull = sal_True;
// special case for old german spelling
- if( rInf.IsUnderFlow() )
+ if( rInf.IsUnderFlow() )
{
if( rInf.GetSoftHyphPos() )
return sal_True;
@@ -608,7 +608,7 @@ sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwSoftHyphPortion::FormatEOL()
+ * virtual SwSoftHyphPortion::FormatEOL()
*************************************************************************/
// Format end of Line
@@ -640,7 +640,7 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
}
/*************************************************************************
- * virtual SwSoftHyphPortion::GetExpTxt()
+ * virtual SwSoftHyphPortion::GetExpTxt()
*
* Wir expandieren:
* - wenn die Sonderzeichen sichtbar sein sollen
@@ -674,7 +674,7 @@ void SwSoftHyphPortion::HandlePortion( SwPortionHandler& rPH ) const
}
/*************************************************************************
- * SwSoftHyphStrPortion::Paint
+ * SwSoftHyphStrPortion::Paint
*************************************************************************/
void SwSoftHyphStrPortion::Paint( const SwTxtPaintInfo &rInf ) const
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index f8ffbbe7dc3f..74468830a8c8 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -2,7 +2,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
@@ -49,9 +49,9 @@
#include "porftn.hxx"
#include "porhyph.hxx"
#include "pordrop.hxx"
-#include "blink.hxx" // Blink-Manager
+#include "blink.hxx" // Blink-Manager
#include "init.hxx" // Deklarationen fuer _TextInit() und _TextFinit()
-#include "txtfly.hxx" // SwContourCache
+#include "txtfly.hxx" // SwContourCache
#include "dbg_lay.hxx" // Layout Debug Fileausgabe
SwCache *SwTxtFrm::pTxtCache = 0;
@@ -59,11 +59,11 @@ long SwTxtFrm::nMinPrtLine = 0;
SwContourCache *pContourCache = 0;
SwDropCapCache *pDropCapCache = 0;
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion, 50, 50 ) //Absaetze
-IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout, 150, 150 ) //Zeilen
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion, 150, 150 ) //z.B. Blanks am Zeilenende
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion, 200, 100 ) //Attributwechsel
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine, 50, 50 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion, 50, 50 ) //Absaetze
+IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout, 150, 150 ) //Zeilen
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion, 150, 150 ) //z.B. Blanks am Zeilenende
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion, 200, 100 ) //Attributwechsel
/*************************************************************************
* _TextInit(), _TextFinit()
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index e0c727c88f26..d93d8d13f7eb 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@
// #define AMA_LAYOUT
#ifdef AMA_LAYOUT
#include <stdio.h>
-#include <stdlib.h> // getenv()
+#include <stdlib.h> // getenv()
#include <flowfrm.hxx>
#include <pagefrm.hxx>
#include <svx/svdobj.hxx>
@@ -520,7 +520,7 @@ const char *GetLangName( const MSHORT /*nLang*/ )
SvStream &SwLinePortion::operator<<( SvStream &rOs ) const //$ ostream
{
rOs << " {";
- rOs << "L:" << nLineLength;
+ rOs << "L:" << nLineLength;
rOs << " H:" << Height();
rOs << " W:" << PrtWidth();
rOs << " A:" << nAscent;
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index 54069949423d..915a03b2f789 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -2,7 +2,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
@@ -58,7 +58,7 @@ void SwSaveClip::Reset()
}
/*************************************************************************
- * SwSaveClip::_ChgClip()
+ * SwSaveClip::_ChgClip()
*************************************************************************/
void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 0a7a36beda48..735236b96265 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -2,7 +2,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
@@ -29,18 +29,18 @@
#define _TXTPAINT_HXX
#include <vcl/outdev.hxx>
-class SwRect; // SwSaveClip
+class SwRect; // SwSaveClip
#include <txtfrm.hxx>
/*************************************************************************
- * class SwSaveClip
+ * class SwSaveClip
*************************************************************************/
class SwSaveClip
{
- Region aClip;
- const sal_Bool bOn;
- sal_Bool bChg;
+ Region aClip;
+ const sal_Bool bOn;
+ sal_Bool bChg;
protected:
OutputDevice* pOut;
void _ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
@@ -52,7 +52,7 @@ public:
sal_Bool bEnlargeRect = sal_False)
{ if( pOut ) _ChgClip( rRect, pFrm, bEnlargeRect ); }
void Reset();
- inline sal_Bool IsOn() const { return bOn; }
+ inline sal_Bool IsOn() const { return bOn; }
inline sal_Bool IsChg() const { return bChg; }
inline sal_Bool IsOut() const { return 0 != pOut; }
inline OutputDevice *GetOut() { return pOut; }
@@ -72,7 +72,7 @@ inline SwSaveClip::~SwSaveClip()
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * class SwDbgOut
+ * class SwDbgOut
*************************************************************************/
class SwDbgOut
@@ -84,7 +84,7 @@ public:
};
/*************************************************************************
- * class DbgColor
+ * class DbgColor
*************************************************************************/
class DbgColor
@@ -98,12 +98,12 @@ public:
};
/*************************************************************************
- * class DbgBrush
+ * class DbgBrush
*************************************************************************/
class DbgBackColor : public SwDbgOut
{
- Color aOldFillColor;
+ Color aOldFillColor;
public:
DbgBackColor( OutputDevice* pOut, const sal_Bool bOn = sal_True,
ColorData nColor = COL_YELLOW );
@@ -111,7 +111,7 @@ public:
};
/*************************************************************************
- * class DbgRect
+ * class DbgRect
*************************************************************************/
class DbgRect : public SwDbgOut
@@ -123,7 +123,7 @@ public:
};
/*************************************************************************
- * Inline-Implementierung
+ * Inline-Implementierung
*************************************************************************/
inline SwDbgOut::SwDbgOut( OutputDevice* pOutDev, const sal_Bool bOn )
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 0a2b980eb0ea..a53f8ada8a03 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <frmatr.hxx>
#include <SwPortionHandler.hxx>
-#include "viewopt.hxx" // SwViewOptions
+#include "viewopt.hxx" // SwViewOptions
#include "txtcfg.hxx"
#include "portab.hxx"
#include "inftxt.hxx"
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 5576cff68fb6..e561356161d3 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -2,7 +2,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
@@ -49,26 +49,26 @@
#include "widorp.hxx"
#include "txtfrm.hxx"
#include "itrtxt.hxx"
-#include "sectfrm.hxx" //SwSectionFrm
+#include "sectfrm.hxx" //SwSectionFrm
#include "ftnfrm.hxx"
#undef WIDOWTWIPS
/*************************************************************************
- * inline IsNastyFollow()
+ * inline IsNastyFollow()
*************************************************************************/
// Ein Follow, der auf der selben Seite steht, wie sein Master ist nasty.
inline sal_Bool IsNastyFollow( const SwTxtFrm *pFrm )
{
- OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() ||
+ OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() ||
((const SwTxtFrm*)pFrm->GetPrev())->GetFollow() == pFrm,
"IsNastyFollow: Was ist denn hier los?" );
- return pFrm->IsFollow() && pFrm->GetPrev();
+ return pFrm->IsFollow() && pFrm->GetPrev();
}
/*************************************************************************
- * SwTxtFrmBreak::SwTxtFrmBreak()
+ * SwTxtFrmBreak::SwTxtFrmBreak()
*************************************************************************/
SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
@@ -110,7 +110,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
*/
/*************************************************************************
- * SwTxtFrmBreak::IsInside()
+ * SwTxtFrmBreak::IsInside()
*************************************************************************/
/* BP(22.07.92): Berechnung von Witwen und Waisen.
@@ -175,7 +175,7 @@ sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
}
/*************************************************************************
- * SwTxtFrmBreak::IsBreakNow()
+ * SwTxtFrmBreak::IsBreakNow()
*************************************************************************/
sal_Bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin &rLine )
@@ -231,11 +231,11 @@ void SwTxtFrmBreak::SetRstHeight( const SwTxtMargin &rLine )
}
/*************************************************************************
- * WidowsAndOrphans::WidowsAndOrphans()
+ * WidowsAndOrphans::WidowsAndOrphans()
*************************************************************************/
WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
- sal_Bool bChkKeep )
+ sal_Bool bChkKeep )
: SwTxtFrmBreak( pNewFrm, nRst ), nWidLines( 0 ), nOrphLines( 0 )
{
SWAP_IF_SWAPPED( pFrm )
@@ -310,7 +310,7 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm, const SwTwips nRst,
}
/*************************************************************************
- * WidowsAndOrphans::FindBreak()
+ * WidowsAndOrphans::FindBreak()
*************************************************************************/
/* Die Find*-Methoden suchen nicht nur, sondern stellen den SwTxtMargin auf
@@ -367,13 +367,13 @@ sal_Bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame, SwTxtMargin &rLine,
}
/*************************************************************************
- * WidowsAndOrphans::FindWidows()
+ * WidowsAndOrphans::FindWidows()
*************************************************************************/
-/* FindWidows positioniert den SwTxtMargin des Masters auf die umzubrechende
- * Zeile, indem der Follow formatiert und untersucht wird.
- * Liefert sal_True zurueck, wenn die Widows-Regelung in Kraft tritt,
- * d.h. der Absatz _zusammengehalten_ werden soll !
+/* FindWidows positioniert den SwTxtMargin des Masters auf die umzubrechende
+ * Zeile, indem der Follow formatiert und untersucht wird.
+ * Liefert sal_True zurueck, wenn die Widows-Regelung in Kraft tritt,
+ * d.h. der Absatz _zusammengehalten_ werden soll !
*/
sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
@@ -448,8 +448,8 @@ sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
// 8575: Follow to Master II
// Wenn der Follow *schrumpft*, so besteht fuer den Master die Chance,
// den kompletten Orphan zu inhalieren.
- // (0W, 2O, 2M, 1F) - 1F = 3M, 0F -> PREP_ADJUST_FRM
- // (0W, 2O, 3M, 2F) - 1F = 2M, 2F -> PREP_WIDOWS
+ // (0W, 2O, 2M, 1F) - 1F = 3M, 0F -> PREP_ADJUST_FRM
+ // (0W, 2O, 3M, 2F) - 1F = 2M, 2F -> PREP_WIDOWS
if( 0 > nChg && !pMaster->IsLocked() && pMaster->GetUpper() )
{
@@ -503,7 +503,7 @@ sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
}
/*************************************************************************
- * WidowsAndOrphans::WouldFit()
+ * WidowsAndOrphans::WouldFit()
*************************************************************************/
sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, sal_Bool bTst )
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index a0730d1b171e..5505dd84dfbd 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -2,7 +2,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
@@ -39,16 +39,16 @@ private:
SwTwips nOrigin;
protected:
SwTxtFrm *pFrm;
- sal_Bool bBreak;
- sal_Bool bKeep;
+ sal_Bool bBreak;
+ sal_Bool bKeep;
public:
SwTxtFrmBreak( SwTxtFrm *pFrm, const SwTwips nRst = 0 );
sal_Bool IsBreakNow( SwTxtMargin &rLine );
- sal_Bool IsBroken() const { return bBreak; }
+ sal_Bool IsBroken() const { return bBreak; }
sal_Bool IsKeepAlways() const { return bKeep; }
- void Keep() { bKeep = sal_True; }
- void Break() { bKeep = sal_False; bBreak = sal_True; }
+ void Keep() { bKeep = sal_True; }
+ void Break() { bKeep = sal_False; bBreak = sal_True; }
inline sal_Bool GetKeep() const { return bKeep; }
inline void SetKeep( const sal_Bool bNew ) { bKeep = bNew; }
@@ -70,7 +70,7 @@ public:
class WidowsAndOrphans : public SwTxtFrmBreak
{
private:
- MSHORT nWidLines, nOrphLines;
+ MSHORT nWidLines, nOrphLines;
public:
WidowsAndOrphans( SwTxtFrm *pFrm, const SwTwips nRst = 0,
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 0bd7d126ebf2..f77d9635a7c2 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@
/*************************************************************************
* SwWrongList::SwWrongList()
*************************************************************************/
-SwWrongList::SwWrongList( WrongListType eType ) :
+SwWrongList::SwWrongList( WrongListType eType ) :
meType (eType),
nBeginInvalid(STRING_LEN), // everything correct... (the invalid area starts beyond the string)
nEndInvalid (STRING_LEN)
@@ -133,7 +133,7 @@ sal_Bool SwWrongList::Check( xub_StrLen &rChk, xub_StrLen &rLn ) const
if( nEnd == rChk )
{
++nPos;
- if( nPos == Count() )
+ if( nPos == Count() )
return sal_False;
else
{
@@ -259,7 +259,7 @@ void SwWrongList::_Invalidate( xub_StrLen nBegin, xub_StrLen nEnd )
}
void SwWrongList::SetInvalid( xub_StrLen nBegin, xub_StrLen nEnd )
-{
+{
nBeginInvalid = nBegin;
nEndInvalid = nEnd;
}
@@ -403,7 +403,7 @@ void SwWrongList::Invalidate( xub_StrLen nBegin, xub_StrLen nEnd )
{
if (STRING_LEN == GetBeginInv())
SetInvalid( nBegin, nEnd );
- else
+ else
_Invalidate( nBegin, nEnd );
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 012db518d9ec..e6cdd53e42de 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -2,7 +2,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
@@ -595,7 +595,7 @@ SwTOXBase::~SwTOXBase()
}
void SwTOXBase::SetTitle(const String& rTitle)
- { aTitle = rTitle; }
+ { aTitle = rTitle; }
SwTOXBase & SwTOXBase::operator = (const SwTOXBase & rSource)
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index fb9b97a265b4..4b06ddb44141 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -2,7 +2,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
@@ -80,7 +80,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
const STAR_NMSPC::lang::Locale& rLocale ) const
{
String sRet;
- try {
+ try {
sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
}
catch ( UNO_NMSPC::Exception&
@@ -101,7 +101,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
String IndexEntrySupplierWrapper::GetFollowingText( BOOL bMorePages ) const
{
String sRet;
- try {
+ try {
sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
}
catch ( UNO_NMSPC::Exception&
@@ -124,7 +124,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
{
uno::Sequence< ::rtl::OUString > sRet;
- try {
+ try {
sRet = xIES->getAlgorithmList( rLcl );
}
catch ( UNO_NMSPC::Exception&
@@ -147,7 +147,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
const String& sSortAlgorithm, long nOptions ) const
{
sal_Bool bRet = sal_False;
- try {
+ try {
bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
}
catch ( UNO_NMSPC::Exception&
@@ -172,7 +172,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
const STAR_NMSPC::lang::Locale& rLocale2 ) const
{
sal_Int16 nRet = 0;
- try {
+ try {
nRet = xIES->compareIndexEntry( rTxt1, rTxtReading1, rLocale1,
rTxt2, rTxtReading2, rLocale2 );
}
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 78cd69e73cef..c905c7b9023d 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -2,7 +2,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
@@ -146,7 +146,7 @@ String SwTOXInternational::GetFollowingText( BOOL bMorePages ) const
}
/*--------------------------------------------------------------------
- Beschreibung: SortierElement fuer Verzeichniseintraege
+ Beschreibung: SortierElement fuer Verzeichniseintraege
--------------------------------------------------------------------*/
@@ -237,7 +237,7 @@ BOOL SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
{
// beide Pointer vorhanden -> vergleiche Text
// beide Pointer nicht vorhanden -> vergleiche AlternativText
- const xub_StrLen *pEnd = pTxtMark->GetEnd(),
+ const xub_StrLen *pEnd = pTxtMark->GetEnd(),
*pEndCmp = rCmp.pTxtMark->GetEnd();
String sMyTxt;
@@ -408,7 +408,7 @@ void SwTOXIndex::_GetText( String& rTxt, String& rTxtReading )
const SwTOXMark& rTOXMark = pTxtMark->GetTOXMark();
switch(nKeyLevel)
{
- case FORM_PRIMARY_KEY :
+ case FORM_PRIMARY_KEY :
{
rTxt = rTOXMark.GetPrimaryKey();
rTxtReading = rTOXMark.GetPrimaryKeyReading();
@@ -420,7 +420,7 @@ void SwTOXIndex::_GetText( String& rTxt, String& rTxtReading )
rTxtReading = rTOXMark.GetSecondaryKeyReading();
}
break;
- case FORM_ENTRY :
+ case FORM_ENTRY :
{
rTxt = rTOXMark.GetText();
rTxtReading = rTOXMark.GetTextReading();
@@ -549,7 +549,7 @@ SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark,
}
-// Der Text des Inhalts
+// Der Text des Inhalts
//
void SwTOXContent::_GetText( String& rTxt, String& rTxtReading )
@@ -688,13 +688,13 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) const
USHORT SwTOXPara::GetLevel() const
{
USHORT nRet = m_nLevel;
- const SwCntntNode* pNd = aTOXSources[0].pNd;
+ const SwCntntNode* pNd = aTOXSources[0].pNd;
if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() )
{
//USHORT nTmp = ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
//if(nTmp < NO_NUMBERING)
- // nRet = nTmp + 1;
+ // nRet = nTmp + 1;
const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//#outline level,zhaojianwei????
if(nTmp != 0 )
nRet = static_cast<USHORT>(nTmp);
@@ -775,7 +775,7 @@ String SwTOXPara::GetURL() const
case nsSwTOXElement::TOX_OLE: pStr = pMarkToOLE; break;
case nsSwTOXElement::TOX_GRAPHIC: pStr = pMarkToGraphic; break;
case nsSwTOXElement::TOX_FRAME: pStr = pMarkToFrame; break;
- default: pStr = 0;
+ default: pStr = 0;
}
if( pStr )
aTxt.AppendAscii( pStr );
@@ -877,7 +877,7 @@ void SwTOXAuthority::_GetText( String& rTxt, String& )
/* -----------------21.09.99 12:50-------------------
--------------------------------------------------*/
-void SwTOXAuthority::FillText( SwTxtNode& rNd,
+void SwTOXAuthority::FillText( SwTxtNode& rNd,
const SwIndex& rInsPos, USHORT nAuthField ) const
{
SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
@@ -906,7 +906,7 @@ void SwTOXAuthority::FillText( SwTxtNode& rNd,
/* -----------------14.10.99 09:35-------------------
--------------------------------------------------*/
-BOOL SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
+BOOL SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
{
return nType == rCmp.nType &&
((SwAuthorityField*)m_rField.GetFld())->GetHandle() ==
@@ -915,7 +915,7 @@ BOOL SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
/* -----------------21.10.99 09:52-------------------
--------------------------------------------------*/
-BOOL SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
+BOOL SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
{
BOOL bRet = FALSE;
SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
@@ -931,7 +931,7 @@ BOOL SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
for(USHORT i = 0; i < pType->GetSortKeyCount(); i++)
{
- const SwTOXSortKey* pKey = pType->GetSortKey(i);
+ const SwTOXSortKey* pKey = pType->GetSortKey(i);
String sMyTxt = pField->GetFieldText(pKey->eField);
String sMyTxtReading;
String sOtherTxt = pCmpField->GetFieldText(pKey->eField);
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index a9ee7f529cdb..5425db5bb119 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient
bool mbFinished;
SwTxtNode* getMyTxtNode() { return (SwTxtNode*)pRegisteredIn; }
DECL_LINK( TimerRepaint, Timer * );
-
+
public:
SwGrammarContact();
~SwGrammarContact() { aTimer.Stop(); delete mpProxyList; }
@@ -210,7 +210,7 @@ void repaintTextFrames( SwModify& rModify )
ViewShell *pCurShell = pRootFrm ? pRootFrm->GetCurrShell() : NULL;
if( pCurShell )
pCurShell->InvalidateWindows( aRec );
- }
+ }
}
void finishGrammarCheck( SwTxtNode& rTxtNode )
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 843705204a21..ab654abeb7e6 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -2,7 +2,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
@@ -94,7 +94,7 @@ SwFmtFld::~SwFmtFld()
SwFieldType* pType = pField ? pField->GetTyp() : 0;
if (pType && pType->Which() == RES_DBFLD)
- pType = 0; // DB-Feldtypen zerstoeren sich selbst
+ pType = 0; // DB-Feldtypen zerstoeren sich selbst
Broadcast( SwFmtFldHint( this, SWFMTFLD_REMOVED ) );
delete pField;
@@ -256,7 +256,7 @@ BOOL SwFmtFld::IsProtect() const
|*
|* Beschreibung Attribut fuer automatischen Text, Ctor
|* Ersterstellung BP 30.04.92
-|* Letzte Aenderung JP 15.08.94
+|* Letzte Aenderung JP 15.08.94
|*
*************************************************************************/
@@ -285,7 +285,7 @@ SwTxtFld::~SwTxtFld( )
|*
|* Beschreibung exandiert das Feld und tauscht den Text im Node
|* Ersterstellung BP 30.04.92
-|* Letzte Aenderung JP 15.08.94
+|* Letzte Aenderung JP 15.08.94
|*
*************************************************************************/
@@ -313,7 +313,7 @@ void SwTxtFld::Expand() const
{
// BP: das muesste man noch optimieren!
//JP 12.06.97: stimmt, man sollte auf jedenfall eine Status-
- // aenderung an die Frames posten
+ // aenderung an die Frames posten
if( m_pTxtNode->CalcHiddenParaField() )
{
m_pTxtNode->Modify( 0, 0 );
@@ -382,7 +382,7 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
{
// erzeuge aus der internen (fuer CORE) die externe (fuer UI) Formel
const SwTableNode* pTblNd = m_pTxtNode->FindTableNode();
- if( pTblNd ) // steht in einer Tabelle
+ if( pTblNd ) // steht in einer Tabelle
((SwTblField*)rFmtFld.GetFld())->PtrToBoxNm( &pTblNd->GetTable() );
}
}
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index bd765b43e937..7bc2ab4c1440 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -2,7 +2,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
@@ -126,8 +126,8 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
(pDoc != pFmt->GetDoc())) // different documents?
{
// JP 03.06.96: dann sorge dafuer, das der koperierte Anker auf
- // gueltigen Content zeigt! Die Umsetzung auf die
- // richtige Position erfolgt spaeter.
+ // gueltigen Content zeigt! Die Umsetzung auf die
+ // richtige Position erfolgt spaeter.
SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), +2 );
SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
if( !pCNd )
@@ -186,7 +186,7 @@ void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode )
// beim Ankerwechsel werden immer alle FlyFrms vom Attribut geloescht
// JP 25.04.95: wird innerhalb des SplitNodes die Frames verschoben
- // koennen die Frames erhalten bleiben.
+ // koennen die Frames erhalten bleiben.
if( ( !pNode->GetpSwpHints() || !pNode->GetpSwpHints()->IsInSplitNode() )
&& RES_DRAWFRMFMT != pFmt->Which() )
pFmt->DelFrms();
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index d9be255d1d02..f1c243d7c043 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -2,7 +2,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
@@ -72,17 +72,17 @@ SwFmtFtn::SwFmtFtn( bool bEndNote )
int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
- return nNumber == ((SwFmtFtn&)rAttr).nNumber &&
- aNumber == ((SwFmtFtn&)rAttr).aNumber &&
+ return nNumber == ((SwFmtFtn&)rAttr).nNumber &&
+ aNumber == ((SwFmtFtn&)rAttr).aNumber &&
m_bEndNote == ((SwFmtFtn&)rAttr).m_bEndNote;
}
SfxPoolItem* SwFmtFtn::Clone( SfxItemPool* ) const
{
- SwFmtFtn* pNew = new SwFmtFtn;
- pNew->aNumber = aNumber;
- pNew->nNumber = nNumber;
+ SwFmtFtn* pNew = new SwFmtFtn;
+ pNew->aNumber = aNumber;
+ pNew->nNumber = nNumber;
pNew->m_bEndNote = m_bEndNote;
return pNew;
}
@@ -170,7 +170,7 @@ XubString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, BOOL bInclStrings ) const
}
/*************************************************************************
- * class SwTxt/FmtFnt
+ * class SwTxt/FmtFnt
*************************************************************************/
SwTxtFtn::SwTxtFtn( SwFmtFtn& rAttr, xub_StrLen nStartPos )
@@ -217,10 +217,10 @@ void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, BOOL bDelNode )
else
{
//JP 27.01.97: der sw3-Reader setzt einen StartNode aber das
- // Attribut ist noch nicht im TextNode verankert.
- // Wird es geloescht (z.B. bei Datei einfuegen mit
- // Ftn in einen Rahmen), muss auch der Inhalt
- // geloescht werden
+ // Attribut ist noch nicht im TextNode verankert.
+ // Wird es geloescht (z.B. bei Datei einfuegen mit
+ // Ftn in einen Rahmen), muss auch der Inhalt
+ // geloescht werden
pDoc = m_pStartNode->GetNodes().GetDoc();
}
@@ -385,7 +385,7 @@ void SwTxtFtn::DelFrms()
}
}
//JP 13.05.97: falls das Layout vorm loeschen der Fussnoten entfernt
- // wird, sollte man das ueber die Fussnote selbst tun
+ // wird, sollte man das ueber die Fussnote selbst tun
if ( !bFrmFnd && m_pStartNode )
{
SwNodeIndex aIdx( *m_pStartNode );
diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx
index b9c66e4b782f..f6e40747bb71 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@ SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const
}
/*************************************************************************
- * class SwTxtRefMark
+ * class SwTxtRefMark
*************************************************************************/
// Attribut fuer Inhalts-/Positions-Referenzen im Text
diff --git a/sw/source/core/txtnode/atrtox.cxx b/sw/source/core/txtnode/atrtox.cxx
index 31820ab10978..ffbef0c517a9 100644
--- a/sw/source/core/txtnode/atrtox.cxx
+++ b/sw/source/core/txtnode/atrtox.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx
index 71d7e48f6d74..90332e45bff3 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <charfmt.hxx>
-TYPEINIT1( SwCharFmt, SwFmt ); //rtti fuer SwCharFmt
+TYPEINIT1( SwCharFmt, SwFmt ); //rtti fuer SwCharFmt
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 2d27ec119286..7830b0ea78b6 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <charfmt.hxx>
#include <hints.hxx> // SwUpdateAttr
#include <unostyle.hxx>
-#include <unoevent.hxx> // SwHyperlinkEventDescriptor
+#include <unoevent.hxx> // SwHyperlinkEventDescriptor
#include <com/sun/star/text/RubyAdjust.hdl>
#include <cmdid.h>
@@ -273,7 +273,7 @@ int SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const
{
const SvxMacro *pOwnMac = rOwn.GetObject(nNo);
const SvxMacro *pOtherMac = rOther.GetObject(nNo);
- if ( rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac) ||
+ if ( rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac) ||
pOwnMac->GetLibName() != pOtherMac->GetLibName() ||
pOwnMac->GetMacName() != pOtherMac->GetMacName() )
return FALSE;
@@ -438,7 +438,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, BYTE nMemberId )
String aString;
SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
aINetFmt = OUString ( aString );
- nINetId = SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
+ nINetId = SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
}
break;
default:
@@ -511,8 +511,8 @@ bool SwFmtRuby::QueryValue( uno::Any& rVal,
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
{
- case MID_RUBY_TEXT: rVal <<= (OUString)sRubyTxt; break;
- case MID_RUBY_ADJUST: rVal <<= (sal_Int16)nAdjustment; break;
+ case MID_RUBY_TEXT: rVal <<= (OUString)sRubyTxt; break;
+ case MID_RUBY_ADJUST: rVal <<= (sal_Int16)nAdjustment; break;
case MID_RUBY_CHARSTYLE:
{
String aString;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 8296d7c7822d..69b993fc44bd 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2,7 +2,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
@@ -39,8 +39,8 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#include <com/sun/star/i18n/WordType.hdl>
#include <breakit.hxx>
-#include <viewsh.hxx> // Bildschirmabgleich
-#include <viewopt.hxx> // Bildschirmabgleich abschalten, ViewOption
+#include <viewsh.hxx> // Bildschirmabgleich
+#include <viewopt.hxx> // Bildschirmabgleich abschalten, ViewOption
#include <fntcache.hxx>
#include <IDocumentSettingAccess.hxx>
#include <swfont.hxx> // CH_BLANK + CH_BULLET
@@ -95,10 +95,10 @@ USHORT GetDefaultFontHeight( SwDrawTextInfo &rInf )
/*************************************************************************
|*
-|* SwFntCache::Flush()
+|* SwFntCache::Flush()
|*
-|* Ersterstellung AMA 16. Dez. 94
-|* Letzte Aenderung AMA 16. Dez. 94
+|* Ersterstellung AMA 16. Dez. 94
+|* Letzte Aenderung AMA 16. Dez. 94
|*
|*************************************************************************/
@@ -114,10 +114,10 @@ void SwFntCache::Flush( )
/*************************************************************************
|*
-|* SwFntObj::SwFntObj(), ~SwFntObj()
+|* SwFntObj::SwFntObj(), ~SwFntObj()
|*
-|* Ersterstellung AMA 7. Nov. 94
-|* Letzte Aenderung AMA 7. Nov. 94
+|* Ersterstellung AMA 7. Nov. 94
+|* Letzte Aenderung AMA 7. Nov. 94
|*
|*************************************************************************/
@@ -292,11 +292,11 @@ void lcl_calcLinePos( const CalcLinePosData &rData,
*
* USHORT SwFntObj::GetFontAscent( const OutputDevice& rOut )
*
- * Ersterstellung AMA 7. Nov. 94
- * Letzte Aenderung AMA 7. Nov. 94
+ * Ersterstellung AMA 7. Nov. 94
+ * Letzte Aenderung AMA 7. Nov. 94
*
* Beschreibung: liefern den Ascent des Fonts auf dem
- * gewuenschten Outputdevice zurueck, ggf. muss der Bildschirmfont erst
+ * gewuenschten Outputdevice zurueck, ggf. muss der Bildschirmfont erst
* erzeugt werden.
*************************************************************************/
@@ -424,8 +424,8 @@ USHORT SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& rOut
*
* SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut )
*
- * Ersterstellung AMA 7. Nov. 94
- * Letzte Aenderung AMA 7. Nov. 94
+ * Ersterstellung AMA 7. Nov. 94
+ * Letzte Aenderung AMA 7. Nov. 94
*
* pOut is the output device, not the reference device
*
@@ -601,10 +601,10 @@ void SwFntObj::GuessLeading( const ViewShell&
/*************************************************************************
*
- * void SwFntObj::SetDeviceFont( const OutputDevice *pOut ),
+ * void SwFntObj::SetDeviceFont( const OutputDevice *pOut ),
*
- * Ersterstellung AMA 7. Nov. 94
- * Letzte Aenderung AMA 7. Nov. 94
+ * Ersterstellung AMA 7. Nov. 94
+ * Letzte Aenderung AMA 7. Nov. 94
*
* Beschreibung: stellt den Font am gewuenschten OutputDevice ein,
* am Bildschirm muss eventuell erst den Abgleich durchgefuehrt werden.
@@ -643,13 +643,13 @@ void SwFntObj::SetDevFont( const ViewShell *pSh, OutputDevice& rOut )
*
* void SwFntObj::DrawText( ... )
*
- * Ersterstellung AMA 16. Dez. 94
- * Letzte Aenderung AMA 16. Dez. 94
+ * Ersterstellung AMA 16. Dez. 94
+ * Letzte Aenderung AMA 16. Dez. 94
*
* Beschreibung: Textausgabe
- * auf dem Bildschirm => DrawTextArray
- * auf dem Drucker, !Kerning => DrawText
- * auf dem Drucker + Kerning => DrawStretchText
+ * auf dem Bildschirm => DrawTextArray
+ * auf dem Drucker, !Kerning => DrawText
+ * auf dem Drucker + Kerning => DrawStretchText
*
*************************************************************************/
@@ -1866,11 +1866,11 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
/*************************************************************************
*
- * Size SwFntObj::GetTextSize( const OutputDevice *pOut, const String &rTxt,
- * const USHORT nIdx, const USHORT nLen, const short nKern = 0 );
+ * Size SwFntObj::GetTextSize( const OutputDevice *pOut, const String &rTxt,
+ * const USHORT nIdx, const USHORT nLen, const short nKern = 0 );
*
- * Ersterstellung AMA 16. Dez. 94
- * Letzte Aenderung AMA 16. Dez. 94
+ * Ersterstellung AMA 16. Dez. 94
+ * Letzte Aenderung AMA 16. Dez. 94
*
* Beschreibung: ermittelt die TextSize (des Druckers)
*
@@ -1973,7 +1973,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
rInf.GetScriptInfo()->CountCompChg() &&
lcl_IsMonoSpaceFont( rInf.GetOut() );
- OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
+ OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
CountCompChg()), "Compression without info" );
// This is the part used e.g., for cursor travelling
@@ -2295,10 +2295,10 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
/*************************************************************************
|*
-|* SwFntAccess::SwFntAccess()
+|* SwFntAccess::SwFntAccess()
|*
-|* Ersterstellung AMA 9. Nov. 94
-|* Letzte Aenderung AMA 9. Nov. 94
+|* Ersterstellung AMA 9. Nov. 94
+|* Letzte Aenderung AMA 9. Nov. 94
|*
|*************************************************************************/
@@ -2345,7 +2345,7 @@ SwFntAccess::SwFntAccess( const void* &rMagic,
((SwSubFont*)pOwn)->GetPropWidth() )
return; // Die Ueberpruefung ergab: Drucker+Zoom okay.
pFntObj->Unlock( ); // Vergiss dies Objekt, es wurde leider
- pObj = NULL; // eine Drucker/Zoomaenderung festgestellt.
+ pObj = NULL; // eine Drucker/Zoomaenderung festgestellt.
}
// Search by font comparison, quite expensive!
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 38d69deb2c63..fb8025fd5faf 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::i18n;
#define KAPITAELCHENPROP 80
/*************************************************************************
- * class SwCapitalInfo
+ * class SwCapitalInfo
*
* The information encapsulated in SwCapitalInfo is required
* by the ::Do functions. They contain the information about
@@ -70,7 +70,7 @@ public:
};
/*************************************************************************
- * xub_StrLen lcl_CalcCaseMap()
+ * xub_StrLen lcl_CalcCaseMap()
*
* rFnt: required for CalcCaseMap
* rOrigString: The original string
@@ -114,7 +114,7 @@ xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt,
}
/*************************************************************************
- * class SwDoCapitals
+ * class SwDoCapitals
*************************************************************************/
class SwDoCapitals
@@ -134,7 +134,7 @@ public:
};
/*************************************************************************
- * class SwDoGetCapitalSize
+ * class SwDoGetCapitalSize
*************************************************************************/
class SwDoGetCapitalSize : public SwDoCapitals
@@ -162,7 +162,7 @@ void SwDoGetCapitalSize::Do()
}
/*************************************************************************
- * SwSubFont::GetCapitalSize()
+ * SwSubFont::GetCapitalSize()
*************************************************************************/
Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
@@ -189,7 +189,7 @@ Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
}
/*************************************************************************
- * class SwDoGetCapitalBreak
+ * class SwDoGetCapitalBreak
*************************************************************************/
class SwDoGetCapitalBreak : public SwDoCapitals
@@ -254,12 +254,12 @@ void SwDoGetCapitalBreak::Do()
}
/*************************************************************************
- * SwFont::GetCapitalBreak()
+ * SwFont::GetCapitalBreak()
*************************************************************************/
xub_StrLen SwFont::GetCapitalBreak( ViewShell* pSh, const OutputDevice* pOut,
const SwScriptInfo* pScript, const XubString& rTxt, long nTextWidth,
- xub_StrLen *pExtra, const xub_StrLen nIdx, const xub_StrLen nLen )
+ xub_StrLen *pExtra, const xub_StrLen nIdx, const xub_StrLen nLen )
{
// Start:
Point aPos( 0, 0 );
@@ -281,7 +281,7 @@ xub_StrLen SwFont::GetCapitalBreak( ViewShell* pSh, const OutputDevice* pOut,
}
/*************************************************************************
- * class SwDoDrawCapital
+ * class SwDoDrawCapital
*************************************************************************/
class SwDoDrawCapital : public SwDoCapitals
@@ -325,7 +325,7 @@ void SwDoDrawCapital::Do()
}
/*************************************************************************
- * SwDoDrawCapital::DrawSpace()
+ * SwDoDrawCapital::DrawSpace()
*************************************************************************/
void SwDoDrawCapital::DrawSpace( Point &rPos )
@@ -362,7 +362,7 @@ void SwDoDrawCapital::DrawSpace( Point &rPos )
}
/*************************************************************************
- * SwSubFont::DrawCapital()
+ * SwSubFont::DrawCapital()
*************************************************************************/
void SwSubFont::DrawCapital( SwDrawTextInfo &rInf )
@@ -377,7 +377,7 @@ void SwSubFont::DrawCapital( SwDrawTextInfo &rInf )
}
/*************************************************************************
- * class SwDoDrawCapital
+ * class SwDoDrawCapital
*************************************************************************/
class SwDoCapitalCrsrOfst : public SwDoCapitals
@@ -442,7 +442,7 @@ void SwDoCapitalCrsrOfst::Do()
}
/*************************************************************************
- * SwSubFont::GetCapitalCrsrOfst()
+ * SwSubFont::GetCapitalCrsrOfst()
*************************************************************************/
xub_StrLen SwSubFont::GetCapitalCrsrOfst( SwDrawTextInfo& rInf )
@@ -459,7 +459,7 @@ xub_StrLen SwSubFont::GetCapitalCrsrOfst( SwDrawTextInfo& rInf )
}
/*************************************************************************
- * class SwDoDrawStretchCapital
+ * class SwDoDrawStretchCapital
*************************************************************************/
class SwDoDrawStretchCapital : public SwDoDrawCapital
@@ -479,7 +479,7 @@ public:
};
/*************************************************************************
- * SwDoDrawStretchCapital
+ * SwDoDrawStretchCapital
*************************************************************************/
void SwDoDrawStretchCapital::Do()
@@ -524,7 +524,7 @@ void SwDoDrawStretchCapital::Do()
}
/*************************************************************************
- * SwSubFont::DrawStretchCapital()
+ * SwSubFont::DrawStretchCapital()
*************************************************************************/
void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf )
@@ -547,7 +547,7 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf )
}
/*************************************************************************
- * SwSubFont::DoOnCapitals() const
+ * SwSubFont::DoOnCapitals() const
*************************************************************************/
// JP 22.8.2001 - global optimization off - Bug 91245 / 91223
@@ -832,7 +832,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
if ( bWordWise )
delete pSpaceFontAccess;
}
- pLastFont = pOldLast;
+ pLastFont = pOldLast;
pLastFont->SetDevFont( rDo.GetInf().GetShell(), rDo.GetOut() );
delete pSmallFontAccess;
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx
index 8d4940b1ec67..67687d27d497 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
namespace ModelToViewHelper
{
-
+
/** Converts a model position into a view position
*/
sal_uInt32 ConvertToViewPosition( const ConversionMap* pMap, sal_uInt32 nModelPos )
@@ -59,7 +59,7 @@ sal_uInt32 ConvertToViewPosition( const ConversionMap* pMap, sal_uInt32 nModelPo
return nRet;
}
-
+
/** Converts a view position into a model position
*/
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 48293a96584f..9a76e6ffa92c 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -2,7 +2,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
@@ -96,7 +96,7 @@ inline BOOL IsEqual( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
// unser SEEK_PTR_TO_OBJECT_NOTL( name,ArrElement )
// Sortierreihenfolge: Start, Ende (umgekehrt!), Which-Wert (umgekehrt!),
-// als letztes die Adresse selbst
+// als letztes die Adresse selbst
static BOOL lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a242e6cd8633..62caad92a37b 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@
#include <ndtxt.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <pam.hxx> // fuer SwPosition
+#include <pam.hxx> // fuer SwPosition
#include <fldbas.hxx>
#include <errhdl.hxx>
#include <paratr.hxx>
@@ -72,9 +72,9 @@
#include <ftnfrm.hxx>
#include <ftnboss.hxx>
#include <rootfrm.hxx>
-#include <pagedesc.hxx> // fuer SwPageDesc
-#include <expfld.hxx> // fuer SwTblField
-#include <section.hxx> // fuer SwSection
+#include <pagedesc.hxx> // fuer SwPageDesc
+#include <expfld.hxx> // fuer SwTblField
+#include <section.hxx> // fuer SwSection
#include <mvsave.hxx>
#include <swcache.hxx>
#include <SwGrammarMarkUp.hxx>
@@ -180,7 +180,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
if( !GoPrevSection( &aTmp, TRUE, FALSE ) ||
aTmp.GetNode().FindTableNode() !=
pNode->FindTableNode() )
- return pNode; // schade, das wars
+ return pNode; // schade, das wars
}
else
aTmp = *pNd->StartOfSectionNode();
@@ -284,7 +284,7 @@ xub_StrLen SwTxtNode::Len() const
/*---------------------------------------------------------------------------
* lcl_ChangeFtnRef
- * After a split node, it's necessary to actualize the ref-pointer of the
+ * After a split node, it's necessary to actualize the ref-pointer of the
* ftnfrms.
* --------------------------------------------------------------------------*/
@@ -395,11 +395,11 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
if ( GetDepends() && m_Text.Len() && (nTxtLen / 2) < nSplitPos )
{
// JP 25.04.95: Optimierung fuer SplitNode:
-// Wird am Ende vom Node gesplittet, dann verschiebe die
-// Frames vom akt. auf den neuen und erzeuge fuer den akt.
-// neue. Dadurch entfaellt das neu aufbauen vom Layout.
+// Wird am Ende vom Node gesplittet, dann verschiebe die
+// Frames vom akt. auf den neuen und erzeuge fuer den akt.
+// neue. Dadurch entfaellt das neu aufbauen vom Layout.
- LockModify(); // Benachrichtigungen abschalten
+ LockModify(); // Benachrichtigungen abschalten
// werden FlyFrames mit verschoben, so muessen diese nicht ihre
// Frames zerstoeren. Im SwTxtFly::SetAnchor wird es abgefragt!
@@ -449,7 +449,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
// alle zeichengebundenen Rahmen, die im neuen Absatz laden
// muessen aus den alten Frame entfernt werden:
// JP 01.10.96: alle leeren und nicht zu expandierenden
- // Attribute loeschen
+ // Attribute loeschen
if ( HasHints() )
{
for ( USHORT j = m_pSwpHints->Count(); j; )
@@ -497,7 +497,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
SetInCache( FALSE );
}
- UnlockModify(); // Benachrichtigungen wieder freischalten
+ UnlockModify(); // Benachrichtigungen wieder freischalten
const SwRootFrm * const pRootFrm = pNode->GetDoc()->GetRootFrm();
// If there is an accessible layout we must call modify even
@@ -523,7 +523,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
{
MoveTxtAttr_To_AttrSet();
}
- pNode->MakeFrms( *this ); // neue Frames anlegen.
+ pNode->MakeFrms( *this ); // neue Frames anlegen.
lcl_ChangeFtnRef( *this );
}
else
@@ -547,7 +547,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
CutText( pNode, aIdx, nSplitPos );
// JP 01.10.96: alle leeren und nicht zu expandierenden
- // Attribute loeschen
+ // Attribute loeschen
if ( HasHints() )
{
for ( USHORT j = m_pSwpHints->Count(); j; )
@@ -585,7 +585,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
if ( GetDepends() )
{
- MakeFrms( *pNode ); // neue Frames anlegen.
+ MakeFrms( *pNode ); // neue Frames anlegen.
}
lcl_ChangeFtnRef( *pNode );
}
@@ -1257,7 +1257,7 @@ SwTxtNode::GetTxtAttrAt(xub_StrLen const nIndex, RES_TXTATR const nWhich,
}
/*************************************************************************
- * CopyHint()
+ * CopyHint()
*************************************************************************/
SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const XubString& rName )
@@ -1371,8 +1371,8 @@ void lcl_CopyHint( const USHORT nWhich, const SwTxtAttr * const pHt,
}
}
//JP 24.04.98: Bug 49753 - ein TextNode muss am Attribut
- // gesetzt sein, damit die Vorlagen erzeugt
- // werden koenne
+ // gesetzt sein, damit die Vorlagen erzeugt
+ // werden koenne
SwTxtINetFmt* const pINetHt = static_cast<SwTxtINetFmt*>(pNewHt);
if ( !pINetHt->GetpTxtNode() )
{
@@ -1399,12 +1399,12 @@ void lcl_CopyHint( const USHORT nWhich, const SwTxtAttr * const pHt,
}
/*************************************************************************
-|* SwTxtNode::CopyAttr()
-|* Beschreibung kopiert Attribute an der Position nStart in pDest.
-|* BP 7.6.93: Es werden mit Absicht nur die Attribute _mit_ EndIdx
-|* kopiert! CopyAttr wird vornehmlich dann gerufen,
-|* wenn Attribute fuer einen Node mit leerem String
-|* gesetzt werden sollen.
+|* SwTxtNode::CopyAttr()
+|* Beschreibung kopiert Attribute an der Position nStart in pDest.
+|* BP 7.6.93: Es werden mit Absicht nur die Attribute _mit_ EndIdx
+|* kopiert! CopyAttr wird vornehmlich dann gerufen,
+|* wenn Attribute fuer einen Node mit leerem String
+|* gesetzt werden sollen.
*************************************************************************/
void SwTxtNode::CopyAttr( SwTxtNode *pDest, const xub_StrLen nTxtStartIdx,
@@ -1420,7 +1420,7 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const xub_StrLen nTxtStartIdx,
SwTxtAttr *const pHt = m_pSwpHints->GetTextHint(i);
xub_StrLen const nAttrStartIdx = *pHt->GetStart();
if ( nTxtStartIdx < nAttrStartIdx )
- break; // ueber das Textende, da nLen == 0
+ break; // ueber das Textende, da nLen == 0
const xub_StrLen *const pEndIdx = pHt->GetEnd();
if ( pEndIdx && !pHt->HasDummyChar() )
@@ -1461,9 +1461,9 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const xub_StrLen nTxtStartIdx,
}
/*************************************************************************
-|* SwTxtNode::Copy()
-|* Beschreibung kopiert Zeichen und Attibute in pDest,
-|* wird angehaengt
+|* SwTxtNode::Copy()
+|* Beschreibung kopiert Zeichen und Attibute in pDest,
+|* wird angehaengt
*************************************************************************/
// --> OD 2008-11-18 #i96213#
@@ -1486,7 +1486,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
const bool bForceCopyOfAllAttrs )
{
xub_StrLen nTxtStartIdx = rStart.GetIndex();
- xub_StrLen nDestStart = rDestStart.GetIndex(); // alte Pos merken
+ xub_StrLen nDestStart = rDestStart.GetIndex(); // alte Pos merken
if (pDest->GetDoc()->IsClipBoard() && this->GetNum())
{
@@ -1535,8 +1535,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
// 1. Text kopieren
const xub_StrLen oldLen = pDest->m_Text.Len();
//JP 15.02.96: Bug 25537 - Attributbehandlung am Ende fehlt! Darum
- // ueber die InsertMethode den Text einfuegen und nicht
- // selbst direkt
+ // ueber die InsertMethode den Text einfuegen und nicht
+ // selbst direkt
pDest->InsertText( m_Text.Copy( nTxtStartIdx, nLen ), rDestStart,
IDocumentContentOperations::INS_EMPTYEXPAND );
@@ -1610,11 +1610,11 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
const USHORT nWhich = pHt->Which();
// JP 26.04.94: REFMARK's werden nie kopiert. Hat das Refmark aber
- // keinen Bereich umspannt, so steht im Text ein 255
- // dieses muss entfernt werden. Trick: erst kopieren,
- // erkennen und sammeln, nach dem kopieren Loeschen.
- // Nimmt sein Zeichen mit ins Grab !!
- // JP 14.08.95: Duerfen RefMarks gemovt werden?
+ // keinen Bereich umspannt, so steht im Text ein 255
+ // dieses muss entfernt werden. Trick: erst kopieren,
+ // erkennen und sammeln, nach dem kopieren Loeschen.
+ // Nimmt sein Zeichen mit ins Grab !!
+ // JP 14.08.95: Duerfen RefMarks gemovt werden?
int bCopyRefMark = RES_TXTATR_REFMARK == nWhich && ( bUndoNodes ||
(!pOtherDoc ? GetDoc()->IsCopyIsMove()
: 0 == pOtherDoc->GetRefMark(
@@ -1825,11 +1825,11 @@ void SwTxtNode::InsertText( const XubString & rStr, const SwIndex & rIdx,
/*************************************************************************
|*
-|* SwTxtNode::Cut()
+|* SwTxtNode::Cut()
|*
-|* Beschreibung text.doc
-|* Ersterstellung VB 20.03.91
-|* Letzte Aenderung JP 11.08.94
+|* Beschreibung text.doc
+|* Ersterstellung VB 20.03.91
+|* Letzte Aenderung JP 11.08.94
|*
*************************************************************************/
@@ -1880,7 +1880,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
}
xub_StrLen nTxtStartIdx = rStart.GetIndex();
- xub_StrLen nDestStart = rDestStart.GetIndex(); // alte Pos merken
+ xub_StrLen nDestStart = rDestStart.GetIndex(); // alte Pos merken
const xub_StrLen nInitSize = pDest->m_Text.Len();
// wird in sich selbst verschoben, muss es gesondert behandelt werden !!
@@ -1938,7 +1938,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
if( pEndIdx )
*pHt->GetEnd() = *pEndIdx - nTxtStartIdx;
aArr.C40_INSERT( SwTxtAttr, pHt, aArr.Count() );
- continue; // while-Schleife weiter, ohne ++ !
+ continue; // while-Schleife weiter, ohne ++ !
}
// das Ende liegt dahinter
else if (RES_TXTATR_REFMARK != nWhich && !pHt->HasDummyChar())
@@ -2016,7 +2016,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
pDest->m_Text.Insert( m_Text, nTxtStartIdx, nLen, nDestStart );
m_Text.Erase( nTxtStartIdx, nLen );
nLen = pDest->m_Text.Len() - nInitSize; // update w/ current size!
- if( !nLen ) // String nicht gewachsen ??
+ if( !nLen ) // String nicht gewachsen ??
return;
if( bUpdate )
@@ -2138,7 +2138,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
{
GetDoc()->GetDocShell()->Broadcast( SfxSimpleHint(SFX_HINT_USER04));
}
- continue; // while-Schleife weiter, ohne ++ !
+ continue; // while-Schleife weiter, ohne ++ !
}
// das Ende liegt dahinter
else if( RES_TXTATR_REFMARK != nWhich || bUndoNodes )
@@ -2166,7 +2166,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
// sollten jetzt noch leere Attribute rumstehen, dann haben diese
// eine hoehere Praezedenz. Also herausholen und das Array updaten.
// Die dabei entstehenden leeren Hints werden von den gesicherten
- // "uebergeplaettet". (Bug: 6977)
+ // "uebergeplaettet". (Bug: 6977)
if( m_pSwpHints && nAttrCnt < m_pSwpHints->Count() )
{
SwpHts aArr( 5 );
@@ -2317,14 +2317,14 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
}
/***********************************************************************
-#* Class : SwTxtNode
-#* Methode : GCAttr
+#* Class : SwTxtNode
+#* Methode : GCAttr
#*
-#* Beschreibung
-#* text.doc
+#* Beschreibung
+#* text.doc
#*
-#* Datum : MS 28.11.90
-#* Update : VB 24.07.91
+#* Datum : MS 28.11.90
+#* Update : VB 24.07.91
#***********************************************************************/
void SwTxtNode::GCAttr()
@@ -2479,7 +2479,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
pNewAttrSet = new SwAttrSet( *GetpSwAttrSet() );
const SfxItemSet* pTmpSet = GetpSwAttrSet();
- if( bNext ) // der naechste erbt keine Breaks!
+ if( bNext ) // der naechste erbt keine Breaks!
pTmpSet = pNewAttrSet;
// PageBreaks/PageDesc/ColBreak rausschmeissen.
@@ -2569,7 +2569,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
// nochmal uebergeplaettet werden !!
if( pColl != pNode->GetTxtColl() ||
( bChgFollow && pColl != GetTxtColl() ))
- return pNode; // mehr duerfte nicht gemacht werden oder ????
+ return pNode; // mehr duerfte nicht gemacht werden oder ????
pNode->_ChgTxtCollUpdateNum( 0, pColl ); // fuer Nummerierung/Gliederung
if( bNext || !bChgFollow )
@@ -2628,7 +2628,7 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
}
/*************************************************************************
- * SwTxtNode::GetTxtAttr
+ * SwTxtNode::GetTxtAttr
*************************************************************************/
SwTxtAttr * SwTxtNode::GetTxtAttrForCharAt( const xub_StrLen nIndex,
@@ -3037,7 +3037,7 @@ BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
const xub_StrLen nAttrStartIdx = *pHt->GetStart();
const USHORT nWhich = pHt->Which();
if (nIdx + nLen <= nAttrStartIdx)
- break; // ueber das Textende
+ break; // ueber das Textende
const xub_StrLen *pEndIdx = pHt->GetEnd();
if( pEndIdx && *pEndIdx > nIdx &&
@@ -3067,7 +3067,7 @@ BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
->ExpandField(GetDoc()->IsClipBoard()));
if( aExpand.Len() )
{
- aDestIdx++; // dahinter einfuegen;
+ aDestIdx++; // dahinter einfuegen;
rDestNd.InsertText( aExpand, aDestIdx );
aDestIdx = nInsPos + nAttrStartIdx;
nInsPos = nInsPos + aExpand.Len();
@@ -3221,11 +3221,11 @@ XubString SwTxtNode::GetRedlineTxt( xub_StrLen nIdx, xub_StrLen nLen,
else
{
aRedlArr.Insert( GetTxt().Len(), aRedlArr.Count() );
- break; // mehr kann nicht kommen
+ break; // mehr kann nicht kommen
}
}
else
- break; // mehr kann nicht kommen
+ break; // mehr kann nicht kommen
}
}
}
@@ -3517,10 +3517,10 @@ void SwTxtNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
m_bNotifiable = false;
// Bug 24616/24617:
- // Modify ueberladen, damit beim Loeschen von Vorlagen diese
- // wieder richtig verwaltet werden (Outline-Numerierung!!)
- // Bug25481:
- // bei Nodes im Undo nie _ChgTxtCollUpdateNum rufen.
+ // Modify ueberladen, damit beim Loeschen von Vorlagen diese
+ // wieder richtig verwaltet werden (Outline-Numerierung!!)
+ // Bug25481:
+ // bei Nodes im Undo nie _ChgTxtCollUpdateNum rufen.
if( pOldValue && pNewValue && RES_FMT_CHG == pOldValue->Which() &&
pRegisteredIn == ((SwFmtChg*)pNewValue)->pChangedFmt &&
GetNodes().IsDocNodes() )
@@ -4260,7 +4260,7 @@ namespace {
{
mbAddTxtNodeToList = true;
// --> OD 2010-05-12 #i105562#
- //
+ //
mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr();
// <--
}
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index 590742575b7d..f4a6a1ce20bd 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -2,7 +2,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
@@ -44,10 +44,10 @@ SwFontCache *pSwFontCache = NULL;
/*************************************************************************
|*
-|* SwFontObj::SwFontObj(), ~SwFontObj()
+|* SwFontObj::SwFontObj(), ~SwFontObj()
|*
-|* Ersterstellung AMA 25. Jun. 95
-|* Letzte Aenderung AMA 25. Jun. 95
+|* Ersterstellung AMA 25. Jun. 95
+|* Letzte Aenderung AMA 25. Jun. 95
|*
|*************************************************************************/
@@ -67,10 +67,10 @@ SwFontObj::~SwFontObj()
/*************************************************************************
|*
-|* SwFontAccess::SwFontAccess()
+|* SwFontAccess::SwFontAccess()
|*
-|* Ersterstellung AMA 25. Jun. 95
-|* Letzte Aenderung AMA 25. Jun. 95
+|* Ersterstellung AMA 25. Jun. 95
+|* Letzte Aenderung AMA 25. Jun. 95
|*
|*************************************************************************/
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 28f483a3f6ae..e7f7620c8a1a 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@
#include <IDocumentSettingAccess.hxx>
#include <vcl/window.hxx>
#include <charatr.hxx>
-#include <viewsh.hxx> // Bildschirmabgleich
+#include <viewsh.hxx> // Bildschirmabgleich
#include <swfont.hxx>
#include <fntcache.hxx> // FontCache
#include <txtfrm.hxx> // SwTxtFrm
@@ -173,12 +173,12 @@ void SwFont::SetVertical( USHORT nDir, const BOOL bVertFormat )
Escapement:
frEsc: Fraction, Grad des Escapements
Esc = resultierendes Escapement
- A1 = Original-Ascent (nOrgAscent)
- A2 = verkleinerter Ascent (nEscAscent)
- Ax = resultierender Ascent (GetAscent())
- H1 = Original-Hoehe (nOrgHeight)
- H2 = verkleinerter Hoehe (nEscHeight)
- Hx = resultierender Hoehe (GetHeight())
+ A1 = Original-Ascent (nOrgAscent)
+ A2 = verkleinerter Ascent (nEscAscent)
+ Ax = resultierender Ascent (GetAscent())
+ H1 = Original-Hoehe (nOrgHeight)
+ H2 = verkleinerter Hoehe (nEscHeight)
+ Hx = resultierender Hoehe (GetHeight())
Bx = resultierende Baseline fuer die Textausgabe (CalcPos())
(Vorsicht: Y - A1!)
@@ -198,7 +198,7 @@ void SwFont::SetVertical( USHORT nDir, const BOOL bVertFormat )
*************************************************************************/
/*************************************************************************
- * SwSubFont::CalcEscAscent( const USHORT nOldAscent )
+ * SwSubFont::CalcEscAscent( const USHORT nOldAscent )
*************************************************************************/
// nEsc ist der Prozentwert
@@ -423,7 +423,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
}
/*************************************************************************
- * class SwFont
+ * class SwFont
*************************************************************************/
SwFont::SwFont( const SwFont &rFont )
@@ -600,7 +600,7 @@ SwFont& SwFont::operator=( const SwFont &rFont )
}
/*************************************************************************
- * SwFont::GoMagic()
+ * SwFont::GoMagic()
*************************************************************************/
void SwFont::GoMagic( ViewShell *pSh, BYTE nWhich )
@@ -610,7 +610,7 @@ void SwFont::GoMagic( ViewShell *pSh, BYTE nWhich )
}
/*************************************************************************
- * SwSubFont::IsSymbol()
+ * SwSubFont::IsSymbol()
*************************************************************************/
BOOL SwSubFont::IsSymbol( ViewShell *pSh )
@@ -620,7 +620,7 @@ BOOL SwSubFont::IsSymbol( ViewShell *pSh )
}
/*************************************************************************
- * SwSubFont::ChgFnt()
+ * SwSubFont::ChgFnt()
*************************************************************************/
BOOL SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut )
@@ -641,7 +641,7 @@ BOOL SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut )
}
/*************************************************************************
- * SwFont::ChgPhysFnt()
+ * SwFont::ChgPhysFnt()
*************************************************************************/
void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut )
@@ -671,11 +671,11 @@ void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut )
}
/*************************************************************************
- * SwFont::CalcEscHeight()
+ * SwFont::CalcEscHeight()
* Height = MaxAscent + MaxDescent
* MaxAscent = Max (T1_ascent, T2_ascent + (Esc * T1_height) );
* MaxDescent = Max (T1_height-T1_ascent,
- * T2_height-T2_ascent - (Esc * T1_height)
+ * T2_height-T2_ascent - (Esc * T1_height)
*************************************************************************/
USHORT SwSubFont::CalcEscHeight( const USHORT nOldHeight,
@@ -717,7 +717,7 @@ USHORT SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut )
}
/*************************************************************************
- * SwSubFont::GetHeight()
+ * SwSubFont::GetHeight()
*************************************************************************/
USHORT SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut )
@@ -734,7 +734,7 @@ USHORT SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut )
}
/*************************************************************************
- * SwSubFont::_GetTxtSize()
+ * SwSubFont::_GetTxtSize()
*************************************************************************/
Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
{
@@ -836,7 +836,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
}
/*************************************************************************
- * SwSubFont::_DrawText()
+ * SwSubFont::_DrawText()
*************************************************************************/
void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const BOOL bGrey )
@@ -1054,7 +1054,7 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
}
/*************************************************************************
- * SwSubFont::_GetCrsrOfst()
+ * SwSubFont::_GetCrsrOfst()
*************************************************************************/
xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index a04fd4ea2404..f2961715466a 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2,7 +2,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
@@ -71,7 +71,7 @@
#include <pam.hxx>
#include <ndtxt.hxx>
#include <txtfrm.hxx>
-#include <rolbck.hxx> // fuer SwRegHistory
+#include <rolbck.hxx> // fuer SwRegHistory
#include <ddefld.hxx>
#include <docufld.hxx>
#include <expfld.hxx>
@@ -962,7 +962,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
}
/*************************************************************************
- * SwTxtNode::MakeTxtAttr()
+ * SwTxtNode::MakeTxtAttr()
*************************************************************************/
SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem & rAttr )
@@ -1116,7 +1116,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
// siehe auch die Anmerkung "Loeschen von Formaten
// zeichengebundener Frames" in fesh.cxx, SwFEShell::DelFmt()
SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
- if( pFmt ) // vom Undo auf 0 gesetzt ??
+ if( pFmt ) // vom Undo auf 0 gesetzt ??
pDoc->DelLayoutFmt( (SwFlyFrmFmt*)pFmt );
}
break;
@@ -1201,7 +1201,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
}
/*************************************************************************
- * SwTxtNode::Insert()
+ * SwTxtNode::Insert()
*************************************************************************/
SwTxtAttr*
@@ -1589,7 +1589,7 @@ void SwTxtNode::DeleteAttributes( const USHORT nWhich,
SwUpdateAttr aHint( nStart, *pEndIdx, nWhich );
m_pSwpHints->DeleteAtPos( nPos ); // gefunden, loeschen,
SwTxtAttr::Destroy( pTxtHt, GetDoc()->GetAttrPool() );
- SwModify::Modify( 0, &aHint ); // die Frames benachrichtigen
+ SwModify::Modify( 0, &aHint ); // die Frames benachrichtigen
}
}
}
@@ -1597,7 +1597,7 @@ void SwTxtNode::DeleteAttributes( const USHORT nWhich,
}
/*************************************************************************
- * SwTxtNode::DelSoftHyph()
+ * SwTxtNode::DelSoftHyph()
*************************************************************************/
void SwTxtNode::DelSoftHyph( const xub_StrLen nStt, const xub_StrLen nEnd )
@@ -1795,10 +1795,10 @@ void lcl_MergeAttr_ExpandChrFmt( SfxItemSet& rSet, const SfxPoolItem& rAttr )
/* wenn mehrere Attribute ueberlappen gewinnt der letze !!
z.B
1234567890123456789
- |------------| Font1
- |------| Font2
+ |------------| Font1
+ |------| Font2
^ ^
- |--| Abfragebereich: -> Gueltig ist Font2
+ |--| Abfragebereich: -> Gueltig ist Font2
*/
rSet.Put( rAttr );
}
@@ -1843,14 +1843,14 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
{
/* stelle erstmal fest, welche Text-Attribut in dem Bereich gueltig
* sind. Dabei gibt es folgende Faelle:
- * UnEindeutig wenn: (wenn != Format-Attribut)
- * - das Attribut liegt vollstaendig im Bereich
- * - das Attributende liegt im Bereich
- * - der Attributanfang liegt im Bereich:
+ * UnEindeutig wenn: (wenn != Format-Attribut)
+ * - das Attribut liegt vollstaendig im Bereich
+ * - das Attributende liegt im Bereich
+ * - der Attributanfang liegt im Bereich:
* Eindeutig (im Set mergen):
- * - das Attrib umfasst den Bereich
+ * - das Attrib umfasst den Bereich
* nichts tun:
- * das Attribut liegt ausserhalb des Bereiches
+ * das Attribut liegt ausserhalb des Bereiches
*/
void (*fnMergeAttr)( SfxItemSet&, const SfxPoolItem& )
@@ -1878,7 +1878,7 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
{
const SwTxtAttr* pHt = (*m_pSwpHints)[n];
const xub_StrLen nAttrStart = *pHt->GetStart();
- if( nAttrStart > nEnd ) // ueber den Bereich hinaus
+ if( nAttrStart > nEnd ) // ueber den Bereich hinaus
break;
const xub_StrLen* pAttrEnd = pHt->GetEnd();
@@ -1893,7 +1893,7 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
(*fnMergeAttr)( rSet, pHt->GetAttr() );
}
}
- else // es ist ein Bereich definiert
+ else // es ist ein Bereich definiert
{
// --> FME 2007-03-13 #i75299#
::std::auto_ptr< std::vector< SwPoolItemEndPair > > pAttrArr;
@@ -1906,7 +1906,7 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
{
const SwTxtAttr* pHt = (*m_pSwpHints)[n];
const xub_StrLen nAttrStart = *pHt->GetStart();
- if( nAttrStart > nEnd ) // ueber den Bereich hinaus
+ if( nAttrStart > nEnd ) // ueber den Bereich hinaus
break;
const xub_StrLen* pAttrEnd = pHt->GetEnd();
@@ -1919,15 +1919,15 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
if( *pAttrEnd <= nStt ) // liegt davor
continue;
- if( nEnd <= *pAttrEnd ) // hinter oder genau Ende
+ if( nEnd <= *pAttrEnd ) // hinter oder genau Ende
(*fnMergeAttr)( aFmtSet, pHt->GetAttr() );
else
-// else if( pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
+// else if( pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
// uneindeutig
bChkInvalid = TRUE;
}
- else if( nAttrStart < nEnd // reicht in den Bereich
-)// && pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
+ else if( nAttrStart < nEnd // reicht in den Bereich
+)// && pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
bChkInvalid = TRUE;
if( bChkInvalid )
@@ -2352,7 +2352,7 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd )
}
/*************************************************************************
- * SwpHints::CalcFlags()
+ * SwpHints::CalcFlags()
*************************************************************************/
void SwpHints::CalcFlags()
@@ -2385,7 +2385,7 @@ void SwpHints::CalcFlags()
}
/*************************************************************************
- * SwpHints::CalcVisibleFlag()
+ * SwpHints::CalcVisibleFlag()
*************************************************************************/
bool SwpHints::CalcHiddenParaField()
@@ -2393,7 +2393,7 @@ bool SwpHints::CalcHiddenParaField()
m_bCalcHiddenParaField = false;
bool bOldHasHiddenParaField = m_bHasHiddenParaField;
bool bNewHasHiddenParaField = false;
- const USHORT nSize = Count();
+ const USHORT nSize = Count();
const SwTxtAttr *pTxtHt;
for( USHORT nPos = 0; nPos < nSize; ++nPos )
@@ -2424,7 +2424,7 @@ bool SwpHints::CalcHiddenParaField()
/*************************************************************************
- * SwpHints::NoteInHistory()
+ * SwpHints::NoteInHistory()
*************************************************************************/
void SwpHints::NoteInHistory( SwTxtAttr *pAttr, const bool bNew )
@@ -2580,7 +2580,7 @@ void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharFmt )
}
/*************************************************************************
- * SwpHints::Insert()
+ * SwpHints::Insert()
*************************************************************************/
/*
@@ -2602,7 +2602,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
// Felder bilden eine Ausnahme:
// 1) Sie koennen nie ueberlappen
// 2) Wenn zwei Felder genau aneinander liegen,
- // sollen sie nicht zu einem verschmolzen werden.
+ // sollen sie nicht zu einem verschmolzen werden.
// Wir koennen also auf die while-Schleife verzichten
xub_StrLen *pHtEnd = pHint->GetEnd();
@@ -2735,12 +2735,12 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
switch( eCmp )
{
case POS_BEFORE:
- case POS_BEHIND: bDelOld = FALSE; break;
+ case POS_BEHIND: bDelOld = FALSE; break;
- case POS_OUTSIDE: bChgStart = bChgEnd = TRUE; break;
+ case POS_OUTSIDE: bChgStart = bChgEnd = TRUE; break;
case POS_COLLIDE_END:
- case POS_OVERLAP_BEFORE: bChgStart = TRUE; break;
+ case POS_OVERLAP_BEFORE: bChgStart = TRUE; break;
case POS_COLLIDE_START:
case POS_OVERLAP_BEHIND: bChgEnd = TRUE; break;
default: break;
@@ -2893,7 +2893,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
}
/*************************************************************************
- * SwpHints::DeleteAtPos()
+ * SwpHints::DeleteAtPos()
*************************************************************************/
void SwpHints::DeleteAtPos( const USHORT nPos )
diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx
index ae370d5afe42..50396024549c 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index 9122b2d42e08..e59b4a05f1b9 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -2,7 +2,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
@@ -185,7 +185,7 @@ void SwTxtAttrIterator::SearchNextChg()
{
aSIter.Next();
pParaItem = 0;
- nAttrPos = 0; // must be restart at the beginning, because
+ nAttrPos = 0; // must be restart at the beginning, because
// some attributes can start before or inside
// the current scripttype!
aStack.Remove( 0, aStack.Count() );
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 0e4434679d7b..de3a16425560 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -2,7 +2,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
@@ -40,8 +40,8 @@
#include <fmtinfmt.hxx>
#include <charfmt.hxx>
#include <ndtxt.hxx> // SwCharFmt, SwTxtNode
-#include <poolfmt.hxx> // RES_POOLCHR_INET_...
-#include <doc.hxx> // SwDoc
+#include <poolfmt.hxx> // RES_POOLCHR_INET_...
+#include <doc.hxx> // SwDoc
#include <fmtruby.hxx>
#include <fmtmeta.hxx>
@@ -51,7 +51,7 @@ TYPEINIT1(SwTxtRuby,SwClient);
/*************************************************************************
- * class SwTxtCharFmt
+ * class SwTxtCharFmt
*************************************************************************/
SwTxtCharFmt::SwTxtCharFmt( SwFmtCharFmt& rAttr,
@@ -118,7 +118,7 @@ SwTxtAttrNesting::~SwTxtAttrNesting()
/*************************************************************************
- * class SwTxtINetFmt
+ * class SwTxtINetFmt
*************************************************************************/
SwTxtINetFmt::SwTxtINetFmt( SwFmtINetFmt& rAttr,
@@ -159,7 +159,7 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
nId = static_cast<USHORT>(IsVisited() ? RES_POOLCHR_INET_VISIT : RES_POOLCHR_INET_NORMAL);
// JP 10.02.2000, Bug 72806: dont modify the doc for getting the
- // correct charstyle.
+ // correct charstyle.
BOOL bResetMod = !pDoc->IsModified();
Link aOle2Lnk;
if( bResetMod )
@@ -220,7 +220,7 @@ BOOL SwTxtINetFmt::IsProtect( ) const
}
/*************************************************************************
- * class SwTxtRuby
+ * class SwTxtRuby
*************************************************************************/
SwTxtRuby::SwTxtRuby( SwFmtRuby& rAttr,
@@ -276,7 +276,7 @@ SwCharFmt* SwTxtRuby::GetCharFmt()
nId = rFmt.GetCharFmtId();
// JP 10.02.2000, Bug 72806: dont modify the doc for getting the
- // correct charstyle.
+ // correct charstyle.
BOOL bResetMod = !pDoc->IsModified();
Link aOle2Lnk;
if( bResetMod )
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 8ba83e61ddf5..cc03200ad775 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -32,9 +32,9 @@
// So kann man die Linguistik-Statistik ( (Tmp-Path)\swlingu.stk ) aktivieren:
//#define LINGU_STATISTIK
#ifdef LINGU_STATISTIK
- #include <stdio.h> // in SwLinguStatistik::DTOR
- #include <stdlib.h> // getenv()
- #include <time.h> // clock()
+ #include <stdio.h> // in SwLinguStatistik::DTOR
+ #include <stdlib.h> // getenv()
+ #include <time.h> // clock()
#include <tools/stream.hxx>
#endif
@@ -55,7 +55,7 @@
#include <splargs.hxx>
#include <viewopt.hxx>
#include <acmplwrd.hxx>
-#include <doc.hxx> // GetDoc()
+#include <doc.hxx> // GetDoc()
#include <docsh.hxx>
#include <txtfld.hxx>
#include <fmtfld.hxx>
@@ -73,8 +73,8 @@
#include <crstate.hxx>
#include <undobj.hxx>
#include <txatritr.hxx>
-#include <redline.hxx> // SwRedline
-#include <docary.hxx> // SwRedlineTbl
+#include <redline.hxx> // SwRedline
+#include <docary.hxx> // SwRedlineTbl
#include <scriptinfo.hxx>
#include <docstat.hxx>
#include <editsh.hxx>
@@ -410,7 +410,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
xub_StrLen nAttrStart;
SwTxtAttr *pHt;
- BOOL bChanged = FALSE;
+ BOOL bChanged = FALSE;
// nMin and nMax initialized to maximum / minimum (inverse)
xub_StrLen nMin = m_Text.Len();
@@ -493,7 +493,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
// Falls wir nur ein nichtaufgespanntes Attribut entfernen,
// tun wir mal so, als ob sich nichts geaendert hat.
bChanged = bChanged || nEnd > nAttrStart || bNoLen;
- if( *pAttrEnd <= nEnd ) // Fall: 1
+ if( *pAttrEnd <= nEnd ) // Fall: 1
{
const xub_StrLen nAttrEnd = *pAttrEnd;
@@ -522,7 +522,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
continue;
}
- else // Fall: 3
+ else // Fall: 3
{
m_pSwpHints->NoteInHistory( pHt );
*pHt->GetStart() = nEnd;
@@ -539,10 +539,10 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
}
}
}
- else // Faelle: 2,4,5
+ else // Faelle: 2,4,5
if( *pAttrEnd > nStt ) // Faelle: 2,4
{
- if( *pAttrEnd < nEnd ) // Fall: 2
+ if( *pAttrEnd < nEnd ) // Fall: 2
{
if ( nMin > nAttrStart )
nMin = nAttrStart;
@@ -563,8 +563,8 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
InsertHint( pNew, nsSetAttrMode::SETATTR_NOHINTADJUST );
}
}
- else if( nLen ) // Fall: 4
- { // bei Lange 0 werden beide Hints vom Insert(Ht)
+ else if( nLen ) // Fall: 4
+ { // bei Lange 0 werden beide Hints vom Insert(Ht)
// wieder zu einem zusammengezogen !!!!
if ( nMin > nAttrStart )
nMin = nAttrStart;
@@ -622,7 +622,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
}
/*************************************************************************
- * SwTxtNode::GetCurWord()
+ * SwTxtNode::GetCurWord()
*
* Aktuelles Wort zurueckliefern:
* Wir suchen immer von links nach rechts, es wird also das Wort
@@ -1058,7 +1058,7 @@ USHORT SwTxtNode::Convert( SwConversionArgs &rArgs )
}
nBegin = nChPos; // start of next language portion
}
- } while (!bFound && aIter.Next()); /* loop while nothing was found and still sth is left to be searched */
+ } while (!bFound && aIter.Next()); /* loop while nothing was found and still sth is left to be searched */
}
// keep resulting text within selection / range of text to be converted
@@ -1448,7 +1448,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, xub_StrLen nActPos )
}
/*************************************************************************
- * SwTxtNode::Hyphenate
+ * SwTxtNode::Hyphenate
*************************************************************************/
// Findet den TxtFrm und sucht dessen CalcHyph
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx
index f26b663e7de8..9db43b4ee85b 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 24607494d7de..7bb38c30d814 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index f054abe32e71..d123f7514b28 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index bb80176b7e6f..893cb248bf7a 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/SwUndoTOXChange.cxx b/sw/source/core/undo/SwUndoTOXChange.cxx
index f4f55422e809..a6d56fce5ad0 100644
--- a/sw/source/core/undo/SwUndoTOXChange.cxx
+++ b/sw/source/core/undo/SwUndoTOXChange.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ void SwUndoTOXChange::UpdateTOXBaseSection()
if (pTOX->ISA(SwTOXBaseSection))
{
SwTOXBaseSection * pTOXBase = static_cast<SwTOXBaseSection *>(pTOX);
-
+
pTOXBase->Update();
pTOXBase->UpdatePageNum();
}
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 79f0ac2adfc9..ec1c0e68750f 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <doc.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <undobj.hxx>
#include <rolbck.hxx>
#include <docary.hxx>
@@ -45,7 +45,7 @@
using namespace ::com::sun::star;
-USHORT SwDoc::nUndoActions = UNDO_ACTION_COUNT; // anzahl von Undo-Action
+USHORT SwDoc::nUndoActions = UNDO_ACTION_COUNT; // anzahl von Undo-Action
// the undo array should never grow beyond this limit:
#define UNDO_ACTION_LIMIT (USHRT_MAX - 1000)
@@ -161,10 +161,10 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
++nUndoPos;
switch( pUndo->GetId() )
{
- case UNDO_START: ++nUndoSttEnd;
+ case UNDO_START: ++nUndoSttEnd;
break;
- case UNDO_END: OSL_ENSURE( nUndoSttEnd, "Undo-Ende ohne Start" );
+ case UNDO_END: OSL_ENSURE( nUndoSttEnd, "Undo-Ende ohne Start" );
--nUndoSttEnd;
// kein break !!!
default:
@@ -191,9 +191,9 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
return;
// folgende Array-Grenzen muessen ueberwacht werden:
- // - Undo, Grenze: fester Wert oder USHRT_MAX - 1000
- // - UndoNodes, Grenze: USHRT_MAX - 1000
- // - AttrHistory Grenze: USHRT_MAX - 1000
+ // - Undo, Grenze: fester Wert oder USHRT_MAX - 1000
+ // - UndoNodes, Grenze: USHRT_MAX - 1000
+ // - AttrHistory Grenze: USHRT_MAX - 1000
// (defined in UNDO_ACTION_LIMIT at the top of this file)
USHORT nEnde = UNDO_ACTION_LIMIT;
@@ -237,7 +237,7 @@ void SwDoc::ClearRedo()
{
if( DoesUndo() && nUndoPos != pUndos->Count() )
{
-//?? why ?? if( !nUndoSttEnd )
+//?? why ?? if( !nUndoSttEnd )
{
// setze UndoCnt auf den neuen Wert
SwUndo* pUndo;
@@ -285,11 +285,11 @@ void SwDoc::DelAllUndoObj()
// loescht alle UndoObjecte vom Anfang bis zum angegebenen Ende
BOOL SwDoc::DelUndoObj( USHORT nEnde )
{
- if( !nEnde ) // sollte mal 0 uebergeben werden,
+ if( !nEnde ) // sollte mal 0 uebergeben werden,
{
if( !pUndos->Count() )
return FALSE;
- ++nEnde; // dann korrigiere es auf 1
+ ++nEnde; // dann korrigiere es auf 1
}
DoUndo( FALSE );
@@ -313,8 +313,8 @@ BOOL SwDoc::DelUndoObj( USHORT nEnde )
"Undo-Del-Ende liegt in einer Redo-Aktion" );
// dann setze ab Ende bis Undo-Ende bei allen Undo-Objecte die Werte um
- nSttEndCnt = nCnt; // Position merken
- if( nUndoSavePos < nSttEndCnt ) // SavePos wird aufgegeben
+ nSttEndCnt = nCnt; // Position merken
+ if( nUndoSavePos < nSttEndCnt ) // SavePos wird aufgegeben
nUndoSavePos = USHRT_MAX;
else if( nUndoSavePos != USHRT_MAX )
nUndoSavePos = nUndoSavePos - nSttEndCnt;
@@ -387,7 +387,7 @@ bool SwDoc::Undo( SwUndoIter& rUndoIter )
// zum spaeteren ueberpruefen
SwUndoId nAktId = pUndo->GetId();
//JP 11.05.98: FlyFormate ueber die EditShell selektieren, nicht aus dem
- // Undo heraus
+ // Undo heraus
switch( nAktId )
{
case UNDO_START:
@@ -416,10 +416,10 @@ bool SwDoc::Undo( SwUndoIter& rUndoIter )
--nUndoPos;
// JP 29.10.96: Start und End setzen kein Modify-Flag.
- // Sonst gibt es Probleme mit der autom. Aufnahme von Ausnahmen
- // bei der Autokorrektur
+ // Sonst gibt es Probleme mit der autom. Aufnahme von Ausnahmen
+ // bei der Autokorrektur
if( UNDO_START != nAktId && UNDO_END != nAktId )
- SetModified(); // default: immer setzen, kann zurueck gesetzt werden
+ SetModified(); // default: immer setzen, kann zurueck gesetzt werden
// ist die History leer und wurde nicht wegen Speichermangel
// verworfen, so kann das Dokument als unveraendert gelten
@@ -489,7 +489,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
while( nSize )
if( UNDO_START == ( nId = (pUndo = (*pUndos)[ --nSize ] )->GetId()) &&
!((SwUndoStart*)pUndo)->GetEndOffset() )
- break; // Start gefunden
+ break; // Start gefunden
if( nId != UNDO_START )
{
@@ -558,7 +558,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
if( !nEndCnt ) // falls mal ein Start ohne Ende vorhanden ist
continue;
--nEndCnt;
- if( !nEndCnt ) // hier ist der Anfang
+ if( !nEndCnt ) // hier ist der Anfang
break;
}
else if( UNDO_END == nTmpId )
@@ -826,7 +826,7 @@ bool SwDoc::Redo( SwUndoIter& rUndoIter )
SetRedlineMode_intern( (RedlineMode_t)(eTmpMode | nsRedlineMode_t::REDLINE_IGNORE));
//JP 11.05.98: FlyFormate ueber die EditShell selektieren, nicht aus dem
- // Undo heraus
+ // Undo heraus
if( UNDO_START != pUndo->GetId() && UNDO_END != pUndo->GetId() )
rUndoIter.ClearSelections();
@@ -936,7 +936,7 @@ bool SwDoc::Repeat( SwUndoIter& rUndoIter, sal_uInt16 nRepeatCnt )
SwPaM* pTmpCrsr = rUndoIter.pAktPam;
SwUndoId nId = UNDO_EMPTY;
- if( pTmpCrsr != pTmpCrsr->GetNext() || !bOneUndo ) // Undo-Klammerung aufbauen
+ if( pTmpCrsr != pTmpCrsr->GetNext() || !bOneUndo ) // Undo-Klammerung aufbauen
{
if (pUndo->GetId() == UNDO_END)
{
@@ -948,12 +948,12 @@ bool SwDoc::Repeat( SwUndoIter& rUndoIter, sal_uInt16 nRepeatCnt )
StartUndo( nId, NULL );
}
- do { // dann durchlaufe mal den gesamten Ring
+ do { // dann durchlaufe mal den gesamten Ring
for( USHORT nRptCnt = nRepeatCnt; nRptCnt > 0; --nRptCnt )
{
rUndoIter.pLastUndoObj = 0;
for( USHORT nCnt = nSize; nCnt < nEndCnt; ++nCnt )
- (*pUndos)[ nCnt ]->Repeat( rUndoIter ); // Repeat ausfuehren
+ (*pUndos)[ nCnt ]->Repeat( rUndoIter ); // Repeat ausfuehren
}
} while( pTmpCrsr !=
( rUndoIter.pAktPam = (SwPaM*)rUndoIter.pAktPam->GetNext() ));
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 43418fb58a98..4214c1c22abb 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -2,7 +2,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
@@ -49,16 +49,16 @@
#include <ftnidx.hxx>
#include <doc.hxx> // SwDoc.GetNodes()
#include <docary.hxx>
-#include <ndtxt.hxx> // SwTxtNode
-#include <paratr.hxx> //
-#include <cellatr.hxx> //
-#include <fldbas.hxx> // fuer Felder
-#include <pam.hxx> // fuer SwPaM
+#include <ndtxt.hxx> // SwTxtNode
+#include <paratr.hxx> //
+#include <cellatr.hxx> //
+#include <fldbas.hxx> // fuer Felder
+#include <pam.hxx> // fuer SwPaM
#include <swtable.hxx>
#include <rolbck.hxx>
-#include <ndgrf.hxx> // SwGrfNode
-#include <undobj.hxx> // fuer UndoDelete
-#include <IMark.hxx> // fuer SwBookmark
+#include <ndgrf.hxx> // SwGrfNode
+#include <undobj.hxx> // fuer UndoDelete
+#include <IMark.hxx> // fuer SwBookmark
#include <charfmt.hxx> // #i27615#
#include <comcore.hrc>
#include <tools/resid.hxx>
@@ -747,8 +747,8 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
case RES_BOXATR_FORMULA:
{
//JP 20.04.98: Bug 49502 - wenn eine Formel gesetzt ist, nie den
- // Value mit sichern. Der muss gegebenfalls neu
- // errechnet werden!
+ // Value mit sichern. Der muss gegebenfalls neu
+ // errechnet werden!
//JP 30.07.98: Bug 54295 - Formeln immer im Klartext speichern
m_OldSet.ClearItem( RES_BOXATR_VALUE );
@@ -1039,7 +1039,7 @@ SwHistory::~SwHistory()
|*
|* void SwHistory::Add()
|*
-|* Beschreibung Dokument 1.0
+|* Beschreibung Dokument 1.0
|* Ersterstellung JP 18.02.91
|* Letzte Aenderung JP 18.02.91
|*
@@ -1195,7 +1195,7 @@ void SwHistory::Add(const SfxItemSet & rSet, const SwCharFmt & rFmt)
|*
|* BOOL SwHistory::Rollback()
|*
-|* Beschreibung Dokument 1.0
+|* Beschreibung Dokument 1.0
|* Ersterstellung JP 18.02.91
|* Letzte Aenderung JP 18.02.91
|*
@@ -1314,7 +1314,7 @@ void SwHistory::CopyAttr( SwpHints* pHts, ULONG nNodeIdx,
pHt = pHts->GetTextHint(n);
nAttrStt = *pHt->GetStart();
// JP: ???? wieso nAttrStt >= nEnd
-// if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt >= nEnd )
+// if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt >= nEnd )
if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt > nEnd )
break;
@@ -1341,7 +1341,7 @@ void SwHistory::CopyAttr( SwpHints* pHts, ULONG nNodeIdx,
{
if ( nEnd > nAttrStt
// JP: ???? wieso nAttrStt >= nEnd
-// || (nEnd == nAttrStt && (!pEndIdx || nEnd == pEndIdx->GetIndex()))
+// || (nEnd == nAttrStt && (!pEndIdx || nEnd == pEndIdx->GetIndex()))
)
{
Add( pHt, nNodeIdx, false );
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 01bd9f37256c..959fbbfb2748 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -2,7 +2,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
@@ -49,7 +49,7 @@
#include <ftnidx.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <swtable.hxx>
@@ -378,8 +378,8 @@ void SwUndoFmtAttr::Repeat( SwUndoIter& rUndoIter)
}
break;
-// case RES_CHRFMT:
-// case RES_FRMFMT:
+// case RES_CHRFMT:
+// case RES_FRMFMT:
case RES_FLYFRMFMT:
{
@@ -444,12 +444,12 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt )
// store old value as attribute, to keep SwUndoFmtAttr small
m_pOldSet->Put( SwFmtFrmSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) );
}
-/* else
+/* else
{
pOldSet->Put( pFmt->GetVertOrient() );
pOldSet->Put( pFmt->GetHoriOrient() );
}
-*/ }
+*/ }
const SwFmtAnchor& rAnchor =
static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, FALSE ) );
@@ -535,7 +535,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
// den akt. wieder zwischenspeichern
aDrawOldPt = pFrmFmt->FindSdrObject()->GetRelativePos();
//JP 08.10.97: ist laut AMA/MA nicht mehr noetig
-// pCont->DisconnectFromLayout();
+// pCont->DisconnectFromLayout();
}
else
{
@@ -595,7 +595,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
// Darum verhinder hier, das durch setzen des Ankers das
// Contact-Object seine Position aendert.
//JP 08.10.97: ist laut AMA/MA nicht mehr noetig
-// pCont->ConnectToLayout();
+// pCont->ConnectToLayout();
SdrObject* pObj = pCont->GetMaster();
if( pCont->GetAnchorFrm() && !pObj->IsInserted() )
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index 8382444d6a5f..817f5d242ac5 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include "doc.hxx"
#include "docary.hxx"
-#include "swundo.hxx" // fuer die UndoIds
+#include "swundo.hxx" // fuer die UndoIds
#include "pam.hxx"
#include "undobj.hxx"
@@ -87,7 +87,7 @@ SwRewriter SwUndoBookmark::GetRewriter() const
return aResult;
}
-//----------------------------------------------------------------------
+//----------------------------------------------------------------------
SwUndoInsBookmark::SwUndoInsBookmark( const ::sw::mark::IMark& rBkmk )
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c8ab7076b826..480d9243f8b3 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
#include <fmtanchr.hxx>
#include <doc.hxx>
#include <swtable.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -179,7 +179,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy )
pHistory->Add( pSttTxtNd->GetTxtColl(),pStt->nNode.GetIndex(), ND_TEXTNODE );
pHistory->Add( pEndTxtNd->GetTxtColl(),pEnd->nNode.GetIndex(), ND_TEXTNODE );
- if( !bJoinNext ) // Selection von Unten nach Oben
+ if( !bJoinNext ) // Selection von Unten nach Oben
{
// Beim JoinPrev() werden die AUTO-PageBreak's richtig
// kopiert. Um diese beim Undo wieder herzustellen, muss das
@@ -207,14 +207,14 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy )
if( !pSttTxtNd && !pEndTxtNd )
rPam.GetPoint()->nNode--;
- rPam.DeleteMark(); // der SPoint ist aus dem Bereich
+ rPam.DeleteMark(); // der SPoint ist aus dem Bereich
if( !pEndTxtNd )
nEndCntnt = 0;
if( !pSttTxtNd )
nSttCntnt = 0;
- if( bMoveNds ) // sind noch Nodes zu verschieben ?
+ if( bMoveNds ) // sind noch Nodes zu verschieben ?
{
SwNodes& rNds = (SwNodes&)*pDoc->GetUndoNds();
SwNodes& rDocNds = pDoc->GetNodes();
@@ -302,7 +302,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy )
nNode = rNds.GetEndOfContent().GetIndex();
rDocNds._MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() ));
pMvStt = new SwNodeIndex( rNds, nNode );
- nNode = rNds.GetEndOfContent().GetIndex() - nNode; // Differenz merken !
+ nNode = rNds.GetEndOfContent().GetIndex() - nNode; // Differenz merken !
if( pSttTxtNd && pEndTxtNd )
{
//Step 4: Moving around sections
@@ -329,7 +329,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy )
bJoinNext ? pEndTxtNd->GetIndex() : pSttTxtNd->GetIndex() );
}
else
- nNode = 0; // kein Node verschoben -> keine Differenz zum Ende
+ nNode = 0; // kein Node verschoben -> keine Differenz zum Ende
// wurden davor noch Nodes geloescht ?? (FootNotes haben ContentNodes!)
if( !pSttTxtNd && !pEndTxtNd )
@@ -521,7 +521,7 @@ SwUndoDelete::~SwUndoDelete()
{
delete pSttStr;
delete pEndStr;
- if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array
+ if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array
{
// Insert speichert den Inhalt in der IconSection
pMvStt->GetNode().GetNodes().Delete( *pMvStt, nNode );
@@ -658,7 +658,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter )
SwNodeIndex aIdx( pDoc->GetNodes(), nCalcStt );
SwNode* pInsNd = &aIdx.GetNode();
- { // Block, damit der SwPosition beim loeschen vom Node
+ { // Block, damit der SwPosition beim loeschen vom Node
// abgemeldet ist
SwPosition aPos( aIdx );
if( !bDelFullPara )
@@ -676,11 +676,11 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter )
if( pInsNd->IsCntntNode() )
aPos.nContent.Assign( (SwCntntNode*)pInsNd, nSttCntnt );
if( !bTblDelLastNd )
- pInsNd = 0; // Node nicht loeschen !!
+ pInsNd = 0; // Node nicht loeschen !!
}
}
else
- pInsNd = 0; // Node nicht loeschen !!
+ pInsNd = 0; // Node nicht loeschen !!
SwNodes* pUNds = (SwNodes*)pDoc->GetUndoNds();
BOOL bNodeMove = 0 != nNode;
@@ -801,7 +801,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter )
pTxtNd->ClearSwpHintsArr( true );
// SectionNode-Modus und von oben nach unten selektiert:
- // -> im StartNode steht noch der Rest vom Join => loeschen
+ // -> im StartNode steht noch der Rest vom Join => loeschen
aPos.nContent.Assign( pTxtNd, nSttCntnt );
pTxtNd->InsertText( *pSttStr, aPos.nContent,
IDocumentContentOperations::INS_NOHINTEXPAND );
@@ -813,7 +813,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter )
if( pHistory )
{
pHistory->TmpRollback( pDoc, nSetPos, false );
- if( nSetPos ) // es gab Fussnoten/FlyFrames
+ if( nSetPos ) // es gab Fussnoten/FlyFrames
{
// gibts ausser diesen noch andere ?
if( nSetPos < pHistory->Count() )
@@ -850,7 +850,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter )
if( pRedlSaveData )
SetSaveData( *pDoc, *pRedlSaveData );
- pDoc->DoUndo( bUndo ); // Undo wieder einschalten
+ pDoc->DoUndo( bUndo ); // Undo wieder einschalten
SetPaM( rUndoIter, TRUE );
}
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 8edccd344adf..707ff307be48 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -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
@@ -52,31 +52,31 @@
#define STR_INSERTSECTION (UNDO_BASE +19)
#define STR_OUTLINE_LR (UNDO_BASE +20)
#define STR_OUTLINE_UD (UNDO_BASE +21)
-#define STR_INSNUM (UNDO_BASE +22)
-#define STR_NUMUP (UNDO_BASE +23)
-#define STR_MOVENUM (UNDO_BASE +24)
-#define STR_INSERTDRAW (UNDO_BASE +25)
-#define STR_NUMORNONUM (UNDO_BASE +26)
-#define STR_INC_LEFTMARGIN (UNDO_BASE +27)
-#define STR_DEC_LEFTMARGIN (UNDO_BASE +28)
-#define STR_INSERTLABEL (UNDO_BASE +29)
-#define STR_SETNUMRULESTART (UNDO_BASE +30)
-#define STR_CHANGEFTN (UNDO_BASE +31)
-#define STR_REDLINE (UNDO_BASE +32)
-#define STR_ACCEPT_REDLINE (UNDO_BASE +33)
-#define STR_REJECT_REDLINE (UNDO_BASE +34)
-#define STR_SPLIT_TABLE (UNDO_BASE +35)
-#define STR_DONTEXPAND (UNDO_BASE +36)
-#define STR_AUTOCORRECT (UNDO_BASE +37)
-#define STR_MERGE_TABLE (UNDO_BASE +38)
-#define STR_TRANSLITERATE (UNDO_BASE +39)
+#define STR_INSNUM (UNDO_BASE +22)
+#define STR_NUMUP (UNDO_BASE +23)
+#define STR_MOVENUM (UNDO_BASE +24)
+#define STR_INSERTDRAW (UNDO_BASE +25)
+#define STR_NUMORNONUM (UNDO_BASE +26)
+#define STR_INC_LEFTMARGIN (UNDO_BASE +27)
+#define STR_DEC_LEFTMARGIN (UNDO_BASE +28)
+#define STR_INSERTLABEL (UNDO_BASE +29)
+#define STR_SETNUMRULESTART (UNDO_BASE +30)
+#define STR_CHANGEFTN (UNDO_BASE +31)
+#define STR_REDLINE (UNDO_BASE +32)
+#define STR_ACCEPT_REDLINE (UNDO_BASE +33)
+#define STR_REJECT_REDLINE (UNDO_BASE +34)
+#define STR_SPLIT_TABLE (UNDO_BASE +35)
+#define STR_DONTEXPAND (UNDO_BASE +36)
+#define STR_AUTOCORRECT (UNDO_BASE +37)
+#define STR_MERGE_TABLE (UNDO_BASE +38)
+#define STR_TRANSLITERATE (UNDO_BASE +39)
#define STR_PASTE_CLIPBOARD_UNDO (UNDO_BASE +40)
-#define STR_TYPING_UNDO (UNDO_BASE +41)
+#define STR_TYPING_UNDO (UNDO_BASE +41)
-#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42)
-#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43)
-#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44)
-#define STR_REPEAT_DUMMY_9 (UNDO_BASE +45)
+#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42)
+#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43)
+#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44)
+#define STR_REPEAT_DUMMY_9 (UNDO_BASE +45)
// !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!
#define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!!
@@ -99,10 +99,10 @@
#define STR_DRAWGROUP (CORE_REPEAT_END +15)
#define STR_DRAWUNGROUP (CORE_REPEAT_END +16)
#define STR_DRAWDELETE (CORE_REPEAT_END +17)
-#define STR_REREAD (CORE_REPEAT_END +18)
-#define STR_DELGRF (CORE_REPEAT_END +19)
-#define STR_DELOLE (CORE_REPEAT_END +20)
-#define STR_TABLE_ATTR (CORE_REPEAT_END +21)
+#define STR_REREAD (CORE_REPEAT_END +18)
+#define STR_DELGRF (CORE_REPEAT_END +19)
+#define STR_DELOLE (CORE_REPEAT_END +20)
+#define STR_TABLE_ATTR (CORE_REPEAT_END +21)
#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22)
#define STR_TABLE_INSCOL (CORE_REPEAT_END +23)
#define STR_TABLE_INSROW (CORE_REPEAT_END +24)
@@ -110,40 +110,40 @@
#define STR_TABLE_SPLIT (CORE_REPEAT_END +26)
#define STR_TABLE_MERGE (CORE_REPEAT_END +27)
#define STR_TABLE_NUMFORMAT (CORE_REPEAT_END +28)
-#define STR_INSERT_TOX (CORE_REPEAT_END +29)
-#define STR_CLEAR_TOX_RANGE (CORE_REPEAT_END +30)
-#define STR_TABLE_TBLCPYTBL (CORE_REPEAT_END +31)
-#define STR_TABLE_CPYTBL (CORE_REPEAT_END +32)
-#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END +33)
-#define STR_UNDO_CHAIN (CORE_REPEAT_END +34)
-#define STR_UNDO_UNCHAIN (CORE_REPEAT_END +35)
-#define STR_UNDO_FTNINFO (CORE_REPEAT_END +36)
-#define STR_UNDO_ENDNOTEINFO (CORE_REPEAT_END +37)
-#define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38)
-#define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39)
-#define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40)
+#define STR_INSERT_TOX (CORE_REPEAT_END +29)
+#define STR_CLEAR_TOX_RANGE (CORE_REPEAT_END +30)
+#define STR_TABLE_TBLCPYTBL (CORE_REPEAT_END +31)
+#define STR_TABLE_CPYTBL (CORE_REPEAT_END +32)
+#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END +33)
+#define STR_UNDO_CHAIN (CORE_REPEAT_END +34)
+#define STR_UNDO_UNCHAIN (CORE_REPEAT_END +35)
+#define STR_UNDO_FTNINFO (CORE_REPEAT_END +36)
+#define STR_UNDO_ENDNOTEINFO (CORE_REPEAT_END +37)
+#define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38)
+#define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39)
+#define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40)
// #102505#
-#define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41)
+#define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41)
-#define STR_TOXCHANGE (CORE_REPEAT_END +42)
+#define STR_TOXCHANGE (CORE_REPEAT_END +42)
#define STR_UNDO_PAGEDESC_CREATE (CORE_REPEAT_END +43)
-#define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44)
-#define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45)
-#define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983#
-#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840#
-#define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48)
-#define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49)
-#define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50)
-#define STR_UNDO_CHARFMT_CREATE (CORE_REPEAT_END +51)
-#define STR_UNDO_CHARFMT_DELETE (CORE_REPEAT_END +52)
-#define STR_UNDO_CHARFMT_RENAME (CORE_REPEAT_END +53)
-#define STR_UNDO_FRMFMT_CREATE (CORE_REPEAT_END +54)
-#define STR_UNDO_FRMFMT_DELETE (CORE_REPEAT_END +55)
-#define STR_UNDO_FRMFMT_RENAME (CORE_REPEAT_END +56)
-#define STR_UNDO_NUMRULE_CREATE (CORE_REPEAT_END +57)
-#define STR_UNDO_NUMRULE_DELETE (CORE_REPEAT_END +58)
-#define STR_UNDO_NUMRULE_RENAME (CORE_REPEAT_END +59)
-#define STR_UNDO_BOOKMARK_RENAME (CORE_REPEAT_END +60)
+#define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44)
+#define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45)
+#define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983#
+#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840#
+#define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48)
+#define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49)
+#define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50)
+#define STR_UNDO_CHARFMT_CREATE (CORE_REPEAT_END +51)
+#define STR_UNDO_CHARFMT_DELETE (CORE_REPEAT_END +52)
+#define STR_UNDO_CHARFMT_RENAME (CORE_REPEAT_END +53)
+#define STR_UNDO_FRMFMT_CREATE (CORE_REPEAT_END +54)
+#define STR_UNDO_FRMFMT_DELETE (CORE_REPEAT_END +55)
+#define STR_UNDO_FRMFMT_RENAME (CORE_REPEAT_END +56)
+#define STR_UNDO_NUMRULE_CREATE (CORE_REPEAT_END +57)
+#define STR_UNDO_NUMRULE_DELETE (CORE_REPEAT_END +58)
+#define STR_UNDO_NUMRULE_RENAME (CORE_REPEAT_END +59)
+#define STR_UNDO_BOOKMARK_RENAME (CORE_REPEAT_END +60)
#define STR_UNDO_INDEX_ENTRY_INSERT (CORE_REPEAT_END +61)
#define STR_UNDO_INDEX_ENTRY_DELETE (CORE_REPEAT_END +62)
#define STR_UNDO_COL_DELETE (CORE_REPEAT_END +63)
@@ -166,12 +166,12 @@
#define STR_DRAG_AND_COPY (UI_UNDO_BEGIN + 5)
#define STR_DRAG_AND_MOVE (UI_UNDO_BEGIN + 6)
#define STR_INSERT_RULER (UI_UNDO_BEGIN + 7)
-#define STR_INSERT_CHART (UI_UNDO_BEGIN + 8)
-#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 9)
-#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 10)
-#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 11)
-#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12)
-#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13)
+#define STR_INSERT_CHART (UI_UNDO_BEGIN + 8)
+#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 9)
+#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 10)
+#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 11)
+#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12)
+#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13)
#define UI_UNDO_END STR_REPLACE_STYLE
#define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1)
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 1035d8cb0d0f..4ad1e70b7869 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -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
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index e665beb6c8e9..d405afa98011 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <frmfmt.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -128,12 +128,12 @@ void SwUndRng::SetPaM( SwPaM & rPam, BOOL bCorrToCntnt ) const
else
rPam.GetPoint()->nContent.Assign( 0, 0 );
- if( !nEndNode && STRING_MAXLEN == nEndCntnt ) // keine Selection
+ if( !nEndNode && STRING_MAXLEN == nEndCntnt ) // keine Selection
return ;
rPam.SetMark();
if( nSttNode == nEndNode && nSttCntnt == nEndCntnt )
- return; // nichts mehr zu tun
+ return; // nichts mehr zu tun
rPam.GetPoint()->nNode = nEndNode;
if( (pNd = rPam.GetNode())->IsCntntNode() )
@@ -276,11 +276,11 @@ SwUndoSaveCntnt::~SwUndoSaveCntnt()
// Inhalte in das UndoNodesArray verschoben. Diese Methoden fuegen
// am Ende eines TextNodes fuer die Attribute einen Trenner ein.
// Dadurch werden die Attribute nicht expandiert.
- // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray
- // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray
+ // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray
+ // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray
- // 2.8.93: ist pEndNdIdx angebenen, wird vom Undo/Redo -Ins/DelFly
- // aufgerufen. Dann soll die gesamte Section verschoben werden.
+ // 2.8.93: ist pEndNdIdx angebenen, wird vom Undo/Redo -Ins/DelFly
+ // aufgerufen. Dann soll die gesamte Section verschoben werden.
void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
SwIndex* pCntIdx, ULONG* pEndNdIdx, xub_StrLen* pEndCntIdx )
@@ -327,7 +327,7 @@ void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
rDoc.GetNodes().MoveRange( rPaM, aPos, rNds );
SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
- if( pTxtNd ) // fuege einen Trenner fuer die Attribute ein !
+ if( pTxtNd ) // fuege einen Trenner fuer die Attribute ein !
{
// weil aber beim Insert die Attribute angefasst/sprich
// aus dem Array geloescht und wieder eingefuegt werden, koennen
@@ -379,13 +379,13 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx,
// jetzt kommt das wiederherstellen
SwNodes& rNds = (SwNodes&)*rDoc.GetUndoNds();
if( nNodeIdx == rNds.GetEndOfPostIts().GetIndex() )
- return; // nichts gespeichert
+ return; // nichts gespeichert
BOOL bUndo = rDoc.DoesUndo();
rDoc.DoUndo( FALSE );
SwPaM aPaM( rInsPos );
- if( pEndNdIdx ) // dann hole aus diesem den Bereich
+ if( pEndNdIdx ) // dann hole aus diesem den Bereich
aPaM.GetPoint()->nNode.Assign( rNds, *pEndNdIdx );
else
{
@@ -394,7 +394,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx,
}
SwTxtNode* pTxtNd = aPaM.GetNode()->GetTxtNode();
- if( !pEndNdIdx && pTxtNd ) // loesche den Trenner wieder
+ if( !pEndNdIdx && pTxtNd ) // loesche den Trenner wieder
{
if( pEndCntIdx )
aPaM.GetPoint()->nContent.Assign( pTxtNd, *pEndCntIdx );
@@ -414,7 +414,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx,
// noch den letzen Node loeschen.
if( !aPaM.GetPoint()->nContent.GetIndex() ||
- ( aPaM.GetPoint()->nNode++ && // noch leere Nodes am Ende ??
+ ( aPaM.GetPoint()->nNode++ && // noch leere Nodes am Ende ??
&rNds.GetEndOfExtras() != &aPaM.GetPoint()->nNode.GetNode() ))
{
aPaM.GetPoint()->nContent.Assign( 0, 0 );
@@ -525,7 +525,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
( &pEnd->nNode.GetNode() == pFtnNd &&
nFtnSttIdx >= pEnd->nContent.GetIndex() )) )
{
- ++nPos; // weiter suchen
+ ++nPos; // weiter suchen
continue;
}
@@ -551,7 +551,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
pStt->nContent.GetIndex() > nFtnSttIdx ) ||
( &pEnd->nNode.GetNode() == pFtnNd &&
nFtnSttIdx >= pEnd->nContent.GetIndex() )))
- continue; // weiter suchen
+ continue; // weiter suchen
// es muss leider ein Index angelegt werden. Sonst knallts im
// TextNode, weil im DTOR der SwFtn dieser geloescht wird !!
@@ -824,7 +824,7 @@ SwUndoSaveSection::SwUndoSaveSection()
SwUndoSaveSection::~SwUndoSaveSection()
{
- if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array
+ if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array
{
// SaveSection speichert den Inhalt in der PostIt-Section
SwNodes& rUNds = pMvStt->GetNode().GetNodes();
@@ -875,7 +875,7 @@ void SwUndoSaveSection::SaveSection( SwDoc* , const SwNodeRange& rRange )
void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx,
USHORT nSectType )
{
- if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ?
+ if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ?
{
// ueberpruefe, ob der Inhalt an der alten Position steht
SwNodeIndex aSttIdx( pDoc->GetNodes(), nStartPos );
@@ -895,7 +895,7 @@ void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx,
void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos )
{
- if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ?
+ if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ?
{
SwPosition aInsPos( rInsPos );
ULONG nEnd = pMvStt->GetIndex() + nMvLen - 1;
@@ -1051,23 +1051,23 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
switch( eCmpPos )
{
- case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
+ case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang
nEndNode = rEndPos.nNode.GetIndex();
nEndCntnt = rEndPos.nContent.GetIndex();
break;
- case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
+ case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende
nSttNode = rSttPos.nNode.GetIndex();
nSttCntnt = rSttPos.nContent.GetIndex();
break;
- case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
+ case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2
nSttNode = rSttPos.nNode.GetIndex();
nSttCntnt = rSttPos.nContent.GetIndex();
nEndNode = rEndPos.nNode.GetIndex();
nEndCntnt = rEndPos.nContent.GetIndex();
break;
- case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
+ case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1
if( rRedl.GetContentIdx() )
{
// dann den Bereich ins UndoArray verschieben und merken
@@ -1076,7 +1076,7 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
}
break;
- case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
+ case POS_EQUAL: // Pos1 ist genauso gross wie Pos2
break;
default:
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 08673ba275e5..7e8f6d7331ae 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -2,7 +2,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
@@ -39,11 +39,11 @@
#include <frmfmt.hxx>
#include <flyfrm.hxx>
#include <undobj.hxx>
-#include <rolbck.hxx> // fuer die Attribut History
+#include <rolbck.hxx> // fuer die Attribut History
#include <doc.hxx>
#include <docary.hxx>
#include <rootfrm.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
// OD 26.06.2003 #108784#
@@ -62,7 +62,7 @@ SwUndoFlyBase::SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId )
SwUndoFlyBase::~SwUndoFlyBase()
{
- if( bDelFmt ) // loeschen waehrend eines Undo's ??
+ if( bDelFmt ) // loeschen waehrend eines Undo's ??
delete pFrmFmt;
}
@@ -118,9 +118,9 @@ void SwUndoFlyBase::InsFly( SwUndoIter& rUndoIter, BOOL bShowSelFrm )
}
//JP 18.12.98: Bug 60505 - InCntntAttribut erst setzen, wenn der Inhalt
- // vorhanden ist! Sonst wuerde das Layout den Fly vorher
- // formatieren, aber keine Inhalt finden; so geschene bei
- // Grafiken aus dem Internet
+ // vorhanden ist! Sonst wuerde das Layout den Fly vorher
+ // formatieren, aber keine Inhalt finden; so geschene bei
+ // Grafiken aus dem Internet
if (FLY_AS_CHAR == nRndId)
{
// es muss mindestens das Attribut im TextNode stehen
@@ -163,8 +163,8 @@ void SwUndoFlyBase::InsFly( SwUndoIter& rUndoIter, BOOL bShowSelFrm )
void SwUndoFlyBase::DelFly( SwDoc* pDoc )
{
- bDelFmt = TRUE; // im DTOR das Format loeschen
- pFrmFmt->DelFrms(); // Frms vernichten.
+ bDelFmt = TRUE; // im DTOR das Format loeschen
+ pFrmFmt->DelFrms(); // Frms vernichten.
// alle Uno-Objecte sollten sich jetzt abmelden
{
@@ -274,7 +274,7 @@ SwUndoInsLayFmt::~SwUndoInsLayFmt()
void SwUndoInsLayFmt::Undo( SwUndoIter& rUndoIter )
{
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
- if( rCntnt.GetCntntIdx() ) // kein Inhalt
+ if( rCntnt.GetCntntIdx() ) // kein Inhalt
{
bool bRemoveIdx = true;
if( mnCrsrSaveIndexPara > 0 )
@@ -441,7 +441,7 @@ void SwUndoDelLayFmt::Undo( SwUndoIter& rUndoIter )
void SwUndoDelLayFmt::Redo( SwUndoIter& rUndoIter )
{
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
- if( rCntnt.GetCntntIdx() ) // kein Inhalt
+ if( rCntnt.GetCntntIdx() ) // kein Inhalt
RemoveIdxFromSection( rUndoIter.GetDoc(),
rCntnt.GetCntntIdx()->GetIndex() );
@@ -451,7 +451,7 @@ void SwUndoDelLayFmt::Redo( SwUndoIter& rUndoIter )
void SwUndoDelLayFmt::Redo()
{
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
- if( rCntnt.GetCntntIdx() ) // kein Inhalt
+ if( rCntnt.GetCntntIdx() ) // kein Inhalt
RemoveIdxFromSection( *pFrmFmt->GetDoc(),
rCntnt.GetCntntIdx()->GetIndex() );
@@ -467,7 +467,7 @@ SwUndoSetFlyFmt::SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt )
rFlyFmt.GetAttrSet().GetRanges() )),
nOldNode( 0 ), nNewNode( 0 ),
nOldCntnt( 0 ), nNewCntnt( 0 ),
- nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( FALSE )
+ nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( FALSE )
{
}
diff --git a/sw/source/core/undo/undoflystrattr.cxx b/sw/source/core/undo/undoflystrattr.cxx
index 3facce917f88..072115ec6798 100644
--- a/sw/source/core/undo/undoflystrattr.cxx
+++ b/sw/source/core/undo/undoflystrattr.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 81f6dce132b1..a571e8101fff 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <doc.hxx>
#include <docary.hxx>
#include <frame.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -218,7 +218,7 @@ SwUndoDrawGroup::~SwUndoDrawGroup()
delete pTmp->pFmt;
}
else
- delete pObjArr->pFmt; // das GroupObject-Format
+ delete pObjArr->pFmt; // das GroupObject-Format
delete [] pObjArr;
}
@@ -230,7 +230,7 @@ void SwUndoDrawGroup::Undo( SwUndoIter& )
// das Group-Object sichern
SwDrawFrmFmt* pFmt = pObjArr->pFmt;
SwDrawContact* pDrawContact = (SwDrawContact*)pFmt->FindContactObj();
- SdrObject* pObj = pDrawContact->GetMaster();
+ SdrObject* pObj = pDrawContact->GetMaster();
pObjArr->pObj = pObj;
//loescht sich selbst!
@@ -383,7 +383,7 @@ SwUndoDrawUnGroup::~SwUndoDrawUnGroup()
delete pTmp->pFmt;
}
else
- delete pObjArr->pFmt; // das GroupObject-Format
+ delete pObjArr->pFmt; // das GroupObject-Format
delete [] pObjArr;
}
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index a9874091b3ce..555a207dfa1b 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include "doc.hxx"
-#include "swundo.hxx" // fuer die UndoIds
+#include "swundo.hxx" // fuer die UndoIds
#include "pam.hxx"
#include "ndtxt.hxx"
@@ -88,7 +88,7 @@ void SwUndoFmtColl::Redo( SwUndoIter& rUndoIter )
SetPaM( rUndoIter );
rUndoIter.pLastUndoObj = 0;
- Repeat( rUndoIter ); // Collection setzen
+ Repeat( rUndoIter ); // Collection setzen
rUndoIter.pLastUndoObj = 0;
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 8fd74df0151f..644ea3291eb6 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -94,9 +94,9 @@ inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
// zwei Zugriffs-Funktionen
inline SwPosition* IterPt( SwUndoIter& rUIter )
-{ return rUIter.pAktPam->GetPoint(); }
+{ return rUIter.pAktPam->GetPoint(); }
inline SwPosition* IterMk( SwUndoIter& rUIter )
-{ return rUIter.pAktPam->GetMark(); }
+{ return rUIter.pAktPam->GetMark(); }
//------------------------------------------------------------
@@ -242,7 +242,7 @@ SwUndoInsert::~SwUndoInsert()
pPos->nNode.GetIndex() );
delete pPos;
}
- else if( pTxt ) // der eingefuegte Text
+ else if( pTxt ) // der eingefuegte Text
delete pTxt;
delete pRedlData;
}
@@ -292,7 +292,7 @@ void SwUndoInsert::Undo( SwUndoIter& rUndoIter )
pTxt = new String( pTxtNode->GetTxt().Copy(nCntnt-nLen, nLen) );
pTxtNode->EraseText( aPaM.GetPoint()->nContent, nLen );
}
- else // ansonsten Grafik/OLE/Text/...
+ else // ansonsten Grafik/OLE/Text/...
{
aPaM.Move(fnMoveBackward);
if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
@@ -413,7 +413,7 @@ void SwUndoInsert::Repeat( SwUndoIter& rUndoIter )
SwNodeIndex aNd( rDoc.GetNodes(), nNode );
SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();;
- if( !bIsAppend && 1 == nLen ) // >1 dann immer nur Text, ansonsten Grafik/OLE/Text/...
+ if( !bIsAppend && 1 == nLen ) // >1 dann immer nur Text, ansonsten Grafik/OLE/Text/...
{
SwPaM aPaM( *pCNd, nCntnt );
aPaM.SetMark();
@@ -530,7 +530,7 @@ void SwUndoReplace::Undo( SwUndoIter& rUndoIter )
aArr[ --nAktPos ]->Undo( rUndoIter );
- if( !nAktPos ) // alten Status wieder zurueck
+ if( !nAktPos ) // alten Status wieder zurueck
rUndoIter.bWeiter = bOldIterFlag;
}
@@ -549,7 +549,7 @@ void SwUndoReplace::Redo( SwUndoIter& rUndoIter )
aArr[ nAktPos ]->Redo( rUndoIter );
- if( ++nAktPos >= aArr.Count() ) // alten Status wieder zurueck
+ if( ++nAktPos >= aArr.Count() ) // alten Status wieder zurueck
{
nAktPos = USHRT_MAX;
rUndoIter.bWeiter = bOldIterFlag;
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index 8e2bcdf547b5..ccb48192518b 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include <doc.hxx>
#include <pam.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <ndtxt.hxx>
#include <undobj.hxx>
#include <rolbck.hxx>
@@ -115,7 +115,7 @@ SwUndoMove::SwUndoMove( SwDoc* pDoc, const SwNodeRange& rRg,
nSttNode = rRg.aStart.GetIndex();
nEndNode = rRg.aEnd.GetIndex();
-// DelFtn( rRange );
+// DelFtn( rRange );
// wird aus dem CntntBereich in den Sonderbereich verschoben ?
ULONG nCntntStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex();
@@ -150,13 +150,13 @@ void SwUndoMove::SetDestRange( const SwPaM& rRange,
? rRange.GetMark()
: rRange.GetPoint();
- nDestSttNode = pStt->nNode.GetIndex();
- nDestSttCntnt = pStt->nContent.GetIndex();
- nDestEndNode = pEnd->nNode.GetIndex();
- nDestEndCntnt = pEnd->nContent.GetIndex();
+ nDestSttNode = pStt->nNode.GetIndex();
+ nDestSttCntnt = pStt->nContent.GetIndex();
+ nDestEndNode = pEnd->nNode.GetIndex();
+ nDestEndCntnt = pEnd->nContent.GetIndex();
nInsPosNode = rInsPos.nNode.GetIndex();
- nInsPosCntnt = rInsPos.nContent.GetIndex();
+ nInsPosCntnt = rInsPos.nContent.GetIndex();
if( bCorrPam )
{
@@ -239,7 +239,7 @@ void SwUndoMove::Undo( SwUndoIter& rUndoIter )
aPam.Exchange();
aPam.DeleteMark();
-// pDoc->ResetAttr( aPam, FALSE );
+// pDoc->ResetAttr( aPam, FALSE );
if( aPam.GetNode()->IsCntntNode() )
aPam.GetNode()->GetCntntNode()->ResetAllAttr();
// der Pam wird jetzt aufgegeben.
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index c6f76dc63efc..6da4a95b1ba7 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
#include <doc.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -275,8 +275,8 @@ SwUndoMoveNum::SwUndoMoveNum( const SwPaM& rPam, long nOff, BOOL bIsOutlMv )
SwUndRng( rPam ),
nNewStt( 0 ), nOffset( nOff )
{
- // nOffset: nach unten => 1
- // nach oben => -1
+ // nOffset: nach unten => 1
+ // nach oben => -1
}
@@ -284,9 +284,9 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter )
{
ULONG nTmpStt = nSttNode, nTmpEnd = nEndNode;
- if( nEndNode || USHRT_MAX != nEndCntnt ) // Bereich ?
+ if( nEndNode || USHRT_MAX != nEndCntnt ) // Bereich ?
{
- if( nNewStt < nSttNode ) // nach vorne verschoben
+ if( nNewStt < nSttNode ) // nach vorne verschoben
nEndNode = nEndNode - ( nSttNode - nNewStt );
else
nEndNode = nEndNode + ( nNewStt - nSttNode );
@@ -294,8 +294,8 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter )
nSttNode = nNewStt;
//JP 22.06.95: wird wollen die Bookmarks/Verzeichnisse behalten, oder?
-// SetPaM( rUndoIter );
-// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE );
+// SetPaM( rUndoIter );
+// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE );
SetPaM( rUndoIter );
rUndoIter.GetDoc().MoveParagraph( *rUndoIter.pAktPam, -nOffset,
@@ -308,8 +308,8 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter )
void SwUndoMoveNum::Redo( SwUndoIter& rUndoIter )
{
//JP 22.06.95: wird wollen die Bookmarks/Verzeichnisse behalten, oder?
-// SetPaM( rUndoIter );
-// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE );
+// SetPaM( rUndoIter );
+// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE );
SetPaM( rUndoIter );
rUndoIter.GetDoc().MoveParagraph( *rUndoIter.pAktPam, nOffset,
@@ -333,8 +333,8 @@ SwUndoNumUpDown::SwUndoNumUpDown( const SwPaM& rPam, short nOff )
: SwUndo( nOff > 0 ? UNDO_NUMUP : UNDO_NUMDOWN ), SwUndRng( rPam ),
nOffset( nOff )
{
- // nOffset: Down => 1
- // Up => -1
+ // nOffset: Down => 1
+ // Up => -1
}
diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx
index d30aba417043..cfdea00be125 100644
--- a/sw/source/core/undo/unoutl.cxx
+++ b/sw/source/core/undo/unoutl.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include "doc.hxx"
-#include "swundo.hxx" // fuer die UndoIds
+#include "swundo.hxx" // fuer die UndoIds
#include "pam.hxx"
#include "ndtxt.hxx"
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index eb1ff8b846ec..a9608aaf4365 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <unotools/transliterationwrapper.hxx>
#include <comphelper/processfactory.hxx>
#include <doc.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -54,9 +54,9 @@ using namespace ::com::sun::star::uno;
// zwei Zugriffs-Funktionen
inline SwPosition* IterPt( SwUndoIter& rUIter )
-{ return rUIter.pAktPam->GetPoint(); }
+{ return rUIter.pAktPam->GetPoint(); }
inline SwPosition* IterMk( SwUndoIter& rUIter )
-{ return rUIter.pAktPam->GetMark(); }
+{ return rUIter.pAktPam->GetMark(); }
inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
@@ -88,7 +88,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
bInsChar = TRUE;
xub_StrLen nTxtNdLen = pTxtNd->GetTxt().Len();
- if( nSttCntnt < nTxtNdLen ) // kein reines Einfuegen ?
+ if( nSttCntnt < nTxtNdLen ) // kein reines Einfuegen ?
{
aDelStr.Insert( pTxtNd->GetTxt().GetChar( nSttCntnt ) );
if( !pHistory )
@@ -368,7 +368,7 @@ struct _UndoTransliterate_Data
void SetChangeAtNode( SwDoc& rDoc );
};
-SwUndoTransliterate::SwUndoTransliterate(
+SwUndoTransliterate::SwUndoTransliterate(
const SwPaM& rPam,
const utl::TransliterationWrapper& rTrans )
: SwUndo( UNDO_TRANSLITERATE ), SwUndRng( rPam ), nType( rTrans.getType() )
@@ -388,7 +388,7 @@ void SwUndoTransliterate::Undo( SwUndoIter& rUndoIter )
rDoc.DoUndo( FALSE );
// since the changes were added to the vector from the end of the string/node towards
- // the start, we need to revert them from the start towards the end now to keep the
+ // the start, we need to revert them from the start towards the end now to keep the
// offset information of the undo data in sync with the changing text.
// Thus we need to iterate from the end of the vector to the start
for (sal_Int32 i = aChanges.size() - 1; i >= 0; --i)
@@ -400,7 +400,7 @@ void SwUndoTransliterate::Undo( SwUndoIter& rUndoIter )
void SwUndoTransliterate::Redo( SwUndoIter& rUndoIter )
{
-/* ??? */ rUndoIter.SetUpdateAttr( TRUE );
+/* ??? */ rUndoIter.SetUpdateAttr( TRUE );
SetPaM( *rUndoIter.pAktPam );
Repeat( rUndoIter );
@@ -469,7 +469,7 @@ void SwUndoTransliterate::AddChanges( SwTxtNode& rTNd,
// same node and have a history?
pNew->pHistory = pD->pHistory;
pD->pHistory = 0;
- break; // more can't exist
+ break; // more can't exist
}
}
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index a994e5e1faa9..ffb72815590e 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <hintids.hxx>
#include <unotools/charclass.hxx>
#include <doc.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -80,8 +80,8 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
else
{
bHiddenRedlines = HasHiddenRedlines( *pRedlSaveData );
- if( bHiddenRedlines ) // dann muessen die NodeIndizies
- { // vom SwUndRng korrigiert werden
+ if( bHiddenRedlines ) // dann muessen die NodeIndizies
+ { // vom SwUndRng korrigiert werden
nEndExtra -= rDoc.GetNodes().GetEndOfExtras().GetIndex();
nSttNode -= nEndExtra;
nEndNode -= nEndExtra;
@@ -303,7 +303,7 @@ void SwUndoRedlineSort::_Redo( SwUndoIter& rIter )
SwNodeIndex aPrevIdx( pStart->nNode, -1 );
ULONG nOffsetTemp = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex();
- xub_StrLen nCntStt = pStart->nContent.GetIndex();
+ xub_StrLen nCntStt = pStart->nContent.GetIndex();
rIter.GetDoc().SortText( rPam, *pOpt );
@@ -517,8 +517,8 @@ void SwUndoCompDoc::Redo( SwUndoIter& rIter )
}
else
{
-// SwRedlineMode eOld = pDoc->GetRedlineMode();
-// pDoc->SetRedlineMode_intern( ( eOld & ~REDLINE_IGNORE) | REDLINE_ON );
+// SwRedlineMode eOld = pDoc->GetRedlineMode();
+// pDoc->SetRedlineMode_intern( ( eOld & ~REDLINE_IGNORE) | REDLINE_ON );
if( pUnDel2 )
{
@@ -535,7 +535,7 @@ void SwUndoCompDoc::Redo( SwUndoIter& rIter )
if (pTmp) // #i19649#
pTmp->InvalidateRange();
-// pDoc->SetRedlineMode_intern( eOld );
+// pDoc->SetRedlineMode_intern( eOld );
}
SetPaM( rIter, TRUE );
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index a78f911f30f0..8d51db6b1aa9 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <fmtcntnt.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index b89c08d9bed3..03aebaa89458 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <doc.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <swtable.hxx>
#include <ndtxt.hxx>
@@ -95,7 +95,7 @@ SwUndoSort::~SwUndoSort()
void SwUndoSort::Undo( SwUndoIter& rIter)
{
- SwDoc& rDoc = rIter.GetDoc();
+ SwDoc& rDoc = rIter.GetDoc();
if(pSortOpt->bTable)
{
// Undo Tabelle
@@ -144,7 +144,7 @@ void SwUndoSort::Undo( SwUndoIter& rIter)
// fuer die sorted Positions einen Index anlegen.
// JP 25.11.97: Die IndexList muss aber nach SourcePosition
- // aufsteigend sortiert aufgebaut werden
+ // aufsteigend sortiert aufgebaut werden
SwUndoSortList aIdxList( (BYTE)aSortList.Count() );
USHORT i;
@@ -225,7 +225,7 @@ void SwUndoSort::Redo( SwUndoIter& rIter)
USHORT i;
for( i = 0; i < aSortList.Count(); ++i)
- { // aktuelle Pos ist die Ausgangslage
+ { // aktuelle Pos ist die Ausgangslage
SwNodeIndex* pIdx = new SwNodeIndex( rDoc.GetNodes(),
aSortList[i]->SORT_TXT_TBL.TXT.nSource);
aIdxList.C40_INSERT( SwNodeIndex, pIdx, i );
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index f1fd1fda60da..875da9c9bca7 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index e6e450088b22..735c8c734039 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@
#include <pam.hxx>
#include <cntfrm.hxx>
#include <tblsel.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <undobj.hxx>
#include <rolbck.hxx>
#include <ddefld.hxx>
@@ -225,7 +225,7 @@ SV_IMPL_PTRARR( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr )
USHORT __FAR_DATA aSave_BoxCntntSet[] = {
RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT,
RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
- RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
+ RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
RES_CHRATR_SHADOWED, RES_CHRATR_WEIGHT,
RES_PARATR_ADJUST, RES_PARATR_ADJUST,
0 };
@@ -331,7 +331,7 @@ void SwUndoInsTbl::Redo( SwUndoIter& rUndoIter )
SwDDEFieldType* pNewType = (SwDDEFieldType*)rDoc.InsertFldType(
*pDDEFldType);
SwDDETable* pDDETbl = new SwDDETable( pTblNode->GetTable(), pNewType );
- pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle
+ pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle
delete pDDEFldType, pDDEFldType = 0;
}
@@ -488,7 +488,7 @@ void SwUndoTblToTxt::Undo( SwUndoIter& rUndoIter )
SwTableNode* pTblNd = rDoc.GetNodes().UndoTableToText( nSttNd, nEndNd, *pBoxSaves );
pTblNd->GetTable().SetTableModel( pTblSave->IsNewModel() );
SwTableFmt* pTableFmt = rDoc.MakeTblFrmFmt( sTblNm, rDoc.GetDfltFrmFmt() );
- pTableFmt->Add( &pTblNd->GetTable() ); // das Frame-Format setzen
+ pTableFmt->Add( &pTblNd->GetTable() ); // das Frame-Format setzen
pTblNd->GetTable().SetRowsToRepeat( nHdlnRpt );
// erzeuge die alte Tabellen Struktur
@@ -499,7 +499,7 @@ void SwUndoTblToTxt::Undo( SwUndoIter& rUndoIter )
SwDDEFieldType* pNewType = (SwDDEFieldType*)rDoc.InsertFldType(
*pDDEFldType);
SwDDETable* pDDETbl = new SwDDETable( pTblNd->GetTable(), pNewType );
- pTblNd->SetNewTable( pDDETbl, FALSE ); // setze die DDE-Tabelle
+ pTblNd->SetNewTable( pDDETbl, FALSE ); // setze die DDE-Tabelle
delete pDDEFldType, pDDEFldType = 0;
}
@@ -745,7 +745,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter )
ULONG nTblNd = nSttNode;
if( nSttCntnt )
- ++nTblNd; // Node wurde vorher gesplittet
+ ++nTblNd; // Node wurde vorher gesplittet
SwNodeIndex aIdx( rDoc.GetNodes(), nTblNd );
SwTableNode* pTNd = rDoc.GetNodes()[ aIdx ]->GetTableNode();
OSL_ENSURE( pTNd, "keinen Tabellen-Node gefunden" );
@@ -813,7 +813,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter )
}
}
- SetPaM( rUndoIter ); // manipulierten Bereich selectieren
+ SetPaM( rUndoIter ); // manipulierten Bereich selectieren
}
@@ -938,8 +938,8 @@ USHORT _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine )
bIsLine ? aTableLineSetRange : aTableBoxSetRange );
pSet->Put( pFmt->GetAttrSet() );
//JP 20.04.98: Bug 49502 - wenn eine Formel gesetzt ist, nie den
- // Value mit sichern. Der muss gegebenfalls neu
- // errechnet werden!
+ // Value mit sichern. Der muss gegebenfalls neu
+ // errechnet werden!
//JP 30.07.98: Bug 54295 - Formeln immer im Klartext speichern
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pSet->GetItemState( RES_BOXATR_FORMULA, TRUE, &pItem ))
@@ -1272,7 +1272,7 @@ _SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl )
_SaveBox::~_SaveBox()
{
- if( ULONG_MAX == nSttNode ) // keine EndBox
+ if( ULONG_MAX == nSttNode ) // keine EndBox
delete Ptrs.pLine;
else
delete Ptrs.pCntntAttrs;
@@ -1284,7 +1284,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
{
rSTbl.NewFrmFmt( &rBox, FALSE, nItemSet, rBox.GetFrmFmt() );
- if( ULONG_MAX == nSttNode ) // keine EndBox
+ if( ULONG_MAX == nSttNode ) // keine EndBox
{
if( !rBox.GetTabLines().Count() )
{
@@ -1343,7 +1343,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
void _SaveBox::SaveCntntAttrs( SwDoc* pDoc )
{
- if( ULONG_MAX == nSttNode ) // keine EndBox
+ if( ULONG_MAX == nSttNode ) // keine EndBox
{
// weiter in der Line
Ptrs.pLine->SaveCntntAttrs( pDoc );
@@ -1385,7 +1385,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl
rSTbl.aFrmFmts.Replace( pFmt, nItemSet );
}
- if( ULONG_MAX == nSttNode ) // keine EndBox
+ if( ULONG_MAX == nSttNode ) // keine EndBox
{
SwTableBox* pNew = new SwTableBox( pFmt, 1, &rParent );
rParent.GetTabBoxes().C40_INSERT( SwTableBox, pNew, rParent.GetTabBoxes().Count() );
@@ -1950,7 +1950,7 @@ void SwUndoTblNdsChg::Redo( SwUndoIter& rUndoIter )
TblChgMode eOldMode = rTbl.GetTblChgMode();
rTbl.SetTblChgMode( (TblChgMode)nCount );
- rDoc.DoUndo( TRUE ); // wir brauchen die SaveSections!
+ rDoc.DoUndo( TRUE ); // wir brauchen die SaveSections!
SwUndoTblNdsChg* pUndo = 0;
switch( nSetColType & 0xff )
@@ -2152,7 +2152,7 @@ CHECKTABLE(pTblNd->GetTable())
pHistory->TmpRollback( &rDoc, 0 );
pHistory->SetTmpEnd( pHistory->Count() );
}
-// nTblNode = pTblNd->GetIndex();
+// nTblNode = pTblNd->GetIndex();
SwPaM* pPam = rUndoIter.pAktPam;
pPam->DeleteMark();
@@ -2408,14 +2408,14 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter )
OSL_ENSURE( pBox, "keine TabellenBox gefunden" );
SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
- if( bNewFmt || bNewFml || bNewValue )
+ if( bNewFmt || bNewFml || bNewValue )
{
SfxItemSet aBoxSet( rDoc.GetAttrPool(),
RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->LockModify();
if( bNewFml )
@@ -2447,8 +2447,8 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter )
aBoxSet.Put( SwTblBoxValue( fNum ));
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->LockModify();
pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA );
pBoxFmt->UnlockModify();
@@ -2464,8 +2464,8 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter )
// es ist keine Zahl
// JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht.
- // Sorge dafuer, das der Text auch entsprechend
- // formatiert wird!
+ // Sorge dafuer, das der Text auch entsprechend
+ // formatiert wird!
pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT ));
pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
@@ -3117,7 +3117,7 @@ void SwUndoMergeTbl::Undo( SwUndoIter& rIter )
pTbl = &pNew->GetTable();
pTbl->GetFrmFmt()->SetName( aName );
-// pSavTbl->CreateNew( *pTbl, FALSE );
+// pSavTbl->CreateNew( *pTbl, FALSE );
pSavTbl->RestoreAttr( *pTbl );
@@ -3184,7 +3184,7 @@ void SwUndoMergeTbl::SaveFormula( SwHistory& rHistory )
void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos )
{
- USHORT nO = rArr.Count(), nM, nU = 0;
+ USHORT nO = rArr.Count(), nM, nU = 0;
if( nO > 0 )
{
nO--;
@@ -3211,7 +3211,7 @@ void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos )
void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos )
{
- USHORT nO = rArr.Count(), nM, nU = 0;
+ USHORT nO = rArr.Count(), nM, nU = 0;
if( nO > 0 )
{
nO--;
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index f3d7dbecb785..7eb48657e99b 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include <frmfmt.hxx>
#include <doc.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <pam.hxx>
#include <ndtxt.hxx>
#include <undobj.hxx>
@@ -61,7 +61,7 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
if( pTxtNd->HasSwAttrSet() )
pHistory->CopyFmtAttr( *pTxtNd->GetpSwAttrSet(), nSttNode );
- if( !nSttCntnt ) // dann werden Flys mitgenommen !!
+ if( !nSttCntnt ) // dann werden Flys mitgenommen !!
{
USHORT nArrLen = pDoc->GetSpzFrmFmts()->Count();
for( USHORT n = 0; n < nArrLen; ++n )
@@ -106,9 +106,9 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, BOOL bScanFlys,
nSttNode = pTmpPos->nNode.GetIndex();
nSttCntnt = pTmpPos->nContent.GetIndex();
- if( !bSttIsTxtNd ) // wird eine Tabellenselektion eingefuegt,
+ if( !bSttIsTxtNd ) // wird eine Tabellenselektion eingefuegt,
{
- ++nSttNode; // dann stimmt der CopyPam nicht ganz
+ ++nSttNode; // dann stimmt der CopyPam nicht ganz
bSttWasTxtNd = FALSE;
}
}
@@ -147,11 +147,11 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, BOOL bScanFlys,
SwUndoInserts::~SwUndoInserts()
{
- if( pPos ) // loesche noch den Bereich aus dem UndoNodes Array
+ if( pPos ) // loesche noch den Bereich aus dem UndoNodes Array
{
// Insert speichert den Inhalt in der IconSection
SwNodes& rUNds = pPos->nNode.GetNodes();
- if( pPos->nContent.GetIndex() ) // nicht den gesamten Node loeschen
+ if( pPos->nContent.GetIndex() ) // nicht den gesamten Node loeschen
{
SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
OSL_ENSURE( pTxtNd, "kein TextNode, aus dem geloescht werden soll" );
@@ -231,7 +231,7 @@ void SwUndoInserts::Undo( SwUndoIter& rUndoIter )
SwTxtNode* pTxtNode = rIdx.GetNode().GetTxtNode();
if( pTxtNode )
{
- if( !pTxtFmtColl ) // falls 0, dann war hier auch kein TextNode,
+ if( !pTxtFmtColl ) // falls 0, dann war hier auch kein TextNode,
{ // dann muss dieser geloescht werden,
SwNodeIndex aDelIdx( rIdx );
rIdx++;
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index c39ece11ede0..5e4581722828 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx
index e72abba9c992..f4a234ca3ae7 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 362b9245af23..ee1cabf84463 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 0b4b34e57153..dd35367aa9b5 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 83a4667eecd4..8a6904eda6bd 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -2,7 +2,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
@@ -201,11 +201,11 @@ BOOL UCB_IsDirectory( const String& rURL )
{
}
return bExists;
-}
+}
// get a list of files from the folder of the URL
// options: pExtension = 0 -> all, else this specific extension
- // pDateTime != 0 -> returns also the modified date/time of
+ // pDateTime != 0 -> returns also the modified date/time of
// the files in a SvPtrarr -->
// !! objects must be deleted from the caller!!
BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList,
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index e4d85ec72b1f..99a3ee8ab8e2 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index b125081bace7..ef57f019a727 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2,7 +2,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
@@ -115,7 +115,7 @@ void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc )
catch ( uno::Exception& )
{
}
-
+
}
}
aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
@@ -357,7 +357,7 @@ static sal_Bool GetTableAndCellsFromRangeRep(
aEndCell = aTmp;
}
}
- else // a single cell like in "Table1.B3"
+ else // a single cell like in "Table1.B3"
{
aStartCell = aEndCell = aRange;
}
@@ -1127,10 +1127,10 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
nCurValuesSeqLen = xCurValues->getData().getLength();
// check for consistent use of 'first cell as label'
- if (nLabelSeqLen == -1) // set initial value to compare with below further on
+ if (nLabelSeqLen == -1) // set initial value to compare with below further on
nLabelSeqLen = nCurLabelSeqLen;
if (nLabelSeqLen != nCurLabelSeqLen)
- nLabelSeqLen = -2; // failed / no consistent use of label cells
+ nLabelSeqLen = -2; // failed / no consistent use of label cells
// get table and cell names for label and values data sequences
// (start and end cell will be sorted, i.e. start cell <= end cell)
@@ -1193,7 +1193,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
nDtaSrcIsColumns = nDirection;
if (nDtaSrcIsColumns != nDirection)
{
- nDtaSrcIsColumns = -2; // failed
+ nDtaSrcIsColumns = -2; // failed
}
@@ -1364,7 +1364,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
if (!pIt)
return aResult; // failed -> return empty property sequence
pSequenceMapping[i] = pIt - pSortedMapping;
-
+
if (i != pSequenceMapping[i])
bNeedSequenceMapping = sal_True;
}
@@ -1660,8 +1660,8 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
if (!bDisposed)
pTable->GetFrmFmt()->GetDoc()->GetChartControllerHelper().StartOrContinueLocking();
- //! make a copy of the STL container!
- //! This is necessary since calling 'dispose' will implicitly remove an element
+ //! make a copy of the STL container!
+ //! This is necessary since calling 'dispose' will implicitly remove an element
//! of the original container, and thus any iterator in the original container
//! would become invalid.
const Set_DataSequenceRef_t aSet( aDataSequences[ pTable ] );
@@ -1711,12 +1711,12 @@ void SwChartDataProvider::AddRowCols(
if (rTable.IsTblComplex())
return;
- const USHORT nBoxes = rBoxes.Count();
+ const USHORT nBoxes = rBoxes.Count();
if (nBoxes < 1 || nLines < 1)
return;
- SwTableBox* pFirstBox = *( rBoxes.GetData() + 0 );
- SwTableBox* pLastBox = *( rBoxes.GetData() + nBoxes - 1 );
+ SwTableBox* pFirstBox = *( rBoxes.GetData() + 0 );
+ SwTableBox* pLastBox = *( rBoxes.GetData() + nBoxes - 1 );
sal_Int32 nFirstCol = -1, nFirstRow = -1, nLastCol = -1, nLastRow = -1;
if (pFirstBox && pLastBox)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 845a41684cb0..373ed9c8b436 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -280,7 +280,7 @@ public:
struct ProvNamesId_Type
{
const char * pName;
- sal_uInt16 nType;
+ sal_uInt16 nType;
};
// note: this thing is indexed as an array, so do not insert/remove entries!
@@ -448,7 +448,7 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
{ CSS_TEXT_TEXTFIELD_DOCINFO_SUBJECT, SW_SERVICE_FIELDTYPE_DOCINFO_SUBJECT },
{ CSS_TEXT_TEXTFIELD_DOCINFO_TITLE, SW_SERVICE_FIELDTYPE_DOCINFO_TITLE },
{ CSS_TEXT_TEXTFIELD_DOCINFO_REVISION, SW_SERVICE_FIELDTYPE_DOCINFO_REVISION },
- { CSS_TEXT_TEXTFIELD_DOCINFO_CUSTOM, SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM },
+ { CSS_TEXT_TEXTFIELD_DOCINFO_CUSTOM, SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM },
{ CSS_TEXT_TEXTFIELD_BIBLIOGRAPHY, SW_SERVICE_FIELDTYPE_BIBLIOGRAPHY },
{ CSS_TEXT_TEXTFIELD_COMBINED_CHARACTERS, SW_SERVICE_FIELDTYPE_COMBINED_CHARACTERS },
{ CSS_TEXT_TEXTFIELD_DROP_DOWN, SW_SERVICE_FIELDTYPE_DROPDOWN },
@@ -476,7 +476,7 @@ const SvEventDescription* lcl_GetSupportedMacroItems()
/******************************************************************
* SwXServiceProvider
******************************************************************/
-OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType)
+OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType)
{
SolarMutexGuard aGuard;
OUString sRet;
@@ -486,7 +486,7 @@ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType)
return sRet;
}
-uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames()
+uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames()
{
sal_uInt16 nEntries = SAL_N_ELEMENTS(aProvNamesId);
uno::Sequence<OUString> aRet(nEntries);
@@ -506,7 +506,7 @@ uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames()
}
-sal_uInt16 SwXServiceProvider::GetProviderType(const OUString& rServiceName)
+sal_uInt16 SwXServiceProvider::GetProviderType(const OUString& rServiceName)
{
sal_uInt16 nEntries = SAL_N_ELEMENTS(aProvNamesId);
for(sal_uInt16 i = 0; i < nEntries; i++ )
@@ -1005,7 +1005,7 @@ XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt )
}
/******************************************************************
- * SwXFrameEnumeration
+ * SwXFrameEnumeration
******************************************************************/
namespace
{
@@ -1155,7 +1155,7 @@ Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames(void) thro
}
/******************************************************************
- * SwXFrames
+ * SwXFrames
******************************************************************/
OUString SwXFrames::getImplementationName(void) throw( RuntimeException )
{
@@ -1352,7 +1352,7 @@ SwXTextFrames::~SwXTextFrames()
}
/******************************************************************
- * SwXTextGraphicObjects
+ * SwXTextGraphicObjects
******************************************************************/
//SMART_UNO_IMPLEMENTATION( SwXTextGraphicObjects, UsrObject );
OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeException )
@@ -1383,7 +1383,7 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects()
}
/******************************************************************
- * SwXTextEmbeddedObjects
+ * SwXTextEmbeddedObjects
******************************************************************/
OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeException )
{
@@ -1861,7 +1861,7 @@ sal_Bool SwXFootnotes::hasElements(void) throw( uno::RuntimeException )
return GetDoc()->GetFtnIdxs().Count() > 0;
}
-Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt )
+Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt )
{
return SwXFootnote::CreateXFootnote(rDoc, rFmt);
}
@@ -1980,7 +1980,7 @@ sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException )
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
- return 0 != GetDoc()->GetRefMarks();
+ return 0 != GetDoc()->GetRefMarks();
}
SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark )
diff --git a/sw/source/core/unocore/unocore.src b/sw/source/core/unocore/unocore.src
index 4bab91813490..1827049dd692 100644
--- a/sw/source/core/unocore/unocore.src
+++ b/sw/source/core/unocore/unocore.src
@@ -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
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index abdb5610247f..360b8cc5b311 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -2,7 +2,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
@@ -135,7 +135,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex,
}
/* -----------------16.09.98 12:27-------------------
-* Lesen spezieller Properties am Cursor
+* Lesen spezieller Properties am Cursor
* --------------------------------------------------*/
sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
@@ -393,8 +393,8 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
eNewState = PropertyState_DEFAULT_VALUE;
}
break;
-/* laesst sich nicht feststellen
-* case FN_UNO_BOOKMARK:
+/* laesst sich nicht feststellen
+* case FN_UNO_BOOKMARK:
{
if()
{
@@ -689,7 +689,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
const SvxFontListItem* pFontListItem =
(const SvxFontListItem* )pDoc->GetDocShell()
->GetItem( SID_ATTR_CHAR_FONTLIST );
- const FontList* pList = pFontListItem->GetFontList();
+ const FontList* pList = pFontListItem->GetFontList();
FontInfo aInfo = pList->Get(
pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
@@ -784,7 +784,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
switch(rEntry.nWID)
{
case FN_UNO_PARA_STYLE :
-// lcl_SetTxtFmtColl(aValue, pUnoCrsr);
+// lcl_SetTxtFmtColl(aValue, pUnoCrsr);
break;
case FN_UNO_PAGE_STYLE :
break;
@@ -792,7 +792,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
{
UnoActionContext aAction(pDoc);
- if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
+ if( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
{
pDoc->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( rPam );
@@ -809,7 +809,7 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
case FN_UNO_NUM_LEVEL :
break;
case FN_UNO_NUM_RULES:
-// lcl_setNumberingProperty(aValue, pUnoCrsr);
+// lcl_setNumberingProperty(aValue, pUnoCrsr);
break;
case FN_UNO_CHARFMT_SEQUENCE:
{
@@ -925,11 +925,11 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SfxObjectShellRef aRef( pDocSh );
pDocSh->RegisterTransfer( *pMed );
- pMed->DownLoad(); // ggfs. den DownLoad anstossen
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
+ pMed->DownLoad(); // ggfs. den DownLoad anstossen
+ if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
{
SwReader* pRdr;
- SfxItemSet* pSet = pMed->GetItemSet();
+ SfxItemSet* pSet = pMed->GetItemSet();
pSet->Put(SfxBoolItem(FN_API_CALL, sal_True));
if(sPassword.getLength())
pSet->Put(SfxStringItem(SID_PASSWORD, sPassword));
@@ -962,11 +962,11 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
delete pRdr;
// ggfs. alle Verzeichnisse updaten:
-/* if( pWrtShell->IsUpdateTOX() )
+/* if( pWrtShell->IsUpdateTOX() )
{
SfxRequest aReq( *this, FN_UPDATE_TOX );
Execute( aReq );
- pWrtShell->SetUpdateTOX( sal_False ); // wieder zurueck setzen
+ pWrtShell->SetUpdateTOX( sal_False ); // wieder zurueck setzen
}*/
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 3b5e047829d0..acc3b9e4a05a 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,7 +2,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
@@ -97,12 +97,12 @@ static SwShapeImplementationIdMap aImplementationIdMap;
class SwShapeDescriptor_Impl
{
- SwFmtHoriOrient* pHOrient;
- SwFmtVertOrient* pVOrient;
- SwFmtAnchor* pAnchor;
- SwFmtSurround* pSurround;
- SvxULSpaceItem* pULSpace;
- SvxLRSpaceItem* pLRSpace;
+ SwFmtHoriOrient* pHOrient;
+ SwFmtVertOrient* pVOrient;
+ SwFmtAnchor* pAnchor;
+ SwFmtSurround* pSurround;
+ SvxULSpaceItem* pULSpace;
+ SvxLRSpaceItem* pLRSpace;
sal_Bool bOpaque;
uno::Reference< text::XTextRange > xTextRange;
// OD 2004-04-21 #i26791#
@@ -153,7 +153,7 @@ public:
// OD 2004-05-05 #i28701#
delete pWrapInfluenceOnObjPos;
}
- SwFmtAnchor* GetAnchor(sal_Bool bCreate = sal_False)
+ SwFmtAnchor* GetAnchor(sal_Bool bCreate = sal_False)
{
if(bCreate && !pAnchor)
{
@@ -180,19 +180,19 @@ public:
return pVOrient;
}
- SwFmtSurround* GetSurround(sal_Bool bCreate = sal_False)
+ SwFmtSurround* GetSurround(sal_Bool bCreate = sal_False)
{
if(bCreate && !pSurround)
pSurround = new SwFmtSurround();
return pSurround;
}
- SvxLRSpaceItem* GetLRSpace(sal_Bool bCreate = sal_False)
+ SvxLRSpaceItem* GetLRSpace(sal_Bool bCreate = sal_False)
{
if(bCreate && !pLRSpace)
pLRSpace = new SvxLRSpaceItem(RES_LR_SPACE);
return pLRSpace;
}
- SvxULSpaceItem* GetULSpace(sal_Bool bCreate = sal_False)
+ SvxULSpaceItem* GetULSpace(sal_Bool bCreate = sal_False)
{
if(bCreate && !pULSpace)
pULSpace = new SvxULSpaceItem(RES_UL_SPACE);
@@ -290,7 +290,7 @@ SwFmDrawPage::~SwFmDrawPage() throw ()
RemovePageView();
}
-const SdrMarkList& SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShapes > & xShapes)
+const SdrMarkList& SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShapes > & xShapes)
{
_SelectObjectsInView( xShapes, GetPageView() );
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
@@ -303,21 +303,21 @@ void SwFmDrawPage::PreUnGroup(const uno::Reference< drawing::XShapeGroup > xSha
_SelectObjectInView( xShape, GetPageView() );
}
-SdrPageView* SwFmDrawPage::GetPageView()
+SdrPageView* SwFmDrawPage::GetPageView()
{
if(!pPageView)
pPageView = mpView->ShowSdrPage( mpPage );
return pPageView;
}
-void SwFmDrawPage::RemovePageView()
+void SwFmDrawPage::RemovePageView()
{
if(pPageView && mpView)
mpView->HideSdrPage();
pPageView = 0;
}
-uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj )
+uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj )
{
uno::Reference< XInterface > xShape;
if( pObj )
@@ -613,9 +613,9 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
SvxShape* pSvxShape = 0;
if(xShapeTunnel.is())
{
- pShape = reinterpret_cast< SwXShape * >(
+ pShape = reinterpret_cast< SwXShape * >(
sal::static_int_cast< sal_IntPtr >( xShapeTunnel->getSomething(SwXShape::getUnoTunnelId()) ));
- pSvxShape = reinterpret_cast< SvxShape * >(
+ pSvxShape = reinterpret_cast< SvxShape * >(
sal::static_int_cast< sal_IntPtr >( xShapeTunnel->getSomething(SvxShape::getUnoTunnelId()) ));
}
@@ -640,7 +640,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
// <--
GetSvxPage()->add(xShape);
- uno::Reference< uno::XAggregation > xAgg = pShape->GetAggregationInterface();
+ uno::Reference< uno::XAggregation > xAgg = pShape->GetAggregationInterface();
DBG_ASSERT(pSvxShape, "warum gibt es hier kein SvxShape?");
//diese Position ist auf jeden Fall in 1/100 mm
@@ -862,7 +862,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
}
}
-SwFmDrawPage* SwXDrawPage::GetSvxPage()
+SwFmDrawPage* SwXDrawPage::GetSvxPage()
{
if(!xPageAgg.is() && pDoc)
{
@@ -1086,8 +1086,8 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx
{
// we need to create a new implementation id for this
// note: this memory is not free'd until application exists
- // but since we have a fixed set of shapetypes and the
- // memory will be reused this is ok.
+ // but since we have a fixed set of shapetypes and the
+ // memory will be reused this is ok.
pImplementationId = new uno::Sequence< sal_Int8 >( 16 );
rtl_createUuid( (sal_uInt8 *) pImplementationId->getArray(), 0, sal_True );
aImplementationIdMap[ aShapeType ] = pImplementationId;
@@ -1139,7 +1139,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
uno::RuntimeException)
{
SolarMutexGuard aGuard;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
if(xShapeAgg.is())
{
@@ -1501,7 +1501,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
SolarMutexGuard aGuard;
uno::Any aRet;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(xShapeAgg.is())
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
@@ -1766,7 +1766,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
uno::Sequence< beans::PropertyState > aRet(aPropertyNames.getLength());
if(xShapeAgg.is())
{
@@ -1867,7 +1867,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(xShapeAgg.is())
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
@@ -1887,12 +1887,12 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
{
switch(pEntry->nWID)
{
- case RES_ANCHOR: pImpl->RemoveAnchor(); break;
- case RES_HORI_ORIENT: pImpl->RemoveHOrient(); break;
- case RES_VERT_ORIENT: pImpl->RemoveVOrient(); break;
- case RES_LR_SPACE: pImpl->RemoveLRSpace(); break;
- case RES_UL_SPACE: pImpl->RemoveULSpace(); break;
- case RES_SURROUND: pImpl->RemoveSurround();break;
+ case RES_ANCHOR: pImpl->RemoveAnchor(); break;
+ case RES_HORI_ORIENT: pImpl->RemoveHOrient(); break;
+ case RES_VERT_ORIENT: pImpl->RemoveVOrient(); break;
+ case RES_LR_SPACE: pImpl->RemoveLRSpace(); break;
+ case RES_UL_SPACE: pImpl->RemoveULSpace(); break;
+ case RES_SURROUND: pImpl->RemoveSurround();break;
case RES_OPAQUE : pImpl->SetOpaque(sal_False); break;
case FN_TEXT_RANGE :
break;
@@ -1930,7 +1930,7 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName )
uno::RuntimeException )
{
SolarMutexGuard aGuard;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
uno::Any aRet;
if(xShapeAgg.is())
{
@@ -2031,9 +2031,9 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange)
SwXText* pText = 0;
SwXParagraph* pParagraph = 0;
- pRange = reinterpret_cast< SwXTextRange * >(
+ pRange = reinterpret_cast< SwXTextRange * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
- pText = reinterpret_cast< SwXText * >(
+ pText = reinterpret_cast< SwXText * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXText::getUnoTunnelId()) ));
pCursor = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
@@ -2211,7 +2211,7 @@ uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( u
return aSeq;
}
-SvxShape* SwXShape::GetSvxShape()
+SvxShape* SwXShape::GetSvxShape()
{
SvxShape* pSvxShape = 0;
if(xShapeAgg.is())
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 51897bea4d2d..60ccd2a63328 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -2,7 +2,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,66 +73,66 @@ const sal_Char sAPI_SwAutoTextEventDescriptor[] =
const struct SvEventDescription aGraphicEvents[] =
{
- { SW_EVENT_OBJECT_SELECT, "OnSelect" },
- { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
- { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
- { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
- { SVX_EVENT_IMAGE_LOAD, "OnLoadDone" },
- { SVX_EVENT_IMAGE_ABORT, "OnLoadCancel" },
- { SVX_EVENT_IMAGE_ERROR, "OnLoadError" },
+ { SW_EVENT_OBJECT_SELECT, "OnSelect" },
+ { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
+ { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
+ { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
+ { SVX_EVENT_IMAGE_LOAD, "OnLoadDone" },
+ { SVX_EVENT_IMAGE_ABORT, "OnLoadCancel" },
+ { SVX_EVENT_IMAGE_ERROR, "OnLoadError" },
{ 0, NULL }
};
const struct SvEventDescription aFrameEvents[] =
{
- { SW_EVENT_OBJECT_SELECT, "OnSelect" },
- { SW_EVENT_FRM_KEYINPUT_ALPHA, "OnAlphaCharInput" },
- { SW_EVENT_FRM_KEYINPUT_NOALPHA, "OnNonAlphaCharInput" },
- { SW_EVENT_FRM_RESIZE, "OnResize" },
- { SW_EVENT_FRM_MOVE, "OnMove" },
- { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
- { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
- { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
+ { SW_EVENT_OBJECT_SELECT, "OnSelect" },
+ { SW_EVENT_FRM_KEYINPUT_ALPHA, "OnAlphaCharInput" },
+ { SW_EVENT_FRM_KEYINPUT_NOALPHA, "OnNonAlphaCharInput" },
+ { SW_EVENT_FRM_RESIZE, "OnResize" },
+ { SW_EVENT_FRM_MOVE, "OnMove" },
+ { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
+ { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
+ { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
{ 0, NULL }
};
const struct SvEventDescription aOLEEvents[] =
{
- { SW_EVENT_OBJECT_SELECT, "OnSelect" },
- { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
- { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
- { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
+ { SW_EVENT_OBJECT_SELECT, "OnSelect" },
+ { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
+ { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
+ { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
{ 0, NULL }
};
const struct SvEventDescription aHyperlinkEvents[] =
{
- { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
- { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
- { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
+ { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
+ { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
+ { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
{ 0, NULL }
};
const struct SvEventDescription aAutotextEvents[] =
{
- { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
- { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
+ { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
+ { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
{ 0, NULL }
};
const struct SvEventDescription aFrameStyleEvents[] =
{
- { SW_EVENT_OBJECT_SELECT, "OnSelect" },
- { SW_EVENT_FRM_KEYINPUT_ALPHA, "OnAlphaCharInput" },
- { SW_EVENT_FRM_KEYINPUT_NOALPHA, "OnNonAlphaCharInput" },
- { SW_EVENT_FRM_RESIZE, "OnResize" },
- { SW_EVENT_FRM_MOVE, "OnMove" },
- { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
- { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
- { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
- { SVX_EVENT_IMAGE_LOAD, "OnLoadDone" },
- { SVX_EVENT_IMAGE_ABORT, "OnLoadCancel" },
- { SVX_EVENT_IMAGE_ERROR, "OnLoadError" },
+ { SW_EVENT_OBJECT_SELECT, "OnSelect" },
+ { SW_EVENT_FRM_KEYINPUT_ALPHA, "OnAlphaCharInput" },
+ { SW_EVENT_FRM_KEYINPUT_NOALPHA, "OnNonAlphaCharInput" },
+ { SW_EVENT_FRM_RESIZE, "OnResize" },
+ { SW_EVENT_FRM_MOVE, "OnMove" },
+ { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" },
+ { SFX_EVENT_MOUSECLICK_OBJECT, "OnClick" },
+ { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" },
+ { SVX_EVENT_IMAGE_LOAD, "OnLoadDone" },
+ { SVX_EVENT_IMAGE_ABORT, "OnLoadCancel" },
+ { SVX_EVENT_IMAGE_ERROR, "OnLoadError" },
{ 0, NULL }
};
diff --git a/sw/source/core/unocore/unoevtlstnr.cxx b/sw/source/core/unocore/unoevtlstnr.cxx
index 0e20fd81af9f..d87af6152f8e 100644
--- a/sw/source/core/unocore/unoevtlstnr.cxx
+++ b/sw/source/core/unocore/unoevtlstnr.cxx
@@ -2,7 +2,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
@@ -57,7 +57,7 @@ SwEventListenerContainer::~SwEventListenerContainer()
delete pListenerArr;
}
-void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEventListener > & rxListener)
+void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEventListener > & rxListener)
{
if(!pListenerArr)
pListenerArr = new SwEvtLstnrArray;
@@ -66,7 +66,7 @@ void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEvent
pListenerArr->Insert(pInsert, pListenerArr->Count());
}
-sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XEventListener > & rxListener)
+sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XEventListener > & rxListener)
{
if(!pListenerArr)
return sal_False;
@@ -88,7 +88,7 @@ sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang:
return sal_False;
}
-void SwEventListenerContainer::Disposing()
+void SwEventListenerContainer::Disposing()
{
if(!pListenerArr)
return;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 65f926e5a2d9..0f9093a49958 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace nsSwDocInfoSubType;
-#define COM_TEXT_FLDMASTER "com.sun.star.text.FieldMaster."
+#define COM_TEXT_FLDMASTER "com.sun.star.text.FieldMaster."
// case-corrected version of the first part for the service names (see #i67811)
#define COM_TEXT_FLDMASTER_CC "com.sun.star.text.fieldmaster."
@@ -107,23 +107,23 @@ using namespace nsSwDocInfoSubType;
// note: this thing is indexed as an array, so do not insert/remove entries!
static const sal_uInt16 aDocInfoSubTypeFromService[] =
{
- DI_CHANGE | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_AUTHOR
- DI_CHANGE | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME
- DI_EDIT | DI_SUB_TIME, //PROPERTY_MAP_FLDTYP_DOCINFO_EDIT_TIME
- DI_COMMENT, //PROPERTY_MAP_FLDTYP_DOCINFO_DESCRIPTION
- DI_CREATE | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_AUTHOR
- DI_CREATE | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_DATE_TIME
- 0, //DUMMY
- 0, //DUMMY
- 0, //DUMMY
- 0, //DUMMY
- DI_CUSTOM, //PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM
- DI_PRINT | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_AUTHOR
- DI_PRINT | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_DATE_TIME
- DI_KEYS, //PROPERTY_MAP_FLDTYP_DOCINFO_KEY_WORDS
- DI_THEMA, //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
- DI_TITEL, //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE
- DI_DOCNO //PROPERTY_MAP_FLDTYP_DOCINFO_REVISION
+ DI_CHANGE | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_AUTHOR
+ DI_CHANGE | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME
+ DI_EDIT | DI_SUB_TIME, //PROPERTY_MAP_FLDTYP_DOCINFO_EDIT_TIME
+ DI_COMMENT, //PROPERTY_MAP_FLDTYP_DOCINFO_DESCRIPTION
+ DI_CREATE | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_AUTHOR
+ DI_CREATE | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_CREATE_DATE_TIME
+ 0, //DUMMY
+ 0, //DUMMY
+ 0, //DUMMY
+ 0, //DUMMY
+ DI_CUSTOM, //PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM
+ DI_PRINT | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_AUTHOR
+ DI_PRINT | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_DATE_TIME
+ DI_KEYS, //PROPERTY_MAP_FLDTYP_DOCINFO_KEY_WORDS
+ DI_THEMA, //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
+ DI_TITEL, //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE
+ DI_DOCNO //PROPERTY_MAP_FLDTYP_DOCINFO_REVISION
};
struct ServiceIdResId
@@ -134,59 +134,59 @@ struct ServiceIdResId
static const ServiceIdResId aServiceToRes[] =
{
- {RES_DATETIMEFLD, SW_SERVICE_FIELDTYPE_DATETIME },
- {RES_USERFLD, SW_SERVICE_FIELDTYPE_USER },
- {RES_SETEXPFLD, SW_SERVICE_FIELDTYPE_SET_EXP } ,
- {RES_GETEXPFLD, SW_SERVICE_FIELDTYPE_GET_EXP } ,
- {RES_FILENAMEFLD, SW_SERVICE_FIELDTYPE_FILE_NAME },
- {RES_PAGENUMBERFLD, SW_SERVICE_FIELDTYPE_PAGE_NUM } ,
- {RES_AUTHORFLD, SW_SERVICE_FIELDTYPE_AUTHOR } ,
- {RES_CHAPTERFLD, SW_SERVICE_FIELDTYPE_CHAPTER },
- {RES_GETREFFLD, SW_SERVICE_FIELDTYPE_GET_REFERENCE } ,
- {RES_HIDDENTXTFLD, SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT },
- {RES_POSTITFLD, SW_SERVICE_FIELDTYPE_ANNOTATION } ,
- {RES_INPUTFLD, SW_SERVICE_FIELDTYPE_INPUT },
- {RES_MACROFLD, SW_SERVICE_FIELDTYPE_MACRO },
- {RES_DDEFLD, SW_SERVICE_FIELDTYPE_DDE },
- {RES_HIDDENPARAFLD, SW_SERVICE_FIELDTYPE_HIDDEN_PARA } ,
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOC_INFO },
- {RES_TEMPLNAMEFLD, SW_SERVICE_FIELDTYPE_TEMPLATE_NAME },
- {RES_EXTUSERFLD, SW_SERVICE_FIELDTYPE_USER_EXT },
- {RES_REFPAGESETFLD, SW_SERVICE_FIELDTYPE_REF_PAGE_SET } ,
- {RES_REFPAGEGETFLD, SW_SERVICE_FIELDTYPE_REF_PAGE_GET } ,
- {RES_JUMPEDITFLD, SW_SERVICE_FIELDTYPE_JUMP_EDIT },
- {RES_SCRIPTFLD, SW_SERVICE_FIELDTYPE_SCRIPT } ,
- {RES_DBNEXTSETFLD, SW_SERVICE_FIELDTYPE_DATABASE_NEXT_SET },
- {RES_DBNUMSETFLD, SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET },
+ {RES_DATETIMEFLD, SW_SERVICE_FIELDTYPE_DATETIME },
+ {RES_USERFLD, SW_SERVICE_FIELDTYPE_USER },
+ {RES_SETEXPFLD, SW_SERVICE_FIELDTYPE_SET_EXP } ,
+ {RES_GETEXPFLD, SW_SERVICE_FIELDTYPE_GET_EXP } ,
+ {RES_FILENAMEFLD, SW_SERVICE_FIELDTYPE_FILE_NAME },
+ {RES_PAGENUMBERFLD, SW_SERVICE_FIELDTYPE_PAGE_NUM } ,
+ {RES_AUTHORFLD, SW_SERVICE_FIELDTYPE_AUTHOR } ,
+ {RES_CHAPTERFLD, SW_SERVICE_FIELDTYPE_CHAPTER },
+ {RES_GETREFFLD, SW_SERVICE_FIELDTYPE_GET_REFERENCE } ,
+ {RES_HIDDENTXTFLD, SW_SERVICE_FIELDTYPE_CONDITIONED_TEXT },
+ {RES_POSTITFLD, SW_SERVICE_FIELDTYPE_ANNOTATION } ,
+ {RES_INPUTFLD, SW_SERVICE_FIELDTYPE_INPUT },
+ {RES_MACROFLD, SW_SERVICE_FIELDTYPE_MACRO },
+ {RES_DDEFLD, SW_SERVICE_FIELDTYPE_DDE },
+ {RES_HIDDENPARAFLD, SW_SERVICE_FIELDTYPE_HIDDEN_PARA } ,
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOC_INFO },
+ {RES_TEMPLNAMEFLD, SW_SERVICE_FIELDTYPE_TEMPLATE_NAME },
+ {RES_EXTUSERFLD, SW_SERVICE_FIELDTYPE_USER_EXT },
+ {RES_REFPAGESETFLD, SW_SERVICE_FIELDTYPE_REF_PAGE_SET } ,
+ {RES_REFPAGEGETFLD, SW_SERVICE_FIELDTYPE_REF_PAGE_GET } ,
+ {RES_JUMPEDITFLD, SW_SERVICE_FIELDTYPE_JUMP_EDIT },
+ {RES_SCRIPTFLD, SW_SERVICE_FIELDTYPE_SCRIPT } ,
+ {RES_DBNEXTSETFLD, SW_SERVICE_FIELDTYPE_DATABASE_NEXT_SET },
+ {RES_DBNUMSETFLD, SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET },
{RES_DBSETNUMBERFLD, SW_SERVICE_FIELDTYPE_DATABASE_SET_NUM } ,
- {RES_DBFLD, SW_SERVICE_FIELDTYPE_DATABASE } ,
- {RES_DBNAMEFLD, SW_SERVICE_FIELDTYPE_DATABASE_NAME },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_PAGE_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_WORD_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_CHARACTER_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_TABLE_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_GRAPHIC_OBJECT_COUNT },
- {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_EMBEDDED_OBJECT_COUNT },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_AUTHOR },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_DATE_TIME},
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_EDIT_TIME },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_DESCRIPTION },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_AUTHOR },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_DATE_TIME},
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_AUTHOR },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_DATE_TIME },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_KEY_WORDS },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_SUBJECT },
- {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_TITLE },
- {RES_INPUTFLD, SW_SERVICE_FIELDTYPE_INPUT_USER },
- {RES_HIDDENTXTFLD, SW_SERVICE_FIELDTYPE_HIDDEN_TEXT },
- {RES_AUTHORITY, SW_SERVICE_FIELDTYPE_BIBLIOGRAPHY },
- {RES_COMBINED_CHARS, SW_SERVICE_FIELDTYPE_COMBINED_CHARACTERS },
- {RES_DROPDOWN, SW_SERVICE_FIELDTYPE_DROPDOWN },
+ {RES_DBFLD, SW_SERVICE_FIELDTYPE_DATABASE } ,
+ {RES_DBNAMEFLD, SW_SERVICE_FIELDTYPE_DATABASE_NAME },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_PAGE_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_WORD_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_CHARACTER_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_TABLE_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_GRAPHIC_OBJECT_COUNT },
+ {RES_DOCSTATFLD, SW_SERVICE_FIELDTYPE_EMBEDDED_OBJECT_COUNT },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_AUTHOR },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_DATE_TIME},
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_EDIT_TIME },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_DESCRIPTION },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_AUTHOR },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CREATE_DATE_TIME},
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_AUTHOR },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_DATE_TIME },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_KEY_WORDS },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_SUBJECT },
+ {RES_DOCINFOFLD, SW_SERVICE_FIELDTYPE_DOCINFO_TITLE },
+ {RES_INPUTFLD, SW_SERVICE_FIELDTYPE_INPUT_USER },
+ {RES_HIDDENTXTFLD, SW_SERVICE_FIELDTYPE_HIDDEN_TEXT },
+ {RES_AUTHORITY, SW_SERVICE_FIELDTYPE_BIBLIOGRAPHY },
+ {RES_COMBINED_CHARS, SW_SERVICE_FIELDTYPE_COMBINED_CHARACTERS },
+ {RES_DROPDOWN, SW_SERVICE_FIELDTYPE_DROPDOWN },
{RES_TABLEFLD, SW_SERVICE_FIELDTYPE_TABLE_FORMULA },
- {USHRT_MAX, USHRT_MAX }
+ {USHRT_MAX, USHRT_MAX }
};
sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId)
@@ -232,13 +232,13 @@ sal_uInt16 lcl_GetServiceForField( const SwField& rFld )
? SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_AUTHOR
: SW_SERVICE_FIELDTYPE_DOCINFO_PRINT_DATE_TIME;
break;
- case DI_EDIT: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_EDIT_TIME;break;
+ case DI_EDIT: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_EDIT_TIME;break;
case DI_COMMENT:nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_DESCRIPTION;break;
case DI_KEYS: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_KEY_WORDS;break;
- case DI_THEMA: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_SUBJECT; break;
- case DI_TITEL: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_TITLE; break;
- case DI_DOCNO: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_REVISION; break;
- case DI_CUSTOM: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM; break;
+ case DI_THEMA: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_SUBJECT; break;
+ case DI_TITEL: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_TITLE; break;
+ case DI_DOCNO: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_REVISION; break;
+ case DI_CUSTOM: nSrvId = SW_SERVICE_FIELDTYPE_DOCINFO_CUSTOM; break;
}
}
break;
@@ -286,12 +286,12 @@ sal_uInt16 lcl_GetPropMapIdForFieldType( USHORT nWhich )
sal_uInt16 nId;
switch( nWhich )
{
- case RES_USERFLD: nId = PROPERTY_MAP_FLDMSTR_USER; break;
- case RES_DBFLD: nId = PROPERTY_MAP_FLDMSTR_DATABASE; break;
- case RES_SETEXPFLD: nId = PROPERTY_MAP_FLDMSTR_SET_EXP; break;
- case RES_DDEFLD: nId = PROPERTY_MAP_FLDMSTR_DDE; break;
- case RES_AUTHORITY: nId = PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY; break;
- default: nId = PROPERTY_MAP_FLDMSTR_DUMMY0;
+ case RES_USERFLD: nId = PROPERTY_MAP_FLDMSTR_USER; break;
+ case RES_DBFLD: nId = PROPERTY_MAP_FLDMSTR_DATABASE; break;
+ case RES_SETEXPFLD: nId = PROPERTY_MAP_FLDMSTR_SET_EXP; break;
+ case RES_DDEFLD: nId = PROPERTY_MAP_FLDMSTR_DDE; break;
+ case RES_AUTHORITY: nId = PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY; break;
+ default: nId = PROPERTY_MAP_FLDMSTR_DUMMY0;
}
return nId;
}
@@ -429,11 +429,11 @@ BOOL SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::R
const sal_Char* pEntry;
switch( nResTypeId )
{
- case RES_USERFLD: pEntry = "User"; break;
- case RES_DBFLD: pEntry = "Database"; break;
- case RES_SETEXPFLD: pEntry = "SetExpression"; break;
- case RES_DDEFLD: pEntry = "DDE"; break;
- case RES_AUTHORITY: pEntry = "Bibliography"; break;
+ case RES_USERFLD: pEntry = "User"; break;
+ case RES_DBFLD: pEntry = "Database"; break;
+ case RES_SETEXPFLD: pEntry = "SetExpression"; break;
+ case RES_DDEFLD: pEntry = "DDE"; break;
+ case RES_AUTHORITY: pEntry = "Bibliography"; break;
default: pEntry = 0;
}
if( pEntry )
@@ -456,11 +456,11 @@ uno::Sequence< OUString > SwXFieldMaster::getSupportedServiceNames(void) throw(
const sal_Char* pEntry1;
switch( nResTypeId )
{
- case RES_USERFLD: pEntry1 = "User"; break;
- case RES_DBFLD: pEntry1 = "Database"; break;
- case RES_SETEXPFLD: pEntry1 = "SetExpression"; break;
- case RES_DDEFLD: pEntry1 = "DDE"; break;
- case RES_AUTHORITY: pEntry1 = "Bibliography"; break;
+ case RES_USERFLD: pEntry1 = "User"; break;
+ case RES_DBFLD: pEntry1 = "Database"; break;
+ case RES_SETEXPFLD: pEntry1 = "SetExpression"; break;
+ case RES_DDEFLD: pEntry1 = "DDE"; break;
+ case RES_AUTHORITY: pEntry1 = "Bibliography"; break;
default: pEntry1 = 0;
}
if( pEntry1 )
@@ -507,7 +507,7 @@ uno::Reference< beans::XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(vo
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
- uno::Reference< beans::XPropertySetInfo > aRef =
+ uno::Reference< beans::XPropertySetInfo > aRef =
aSwMapProvider.GetPropertySet(
lcl_GetPropMapIdForFieldType( nResTypeId ) )->getPropertySetInfo();
return aRef;
@@ -537,7 +537,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
};
for(const sal_uInt16 * pIds = nIds; *pIds; ++pIds)
{
- if(sTypeName == *rExtraArr[ *pIds ] )
+ if(sTypeName == *rExtraArr[ *pIds ] )
{
bSetValue = sal_False;
break;
@@ -609,7 +609,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
}
break;
case RES_DBFLD :
- {
+ {
::GetString( rValue, sParam3 );
pType = GetFldType();
}
@@ -898,7 +898,7 @@ void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName
DBG_WARNING("not implemented");
}
-void SwXFieldMaster::dispose(void) throw( uno::RuntimeException )
+void SwXFieldMaster::dispose(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
SwFieldType* pFldType = GetFldType(sal_True);
@@ -970,14 +970,14 @@ const Programmatic2UIName_Impl* lcl_GetFieldNameTable()
{
bInitialized = TRUE;
int nName = 0;
- aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_ABB ));
- aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_ABB));
- aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_TABLE ));
- aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_TABLE));
- aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_FRAME));
- aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_FRAME));
- aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_DRAWING ));
- aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_DRAWING));
+ aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_ABB ));
+ aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_ABB));
+ aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_TABLE ));
+ aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_TABLE));
+ aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_FRAME));
+ aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_FRAME));
+ aFieldNames[nName].sUIName = String (SW_RES(STR_POOLCOLL_LABEL_DRAWING ));
+ aFieldNames[nName++].sProgrammaticName = String (SW_RES(STR_POCO_PRGM_LABEL_DRAWING));
}
return &aFieldNames[0];
}
@@ -1042,28 +1042,28 @@ SwXTextField * CreateSwXTextField(SwDoc & rDoc, SwFmtFld const& rFmt)
struct SwFieldProperties_Impl
{
- String sPar1;
- String sPar2;
- String sPar3;
- String sPar4;
+ String sPar1;
+ String sPar2;
+ String sPar3;
+ String sPar4;
String sPar5;
String sPar6;
- Date aDate;
- double fDouble;
- uno::Sequence<beans::PropertyValue> aPropSeq;
+ Date aDate;
+ double fDouble;
+ uno::Sequence<beans::PropertyValue> aPropSeq;
uno::Sequence<OUString> aStrings;
- util::DateTime* pDateTime;
-
- sal_Int32 nSubType;
- sal_Int32 nFormat;
- sal_uInt16 nUSHORT1;
- sal_uInt16 nUSHORT2;
- sal_Int16 nSHORT1;
- sal_Int8 nByte1;
+ util::DateTime* pDateTime;
+
+ sal_Int32 nSubType;
+ sal_Int32 nFormat;
+ sal_uInt16 nUSHORT1;
+ sal_uInt16 nUSHORT2;
+ sal_Int16 nSHORT1;
+ sal_Int8 nByte1;
sal_Bool bFormatIsDefault;
- sal_Bool bBool1;
- sal_Bool bBool2;
- sal_Bool bBool3;
+ sal_Bool bBool1;
+ sal_Bool bBool2;
+ sal_Bool bBool3;
sal_Bool bBool4;
SwFieldProperties_Impl():
@@ -1183,9 +1183,9 @@ uno::Reference< beans::XPropertySet > SwXTextField::getTextFieldMaster(void) th
if( m_bIsDescriptor && m_aFieldTypeClient.GetRegisteredIn() )
{
pType = (SwFieldType*)m_aFieldTypeClient.GetRegisteredIn();
- }
+ }
else
- {
+ {
if(!GetRegisteredIn())
throw uno::RuntimeException();
pType = pFmtFld->GetFld()->GetTyp();
@@ -1222,9 +1222,9 @@ void SwXTextField::attachToRange(
OTextCursorHelper* pCursor = 0;
if(xRangeTunnel.is())
{
- pRange = reinterpret_cast< SwXTextRange * >(
+ pRange = reinterpret_cast< SwXTextRange * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
- pCursor = reinterpret_cast< OTextCursorHelper * >(
+ pCursor = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
}
@@ -1241,7 +1241,7 @@ void SwXTextField::attachToRange(
case SW_SERVICE_FIELDTYPE_ANNOTATION:
{
SwFieldType* pFldType = pDoc->GetSysFldType(RES_POSTITFLD);
-
+
DateTime aDateTime;
if (m_pProps->pDateTime)
{
@@ -1380,7 +1380,7 @@ void SwXTextField::attachToRange(
m_pProps->nUSHORT1, m_pProps->sPar2, m_pProps->sPar1);
}
break;
- case SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_AUTHOR :
+ case SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_AUTHOR :
case SW_SERVICE_FIELDTYPE_DOCINFO_CHANGE_DATE_TIME :
case SW_SERVICE_FIELDTYPE_DOCINFO_EDIT_TIME :
case SW_SERVICE_FIELDTYPE_DOCINFO_DESCRIPTION :
@@ -1573,7 +1573,7 @@ void SwXTextField::attachToRange(
m_pProps->nUSHORT2 != USHRT_MAX ? //#i79471# the field can have a number format or a number_ing_ format
m_pProps->nUSHORT2 : m_pProps->nFormat);
- sal_uInt16 nSubType = pFld->GetSubType();
+ sal_uInt16 nSubType = pFld->GetSubType();
if(m_pProps->bBool2)
nSubType &= ~nsSwExtendedSubType::SUB_INVISIBLE;
else
@@ -1613,8 +1613,8 @@ void SwXTextField::attachToRange(
static_cast< SwSetExpFieldType* >(pSetExpFld)->GetType() == nsSwGetSetExpType::GSE_STRING )
nSubType = nsSwGetSetExpType::GSE_STRING;
}
- else
- bSetGetExpFieldUninitialized = true; // #i82544#
+ else
+ bSetGetExpFieldUninitialized = true; // #i82544#
if(m_pProps->bBool2)
nSubType |= nsSwExtendedSubType::SUB_CMD;
@@ -1626,7 +1626,7 @@ void SwXTextField::attachToRange(
//TODO: SubType auswerten!
if(m_pProps->sPar4.Len())
((SwGetExpField*)pFld)->ChgExpStr(m_pProps->sPar4);
- // #i82544#
+ // #i82544#
if( bSetGetExpFieldUninitialized )
((SwGetExpField*)pFld)->SetLateInitialization();
}
@@ -1678,7 +1678,7 @@ void SwXTextField::attachToRange(
sal_uInt16 nSubType = DS_PAGE;
switch(m_nServiceId)
{
-// case SW_SERVICE_FIELDTYPE_PAGE_COUNT : break;
+// case SW_SERVICE_FIELDTYPE_PAGE_COUNT : break;
case SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT : nSubType = DS_PARA;break;
case SW_SERVICE_FIELDTYPE_WORD_COUNT : nSubType = DS_WORD;break;
case SW_SERVICE_FIELDTYPE_CHARACTER_COUNT : nSubType = DS_CHAR;break;
@@ -1929,12 +1929,12 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
{
pFmtFld->GetTxtFld()->Expand();
}
-
+
//#i100374# changing a document field should set the modify flag
SwDoc* pDoc = GetDoc();
if (pDoc)
pDoc->SetModified();
-
+
}
else if(m_pProps)
{
@@ -2142,7 +2142,7 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
m_pTextObject = new SwTextAPIObject( pObj );
m_pTextObject->acquire();
}
-
+
uno::Reference < text::XText > xText( m_pTextObject );
aRet <<= xText;
break;
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 035f2986d7b0..2090dc747374 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -2,7 +2,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
@@ -126,7 +126,7 @@ void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl:
{
SolarMutexGuard aGuard;
SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer );
-}
+}
// text::XFlatParagraph:
::rtl::OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException)
@@ -179,7 +179,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, ::sal_Bool bVal )
}
// text::XFlatParagraph:
-lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
+lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
throw (uno::RuntimeException, lang::IllegalArgumentException)
{
SolarMutexGuard aGuard;
@@ -191,7 +191,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa
}
// text::XFlatParagraph:
-lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
+lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
throw (uno::RuntimeException, lang::IllegalArgumentException)
{
SolarMutexGuard aGuard;
@@ -362,10 +362,10 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
{
SwTxtNode* pTxtNode = dynamic_cast<SwTxtNode*>( pCnt->GetNode()->GetTxtNode() );
- if ( pTxtNode &&
- ((mnType == text::TextMarkupType::SPELLCHECK &&
+ if ( pTxtNode &&
+ ((mnType == text::TextMarkupType::SPELLCHECK &&
pTxtNode->IsWrongDirty()) ||
- (mnType == text::TextMarkupType::PROOFREADING &&
+ (mnType == text::TextMarkupType::PROOFREADING &&
pTxtNode->IsGrammarCheckDirty())) )
{
pRet = pTxtNode;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index afc9a0aaee6a..3b7e2909b6d2 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2,7 +2,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
@@ -210,7 +210,7 @@ sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const
{
SvxBrushItem aBrush ( static_cast < const :: SvxBrushItem & > ( rFromSet.Get ( RES_BACKGROUND ) ) );
if(pCol )
- bRet &= ((SfxPoolItem&)aBrush).PutValue(*pCol,MID_BACK_COLOR );
+ bRet &= ((SfxPoolItem&)aBrush).PutValue(*pCol,MID_BACK_COLOR );
if(pColTrans)
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
if(pRGBCol)
@@ -373,7 +373,7 @@ sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const
{
SwFmtSurround aSrnd ( static_cast < const :: SwFmtSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
if(pSur)
- bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSur, MID_SURROUND_SURROUNDTYPE );
+ bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSur, MID_SURROUND_SURROUNDTYPE );
if(pSurAnch)
bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSurAnch, MID_SURROUND_ANCHORONLY);
rToSet.Put(aSrnd);
@@ -396,17 +396,17 @@ sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const
GetProperty(RES_BOX, CONVERT_TWIPS|TOP_BORDER_DISTANCE, pTopDistance);
const ::uno::Any* pBottomDistance = 0;
GetProperty(RES_BOX, CONVERT_TWIPS|BOTTOM_BORDER_DISTANCE, pBottomDistance);
- if( pLeft || pRight || pTop || pBottom || pDistance ||
+ if( pLeft || pRight || pTop || pBottom || pDistance ||
pLeftDistance || pRightDistance || pTopDistance || pBottomDistance )
{
SvxBoxItem aBox ( static_cast < const :: SvxBoxItem & > ( rFromSet.Get ( RES_BOX ) ) );
- if( pLeft )
+ if( pLeft )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLeft, CONVERT_TWIPS|LEFT_BORDER );
- if( pRight )
+ if( pRight )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pRight, CONVERT_TWIPS|RIGHT_BORDER );
- if( pTop )
+ if( pTop )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pTop, CONVERT_TWIPS|TOP_BORDER);
- if( pBottom )
+ if( pBottom )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pBottom, CONVERT_TWIPS|BOTTOM_BORDER);
if( pDistance )
bRet &= ((SfxPoolItem&)aBox).PutValue(*pDistance, CONVERT_TWIPS|BORDER_DISTANCE);
@@ -620,7 +620,7 @@ inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet,
}
}
-sal_Bool SwGraphicProperties_Impl::AnyToItemSet(
+sal_Bool SwGraphicProperties_Impl::AnyToItemSet(
SwDoc* pDoc,
SfxItemSet& rFrmSet,
SfxItemSet& rGrSet,
@@ -714,7 +714,7 @@ sal_Bool SwOLEProperties_Impl::AnyToItemSet(
}
/******************************************************************
- * SwXFrame
+ * SwXFrame
******************************************************************/
const :: uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId()
{
@@ -1150,7 +1150,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
+// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
if(!pGrfNode)
{
@@ -1495,7 +1495,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
if(pIdx)
{
SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
+// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
if(!pGrfNode)
throw uno::RuntimeException();
@@ -1914,7 +1914,7 @@ void SwXFrame::removeEventListener(const uno::Reference< lang::XEventListener >
throw uno::RuntimeException();
}
-void SwXFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
+void SwXFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
{
ClientModify(this, pOld, pNew);
if(!GetRegisteredIn())
@@ -1996,7 +1996,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
OTextCursorHelper* pCursor = 0;
if(xRangeTunnel.is())
{
- pRange = reinterpret_cast< SwXTextRange * >(
+ pRange = reinterpret_cast< SwXTextRange * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
pCursor = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
@@ -2014,14 +2014,14 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
aPam.Move( fnMoveBackward, fnGoDoc );
static sal_uInt16 __READONLY_DATA aFrmAttrRange[] =
{
- RES_FRMATR_BEGIN, RES_FRMATR_END-1,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0
};
static sal_uInt16 __READONLY_DATA aGrAttrRange[] =
{
- RES_GRFATR_BEGIN, RES_GRFATR_END-1,
+ RES_GRFATR_BEGIN, RES_GRFATR_END-1,
0
};
SfxItemSet aGrSet(pDoc->GetAttrPool(), aGrAttrRange );
@@ -2330,7 +2330,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
OTextCursorHelper* pCursor = 0;
if(xRangeTunnel.is())
{
- pRange = reinterpret_cast< SwXTextRange * >(
+ pRange = reinterpret_cast< SwXTextRange * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
pCursor = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
@@ -2388,7 +2388,7 @@ OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException )
}
/******************************************************************
- * SwXTextFrame
+ * SwXTextFrame
******************************************************************/
SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
SwXText(0, CURSOR_FRAME),
@@ -2577,11 +2577,11 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void)
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(aPos, sal_False));
pUnoCursor->Move(fnMoveForward, fnGoNode);
-// // no Cursor in protected sections
-// SwCrsrSaveState aSave( *pUnoCrsr );
-// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
-// pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
-// throw uno::RuntimeException() );
+// // no Cursor in protected sections
+// SwCrsrSaveState aSave( *pUnoCrsr );
+// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
+// pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
+// throw uno::RuntimeException() );
aRef = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FRAME);
}
return aRef;
@@ -2691,7 +2691,7 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >&
}
/******************************************************************
- * SwXTextGraphicObject
+ * SwXTextGraphicObject
******************************************************************/
SwXTextGraphicObject::SwXTextGraphicObject( SwDoc *pDoc ) :
SwXFrame(FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC), pDoc)
@@ -2926,12 +2926,12 @@ void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< lang::XEve
uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( uno::RuntimeException )
{
uno::Reference< lang::XComponent > xRet;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
SwDoc* pDoc = pFmt->GetDoc();
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
- DBG_ASSERT( pCnt->GetCntntIdx() &&
+ DBG_ASSERT( pCnt->GetCntntIdx() &&
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
@@ -2968,12 +2968,12 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
throw( uno::RuntimeException )
{
uno::Reference< embed::XEmbeddedObject > xResult;
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
SwDoc* pDoc = pFmt->GetDoc();
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
- DBG_ASSERT( pCnt->GetCntntIdx() &&
+ DBG_ASSERT( pCnt->GetCntntIdx() &&
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
@@ -3008,12 +3008,12 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeException)
{
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
SwDoc* pDoc = pFmt->GetDoc();
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
- DBG_ASSERT( pCnt->GetCntntIdx() &&
+ DBG_ASSERT( pCnt->GetCntntIdx() &&
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
@@ -3025,12 +3025,12 @@ sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeExcepti
void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::RuntimeException)
{
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
SwDoc* pDoc = pFmt->GetDoc();
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
- DBG_ASSERT( pCnt->GetCntntIdx() &&
+ DBG_ASSERT( pCnt->GetCntntIdx() &&
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
@@ -3040,12 +3040,12 @@ void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::
uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() throw (uno::RuntimeException)
{
- SwFrmFmt* pFmt = GetFrmFmt();
+ SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
SwDoc* pDoc = pFmt->GetDoc();
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
- DBG_ASSERT( pCnt->GetCntntIdx() &&
+ DBG_ASSERT( pCnt->GetCntntIdx() &&
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 1e6f98b63496..3d24614466d5 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 07745d549d3a..aca14a1fe0f3 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2,7 +2,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
@@ -526,7 +526,7 @@ throw (uno::RuntimeException)
USHORT nObjectType = SW_SERVICE_TYPE_INDEX;
switch (m_pImpl->m_eTOXType)
{
-// case TOX_INDEX: break;
+// case TOX_INDEX: break;
case TOX_USER: nObjectType = SW_SERVICE_USER_INDEX;
break;
case TOX_CONTENT: nObjectType = SW_SERVICE_CONTENT_INDEX;
@@ -954,7 +954,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
}
break;
- case WID_IDX_TITLE :
+ case WID_IDX_TITLE :
{
OUString uRet(pTOXBase->GetTitle());
aRet <<= uRet;
@@ -985,7 +985,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
case WID_IDX_SORT_ALGORITHM:
aRet <<= OUString(pTOXBase->GetSortAlgorithm());
break;
- case WID_LEVEL :
+ case WID_LEVEL :
aRet <<= static_cast<sal_Int16>(pTOXBase->GetLevel());
break;
case WID_CREATE_FROM_MARKS:
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 7340237918a9..e3df0023e4bb 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::beans;
using ::rtl::OUString;
using namespace ::comphelper;
-#define SW_PROP_NMID(id) ((const char*)id), 0
+#define SW_PROP_NMID(id) ((const char*)id), 0
#ifndef MID_TXT_LMARGIN
#define MID_TXT_LMARGIN 11
@@ -85,70 +85,70 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
}
#define _STANDARD_FONT_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
+ { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT), RES_CHRATR_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE), RES_CHRATR_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
#define _CJK_FONT_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_ASIAN), RES_CHRATR_CJK_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_ASIAN), RES_CHRATR_CJK_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_ASIAN), RES_CHRATR_CJK_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
+ { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_ASIAN), RES_CHRATR_CJK_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_ASIAN), RES_CHRATR_CJK_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_ASIAN), RES_CHRATR_CJK_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
#define _CTL_FONT_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
- { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_COMPLEX), RES_CHRATR_CTL_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
- { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_COMPLEX), RES_CHRATR_CTL_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
- { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_COMPLEX), RES_CHRATR_CTL_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
+ { SW_PROP_NMID(UNO_NAME_CHAR_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
+ { SW_PROP_NMID(UNO_NAME_CHAR_WEIGHT_COMPLEX), RES_CHRATR_CTL_WEIGHT , CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::MAYBEVOID, MID_WEIGHT}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH }, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_POSTURE_COMPLEX), RES_CHRATR_CTL_POSTURE , CPPU_E2T(CPPUTYPE_FONTSLANT), PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+ { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE_COMPLEX), RES_CHRATR_CTL_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE) , PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
#define _REDLINE_NODE_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_START_REDLINE), FN_UNO_REDLINE_NODE_START , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff }, \
- { SW_PROP_NMID(UNO_NAME_END_REDLINE), FN_UNO_REDLINE_NODE_END , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff },
+ { SW_PROP_NMID(UNO_NAME_START_REDLINE), FN_UNO_REDLINE_NODE_START , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff }, \
+ { SW_PROP_NMID(UNO_NAME_END_REDLINE), FN_UNO_REDLINE_NODE_END , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0xff },
#define _REDLINE_PROPERTIES \
- {SW_PROP_NMID(UNO_NAME_REDLINE_AUTHOR), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_DATE_TIME), 0, CPPU_E2T(CPPUTYPE_DATETIME), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_COMMENT), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_TYPE), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_SUCCESSOR_DATA), 0, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_IDENTIFIER), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_IS_IN_HEADER_FOOTER), 0, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_REDLINE_TEXT), 0, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
- {SW_PROP_NMID(UNO_NAME_MERGE_LAST_PARA), 0, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_REDLINE_AUTHOR), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_DATE_TIME), 0, CPPU_E2T(CPPUTYPE_DATETIME), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_COMMENT), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_TYPE), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_SUCCESSOR_DATA), 0, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_IDENTIFIER), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_IS_IN_HEADER_FOOTER), 0, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_REDLINE_TEXT), 0, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+ {SW_PROP_NMID(UNO_NAME_MERGE_LAST_PARA), 0, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
/* -----------------24.06.98 18:12-------------------
*
* --------------------------------------------------*/
#define COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
- { SW_PROP_NMID(UNO_NAME_PARA_STYLE_NAME), FN_UNO_PARA_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, \
- { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), FN_UNO_PAGE_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, \
- { SW_PROP_NMID(UNO_NAME_NUMBERING_IS_NUMBER), FN_UNO_IS_NUMBER, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0}, \
- { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), FN_UNO_NUM_LEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \
- { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_NUMBERING_START_VALUE), FN_UNO_NUM_START_VALUE, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), FN_UNO_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
- { SW_PROP_NMID(UNO_NAME_TEXT_TABLE), FN_UNO_TEXT_TABLE, CPPU_E2T(CPPUTYPE_REFTXTTABLE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
- { SW_PROP_NMID(UNO_NAME_CELL), FN_UNO_CELL, CPPU_E2T(CPPUTYPE_REFCELL), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
- { SW_PROP_NMID(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME, CPPU_E2T(CPPUTYPE_REFTEXTFRAME), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
- { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLE_NAME), FN_UNO_PARA_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, \
+ { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), FN_UNO_PAGE_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_IS_NUMBER), FN_UNO_IS_NUMBER, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_LEVEL), FN_UNO_NUM_LEVEL, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, 0}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_START_VALUE), FN_UNO_NUM_START_VALUE, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), FN_UNO_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
+ { SW_PROP_NMID(UNO_NAME_TEXT_TABLE), FN_UNO_TEXT_TABLE, CPPU_E2T(CPPUTYPE_REFTXTTABLE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
+ { SW_PROP_NMID(UNO_NAME_CELL), FN_UNO_CELL, CPPU_E2T(CPPUTYPE_REFCELL), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
+ { SW_PROP_NMID(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME, CPPU_E2T(CPPUTYPE_REFTEXTFRAME), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
+ { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 }, \
{ SW_PROP_NMID(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL), FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0}, \
- { SW_PROP_NMID(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), FN_UNO_PARA_CONDITIONAL_STYLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0}, \
+ { SW_PROP_NMID(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME), FN_UNO_PARA_CONDITIONAL_STYLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0}, \
{ SW_PROP_NMID(UNO_NAME_LIST_ID), FN_UNO_LIST_ID, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, \
{ SW_PROP_NMID(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
{ SW_PROP_NMID(UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE), FN_UNO_PARA_CONT_PREV_SUBTREE, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0 }, \
@@ -295,67 +295,67 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
{ SW_PROP_NMID(UNO_NAME_CONTENT_SECTION), WID_IDX_CONTENT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION) , PropertyAttribute::READONLY, 0},\
{ SW_PROP_NMID(UNO_NAME_HEADER_SECTION), WID_IDX_HEADER_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION) , PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
-#define ANCHOR_TYPES_PROPERTY { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPES), FN_UNO_ANCHOR_TYPES, CPPU_E2T(CPPUTYPE_SEQANCHORTYPE),PropertyAttribute::READONLY, 0xff},
+#define ANCHOR_TYPES_PROPERTY { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPES), FN_UNO_ANCHOR_TYPES, CPPU_E2T(CPPUTYPE_SEQANCHORTYPE),PropertyAttribute::READONLY, 0xff},
// OD 18.09.2003 #i18732# - add property
// OD 2004-05-05 #i28701# - add property 'WrapInfluenceOnObjPos'
// OD 2009-07-13 #i73249# - add properties 'Title' and 'Description'
#define COMMON_FRAME_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ANCHOR_PAGENUM }, \
- { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE}, \
+ { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ANCHOR_PAGENUM }, \
+ { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE}, \
{ SW_PROP_NMID(UNO_NAME_ANCHOR_FRAME), RES_ANCHOR, CPPU_E2T(CPPUTYPE_REFTEXTFRAME), PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME}, \
ANCHOR_TYPES_PROPERTY\
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, \
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, \
{ SW_PROP_NMID(UNO_NAME_BACK_COLOR_R_G_B), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B}, \
{ SW_PROP_NMID(UNO_NAME_BACK_COLOR_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY}, \
{ SW_PROP_NMID(UNO_NAME_CONTENT_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_PROTECT_CONTENT }, \
{ SW_PROP_NMID(UNO_NAME_FRAME_STYLE_NAME), FN_UNO_FRAME_STYLE_NAME,CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, \
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL }, \
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER }, \
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL }, \
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER }, \
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY}, \
{ SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
- { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_ORIENT }, \
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_RELATION }, \
- { SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_URL}, \
- { SW_PROP_NMID(UNO_NAME_HYPER_LINK_TARGET), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_TARGET}, \
- { SW_PROP_NMID(UNO_NAME_HYPER_LINK_NAME), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_HYPERLINKNAME }, \
- { SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
- { SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE }, \
- { SW_PROP_NMID(UNO_NAME_POSITION_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_PROTECT_POSITION}, \
- { SW_PROP_NMID(UNO_NAME_PRINT), RES_PRINT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
- { SW_PROP_NMID(UNO_NAME_RELATIVE_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT }, \
- { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH }, \
- { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
+ { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_ORIENT }, \
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_RELATION }, \
+ { SW_PROP_NMID(UNO_NAME_HYPER_LINK_U_R_L), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_URL}, \
+ { SW_PROP_NMID(UNO_NAME_HYPER_LINK_TARGET), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_TARGET}, \
+ { SW_PROP_NMID(UNO_NAME_HYPER_LINK_NAME), RES_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_URL_HYPERLINKNAME }, \
+ { SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
+ { SW_PROP_NMID(UNO_NAME_PAGE_TOGGLE), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE }, \
+ { SW_PROP_NMID(UNO_NAME_POSITION_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_PROTECT_POSITION}, \
+ { SW_PROP_NMID(UNO_NAME_PRINT), RES_PRINT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
+ { SW_PROP_NMID(UNO_NAME_RELATIVE_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT }, \
+ { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH }, \
+ { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS}, \
{ SW_PROP_NMID(UNO_NAME_IMAGE_MAP), RES_URL, CPPU_E2T(CPPUTYPE_REFIDXCNTNR), PROPERTY_NONE, MID_URL_CLIENTMAP}, \
{ SW_PROP_NMID(UNO_NAME_SERVER_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_SERVERMAP }, \
- { SW_PROP_NMID(UNO_NAME_SIZE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_SIZE_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_PROTECT_SIZE }, \
- { SW_PROP_NMID(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT }, \
- { SW_PROP_NMID(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH }, \
- { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE }, \
+ { SW_PROP_NMID(UNO_NAME_SIZE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_SIZE_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_PROTECT_SIZE }, \
+ { SW_PROP_NMID(UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT }, \
+ { SW_PROP_NMID(UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH }, \
+ { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE }, \
{ SW_PROP_NMID(UNO_NAME_SURROUND), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE }, \
- { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_ANCHORONLY }, \
- { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT }, \
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT }, \
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_RELATION }, \
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, \
- { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff}, \
+ { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_ANCHORONLY }, \
+ { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT }, \
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT }, \
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_RELATION }, \
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS }, \
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff}, \
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },\
{ SW_PROP_NMID(UNO_NAME_Z_ORDER), FN_UNO_Z_ORDER, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, \
{ SW_PROP_NMID(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, \
@@ -367,17 +367,17 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
#define COMMON_TEXT_CONTENT_PROPERTIES \
- { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), FN_UNO_ANCHOR_TYPE, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
+ { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), FN_UNO_ANCHOR_TYPE, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
ANCHOR_TYPES_PROPERTY\
- { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), FN_UNO_TEXT_WRAP, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE },
+ { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), FN_UNO_TEXT_WRAP, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE },
-#define _PROP_DIFF_FONTHEIGHT \
- { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+#define _PROP_DIFF_FONTHEIGHT \
+ { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
{ SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT), RES_CHRATR_FONTSIZE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
- { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+ { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
{ SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN), RES_CHRATR_CJK_FONTSIZE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
- { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+ { SW_PROP_NMID(UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_FLOAT), PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
{ SW_PROP_NMID(UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX), RES_CHRATR_CTL_FONTSIZE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
@@ -550,42 +550,42 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aCharStyleMap [] =
{
- { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_STRIKEOUT), RES_CHRATR_CROSSEDOUT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
- { SW_PROP_NMID(UNO_NAME_CHAR_CROSSED_OUT), RES_CHRATR_CROSSEDOUT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ESC },
- { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT, CPPU_E2T(CPPUTYPE_INT8) , PROPERTY_NONE, MID_ESC_HEIGHT},
- { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_STRIKEOUT), RES_CHRATR_CROSSEDOUT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
+ { SW_PROP_NMID(UNO_NAME_CHAR_CROSSED_OUT), RES_CHRATR_CROSSEDOUT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ESC },
+ { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT, CPPU_E2T(CPPUTYPE_INT8) , PROPERTY_NONE, MID_ESC_HEIGHT},
+ { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
_STANDARD_FONT_PROPERTIES
_CJK_FONT_PROPERTIES
_CTL_FONT_PROPERTIES
- { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_TL_STYLE},
- { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_TL_COLOR},
- { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TL_HASCOLOR},
- { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_TL_STYLE},
- { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_TL_COLOR},
- { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TL_HASCOLOR},
- { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_TL_STYLE},
+ { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_TL_COLOR},
+ { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TL_HASCOLOR},
+ { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_TL_STYLE},
+ { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_TL_COLOR},
+ { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TL_HASCOLOR},
+ { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE), RES_CHRATR_WORDLINEMODE,CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TWOLINES},
- { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, MID_START_BRACKET},
- { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, MID_END_BRACKET},
- { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_EMPHASIS},
+ { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_TWOLINES},
+ { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, MID_START_BRACKET},
+ { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, MID_END_BRACKET},
+ { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_EMPHASIS},
_PROP_DIFF_FONTHEIGHT
- { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ROTATE },
- { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_FITTOLINE },
- { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
+ { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ROTATE },
+ { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_FITTOLINE },
+ { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_RELIEF },
{0,0,0,0,0,0}
};
@@ -758,105 +758,105 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aPageStyleMap [] =
{
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- // { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ // { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEADER_BACK_COLOR), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- // { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC), FN_UNO_HEADER_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
- { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_URL), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_FILTER), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_LOCATION), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_MARGIN), FN_UNO_HEADER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_MARGIN), FN_UNO_HEADER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEADER_BACK_TRANSPARENT), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_BACK_COLOR), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ // { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC), FN_UNO_HEADER_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
+ { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_URL), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_FILTER), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC_LOCATION), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_MARGIN), FN_UNO_HEADER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_MARGIN), FN_UNO_HEADER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HEADER_BACK_TRANSPARENT), FN_UNO_HEADER_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_HEADER_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_SHADOW_FORMAT), FN_UNO_HEADER_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEADER_BODY_DISTANCE), FN_UNO_HEADER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT), FN_UNO_HEADER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
- { SW_PROP_NMID(UNO_NAME_HEADER_IS_SHARED), FN_UNO_HEADER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
- { SW_PROP_NMID(UNO_NAME_HEADER_HEIGHT), FN_UNO_HEADER_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HEADER_IS_ON), FN_UNO_HEADER_ON, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_HEADER_LEFT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_TOP_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE), FN_UNO_HEADER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_SHADOW_FORMAT), FN_UNO_HEADER_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HEADER_BODY_DISTANCE), FN_UNO_HEADER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT), FN_UNO_HEADER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_HEADER_IS_SHARED), FN_UNO_HEADER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_HEADER_HEIGHT), FN_UNO_HEADER_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HEADER_IS_ON), FN_UNO_HEADER_ON, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
{ SW_PROP_NMID(UNO_NAME_HEADER_DYNAMIC_SPACING), FN_UNO_HEADER_EAT_SPACING, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID ,0 },
- { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_COLOR), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- // { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC), FN_UNO_FOOTER_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
- { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_URL), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_FILTER), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_LOCATION), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_MARGIN), FN_UNO_FOOTER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_MARGIN), FN_UNO_FOOTER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_TRANSPARENT), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_COLOR), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ // { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC), FN_UNO_FOOTER_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
+ { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_URL), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_FILTER), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_GRAPHIC_LOCATION), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_MARGIN), FN_UNO_FOOTER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_MARGIN), FN_UNO_FOOTER_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_BACK_TRANSPARENT), FN_UNO_FOOTER_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_FOOTER_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_SHADOW_FORMAT), FN_UNO_FOOTER_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_FOOTER_BODY_DISTANCE), FN_UNO_FOOTER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT), FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
- { SW_PROP_NMID(UNO_NAME_FOOTER_IS_SHARED), FN_UNO_FOOTER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
- { SW_PROP_NMID(UNO_NAME_FOOTER_HEIGHT), FN_UNO_FOOTER_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTER_IS_ON), FN_UNO_FOOTER_ON, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_TOP_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE), FN_UNO_FOOTER_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_SHADOW_FORMAT), FN_UNO_FOOTER_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_BODY_DISTANCE), FN_UNO_FOOTER_BODY_DISTANCE,CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT), FN_UNO_FOOTER_IS_DYNAMIC_DISTANCE,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_IS_SHARED), FN_UNO_FOOTER_SHARE_CONTENT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_HEIGHT), FN_UNO_FOOTER_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTER_IS_ON), FN_UNO_FOOTER_ON, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
{ SW_PROP_NMID(UNO_NAME_FOOTER_DYNAMIC_SPACING), FN_UNO_FOOTER_EAT_SPACING, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID ,0 },
- { SW_PROP_NMID(UNO_NAME_IS_LANDSCAPE), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_PAGE_ORIENTATION },
- { SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_PAGE_NUMTYPE },
- { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_LAYOUT), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_PAGESTYLELAY), PROPERTY_NONE ,MID_PAGE_LAYOUT },
- { SW_PROP_NMID(UNO_NAME_PRINTER_PAPER_TRAY), RES_PAPER_BIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
-// { SW_PROP_NMID(UNO_NAME_REGISTER_MODE_ACTIVE), SID_SWREGISTER_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , 0 },
- { SW_PROP_NMID(UNO_NAME_REGISTER_PARAGRAPH_STYLE), SID_SWREGISTER_COLLECTION, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
- { SW_PROP_NMID(UNO_NAME_SIZE), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PROPERTY_NONE, MID_SIZE_SIZE|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_WIDTH), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEIGHT), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_IS_LANDSCAPE), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_PAGE_ORIENTATION },
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_PAGE_NUMTYPE },
+ { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_LAYOUT), SID_ATTR_PAGE, CPPU_E2T(CPPUTYPE_PAGESTYLELAY), PROPERTY_NONE ,MID_PAGE_LAYOUT },
+ { SW_PROP_NMID(UNO_NAME_PRINTER_PAPER_TRAY), RES_PAPER_BIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
+// { SW_PROP_NMID(UNO_NAME_REGISTER_MODE_ACTIVE), SID_SWREGISTER_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , 0 },
+ { SW_PROP_NMID(UNO_NAME_REGISTER_PARAGRAPH_STYLE), SID_SWREGISTER_COLLECTION, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE , 0 },
+ { SW_PROP_NMID(UNO_NAME_SIZE), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PROPERTY_NONE, MID_SIZE_SIZE|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_WIDTH), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HEIGHT), SID_ATTR_PAGE_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HEADER_TEXT), FN_UNO_HEADER, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_LEFT), FN_UNO_HEADER_LEFT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_RIGHT), FN_UNO_HEADER_RIGHT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT), FN_UNO_FOOTER, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_LEFT), FN_UNO_FOOTER_LEFT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_RIGHT), FN_UNO_FOOTER_RIGHT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_FOLLOW_STYLE), FN_UNO_FOLLOW_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HEADER_TEXT), FN_UNO_HEADER, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_LEFT), FN_UNO_HEADER_LEFT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_HEADER_TEXT_RIGHT), FN_UNO_HEADER_RIGHT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT), FN_UNO_FOOTER, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_LEFT), FN_UNO_FOOTER_LEFT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_FOOTER_TEXT_RIGHT), FN_UNO_FOOTER_RIGHT, CPPU_E2T(CPPUTYPE_REFTEXT), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_FOLLOW_STYLE), FN_UNO_FOLLOW_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_HEIGHT), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_FTN_HEIGHT|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_WEIGHT), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_LINE_WEIGHT|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_COLOR), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_COLOR},
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE , MID_LINE_RELWIDTH },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_ADJUST), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_LINE_ADJUST },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_TEXT_DIST |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_DISTANCE), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_HEIGHT), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_FTN_HEIGHT|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_WEIGHT), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_LINE_WEIGHT|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_COLOR), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_COLOR},
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE , MID_LINE_RELWIDTH },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_ADJUST), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_LINE_ADJUST },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_TEXT_DIST |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_LINE_DISTANCE), FN_PARAM_FTN_INFO, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
// writing grid
{ SW_PROP_NMID(UNO_NAME_GRID_COLOR), RES_TEXTGRID, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_GRID_COLOR},
@@ -879,8 +879,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aNumStyleMap [] =
{
- { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PROPERTY_NONE, CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_NUMBERING_RULES), FN_UNO_NUM_RULES, CPPU_E2T(CPPUTYPE_REFIDXREPL), PROPERTY_NONE, CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_IS_PHYSICAL), FN_UNO_IS_PHYSICAL, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
@@ -891,37 +891,37 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aTablePropertyMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK, CPPU_E2T(CPPUTYPE_BREAK), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_ORIENT },
- { SW_PROP_NMID(UNO_NAME_KEEP_TOGETHER), RES_KEEP, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SPLIT), RES_LAYOUT_SPLIT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_PAGE_NUMBER_OFFSET), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BREAK_TYPE), RES_BREAK, CPPU_E2T(CPPUTYPE_BREAK), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_HORIORIENT_ORIENT },
+ { SW_PROP_NMID(UNO_NAME_KEEP_TOGETHER), RES_KEEP, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SPLIT), RES_LAYOUT_SPLIT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_PAGE_NUMBER_OFFSET), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},
{ SW_PROP_NMID(UNO_NAME_PAGE_DESC_NAME), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0xff},
- { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), FN_TABLE_RELATIVE_WIDTH,CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0xff },
- { SW_PROP_NMID(UNO_NAME_REPEAT_HEADLINE), FN_TABLE_HEADLINE_REPEAT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0xff},
+ { SW_PROP_NMID(UNO_NAME_RELATIVE_WIDTH), FN_TABLE_RELATIVE_WIDTH,CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0xff },
+ { SW_PROP_NMID(UNO_NAME_REPEAT_HEADLINE), FN_TABLE_HEADLINE_REPEAT,CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0xff},
{ SW_PROP_NMID(UNO_NAME_HEADER_ROW_COUNT), FN_TABLE_HEADLINE_COUNT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0xff},
- { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_WIDTH), FN_TABLE_WIDTH, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, 0xff},
- { SW_PROP_NMID(UNO_NAME_IS_WIDTH_RELATIVE), FN_TABLE_IS_RELATIVE_WIDTH, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0xff},
- { SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL), FN_UNO_RANGE_ROW_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_CHART_COLUMN_AS_LABEL), FN_UNO_RANGE_COL_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_TABLE_BORDER), FN_UNO_TABLE_BORDER, CPPU_E2T(CPPUTYPE_TABLEBORDER), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_WIDTH), FN_TABLE_WIDTH, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, 0xff},
+ { SW_PROP_NMID(UNO_NAME_IS_WIDTH_RELATIVE), FN_TABLE_IS_RELATIVE_WIDTH, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0xff},
+ { SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL), FN_UNO_RANGE_ROW_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CHART_COLUMN_AS_LABEL), FN_UNO_RANGE_COL_LABEL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_TABLE_BORDER), FN_UNO_TABLE_BORDER, CPPU_E2T(CPPUTYPE_TABLEBORDER), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_TABLE_BORDER_DISTANCES), FN_UNO_TABLE_BORDER_DISTANCES, CPPU_E2T(CPPUTYPE_TABLEBORDERDISTANCES), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_SEPARATORS), FN_UNO_TABLE_COLUMN_SEPARATORS, CPPU_E2T(CPPUTYPE_TBLCOLSEP), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_RELATIVE_SUM), FN_UNO_TABLE_COLUMN_RELATIVE_SUM, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0 },
+ { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_RELATIVE_SUM), FN_UNO_TABLE_COLUMN_RELATIVE_SUM, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0 },
COMMON_TEXT_CONTENT_PROPERTIES
- { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+ { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_TABLE_NAME), FN_UNO_TABLE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), RES_PAGEDESC, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
@@ -939,26 +939,26 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aCellMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE , MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
{ SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0 },
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0 },
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, LEFT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, RIGHT_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, TOP_BORDER |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), 0, BOTTOM_BORDER|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+ { SW_PROP_NMID(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION, CPPU_E2T(CPPUTYPE_REFTEXTSECTION), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), RES_PROTECT, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, MID_PROTECT_CONTENT},
{ SW_PROP_NMID(UNO_NAME_CELL_NAME), FN_UNO_CELL_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY,0},
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT },
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_ROW_SPAN), FN_UNO_CELL_ROW_SPAN, CPPU_E2T(CPPUTYPE_INT32), 0, 0 },
_REDLINE_NODE_PROPERTIES
@@ -1003,51 +1003,51 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aSectionPropertyMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_CONDITION), WID_SECT_CONDITION, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE), WID_SECT_DDE_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE), WID_SECT_DDE_FILE, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT), WID_SECT_DDE_ELEMENT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), WID_SECT_DDE_AUTOUPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_FILE_LINK), WID_SECT_LINK , CPPU_E2T(CPPUTYPE_SECTFILELNK), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_IS_VISIBLE), WID_SECT_VISIBLE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_SECT_PROTECTED, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_CONDITION), WID_SECT_CONDITION, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE), WID_SECT_DDE_TYPE, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE), WID_SECT_DDE_FILE, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT), WID_SECT_DDE_ELEMENT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), WID_SECT_DDE_AUTOUPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_FILE_LINK), WID_SECT_LINK , CPPU_E2T(CPPUTYPE_SECTFILELNK), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_VISIBLE), WID_SECT_VISIBLE , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_SECT_PROTECTED, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
// --> FME 2004-06-22 #114856# edit in readonly sections
{ SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), WID_SECT_EDIT_IN_READONLY, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
// <--
{ SW_PROP_NMID(UNO_NAME_LINK_REGION), WID_SECT_REGION , CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
{ SW_PROP_NMID(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_COLLECT },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_RESTART_NUM },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_START_AT},
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_OWN_NUM },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_TYPE), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_TYPE },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_PREFIX), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_PREFIX },
- { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_SUFFIX },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_COLLECT },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_RESTART_NUM },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_START_AT },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_OWN_NUMBERING), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_OWN_NUM },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_TYPE), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_NUM_TYPE },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_PREFIX), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_PREFIX },
- { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_SUFFIX), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_SUFFIX },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_COLLECT },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_RESTART_NUM },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_START_AT},
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_OWN_NUM },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_TYPE), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_TYPE },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_PREFIX), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_PREFIX },
+ { SW_PROP_NMID(UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX), RES_FTN_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_SUFFIX },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_COLLECT },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_RESTART_NUM },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , MID_NUM_START_AT },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_IS_OWN_NUMBERING), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , MID_OWN_NUM },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_TYPE), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_NUM_TYPE },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_PREFIX), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_PREFIX },
+ { SW_PROP_NMID(UNO_NAME_ENDNOTE_NUMBERING_SUFFIX), RES_END_AT_TXTEND, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, MID_SUFFIX },
{ SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX), WID_SECT_DOCUMENT_INDEX, CPPU_E2T(CPPUTYPE_REFDOCINDEX), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION), WID_SECT_IS_GLOBAL_DOC_SECTION, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0 },
{ SW_PROP_NMID(UNO_NAME_PROTECTION_KEY), WID_SECT_PASSWORD, CPPU_E2T(CPPUTYPE_SEQINT8), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_DONT_BALANCE_TEXT_COLUMNS), RES_COLUMNBALANCE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
COMMON_TEXT_CONTENT_PROPERTIES
_REDLINE_NODE_PROPERTIES
- { SW_PROP_NMID(UNO_NAME_IS_CURRENTLY_VISIBLE), WID_SECT_CURRENTLY_VISIBLE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_CURRENTLY_VISIBLE), WID_SECT_CURRENTLY_VISIBLE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
/* -> #109700# */
- { SW_PROP_NMID(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS}, \
- { SW_PROP_NMID(UNO_NAME_SECT_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_SECT_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS}, \
+ { SW_PROP_NMID(UNO_NAME_SECT_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
/* <- #1097001# */
{0,0,0,0,0,0}
};
@@ -1058,18 +1058,18 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_SEARCH_ALL), WID_SEARCH_ALL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_BACKWARDS), WID_BACKWARDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_CASE_SENSITIVE), WID_CASE_SENSITIVE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_SEARCH_IN_SELECTION), WID_IN_SELECTION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_REGULAR_EXPRESSION), WID_REGULAR_EXPRESSION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY), WID_SIMILARITY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_ADD), WID_SIMILARITY_ADD, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_EXCHANGE), WID_SIMILARITY_EXCHANGE,CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_RELAX), WID_SIMILARITY_RELAX, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_REMOVE), WID_SIMILARITY_REMOVE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_STYLES), WID_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SEARCH_WORDS), WID_WORDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_ALL), WID_SEARCH_ALL, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_BACKWARDS), WID_BACKWARDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_CASE_SENSITIVE), WID_CASE_SENSITIVE, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_SEARCH_IN_SELECTION), WID_IN_SELECTION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_REGULAR_EXPRESSION), WID_REGULAR_EXPRESSION, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY), WID_SIMILARITY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_ADD), WID_SIMILARITY_ADD, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_EXCHANGE), WID_SIMILARITY_EXCHANGE,CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_RELAX), WID_SIMILARITY_RELAX, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_SIMILARITY_REMOVE), WID_SIMILARITY_REMOVE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_STYLES), WID_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SEARCH_WORDS), WID_WORDS, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aSearchPropertyMap_Impl;
@@ -1082,19 +1082,19 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
COMMON_FRAME_PROPERTIES
_REDLINE_NODE_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
- { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
- /*not impl*/ { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_CLIENTMAP },
- { SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), RES_EDIT_IN_READONLY, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
+ { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
+ /*not impl*/ { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_CLIENTMAP },
+ { SW_PROP_NMID(UNO_NAME_EDIT_IN_READONLY), RES_EDIT_IN_READONLY, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_GRAPHIC), RES_BACKGROUND, &, PROPERTY_NONE, MID_GRAPHIC
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
//next elements are part of the service description
- { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_ABSOLUTE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_PERCENT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
- { SW_PROP_NMID(UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT },
- { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_ABSOLUTE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_PERCENT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH },
- { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
- { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE },
+ { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_ABSOLUTE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FRAME_HEIGHT_PERCENT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
+ { SW_PROP_NMID(UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT },
+ { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_ABSOLUTE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_FRAME_WIDTH_PERCENT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH },
+ { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
+ { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE },
{ SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 },
{0,0,0,0,0,0}
};
@@ -1106,12 +1106,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aGraphicPropertyMap_Impl[] =
{
COMMON_FRAME_PROPERTIES
- { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR },
- { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE },
- { SW_PROP_NMID(UNO_NAME_GRAPHIC_CROP), RES_GRFATR_CROPGRF, CPPU_E2T(CPPUTYPE_GRFCROP), PROPERTY_NONE, CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_HORZ_EVEN_PAGES },
- { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_HORZ_ODD_PAGES },
- { SW_PROP_NMID(UNO_NAME_VERT_MIRRORED), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_VERT },
+ { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR },
+ { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE },
+ { SW_PROP_NMID(UNO_NAME_GRAPHIC_CROP), RES_GRFATR_CROPGRF, CPPU_E2T(CPPUTYPE_GRFCROP), PROPERTY_NONE, CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_HORZ_EVEN_PAGES },
+ { SW_PROP_NMID(UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_HORZ_ODD_PAGES },
+ { SW_PROP_NMID(UNO_NAME_VERT_MIRRORED), RES_GRFATR_MIRRORGRF, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_MIRROR_VERT },
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_URL), FN_UNO_GRAPHIC_U_R_L, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
{ SW_PROP_NMID(UNO_NAME_GRAPHIC_FILTER), FN_UNO_GRAPHIC_FILTER, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0 },
{ SW_PROP_NMID(UNO_NAME_GRAPHIC), FN_UNO_GRAPHIC, CPPU_E2T(CPPUTYPE_REFXGRAPHIC), 0, 0 },
@@ -1120,16 +1120,16 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 },
{ SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 },
- { SW_PROP_NMID(UNO_NAME_GRAPHIC_ROTATION), RES_GRFATR_ROTATION, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_ADJUST_LUMINANCE), RES_GRFATR_LUMINANCE, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_ADJUST_CONTRAST), RES_GRFATR_CONTRAST, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_ADJUST_RED), RES_GRFATR_CHANNELR, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_ADJUST_GREEN), RES_GRFATR_CHANNELG, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_ADJUST_BLUE), RES_GRFATR_CHANNELB, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_GAMMA), RES_GRFATR_GAMMA, CPPU_E2T(CPPUTYPE_DOUBLE), 0, 0},
- { SW_PROP_NMID(UNO_NAME_GRAPHIC_IS_INVERTED), RES_GRFATR_INVERT, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
- { SW_PROP_NMID(UNO_NAME_TRANSPARENCY), RES_GRFATR_TRANSPARENCY, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
- { SW_PROP_NMID(UNO_NAME_GRAPHIC_COLOR_MODE), RES_GRFATR_DRAWMODE, CPPU_E2T(CPPUTYPE_COLORMODE), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_GRAPHIC_ROTATION), RES_GRFATR_ROTATION, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_ADJUST_LUMINANCE), RES_GRFATR_LUMINANCE, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_ADJUST_CONTRAST), RES_GRFATR_CONTRAST, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_ADJUST_RED), RES_GRFATR_CHANNELR, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_ADJUST_GREEN), RES_GRFATR_CHANNELG, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_ADJUST_BLUE), RES_GRFATR_CHANNELB, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_GAMMA), RES_GRFATR_GAMMA, CPPU_E2T(CPPUTYPE_DOUBLE), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_GRAPHIC_IS_INVERTED), RES_GRFATR_INVERT, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_TRANSPARENCY), RES_GRFATR_TRANSPARENCY, CPPU_E2T(CPPUTYPE_INT16), 0, 0},
+ { SW_PROP_NMID(UNO_NAME_GRAPHIC_COLOR_MODE), RES_GRFATR_DRAWMODE, CPPU_E2T(CPPUTYPE_COLORMODE), 0, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aGraphicPropertyMap_Impl;
@@ -1161,25 +1161,25 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aShapeMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM },
- { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
+ { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM },
+ { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
{ SW_PROP_NMID(UNO_NAME_ANCHOR_FRAME), RES_ANCHOR, CPPU_E2T(CPPUTYPE_REFTEXTFRAME), PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},
{ SW_PROP_NMID(UNO_NAME_HORI_ORIENT), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_ORIENT },
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
- { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_POSITION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_HORI_ORIENT_RELATION), RES_HORI_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
+ { SW_PROP_NMID(UNO_NAME_LEFT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
{ SW_PROP_NMID(UNO_NAME_SURROUND), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_SURROUNDTYPE },
- { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
- { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY },
- { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR },
- { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE },
- { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT },
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
- { SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FN_TEXT_RANGE, CPPU_E2T(CPPUTYPE_REFTXTRANGE), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_TEXT_WRAP), RES_SURROUND, CPPU_E2T(CPPUTYPE_WRAPTXTMODE), PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
+ { SW_PROP_NMID(UNO_NAME_SURROUND_ANCHORONLY), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY },
+ { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR },
+ { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE },
+ { SW_PROP_NMID(UNO_NAME_TOP_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_BOTTOM_MARGIN), RES_UL_SPACE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT },
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_POSITION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_VERT_ORIENT_RELATION), RES_VERT_ORIENT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
+ { SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FN_TEXT_RANGE, CPPU_E2T(CPPUTYPE_REFTXTRANGE), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_OPAQUE), RES_OPAQUE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_ANCHOR_POSITION), FN_ANCHOR_POSITION, CPPU_E2T(CPPUTYPE_AWTPOINT), PropertyAttribute::READONLY, 0},
// OD 2004-05-04 #i26791#
@@ -1219,13 +1219,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aIdxMarkMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_PRIMARY_KEY), WID_PRIMARY_KEY, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SECONDARY_KEY), WID_SECONDARY_KEY, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_PRIMARY_KEY), WID_PRIMARY_KEY, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SECONDARY_KEY), WID_SECONDARY_KEY, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_READING), WID_TEXT_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_PRIMARY_KEY_READING), WID_PRIMARY_KEY_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_SECONDARY_KEY_READING), WID_SECONDARY_KEY_READING, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_IS_MAIN_ENTRY), WID_MAIN_ENTRY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_MAIN_ENTRY), WID_MAIN_ENTRY, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1236,8 +1236,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aCntntMarkMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1248,9 +1248,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aUserMarkMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_LEVEL ), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_ALTERNATIVE_TEXT), WID_ALT_TEXT, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_LEVEL ), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
COMMON_TEXT_CONTENT_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1271,22 +1271,22 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_USE_P_P), WID_USE_P_P , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USE_DASH), WID_USE_DASH , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USE_UPPER_CASE), WID_USE_UPPER_CASE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME), WID_MAIN_ENTRY_CHARACTER_STYLE_NAME , CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLESEPARATOR), WID_PARA_SEP, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_IS_COMMA_SEPARATED), WID_IS_COMMA_SEPARATED, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
- { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLESEPARATOR), WID_PARA_SEP, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_COMMA_SEPARATED), WID_IS_COMMA_SEPARATED, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,0 },
+ { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LOCALE), WID_IDX_LOCALE, CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE, 0},\
{ SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), WID_IDX_SORT_ALGORITHM, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},\
@@ -1303,33 +1303,33 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_LEVEL), WID_LEVEL , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_OUTLINE), WID_CREATE_FROM_OUTLINE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_PARAGRAPH_STYLES), WID_LEVEL_PARAGRAPH_STYLES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES), WID_CREATE_FROM_PARAGRAPH_STYLES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_RECALC_TAB_STOPS), WID_RECALC_TAB_STOPS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_RECALC_TAB_STOPS), WID_RECALC_TAB_STOPS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ // { SW_PROP_NMID(UNO_NAME_??? ), WID_??? , &_getReflection , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4), WID_PARA_LEV4, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5), WID_PARA_LEV5, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6), WID_PARA_LEV6, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7), WID_PARA_LEV7, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8), WID_PARA_LEV8, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9), WID_PARA_LEV9, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10), WID_PARA_LEV10, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4), WID_PARA_LEV4, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5), WID_PARA_LEV5, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6), WID_PARA_LEV6, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7), WID_PARA_LEV7, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8), WID_PARA_LEV8, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9), WID_PARA_LEV9, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10), WID_PARA_LEV10, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
+ { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aTOXContentMap_Impl;
@@ -1341,7 +1341,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
_BASE_INDEX_PROPERTIES_
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_MARKS), WID_CREATE_FROM_MARKS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
- // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
+ // { SW_PROP_NMID(UNO_NAME_PARAGRAPH_STYLE_NAMES), WID_PARAGRAPH_STYLE_NAMES , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USE_LEVEL_FROM_SOURCE), WID_USE_LEVEL_FROM_SOURCE , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
@@ -1353,23 +1353,23 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS), WID_CREATE_FROM_GRAPHIC_OBJECTS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS), WID_CREATE_FROM_EMBEDDED_OBJECTS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4), WID_PARA_LEV4, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5), WID_PARA_LEV5, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6), WID_PARA_LEV6, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7), WID_PARA_LEV7, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8), WID_PARA_LEV8, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9), WID_PARA_LEV9, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10), WID_PARA_LEV10, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL2), WID_PARA_LEV2, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL3), WID_PARA_LEV3, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL4), WID_PARA_LEV4, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL5), WID_PARA_LEV5, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL6), WID_PARA_LEV6, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL7), WID_PARA_LEV7, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL8), WID_PARA_LEV8, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL9), WID_PARA_LEV9, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL10), WID_PARA_LEV10, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_DOCUMENT_INDEX_MARKS), WID_INDEX_MARKS, CPPU_E2T(CPPUTYPE_DOCIDXMRK), PropertyAttribute::READONLY ,0 },
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_USER_INDEX_NAME), WID_USER_IDX_NAME, CPPU_E2T(CPPUTYPE_OUSTRING) , PROPERTY_NONE, 0},
{0,0,0,0,0,0}
@@ -1389,13 +1389,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_LABEL_DISPLAY_TYPE), WID_LABEL_DISPLAY_TYPE , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
@@ -1417,13 +1417,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_STAR_DRAW), WID_CREATE_FROM_STAR_DRAW , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS), WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
@@ -1443,13 +1443,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ SW_PROP_NMID(UNO_NAME_LABEL_DISPLAY_TYPE), WID_LABEL_DISPLAY_TYPE , CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_IS_RELATIVE_TABSTOPS), WID_IS_RELATIVE_TABSTOPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
@@ -1460,19 +1460,19 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aTableRowPropertyMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_SEPARATORS), FN_UNO_TABLE_COLUMN_SEPARATORS, CPPU_E2T(CPPUTYPE_TBLCOLSEP), PropertyAttribute::MAYBEVOID, 0 },
- { SW_PROP_NMID(UNO_NAME_HEIGHT), FN_UNO_ROW_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,CONVERT_TWIPS },
- { SW_PROP_NMID(UNO_NAME_IS_AUTO_HEIGHT), FN_UNO_ROW_AUTO_HEIGHT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , 0 },
- { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
- { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE },
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_TABLE_COLUMN_SEPARATORS), FN_UNO_TABLE_COLUMN_SEPARATORS, CPPU_E2T(CPPUTYPE_TBLCOLSEP), PropertyAttribute::MAYBEVOID, 0 },
+ { SW_PROP_NMID(UNO_NAME_HEIGHT), FN_UNO_ROW_HEIGHT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,CONVERT_TWIPS },
+ { SW_PROP_NMID(UNO_NAME_IS_AUTO_HEIGHT), FN_UNO_ROW_AUTO_HEIGHT, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE , 0 },
+ { SW_PROP_NMID(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_SIZE_TYPE },
+ { SW_PROP_NMID(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT16) , PROPERTY_NONE, MID_FRMSIZE_WIDTH_TYPE },
{ SW_PROP_NMID(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT, CPPU_E2T(CPPUTYPE_BOOLEAN) , PropertyAttribute::MAYBEVOID, 0},
// { SW_PROP_NMID(UNO_NAME_HEIGHT), RES_FRM_SIZE, CPPU_E2T(CPPUTYPE_INT32) , PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS },
- // { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
+ // { SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT), RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE, CONVERT_TWIPS},
{0,0,0,0,0,0}
};
@@ -1518,7 +1518,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aBookmarkPropertyMap_Impl [] =
{
- { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), FN_PARAM_LINK_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
COMMON_TEXT_CONTENT_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1543,13 +1543,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
_BASE_INDEX_PROPERTIES_
{ SW_PROP_NMID(UNO_NAME_IS_PROTECTED), WID_PROTECTED , CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_TEXT_COLUMNS), RES_COL, CPPU_E2T(CPPUTYPE_REFTEXTCOL), PROPERTY_NONE, MID_COLUMNS},
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
- { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
- { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
- { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
- { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
- { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_URL },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_GRAPHIC_FILTER },
+ { SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+ { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR },
+ { SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT },
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLEHEADING), WID_PARA_HEAD, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
+ { SW_PROP_NMID(UNO_NAME_PARA_STYLELEVEL1), WID_PARA_LEV1, CPPU_E2T(CPPUTYPE_OUSTRING) , 0, 0},
{ SW_PROP_NMID(UNO_NAME_LEVEL_FORMAT), WID_LEVEL_FORMAT , CPPU_E2T(CPPUTYPE_REFIDXREPL) , PROPERTY_NONE,0},
{ SW_PROP_NMID(UNO_NAME_LOCALE), WID_IDX_LOCALE, CPPU_E2T(CPPUTYPE_LOCALE), PROPERTY_NONE, 0},\
{ SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), WID_IDX_SORT_ALGORITHM, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},\
@@ -1563,39 +1563,39 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aDocMap_Impl[] =
{
{ SW_PROP_NMID(UNO_NAME_BASIC_LIBRARIES), WID_DOC_BASIC_LIBRARIES, CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH), RES_CHRATR_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
{ SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
- { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_ASIAN), RES_CHRATR_CJK_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+ { SW_PROP_NMID(UNO_NAME_CHAR_FONT_PITCH_COMPLEX), RES_CHRATR_CTL_FONT, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::MAYBEVOID, MID_FONT_PITCH },
{ SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE), PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE },
- { SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_DIALOG_LIBRARIES), WID_DOC_DIALOG_LIBRARIES, CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_VBA_DOCOBJ), WID_DOC_VBA_DOCOBJ, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_SHOW_CHANGES), WID_DOC_CHANGES_SHOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_IS_TEMPLATE), WID_DOC_ISTEMPLATEID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
- { SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L), WID_DOC_AUTO_MARK_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_PARAGRAPH_COUNT), WID_DOC_PARA_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_RECORD_CHANGES), WID_DOC_CHANGES_RECORD, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_SHOW_CHANGES), WID_DOC_CHANGES_SHOW, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_WORD_COUNT), WID_DOC_WORD_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_IS_TEMPLATE), WID_DOC_ISTEMPLATEID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_REDLINE_PROTECTION_KEY), WID_DOC_CHANGES_PASSWORD, CPPU_E2T(CPPUTYPE_SEQINT8), PROPERTY_NONE, 0 },
{ SW_PROP_NMID(UNO_NAME_FORBIDDEN_CHARACTERS), WID_DOC_FORBIDDEN_CHARS, CPPU_E2T(CPPUTYPE_REFFORBCHARS), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_TWO_DIGIT_YEAR), WID_DOC_TWO_DIGIT_YEAR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_AUTOMATIC_CONTROL_FOCUS), WID_DOC_AUTOMATIC_CONTROL_FOCUS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- { SW_PROP_NMID(UNO_NAME_APPLY_FORM_DESIGN_MODE), WID_DOC_APPLY_FORM_DESIGN_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_TWO_DIGIT_YEAR), WID_DOC_TWO_DIGIT_YEAR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_AUTOMATIC_CONTROL_FOCUS), WID_DOC_AUTOMATIC_CONTROL_FOCUS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_APPLY_FORM_DESIGN_MODE), WID_DOC_APPLY_FORM_DESIGN_MODE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_RUNTIME_UID), WID_DOC_RUNTIME_UID, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{ SW_PROP_NMID(UNO_NAME_LOCK_UPDATES), WID_DOC_LOCK_UPDATES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{ SW_PROP_NMID(UNO_NAME_HAS_VALID_SIGNATURES), WID_DOC_HAS_VALID_SIGNATURES, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY, 0},
@@ -1612,8 +1612,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] =
{
- { SW_PROP_NMID(UNO_LINK_DISPLAY_BITMAP), 0, CPPU_E2T(CPPUTYPE_REFBITMAP), PropertyAttribute::READONLY, 0xff},
- { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_BITMAP), 0, CPPU_E2T(CPPUTYPE_REFBITMAP), PropertyAttribute::READONLY, 0xff},
+ { SW_PROP_NMID(UNO_LINK_DISPLAY_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0xff},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aLinkTargetMap_Impl;
@@ -1623,8 +1623,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aAutoTextGroupMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_FILE_PATH), WID_GROUP_PATH, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, PropertyAttribute::READONLY},
- { SW_PROP_NMID(UNO_NAME_TITLE), WID_GROUP_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ { SW_PROP_NMID(UNO_NAME_FILE_PATH), WID_GROUP_PATH, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, PropertyAttribute::READONLY},
+ { SW_PROP_NMID(UNO_NAME_TITLE), WID_GROUP_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aAutoTextGroupMap_Impl;
@@ -1651,7 +1651,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
{
- {SW_PROP_NMID(UNO_NAME_REFERENCE_ID), 0, CPPU_E2T(CPPUTYPE_INT16),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
+ {SW_PROP_NMID(UNO_NAME_REFERENCE_ID), 0, CPPU_E2T(CPPUTYPE_INT16),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
COMMON_TEXT_CONTENT_PROPERTIES
_REDLINE_NODE_PROPERTIES
{0,0,0,0,0,0}
@@ -1666,10 +1666,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC), WID_TXTCOL_IS_AUTOMATIC, CPPU_E2T(CPPUTYPE_BOOLEAN),PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_AUTOMATIC_DISTANCE), WID_TXTCOL_AUTO_DISTANCE, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_WIDTH), WID_TXTCOL_LINE_WIDTH, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_COLOR), WID_TXTCOL_LINE_COLOR, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT), WID_TXTCOL_LINE_REL_HGT, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT), WID_TXTCOL_LINE_ALIGN, CPPU_E2T(CPPUTYPE_VERTALIGN),PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_IS_ON), WID_TXTCOL_LINE_IS_ON, CPPU_E2T(CPPUTYPE_BOOLEAN),PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_COLOR), WID_TXTCOL_LINE_COLOR, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT), WID_TXTCOL_LINE_REL_HGT, CPPU_E2T(CPPUTYPE_INT32),PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT), WID_TXTCOL_LINE_ALIGN, CPPU_E2T(CPPUTYPE_VERTALIGN),PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SEPARATOR_LINE_IS_ON), WID_TXTCOL_LINE_IS_ON, CPPU_E2T(CPPUTYPE_BOOLEAN),PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aTextColumns_Impl;
@@ -1682,7 +1682,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
_REDLINE_PROPERTIES
_REDLINE_NODE_PROPERTIES
{SW_PROP_NMID(UNO_NAME_REDLINE_START), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::READONLY, 0},
- {SW_PROP_NMID(UNO_NAME_REDLINE_END), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_REDLINE_END), 0, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aRedlineMap_Impl;
@@ -1692,7 +1692,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aTextDefaultMap_Impl[] =
{
- { SW_PROP_NMID(UNO_NAME_TAB_STOP_DISTANCE), RES_PARATR_TABSTOP, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
+ { SW_PROP_NMID(UNO_NAME_TAB_STOP_DISTANCE), RES_PARATR_TABSTOP, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
COMMON_HYPERLINK_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},
@@ -1736,11 +1736,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDateTimeFieldPropMap[] =
{
- {SW_PROP_NMID(UNO_NAME_ADJUST), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DATE_TIME, CPPU_E2T(CPPUTYPE_DATETIME), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {SW_PROP_NMID(UNO_NAME_IS_DATE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_ADJUST), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DATE_TIME, CPPU_E2T(CPPUTYPE_DATETIME), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_IS_DATE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -1752,9 +1752,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aUserFieldPropMap[] =
{
- {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -1767,21 +1767,21 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aSetExpFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_INPUT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_INPUT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
// #i69733# wrong name - UNO_NAME_IS_INPUT expanded to "Input" instead of "IsInput"
{SW_PROP_NMID(UNO_NAME_INPUT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL3, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
//TODO: UNO_NAME_VARIABLE_NAME gibt es das wirklich?
- {SW_PROP_NMID(UNO_NAME_SEQUENCE_VALUE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_VARIABLE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_SEQUENCE_VALUE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_VARIABLE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -1793,13 +1793,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aGetExpFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
- {SW_PROP_NMID(UNO_NAME_VARIABLE_SUBTYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_VARIABLE_SUBTYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -1812,8 +1812,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aFileNameFieldPropMap [] =
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1824,10 +1824,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aPageNumFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_PAGENUMTYPE), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_USERTEXT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_PAGENUMTYPE), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_USERTEXT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1838,10 +1838,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aAuthorFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_FULL_NAME),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_FULL_NAME),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1852,23 +1852,23 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aChapterFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CHAPTER_FORMAT),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_LEVEL ),FIELD_PROP_BYTE1, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CHAPTER_FORMAT),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_LEVEL ),FIELD_PROP_BYTE1, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aChapterFieldPropMap;
}
break;
- case PROPERTY_MAP_FLDTYP_GET_REFERENCE :
+ case PROPERTY_MAP_FLDTYP_GET_REFERENCE :
{
static SfxItemPropertyMapEntry aGetRefFieldPropMap [] =
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_PART),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_SOURCE),FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SEQUENCE_NUMBER), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SOURCE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_PART),FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_REFERENCE_FIELD_SOURCE),FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SEQUENCE_NUMBER), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SOURCE_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1879,8 +1879,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aConditionedTxtFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_FALSE_CONTENT), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_FALSE_CONTENT), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_CONDITION_TRUE) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_TRUE_CONTENT) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
@@ -1894,8 +1894,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aHiddenTxtFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_CONTENT) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_HIDDEN) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
@@ -1908,9 +1908,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aAnnotationFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DATE_TIME, CPPU_E2T(CPPUTYPE_DATETIME), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DATE_TIME, CPPU_E2T(CPPUTYPE_DATETIME), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATE), FIELD_PROP_DATE, CPPU_E2T(CPPUTYPE_DATE), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_TEXT_RANGE), FIELD_PROP_TEXT, CPPU_E2T(CPPUTYPE_REFINTERFACE), PropertyAttribute::READONLY, 0},
COMMON_FLDTYP_PROPERTIES
@@ -1923,10 +1923,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aInputFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_HELP), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_TOOLTIP), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_HELP), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_TOOLTIP), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -1988,9 +1988,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDocInfoFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INFO_FORMAT), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INFO_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_INFO_FORMAT), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_INFO_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2001,7 +2001,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aTmplNameFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_FILE_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2012,10 +2012,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aUsrExtFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_USER_DATA_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_USER_DATA_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2026,8 +2026,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aRefPgSetFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_ON), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_OFFSET), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_ON), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2050,9 +2050,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aJumpEdtFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_PLACEHOLDER), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_PLACEHOLDER_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_HINT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_PLACEHOLDER), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_PLACEHOLDER_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2063,9 +2063,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aScriptFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SCRIPT_TYPE), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_URL_CONTENT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SCRIPT_TYPE), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_URL_CONTENT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2082,7 +2082,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_DATA_BASE_NAME ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_CONDITION) , FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONDITION) , FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
@@ -2104,7 +2104,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_CONDITION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2123,8 +2123,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_DATA_TABLE_NAME) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SET_NUMBER ), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -2136,11 +2136,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDBFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_FIELD_CODE), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_DATA_BASE_FORMAT),FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -2171,8 +2171,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDocstatFieldPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- // {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBERING_TYPE), FIELD_PROP_USHORT2, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ // {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2183,9 +2183,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDocInfoAuthorPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_AUTHOR), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2197,10 +2197,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aDocInfoDateTimePropMap [] =
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
- {SW_PROP_NMID(UNO_NAME_IS_DATE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_DATE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
@@ -2212,9 +2212,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aDocInfoEditTimePropMap [] =
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DATE_TIME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT),FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
@@ -2226,9 +2226,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDocInfoStringContentPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2239,9 +2239,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aDocInfoCustomPropMap [] =
{
- {SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
{SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), FIELD_PROP_FORMAT, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_FIXED_LANGUAGE), FIELD_PROP_BOOL4, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
@@ -2255,8 +2255,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
static SfxItemPropertyMapEntry aDocInfoRevisionPropMap [] =
{
{SW_PROP_NMID(UNO_NAME_CURRENT_PRESENTATION), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_REVISION), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
+ {SW_PROP_NMID(UNO_NAME_REVISION), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_FIXED), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN) , PROPERTY_NONE,0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2302,28 +2302,28 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aUserFieldTypePropMap[] =
{
- {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
- {SW_PROP_NMID(UNO_NAME_IS_EXPRESSION), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_EXPRESSION), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},
- {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aUserFieldTypePropMap;
}
break;
- case PROPERTY_MAP_FLDMSTR_DDE :
+ case PROPERTY_MAP_FLDMSTR_DDE :
{
static SfxItemPropertyMapEntry aDDEFieldTypePropMap[] =
{
- {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT ), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE ), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE ), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_ELEMENT ), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_FILE ), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DDE_COMMAND_TYPE ), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_UPDATE), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_CONTENT), FIELD_PROP_PAR5, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
@@ -2334,12 +2334,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aSetExpFieldTypePropMap[] =
{
- {SW_PROP_NMID(UNO_NAME_CHAPTER_NUMBERING_LEVEL),FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_CHAPTER_NUMBERING_LEVEL),FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_NAME), FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_NUMBERING_SEPARATOR), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_NUMBERING_SEPARATOR), FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aSetExpFieldTypePropMap;
@@ -2360,7 +2360,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_DATA_BASE_URL ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), FIELD_PROP_SHORT1, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aDBFieldTypePropMap;
@@ -2370,9 +2370,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aStandardFieldMasterMap[] =
{
- {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), 0, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_DEPENDENT_TEXT_FIELDS), 0, CPPU_E2T(CPPUTYPE_SEQDEPTXTFLD), PropertyAttribute::READONLY, 0},
{SW_PROP_NMID(UNO_NAME_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), 0, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aStandardFieldMasterMap;
@@ -2382,7 +2382,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aBibliographyFieldMap[] =
{
- {SW_PROP_NMID(UNO_NAME_FIELDS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUE),PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_FIELDS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUE),PROPERTY_NONE, 0},
COMMON_FLDTYP_PROPERTIES
{0,0,0,0,0,0}
};
@@ -2393,14 +2393,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
static SfxItemPropertyMapEntry aBibliographyFieldMasterMap[] =
{
- {SW_PROP_NMID(UNO_NAME_BRACKET_BEFORE ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_BRACKET_AFTER ) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_NUMBER_ENTRIES ) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_IS_SORT_BY_POSITION) , FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_BRACKET_BEFORE ) , FIELD_PROP_PAR1, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_BRACKET_AFTER ) , FIELD_PROP_PAR2, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_NUMBER_ENTRIES ) , FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_IS_SORT_BY_POSITION) , FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_LOCALE), FIELD_PROP_LOCALE, CPPU_E2T(CPPUTYPE_LOCALE) , PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SORT_ALGORITHM), FIELD_PROP_PAR3, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_SORT_KEYS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUES), PROPERTY_NONE, 0},
- {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
+ {SW_PROP_NMID(UNO_NAME_SORT_KEYS ) , FIELD_PROP_PROP_SEQ, CPPU_E2T(CPPUTYPE_PROPERTYVALUES), PROPERTY_NONE, 0},
+ {SW_PROP_NMID(UNO_NAME_INSTANCE_NAME), FIELD_PROP_PAR4, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aBibliographyFieldMasterMap;
@@ -3116,7 +3116,7 @@ const SfxItemPropertySet* SwUnoPropertyMapProvider::GetPropertySet( sal_uInt16
sal_Bool SwItemPropertySet::FillItem(SfxItemSet& /*rSet*/, sal_uInt16 /*nWhich*/, sal_Bool /*bGetProperty*/) const
{
sal_Bool bRet = sal_False;
-/* if(nWhich == SID_ATTR_PAGE_PAPERBIN)
+/* if(nWhich == SID_ATTR_PAGE_PAPERBIN)
{
rSet.Put(SvxPaperBinItem(SID_ATTR_PAGE_PAPERBIN, 0));
bRet = sal_True;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index bfd6cd94bc44..3527e3e97e01 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2,7 +2,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
@@ -137,7 +137,7 @@ uno::Sequence< sal_Int8 > CreateUnoTunnelId()
static osl::Mutex aCreateMutex;
osl::Guard<osl::Mutex> aGuard( aCreateMutex );
uno::Sequence< sal_Int8 > aSeq( 16 );
- rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+ rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
return aSeq;
}
@@ -157,7 +157,7 @@ SwUnoInternalPaM::~SwUnoInternalPaM()
}
}
-SwUnoInternalPaM& SwUnoInternalPaM::operator=(const SwPaM& rPaM)
+SwUnoInternalPaM& SwUnoInternalPaM::operator=(const SwPaM& rPaM)
{
const SwPaM* pTmp = &rPaM;
*GetPoint() = *rPaM.GetPoint();
@@ -402,7 +402,7 @@ lcl_SetNodeNumStart(SwPaM & rCrsr, uno::Any const& rValue)
SwDoc* pDoc = rCrsr.GetDoc();
UnoActionContext aAction(pDoc);
- if( rCrsr.GetNext() != &rCrsr ) // Mehrfachselektion ?
+ if( rCrsr.GetNext() != &rCrsr ) // Mehrfachselektion ?
{
pDoc->StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( rCrsr );
@@ -666,8 +666,8 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
static const sal_uInt16 nMaxLookup = 1000;
SwFmtColl *pFmt = 0;
-// if ( GetCrsrCnt() > nMaxLookup )
-// return 0;
+// if ( GetCrsrCnt() > nMaxLookup )
+// return 0;
bool bError = false;
SwPaM *pTmpCrsr = &rPaM;
do
@@ -707,9 +707,9 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
}
/* -----------------26.06.98 16:20-------------------
- * Hilfsfunktion fuer PageDesc
+ * Hilfsfunktion fuer PageDesc
* --------------------------------------------------*/
-SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName)
+SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName)
{
SwPageDesc* pRet = 0;
sal_uInt16 nDCount = rDoc.GetPageDescCnt();
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 64d7dbdbbdbb..fcaf6e356957 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -2,7 +2,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
@@ -360,8 +360,8 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
}
else
{
-// if( !HasSelection() )
-// UpdateAttr();
+// if( !HasSelection() )
+// UpdateAttr();
pDoc->InsertItemSet( rPam, rSet, nFlags );
}
//#outline level,add by zhaojianwei
@@ -371,7 +371,7 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
if ( pTmpNode )
{
rPam.GetDoc()->GetNodes().UpdateOutlineNode( *pTmpNode );
- }
+ }
}
//<-end,zhaojianwei
}
@@ -588,7 +588,7 @@ lcl_FindTopLevelTable(
SwTableNode * pLast = pTblNode;
for (SwTableNode* pTmp = pLast;
- pTmp != NULL && &pTmp->GetTable() != pOwnTable; /* we must not go up higher than the own table! */
+ pTmp != NULL && &pTmp->GetTable() != pOwnTable; /* we must not go up higher than the own table! */
pTmp = pTmp->StartOfSectionNode()->FindTableNode() )
{
pLast = pTmp;
@@ -1642,8 +1642,8 @@ throw (uno::RuntimeException)
}
/****************************************************************************
- * Text positions
- * Bis zum ersten Zugriff auf eine TextPosition wird ein SwCursor gehalten,
+ * Text positions
+ * Bis zum ersten Zugriff auf eine TextPosition wird ein SwCursor gehalten,
* danach wird ein Array mit uno::Reference< XTextPosition > angelegt
*
****************************************************************************/
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 26d148446d4a..1f8083108b3c 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -2,7 +2,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
@@ -802,7 +802,7 @@ bool ::sw::GetDefaultTextContentValue(
case FN_UNO_TEXT_WRAP: rAny <<= text::WrapTextMode_NONE; break;
case FN_UNO_ANCHOR_TYPE: rAny <<= text::TextContentAnchorType_AT_PARAGRAPH; break;
case FN_UNO_ANCHOR_TYPES:
- { uno::Sequence<text::TextContentAnchorType> aTypes(1);
+ { uno::Sequence<text::TextContentAnchorType> aTypes(1);
text::TextContentAnchorType* pArray = aTypes.getArray();
pArray[0] = text::TextContentAnchorType_AT_PARAGRAPH;
rAny.setValue(&aTypes, ::getCppuType((uno::Sequence<text::TextContentAnchorType>*)0));
@@ -859,7 +859,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
beans::PropertyState lcl_SwXParagraph_getPropertyState(
-// SwUnoCrsr& rUnoCrsr,
+// SwUnoCrsr& rUnoCrsr,
const SwTxtNode& rTxtNode,
const SwAttrSet** ppSet,
const SfxItemPropertySimpleEntry& rEntry,
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index ca2643495c63..4dd5779f7825 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -2,7 +2,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
@@ -642,7 +642,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
rPropertyNames,
SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION_TOLERANT );
const beans::PropertyState* pPropertyStates = aPropertyStates.getConstArray();
-
+
std::vector< beans::GetDirectPropertyTolerantResult > aResultVector;
for (sal_Int32 i = 0; i < nProps; ++i)
{
@@ -651,7 +651,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
{
aResult.Name = pProp[i];
if(pPropertyStates[i] == beans::PropertyState_MAKE_FIXED_SIZE) // property unknown?
- {
+ {
if( bDirectValuesOnly )
continue;
else
@@ -663,7 +663,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
aResult.State = pPropertyStates[i];
aResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
- //#i104499# ruby portion attributes need special handling:
+ //#i104499# ruby portion attributes need special handling:
if( pEntry->nWID == RES_TXTATR_CJK_RUBY &&
m_ePortionType == PORTION_RUBY_START )
{
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 5097f8887f9c..14ab9d668f4b 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -2,7 +2,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
@@ -92,9 +92,9 @@ namespace
struct SwXBookmarkPortion_Impl
{
- Reference<XTextContent> xBookmark;
- BYTE nBkmType;
- const SwPosition aPosition;
+ Reference<XTextContent> xBookmark;
+ BYTE nBkmType;
+ const SwPosition aPosition;
SwXBookmarkPortion_Impl(uno::Reference<text::XTextContent> const& xMark,
const BYTE nType, SwPosition const& rPosition)
@@ -118,8 +118,8 @@ namespace
// always precede the end. Hence compare positions, and use bookmark type
// as tie-breaker for same position.
// return ( r1->nIndex == r2->nIndex )
- // ? ( r1->nBkmType < r2->nBkmType )
- // : ( r1->nIndex < r2->nIndex );
+ // ? ( r1->nBkmType < r2->nBkmType )
+ // : ( r1->nIndex < r2->nIndex );
// MTG: 25/11/05: Note that the above code does not correctly handle
// the case when one bookmark ends, and another begins in the same
@@ -194,7 +194,7 @@ namespace
}
/******************************************************************
- * SwXTextPortionEnumeration
+ * SwXTextPortionEnumeration
******************************************************************/
const uno::Sequence< sal_Int8 > & SwXTextPortionEnumeration::getUnoTunnelId()
{
@@ -722,7 +722,7 @@ lcl_ExportHints(
pPortion->SetTextField(xField);
}
break;
- case RES_TXTATR_FLYCNT :
+ case RES_TXTATR_FLYCNT :
if(!bRightMoveForbidden)
{
pUnoCrsr->Right(1,CRSR_SKIP_CHARS,FALSE,FALSE);
@@ -733,7 +733,7 @@ lcl_ExportHints(
pUnoCrsr, xParent, PORTION_FRAME);
}
break;
- case RES_TXTATR_FTN :
+ case RES_TXTATR_FTN :
{
if(!bRightMoveForbidden)
{
@@ -883,7 +883,7 @@ void lcl_MoveCursor( SwUnoCrsr * const pUnoCrsr,
if (nMovePos > nCurrentIndex)
{
-// pUnoCrsr->Right(nMovePos - nCurrentIndex);
+// pUnoCrsr->Right(nMovePos - nCurrentIndex);
pUnoCrsr->GetPoint()->nContent = static_cast<USHORT>(nMovePos);
}
}
@@ -1167,7 +1167,7 @@ lcl_CreatePortions(
"CreatePortions: stack error" );
}
-void SwXTextPortionEnumeration::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
+void SwXTextPortionEnumeration::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
{
ClientModify(this, pOld, pNew);
}
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index f60afcce4982..af8ff91492ae 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -2,7 +2,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
@@ -37,624 +37,624 @@
const SwPropNameTab aPropNameTab = {
-/* 0001 FOLLOW_STYLE */ {MAP_CHAR_LEN("FollowStyle")},
-/* 0002 IS_PHYSICAL */ {MAP_CHAR_LEN("IsPhysical")},
-/* 0003 IS_AUTO_UPDATE */ {MAP_CHAR_LEN("IsAutoUpdate")},
-/* 0004 DISPLAY_NAME */ {MAP_CHAR_LEN("DisplayName")},
-/* 0005 PARA_GRAPHIC_URL */ {MAP_CHAR_LEN("ParaBackGraphicURL")},
-/* 0006 PARA_GRAPHIC_FILTER */ {MAP_CHAR_LEN("ParaBackGraphicFilter")},
-/* 0007 HEADER_GRAPHIC_URL */ {MAP_CHAR_LEN("HeaderBackGraphicURL")},
-/* 0008 HEADER_GRAPHIC_FILTER */ {MAP_CHAR_LEN("HeaderBackGraphicFilter")},
-/* 0009 FOOTER_GRAPHIC_URL */ {MAP_CHAR_LEN("FooterBackGraphicURL")},
-/* 0010 FOOTER_GRAPHIC_FILTER */ {MAP_CHAR_LEN("FooterBackGraphicFilter")},
-/* 0011 BACK_GRAPHIC_URL */ {MAP_CHAR_LEN("BackGraphicURL")},
-/* 0012 BACK_GRAPHIC_FILTER */ {MAP_CHAR_LEN("BackGraphicFilter")},
-/* 0013 BACK_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("BackGraphicLocation")},
-/* 0014 BACK_GRAPHIC_BITMAP */ {MAP_CHAR_LEN("BackGraphicBitmap")},
-/* 0015 GRAPHIC_URL */ {MAP_CHAR_LEN("GraphicURL")},
-/* 0016 GRAPHIC_FILTER */ {MAP_CHAR_LEN("GraphicFilter")},
-/* 0017 GRAPHIC_LOCATION */ {MAP_CHAR_LEN("GraphicLocation")},
-/* 0018 GRAPHIC_SIZE */ {MAP_CHAR_LEN("GraphicSize")},
-/* 0019 GRAPHIC_BITMAP */ {MAP_CHAR_LEN("GraphicBitmap")},
-/* 0020 BULLET_FONT */ {MAP_CHAR_LEN("BulletFont")},
-/* 0021 PARA_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("ParaBackGraphicLocation")},
-/* 0022 HEADER_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("HeaderBackGraphicLocation")},
-/* 0023 FOOTER_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("FooterBackGraphicLocation")},
-/* 0024 PARA_LEFT_PARA_MARGIN */ {MAP_CHAR_LEN("ParaLeftParaMargin")},
-/* 0025 PARA_RIGHT_PARA_MARGIN */ {MAP_CHAR_LEN("ParaRightParaMargin")},
-/* 0026 PARA_LEFT_MARGIN */ {MAP_CHAR_LEN("ParaLeftMargin")},
-/* 0027 PARA_RIGHT_MARGIN */ {MAP_CHAR_LEN("ParaRightMargin")},
-/* 0028 PARA_LEFT_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaLeftMarginRelative")},
-/* 0029 PARA_RIGHT_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaRightMarginRelative")},
-/* 0030 PARA_IS_AUTO_FIRST_LINE_INDENT */ {MAP_CHAR_LEN("ParaIsAutoFirstLineIndent")},
-/* 0031 PARA_FIRST_LINE_INDENT */ {MAP_CHAR_LEN("ParaFirstLineIndent")},
-/* 0032 PARA_FIRST_LINE_INDENT_RELATIVE */ {MAP_CHAR_LEN("ParaFirstLineIndentRelative")},
-/* 0033 PARA_IS_HYPHENATION */ {MAP_CHAR_LEN("ParaIsHyphenation")},
-/* 0034 PARA_HYPHENATION_MAX_LEADING_CHARS */ {MAP_CHAR_LEN("ParaHyphenationMaxLeadingChars")},
-/* 0035 PARA_HYPHENATION_MAX_TRAILING_CHARS */ {MAP_CHAR_LEN("ParaHyphenationMaxTrailingChars")},
-/* 0036 PARA_HYPHENATION_MAX_HYPHENS */ {MAP_CHAR_LEN("ParaHyphenationMaxHyphens")},
-/* 0037 LEFT_MARGIN */ {MAP_CHAR_LEN("LeftMargin")},
-/* 0038 RIGHT_MARGIN */ {MAP_CHAR_LEN("RightMargin")},
-/* 0039 HEADER_LEFT_MARGIN */ {MAP_CHAR_LEN("HeaderLeftMargin")},
-/* 0040 HEADER_RIGHT_MARGIN */ {MAP_CHAR_LEN("HeaderRightMargin")},
-/* 0041 FOOTER_LEFT_MARGIN */ {MAP_CHAR_LEN("FooterLeftMargin")},
-/* 0042 FOOTER_RIGHT_MARGIN */ {MAP_CHAR_LEN("FooterRightMargin")},
-/* 0043 TEXT_RANGE */ {MAP_CHAR_LEN("TextRange")},
-/* 0044 NAME */ {MAP_CHAR_LEN("Name")},
-/* 0045 NUMBERING_ALIGNMENT */ {MAP_CHAR_LEN("NumberingAlignment")},
-/* 0046 BULLET_FONT_NAME */ {MAP_CHAR_LEN("BulletFontName")},
-/* 0047 BULLET_ID */ {MAP_CHAR_LEN("BulletId")},
-/* 0048 CHAR_STYLE_NAME */ {MAP_CHAR_LEN("CharStyleName")},
-/* 0049 ANCHOR_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("AnchorCharStyleName")},
-/* 0050 SUFFIX */ {MAP_CHAR_LEN("Suffix")},
-/* 0051 PREFIX */ {MAP_CHAR_LEN("Prefix")},
-/* 0052 PARENT_NUMBERING */ {MAP_CHAR_LEN("ParentNumbering")},
-/* 0053 START_WITH */ {MAP_CHAR_LEN("StartWith")},
-/* 0054 CHAR_FONT_NAME */ {MAP_CHAR_LEN("CharFontName")},
-/* 0055 CHAR_FONT_STYLE_NAME */ {MAP_CHAR_LEN("CharFontStyleName")},
-/* 0056 CHAR_FONT_FAMILY */ {MAP_CHAR_LEN("CharFontFamily")},
-/* 0057 CHAR_FONT_CHAR_SET */ {MAP_CHAR_LEN("CharFontCharSet")},
-/* 0058 CHAR_FONT_PITCH */ {MAP_CHAR_LEN("CharFontPitch")},
-/* 0059 CHAR_POSTURE */ {MAP_CHAR_LEN("CharPosture")},
-/* 0060 CHAR_WEIGHT */ {MAP_CHAR_LEN("CharWeight")},
-/* 0061 CHAR_HEIGHT */ {MAP_CHAR_LEN("CharHeight")},
-/* 0062 CHAR_LOCALE */ {MAP_CHAR_LEN("CharLocale")},
-/* 0063 CHAR_FONT_NAME_ASIAN */ {MAP_CHAR_LEN("CharFontNameAsian")},
-/* 0064 CHAR_FONT_STYLE_NAME_ASIAN */ {MAP_CHAR_LEN("CharFontStyleNameAsian")},
-/* 0065 CHAR_FONT_FAMILY_ASIAN */ {MAP_CHAR_LEN("CharFontFamilyAsian")},
-/* 0066 CHAR_FONT_CHAR_SET_ASIAN */ {MAP_CHAR_LEN("CharFontCharSetAsian")},
-/* 0067 CHAR_FONT_PITCH_ASIAN */ {MAP_CHAR_LEN("CharFontPitchAsian")},
-/* 0068 CHAR_POSTURE_ASIAN */ {MAP_CHAR_LEN("CharPostureAsian")},
-/* 0069 CHAR_WEIGHT_ASIAN */ {MAP_CHAR_LEN("CharWeightAsian")},
-/* 0070 CHAR_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharHeightAsian")},
-/* 0071 CHAR_LOCALE_ASIAN */ {MAP_CHAR_LEN("CharLocaleAsian")},
-/* 0072 CHAR_FONT_NAME_COMPLEX */ {MAP_CHAR_LEN("CharFontNameComplex")},
-/* 0073 CHAR_FONT_STYLE_NAME_COMPLEX */ {MAP_CHAR_LEN("CharFontStyleNameComplex")},
-/* 0074 CHAR_FONT_FAMILY_COMPLEX */ {MAP_CHAR_LEN("CharFontFamilyComplex")},
-/* 0075 CHAR_FONT_CHAR_SET_COMPLEX */ {MAP_CHAR_LEN("CharFontCharSetComplex")},
-/* 0076 CHAR_FONT_PITCH_COMPLEX */ {MAP_CHAR_LEN("CharFontPitchComplex")},
-/* 0077 CHAR_POSTURE_COMPLEX */ {MAP_CHAR_LEN("CharPostureComplex")},
-/* 0078 CHAR_WEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharWeightComplex")},
-/* 0079 CHAR_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharHeightComplex")},
-/* 0080 CHAR_LOCALE_COMPLEX */ {MAP_CHAR_LEN("CharLocaleComplex")},
-/* 0081 CHAR_AUTO_KERNING */ {MAP_CHAR_LEN("CharAutoKerning")},
-/* 0082 CHAR_UNDERLINE */ {MAP_CHAR_LEN("CharUnderline")},
-/* 0083 CHAR_UNDERLINE_COLOR */ {MAP_CHAR_LEN("CharUnderlineColor")},
-/* 0084 CHAR_UNDERLINE_HAS_COLOR */ {MAP_CHAR_LEN("CharUnderlineHasColor")},
-/* 0085 CHAR_ESCAPEMENT */ {MAP_CHAR_LEN("CharEscapement")},
-/* 0086 CHAR_CASE_MAP */ {MAP_CHAR_LEN("CharCaseMap")},
-/* 0087 CHAR_SHADOWED */ {MAP_CHAR_LEN("CharShadowed")},
-/* 0088 CHAR_STRIKEOUT */ {MAP_CHAR_LEN("CharStrikeout")},
-/* 0089 CHAR_CROSSED_OUT */ {MAP_CHAR_LEN("CharCrossedOut")},
-/* 0090 CHAR_NO_HYPHENATION */ {MAP_CHAR_LEN("CharNoHyphenation")},
-/* 0091 CHAR_AUTO_ESCAPEMENT */ {MAP_CHAR_LEN("CharAutoEscapement")},
-/* 0092 CHAR_PROP_HEIGHT */ {MAP_CHAR_LEN("CharPropHeight")},
-/* 0093 CHAR_DIFF_HEIGHT */ {MAP_CHAR_LEN("CharDiffHeight")},
-/* 0094 CHAR_PROP_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharPropHeightAsian")},
-/* 0095 CHAR_DIFF_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharDiffHeightAsian")},
-/* 0096 CHAR_PROP_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharPropHeightComplex")},
-/* 0097 CHAR_DIFF_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharDiffHeightComplex")},
-/* 0098 CHAR_ESCAPEMENT_HEIGHT */ {MAP_CHAR_LEN("CharEscapementHeight")},
-/* 0099 CHAR_COLOR */ {MAP_CHAR_LEN("CharColor")},
+/* 0001 FOLLOW_STYLE */ {MAP_CHAR_LEN("FollowStyle")},
+/* 0002 IS_PHYSICAL */ {MAP_CHAR_LEN("IsPhysical")},
+/* 0003 IS_AUTO_UPDATE */ {MAP_CHAR_LEN("IsAutoUpdate")},
+/* 0004 DISPLAY_NAME */ {MAP_CHAR_LEN("DisplayName")},
+/* 0005 PARA_GRAPHIC_URL */ {MAP_CHAR_LEN("ParaBackGraphicURL")},
+/* 0006 PARA_GRAPHIC_FILTER */ {MAP_CHAR_LEN("ParaBackGraphicFilter")},
+/* 0007 HEADER_GRAPHIC_URL */ {MAP_CHAR_LEN("HeaderBackGraphicURL")},
+/* 0008 HEADER_GRAPHIC_FILTER */ {MAP_CHAR_LEN("HeaderBackGraphicFilter")},
+/* 0009 FOOTER_GRAPHIC_URL */ {MAP_CHAR_LEN("FooterBackGraphicURL")},
+/* 0010 FOOTER_GRAPHIC_FILTER */ {MAP_CHAR_LEN("FooterBackGraphicFilter")},
+/* 0011 BACK_GRAPHIC_URL */ {MAP_CHAR_LEN("BackGraphicURL")},
+/* 0012 BACK_GRAPHIC_FILTER */ {MAP_CHAR_LEN("BackGraphicFilter")},
+/* 0013 BACK_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("BackGraphicLocation")},
+/* 0014 BACK_GRAPHIC_BITMAP */ {MAP_CHAR_LEN("BackGraphicBitmap")},
+/* 0015 GRAPHIC_URL */ {MAP_CHAR_LEN("GraphicURL")},
+/* 0016 GRAPHIC_FILTER */ {MAP_CHAR_LEN("GraphicFilter")},
+/* 0017 GRAPHIC_LOCATION */ {MAP_CHAR_LEN("GraphicLocation")},
+/* 0018 GRAPHIC_SIZE */ {MAP_CHAR_LEN("GraphicSize")},
+/* 0019 GRAPHIC_BITMAP */ {MAP_CHAR_LEN("GraphicBitmap")},
+/* 0020 BULLET_FONT */ {MAP_CHAR_LEN("BulletFont")},
+/* 0021 PARA_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("ParaBackGraphicLocation")},
+/* 0022 HEADER_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("HeaderBackGraphicLocation")},
+/* 0023 FOOTER_GRAPHIC_LOCATION */ {MAP_CHAR_LEN("FooterBackGraphicLocation")},
+/* 0024 PARA_LEFT_PARA_MARGIN */ {MAP_CHAR_LEN("ParaLeftParaMargin")},
+/* 0025 PARA_RIGHT_PARA_MARGIN */ {MAP_CHAR_LEN("ParaRightParaMargin")},
+/* 0026 PARA_LEFT_MARGIN */ {MAP_CHAR_LEN("ParaLeftMargin")},
+/* 0027 PARA_RIGHT_MARGIN */ {MAP_CHAR_LEN("ParaRightMargin")},
+/* 0028 PARA_LEFT_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaLeftMarginRelative")},
+/* 0029 PARA_RIGHT_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaRightMarginRelative")},
+/* 0030 PARA_IS_AUTO_FIRST_LINE_INDENT */ {MAP_CHAR_LEN("ParaIsAutoFirstLineIndent")},
+/* 0031 PARA_FIRST_LINE_INDENT */ {MAP_CHAR_LEN("ParaFirstLineIndent")},
+/* 0032 PARA_FIRST_LINE_INDENT_RELATIVE */ {MAP_CHAR_LEN("ParaFirstLineIndentRelative")},
+/* 0033 PARA_IS_HYPHENATION */ {MAP_CHAR_LEN("ParaIsHyphenation")},
+/* 0034 PARA_HYPHENATION_MAX_LEADING_CHARS */ {MAP_CHAR_LEN("ParaHyphenationMaxLeadingChars")},
+/* 0035 PARA_HYPHENATION_MAX_TRAILING_CHARS */ {MAP_CHAR_LEN("ParaHyphenationMaxTrailingChars")},
+/* 0036 PARA_HYPHENATION_MAX_HYPHENS */ {MAP_CHAR_LEN("ParaHyphenationMaxHyphens")},
+/* 0037 LEFT_MARGIN */ {MAP_CHAR_LEN("LeftMargin")},
+/* 0038 RIGHT_MARGIN */ {MAP_CHAR_LEN("RightMargin")},
+/* 0039 HEADER_LEFT_MARGIN */ {MAP_CHAR_LEN("HeaderLeftMargin")},
+/* 0040 HEADER_RIGHT_MARGIN */ {MAP_CHAR_LEN("HeaderRightMargin")},
+/* 0041 FOOTER_LEFT_MARGIN */ {MAP_CHAR_LEN("FooterLeftMargin")},
+/* 0042 FOOTER_RIGHT_MARGIN */ {MAP_CHAR_LEN("FooterRightMargin")},
+/* 0043 TEXT_RANGE */ {MAP_CHAR_LEN("TextRange")},
+/* 0044 NAME */ {MAP_CHAR_LEN("Name")},
+/* 0045 NUMBERING_ALIGNMENT */ {MAP_CHAR_LEN("NumberingAlignment")},
+/* 0046 BULLET_FONT_NAME */ {MAP_CHAR_LEN("BulletFontName")},
+/* 0047 BULLET_ID */ {MAP_CHAR_LEN("BulletId")},
+/* 0048 CHAR_STYLE_NAME */ {MAP_CHAR_LEN("CharStyleName")},
+/* 0049 ANCHOR_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("AnchorCharStyleName")},
+/* 0050 SUFFIX */ {MAP_CHAR_LEN("Suffix")},
+/* 0051 PREFIX */ {MAP_CHAR_LEN("Prefix")},
+/* 0052 PARENT_NUMBERING */ {MAP_CHAR_LEN("ParentNumbering")},
+/* 0053 START_WITH */ {MAP_CHAR_LEN("StartWith")},
+/* 0054 CHAR_FONT_NAME */ {MAP_CHAR_LEN("CharFontName")},
+/* 0055 CHAR_FONT_STYLE_NAME */ {MAP_CHAR_LEN("CharFontStyleName")},
+/* 0056 CHAR_FONT_FAMILY */ {MAP_CHAR_LEN("CharFontFamily")},
+/* 0057 CHAR_FONT_CHAR_SET */ {MAP_CHAR_LEN("CharFontCharSet")},
+/* 0058 CHAR_FONT_PITCH */ {MAP_CHAR_LEN("CharFontPitch")},
+/* 0059 CHAR_POSTURE */ {MAP_CHAR_LEN("CharPosture")},
+/* 0060 CHAR_WEIGHT */ {MAP_CHAR_LEN("CharWeight")},
+/* 0061 CHAR_HEIGHT */ {MAP_CHAR_LEN("CharHeight")},
+/* 0062 CHAR_LOCALE */ {MAP_CHAR_LEN("CharLocale")},
+/* 0063 CHAR_FONT_NAME_ASIAN */ {MAP_CHAR_LEN("CharFontNameAsian")},
+/* 0064 CHAR_FONT_STYLE_NAME_ASIAN */ {MAP_CHAR_LEN("CharFontStyleNameAsian")},
+/* 0065 CHAR_FONT_FAMILY_ASIAN */ {MAP_CHAR_LEN("CharFontFamilyAsian")},
+/* 0066 CHAR_FONT_CHAR_SET_ASIAN */ {MAP_CHAR_LEN("CharFontCharSetAsian")},
+/* 0067 CHAR_FONT_PITCH_ASIAN */ {MAP_CHAR_LEN("CharFontPitchAsian")},
+/* 0068 CHAR_POSTURE_ASIAN */ {MAP_CHAR_LEN("CharPostureAsian")},
+/* 0069 CHAR_WEIGHT_ASIAN */ {MAP_CHAR_LEN("CharWeightAsian")},
+/* 0070 CHAR_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharHeightAsian")},
+/* 0071 CHAR_LOCALE_ASIAN */ {MAP_CHAR_LEN("CharLocaleAsian")},
+/* 0072 CHAR_FONT_NAME_COMPLEX */ {MAP_CHAR_LEN("CharFontNameComplex")},
+/* 0073 CHAR_FONT_STYLE_NAME_COMPLEX */ {MAP_CHAR_LEN("CharFontStyleNameComplex")},
+/* 0074 CHAR_FONT_FAMILY_COMPLEX */ {MAP_CHAR_LEN("CharFontFamilyComplex")},
+/* 0075 CHAR_FONT_CHAR_SET_COMPLEX */ {MAP_CHAR_LEN("CharFontCharSetComplex")},
+/* 0076 CHAR_FONT_PITCH_COMPLEX */ {MAP_CHAR_LEN("CharFontPitchComplex")},
+/* 0077 CHAR_POSTURE_COMPLEX */ {MAP_CHAR_LEN("CharPostureComplex")},
+/* 0078 CHAR_WEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharWeightComplex")},
+/* 0079 CHAR_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharHeightComplex")},
+/* 0080 CHAR_LOCALE_COMPLEX */ {MAP_CHAR_LEN("CharLocaleComplex")},
+/* 0081 CHAR_AUTO_KERNING */ {MAP_CHAR_LEN("CharAutoKerning")},
+/* 0082 CHAR_UNDERLINE */ {MAP_CHAR_LEN("CharUnderline")},
+/* 0083 CHAR_UNDERLINE_COLOR */ {MAP_CHAR_LEN("CharUnderlineColor")},
+/* 0084 CHAR_UNDERLINE_HAS_COLOR */ {MAP_CHAR_LEN("CharUnderlineHasColor")},
+/* 0085 CHAR_ESCAPEMENT */ {MAP_CHAR_LEN("CharEscapement")},
+/* 0086 CHAR_CASE_MAP */ {MAP_CHAR_LEN("CharCaseMap")},
+/* 0087 CHAR_SHADOWED */ {MAP_CHAR_LEN("CharShadowed")},
+/* 0088 CHAR_STRIKEOUT */ {MAP_CHAR_LEN("CharStrikeout")},
+/* 0089 CHAR_CROSSED_OUT */ {MAP_CHAR_LEN("CharCrossedOut")},
+/* 0090 CHAR_NO_HYPHENATION */ {MAP_CHAR_LEN("CharNoHyphenation")},
+/* 0091 CHAR_AUTO_ESCAPEMENT */ {MAP_CHAR_LEN("CharAutoEscapement")},
+/* 0092 CHAR_PROP_HEIGHT */ {MAP_CHAR_LEN("CharPropHeight")},
+/* 0093 CHAR_DIFF_HEIGHT */ {MAP_CHAR_LEN("CharDiffHeight")},
+/* 0094 CHAR_PROP_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharPropHeightAsian")},
+/* 0095 CHAR_DIFF_HEIGHT_ASIAN */ {MAP_CHAR_LEN("CharDiffHeightAsian")},
+/* 0096 CHAR_PROP_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharPropHeightComplex")},
+/* 0097 CHAR_DIFF_HEIGHT_COMPLEX */ {MAP_CHAR_LEN("CharDiffHeightComplex")},
+/* 0098 CHAR_ESCAPEMENT_HEIGHT */ {MAP_CHAR_LEN("CharEscapementHeight")},
+/* 0099 CHAR_COLOR */ {MAP_CHAR_LEN("CharColor")},
-/* 0100 CHAR_FLASH */ {MAP_CHAR_LEN("CharFlash")},
-/* 0101 CHAR_KERNING */ {MAP_CHAR_LEN("CharKerning")},
-/* 0102 CHAR_BACK_COLOR */ {MAP_CHAR_LEN("CharBackColor")},
-/* 0103 CHAR_BACK_TRANSPARENT */ {MAP_CHAR_LEN("CharBackTransparent")},
-/* 0104 CHAR_COMBINE_IS_ON */ {MAP_CHAR_LEN("CharCombineIsOn")},
-/* 0105 CHAR_COMBINE_PREFIX */ {MAP_CHAR_LEN("CharCombinePrefix")},
-/* 0106 CHAR_COMBINE_SUFFIX */ {MAP_CHAR_LEN("CharCombineSuffix")},
-/* 0107 CHAR_EMPHASIS */ {MAP_CHAR_LEN("CharEmphasis")},
-/* 0108 PARA_LINE_SPACING */ {MAP_CHAR_LEN("ParaLineSpacing")},
-/* 0109 PARA_TOP_MARGIN */ {MAP_CHAR_LEN("ParaTopMargin")},
-/* 0110 PARA_BOTTOM_MARGIN */ {MAP_CHAR_LEN("ParaBottomMargin")},
-/* 0111 PARA_TOP_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaTopMarginRelative")},
-/* 0112 PARA_BOTTOM_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaBottomMarginRelative")},
-/* 0113 PARA_EXPAND_SINGLE_WORD */ {MAP_CHAR_LEN("ParaExpandSingleWord")},
-/* 0114 END_NOTICE */ {MAP_CHAR_LEN("EndNotice")},
-/* 0115 EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("EmbeddedObjects")},
-/* 0116 ALPHABETICAL_SEPARATORS */ {MAP_CHAR_LEN("AlphabeticalSeparators")},
-/* 0117 BACKGROUND_COLOR */ {MAP_CHAR_LEN("BackgroundColor")},
-/* 0118 BEGIN_NOTICE */ {MAP_CHAR_LEN("BeginNotice")},
-/* 0119 CASE_SENSITIVE */ {MAP_CHAR_LEN("CaseSensitive")},
-/* 0120 FRAME_STYLE_NAME */ {MAP_CHAR_LEN("FrameStyleName")},
-/* 0121 NUMBERING_STYLE_NAME */ {MAP_CHAR_LEN("NumberingStyleName")},
-/* 0122 NUMBERING_LEVEL */ {MAP_CHAR_LEN("NumberingLevel")},
-/* 0123 NUMBERING_START_VALUE */ {MAP_CHAR_LEN("NumberingStartValue")},
-/* 0124 NUMBERING_IS_NUMBER */ {MAP_CHAR_LEN("NumberingIsNumber")},
-/* 0125 COMBINE_ENTRIES */ {MAP_CHAR_LEN("CombineEntries")},
-/* 0126 COUNT_LINES_IN_FRAMES */ {MAP_CHAR_LEN("CountLinesInFrames")},
-/* 0127 DDE_COMMAND_TYPE */ {MAP_CHAR_LEN("DDECommandType")},
-/* 0128 DDE_COMMAND_FILE */ {MAP_CHAR_LEN("DDECommandFile")},
-/* 0129 DDE_COMMAND_ELEMENT */ {MAP_CHAR_LEN("DDECommandElement")},
-/* 0130 IS_AUTOMATIC_UPDATE */ {MAP_CHAR_LEN("IsAutomaticUpdate")},
-/* 0131 DEFAULT_TABSTOP_DISTANCE */ {MAP_CHAR_LEN("DefaultTabstopDistance")},
-/* 0132 DISTANCE */ {MAP_CHAR_LEN("Distance")},
-/* 0133 DROP_CAP_FORMAT */ {MAP_CHAR_LEN("DropCapFormat")},
-/* 0134 DROP_CAP_WHOLE_WORD */ {MAP_CHAR_LEN("DropCapWholeWord")},
-/* 0135 DROP_CAP_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("DropCapCharStyleName")},
-/* 0136 FILE_LINK */ {MAP_CHAR_LEN("FileLink")},
-/* 0137 GRAPHIC */ {MAP_CHAR_LEN("Graphic")},
-/* 0138 GRAPHICS */ {MAP_CHAR_LEN("Graphics")},
-/* 0139 IS_PROTECTED */ {MAP_CHAR_LEN("IsProtected")},
-/* 0140 KEY_AS_ENTRY */ {MAP_CHAR_LEN("KeyAsEntry")},
-/* 0141 PARA_KEEP_TOGETHER */ {MAP_CHAR_LEN("ParaKeepTogether")},
-/* 0142 KEEP_TOGETHER */ {MAP_CHAR_LEN("KeepTogether")},
-/* 0143 IS_LANDSCAPE */ {MAP_CHAR_LEN("IsLandscape")},
-/* 0144 SEPARATOR_TEXT */ {MAP_CHAR_LEN("SeparatorText")},
-/* 0145 MARKS */ {MAP_CHAR_LEN("Marks")},
-/* 0146 NUMBER_POSITION */ {MAP_CHAR_LEN("NumberPosition")},
-/* 0147 OUTLINES */ {MAP_CHAR_LEN("Outlines")},
-/* 0148 PAGE_STYLE_NAME */ {MAP_CHAR_LEN("PageStyleName")},
-/* 0149 PAGE_STYLE_LAYOUT */ {MAP_CHAR_LEN("PageStyleLayout")},
-/* 0150 PARA_STYLES */ {MAP_CHAR_LEN("ParaStyles")},
-/* 0151 PARA_ADJUST */ {MAP_CHAR_LEN("ParaAdjust")},
-/* 0152 PARA_REGISTER_MODE_ACTIVE */ {MAP_CHAR_LEN("ParaRegisterModeActive")},
-/* 0153 PARA_STYLE_NAME */ {MAP_CHAR_LEN("ParaStyleName")},
-/* 0154 PARA_LAST_LINE_ADJUST */ {MAP_CHAR_LEN("ParaLastLineAdjust")},
-/* 0155 PARA_LINE_NUMBER_COUNT */ {MAP_CHAR_LEN("ParaLineNumberCount")},
-/* 0156 PARA_LINE_NUMBER_START_VALUE */ {MAP_CHAR_LEN("ParaLineNumberStartValue")},
-/* 0157 BACK_COLOR */ {MAP_CHAR_LEN("BackColor")},
-/* 0158 PARA_BACK_COLOR */ {MAP_CHAR_LEN("ParaBackColor")},
-/* 0159 PARA_WIDOWS */ {MAP_CHAR_LEN("ParaWidows")},
-/* 0160 PARA_ORPHANS */ {MAP_CHAR_LEN("ParaOrphans")},
-/* 0161 PARA_BACK_TRANSPARENT */ {MAP_CHAR_LEN("ParaBackTransparent")},
-/* 0162 POSITION_END_OF_DOC */ {MAP_CHAR_LEN("PositionEndOfDoc")},
-/* 0163 POSITION_PROTECTED */ {MAP_CHAR_LEN("PositionProtected")},
-/* 0164 ALTERNATIVE_TEXT */ {MAP_CHAR_LEN("AlternativeText")},
-/* 0165 PRIMARY_KEY */ {MAP_CHAR_LEN("PrimaryKey")},
-/* 0166 PRINT_TABLES */ {MAP_CHAR_LEN("PrintTables")},
-/* 0167 PRINT_GRAPHICS */ {MAP_CHAR_LEN("PrintGraphics")},
-/* 0168 PRINT_REVERSED */ {MAP_CHAR_LEN("PrintReversed")},
-/* 0169 PRINT_PROSPECT */ {MAP_CHAR_LEN("PrintProspect")},
-/* 0170 PRINT_CONTROLS */ {MAP_CHAR_LEN("PrintControls")},
-/* 0171 PRINT_DRAWINGS */ {MAP_CHAR_LEN("PrintDrawings")},
-/* 0172 PRINT_RIGHT_PAGES */ {MAP_CHAR_LEN("PrintRightPages")},
-/* 0173 PRINT_LEFT_PAGES */ {MAP_CHAR_LEN("PrintLeftPages")},
-/* 0174 PRINT_BLACK_FONTS */ {MAP_CHAR_LEN("PrintBlackFonts")},
-/* 0175 PRINTER_PAPER_TRAY */ {MAP_CHAR_LEN("PrinterPaperTray")},
-/* 0176 PRINT_PAGE_BACKGROUND */ {MAP_CHAR_LEN("PrintPageBackground")},
-/* 0177 PRINT_ANNOTATION_MODE */ {MAP_CHAR_LEN("PrintAnnotationMode")},
-/* 0178 PRINT_FAX_NAME */ {MAP_CHAR_LEN("PrintFaxName")},
-/* 0179 PRINT_PAPER_FROM_SETUP */ {MAP_CHAR_LEN("PrintPaperFromSetup")},
-/* 0180 REGISTER_MODE_ACTIVE */ {MAP_CHAR_LEN("RegisterModeActive")},
-/* 0181 RELATIVE_WIDTH */ {MAP_CHAR_LEN("RelativeWidth")},
-/* 0182 RELATIVE_HEIGHT */ {MAP_CHAR_LEN("RelativeHeight")},
-/* 0183 REPEAT_HEADLINE */ {MAP_CHAR_LEN("RepeatHeadline")},
-/* 0184 SEARCH_STYLES */ {MAP_CHAR_LEN("SearchStyles")},
-/* 0185 SEARCH_BACKWARDS */ {MAP_CHAR_LEN("SearchBackwards")},
-/* 0186 SEARCH_SIMILARITY */ {MAP_CHAR_LEN("SearchSimilarity")},
-/* 0187 SEARCH_IN_SELECTION */ {MAP_CHAR_LEN("SearchInSelection")},
-/* 0188 SEARCH_CASE_SENSITIVE */ {MAP_CHAR_LEN("SearchCaseSensitive")},
-/* 0189 SEARCH_SIMILARITY_ADD */ {MAP_CHAR_LEN("SearchSimilarityAdd")},
-/* 0190 SEARCH_SIMILARITY_RELAX */ {MAP_CHAR_LEN("SearchSimilarityRelax")},
-/* 0191 SEARCH_SIMILARITY_REMOVE */ {MAP_CHAR_LEN("SearchSimilarityRemove")},
-/* 0192 SEARCH_REGULAR_EXPRESSION */ {MAP_CHAR_LEN("SearchRegularExpression")},
-/* 0193 SEARCH_SIMILARITY_EXCHANGE */ {MAP_CHAR_LEN("SearchSimilarityExchange")},
-/* 0194 SECONDARY_KEY */ {MAP_CHAR_LEN("SecondaryKey")},
-/* 0195 SEPARATOR_INTERVAL */ {MAP_CHAR_LEN("SeparatorInterval")},
-/* 0196 SHOW_BREAKS */ {MAP_CHAR_LEN("ShowBreaks")},
-/* 0197 SHOW_SPACES */ {MAP_CHAR_LEN("ShowSpaces")},
-/* 0198 SHOW_TABLES */ {MAP_CHAR_LEN("ShowTables")},
-/* 0199 SHOW_GRAPHICS */ {MAP_CHAR_LEN("ShowGraphics")},
+/* 0100 CHAR_FLASH */ {MAP_CHAR_LEN("CharFlash")},
+/* 0101 CHAR_KERNING */ {MAP_CHAR_LEN("CharKerning")},
+/* 0102 CHAR_BACK_COLOR */ {MAP_CHAR_LEN("CharBackColor")},
+/* 0103 CHAR_BACK_TRANSPARENT */ {MAP_CHAR_LEN("CharBackTransparent")},
+/* 0104 CHAR_COMBINE_IS_ON */ {MAP_CHAR_LEN("CharCombineIsOn")},
+/* 0105 CHAR_COMBINE_PREFIX */ {MAP_CHAR_LEN("CharCombinePrefix")},
+/* 0106 CHAR_COMBINE_SUFFIX */ {MAP_CHAR_LEN("CharCombineSuffix")},
+/* 0107 CHAR_EMPHASIS */ {MAP_CHAR_LEN("CharEmphasis")},
+/* 0108 PARA_LINE_SPACING */ {MAP_CHAR_LEN("ParaLineSpacing")},
+/* 0109 PARA_TOP_MARGIN */ {MAP_CHAR_LEN("ParaTopMargin")},
+/* 0110 PARA_BOTTOM_MARGIN */ {MAP_CHAR_LEN("ParaBottomMargin")},
+/* 0111 PARA_TOP_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaTopMarginRelative")},
+/* 0112 PARA_BOTTOM_MARGIN_RELATIVE */ {MAP_CHAR_LEN("ParaBottomMarginRelative")},
+/* 0113 PARA_EXPAND_SINGLE_WORD */ {MAP_CHAR_LEN("ParaExpandSingleWord")},
+/* 0114 END_NOTICE */ {MAP_CHAR_LEN("EndNotice")},
+/* 0115 EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("EmbeddedObjects")},
+/* 0116 ALPHABETICAL_SEPARATORS */ {MAP_CHAR_LEN("AlphabeticalSeparators")},
+/* 0117 BACKGROUND_COLOR */ {MAP_CHAR_LEN("BackgroundColor")},
+/* 0118 BEGIN_NOTICE */ {MAP_CHAR_LEN("BeginNotice")},
+/* 0119 CASE_SENSITIVE */ {MAP_CHAR_LEN("CaseSensitive")},
+/* 0120 FRAME_STYLE_NAME */ {MAP_CHAR_LEN("FrameStyleName")},
+/* 0121 NUMBERING_STYLE_NAME */ {MAP_CHAR_LEN("NumberingStyleName")},
+/* 0122 NUMBERING_LEVEL */ {MAP_CHAR_LEN("NumberingLevel")},
+/* 0123 NUMBERING_START_VALUE */ {MAP_CHAR_LEN("NumberingStartValue")},
+/* 0124 NUMBERING_IS_NUMBER */ {MAP_CHAR_LEN("NumberingIsNumber")},
+/* 0125 COMBINE_ENTRIES */ {MAP_CHAR_LEN("CombineEntries")},
+/* 0126 COUNT_LINES_IN_FRAMES */ {MAP_CHAR_LEN("CountLinesInFrames")},
+/* 0127 DDE_COMMAND_TYPE */ {MAP_CHAR_LEN("DDECommandType")},
+/* 0128 DDE_COMMAND_FILE */ {MAP_CHAR_LEN("DDECommandFile")},
+/* 0129 DDE_COMMAND_ELEMENT */ {MAP_CHAR_LEN("DDECommandElement")},
+/* 0130 IS_AUTOMATIC_UPDATE */ {MAP_CHAR_LEN("IsAutomaticUpdate")},
+/* 0131 DEFAULT_TABSTOP_DISTANCE */ {MAP_CHAR_LEN("DefaultTabstopDistance")},
+/* 0132 DISTANCE */ {MAP_CHAR_LEN("Distance")},
+/* 0133 DROP_CAP_FORMAT */ {MAP_CHAR_LEN("DropCapFormat")},
+/* 0134 DROP_CAP_WHOLE_WORD */ {MAP_CHAR_LEN("DropCapWholeWord")},
+/* 0135 DROP_CAP_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("DropCapCharStyleName")},
+/* 0136 FILE_LINK */ {MAP_CHAR_LEN("FileLink")},
+/* 0137 GRAPHIC */ {MAP_CHAR_LEN("Graphic")},
+/* 0138 GRAPHICS */ {MAP_CHAR_LEN("Graphics")},
+/* 0139 IS_PROTECTED */ {MAP_CHAR_LEN("IsProtected")},
+/* 0140 KEY_AS_ENTRY */ {MAP_CHAR_LEN("KeyAsEntry")},
+/* 0141 PARA_KEEP_TOGETHER */ {MAP_CHAR_LEN("ParaKeepTogether")},
+/* 0142 KEEP_TOGETHER */ {MAP_CHAR_LEN("KeepTogether")},
+/* 0143 IS_LANDSCAPE */ {MAP_CHAR_LEN("IsLandscape")},
+/* 0144 SEPARATOR_TEXT */ {MAP_CHAR_LEN("SeparatorText")},
+/* 0145 MARKS */ {MAP_CHAR_LEN("Marks")},
+/* 0146 NUMBER_POSITION */ {MAP_CHAR_LEN("NumberPosition")},
+/* 0147 OUTLINES */ {MAP_CHAR_LEN("Outlines")},
+/* 0148 PAGE_STYLE_NAME */ {MAP_CHAR_LEN("PageStyleName")},
+/* 0149 PAGE_STYLE_LAYOUT */ {MAP_CHAR_LEN("PageStyleLayout")},
+/* 0150 PARA_STYLES */ {MAP_CHAR_LEN("ParaStyles")},
+/* 0151 PARA_ADJUST */ {MAP_CHAR_LEN("ParaAdjust")},
+/* 0152 PARA_REGISTER_MODE_ACTIVE */ {MAP_CHAR_LEN("ParaRegisterModeActive")},
+/* 0153 PARA_STYLE_NAME */ {MAP_CHAR_LEN("ParaStyleName")},
+/* 0154 PARA_LAST_LINE_ADJUST */ {MAP_CHAR_LEN("ParaLastLineAdjust")},
+/* 0155 PARA_LINE_NUMBER_COUNT */ {MAP_CHAR_LEN("ParaLineNumberCount")},
+/* 0156 PARA_LINE_NUMBER_START_VALUE */ {MAP_CHAR_LEN("ParaLineNumberStartValue")},
+/* 0157 BACK_COLOR */ {MAP_CHAR_LEN("BackColor")},
+/* 0158 PARA_BACK_COLOR */ {MAP_CHAR_LEN("ParaBackColor")},
+/* 0159 PARA_WIDOWS */ {MAP_CHAR_LEN("ParaWidows")},
+/* 0160 PARA_ORPHANS */ {MAP_CHAR_LEN("ParaOrphans")},
+/* 0161 PARA_BACK_TRANSPARENT */ {MAP_CHAR_LEN("ParaBackTransparent")},
+/* 0162 POSITION_END_OF_DOC */ {MAP_CHAR_LEN("PositionEndOfDoc")},
+/* 0163 POSITION_PROTECTED */ {MAP_CHAR_LEN("PositionProtected")},
+/* 0164 ALTERNATIVE_TEXT */ {MAP_CHAR_LEN("AlternativeText")},
+/* 0165 PRIMARY_KEY */ {MAP_CHAR_LEN("PrimaryKey")},
+/* 0166 PRINT_TABLES */ {MAP_CHAR_LEN("PrintTables")},
+/* 0167 PRINT_GRAPHICS */ {MAP_CHAR_LEN("PrintGraphics")},
+/* 0168 PRINT_REVERSED */ {MAP_CHAR_LEN("PrintReversed")},
+/* 0169 PRINT_PROSPECT */ {MAP_CHAR_LEN("PrintProspect")},
+/* 0170 PRINT_CONTROLS */ {MAP_CHAR_LEN("PrintControls")},
+/* 0171 PRINT_DRAWINGS */ {MAP_CHAR_LEN("PrintDrawings")},
+/* 0172 PRINT_RIGHT_PAGES */ {MAP_CHAR_LEN("PrintRightPages")},
+/* 0173 PRINT_LEFT_PAGES */ {MAP_CHAR_LEN("PrintLeftPages")},
+/* 0174 PRINT_BLACK_FONTS */ {MAP_CHAR_LEN("PrintBlackFonts")},
+/* 0175 PRINTER_PAPER_TRAY */ {MAP_CHAR_LEN("PrinterPaperTray")},
+/* 0176 PRINT_PAGE_BACKGROUND */ {MAP_CHAR_LEN("PrintPageBackground")},
+/* 0177 PRINT_ANNOTATION_MODE */ {MAP_CHAR_LEN("PrintAnnotationMode")},
+/* 0178 PRINT_FAX_NAME */ {MAP_CHAR_LEN("PrintFaxName")},
+/* 0179 PRINT_PAPER_FROM_SETUP */ {MAP_CHAR_LEN("PrintPaperFromSetup")},
+/* 0180 REGISTER_MODE_ACTIVE */ {MAP_CHAR_LEN("RegisterModeActive")},
+/* 0181 RELATIVE_WIDTH */ {MAP_CHAR_LEN("RelativeWidth")},
+/* 0182 RELATIVE_HEIGHT */ {MAP_CHAR_LEN("RelativeHeight")},
+/* 0183 REPEAT_HEADLINE */ {MAP_CHAR_LEN("RepeatHeadline")},
+/* 0184 SEARCH_STYLES */ {MAP_CHAR_LEN("SearchStyles")},
+/* 0185 SEARCH_BACKWARDS */ {MAP_CHAR_LEN("SearchBackwards")},
+/* 0186 SEARCH_SIMILARITY */ {MAP_CHAR_LEN("SearchSimilarity")},
+/* 0187 SEARCH_IN_SELECTION */ {MAP_CHAR_LEN("SearchInSelection")},
+/* 0188 SEARCH_CASE_SENSITIVE */ {MAP_CHAR_LEN("SearchCaseSensitive")},
+/* 0189 SEARCH_SIMILARITY_ADD */ {MAP_CHAR_LEN("SearchSimilarityAdd")},
+/* 0190 SEARCH_SIMILARITY_RELAX */ {MAP_CHAR_LEN("SearchSimilarityRelax")},
+/* 0191 SEARCH_SIMILARITY_REMOVE */ {MAP_CHAR_LEN("SearchSimilarityRemove")},
+/* 0192 SEARCH_REGULAR_EXPRESSION */ {MAP_CHAR_LEN("SearchRegularExpression")},
+/* 0193 SEARCH_SIMILARITY_EXCHANGE */ {MAP_CHAR_LEN("SearchSimilarityExchange")},
+/* 0194 SECONDARY_KEY */ {MAP_CHAR_LEN("SecondaryKey")},
+/* 0195 SEPARATOR_INTERVAL */ {MAP_CHAR_LEN("SeparatorInterval")},
+/* 0196 SHOW_BREAKS */ {MAP_CHAR_LEN("ShowBreaks")},
+/* 0197 SHOW_SPACES */ {MAP_CHAR_LEN("ShowSpaces")},
+/* 0198 SHOW_TABLES */ {MAP_CHAR_LEN("ShowTables")},
+/* 0199 SHOW_GRAPHICS */ {MAP_CHAR_LEN("ShowGraphics")},
-/* 0200 SHOW_DRAWINGS */ {MAP_CHAR_LEN("ShowDrawings")},
-/* 0201 SHOW_TABSTOPS */ {MAP_CHAR_LEN("ShowTabstops")},
-/* 0202 SHOW_VERT_RULER */ {MAP_CHAR_LEN("ShowVertRuler")},
-/* 0203 SHOW_PARA_BREAKS */ {MAP_CHAR_LEN("ShowParaBreaks")},
-/* 0204 SHOW_HIDDEN_TEXT */ {MAP_CHAR_LEN("ShowHiddenText")},
-/* 0205 SHOW_ANNOTATIONS */ {MAP_CHAR_LEN("ShowAnnotations")},
-/* 0206 SHOW_SOFT_HYPHENS */ {MAP_CHAR_LEN("ShowSoftHyphens")},
-/* 0207 SHOW_VERT_SCROLL_BAR */ {MAP_CHAR_LEN("ShowVertScrollBar")},
-/* 0208 SHOW_HORI_SCROLL_BAR */ {MAP_CHAR_LEN("ShowHoriScrollBar")},
-/* 0209 SHOW_FIELD_COMMANDS */ {MAP_CHAR_LEN("ShowFieldCommands")},
-/* 0210 SHOW_TEXT_BOUNDARIES */ {MAP_CHAR_LEN("ShowTextBoundaries")},
-/* 0211 SHOW_PROTECTED_SPACES */ {MAP_CHAR_LEN("ShowProtectedSpaces")},
-/* 0212 SHOW_TABLE_BOUNDARIES */ {MAP_CHAR_LEN("ShowTableBoundaries")},
-/* 0213 SHOW_HIDDEN_PARAGRAPHS */ {MAP_CHAR_LEN("ShowHiddenParagraphs")},
-/* 0214 SHOW_INDEX_MARK_BACKGROUND */ {MAP_CHAR_LEN("ShowIndexMarkBackground")},
-/* 0215 SHOW_FOOTNOTE_BACKGROUND */ {MAP_CHAR_LEN("ShowFootnoteBackground")},
-/* 0216 SHOW_TEXT_FIELD_BACKGROUND */ {MAP_CHAR_LEN("ShowTextFieldBackground")},
-/* 0217 IS_SYNC_WIDTH_TO_HEIGHT */ {MAP_CHAR_LEN("IsSyncWidthToHeight")},
-/* 0218 IS_SYNC_HEIGHT_TO_WIDTH */ {MAP_CHAR_LEN("IsSyncHeightToWidth")},
-/* 0219 SIZE_PROTECTED */ {MAP_CHAR_LEN("SizeProtected")},
-/* 0220 SMOOTH_SCROLLING */ {MAP_CHAR_LEN("SmoothScrolling")},
-/* 0221 SOLID_MARK_HANDLES */ {MAP_CHAR_LEN("SolidMarkHandles")},
-/* 0222 TABLES */ {MAP_CHAR_LEN("Tables")},
-/* 0223 TEXT_FRAMES */ {MAP_CHAR_LEN("TextFrames")},
-/* 0224 TEXT_COLUMNS */ {MAP_CHAR_LEN("TextColumns")},
-/* 0225 BACK_TRANSPARENT */ {MAP_CHAR_LEN("BackTransparent")},
-/* 0226 USE_PP */ {MAP_CHAR_LEN("UsePP")},
-/* 0227 USER_METRIC */ {MAP_CHAR_LEN("UserMetric")},
-/* 0228 ANCHOR_TYPE */ {MAP_CHAR_LEN("AnchorType")},
-/* 0229 ANCHOR_TYPES */ {MAP_CHAR_LEN("AnchorTypes")},
-/* 0230 ANCHOR_PAGE_NO */ {MAP_CHAR_LEN("AnchorPageNo")},
-/* 0231 ANCHOR_FRAME */ {MAP_CHAR_LEN("AnchorFrame")},
-/* 0232 AUTHOR */ {MAP_CHAR_LEN("Author")},
-/* 0233 BREAK_TYPE */ {MAP_CHAR_LEN("BreakType")},
-/* 0234 CHAIN_NEXT_NAME */ {MAP_CHAR_LEN("ChainNextName")},
-/* 0235 CHAIN_PREV_NAME */ {MAP_CHAR_LEN("ChainPrevName")},
-/* 0236 CHAPTER_FORMAT */ {MAP_CHAR_LEN("ChapterFormat")},
-/* 0237 CLIENT_MAP */ {MAP_CHAR_LEN("ClientMap")},
-/* 0238 CONDITION */ {MAP_CHAR_LEN("Condition")},
-/* 0239 CONTENT */ {MAP_CHAR_LEN("Content")},
-/* 0240 CHAR_CONTOURED */ {MAP_CHAR_LEN("CharContoured")},
-/* 0241 CONTOUR_OUTSIDE */ {MAP_CHAR_LEN("ContourOutside")},
-/* 0242 CONTENT_PROTECTED */ {MAP_CHAR_LEN("ContentProtected")},
-/* 0243 COUNT_EMPTY_LINES */ {MAP_CHAR_LEN("CountEmptyLines")},
-/* 0244 RESTART_AT_EACH_PAGE */ {MAP_CHAR_LEN("RestartAtEachPage")},
-/* 0245 DATA_BASE_NAME */ {MAP_CHAR_LEN("DataBaseName")},
-/* 0246 DATA_TABLE_NAME */ {MAP_CHAR_LEN("DataTableName")},
-/* 0247 DATA_COMMAND_TYPE */ {MAP_CHAR_LEN("DataCommandType")},
-/* 0248 DATA_COLUMN_NAME */ {MAP_CHAR_LEN("DataColumnName")},
-/* 0249 IS_DATA_BASE_FORMAT */ {MAP_CHAR_LEN("DataBaseFormat")},
-/* 0250 DATE */ {MAP_CHAR_LEN("Date")},
-/* 0251 IS_DATE */ {MAP_CHAR_LEN("IsDate")},
-/* 0252 EDIT_IN_READONLY */ {MAP_CHAR_LEN("EditInReadonly")},
-/* 0253 FALSE_CONTENT */ {MAP_CHAR_LEN("FalseContent")},
-/* 0254 FILE_FORMAT */ {MAP_CHAR_LEN("FileFormat")},
-/* 0255 IS_FIXED */ {MAP_CHAR_LEN("IsFixed")},
-/* 0256 FOOTNOTE_COUNTING */ {MAP_CHAR_LEN("FootnoteCounting")},
-/* 0257 FORMULA */ {MAP_CHAR_LEN("Formula")},
-/* 0258 FRAME_NAME */ {MAP_CHAR_LEN("FrameName")},
-/* 0259 GRAPHIC_NAME */ {MAP_CHAR_LEN("GraphicName")},
-/* 0260 FULL_NAME */ {MAP_CHAR_LEN("FullName")},
-/* 0261 HEIGHT */ {MAP_CHAR_LEN("Height")},
-/* 0262 IS_AUTO_HEIGHT */ {MAP_CHAR_LEN("IsAutoHeight")},
-/* 0263 SIZE_TYPE */ {MAP_CHAR_LEN("SizeType")},
-/* 0264 HINT */ {MAP_CHAR_LEN("Hint")},
-/* 0265 HORI_ORIENT */ {MAP_CHAR_LEN("HoriOrient")},
-/* 0266 HORI_MIRRORED_ON_EVEN_PAGES */ {MAP_CHAR_LEN("HoriMirroredOnEvenPages")},
-/* 0267 HORI_MIRRORED_ON_ODD_PAGES */ {MAP_CHAR_LEN("HoriMirroredOnOddPages")},
-/* 0268 HORI_ORIENT_RELATION */ {MAP_CHAR_LEN("HoriOrientRelation")},
-/* 0269 HORI_ORIENT_POSITION */ {MAP_CHAR_LEN("HoriOrientPosition")},
-/* 0270 HYPER_LINK_U_R_L */ {MAP_CHAR_LEN("HyperLinkURL")},
-/* 0271 HYPER_LINK_TARGET */ {MAP_CHAR_LEN("HyperLinkTarget")},
-/* 0272 HYPER_LINK_NAME */ {MAP_CHAR_LEN("HyperLinkName")},
-/* 0273 HYPER_LINK_EVENTS */ {MAP_CHAR_LEN("HyperLinkEvents")},
-/* 0274 INFO_TYPE */ {MAP_CHAR_LEN("InfoType")},
-/* 0275 INFO_FORMAT */ {MAP_CHAR_LEN("InfoFormat")},
+/* 0200 SHOW_DRAWINGS */ {MAP_CHAR_LEN("ShowDrawings")},
+/* 0201 SHOW_TABSTOPS */ {MAP_CHAR_LEN("ShowTabstops")},
+/* 0202 SHOW_VERT_RULER */ {MAP_CHAR_LEN("ShowVertRuler")},
+/* 0203 SHOW_PARA_BREAKS */ {MAP_CHAR_LEN("ShowParaBreaks")},
+/* 0204 SHOW_HIDDEN_TEXT */ {MAP_CHAR_LEN("ShowHiddenText")},
+/* 0205 SHOW_ANNOTATIONS */ {MAP_CHAR_LEN("ShowAnnotations")},
+/* 0206 SHOW_SOFT_HYPHENS */ {MAP_CHAR_LEN("ShowSoftHyphens")},
+/* 0207 SHOW_VERT_SCROLL_BAR */ {MAP_CHAR_LEN("ShowVertScrollBar")},
+/* 0208 SHOW_HORI_SCROLL_BAR */ {MAP_CHAR_LEN("ShowHoriScrollBar")},
+/* 0209 SHOW_FIELD_COMMANDS */ {MAP_CHAR_LEN("ShowFieldCommands")},
+/* 0210 SHOW_TEXT_BOUNDARIES */ {MAP_CHAR_LEN("ShowTextBoundaries")},
+/* 0211 SHOW_PROTECTED_SPACES */ {MAP_CHAR_LEN("ShowProtectedSpaces")},
+/* 0212 SHOW_TABLE_BOUNDARIES */ {MAP_CHAR_LEN("ShowTableBoundaries")},
+/* 0213 SHOW_HIDDEN_PARAGRAPHS */ {MAP_CHAR_LEN("ShowHiddenParagraphs")},
+/* 0214 SHOW_INDEX_MARK_BACKGROUND */ {MAP_CHAR_LEN("ShowIndexMarkBackground")},
+/* 0215 SHOW_FOOTNOTE_BACKGROUND */ {MAP_CHAR_LEN("ShowFootnoteBackground")},
+/* 0216 SHOW_TEXT_FIELD_BACKGROUND */ {MAP_CHAR_LEN("ShowTextFieldBackground")},
+/* 0217 IS_SYNC_WIDTH_TO_HEIGHT */ {MAP_CHAR_LEN("IsSyncWidthToHeight")},
+/* 0218 IS_SYNC_HEIGHT_TO_WIDTH */ {MAP_CHAR_LEN("IsSyncHeightToWidth")},
+/* 0219 SIZE_PROTECTED */ {MAP_CHAR_LEN("SizeProtected")},
+/* 0220 SMOOTH_SCROLLING */ {MAP_CHAR_LEN("SmoothScrolling")},
+/* 0221 SOLID_MARK_HANDLES */ {MAP_CHAR_LEN("SolidMarkHandles")},
+/* 0222 TABLES */ {MAP_CHAR_LEN("Tables")},
+/* 0223 TEXT_FRAMES */ {MAP_CHAR_LEN("TextFrames")},
+/* 0224 TEXT_COLUMNS */ {MAP_CHAR_LEN("TextColumns")},
+/* 0225 BACK_TRANSPARENT */ {MAP_CHAR_LEN("BackTransparent")},
+/* 0226 USE_PP */ {MAP_CHAR_LEN("UsePP")},
+/* 0227 USER_METRIC */ {MAP_CHAR_LEN("UserMetric")},
+/* 0228 ANCHOR_TYPE */ {MAP_CHAR_LEN("AnchorType")},
+/* 0229 ANCHOR_TYPES */ {MAP_CHAR_LEN("AnchorTypes")},
+/* 0230 ANCHOR_PAGE_NO */ {MAP_CHAR_LEN("AnchorPageNo")},
+/* 0231 ANCHOR_FRAME */ {MAP_CHAR_LEN("AnchorFrame")},
+/* 0232 AUTHOR */ {MAP_CHAR_LEN("Author")},
+/* 0233 BREAK_TYPE */ {MAP_CHAR_LEN("BreakType")},
+/* 0234 CHAIN_NEXT_NAME */ {MAP_CHAR_LEN("ChainNextName")},
+/* 0235 CHAIN_PREV_NAME */ {MAP_CHAR_LEN("ChainPrevName")},
+/* 0236 CHAPTER_FORMAT */ {MAP_CHAR_LEN("ChapterFormat")},
+/* 0237 CLIENT_MAP */ {MAP_CHAR_LEN("ClientMap")},
+/* 0238 CONDITION */ {MAP_CHAR_LEN("Condition")},
+/* 0239 CONTENT */ {MAP_CHAR_LEN("Content")},
+/* 0240 CHAR_CONTOURED */ {MAP_CHAR_LEN("CharContoured")},
+/* 0241 CONTOUR_OUTSIDE */ {MAP_CHAR_LEN("ContourOutside")},
+/* 0242 CONTENT_PROTECTED */ {MAP_CHAR_LEN("ContentProtected")},
+/* 0243 COUNT_EMPTY_LINES */ {MAP_CHAR_LEN("CountEmptyLines")},
+/* 0244 RESTART_AT_EACH_PAGE */ {MAP_CHAR_LEN("RestartAtEachPage")},
+/* 0245 DATA_BASE_NAME */ {MAP_CHAR_LEN("DataBaseName")},
+/* 0246 DATA_TABLE_NAME */ {MAP_CHAR_LEN("DataTableName")},
+/* 0247 DATA_COMMAND_TYPE */ {MAP_CHAR_LEN("DataCommandType")},
+/* 0248 DATA_COLUMN_NAME */ {MAP_CHAR_LEN("DataColumnName")},
+/* 0249 IS_DATA_BASE_FORMAT */ {MAP_CHAR_LEN("DataBaseFormat")},
+/* 0250 DATE */ {MAP_CHAR_LEN("Date")},
+/* 0251 IS_DATE */ {MAP_CHAR_LEN("IsDate")},
+/* 0252 EDIT_IN_READONLY */ {MAP_CHAR_LEN("EditInReadonly")},
+/* 0253 FALSE_CONTENT */ {MAP_CHAR_LEN("FalseContent")},
+/* 0254 FILE_FORMAT */ {MAP_CHAR_LEN("FileFormat")},
+/* 0255 IS_FIXED */ {MAP_CHAR_LEN("IsFixed")},
+/* 0256 FOOTNOTE_COUNTING */ {MAP_CHAR_LEN("FootnoteCounting")},
+/* 0257 FORMULA */ {MAP_CHAR_LEN("Formula")},
+/* 0258 FRAME_NAME */ {MAP_CHAR_LEN("FrameName")},
+/* 0259 GRAPHIC_NAME */ {MAP_CHAR_LEN("GraphicName")},
+/* 0260 FULL_NAME */ {MAP_CHAR_LEN("FullName")},
+/* 0261 HEIGHT */ {MAP_CHAR_LEN("Height")},
+/* 0262 IS_AUTO_HEIGHT */ {MAP_CHAR_LEN("IsAutoHeight")},
+/* 0263 SIZE_TYPE */ {MAP_CHAR_LEN("SizeType")},
+/* 0264 HINT */ {MAP_CHAR_LEN("Hint")},
+/* 0265 HORI_ORIENT */ {MAP_CHAR_LEN("HoriOrient")},
+/* 0266 HORI_MIRRORED_ON_EVEN_PAGES */ {MAP_CHAR_LEN("HoriMirroredOnEvenPages")},
+/* 0267 HORI_MIRRORED_ON_ODD_PAGES */ {MAP_CHAR_LEN("HoriMirroredOnOddPages")},
+/* 0268 HORI_ORIENT_RELATION */ {MAP_CHAR_LEN("HoriOrientRelation")},
+/* 0269 HORI_ORIENT_POSITION */ {MAP_CHAR_LEN("HoriOrientPosition")},
+/* 0270 HYPER_LINK_U_R_L */ {MAP_CHAR_LEN("HyperLinkURL")},
+/* 0271 HYPER_LINK_TARGET */ {MAP_CHAR_LEN("HyperLinkTarget")},
+/* 0272 HYPER_LINK_NAME */ {MAP_CHAR_LEN("HyperLinkName")},
+/* 0273 HYPER_LINK_EVENTS */ {MAP_CHAR_LEN("HyperLinkEvents")},
+/* 0274 INFO_TYPE */ {MAP_CHAR_LEN("InfoType")},
+/* 0275 INFO_FORMAT */ {MAP_CHAR_LEN("InfoFormat")},
/* 0276 IS_INPUT */ {MAP_CHAR_LEN("IsInput")},
-/* 0277 LEVEL */ {MAP_CHAR_LEN("Level")},
-/* 0278 INTERVAL */ {MAP_CHAR_LEN("Interval")},
-/* 0279 LINK_REGION */ {MAP_CHAR_LEN("LinkRegion")},
-/* 0280 MACRO_NAME */ {MAP_CHAR_LEN("MacroName")},
-/* 0281 SPLIT */ {MAP_CHAR_LEN("Split")},
-/* 0282 PARA_SPLIT */ {MAP_CHAR_LEN("ParaSplit")},
-/* 0283 NUMBER_FORMAT */ {MAP_CHAR_LEN("NumberFormat")},
-/* 0284 NUMBERING_TYPE */ {MAP_CHAR_LEN("NumberingType")},
-/* 0285 NUMBERING_RULES */ {MAP_CHAR_LEN("NumberingRules")},
-/* 0286 OFFSET */ {MAP_CHAR_LEN("Offset")},
-/* 0287 ON */ {MAP_CHAR_LEN("On")},
-/* 0288 OPAQUE */ {MAP_CHAR_LEN("Opaque")},
-/* 0289 PAGE_TOGGLE */ {MAP_CHAR_LEN("PageToggle")},
-/* 0290 PAGE_DESC_NAME */ {MAP_CHAR_LEN("PageDescName")},
-/* 0291 PAGE_NUMBER_OFFSET */ {MAP_CHAR_LEN("PageNumberOffset")},
-/* 0292 PLACEHOLDER */ {MAP_CHAR_LEN("PlaceHolder")},
-/* 0293 PLACEHOLDER_TYPE */ {MAP_CHAR_LEN("PlaceHolderType")},
-/* 0294 PRINT */ {MAP_CHAR_LEN("Print")},
-/* 0295 REFERENCE_FIELD_PART */ {MAP_CHAR_LEN("ReferenceFieldPart")},
-/* 0296 REFERENCE_FIELD_SOURCE */ {MAP_CHAR_LEN("ReferenceFieldSource")},
-/* 0297 REGISTER_PARAGRAPH_STYLE */ {MAP_CHAR_LEN("RegisterParagraphStyle")},
-/* 0298 SCRIPT_TYPE */ {MAP_CHAR_LEN("ScriptType")},
-/* 0299 SEARCH_ALL */ {MAP_CHAR_LEN("SearchAll")},
+/* 0277 LEVEL */ {MAP_CHAR_LEN("Level")},
+/* 0278 INTERVAL */ {MAP_CHAR_LEN("Interval")},
+/* 0279 LINK_REGION */ {MAP_CHAR_LEN("LinkRegion")},
+/* 0280 MACRO_NAME */ {MAP_CHAR_LEN("MacroName")},
+/* 0281 SPLIT */ {MAP_CHAR_LEN("Split")},
+/* 0282 PARA_SPLIT */ {MAP_CHAR_LEN("ParaSplit")},
+/* 0283 NUMBER_FORMAT */ {MAP_CHAR_LEN("NumberFormat")},
+/* 0284 NUMBERING_TYPE */ {MAP_CHAR_LEN("NumberingType")},
+/* 0285 NUMBERING_RULES */ {MAP_CHAR_LEN("NumberingRules")},
+/* 0286 OFFSET */ {MAP_CHAR_LEN("Offset")},
+/* 0287 ON */ {MAP_CHAR_LEN("On")},
+/* 0288 OPAQUE */ {MAP_CHAR_LEN("Opaque")},
+/* 0289 PAGE_TOGGLE */ {MAP_CHAR_LEN("PageToggle")},
+/* 0290 PAGE_DESC_NAME */ {MAP_CHAR_LEN("PageDescName")},
+/* 0291 PAGE_NUMBER_OFFSET */ {MAP_CHAR_LEN("PageNumberOffset")},
+/* 0292 PLACEHOLDER */ {MAP_CHAR_LEN("PlaceHolder")},
+/* 0293 PLACEHOLDER_TYPE */ {MAP_CHAR_LEN("PlaceHolderType")},
+/* 0294 PRINT */ {MAP_CHAR_LEN("Print")},
+/* 0295 REFERENCE_FIELD_PART */ {MAP_CHAR_LEN("ReferenceFieldPart")},
+/* 0296 REFERENCE_FIELD_SOURCE */ {MAP_CHAR_LEN("ReferenceFieldSource")},
+/* 0297 REGISTER_PARAGRAPH_STYLE */ {MAP_CHAR_LEN("RegisterParagraphStyle")},
+/* 0298 SCRIPT_TYPE */ {MAP_CHAR_LEN("ScriptType")},
+/* 0299 SEARCH_ALL */ {MAP_CHAR_LEN("SearchAll")},
-/* 0300 SEARCH_WORDS */ {MAP_CHAR_LEN("SearchWords")},
-/* 0301 SEQUENCE_VALUE */ {MAP_CHAR_LEN("SequenceValue")},
-/* 0302 SERVER_MAP */ {MAP_CHAR_LEN("ServerMap")},
-/* 0303 IMAGE_MAP */ {MAP_CHAR_LEN("ImageMap")},
-/* 0304 SET_NUMBER */ {MAP_CHAR_LEN("SetNumber")},
-/* 0305 SHADOW_FORMAT */ {MAP_CHAR_LEN("ShadowFormat")},
-/* 0306 SHOW_HORI_RULER */ {MAP_CHAR_LEN("ShowHoriRuler")},
-/* 0307 SIZE */ {MAP_CHAR_LEN("Size")},
-/* 0308 ACTUAL_SIZE */ {MAP_CHAR_LEN("ActualSize")},
-/* 0309 SOURCE_NAME */ {MAP_CHAR_LEN("SourceName")},
-/* 0310 START_AT */ {MAP_CHAR_LEN("StartAt")},
-/* 0311 STATISTIC_TYPE_ID */ {MAP_CHAR_LEN("StatisticTypeId")},
-/* 0312 SUB_TYPE */ {MAP_CHAR_LEN("SubType")},
-/* 0313 SURROUND */ {MAP_CHAR_LEN("Surround")},
-/* 0314 IS_EXPRESSION */ {MAP_CHAR_LEN("IsExpression")},
-/* 0315 IS_SHOW_FORMULA */ {MAP_CHAR_LEN("IsShowFormula")},
-/* 0316 TEXT_WRAP */ {MAP_CHAR_LEN("TextWrap")},
-/* 0317 SURROUND_CONTOUR */ {MAP_CHAR_LEN("SurroundContour")},
-/* 0318 SURROUND_ANCHORONLY */ {MAP_CHAR_LEN("SurroundAnchorOnly")},
-/* 0319 TABLE_NAME */ {MAP_CHAR_LEN("TableName")},
-/* 0320 TABSTOPS */ {MAP_CHAR_LEN("ParaTabStops")},
-/* 0321 TITLE */ {MAP_CHAR_LEN("Title")},
-/* 0322 TOP_MARGIN */ {MAP_CHAR_LEN("TopMargin")},
-/* 0323 BOTTOM_MARGIN */ {MAP_CHAR_LEN("BottomMargin")},
-/* 0324 TRUE_CONTENT */ {MAP_CHAR_LEN("TrueContent")},
-/* 0325 URL_CONTENT */ {MAP_CHAR_LEN("URLContent")},
-/* 0326 USERTEXT */ {MAP_CHAR_LEN("UserText")},
-/* 0327 USER_DATA_TYPE */ {MAP_CHAR_LEN("UserDataType")},
-/* 0328 VALUE */ {MAP_CHAR_LEN("Value")},
-/* 0329 VARIABLE_NAME */ {MAP_CHAR_LEN("VariableName")},
-/* 0330 VARIABLE_SUBTYPE */ {MAP_CHAR_LEN("VariableSubtype")},
-/* 0331 VERT_ORIENT */ {MAP_CHAR_LEN("VertOrient")},
-/* 0332 VERT_MIRRORED */ {MAP_CHAR_LEN("VertMirrored")},
-/* 0333 VERT_ORIENT_POSITION */ {MAP_CHAR_LEN("VertOrientPosition")},
-/* 0334 VERT_ORIENT_RELATION */ {MAP_CHAR_LEN("VertOrientRelation")},
-/* 0335 IS_VISIBLE */ {MAP_CHAR_LEN("IsVisible")},
-/* 0336 WIDTH */ {MAP_CHAR_LEN("Width")},
-/* 0337 CHAR_WORD_MODE */ {MAP_CHAR_LEN("CharWordMode")},
-/* 0338 GRAPHIC_CROP */ {MAP_CHAR_LEN("GraphicCrop")},
-/* 0339 CHARACTER_FORMAT_NONE */ {MAP_CHAR_LEN("CharacterFormatNone")},
-/* 0340 TEXT_POSITION */ {MAP_CHAR_LEN("TextPosition")},
-/* 0341 DOCUMENT_INDEX_MARK */ {MAP_CHAR_LEN("DocumentIndexMark")},
-/* 0342 DOCUMENT_INDEX */ {MAP_CHAR_LEN("DocumentIndex")},
-/* 0343 IS_GLOBAL_DOCUMENT_SECTION */ {MAP_CHAR_LEN("IsGlobalDocumentSection")},
-/* 0344 TEXT_FIELD */ {MAP_CHAR_LEN("TextField")},
-/* 0345 BOOKMARK */ {MAP_CHAR_LEN("Bookmark")},
-/* 0346 TEXT_TABLE */ {MAP_CHAR_LEN("TextTable")},
-/* 0347 CELL */ {MAP_CHAR_LEN("Cell")},
-/* 0348 TEXT_FRAME */ {MAP_CHAR_LEN("TextFrame")},
-/* 0349 REFERENCE_MARK */ {MAP_CHAR_LEN("ReferenceMark")},
-/* 0350 TEXT_SECTION */ {MAP_CHAR_LEN("TextSection")},
-/* 0351 FOOTNOTE */ {MAP_CHAR_LEN("Footnote")},
-/* 0352 ENDNOTE */ {MAP_CHAR_LEN("Endnote")},
-/* 0353 CHART_ROW_AS_LABEL */ {MAP_CHAR_LEN("ChartRowAsLabel")},
-/* 0354 CHART_COLUMN_AS_LABEL */ {MAP_CHAR_LEN("ChartColumnAsLabel")},
-/* 0355 TABLE_COLUMS */ {MAP_CHAR_LEN("TableColumns")},
-/* 0356 LEFT_BORDER */ {MAP_CHAR_LEN("LeftBorder")},
-/* 0357 RIGHT_BORDER */ {MAP_CHAR_LEN("RightBorder")},
-/* 0358 TOP_BORDER */ {MAP_CHAR_LEN("TopBorder")},
-/* 0359 BOTTOM_BORDER */ {MAP_CHAR_LEN("BottomBorder")},
-/* 0360 BORDER_DISTANCE */ {MAP_CHAR_LEN("BorderDistance")},
-/* 0361 LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("LeftBorderDistance")},
-/* 0362 RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("RightBorderDistance")},
-/* 0363 TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("TopBorderDistance")},
-/* 0364 BOTTOM_BORDER_DISTANCE */ {MAP_CHAR_LEN("BottomBorderDistance")},
-/* 0365 TABLE_BORDER */ {MAP_CHAR_LEN("TableBorder")},
-/* 0366 TABLE_COLUMN_SEPARATORS */ {MAP_CHAR_LEN("TableColumnSeparators")},
-/* 0367 TABLE_COLUMN_RELATIVE_SUM */ {MAP_CHAR_LEN("TableColumnRelativeSum")},
-/* 0368 HEADER_TEXT */ {MAP_CHAR_LEN("HeaderText")},
-/* 0369 HEADER_TEXT_LEFT */ {MAP_CHAR_LEN("HeaderTextLeft")},
-/* 0370 HEADER_TEXT_RIGHT */ {MAP_CHAR_LEN("HeaderTextRight")},
-/* 0371 FOOTER_TEXT */ {MAP_CHAR_LEN("FooterText")},
-/* 0372 FOOTER_TEXT_LEFT */ {MAP_CHAR_LEN("FooterTextLeft")},
-/* 0373 FOOTER_TEXT_RIGHT */ {MAP_CHAR_LEN("FooterTextRight")},
-/* 0374 HEADER_BACK_COLOR */ {MAP_CHAR_LEN("HeaderBackColor")},
-/* 0375 HEADER_GRAPHIC */ {MAP_CHAR_LEN("HeaderBackGraphic")},
-/* 0376 HEADER_BACK_TRANSPARENT */ {MAP_CHAR_LEN("HeaderBackTransparent")},
-/* 0377 HEADER_LEFT_BORDER */ {MAP_CHAR_LEN("HeaderLeftBorder")},
-/* 0378 HEADER_RIGHT_BORDER */ {MAP_CHAR_LEN("HeaderRightBorder")},
-/* 0379 HEADER_TOP_BORDER */ {MAP_CHAR_LEN("HeaderTopBorder")},
-/* 0380 HEADER_BOTTOM_BORDER */ {MAP_CHAR_LEN("HeaderBottomBorder")},
-/* 0381 HEADER_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderBorderDistance")},
-/* 0382 HEADER_SHADOW_FORMAT */ {MAP_CHAR_LEN("HeaderShadowFormat")},
-/* 0383 HEADER_BODY_DISTANCE */ {MAP_CHAR_LEN("HeaderBodyDistance")},
-/* 0384 HEADER_IS_DYNAMIC_HEIGHT */ {MAP_CHAR_LEN("HeaderIsDynamicHeight")},
-/* 0385 HEADER_IS_SHARED */ {MAP_CHAR_LEN("HeaderIsShared")},
-/* 0386 HEADER_HEIGHT */ {MAP_CHAR_LEN("HeaderHeight")},
-/* 0387 HEADER_IS_ON */ {MAP_CHAR_LEN("HeaderIsOn")},
-/* 0388 FOOTER_BACK_COLOR */ {MAP_CHAR_LEN("FooterBackColor")},
-/* 0389 FOOTER_GRAPHIC */ {MAP_CHAR_LEN("FooterBackGraphic")},
-/* 0390 FOOTER_BACK_TRANSPARENT */ {MAP_CHAR_LEN("FooterBackTransparent")},
-/* 0391 FOOTER_LEFT_BORDER */ {MAP_CHAR_LEN("FooterLeftBorder")},
-/* 0392 FOOTER_RIGHT_BORDER */ {MAP_CHAR_LEN("FooterRightBorder")},
-/* 0393 FOOTER_TOP_BORDER */ {MAP_CHAR_LEN("FooterTopBorder")},
-/* 0394 FOOTER_BOTTOM_BORDER */ {MAP_CHAR_LEN("FooterBottomBorder")},
-/* 0395 FOOTER_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterBorderDistance")},
-/* 0396 FOOTER_SHADOW_FORMAT */ {MAP_CHAR_LEN("FooterShadowFormat")},
-/* 0397 FOOTER_BODY_DISTANCE */ {MAP_CHAR_LEN("FooterBodyDistance")},
-/* 0398 FOOTER_IS_DYNAMIC_HEIGHT */ {MAP_CHAR_LEN("FooterIsDynamicHeight")},
-/* 0399 FOOTER_IS_SHARED */ {MAP_CHAR_LEN("FooterIsShared")},
+/* 0300 SEARCH_WORDS */ {MAP_CHAR_LEN("SearchWords")},
+/* 0301 SEQUENCE_VALUE */ {MAP_CHAR_LEN("SequenceValue")},
+/* 0302 SERVER_MAP */ {MAP_CHAR_LEN("ServerMap")},
+/* 0303 IMAGE_MAP */ {MAP_CHAR_LEN("ImageMap")},
+/* 0304 SET_NUMBER */ {MAP_CHAR_LEN("SetNumber")},
+/* 0305 SHADOW_FORMAT */ {MAP_CHAR_LEN("ShadowFormat")},
+/* 0306 SHOW_HORI_RULER */ {MAP_CHAR_LEN("ShowHoriRuler")},
+/* 0307 SIZE */ {MAP_CHAR_LEN("Size")},
+/* 0308 ACTUAL_SIZE */ {MAP_CHAR_LEN("ActualSize")},
+/* 0309 SOURCE_NAME */ {MAP_CHAR_LEN("SourceName")},
+/* 0310 START_AT */ {MAP_CHAR_LEN("StartAt")},
+/* 0311 STATISTIC_TYPE_ID */ {MAP_CHAR_LEN("StatisticTypeId")},
+/* 0312 SUB_TYPE */ {MAP_CHAR_LEN("SubType")},
+/* 0313 SURROUND */ {MAP_CHAR_LEN("Surround")},
+/* 0314 IS_EXPRESSION */ {MAP_CHAR_LEN("IsExpression")},
+/* 0315 IS_SHOW_FORMULA */ {MAP_CHAR_LEN("IsShowFormula")},
+/* 0316 TEXT_WRAP */ {MAP_CHAR_LEN("TextWrap")},
+/* 0317 SURROUND_CONTOUR */ {MAP_CHAR_LEN("SurroundContour")},
+/* 0318 SURROUND_ANCHORONLY */ {MAP_CHAR_LEN("SurroundAnchorOnly")},
+/* 0319 TABLE_NAME */ {MAP_CHAR_LEN("TableName")},
+/* 0320 TABSTOPS */ {MAP_CHAR_LEN("ParaTabStops")},
+/* 0321 TITLE */ {MAP_CHAR_LEN("Title")},
+/* 0322 TOP_MARGIN */ {MAP_CHAR_LEN("TopMargin")},
+/* 0323 BOTTOM_MARGIN */ {MAP_CHAR_LEN("BottomMargin")},
+/* 0324 TRUE_CONTENT */ {MAP_CHAR_LEN("TrueContent")},
+/* 0325 URL_CONTENT */ {MAP_CHAR_LEN("URLContent")},
+/* 0326 USERTEXT */ {MAP_CHAR_LEN("UserText")},
+/* 0327 USER_DATA_TYPE */ {MAP_CHAR_LEN("UserDataType")},
+/* 0328 VALUE */ {MAP_CHAR_LEN("Value")},
+/* 0329 VARIABLE_NAME */ {MAP_CHAR_LEN("VariableName")},
+/* 0330 VARIABLE_SUBTYPE */ {MAP_CHAR_LEN("VariableSubtype")},
+/* 0331 VERT_ORIENT */ {MAP_CHAR_LEN("VertOrient")},
+/* 0332 VERT_MIRRORED */ {MAP_CHAR_LEN("VertMirrored")},
+/* 0333 VERT_ORIENT_POSITION */ {MAP_CHAR_LEN("VertOrientPosition")},
+/* 0334 VERT_ORIENT_RELATION */ {MAP_CHAR_LEN("VertOrientRelation")},
+/* 0335 IS_VISIBLE */ {MAP_CHAR_LEN("IsVisible")},
+/* 0336 WIDTH */ {MAP_CHAR_LEN("Width")},
+/* 0337 CHAR_WORD_MODE */ {MAP_CHAR_LEN("CharWordMode")},
+/* 0338 GRAPHIC_CROP */ {MAP_CHAR_LEN("GraphicCrop")},
+/* 0339 CHARACTER_FORMAT_NONE */ {MAP_CHAR_LEN("CharacterFormatNone")},
+/* 0340 TEXT_POSITION */ {MAP_CHAR_LEN("TextPosition")},
+/* 0341 DOCUMENT_INDEX_MARK */ {MAP_CHAR_LEN("DocumentIndexMark")},
+/* 0342 DOCUMENT_INDEX */ {MAP_CHAR_LEN("DocumentIndex")},
+/* 0343 IS_GLOBAL_DOCUMENT_SECTION */ {MAP_CHAR_LEN("IsGlobalDocumentSection")},
+/* 0344 TEXT_FIELD */ {MAP_CHAR_LEN("TextField")},
+/* 0345 BOOKMARK */ {MAP_CHAR_LEN("Bookmark")},
+/* 0346 TEXT_TABLE */ {MAP_CHAR_LEN("TextTable")},
+/* 0347 CELL */ {MAP_CHAR_LEN("Cell")},
+/* 0348 TEXT_FRAME */ {MAP_CHAR_LEN("TextFrame")},
+/* 0349 REFERENCE_MARK */ {MAP_CHAR_LEN("ReferenceMark")},
+/* 0350 TEXT_SECTION */ {MAP_CHAR_LEN("TextSection")},
+/* 0351 FOOTNOTE */ {MAP_CHAR_LEN("Footnote")},
+/* 0352 ENDNOTE */ {MAP_CHAR_LEN("Endnote")},
+/* 0353 CHART_ROW_AS_LABEL */ {MAP_CHAR_LEN("ChartRowAsLabel")},
+/* 0354 CHART_COLUMN_AS_LABEL */ {MAP_CHAR_LEN("ChartColumnAsLabel")},
+/* 0355 TABLE_COLUMS */ {MAP_CHAR_LEN("TableColumns")},
+/* 0356 LEFT_BORDER */ {MAP_CHAR_LEN("LeftBorder")},
+/* 0357 RIGHT_BORDER */ {MAP_CHAR_LEN("RightBorder")},
+/* 0358 TOP_BORDER */ {MAP_CHAR_LEN("TopBorder")},
+/* 0359 BOTTOM_BORDER */ {MAP_CHAR_LEN("BottomBorder")},
+/* 0360 BORDER_DISTANCE */ {MAP_CHAR_LEN("BorderDistance")},
+/* 0361 LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("LeftBorderDistance")},
+/* 0362 RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("RightBorderDistance")},
+/* 0363 TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("TopBorderDistance")},
+/* 0364 BOTTOM_BORDER_DISTANCE */ {MAP_CHAR_LEN("BottomBorderDistance")},
+/* 0365 TABLE_BORDER */ {MAP_CHAR_LEN("TableBorder")},
+/* 0366 TABLE_COLUMN_SEPARATORS */ {MAP_CHAR_LEN("TableColumnSeparators")},
+/* 0367 TABLE_COLUMN_RELATIVE_SUM */ {MAP_CHAR_LEN("TableColumnRelativeSum")},
+/* 0368 HEADER_TEXT */ {MAP_CHAR_LEN("HeaderText")},
+/* 0369 HEADER_TEXT_LEFT */ {MAP_CHAR_LEN("HeaderTextLeft")},
+/* 0370 HEADER_TEXT_RIGHT */ {MAP_CHAR_LEN("HeaderTextRight")},
+/* 0371 FOOTER_TEXT */ {MAP_CHAR_LEN("FooterText")},
+/* 0372 FOOTER_TEXT_LEFT */ {MAP_CHAR_LEN("FooterTextLeft")},
+/* 0373 FOOTER_TEXT_RIGHT */ {MAP_CHAR_LEN("FooterTextRight")},
+/* 0374 HEADER_BACK_COLOR */ {MAP_CHAR_LEN("HeaderBackColor")},
+/* 0375 HEADER_GRAPHIC */ {MAP_CHAR_LEN("HeaderBackGraphic")},
+/* 0376 HEADER_BACK_TRANSPARENT */ {MAP_CHAR_LEN("HeaderBackTransparent")},
+/* 0377 HEADER_LEFT_BORDER */ {MAP_CHAR_LEN("HeaderLeftBorder")},
+/* 0378 HEADER_RIGHT_BORDER */ {MAP_CHAR_LEN("HeaderRightBorder")},
+/* 0379 HEADER_TOP_BORDER */ {MAP_CHAR_LEN("HeaderTopBorder")},
+/* 0380 HEADER_BOTTOM_BORDER */ {MAP_CHAR_LEN("HeaderBottomBorder")},
+/* 0381 HEADER_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderBorderDistance")},
+/* 0382 HEADER_SHADOW_FORMAT */ {MAP_CHAR_LEN("HeaderShadowFormat")},
+/* 0383 HEADER_BODY_DISTANCE */ {MAP_CHAR_LEN("HeaderBodyDistance")},
+/* 0384 HEADER_IS_DYNAMIC_HEIGHT */ {MAP_CHAR_LEN("HeaderIsDynamicHeight")},
+/* 0385 HEADER_IS_SHARED */ {MAP_CHAR_LEN("HeaderIsShared")},
+/* 0386 HEADER_HEIGHT */ {MAP_CHAR_LEN("HeaderHeight")},
+/* 0387 HEADER_IS_ON */ {MAP_CHAR_LEN("HeaderIsOn")},
+/* 0388 FOOTER_BACK_COLOR */ {MAP_CHAR_LEN("FooterBackColor")},
+/* 0389 FOOTER_GRAPHIC */ {MAP_CHAR_LEN("FooterBackGraphic")},
+/* 0390 FOOTER_BACK_TRANSPARENT */ {MAP_CHAR_LEN("FooterBackTransparent")},
+/* 0391 FOOTER_LEFT_BORDER */ {MAP_CHAR_LEN("FooterLeftBorder")},
+/* 0392 FOOTER_RIGHT_BORDER */ {MAP_CHAR_LEN("FooterRightBorder")},
+/* 0393 FOOTER_TOP_BORDER */ {MAP_CHAR_LEN("FooterTopBorder")},
+/* 0394 FOOTER_BOTTOM_BORDER */ {MAP_CHAR_LEN("FooterBottomBorder")},
+/* 0395 FOOTER_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterBorderDistance")},
+/* 0396 FOOTER_SHADOW_FORMAT */ {MAP_CHAR_LEN("FooterShadowFormat")},
+/* 0397 FOOTER_BODY_DISTANCE */ {MAP_CHAR_LEN("FooterBodyDistance")},
+/* 0398 FOOTER_IS_DYNAMIC_HEIGHT */ {MAP_CHAR_LEN("FooterIsDynamicHeight")},
+/* 0399 FOOTER_IS_SHARED */ {MAP_CHAR_LEN("FooterIsShared")},
-/* 0400 FOOTER_HEIGHT */ {MAP_CHAR_LEN("FooterHeight")},
-/* 0401 FOOTER_IS_ON */ {MAP_CHAR_LEN("FooterIsOn")},
-/* 0402 OVERWRITE_STYLES */ {MAP_CHAR_LEN("OverwriteStyles")},
-/* 0403 LOAD_NUMBERING_STYLES */ {MAP_CHAR_LEN("LoadNumberingStyles")},
-/* 0404 LOAD_PAGE_STYLES */ {MAP_CHAR_LEN("LoadPageStyles")},
-/* 0405 LOAD_FRAME_STYLES */ {MAP_CHAR_LEN("LoadFrameStyles")},
-/* 0406 LOAD_TEXT_STYLES */ {MAP_CHAR_LEN("LoadTextStyles")},
-/* 0407 FILE_NAME */ {MAP_CHAR_LEN("FileName")},
-/* 0408 FILTER_NAME */ {MAP_CHAR_LEN("FilterName")},
-/* 0409 FILTER_OPTION */ {MAP_CHAR_LEN("FilterOption")},
-/* 0410 PASSWORD */ {MAP_CHAR_LEN("Password")},
-/* 0411 COPY_COUNT */ {MAP_CHAR_LEN("CopyCount")},
-/* 0412 COLLATE */ {MAP_CHAR_LEN("Collate")},
-/* 0413 SORT */ {MAP_CHAR_LEN("Sort")},
-/* 0414 PAGES */ {MAP_CHAR_LEN("Pages")},
-/* 0415 FIRST_LINE_OFFSET */ {MAP_CHAR_LEN("FirstLineOffset")},
-/* 0416 SYMBOL_TEXT_DISTANCE */ {MAP_CHAR_LEN("SymbolTextDistance")},
-/* 0417 USER_INDEX_NAME */ {MAP_CHAR_LEN("UserIndexName")},
-/* 0418 REVISION */ {MAP_CHAR_LEN("Revision")},
-/* 0419 UNVISITED_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("UnvisitedCharStyleName")},
-/* 0420 VISITED_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("VisitedCharStyleName")},
-/* 0421 PARAGRAPH_COUNT */ {MAP_CHAR_LEN("ParagraphCount")},
-/* 0422 WORD_COUNT */ {MAP_CHAR_LEN("WordCount")},
-/* 0423 WORD_SEPARATOR */ {MAP_CHAR_LEN("WordSeparator")},
-/* 0424 CHARACTER_COUNT */ {MAP_CHAR_LEN("CharacterCount")},
-/* 0425 ZOOM_VALUE */ {MAP_CHAR_LEN("ZoomValue")},
-/* 0426 ZOOM_TYPE */ {MAP_CHAR_LEN("ZoomType")},
-/* 0427 CREATE_FROM_MARKS */ {MAP_CHAR_LEN("CreateFromMarks")},
-/* 0428 CREATE_FROM_OUTLINE */ {MAP_CHAR_LEN("CreateFromOutline")},
-/* 0429 PARAGRAPH_STYLE_NAMES */ {MAP_CHAR_LEN("ParagraphStyleNames")},
-/* 0430 CREATE_FROM_CHAPTER */ {MAP_CHAR_LEN("CreateFromChapter")},
-/* 0431 CREATE_FROM_LABELS */ {MAP_CHAR_LEN("CreateFromLabels")},
-/* 0432 USE_ALPHABETICAL_SEPARATORS */ {MAP_CHAR_LEN("UseAlphabeticalSeparators")},
-/* 0433 USE_KEY_AS_ENTRY */ {MAP_CHAR_LEN("UseKeyAsEntry")},
-/* 0434 USE_COMBINED_ENTRIES */ {MAP_CHAR_LEN("UseCombinedEntries")},
-/* 0435 IS_CASE_SENSITIVE */ {MAP_CHAR_LEN("IsCaseSensitive")},
-/* 0436 USE_P_P */ {MAP_CHAR_LEN("UsePP")},
-/* 0437 USE_DASH */ {MAP_CHAR_LEN("UseDash")},
-/* 0438 USE_UPPER_CASE */ {MAP_CHAR_LEN("UseUpperCase")},
-/* 0439 LABEL_CATEGORY */ {MAP_CHAR_LEN("LabelCategory")},
-/* 0440 LABEL_DISPLAY_TYPE */ {MAP_CHAR_LEN("LabelDisplayType")},
-/* 0441 USE_LEVEL_FROM_SOURCE */ {MAP_CHAR_LEN("UseLevelFromSource")},
-/* 0442 LEVEL_FORMAT */ {MAP_CHAR_LEN("LevelFormat")},
-/* 0443 LEVEL_PARAGRAPH_STYLES */ {MAP_CHAR_LEN("LevelParagraphStyles")},
-/* 0444 RECALC_TAB_STOPS */ {MAP_CHAR_LEN("RecalcTabStops")},
-/* 0445 MAIN_ENTRY_CHARACTER_STYLE_NAME */ {MAP_CHAR_LEN("MainEntryCharacterStyleName")},
-/* 0446 CREATE_FROM_TABLES */ {MAP_CHAR_LEN("CreateFromTables")},
-/* 0447 CREATE_FROM_TEXT_FRAMES */ {MAP_CHAR_LEN("CreateFromTextFrames")},
-/* 0448 CREATE_FROM_GRAPHIC_OBJECTS */ {MAP_CHAR_LEN("CreateFromGraphicObjects")},
-/* 0449 CREATE_FROM_EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("CreateFromEmbeddedObjects")},
-/* 0450 CREATE_FROM_STAR_MATH */ {MAP_CHAR_LEN("CreateFromStarMath")},
-/* 0451 CREATE_FROM_STAR_CHART */ {MAP_CHAR_LEN("CreateFromStarChart")},
-/* 0452 CREATE_FROM_STAR_CALC */ {MAP_CHAR_LEN("CreateFromStarCalc")},
-/* 0453 CREATE_FROM_STAR_DRAW */ {MAP_CHAR_LEN("CreateFromStarDraw")},
-/* 0454 CREATE_FROM_OTHER_EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("CreateFromOtherEmbeddedObjects")},
-/* 0455 INDEX_AUTO_MARK_FILE_U_R_L */ {MAP_CHAR_LEN("IndexAutoMarkFileURL")},
-/* 0456 IS_COMMA_SEPARATED */ {MAP_CHAR_LEN("IsCommaSeparated")},
-/* 0457 IS_RELATIVE_TABSTOPS */ {MAP_CHAR_LEN("IsRelativeTabstops")},
-/* 0458 CREATE_FROM_LEVEL_PARAGRAPH_STYLES */ {MAP_CHAR_LEN("CreateFromLevelParagraphStyles")},
-/* 0459 SHOW_CHANGES */ {MAP_CHAR_LEN("ShowChanges")},
-/* 0460 RECORD_CHANGES */ {MAP_CHAR_LEN("RecordChanges")},
-/* 0461 DISPLAY_NAME */ {MAP_CHAR_LEN("LinkDisplayName")},
-/* 0462 DISPLAY_BITMAP */ {MAP_CHAR_LEN("LinkDisplayBitmap")},
-/* 0463 HEADING_STYLE_NAME */ {MAP_CHAR_LEN("HeadingStyleName")},
-/* 0464 SHOW_ONLINE_LAYOUT */ {MAP_CHAR_LEN("ShowOnlineLayout")},
-/* 0465 USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("UserDefinedAttributes")},
-/* 0466 TEXT_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("TextUserDefinedAttributes")},
-/* 0467 FILE_PATH */ {MAP_CHAR_LEN("FilePath")},
-/* 0468 PARA_CHAPTER_NUMBERING_LEVEL */ {MAP_CHAR_LEN("ParaChapterNumberingLevel")},
-/* 0469 PARA_CONDITIONAL_STYLE_NAME */ {MAP_CHAR_LEN("ParaConditionalStyleName")},
-/* 0470 CHAPTER_NUMBERING_LEVEL */ {MAP_CHAR_LEN("ChapterNumberingLevel")},
-/* 0471 NUMBERING_SEPARATOR */ {MAP_CHAR_LEN("NumberingSeparator")},
-/* 0472 IS_CONTINUOUS_NUMBERING */ {MAP_CHAR_LEN("IsContinuousNumbering")},
-/* 0473 IS_AUTOMATIC */ {MAP_CHAR_LEN("IsAutomatic")},
-/* 0474 IS_ABSOLUTE_MARGINS */ {MAP_CHAR_LEN("IsAbsoluteMargins")},
-/* 0475 CATEGORY */ {MAP_CHAR_LEN("Category")},
-/* 0476 DEPENDENT_TEXT_FIELDS */ {MAP_CHAR_LEN("DependentTextFields")},
-/* 0477 CURRENT_PRESENTATION */ {MAP_CHAR_LEN("CurrentPresentation")},
-/* 0478 ADJUST */ {MAP_CHAR_LEN("Adjust")},
-/* 0479 INSTANCE_NAME */ {MAP_CHAR_LEN("InstanceName")},
-/* 0480 TEXT_PORTION_TYPE */ {MAP_CHAR_LEN("TextPortionType")},
-/* 0481 CONTROL_CHARACTER */ {MAP_CHAR_LEN("ControlCharacter")},
-/* 0482 IS_COLLAPSED */ {MAP_CHAR_LEN("IsCollapsed")},
-/* 0483 IS_START */ {MAP_CHAR_LEN("IsStart")},
-/* 0484 SEQUENCE_NUMBER */ {MAP_CHAR_LEN("SequenceNumber")},
-/* 0485 REFERENCE_ID */ {MAP_CHAR_LEN("ReferenceId")},
-/* 0486 HEADER_LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderLeftBorderDistance")},
-/* 0487 HEADER_RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderRightBorderDistance")},
-/* 0488 HEADER_TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderTopBorderDistance")},
+/* 0400 FOOTER_HEIGHT */ {MAP_CHAR_LEN("FooterHeight")},
+/* 0401 FOOTER_IS_ON */ {MAP_CHAR_LEN("FooterIsOn")},
+/* 0402 OVERWRITE_STYLES */ {MAP_CHAR_LEN("OverwriteStyles")},
+/* 0403 LOAD_NUMBERING_STYLES */ {MAP_CHAR_LEN("LoadNumberingStyles")},
+/* 0404 LOAD_PAGE_STYLES */ {MAP_CHAR_LEN("LoadPageStyles")},
+/* 0405 LOAD_FRAME_STYLES */ {MAP_CHAR_LEN("LoadFrameStyles")},
+/* 0406 LOAD_TEXT_STYLES */ {MAP_CHAR_LEN("LoadTextStyles")},
+/* 0407 FILE_NAME */ {MAP_CHAR_LEN("FileName")},
+/* 0408 FILTER_NAME */ {MAP_CHAR_LEN("FilterName")},
+/* 0409 FILTER_OPTION */ {MAP_CHAR_LEN("FilterOption")},
+/* 0410 PASSWORD */ {MAP_CHAR_LEN("Password")},
+/* 0411 COPY_COUNT */ {MAP_CHAR_LEN("CopyCount")},
+/* 0412 COLLATE */ {MAP_CHAR_LEN("Collate")},
+/* 0413 SORT */ {MAP_CHAR_LEN("Sort")},
+/* 0414 PAGES */ {MAP_CHAR_LEN("Pages")},
+/* 0415 FIRST_LINE_OFFSET */ {MAP_CHAR_LEN("FirstLineOffset")},
+/* 0416 SYMBOL_TEXT_DISTANCE */ {MAP_CHAR_LEN("SymbolTextDistance")},
+/* 0417 USER_INDEX_NAME */ {MAP_CHAR_LEN("UserIndexName")},
+/* 0418 REVISION */ {MAP_CHAR_LEN("Revision")},
+/* 0419 UNVISITED_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("UnvisitedCharStyleName")},
+/* 0420 VISITED_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("VisitedCharStyleName")},
+/* 0421 PARAGRAPH_COUNT */ {MAP_CHAR_LEN("ParagraphCount")},
+/* 0422 WORD_COUNT */ {MAP_CHAR_LEN("WordCount")},
+/* 0423 WORD_SEPARATOR */ {MAP_CHAR_LEN("WordSeparator")},
+/* 0424 CHARACTER_COUNT */ {MAP_CHAR_LEN("CharacterCount")},
+/* 0425 ZOOM_VALUE */ {MAP_CHAR_LEN("ZoomValue")},
+/* 0426 ZOOM_TYPE */ {MAP_CHAR_LEN("ZoomType")},
+/* 0427 CREATE_FROM_MARKS */ {MAP_CHAR_LEN("CreateFromMarks")},
+/* 0428 CREATE_FROM_OUTLINE */ {MAP_CHAR_LEN("CreateFromOutline")},
+/* 0429 PARAGRAPH_STYLE_NAMES */ {MAP_CHAR_LEN("ParagraphStyleNames")},
+/* 0430 CREATE_FROM_CHAPTER */ {MAP_CHAR_LEN("CreateFromChapter")},
+/* 0431 CREATE_FROM_LABELS */ {MAP_CHAR_LEN("CreateFromLabels")},
+/* 0432 USE_ALPHABETICAL_SEPARATORS */ {MAP_CHAR_LEN("UseAlphabeticalSeparators")},
+/* 0433 USE_KEY_AS_ENTRY */ {MAP_CHAR_LEN("UseKeyAsEntry")},
+/* 0434 USE_COMBINED_ENTRIES */ {MAP_CHAR_LEN("UseCombinedEntries")},
+/* 0435 IS_CASE_SENSITIVE */ {MAP_CHAR_LEN("IsCaseSensitive")},
+/* 0436 USE_P_P */ {MAP_CHAR_LEN("UsePP")},
+/* 0437 USE_DASH */ {MAP_CHAR_LEN("UseDash")},
+/* 0438 USE_UPPER_CASE */ {MAP_CHAR_LEN("UseUpperCase")},
+/* 0439 LABEL_CATEGORY */ {MAP_CHAR_LEN("LabelCategory")},
+/* 0440 LABEL_DISPLAY_TYPE */ {MAP_CHAR_LEN("LabelDisplayType")},
+/* 0441 USE_LEVEL_FROM_SOURCE */ {MAP_CHAR_LEN("UseLevelFromSource")},
+/* 0442 LEVEL_FORMAT */ {MAP_CHAR_LEN("LevelFormat")},
+/* 0443 LEVEL_PARAGRAPH_STYLES */ {MAP_CHAR_LEN("LevelParagraphStyles")},
+/* 0444 RECALC_TAB_STOPS */ {MAP_CHAR_LEN("RecalcTabStops")},
+/* 0445 MAIN_ENTRY_CHARACTER_STYLE_NAME */ {MAP_CHAR_LEN("MainEntryCharacterStyleName")},
+/* 0446 CREATE_FROM_TABLES */ {MAP_CHAR_LEN("CreateFromTables")},
+/* 0447 CREATE_FROM_TEXT_FRAMES */ {MAP_CHAR_LEN("CreateFromTextFrames")},
+/* 0448 CREATE_FROM_GRAPHIC_OBJECTS */ {MAP_CHAR_LEN("CreateFromGraphicObjects")},
+/* 0449 CREATE_FROM_EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("CreateFromEmbeddedObjects")},
+/* 0450 CREATE_FROM_STAR_MATH */ {MAP_CHAR_LEN("CreateFromStarMath")},
+/* 0451 CREATE_FROM_STAR_CHART */ {MAP_CHAR_LEN("CreateFromStarChart")},
+/* 0452 CREATE_FROM_STAR_CALC */ {MAP_CHAR_LEN("CreateFromStarCalc")},
+/* 0453 CREATE_FROM_STAR_DRAW */ {MAP_CHAR_LEN("CreateFromStarDraw")},
+/* 0454 CREATE_FROM_OTHER_EMBEDDED_OBJECTS */ {MAP_CHAR_LEN("CreateFromOtherEmbeddedObjects")},
+/* 0455 INDEX_AUTO_MARK_FILE_U_R_L */ {MAP_CHAR_LEN("IndexAutoMarkFileURL")},
+/* 0456 IS_COMMA_SEPARATED */ {MAP_CHAR_LEN("IsCommaSeparated")},
+/* 0457 IS_RELATIVE_TABSTOPS */ {MAP_CHAR_LEN("IsRelativeTabstops")},
+/* 0458 CREATE_FROM_LEVEL_PARAGRAPH_STYLES */ {MAP_CHAR_LEN("CreateFromLevelParagraphStyles")},
+/* 0459 SHOW_CHANGES */ {MAP_CHAR_LEN("ShowChanges")},
+/* 0460 RECORD_CHANGES */ {MAP_CHAR_LEN("RecordChanges")},
+/* 0461 DISPLAY_NAME */ {MAP_CHAR_LEN("LinkDisplayName")},
+/* 0462 DISPLAY_BITMAP */ {MAP_CHAR_LEN("LinkDisplayBitmap")},
+/* 0463 HEADING_STYLE_NAME */ {MAP_CHAR_LEN("HeadingStyleName")},
+/* 0464 SHOW_ONLINE_LAYOUT */ {MAP_CHAR_LEN("ShowOnlineLayout")},
+/* 0465 USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("UserDefinedAttributes")},
+/* 0466 TEXT_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("TextUserDefinedAttributes")},
+/* 0467 FILE_PATH */ {MAP_CHAR_LEN("FilePath")},
+/* 0468 PARA_CHAPTER_NUMBERING_LEVEL */ {MAP_CHAR_LEN("ParaChapterNumberingLevel")},
+/* 0469 PARA_CONDITIONAL_STYLE_NAME */ {MAP_CHAR_LEN("ParaConditionalStyleName")},
+/* 0470 CHAPTER_NUMBERING_LEVEL */ {MAP_CHAR_LEN("ChapterNumberingLevel")},
+/* 0471 NUMBERING_SEPARATOR */ {MAP_CHAR_LEN("NumberingSeparator")},
+/* 0472 IS_CONTINUOUS_NUMBERING */ {MAP_CHAR_LEN("IsContinuousNumbering")},
+/* 0473 IS_AUTOMATIC */ {MAP_CHAR_LEN("IsAutomatic")},
+/* 0474 IS_ABSOLUTE_MARGINS */ {MAP_CHAR_LEN("IsAbsoluteMargins")},
+/* 0475 CATEGORY */ {MAP_CHAR_LEN("Category")},
+/* 0476 DEPENDENT_TEXT_FIELDS */ {MAP_CHAR_LEN("DependentTextFields")},
+/* 0477 CURRENT_PRESENTATION */ {MAP_CHAR_LEN("CurrentPresentation")},
+/* 0478 ADJUST */ {MAP_CHAR_LEN("Adjust")},
+/* 0479 INSTANCE_NAME */ {MAP_CHAR_LEN("InstanceName")},
+/* 0480 TEXT_PORTION_TYPE */ {MAP_CHAR_LEN("TextPortionType")},
+/* 0481 CONTROL_CHARACTER */ {MAP_CHAR_LEN("ControlCharacter")},
+/* 0482 IS_COLLAPSED */ {MAP_CHAR_LEN("IsCollapsed")},
+/* 0483 IS_START */ {MAP_CHAR_LEN("IsStart")},
+/* 0484 SEQUENCE_NUMBER */ {MAP_CHAR_LEN("SequenceNumber")},
+/* 0485 REFERENCE_ID */ {MAP_CHAR_LEN("ReferenceId")},
+/* 0486 HEADER_LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderLeftBorderDistance")},
+/* 0487 HEADER_RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderRightBorderDistance")},
+/* 0488 HEADER_TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("HeaderTopBorderDistance")},
/* 0489 HEADER_BOTTOM_BORDER_DISTANCE */{MAP_CHAR_LEN("HeaderBottomBorderDistance")},
-/* 0490 FOOTER_LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterLeftBorderDistance")},
-/* 0491 FOOTER_RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterRightBorderDistance")},
-/* 0492 FOOTER_TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterTopBorderDistance")},
+/* 0490 FOOTER_LEFT_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterLeftBorderDistance")},
+/* 0491 FOOTER_RIGHT_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterRightBorderDistance")},
+/* 0492 FOOTER_TOP_BORDER_DISTANCE */ {MAP_CHAR_LEN("FooterTopBorderDistance")},
/* 0493 FOOTER_BOTTOM_BORDER_DISTANCE */{MAP_CHAR_LEN("FooterBottomBorderDistance")},
-/* 0494 PARA_IS_NUMBERING_RESTART */ {MAP_CHAR_LEN("ParaIsNumberingRestart")},
-/* 0495 HIDE_FIELD_TIPS */ {MAP_CHAR_LEN("HideFieldTips")},
-/* 0496 HEADER_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("HeaderUserDefinedAttributes")},
-/* 0497 FOOTER_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("FooterUserDefinedAttributes")},
-/* 0498 PARA_SHADOW_FORMAT */ {MAP_CHAR_LEN("ParaShadowFormat")},
-/* 0499 CONTOUR_POLY_POLYGON */ {MAP_CHAR_LEN("ContourPolyPolygon")},
+/* 0494 PARA_IS_NUMBERING_RESTART */ {MAP_CHAR_LEN("ParaIsNumberingRestart")},
+/* 0495 HIDE_FIELD_TIPS */ {MAP_CHAR_LEN("HideFieldTips")},
+/* 0496 HEADER_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("HeaderUserDefinedAttributes")},
+/* 0497 FOOTER_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("FooterUserDefinedAttributes")},
+/* 0498 PARA_SHADOW_FORMAT */ {MAP_CHAR_LEN("ParaShadowFormat")},
+/* 0499 CONTOUR_POLY_POLYGON */ {MAP_CHAR_LEN("ContourPolyPolygon")},
-/* 0500 IS_PIXEL_CONTOUR */ {MAP_CHAR_LEN("IsPixelContour")},
-/* 0501 IS_AUTOMATIC_CONTOUR */ {MAP_CHAR_LEN("IsAutomaticContour")},
-/* 0502 SEPARATOR_LINE_WIDTH */ {MAP_CHAR_LEN("SeparatorLineWidth")},
-/* 0503 SEPARATOR_LINE_COLOR */ {MAP_CHAR_LEN("SeparatorLineColor")},
-/* 0504 SEPARATOR_LINE_RELATIVE_HEIGHT */ {MAP_CHAR_LEN("SeparatorLineRelativeHeight")},
+/* 0500 IS_PIXEL_CONTOUR */ {MAP_CHAR_LEN("IsPixelContour")},
+/* 0501 IS_AUTOMATIC_CONTOUR */ {MAP_CHAR_LEN("IsAutomaticContour")},
+/* 0502 SEPARATOR_LINE_WIDTH */ {MAP_CHAR_LEN("SeparatorLineWidth")},
+/* 0503 SEPARATOR_LINE_COLOR */ {MAP_CHAR_LEN("SeparatorLineColor")},
+/* 0504 SEPARATOR_LINE_RELATIVE_HEIGHT */ {MAP_CHAR_LEN("SeparatorLineRelativeHeight")},
/* 0505 SEPARATOR_LINE_VERTIVAL_ALIGNMENT */{MAP_CHAR_LEN("SeparatorLineVerticalAlignment")},
-/* 0506 SEPARATOR_LINE_IS_ON */ {MAP_CHAR_LEN("SeparatorLineIsOn")},
-/* 0507 IS_SKIP_HIDDEN_TEXT */ {MAP_CHAR_LEN("IsSkipHiddenText")},
-/* 0508 IS_SKIP_PROTECTED_TEXT */ {MAP_CHAR_LEN("IsSkipProtectedText")},
-/* 0509 DOCUMENT_INDEX_MARKS */ {MAP_CHAR_LEN("DocumentIndexMarks")},
-/* 0510 FOOTNOTE_IS_COLLECT_AT_TEXT_END */ {MAP_CHAR_LEN("FootnoteIsCollectAtTextEnd")},
-/* 0511 FOOTNOTE_IS_RESTART_NUMBERING */ {MAP_CHAR_LEN("FootnoteIsRestartNumbering")},
+/* 0506 SEPARATOR_LINE_IS_ON */ {MAP_CHAR_LEN("SeparatorLineIsOn")},
+/* 0507 IS_SKIP_HIDDEN_TEXT */ {MAP_CHAR_LEN("IsSkipHiddenText")},
+/* 0508 IS_SKIP_PROTECTED_TEXT */ {MAP_CHAR_LEN("IsSkipProtectedText")},
+/* 0509 DOCUMENT_INDEX_MARKS */ {MAP_CHAR_LEN("DocumentIndexMarks")},
+/* 0510 FOOTNOTE_IS_COLLECT_AT_TEXT_END */ {MAP_CHAR_LEN("FootnoteIsCollectAtTextEnd")},
+/* 0511 FOOTNOTE_IS_RESTART_NUMBERING */ {MAP_CHAR_LEN("FootnoteIsRestartNumbering")},
/* 0512 FOOTNOTE_RESTART_NUMBERING_AT */{MAP_CHAR_LEN("FootnoteRestartNumberingAt")},
-/* 0513 FOOTNOTE_IS_OWN_NUMBERING */ {MAP_CHAR_LEN("FootnoteIsOwnNumbering")},
-/* 0514 FOOTNOTE_NUMBERING_TYPE */ {MAP_CHAR_LEN("FootnoteNumberingType")},
-/* 0515 FOOTNOTE_NUMBERING_PREFIX */ {MAP_CHAR_LEN("FootnoteNumberingPrefix")},
-/* 0516 FOOTNOTE_NUMBERING_SUFFIX */ {MAP_CHAR_LEN("FootnoteNumberingSuffix")},
-/* 0517 ENDNOTE_IS_COLLECT_AT_TEXT_END */ {MAP_CHAR_LEN("EndnoteIsCollectAtTextEnd")},
-/* 0518 ENDNOTE_IS_RESTART_NUMBERING */ {MAP_CHAR_LEN("EndnoteIsRestartNumbering")},
-/* 0519 ENDNOTE_RESTART_NUMBERING_AT */ {MAP_CHAR_LEN("EndnoteRestartNumberingAt")},
-/* 0520 ENDNOTE_IS_OWN_NUMBERING */ {MAP_CHAR_LEN("EndnoteIsOwnNumbering")},
-/* 0521 ENDNOTE_NUMBERING_TYPE */ {MAP_CHAR_LEN("EndnoteNumberingType")},
-/* 0522 ENDNOTE_NUMBERING_PREFIX */ {MAP_CHAR_LEN("EndnoteNumberingPrefix")},
-/* 0523 ENDNOTE_NUMBERING_SUFFIX */ {MAP_CHAR_LEN("EndnoteNumberingSuffix")},
-/* 0524 BRACKET_BEFORE */ {MAP_CHAR_LEN("BracketBefore")},
-/* 0525 BRACKET_AFTER */ {MAP_CHAR_LEN("BracketAfter")},
-/* 0526 IS_NUMBER_ENTRIES */ {MAP_CHAR_LEN("IsNumberEntries")},
-/* 0527 IS_SORT_BY_POSITION */ {MAP_CHAR_LEN("IsSortByPosition")},
-/* 0528 SORT_KEYS */ {MAP_CHAR_LEN("SortKeys")},
-/* 0529 IS_SORT_ASCENDING */ {MAP_CHAR_LEN("IsSortAscending")},
-/* 0530 SORT_KEY */ {MAP_CHAR_LEN("SortKey")},
-/* 0531 FIELDS */ {MAP_CHAR_LEN("Fields")},
-/* 0532 DATE_TIME_VALUE */ {MAP_CHAR_LEN("DateTimeValue")},
-/* 0533 IS_ON */ {MAP_CHAR_LEN("IsOn")},
-/* 0534 Z_ORDER */ {MAP_CHAR_LEN("ZOrder")},
-/* 0535 CONTENT_SECTION */ {MAP_CHAR_LEN("ContentSection")},
-/* 0536 HEADER_SECTION */ {MAP_CHAR_LEN("HeaderSection")},
-/* 0537 PARA_IS_HANGING_PUNCTUATION */ {MAP_CHAR_LEN("ParaIsHangingPunctuation")},
-/* 0538 PARA_IS_CHARACTER_DISTANCE */ {MAP_CHAR_LEN("ParaIsCharacterDistance")},
-/* 0539 PARA_IS_FORBIDDEN_RULES */ {MAP_CHAR_LEN("ParaIsForbiddenRules")},
-/* 0540 PARA_VERT_ALIGNMENT */ {MAP_CHAR_LEN("ParaVertAlignment")},
-/* 0541 IS_MAIN_ENTRY */ {MAP_CHAR_LEN("IsMainEntry")},
-/* 0542 GRAPHIC_ROTATION */ {MAP_CHAR_LEN("GraphicRotation")},
-/* 0543 ADJUST_LUMINANCE */ {MAP_CHAR_LEN("AdjustLuminance")},
-/* 0544 ADJUST_CONTRAST */ {MAP_CHAR_LEN("AdjustContrast")},
-/* 0545 ADJUST_RED */ {MAP_CHAR_LEN("AdjustRed")},
-/* 0546 ADJUST_GREEN */ {MAP_CHAR_LEN("AdjustGreen")},
-/* 0547 ADJUST_BLUE */ {MAP_CHAR_LEN("AdjustBlue")},
-/* 0548 GAMMA */ {MAP_CHAR_LEN("Gamma")},
-/* 0549 GRAPHIC_IS_INVERTED */ {MAP_CHAR_LEN("GraphicIsInverted")},
-/* 0550 TRANSPARENCY */ {MAP_CHAR_LEN("Transparency")},
-/* 0551 GRAPHIC_COLOR_MODE */ {MAP_CHAR_LEN("GraphicColorMode")},
-/* 0552 REDLINE_AUTHOR */ {MAP_CHAR_LEN("RedlineAuthor")},
-/* 0553 REDLINE_DATE_TIME */ {MAP_CHAR_LEN("RedlineDateTime")},
-/* 0554 REDLINE_COMMENT */ {MAP_CHAR_LEN("RedlineComment")},
-/* 0555 REDLINE_TYPE */ {MAP_CHAR_LEN("RedlineType")},
-/* 0556 REDLINE_SUCCESSOR_DATA */ {MAP_CHAR_LEN("RedlineSuccessorData")},
-/* 0557 REDLINE_IDENTIFIER */ {MAP_CHAR_LEN("RedlineIdentifier")},
-/* 0558 IS_IN_HEADER_FOOTER */ {MAP_CHAR_LEN("IsInHeaderFooter")},
-/* 0559 START_REDLINE */ {MAP_CHAR_LEN("StartRedline")},
-/* 0560 END_REDLINE */ {MAP_CHAR_LEN("EndRedline")},
-/* 0561 REDLINE_START */ {MAP_CHAR_LEN("RedlineStart")},
-/* 0562 REDLINE_END */ {MAP_CHAR_LEN("RedlineEnd")},
-/* 0563 REDLINE_TEXT */ {MAP_CHAR_LEN("RedlineText")},
-/* 0564 REDLINE_DISPLAY_TYPE */ {MAP_CHAR_LEN("RedlineDisplayType")},
-/* 0565 FORBIDDEN_CHARACTERS */ {MAP_CHAR_LEN("ForbiddenCharacters")},
-/* 0566 RUBY_BASE_TEXT */ {MAP_CHAR_LEN("RubyBaseText")},
-/* 0567 RUBY_TEXT */ {MAP_CHAR_LEN("RubyText")},
-/* 0568 RUBY_ADJUST */ {MAP_CHAR_LEN("RubyAdjust")},
-/* 0569 RUBY_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("RubyCharStyleName")},
-/* 0570 RUBY_IS_ABOVE */ {MAP_CHAR_LEN("RubyIsAbove")},
-/* 0571 FOOTNOTE_HEIGHT */ {MAP_CHAR_LEN("FootnoteHeight")},
-/* 0572 FOOTNOTE_LINE_WEIGHT */ {MAP_CHAR_LEN("FootnoteLineWeight")},
-/* 0573 FOOTNOTE_LINE_COLOR */ {MAP_CHAR_LEN("FootnoteLineColor")},
-/* 0574 FOOTNOTE_LINE_RELATIVE_WIDTH */ {MAP_CHAR_LEN("FootnoteLineRelativeWidth")},
-/* 0575 FOOTNOTE_LINE_ADJUST */ {MAP_CHAR_LEN("FootnoteLineAdjust")},
-/* 0576 FOOTNOTE_LINE_TEXT_DISTANCE */ {MAP_CHAR_LEN("FootnoteLineTextDistance")},
-/* 0577 FOOTNOTE_LINE_DISTANCE */ {MAP_CHAR_LEN("FootnoteLineDistance")},
-/* 0578 CHAR_ROTATION */ {MAP_CHAR_LEN("CharRotation")},
-/* 0579 CHAR_ROTATION_IS_FIT_TO_LINE */ {MAP_CHAR_LEN("CharRotationIsFitToLine")},
-/* 0580 CHAR_SCALE_WIDTH */ {MAP_CHAR_LEN("CharScaleWidth")},
-/* 0581 TAB_STOP_DISTANCE */ {MAP_CHAR_LEN("TabStopDistance")},
-/* 0582 IS_WIDTH_RELATIVE */ {MAP_CHAR_LEN("IsWidthRelative")},
-/* 0583 CHAR_RELIEF */ {MAP_CHAR_LEN("CharRelief")},
-/* 0584 IS_HIDDEN */ {MAP_CHAR_LEN("IsHidden")},
-/* 0585 IS_CONDITION_TRUE */ {MAP_CHAR_LEN("IsConditionTrue")},
-/* 0586 TWO_DIGIT_YEAR */ {MAP_CHAR_LEN("TwoDigitYear")},
-/* 0587 PROTECTION_KEY */ {MAP_CHAR_LEN("ProtectionKey")},
-/* 0588 REDLINE_PROTECTION_KEY */ {MAP_CHAR_LEN("RedlineProtectionKey")},
-/* 0589 AUTOMATIC_DISTANCE */ {MAP_CHAR_LEN("AutomaticDistance")},
-/* 0590 AUTOMATIC_CONTROL_FOCUS */ {MAP_CHAR_LEN("AutomaticControlFocus")},
-/* 0591 APPLY_FORM_DESIGN_MODE */ {MAP_CHAR_LEN("ApplyFormDesignMode")},
-/* 0592 LOCALE */ {MAP_CHAR_LEN("Locale")},
-/* 0593 SORT_ALGORITHM */ {MAP_CHAR_LEN("SortAlgorithm")},
-/* 0594 FRAME_HEIGHT_ABSOLUTE */ {MAP_CHAR_LEN("FrameHeightAbsolute")},
-/* 0596 FRAME_HEIGHT_PERCENT */ {MAP_CHAR_LEN("FrameHeightPercent")},
-/* 0597 FRAME_ISAUTOMATIC_HEIGHT */ {MAP_CHAR_LEN("FrameIsAutomaticHeight")},
-/* 0598 FRAME_WIDTH_ABSOLUTE */ {MAP_CHAR_LEN("FrameWidthAbsolute")},
-/* 0599 FRAME_WIDTH_PERCENT */ {MAP_CHAR_LEN("FrameWidthPercent")},
-/* 0600 PARA_STYLEHEADING */ {MAP_CHAR_LEN("ParaStyleHeading")},
-/* 0601 PARA_STYLELEVEL1 */ {MAP_CHAR_LEN("ParaStyleLevel1")},
-/* 0602 PARA_STYLELEVEL10 */ {MAP_CHAR_LEN("ParaStyleLevel10")},
-/* 0603 PARA_STYLELEVEL2 */ {MAP_CHAR_LEN("ParaStyleLevel2")},
-/* 0604 PARA_STYLELEVEL3 */ {MAP_CHAR_LEN("ParaStyleLevel3")},
-/* 0605 PARA_STYLELEVEL4 */ {MAP_CHAR_LEN("ParaStyleLevel4")},
-/* 0606 PARA_STYLELEVEL5 */ {MAP_CHAR_LEN("ParaStyleLevel5")},
-/* 0607 PARA_STYLELEVEL6 */ {MAP_CHAR_LEN("ParaStyleLevel6")},
-/* 0608 PARA_STYLELEVEL7 */ {MAP_CHAR_LEN("ParaStyleLevel7")},
-/* 0609 PARA_STYLELEVEL8 */ {MAP_CHAR_LEN("ParaStyleLevel8")},
-/* 0610 PARA_STYLELEVEL9 */ {MAP_CHAR_LEN("ParaStyleLevel9")},
-/* 0611 PARA_STYLESEPARATOR */ {MAP_CHAR_LEN("ParaStyleSeparator")},
+/* 0513 FOOTNOTE_IS_OWN_NUMBERING */ {MAP_CHAR_LEN("FootnoteIsOwnNumbering")},
+/* 0514 FOOTNOTE_NUMBERING_TYPE */ {MAP_CHAR_LEN("FootnoteNumberingType")},
+/* 0515 FOOTNOTE_NUMBERING_PREFIX */ {MAP_CHAR_LEN("FootnoteNumberingPrefix")},
+/* 0516 FOOTNOTE_NUMBERING_SUFFIX */ {MAP_CHAR_LEN("FootnoteNumberingSuffix")},
+/* 0517 ENDNOTE_IS_COLLECT_AT_TEXT_END */ {MAP_CHAR_LEN("EndnoteIsCollectAtTextEnd")},
+/* 0518 ENDNOTE_IS_RESTART_NUMBERING */ {MAP_CHAR_LEN("EndnoteIsRestartNumbering")},
+/* 0519 ENDNOTE_RESTART_NUMBERING_AT */ {MAP_CHAR_LEN("EndnoteRestartNumberingAt")},
+/* 0520 ENDNOTE_IS_OWN_NUMBERING */ {MAP_CHAR_LEN("EndnoteIsOwnNumbering")},
+/* 0521 ENDNOTE_NUMBERING_TYPE */ {MAP_CHAR_LEN("EndnoteNumberingType")},
+/* 0522 ENDNOTE_NUMBERING_PREFIX */ {MAP_CHAR_LEN("EndnoteNumberingPrefix")},
+/* 0523 ENDNOTE_NUMBERING_SUFFIX */ {MAP_CHAR_LEN("EndnoteNumberingSuffix")},
+/* 0524 BRACKET_BEFORE */ {MAP_CHAR_LEN("BracketBefore")},
+/* 0525 BRACKET_AFTER */ {MAP_CHAR_LEN("BracketAfter")},
+/* 0526 IS_NUMBER_ENTRIES */ {MAP_CHAR_LEN("IsNumberEntries")},
+/* 0527 IS_SORT_BY_POSITION */ {MAP_CHAR_LEN("IsSortByPosition")},
+/* 0528 SORT_KEYS */ {MAP_CHAR_LEN("SortKeys")},
+/* 0529 IS_SORT_ASCENDING */ {MAP_CHAR_LEN("IsSortAscending")},
+/* 0530 SORT_KEY */ {MAP_CHAR_LEN("SortKey")},
+/* 0531 FIELDS */ {MAP_CHAR_LEN("Fields")},
+/* 0532 DATE_TIME_VALUE */ {MAP_CHAR_LEN("DateTimeValue")},
+/* 0533 IS_ON */ {MAP_CHAR_LEN("IsOn")},
+/* 0534 Z_ORDER */ {MAP_CHAR_LEN("ZOrder")},
+/* 0535 CONTENT_SECTION */ {MAP_CHAR_LEN("ContentSection")},
+/* 0536 HEADER_SECTION */ {MAP_CHAR_LEN("HeaderSection")},
+/* 0537 PARA_IS_HANGING_PUNCTUATION */ {MAP_CHAR_LEN("ParaIsHangingPunctuation")},
+/* 0538 PARA_IS_CHARACTER_DISTANCE */ {MAP_CHAR_LEN("ParaIsCharacterDistance")},
+/* 0539 PARA_IS_FORBIDDEN_RULES */ {MAP_CHAR_LEN("ParaIsForbiddenRules")},
+/* 0540 PARA_VERT_ALIGNMENT */ {MAP_CHAR_LEN("ParaVertAlignment")},
+/* 0541 IS_MAIN_ENTRY */ {MAP_CHAR_LEN("IsMainEntry")},
+/* 0542 GRAPHIC_ROTATION */ {MAP_CHAR_LEN("GraphicRotation")},
+/* 0543 ADJUST_LUMINANCE */ {MAP_CHAR_LEN("AdjustLuminance")},
+/* 0544 ADJUST_CONTRAST */ {MAP_CHAR_LEN("AdjustContrast")},
+/* 0545 ADJUST_RED */ {MAP_CHAR_LEN("AdjustRed")},
+/* 0546 ADJUST_GREEN */ {MAP_CHAR_LEN("AdjustGreen")},
+/* 0547 ADJUST_BLUE */ {MAP_CHAR_LEN("AdjustBlue")},
+/* 0548 GAMMA */ {MAP_CHAR_LEN("Gamma")},
+/* 0549 GRAPHIC_IS_INVERTED */ {MAP_CHAR_LEN("GraphicIsInverted")},
+/* 0550 TRANSPARENCY */ {MAP_CHAR_LEN("Transparency")},
+/* 0551 GRAPHIC_COLOR_MODE */ {MAP_CHAR_LEN("GraphicColorMode")},
+/* 0552 REDLINE_AUTHOR */ {MAP_CHAR_LEN("RedlineAuthor")},
+/* 0553 REDLINE_DATE_TIME */ {MAP_CHAR_LEN("RedlineDateTime")},
+/* 0554 REDLINE_COMMENT */ {MAP_CHAR_LEN("RedlineComment")},
+/* 0555 REDLINE_TYPE */ {MAP_CHAR_LEN("RedlineType")},
+/* 0556 REDLINE_SUCCESSOR_DATA */ {MAP_CHAR_LEN("RedlineSuccessorData")},
+/* 0557 REDLINE_IDENTIFIER */ {MAP_CHAR_LEN("RedlineIdentifier")},
+/* 0558 IS_IN_HEADER_FOOTER */ {MAP_CHAR_LEN("IsInHeaderFooter")},
+/* 0559 START_REDLINE */ {MAP_CHAR_LEN("StartRedline")},
+/* 0560 END_REDLINE */ {MAP_CHAR_LEN("EndRedline")},
+/* 0561 REDLINE_START */ {MAP_CHAR_LEN("RedlineStart")},
+/* 0562 REDLINE_END */ {MAP_CHAR_LEN("RedlineEnd")},
+/* 0563 REDLINE_TEXT */ {MAP_CHAR_LEN("RedlineText")},
+/* 0564 REDLINE_DISPLAY_TYPE */ {MAP_CHAR_LEN("RedlineDisplayType")},
+/* 0565 FORBIDDEN_CHARACTERS */ {MAP_CHAR_LEN("ForbiddenCharacters")},
+/* 0566 RUBY_BASE_TEXT */ {MAP_CHAR_LEN("RubyBaseText")},
+/* 0567 RUBY_TEXT */ {MAP_CHAR_LEN("RubyText")},
+/* 0568 RUBY_ADJUST */ {MAP_CHAR_LEN("RubyAdjust")},
+/* 0569 RUBY_CHAR_STYLE_NAME */ {MAP_CHAR_LEN("RubyCharStyleName")},
+/* 0570 RUBY_IS_ABOVE */ {MAP_CHAR_LEN("RubyIsAbove")},
+/* 0571 FOOTNOTE_HEIGHT */ {MAP_CHAR_LEN("FootnoteHeight")},
+/* 0572 FOOTNOTE_LINE_WEIGHT */ {MAP_CHAR_LEN("FootnoteLineWeight")},
+/* 0573 FOOTNOTE_LINE_COLOR */ {MAP_CHAR_LEN("FootnoteLineColor")},
+/* 0574 FOOTNOTE_LINE_RELATIVE_WIDTH */ {MAP_CHAR_LEN("FootnoteLineRelativeWidth")},
+/* 0575 FOOTNOTE_LINE_ADJUST */ {MAP_CHAR_LEN("FootnoteLineAdjust")},
+/* 0576 FOOTNOTE_LINE_TEXT_DISTANCE */ {MAP_CHAR_LEN("FootnoteLineTextDistance")},
+/* 0577 FOOTNOTE_LINE_DISTANCE */ {MAP_CHAR_LEN("FootnoteLineDistance")},
+/* 0578 CHAR_ROTATION */ {MAP_CHAR_LEN("CharRotation")},
+/* 0579 CHAR_ROTATION_IS_FIT_TO_LINE */ {MAP_CHAR_LEN("CharRotationIsFitToLine")},
+/* 0580 CHAR_SCALE_WIDTH */ {MAP_CHAR_LEN("CharScaleWidth")},
+/* 0581 TAB_STOP_DISTANCE */ {MAP_CHAR_LEN("TabStopDistance")},
+/* 0582 IS_WIDTH_RELATIVE */ {MAP_CHAR_LEN("IsWidthRelative")},
+/* 0583 CHAR_RELIEF */ {MAP_CHAR_LEN("CharRelief")},
+/* 0584 IS_HIDDEN */ {MAP_CHAR_LEN("IsHidden")},
+/* 0585 IS_CONDITION_TRUE */ {MAP_CHAR_LEN("IsConditionTrue")},
+/* 0586 TWO_DIGIT_YEAR */ {MAP_CHAR_LEN("TwoDigitYear")},
+/* 0587 PROTECTION_KEY */ {MAP_CHAR_LEN("ProtectionKey")},
+/* 0588 REDLINE_PROTECTION_KEY */ {MAP_CHAR_LEN("RedlineProtectionKey")},
+/* 0589 AUTOMATIC_DISTANCE */ {MAP_CHAR_LEN("AutomaticDistance")},
+/* 0590 AUTOMATIC_CONTROL_FOCUS */ {MAP_CHAR_LEN("AutomaticControlFocus")},
+/* 0591 APPLY_FORM_DESIGN_MODE */ {MAP_CHAR_LEN("ApplyFormDesignMode")},
+/* 0592 LOCALE */ {MAP_CHAR_LEN("Locale")},
+/* 0593 SORT_ALGORITHM */ {MAP_CHAR_LEN("SortAlgorithm")},
+/* 0594 FRAME_HEIGHT_ABSOLUTE */ {MAP_CHAR_LEN("FrameHeightAbsolute")},
+/* 0596 FRAME_HEIGHT_PERCENT */ {MAP_CHAR_LEN("FrameHeightPercent")},
+/* 0597 FRAME_ISAUTOMATIC_HEIGHT */ {MAP_CHAR_LEN("FrameIsAutomaticHeight")},
+/* 0598 FRAME_WIDTH_ABSOLUTE */ {MAP_CHAR_LEN("FrameWidthAbsolute")},
+/* 0599 FRAME_WIDTH_PERCENT */ {MAP_CHAR_LEN("FrameWidthPercent")},
+/* 0600 PARA_STYLEHEADING */ {MAP_CHAR_LEN("ParaStyleHeading")},
+/* 0601 PARA_STYLELEVEL1 */ {MAP_CHAR_LEN("ParaStyleLevel1")},
+/* 0602 PARA_STYLELEVEL10 */ {MAP_CHAR_LEN("ParaStyleLevel10")},
+/* 0603 PARA_STYLELEVEL2 */ {MAP_CHAR_LEN("ParaStyleLevel2")},
+/* 0604 PARA_STYLELEVEL3 */ {MAP_CHAR_LEN("ParaStyleLevel3")},
+/* 0605 PARA_STYLELEVEL4 */ {MAP_CHAR_LEN("ParaStyleLevel4")},
+/* 0606 PARA_STYLELEVEL5 */ {MAP_CHAR_LEN("ParaStyleLevel5")},
+/* 0607 PARA_STYLELEVEL6 */ {MAP_CHAR_LEN("ParaStyleLevel6")},
+/* 0608 PARA_STYLELEVEL7 */ {MAP_CHAR_LEN("ParaStyleLevel7")},
+/* 0609 PARA_STYLELEVEL8 */ {MAP_CHAR_LEN("ParaStyleLevel8")},
+/* 0610 PARA_STYLELEVEL9 */ {MAP_CHAR_LEN("ParaStyleLevel9")},
+/* 0611 PARA_STYLESEPARATOR */ {MAP_CHAR_LEN("ParaStyleSeparator")},
/* 0612 MACRO_LIBRARY */ {MAP_CHAR_LEN("MacroLibrary")},
-/* 0613 CELL_NAME */ {MAP_CHAR_LEN("CellName")},
-/* 0614 PARA_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("ParaUserDefinedAttributes")},
+/* 0613 CELL_NAME */ {MAP_CHAR_LEN("CellName")},
+/* 0614 PARA_USER_DEFINED_ATTRIBUTES */ {MAP_CHAR_LEN("ParaUserDefinedAttributes")},
/* 0615 UNO_NAME_MERGE_LAST_PARA */ {MAP_CHAR_LEN("MergeLastPara")},
/* 0616 UNO_NAME_WRITING_MODE */ {MAP_CHAR_LEN("WritingMode")},
/* 0617 UNO_NAME_GRID_COLOR */ {MAP_CHAR_LEN("GridColor")},
@@ -716,7 +716,7 @@ const SwPropNameTab aPropNameTab = {
/* 0673 UNO_NAME_TRANSFORMATION_IN_HORI_L2R*/ {MAP_CHAR_LEN("TransformationInHoriL2R")},
/* 0674 UNO_NAME_POSITION_LAYOUT_DIR*/ {MAP_CHAR_LEN("PositionLayoutDir")},
/* 0675 UNO_NAME_NUMBERING_IS_OUTLINE*/ {MAP_CHAR_LEN("NumberingIsOutline")},
-///* 0676 UNO_NAME_DEFAULT_OUTLINE_LEVEL*/ {MAP_CHAR_LEN("DefaultOutlineLevel")}, //#outline level,removed by zhaojianwei
+///* 0676 UNO_NAME_DEFAULT_OUTLINE_LEVEL*/ {MAP_CHAR_LEN("DefaultOutlineLevel")}, //#outline level,removed by zhaojianwei
/* 0677 UNO_NAME_STARTPOSITION_IN_HORI_L2R*/ {MAP_CHAR_LEN("StartPositionInHoriL2R")},
/* 0678 UNO_NAME_ENDPOSITION_IN_HORI_L2R*/ {MAP_CHAR_LEN("EndPositionInHoriL2R")},
/* 0679 UNO_NAME_SUBJECT */ {MAP_CHAR_LEN("Subject")},
@@ -742,7 +742,7 @@ const SwPropNameTab aPropNameTab = {
/* 0699 UNO_NAME_IS_HIDE_SPELL_MARKS*/ {MAP_CHAR_LEN("IsHideSpellMarks")}, /* deprecated #i91949 */
/* 0700 UNO_NAME_IS_FIELD_USED */ {MAP_CHAR_LEN("IsFieldUsed")},
/* 0701 UNO_NAME_IS_FIELD_DISPLAYED */ {MAP_CHAR_LEN("IsFieldDisplayed")},
-/* 0702 UNO_NAME_BUILDID */ {MAP_CHAR_LEN("BuildId")},
+/* 0702 UNO_NAME_BUILDID */ {MAP_CHAR_LEN("BuildId")},
/* 0703 UNO_NAME_PARA_STYLE_CONDITIONS*/ {MAP_CHAR_LEN("ParaStyleConditions")},
/* 0704 UNO_NAME_PRINT_EMPTY_PAGES*/ {MAP_CHAR_LEN("PrintEmptyPages")},
/* 0705 UNO_NAME_ROLE */ {MAP_CHAR_LEN("Role")},
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index de92d788f393..ffe3050cf031 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -2,7 +2,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
@@ -190,15 +190,15 @@ uno::Type SwXRedlineText::getElementType( ) throw(uno::RuntimeException)
sal_Bool SwXRedlineText::hasElements( ) throw(uno::RuntimeException)
{
- return sal_True; // we always have a content index
+ return sal_True; // we always have a content index
}
-SwXRedlinePortion::SwXRedlinePortion( const SwRedline* pRed,
+SwXRedlinePortion::SwXRedlinePortion( const SwRedline* pRed,
const SwUnoCrsr* pPortionCrsr,
uno::Reference< text::XText > xParent, BOOL bStart) :
SwXTextPortion(pPortionCrsr, xParent, bStart ? PORTION_REDLINE_START : PORTION_REDLINE_END),
-// SwXText(pPortionCrsr->GetDoc(), CURSOR_REDLINE),
-// SwXRedlineText(pPortionCrsr->GetDoc(), *pRed->GetContentIdx()),
+// SwXText(pPortionCrsr->GetDoc(), CURSOR_REDLINE),
+// SwXRedlineText(pPortionCrsr->GetDoc(), *pRed->GetContentIdx()),
pRedline(pRed)
{
SetCollapsed(!pRedline->HasMark());
@@ -213,8 +213,8 @@ static util::DateTime lcl_DateTimeToUno(const DateTime& rDT)
util::DateTime aRetDT;
aRetDT.Year = rDT.GetYear();
aRetDT.Month= rDT.GetMonth();
- aRetDT.Day = rDT.GetDay();
- aRetDT.Hours = rDT.GetHour();
+ aRetDT.Day = rDT.GetDay();
+ aRetDT.Hours = rDT.GetHour();
aRetDT.Minutes = rDT.GetMin();
aRetDT.Seconds = rDT.GetSec();
aRetDT.HundredthSeconds = rDT.Get100Sec();
@@ -445,9 +445,9 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_DATE_TIME)))
{
DBG_ERROR("currently not available");
-// util::DateTime aDT;
-// if(aValue >>= aDT)
-// pRedline->SetTimeStamp(lcl_DateTimeFromUno(aDT));
+// util::DateTime aDT;
+// if(aValue >>= aDT)
+// pRedline->SetTimeStamp(lcl_DateTimeFromUno(aDT));
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_COMMENT)))
{
@@ -460,12 +460,12 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
OUString sTmp; aValue >>= sTmp;
if(!sTmp.getLength())
throw lang::IllegalArgumentException();
-// pRedline->SetType(lcl_OUStringToRedlineType(sTmp));
+// pRedline->SetType(lcl_OUStringToRedlineType(sTmp));
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_SUCCESSOR_DATA)))
{
DBG_ERROR("currently not available");
-/* SwRedlineData* pNext = pRedline->GetRedlineData().Next();
+/* SwRedlineData* pNext = pRedline->GetRedlineData().Next();
uno::Sequence<beans::PropertyValue> aValues;
if(!(aValue =>> aValues) || !pNext)
throw lang::IllegalArgumentException();
@@ -494,7 +494,7 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
pNext->SetType(lcl_OUStringToRedlineType(sTmp);
}
}
-*/ }
+*/ }
else
{
throw lang::IllegalArgumentException();
@@ -643,7 +643,7 @@ uno::Reference< text::XTextCursor > SwXRedline::createTextCursor(void) throw( u
if(!pDoc)
throw uno::RuntimeException();
- uno::Reference< text::XTextCursor > xRet;
+ uno::Reference< text::XTextCursor > xRet;
SwNodeIndex* pNodeIndex = pRedline->GetContentIdx();
if(pNodeIndex)
{
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 5ceff5ba7d98..a27f22f2486e 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -2,7 +2,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
@@ -126,7 +126,7 @@ uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames(void)
return uno::Sequence< OUString >();
}
-beans::XPropertySet* SwXRedlines::GetObject( SwRedline& rRedline, SwDoc& rDoc )
+beans::XPropertySet* SwXRedlines::GetObject( SwRedline& rRedline, SwDoc& rDoc )
{
SwPageDesc* pStdDesc = rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD);
SwClientIter aIter(*pStdDesc);
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 4c362ff3276e..b1124c7ab282 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index cbc48ebd4557..2cf2cfb87870 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 139bb9524fa5..828672182a11 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2,7 +2,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
@@ -90,8 +90,8 @@ using rtl::OUString;
struct PropValData
{
- uno::Any aVal;
- OUString sPropName;
+ uno::Any aVal;
+ OUString sPropName;
PropValData(void* pVal, const char* cPropName, uno::Type aType ) :
aVal(pVal, aType),
sPropName(OUString::createFromAscii(cPropName))
@@ -107,35 +107,35 @@ SV_DECL_PTRARR(PropValDataArr, PropValDataPtr, 5, 5 )
SV_IMPL_PTRARR(PropValDataArr, PropValDataPtr)
-#define WID_PREFIX 0
-#define WID_SUFFIX 1
+#define WID_PREFIX 0
+#define WID_SUFFIX 1
#define WID_NUMBERING_TYPE 2
#define WID_START_AT 3
-#define WID_FOOTNOTE_COUNTING 4
+#define WID_FOOTNOTE_COUNTING 4
#define WID_PARAGRAPH_STYLE 5
#define WID_PAGE_STYLE 6
#define WID_CHARACTER_STYLE 7
#define WID_POSITION_END_OF_DOC 8
#define WID_END_NOTICE 9
#define WID_BEGIN_NOTICE 10
-#define WID_ANCHOR_CHARACTER_STYLE 11
+#define WID_ANCHOR_CHARACTER_STYLE 11
const SfxItemPropertySet* GetFootnoteSet()
{
static SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
{
{ SW_PROP_NAME(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_BEGIN_NOTICE), WID_BEGIN_NOTICE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_END_NOTICE), WID_END_NOTICE , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_FOOTNOTE_COUNTING), WID_FOOTNOTE_COUNTING, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_POSITION_END_OF_DOC), WID_POSITION_END_OF_DOC,&::getBooleanCppuType(), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PREFIX), WID_PREFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_START_AT), WID_START_AT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_SUFFIX), WID_SUFFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_BEGIN_NOTICE), WID_BEGIN_NOTICE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_END_NOTICE), WID_END_NOTICE , &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_FOOTNOTE_COUNTING), WID_FOOTNOTE_COUNTING, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_POSITION_END_OF_DOC), WID_POSITION_END_OF_DOC,&::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PREFIX), WID_PREFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_START_AT), WID_START_AT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_SUFFIX), WID_SUFFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
static SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl);
@@ -147,13 +147,13 @@ const SfxItemPropertySet* GetEndnoteSet()
static SfxItemPropertyMapEntry aEndnoteMap_Impl[] =
{
{ SW_PROP_NAME(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_PREFIX), WID_PREFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_START_AT), WID_START_AT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_SUFFIX), WID_SUFFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_PREFIX), WID_PREFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_START_AT), WID_START_AT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_SUFFIX), WID_SUFFIX, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
static SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl);
@@ -164,11 +164,11 @@ const SfxItemPropertySet* GetNumberingRulesSet()
{
static SfxItemPropertyMapEntry aNumberingRulesMap_Impl[] =
{
- { SW_PROP_NAME(UNO_NAME_IS_ABSOLUTE_MARGINS), WID_IS_ABS_MARGINS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC), WID_IS_AUTOMATIC, &::getBooleanCppuType(), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_IS_CONTINUOUS_NUMBERING), WID_CONTINUOUS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_NAME), WID_RULE_NAME , &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
- { SW_PROP_NAME(UNO_NAME_NUMBERING_IS_OUTLINE), WID_IS_OUTLINE, &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_ABSOLUTE_MARGINS), WID_IS_ABS_MARGINS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC), WID_IS_AUTOMATIC, &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_CONTINUOUS_NUMBERING), WID_CONTINUOUS, &::getBooleanCppuType(), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_NAME), WID_RULE_NAME , &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
+ { SW_PROP_NAME(UNO_NAME_NUMBERING_IS_OUTLINE), WID_IS_OUTLINE, &::getBooleanCppuType(), PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_DEFAULT_LIST_ID), WID_DEFAULT_LIST_ID, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
{0,0,0,0,0,0}
};
@@ -176,7 +176,7 @@ const SfxItemPropertySet* GetNumberingRulesSet()
return &aNumberingRulesSet_Impl;
}
-#define WID_NUM_ON 0
+#define WID_NUM_ON 0
#define WID_SEPARATOR_INTERVAL 1
#define WID_NUMBERING_TYPE 2
#define WID_NUMBER_POSITION 3
@@ -186,23 +186,23 @@ const SfxItemPropertySet* GetNumberingRulesSet()
//#define WID_CHARACTER_STYLE 7
#define WID_COUNT_EMPTY_LINES 8
#define WID_COUNT_LINES_IN_FRAMES 9
-#define WID_RESTART_AT_EACH_PAGE 10
+#define WID_RESTART_AT_EACH_PAGE 10
const SfxItemPropertySet* GetLineNumberingSet()
{
static SfxItemPropertyMapEntry aLineNumberingMap_Impl[] =
{
{ SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_COUNT_EMPTY_LINES), WID_COUNT_EMPTY_LINES , &::getBooleanCppuType(),PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_COUNT_EMPTY_LINES), WID_COUNT_EMPTY_LINES , &::getBooleanCppuType(),PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_COUNT_LINES_IN_FRAMES), WID_COUNT_LINES_IN_FRAMES, &::getBooleanCppuType(),PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_DISTANCE ), WID_DISTANCE , &::getCppuType((const sal_Int32*)0),PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_IS_ON), WID_NUM_ON, &::getBooleanCppuType() , PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_INTERVAL ), WID_INTERVAL , &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_SEPARATOR_TEXT ), WID_SEPARATOR_TEXT, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_IS_ON), WID_NUM_ON, &::getBooleanCppuType() , PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_INTERVAL ), WID_INTERVAL , &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_SEPARATOR_TEXT ), WID_SEPARATOR_TEXT, &::getCppuType((const OUString*)0), PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_NUMBER_POSITION), WID_NUMBER_POSITION, &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
{ SW_PROP_NAME(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE , &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_RESTART_AT_EACH_PAGE), WID_RESTART_AT_EACH_PAGE, &::getBooleanCppuType() , PROPERTY_NONE, 0},
- { SW_PROP_NAME(UNO_NAME_SEPARATOR_INTERVAL), WID_SEPARATOR_INTERVAL, &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_RESTART_AT_EACH_PAGE), WID_RESTART_AT_EACH_PAGE, &::getBooleanCppuType() , PROPERTY_NONE, 0},
+ { SW_PROP_NAME(UNO_NAME_SEPARATOR_INTERVAL), WID_SEPARATOR_INTERVAL, &::getCppuType((const sal_Int16*)0),PROPERTY_NONE, 0},
{0,0,0,0,0,0}
};
static SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl);
@@ -289,7 +289,7 @@ const unsigned short aUnoToSvxAdjust[] =
USHRT_MAX,
SVX_ADJUST_RIGHT, // 1
SVX_ADJUST_CENTER, // 3
- SVX_ADJUST_LEFT, // 0
+ SVX_ADJUST_LEFT, // 0
USHRT_MAX,
USHRT_MAX
};
@@ -1122,9 +1122,9 @@ DBG_WARNING("not implemented");
/******************************************************************
* SwXNumberingRules
******************************************************************/
-String SwXNumberingRules::sInvalidStyle(String::CreateFromAscii("__XXX___invalid"));
+String SwXNumberingRules::sInvalidStyle(String::CreateFromAscii("__XXX___invalid"));
-const String& SwXNumberingRules::GetInvalidStyle()
+const String& SwXNumberingRules::GetInvalidStyle()
{
return sInvalidStyle;
}
@@ -1369,7 +1369,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
sal_Bool bChapterNum = pDocShell != 0;
- PropValDataArr aPropertyValues;
+ PropValDataArr aPropertyValues;
//fill all properties into the array
//adjust
@@ -1583,10 +1583,10 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
if(rTxtColl.IsDefault())
continue;
- //sal_Int8 nOutLevel = rTxtColl.GetOutlineLevel(); //#outline level,zhaojianwei
+ //sal_Int8 nOutLevel = rTxtColl.GetOutlineLevel(); //#outline level,zhaojianwei
const sal_Int16 nOutLevel = rTxtColl.IsAssignedToListLevelOfOutlineStyle()
? static_cast<sal_Int16>(rTxtColl.GetAssignedOutlineStyleLevel())
- : MAXLEVEL; //<-end,zhaojianwei
+ : MAXLEVEL; //<-end,zhaojianwei
if ( nOutLevel == nIndex )
{
sValue = rTxtColl.GetName();
@@ -1621,7 +1621,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
return aSeq;
}
-PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues)
+PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues)
{
OUString sCmp = C2U(cName);
for(sal_uInt16 i = 0; i < rPropertyValues.Count(); i++)
@@ -1644,7 +1644,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
// the order of the names is important!
static const char* aNumPropertyNames[] =
{
- "Adjust", //0
+ "Adjust", //0
"ParentNumbering", //1
"Prefix", //2
"Suffix", //3
@@ -2068,12 +2068,12 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
SwTxtFmtColl &rTxtColl = *((*pColls)[k]);
if(rTxtColl.IsDefault())
continue;
- //if(rTxtColl.GetOutlineLevel() == nIndex && //#outline level,removed by zhaojianwei
- // rTxtColl.GetName() != sStyleName)
- // rTxtColl..SetOutlineLevel(NO_NUMBERING);
+ //if(rTxtColl.GetOutlineLevel() == nIndex && //#outline level,removed by zhaojianwei
+ // rTxtColl.GetName() != sStyleName)
+ // rTxtColl..SetOutlineLevel(NO_NUMBERING);
//else if(rTxtColl.GetName() == sStyleName)
- // rTxtColl.SetOutlineLevel(sal_Int8(nIndex));
- if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && //add by zhaojianwei
+ // rTxtColl.SetOutlineLevel(sal_Int8(nIndex));
+ if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && //add by zhaojianwei
rTxtColl.GetAssignedOutlineStyleLevel() == nIndex &&
rTxtColl.GetName() != sStyleName )
{
@@ -2082,7 +2082,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
else if ( rTxtColl.GetName() == sStyleName )
{
rTxtColl.AssignToListLevelOfOutlineStyle( nIndex );
- } //<-end,,zhaojianwei,
+ } //<-end,,zhaojianwei,
}
}
break;
@@ -2412,8 +2412,8 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
pColumns[i].Width = pCol->GetWishWidth();
nReference += pColumns[i].Width;
- pColumns[i].LeftMargin = TWIP_TO_MM100_UNSIGNED(pCol->GetLeft ());
- pColumns[i].RightMargin = TWIP_TO_MM100_UNSIGNED(pCol->GetRight());
+ pColumns[i].LeftMargin = TWIP_TO_MM100_UNSIGNED(pCol->GetLeft ());
+ pColumns[i].RightMargin = TWIP_TO_MM100_UNSIGNED(pCol->GetRight());
}
if(!aTextColumns.getLength())
nReference = USHRT_MAX;
@@ -2424,10 +2424,10 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
bSepLineIsOn = rFmtCol.GetLineAdj() != COLADJ_NONE;
switch(rFmtCol.GetLineAdj())
{
- case COLADJ_TOP: nSepLineVertAlign = style::VerticalAlignment_TOP; break;
- case COLADJ_BOTTOM: nSepLineVertAlign = style::VerticalAlignment_BOTTOM; break;
+ case COLADJ_TOP: nSepLineVertAlign = style::VerticalAlignment_TOP; break;
+ case COLADJ_BOTTOM: nSepLineVertAlign = style::VerticalAlignment_BOTTOM; break;
case COLADJ_CENTER:
- case COLADJ_NONE: nSepLineVertAlign = style::VerticalAlignment_MIDDLE;
+ case COLADJ_NONE: nSepLineVertAlign = style::VerticalAlignment_MIDDLE;
}
}
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index d54a6768f66b..c162b549467b 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -2,7 +2,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
@@ -49,19 +49,19 @@ using ::rtl::OUString;
class SwSearchProperties_Impl
{
- beans::PropertyValue** pValueArr; //
+ beans::PropertyValue** pValueArr; //
sal_uInt32 nArrLen;
const PropertyEntryVector_t aPropertyEntries;
public:
SwSearchProperties_Impl();
~SwSearchProperties_Impl();
- void SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
+ void SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException );
const uno::Sequence< beans::PropertyValue > GetProperties() const;
- void FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const;
- sal_Bool HasAttributes() const;
+ void FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const;
+ sal_Bool HasAttributes() const;
};
SwSearchProperties_Impl::SwSearchProperties_Impl() :
@@ -81,7 +81,7 @@ SwSearchProperties_Impl::~SwSearchProperties_Impl()
delete[] pValueArr;
}
-void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
+void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException )
{
const beans::PropertyValue* pProps = aSearchAttribs.getConstArray();
@@ -138,7 +138,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSea
SfxPoolItem* pBoxItem = 0,
*pBreakItem = 0,
*pAutoKernItem = 0,
- *pWLineItem = 0,
+ *pWLineItem = 0,
*pTabItem = 0,
*pSplitItem = 0,
*pRegItem = 0,
@@ -405,7 +405,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSea
delete pBrushItem ;
}
-sal_Bool SwSearchProperties_Impl::HasAttributes() const
+sal_Bool SwSearchProperties_Impl::HasAttributes() const
{
for(sal_uInt32 i = 0; i < nArrLen; i++)
if(pValueArr[i])
@@ -502,18 +502,18 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
bVal = *(sal_Bool*)aValue.getValue();
switch(pEntry->nWID)
{
- case WID_SEARCH_ALL : bAll = bVal; break;
- case WID_WORDS: bWord = bVal; break;
- case WID_BACKWARDS : bBack = bVal; break;
- case WID_REGULAR_EXPRESSION : bExpr = bVal; break;
- case WID_CASE_SENSITIVE : bCase = bVal; break;
- //case WID_IN_SELECTION : bInSel = bVal; break;
- case WID_STYLES : bStyles = bVal; break;
+ case WID_SEARCH_ALL : bAll = bVal; break;
+ case WID_WORDS: bWord = bVal; break;
+ case WID_BACKWARDS : bBack = bVal; break;
+ case WID_REGULAR_EXPRESSION : bExpr = bVal; break;
+ case WID_CASE_SENSITIVE : bCase = bVal; break;
+ //case WID_IN_SELECTION : bInSel = bVal; break;
+ case WID_STYLES : bStyles = bVal; break;
case WID_SIMILARITY : bSimilarity = bVal; break;
- case WID_SIMILARITY_RELAX: bLevRelax = bVal; break;
- case WID_SIMILARITY_EXCHANGE: aValue >>= nLevExchange; break;
- case WID_SIMILARITY_ADD: aValue >>= nLevAdd; break;
- case WID_SIMILARITY_REMOVE : aValue >>= nLevRemove;break;
+ case WID_SIMILARITY_RELAX: bLevRelax = bVal; break;
+ case WID_SIMILARITY_EXCHANGE: aValue >>= nLevExchange; break;
+ case WID_SIMILARITY_ADD: aValue >>= nLevAdd; break;
+ case WID_SIMILARITY_REMOVE : aValue >>= nLevRemove;break;
};
}
else
@@ -532,8 +532,8 @@ uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( b
{
switch(pEntry->nWID)
{
- case WID_SEARCH_ALL : bSet = bAll; goto SET_BOOL;
- case WID_WORDS: bSet = bWord; goto SET_BOOL;
+ case WID_SEARCH_ALL : bSet = bAll; goto SET_BOOL;
+ case WID_WORDS: bSet = bWord; goto SET_BOOL;
case WID_BACKWARDS : bSet = bBack; goto SET_BOOL;
case WID_REGULAR_EXPRESSION : bSet = bExpr; goto SET_BOOL;
case WID_CASE_SENSITIVE : bSet = bCase; goto SET_BOOL;
@@ -544,9 +544,9 @@ uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( b
SET_BOOL:
aRet.setValue(&bSet, ::getBooleanCppuType());
break;
- case WID_SIMILARITY_EXCHANGE: nSet = nLevExchange; goto SET_UINT16;
- case WID_SIMILARITY_ADD: nSet = nLevAdd; goto SET_UINT16;
- case WID_SIMILARITY_REMOVE : nSet = nLevRemove;
+ case WID_SIMILARITY_EXCHANGE: nSet = nLevExchange; goto SET_UINT16;
+ case WID_SIMILARITY_ADD: nSet = nLevAdd; goto SET_UINT16;
+ case WID_SIMILARITY_REMOVE : nSet = nLevRemove;
SET_UINT16:
aRet <<= nSet;
break;
@@ -591,7 +591,7 @@ void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeExc
uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes(void) throw( uno::RuntimeException )
{
- return pSearchProperties->GetProperties();
+ return pSearchProperties->GetProperties();
}
void SwXTextSearch::setSearchAttributes(const uno::Sequence< beans::PropertyValue >& rSearchAttribs)
@@ -612,22 +612,22 @@ void SwXTextSearch::setReplaceAttributes(const uno::Sequence< beans::PropertyVal
pReplaceProperties->SetProperties(rReplaceAttribs);
}
-void SwXTextSearch::FillSearchItemSet(SfxItemSet& rSet) const
+void SwXTextSearch::FillSearchItemSet(SfxItemSet& rSet) const
{
pSearchProperties->FillItemSet(rSet, bIsValueSearch);
}
-void SwXTextSearch::FillReplaceItemSet(SfxItemSet& rSet) const
+void SwXTextSearch::FillReplaceItemSet(SfxItemSet& rSet) const
{
pReplaceProperties->FillItemSet(rSet, bIsValueSearch);
}
-sal_Bool SwXTextSearch::HasSearchAttributes() const
+sal_Bool SwXTextSearch::HasSearchAttributes() const
{
return pSearchProperties->HasAttributes();
}
-sal_Bool SwXTextSearch::HasReplaceAttributes() const
+sal_Bool SwXTextSearch::HasReplaceAttributes() const
{
return pReplaceProperties->HasAttributes();
}
@@ -677,10 +677,10 @@ void SwXTextSearch::FillSearchOptions( util::SearchOptions& rSearchOpt ) const
if( bWord )
rSearchOpt.searchFlag |= util::SearchFlags::NORM_WORD_ONLY;
-// bInSel: 1; // wie geht das?
-// TODO: pSearch->bStyles!
-// inSelection??
-// aSrchParam.SetSrchInSelection(TypeConversion::toBOOL(aVal));
+// bInSel: 1; // wie geht das?
+// TODO: pSearch->bStyles!
+// inSelection??
+// aSrchParam.SetSrchInSelection(TypeConversion::toBOOL(aVal));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 2f6f63de94f8..9590cfad280c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2,7 +2,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
@@ -1104,7 +1104,7 @@ SwStyleProperties_Impl::SwStyleProperties_Impl(const SfxItemPropertyMap* pMap) :
{
nArrLen = aPropertyEntries.size();
//const SfxItemPropertyMap* pTmp = _pMap;
-
+
pAnyArr = new uno::Any* [nArrLen];
for ( sal_uInt32 i =0 ; i < nArrLen; i++ )
pAnyArr[i] = 0;
@@ -1182,7 +1182,7 @@ sal_Bool SwStyleProperties_Impl::GetProperty(const ::rtl::OUString& rName, uno::
++nPos;
++aIt;
}
-
+
return bRet;
}
@@ -1830,7 +1830,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
throw lang::IllegalArgumentException();
}
break;
- // case FN_UNO_DEFAULT_OUTLINE_LEVEL: //#outline level,removed by zahojianwei
+ // case FN_UNO_DEFAULT_OUTLINE_LEVEL: //#outline level,removed by zahojianwei
//{
// sal_Int8 nLevel = 0;
// if( rValue >>= nLevel )
@@ -1839,14 +1839,14 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
// rBase.mxNewBase->GetCollection()->SetOutlineLevel( NO_NUMBERING );
//}
//break;
- case RES_PARATR_OUTLINELEVEL: //add by zahojianwei
+ case RES_PARATR_OUTLINELEVEL: //add by zahojianwei
{
sal_Int16 nLevel = 0;
- rValue >>= nLevel;
+ rValue >>= nLevel;
if( 0 <= nLevel && nLevel <= MAXLEVEL)
rBase.mxNewBase->GetCollection()->SetAttrOutlineLevel( nLevel );
- }
- break; //<-end,zhaojianwei
+ }
+ break; //<-end,zhaojianwei
case FN_UNO_FOLLOW_STYLE:
{
OUString sTmp;
@@ -2088,9 +2088,9 @@ put_itemset:
if ( SFX_STYLE_FAMILY_PARA == eFamily &&
rEntry.nWID == RES_PARATR_NUMRULE &&
rBase.mxNewBase.is() && rBase.mxNewBase->GetCollection() &&
- //rBase.mxNewBase->GetCollection()->GetOutlineLevel() < MAXLEVEL /* assigned to list level of outline style */) //#outline level,removed by zhaojianwei
- rBase.mxNewBase->GetCollection()->IsAssignedToListLevelOfOutlineStyle() ) ////<-end,add by zhaojianwei
-
+ //rBase.mxNewBase->GetCollection()->GetOutlineLevel() < MAXLEVEL /* assigned to list level of outline style */) //#outline level,removed by zhaojianwei
+ rBase.mxNewBase->GetCollection()->IsAssignedToListLevelOfOutlineStyle() ) ////<-end,add by zhaojianwei
+
{
OUString sNewNumberingRuleName;
rValue >>= sNewNumberingRuleName;
@@ -2099,8 +2099,8 @@ put_itemset:
sTmp != pDoc->GetOutlineNumRule()->GetName() )
{
// delete assignment to list level of outline style.
- //rBase.mxNewBase->GetCollection()->SetOutlineLevel( NO_NUMBERING ); //#outline level,removed by zhaojianwei
- rBase.mxNewBase->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,adde by zhaojianwei
+ //rBase.mxNewBase->GetCollection()->SetOutlineLevel( NO_NUMBERING ); //#outline level,removed by zhaojianwei
+ rBase.mxNewBase->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,adde by zhaojianwei
}
}
}
@@ -2251,7 +2251,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
aRet.setValue(&xRules, ::getCppuType((uno::Reference<container::XIndexReplace>*)0));
}
break;
- //case FN_UNO_DEFAULT_OUTLINE_LEVEL: //#outline level,removed by zahojianwei
+ //case FN_UNO_DEFAULT_OUTLINE_LEVEL: //#outline level,removed by zahojianwei
//{
// DBG_ASSERT( SFX_STYLE_FAMILY_PARA == eFamily, "only paras" );
// BYTE nLevel = rBase.mxNewBase->GetCollection()->GetOutlineLevel();
@@ -2259,13 +2259,13 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
// aRet <<= static_cast<sal_Int8>( nLevel );
//}
//break;
- case RES_PARATR_OUTLINELEVEL: //add by zahojianwei
+ case RES_PARATR_OUTLINELEVEL: //add by zahojianwei
{
DBG_ASSERT( SFX_STYLE_FAMILY_PARA == eFamily, "only paras" );
int nLevel = rBase.mxNewBase->GetCollection()->GetAttrOutlineLevel();
aRet <<= static_cast<sal_Int16>( nLevel );
}
- break; //<-end,zhaojianwei
+ break; //<-end,zhaojianwei
case FN_UNO_FOLLOW_STYLE:
{
String aString;
@@ -2641,7 +2641,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates(
// == NO_NUMBERING )
// ? beans::PropertyState_DEFAULT_VALUE
// : beans::PropertyState_DIRECT_VALUE;
- // } //<-end,zhaojianwei
+ // } //<-end,zhaojianwei
else if(SFX_STYLE_FAMILY_PAGE == eFamily &&
(rPropName.EqualsAscii("Header", 0, 6)
|| rPropName.EqualsAscii("Footer", 0, 6)))
@@ -2764,7 +2764,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertiesToDefault: property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
//if( pEntry->nWID == FN_UNO_DEFAULT_OUTLINE_LEVEL ) //#outline level, removed by zhaojianwei
- // static_cast<SwTxtFmtColl*>(pTargetFmt)->SetOutlineLevel( NO_NUMBERING );
+ // static_cast<SwTxtFmtColl*>(pTargetFmt)->SetOutlineLevel( NO_NUMBERING );
//else
// pTargetFmt->ResetFmtAttr( pEntry->nWID );
if( pEntry->nWID == RES_PARATR_OUTLINELEVEL ) //add by zhaojianwei
@@ -2807,8 +2807,8 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault( )
// --> OD 2007-07-25 #132402# - make code robust
if ( xStyle->GetCollection() )
{
- // xStyle->GetCollection()->SetOutlineLevel( NO_NUMBERING ); //#outline level,removed by zhaojianwei
- xStyle->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,add by zhaojianwei
+ // xStyle->GetCollection()->SetOutlineLevel( NO_NUMBERING ); //#outline level,removed by zhaojianwei
+ xStyle->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,add by zhaojianwei
}
// <--
}
@@ -4194,8 +4194,8 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() throw (uno::
// aPropertyValue.Name = aIt->sName;
// pItem->QueryValue( aPropertyValue.Value, aIt->nMemberId );
// aPropertyVector.push_back( aPropertyValue );
-// }
- // TODO: Optimize - and fix! the old iteration filled each WhichId
+// }
+ // TODO: Optimize - and fix! the old iteration filled each WhichId
// only once but there are more properties than WhichIds
PropertyEntryVector_t::const_iterator aIt = aPropVector.begin();
while( aIt != aPropVector.end() )
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 335e1143c907..4792cf1a8a5f 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2,7 +2,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
@@ -115,13 +115,13 @@ table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine)
table::BorderLine2 aLine;
if(pLine)
{
- aLine.Color = pLine->GetColor().GetColor() ;
+ aLine.Color = pLine->GetColor().GetColor() ;
aLine.InnerLineWidth = TWIP_TO_MM100_UNSIGNED( pLine->GetInWidth() );
aLine.OuterLineWidth = TWIP_TO_MM100_UNSIGNED( pLine->GetOutWidth() );
- aLine.LineDistance = TWIP_TO_MM100_UNSIGNED( pLine->GetDistance() );
+ aLine.LineDistance = TWIP_TO_MM100_UNSIGNED( pLine->GetDistance() );
}
else
- aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0;
+ aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0;
return aLine;
}
@@ -130,7 +130,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi
rSvxLine.SetColor( Color(rLine.Color));
rSvxLine.SetInWidth( MM100_TO_TWIP( rLine.InnerLineWidth ) );
rSvxLine.SetOutWidth(MM100_TO_TWIP( rLine.OuterLineWidth ) );
- rSvxLine.SetDistance(MM100_TO_TWIP( rLine.LineDistance ) );
+ rSvxLine.SetDistance(MM100_TO_TWIP( rLine.LineDistance ) );
sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0;
return bRet;
}
@@ -363,7 +363,7 @@ void lcl_GetCellPosition( const String &rCellName,
}
rColumn = nColIdx;
- rRow = aRowTxt.ToInt32() - 1; // - 1 because indices ought to be 0 based
+ rRow = aRowTxt.ToInt32() - 1; // - 1 because indices ought to be 0 based
}
}
}
@@ -735,7 +735,7 @@ void lcl_setValue( SwXCell &rCell, double nVal )
// - the current number format is not even a valid number formatter number format, but rather Writer's own 'special' text number format
if(SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem)
|| pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())
- || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT)
+ || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT)
{
aSet.Put(SwTblBoxNumFormat(0));
}
@@ -958,10 +958,10 @@ table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException )
sal_uInt32 nNdPos = pBox->IsFormulaOrValueBox();
switch (nNdPos)
{
- case 0 : nRes = table::CellContentType_TEXT; break;
- case USHRT_MAX : nRes = table::CellContentType_EMPTY; break;
- case RES_BOXATR_VALUE : nRes = table::CellContentType_VALUE; break;
- case RES_BOXATR_FORMULA : nRes = table::CellContentType_FORMULA; break;
+ case 0 : nRes = table::CellContentType_TEXT; break;
+ case USHRT_MAX : nRes = table::CellContentType_EMPTY; break;
+ case RES_BOXATR_VALUE : nRes = table::CellContentType_VALUE; break;
+ case RES_BOXATR_FORMULA : nRes = table::CellContentType_FORMULA; break;
default :
DBG_ERROR( "unexpected case" );
}
@@ -984,7 +984,7 @@ sal_Int32 SwXCell::getError(void) throw( uno::RuntimeException )
uno::Reference< text::XTextCursor > SwXCell::createTextCursor(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
- uno::Reference< text::XTextCursor > aRef;
+ uno::Reference< text::XTextCursor > aRef;
if(pStartNode || IsValid())
{
const SwStartNode* pSttNd = pStartNode ? pStartNode : pBox->GetSttNd();
@@ -994,11 +994,11 @@ uno::Reference< text::XTextCursor > SwXCell::createTextCursor(void) throw( uno:
SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
pUnoCrsr->Move(fnMoveForward, fnGoNode);
aRef = static_cast<text::XWordCursor*>(pXCursor);
-// // no Cursor in protected sections
-// SwCrsrSaveState aSave( *pUnoCrsr );
-// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
+// // no Cursor in protected sections
+// SwCrsrSaveState aSave( *pUnoCrsr );
+// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
// pUnoCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
-// throw( uno::RuntimeException() );
+// throw( uno::RuntimeException() );
}
else
throw uno::RuntimeException();
@@ -1044,7 +1044,7 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
SolarMutexGuard aGuard;
if(IsValid())
{
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if( !pEntry )
{
@@ -1164,11 +1164,11 @@ uno::Reference< container::XEnumeration > SwXCell::createEnumeration(void) thro
pSttNd, pTable);
aRef = pEnum;
-// // no Cursor in protected sections
-// SwCrsrSaveState aSave( *pUnoCrsr );
-// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
+// // no Cursor in protected sections
+// SwCrsrSaveState aSave( *pUnoCrsr );
+// if(pUnoCrsr->IsInProtectTable( sal_True ) ||
// pUnoCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
-// throw( uno::RuntimeException() );
+// throw( uno::RuntimeException() );
}
return aRef;
}
@@ -1223,7 +1223,7 @@ SwXCell* SwXCell::CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTab
}
/* -----------------12.06.98 07:37-------------------
- * exitstiert die Box in der angegebenen Tabelle?
+ * exitstiert die Box in der angegebenen Tabelle?
* --------------------------------------------------*/
SwTableBox* SwXCell::FindBox(SwTable* pTable, SwTableBox* pBox2)
{
@@ -1313,7 +1313,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
SwTableLine* pLn = SwXTextTableRow::FindLine(pTable, pLine);
if(pLn)
{
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
SwDoc* pDoc = pFmt->GetDoc();
if (!pEntry)
@@ -1373,7 +1373,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
SwTableLine* pLn = SwXTextTableRow::FindLine(pTable, pLine);
if(pLn)
{
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1461,12 +1461,12 @@ BOOL SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( un
}
IMPLEMENT_FORWARD_XINTERFACE2(SwXTextTableCursor,SwXTextTableCursor_Base,OTextCursorHelper)
-const SwPaM* SwXTextTableCursor::GetPaM() const { return GetCrsr(); }
-SwPaM* SwXTextTableCursor::GetPaM() { return GetCrsr(); }
-const SwDoc* SwXTextTableCursor::GetDoc() const { return GetFrmFmt()->GetDoc(); }
-SwDoc* SwXTextTableCursor::GetDoc() { return GetFrmFmt()->GetDoc(); }
-const SwUnoCrsr* SwXTextTableCursor::GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
-SwUnoCrsr* SwXTextTableCursor::GetCrsr() { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
+const SwPaM* SwXTextTableCursor::GetPaM() const { return GetCrsr(); }
+SwPaM* SwXTextTableCursor::GetPaM() { return GetCrsr(); }
+const SwDoc* SwXTextTableCursor::GetDoc() const { return GetFrmFmt()->GetDoc(); }
+SwDoc* SwXTextTableCursor::GetDoc() { return GetFrmFmt()->GetDoc(); }
+const SwUnoCrsr* SwXTextTableCursor::GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
+SwUnoCrsr* SwXTextTableCursor::GetCrsr() { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
uno::Sequence< OUString > SwXTextTableCursor::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
@@ -1491,7 +1491,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) :
pTblCrsr->MakeBoxSels();
}
-SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* pTableSelection) :
+SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* pTableSelection) :
SwClient(&rTableFmt),
aCrsrDepend(this, 0),
m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR))
@@ -1569,7 +1569,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool E
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
String sCellName(CellName);
bRet = pTblCrsr->GotoTblBox(sCellName);
}
@@ -1584,7 +1584,7 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
bRet = pTblCrsr->Left( Count,CRSR_SKIP_CHARS, FALSE, FALSE);
}
return bRet;
@@ -1598,7 +1598,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
bRet = pTblCrsr->Right( Count, CRSR_SKIP_CHARS, FALSE, FALSE);
}
return bRet;
@@ -1612,7 +1612,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
bRet = pTblCrsr->UpDown(sal_True, Count, 0, 0);
}
return bRet;
@@ -1626,7 +1626,7 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
bRet = pTblCrsr->UpDown(sal_False, Count, 0, 0);
}
return bRet;
@@ -1639,7 +1639,7 @@ void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
pTblCrsr->MoveTable(fnTableCurr, fnTableStart);
}
}
@@ -1651,7 +1651,7 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException )
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
+ lcl_CrsrSelect( pTblCrsr, Expand );
pTblCrsr->MoveTable(fnTableCurr, fnTableEnd);
}
}
@@ -1731,7 +1731,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
const SwTableNode* pTblNode = pSttNode->FindTableNode();
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if(pEntry)
{
@@ -1793,7 +1793,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
const SwTableNode* pTblNode = pSttNode->FindTableNode();
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if(pEntry)
{
@@ -1825,7 +1825,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
default:
{
SfxItemSet aSet(pTblCrsr->GetDoc()->GetAttrPool(),
- RES_CHRATR_BEGIN, RES_FRMATR_END -1,
+ RES_CHRATR_BEGIN, RES_FRMATR_END -1,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
// erstmal die Attribute des Cursors
@@ -1903,17 +1903,17 @@ sal_Bool SwTableProperties_Impl::GetProperty(USHORT nWhichId, USHORT nMemberId,
return aAnyMap.FillValue( nWhichId, nMemberId, rpAny );
}
-void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
+void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
{
SfxItemSet aSet(rDoc.GetAttrPool(),
- RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
- RES_BACKGROUND, RES_BACKGROUND,
- RES_FRM_SIZE, RES_UL_SPACE,
- RES_HORI_ORIENT, RES_HORI_ORIENT,
- RES_BREAK, RES_BREAK,
- RES_KEEP, RES_KEEP,
- RES_SHADOW, RES_SHADOW,
- RES_PAGEDESC, RES_PAGEDESC,
+ RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
+ RES_BACKGROUND, RES_BACKGROUND,
+ RES_FRM_SIZE, RES_UL_SPACE,
+ RES_HORI_ORIENT, RES_HORI_ORIENT,
+ RES_BREAK, RES_BREAK,
+ RES_KEEP, RES_KEEP,
+ RES_SHADOW, RES_SHADOW,
+ RES_PAGEDESC, RES_PAGEDESC,
0
);
const uno::Any* pRepHead;
@@ -2072,9 +2072,9 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
}
//TODO: folgende Propertiers noch impl.
-// FN_UNO_RANGE_ROW_LABEL
-// FN_UNO_RANGE_COL_LABEL
-// FN_UNO_TABLE_BORDER
+// FN_UNO_RANGE_ROW_LABEL
+// FN_UNO_RANGE_COL_LABEL
+// FN_UNO_TABLE_BORDER
if(aSet.Count())
{
@@ -2259,7 +2259,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
OTextCursorHelper* pCursor = 0;
if(xRangeTunnel.is())
{
- pRange = reinterpret_cast< SwXTextRange * >(
+ pRange = reinterpret_cast< SwXTextRange * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
pCursor = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
@@ -2555,8 +2555,8 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
//const SfxPoolItem* pItem;
//SwDoc* pDoc = pXCell->GetDoc();
//BOOL bIsText = (SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem)
- // || pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())
- // || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT);
+ // || pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())
+ // || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT);
if(!bIsNum/*bIsText*/)
pColArray[nCol] <<= lcl_getString(*pXCell);
@@ -2992,7 +2992,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
SwFrmFmt* pFmt = GetFrmFmt();
if(!aValue.hasValue())
throw lang::IllegalArgumentException();
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if( !pEntry )
throw lang::IllegalArgumentException();
@@ -3198,7 +3198,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
SolarMutexGuard aGuard;
uno::Any aRet;
SwFrmFmt* pFmt = GetFrmFmt();
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if(pFmt)
{
@@ -3261,7 +3261,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
pUnoCrsr->SetMark();
const SwStartNode* pLastNd = pBRBox->GetSttNd();
pUnoCrsr->GetPoint()->nNode = *pLastNd;
-
+
pUnoCrsr->Move( fnMoveForward, fnGoNode );
SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
pCrsr->MakeBoxSels();
@@ -3276,35 +3276,35 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
const SvxBoxItem& rBox = (const SvxBoxItem&)aSet.Get(RES_BOX);
table::TableBorder aTableBorder;
- aTableBorder.TopLine = lcl_SvxLineToLine(rBox.GetTop());
- aTableBorder.IsTopLineValid = rBoxInfoItem.IsValid(VALID_TOP);
- aTableBorder.BottomLine = lcl_SvxLineToLine(rBox.GetBottom());
- aTableBorder.IsBottomLineValid = rBoxInfoItem.IsValid(VALID_BOTTOM);
- aTableBorder.LeftLine = lcl_SvxLineToLine(rBox.GetLeft());
- aTableBorder.IsLeftLineValid = rBoxInfoItem.IsValid(VALID_LEFT);
- aTableBorder.RightLine = lcl_SvxLineToLine(rBox.GetRight());
- aTableBorder.IsRightLineValid = rBoxInfoItem.IsValid(VALID_RIGHT );
- aTableBorder.HorizontalLine = lcl_SvxLineToLine(rBoxInfoItem.GetHori());
- aTableBorder.IsHorizontalLineValid = rBoxInfoItem.IsValid(VALID_HORI);
- aTableBorder.VerticalLine = lcl_SvxLineToLine(rBoxInfoItem.GetVert());
- aTableBorder.IsVerticalLineValid = rBoxInfoItem.IsValid(VALID_VERT);
- aTableBorder.Distance = TWIP_TO_MM100_UNSIGNED( rBox.GetDistance() );
- aTableBorder.IsDistanceValid = rBoxInfoItem.IsValid(VALID_DISTANCE);
+ aTableBorder.TopLine = lcl_SvxLineToLine(rBox.GetTop());
+ aTableBorder.IsTopLineValid = rBoxInfoItem.IsValid(VALID_TOP);
+ aTableBorder.BottomLine = lcl_SvxLineToLine(rBox.GetBottom());
+ aTableBorder.IsBottomLineValid = rBoxInfoItem.IsValid(VALID_BOTTOM);
+ aTableBorder.LeftLine = lcl_SvxLineToLine(rBox.GetLeft());
+ aTableBorder.IsLeftLineValid = rBoxInfoItem.IsValid(VALID_LEFT);
+ aTableBorder.RightLine = lcl_SvxLineToLine(rBox.GetRight());
+ aTableBorder.IsRightLineValid = rBoxInfoItem.IsValid(VALID_RIGHT );
+ aTableBorder.HorizontalLine = lcl_SvxLineToLine(rBoxInfoItem.GetHori());
+ aTableBorder.IsHorizontalLineValid = rBoxInfoItem.IsValid(VALID_HORI);
+ aTableBorder.VerticalLine = lcl_SvxLineToLine(rBoxInfoItem.GetVert());
+ aTableBorder.IsVerticalLineValid = rBoxInfoItem.IsValid(VALID_VERT);
+ aTableBorder.Distance = TWIP_TO_MM100_UNSIGNED( rBox.GetDistance() );
+ aTableBorder.IsDistanceValid = rBoxInfoItem.IsValid(VALID_DISTANCE);
aRet.setValue(&aTableBorder, ::getCppuType((const table::TableBorder*)0));
delete pUnoCrsr;
}
}
break;
case FN_UNO_TABLE_BORDER_DISTANCES :
- {
+ {
table::TableBorderDistances aTableBorderDistances( 0, sal_True, 0, sal_True, 0, sal_True, 0, sal_True ) ;
SwTable* pTable = SwTable::FindTable( pFmt );
const SwTableLines &rLines = pTable->GetTabLines();
bool bFirst = true;
- USHORT nLeftDistance = 0;
- USHORT nRightDistance = 0;
- USHORT nTopDistance = 0;
- USHORT nBottomDistance = 0;
+ USHORT nLeftDistance = 0;
+ USHORT nRightDistance = 0;
+ USHORT nTopDistance = 0;
+ USHORT nBottomDistance = 0;
for(sal_uInt16 i = 0; i < rLines.Count(); i++)
{
@@ -3325,38 +3325,38 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
}
else
{
- if( aTableBorderDistances.IsLeftDistanceValid &&
+ if( aTableBorderDistances.IsLeftDistanceValid &&
nLeftDistance != TWIP_TO_MM100_UNSIGNED( rBox.GetDistance( BOX_LINE_LEFT )))
aTableBorderDistances.IsLeftDistanceValid = sal_False;
- if( aTableBorderDistances.IsRightDistanceValid &&
+ if( aTableBorderDistances.IsRightDistanceValid &&
nRightDistance != TWIP_TO_MM100_UNSIGNED( rBox.GetDistance( BOX_LINE_RIGHT )))
aTableBorderDistances.IsRightDistanceValid = sal_False;
- if( aTableBorderDistances.IsTopDistanceValid &&
+ if( aTableBorderDistances.IsTopDistanceValid &&
nTopDistance != TWIP_TO_MM100_UNSIGNED( rBox.GetDistance( BOX_LINE_TOP )))
aTableBorderDistances.IsTopDistanceValid = sal_False;
- if( aTableBorderDistances.IsBottomDistanceValid &&
+ if( aTableBorderDistances.IsBottomDistanceValid &&
nBottomDistance != TWIP_TO_MM100_UNSIGNED( rBox.GetDistance( BOX_LINE_BOTTOM )))
aTableBorderDistances.IsBottomDistanceValid = sal_False;
- }
+ }
- }
- if( !aTableBorderDistances.IsLeftDistanceValid &&
- !aTableBorderDistances.IsRightDistanceValid &&
- !aTableBorderDistances.IsTopDistanceValid &&
+ }
+ if( !aTableBorderDistances.IsLeftDistanceValid &&
+ !aTableBorderDistances.IsRightDistanceValid &&
+ !aTableBorderDistances.IsTopDistanceValid &&
!aTableBorderDistances.IsBottomDistanceValid )
break;
}
if( aTableBorderDistances.IsLeftDistanceValid)
- aTableBorderDistances.LeftDistance = nLeftDistance;
+ aTableBorderDistances.LeftDistance = nLeftDistance;
if( aTableBorderDistances.IsRightDistanceValid)
aTableBorderDistances.RightDistance = nRightDistance;
if( aTableBorderDistances.IsTopDistanceValid)
aTableBorderDistances.TopDistance = nTopDistance;
if( aTableBorderDistances.IsBottomDistanceValid)
aTableBorderDistances.BottomDistance = nBottomDistance;
-
+
aRet <<= aTableBorderDistances;
- }
+ }
break;
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
@@ -3760,7 +3760,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
{
/* ASK OLIVER
lcl_FormatTable(pFmt);*/
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if(pEntry)
{
@@ -3877,7 +3877,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be
{
/* ASK OLIVER
lcl_FormatTable(pFmt);*/
- const SfxItemPropertySimpleEntry* pEntry =
+ const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap()->getByName(rPropertyName);
if(pEntry)
{
@@ -3933,7 +3933,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be
default:
{
SfxItemSet aSet(pTblCrsr->GetDoc()->GetAttrPool(),
- RES_CHRATR_BEGIN, RES_FRMATR_END -1,
+ RES_CHRATR_BEGIN, RES_FRMATR_END -1,
RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
@@ -4161,8 +4161,8 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
//const SfxPoolItem* pItem;
//SwDoc* pDoc = pXCell->GetDoc();
//BOOL bIsText = (SFX_ITEM_SET != pBoxFmt->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, sal_True, &pItem)
- // || pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())
- // || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT);
+ // || pDoc->GetNumberFormatter()->IsTextFormat(((SwTblBoxNumFormat*)pItem)->GetValue())
+ // || ((SwTblBoxNumFormat*)pItem)->GetValue() == NUMBERFORMAT_TEXT);
if(!bIsNum/*bIsText*/)
pColArray[nCol] <<= lcl_getString(*pXCell);
@@ -4556,7 +4556,7 @@ void SwXCellRange::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
}
/******************************************************************
- * SwXTableRows
+ * SwXTableRows
******************************************************************/
OUString SwXTableRows::getImplementationName(void) throw( uno::RuntimeException )
{
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 408372ff72f3..05c50fdde8ed 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2,7 +2,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
@@ -992,8 +992,8 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException)
}
//FIXME why is CheckForOwnMember duplicated in some insert methods?
-// Description: Checks if pRange/pCursor are member of the same text interface.
-// Only one of the pointers has to be set!
+// Description: Checks if pRange/pCursor are member of the same text interface.
+// Only one of the pointers has to be set!
bool SwXText::Impl::CheckForOwnMember(
const SwPaM & rPaM)
throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -1654,11 +1654,20 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
SfxItemSet aFrameItemSet(m_pImpl->m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
0 );
-
+ // If there is no content in the frame the shape is in
+ // it gets deleted in the DelFullPara call below,
+ // In this case insert a tmp text node ( we delete it later )
+ if ( aStartPam.Start()->nNode == pEndPam->Start()->nNode
+ && aStartPam.End()->nNode == pEndPam->End()->nNode )
+ {
+ SwPosition aEnd(*aStartPam.End());
+ bParaAfterInserted = GetDoc()->AppendTxtNode( aEnd );
+ pEndPam->DeleteMark();
+ *pEndPam->GetPoint() = aEnd;
+ }
aStartPam.SetMark();
*aStartPam.End() = *pEndPam->End();
pEndPam.reset(0);
-
SwXTextFrame *const pNewFrame = new SwXTextFrame(m_pImpl->m_pDoc);
const uno::Reference< text::XTextFrame > xNewFrame = pNewFrame;
pNewFrame->SetSelection( aStartPam );
@@ -1788,13 +1797,13 @@ void SwXText::copyText(
SwXText* pText = 0;
pText = reinterpret_cast< SwXText* >(
sal::static_int_cast< sal_IntPtr >( xTTunnel->getSomething( SwXText::getUnoTunnelId()) ));
-
+
uno::Reference< text::XText > xText( xSource, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextCursor > xCursor = xText->createTextCursor( );
xCursor->gotoEnd( sal_True );
-
+
uno::Reference< lang::XUnoTunnel > xTunnel( xCursor, uno::UNO_QUERY_THROW );
-
+
OTextCursorHelper* pCursor = 0;
pCursor = reinterpret_cast< OTextCursorHelper* >(
sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
@@ -1831,26 +1840,26 @@ void SwXText::Impl::ConvertCell(
{
throw lang::IllegalArgumentException();
}
-
- SwNodeRange aTmpRange(aStartCellPam.Start()->nNode,
+
+ SwNodeRange aTmpRange(aStartCellPam.Start()->nNode,
aEndCellPam.End()->nNode);
- SwNodeRange * pCorrectedRange =
+ SwNodeRange * pCorrectedRange =
m_pDoc->GetNodes().ExpandRangeForTableBox(aTmpRange);
-
+
if (pCorrectedRange != NULL)
{
SwPaM aNewStartPaM(pCorrectedRange->aStart, 0);
aStartCellPam = aNewStartPaM;
-
- xub_StrLen nEndLen = 0;
+
+ xub_StrLen nEndLen = 0;
SwTxtNode * pTxtNode = pCorrectedRange->aEnd.GetNode().GetTxtNode();
if (pTxtNode != NULL)
nEndLen = pTxtNode->Len();
-
+
SwPaM aNewEndPaM(pCorrectedRange->aEnd, nEndLen);
aEndCellPam = aNewEndPaM;
}
-
+
/** check the nodes between start and end
it is allowed to have pairs of StartNode/EndNodes
*/
@@ -2541,7 +2550,7 @@ SwXBodyText::hasElements() throw (uno::RuntimeException)
}
/******************************************************************
- * SwXHeadFootText
+ * SwXHeadFootText
******************************************************************/
class SwXHeadFootText::Impl
: public SwClient
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index a4260ed63d19..e4cfb912fbd5 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -2,7 +2,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
@@ -65,12 +65,12 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo
return xProp;
}
-void SAL_CALL SwXTextMarkup::commitTextMarkup(
- ::sal_Int32 nType,
- const ::rtl::OUString & rIdentifier,
- ::sal_Int32 nStart,
- ::sal_Int32 nLength,
- const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
+void SAL_CALL SwXTextMarkup::commitTextMarkup(
+ ::sal_Int32 nType,
+ const ::rtl::OUString & rIdentifier,
+ ::sal_Int32 nStart,
+ ::sal_Int32 nLength,
+ const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -94,7 +94,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup(
pWList = new SwWrongList( WRONGLIST_SPELL );
mpTxtNode->SetWrong( pWList );
}
- }
+ }
else if ( nType == text::TextMarkupType::PROOFREADING || nType == text::TextMarkupType::SENTENCE )
{
IGrammarContact *pGrammarContact = getGrammarContact( *mpTxtNode );
@@ -223,7 +223,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup(
if( nType == text::TextMarkupType::SENTENCE )
((SwGrammarMarkUp*)pWList)->setSentence( static_cast< xub_StrLen >(nStart) );
else
- pWList->Insert( rIdentifier, xMarkupInfoContainer,
+ pWList->Insert( rIdentifier, xMarkupInfoContainer,
static_cast< xub_StrLen >(nStart), static_cast< xub_StrLen >(nLength) );
}
@@ -232,14 +232,14 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup(
}
-void lcl_commitGrammarMarkUp(
+void lcl_commitGrammarMarkUp(
const ModelToViewHelper::ConversionMap* pConversionMap,
SwGrammarMarkUp* pWList,
- ::sal_Int32 nType,
- const ::rtl::OUString & rIdentifier,
- ::sal_Int32 nStart,
- ::sal_Int32 nLength,
- const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
+ ::sal_Int32 nType,
+ const ::rtl::OUString & rIdentifier,
+ ::sal_Int32 nStart,
+ ::sal_Int32 nLength,
+ const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
{
OSL_ENSURE( nType == text::TextMarkupType::PROOFREADING || nType == text::TextMarkupType::SENTENCE, "Wrong mark-up type" );
const ModelToViewHelper::ModelPosition aStartPos =
@@ -322,14 +322,14 @@ void lcl_commitGrammarMarkUp(
if( nType == text::TextMarkupType::SENTENCE )
((SwGrammarMarkUp*)pWList)->setSentence( static_cast< xub_StrLen >(nStart+nLength) );
else
- pWList->Insert( rIdentifier, xMarkupInfoContainer,
+ pWList->Insert( rIdentifier, xMarkupInfoContainer,
static_cast< xub_StrLen >(nStart), static_cast< xub_StrLen >(nLength) );
}
}
void SAL_CALL SwXTextMarkup::commitMultiTextMarkup(
- const uno::Sequence< text::TextMarkupDescriptor > &rMarkups )
+ const uno::Sequence< text::TextMarkupDescriptor > &rMarkups )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -358,11 +358,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
nSentenceMarkUpIndex = i;
else // there is already one sentence markup
throw lang::IllegalArgumentException();
- }
+ }
else if( pMarkups[i].nType != text::TextMarkupType::PROOFREADING )
return;
}
-
+
if( nSentenceMarkUpIndex == -1 )
return;
@@ -391,18 +391,18 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if( pWList->GetBeginInv() < STRING_LEN )
{
const ModelToViewHelper::ModelPosition aSentenceEnd =
- ModelToViewHelper::ConvertToModelPosition( mpConversionMap,
+ ModelToViewHelper::ConvertToModelPosition( mpConversionMap,
pMarkups[nSentenceMarkUpIndex].nOffset + pMarkups[nSentenceMarkUpIndex].nLength );
bAcceptGrammarError = (xub_StrLen)aSentenceEnd.mnPos > pWList->GetBeginInv();
pWList->ClearGrammarList( (xub_StrLen)aSentenceEnd.mnPos );
}
-
+
if( bAcceptGrammarError )
{
for( i = 0; i < nLen; ++i )
{
const text::TextMarkupDescriptor &rDesc = pMarkups[i];
- lcl_commitGrammarMarkUp( mpConversionMap, pWList, rDesc.nType,
+ lcl_commitGrammarMarkUp( mpConversionMap, pWList, rDesc.nType,
rDesc.aIdentifier, rDesc.nOffset, rDesc.nLength, rDesc.xMarkupInfoContainer );
}
}
@@ -411,7 +411,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
bRepaint = false;
i = nSentenceMarkUpIndex;
const text::TextMarkupDescriptor &rDesc = pMarkups[i];
- lcl_commitGrammarMarkUp( mpConversionMap, pWList, rDesc.nType,
+ lcl_commitGrammarMarkUp( mpConversionMap, pWList, rDesc.nType,
rDesc.aIdentifier, rDesc.nOffset, rDesc.nLength, rDesc.xMarkupInfoContainer );
}
@@ -419,7 +419,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
finishGrammarCheck( *mpTxtNode );
return;
-}
+}
void SwXTextMarkup::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ )
@@ -429,7 +429,7 @@ void SwXTextMarkup::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ )
if ( pRegisteredIn )
pRegisteredIn->Remove( this );
// <--
-
+
SolarMutexGuard aGuard;
mpTxtNode = 0;
}
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 92c93a47e3d8..62ed0a4f0e90 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -2,7 +2,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
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index e13fb5331097..e77371e70bbf 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -1,9 +1,9 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/**************************************************************************
+/**************************************************************************
*
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ SwRenderData::~SwRenderData()
DBG_ASSERT( !m_pPostItShell, "m_pPostItShell should already have been deleted" );
DBG_ASSERT( !m_pPostItDoc, "m_pPostItDoc should already have been deleted" );
DBG_ASSERT( !m_pPostItFields, " should already have been deleted" );
-}
+}
void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev )
@@ -97,7 +97,7 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt,
m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, &aViewOpt, pOutDev );
}
-
+
void SwRenderData::DeletePostItData()
{
@@ -110,7 +110,7 @@ void SwRenderData::DeletePostItData()
m_pPostItShell = 0;
m_pPostItFields = 0;
}
-}
+}
bool SwRenderData::NeedNewViewOptionAdjust( const SwWrtShell& rCompare ) const
{
@@ -126,7 +126,7 @@ void SwRenderData::ViewOptionAdjustStart( SwWrtShell &rSh, const SwViewOption &r
}
m_pViewOptionAdjust = new SwViewOptionAdjust_Impl( rSh, rViewOptions );
}
-
+
void SwRenderData::ViewOptionAdjust( const SwPrtOptions *pPrtOptions )
{
@@ -140,20 +140,20 @@ void SwRenderData::ViewOptionAdjustStop()
{
delete m_pViewOptionAdjust;
m_pViewOptionAdjust = 0;
- }
+ }
}
-void SwRenderData::MakeSwPrtOptions(
+void SwRenderData::MakeSwPrtOptions(
SwPrtOptions &rOptions,
const SwDocShell *pDocShell,
const SwPrintUIOptions *pOpt,
- const SwRenderData *pData,
+ const SwRenderData *pData,
bool bIsPDFExport )
{
if (!pDocShell || !pOpt || !pData)
return;
-
+
// get default print options
const TypeId aSwWebDocShellTypeId = TYPE(SwWebDocShell);
BOOL bWeb = pDocShell->IsA( aSwWebDocShellTypeId );
@@ -175,7 +175,7 @@ void SwRenderData::MakeSwPrtOptions(
rOptions.bPrintProspectRTL = pOpt->IsPrintProspectRTL();
// bPrintSingleJobs <-- not set here; mail merge and or configuration
// bModified <-- not set here; mail merge only
- rOptions.bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
+ rOptions.bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
rOptions.bPrintHiddenText = pOpt->IsPrintHiddenText();
rOptions.bPrintTextPlaceholder = pOpt->IsPrintTextPlaceholders();
rOptions.nPrintPostIts = pOpt->GetPrintPostItsType();
@@ -185,7 +185,7 @@ void SwRenderData::MakeSwPrtOptions(
rOptions.SetPrintUIOptions( pOpt );
rOptions.SetRenderData( pData );
- // rOptions.aMulti is not used anymore in the XRenderable API
+ // rOptions.aMulti is not used anymore in the XRenderable API
// Thus we set it to a dummy value here.
rOptions.aMulti = MultiSelection( Range( 1, 1 ) );
@@ -196,15 +196,15 @@ void SwRenderData::MakeSwPrtOptions(
if (bIsPDFExport)
rOptions.bPrintSelection = FALSE;
}
-
+
//////////////////////////////////////////////////////////////////////
-SwPrintUIOptions::SwPrintUIOptions(
- bool bWeb,
- bool bSwSrcView,
- bool bHasSelection,
- bool bHasPostIts,
+SwPrintUIOptions::SwPrintUIOptions(
+ bool bWeb,
+ bool bSwSrcView,
+ bool bHasSelection,
+ bool bHasPostIts,
const SwPrintData &rDefaultPrintData ) :
m_pLast( NULL ),
m_rDefaultPrintData( rDefaultPrintData )
@@ -214,7 +214,7 @@ SwPrintUIOptions::SwPrintUIOptions(
DBG_ASSERT( aLocalizedStrings.Count() >= 44, "resource incomplete" );
if( aLocalizedStrings.Count() < 44 ) // bad resource ?
return;
-
+
// printing HTML sources does not have any valid UI options.
// Its just the source code that gets printed ...
if (bSwSrcView)
@@ -222,7 +222,7 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties.realloc( 0 );
return;
}
-
+
// check if CTL is enabled
SvtLanguageOptions aLangOpt;
bool bCTL = aLangOpt.IsCTLFontEnabled();
@@ -238,10 +238,10 @@ SwPrintUIOptions::SwPrintUIOptions(
SvtModuleOptions aModOpt;
String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
- aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) );
+ aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) );
m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
- // create sub section for Contents
+ // create sub section for Contents
m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() );
// create a bool option for background
@@ -323,7 +323,7 @@ SwPrintUIOptions::SwPrintUIOptions(
rtl::OUString(),
aPrintRangeOpt
);
-
+
// create a choice for the content to create
rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
uno::Sequence< rtl::OUString > aChoices( bHasSelection ? 3 : 2 );
@@ -349,7 +349,7 @@ SwPrintUIOptions::SwPrintUIOptions(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
rtl::OUString(),
aPageRangeOpt
- );
+ );
// print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) );
@@ -377,7 +377,7 @@ SwPrintUIOptions::SwPrintUIOptions(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
aAnnotOpt
);
-
+
// create subsection for Page settings
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
aPageSetOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) );
@@ -398,7 +398,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// 0 : all pages (left & right)
// 1 : left pages
// 2 : right pages
- DBG_ASSERT( rDefaultPrintData.IsPrintLeftPage() || rDefaultPrintData.IsPrintRightPage(),
+ DBG_ASSERT( rDefaultPrintData.IsPrintLeftPage() || rDefaultPrintData.IsPrintRightPage(),
"unexpected value combination" );
sal_Int16 nPagesChoice = 0;
if (rDefaultPrintData.IsPrintLeftPage() && !rDefaultPrintData.IsPrintRightPage())
@@ -408,12 +408,12 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 32 ),
aRLHelp,
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintLeftRightPages" ) ),
- aRLChoices,
- nPagesChoice,
+ aRLChoices,
+ nPagesChoice,
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) )
);
}
-
+
// create a bool option for brochure
bDefaultVal = rDefaultPrintData.IsPrintProspect();
rtl::OUString aBrochurePropertyName( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) );
@@ -423,7 +423,7 @@ SwPrintUIOptions::SwPrintUIOptions(
bDefaultVal,
aPageSetOpt
);
-
+
if (bCTL)
{
// create a bool option for brochure RTL dependent on brochure
@@ -439,13 +439,13 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( rtl::OUString(),
uno::Sequence< rtl::OUString >(),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ),
- aBRTLChoices,
- nBRTLChoice,
+ aBRTLChoices,
+ nBRTLChoice,
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
aBrochureRTLOpt
);
}
-
+
DBG_ASSERT( nIdx == nNumProps, "number of added properties is not as expected" );
}
@@ -454,7 +454,7 @@ SwPrintUIOptions::SwPrintUIOptions(
SwPrintUIOptions::~SwPrintUIOptions()
{
}
-
+
bool SwPrintUIOptions::IsPrintLeftPages() const
{
// take care of different property names for the option.
@@ -485,7 +485,7 @@ bool SwPrintUIOptions::IsPrintEmptyPages( bool bIsPDFExport ) const
// take care of different property names for the option.
bool bRes = bIsPDFExport ?
- !getBoolValue( "IsSkipEmptyPages", sal_True ) :
+ !getBoolValue( "IsSkipEmptyPages", sal_True ) :
getBoolValue( "PrintEmptyPages", sal_True );
return bRes;
}
@@ -539,7 +539,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea
bChanged = bChanged || (pOut != m_pLast);
if( pOut )
m_pLast = pOut;
-
+
return bChanged;
}
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 351382dbdb00..a1e2d450f092 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -2,7 +2,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
@@ -190,9 +190,9 @@ BOOL SwViewImp::IsDragPossible( const Point &rPoint )
else
aRect = GetShell()->GetLayout()->Frm();
- aRect.Top( aRect.Top() - WIEDUWILLST );
+ aRect.Top( aRect.Top() - WIEDUWILLST );
aRect.Bottom( aRect.Bottom() + WIEDUWILLST );
- aRect.Left( aRect.Left() - WIEDUWILLST );
+ aRect.Left( aRect.Left() - WIEDUWILLST );
aRect.Right( aRect.Right() + WIEDUWILLST );
return aRect.IsInside( rPoint );
}
@@ -227,9 +227,9 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
{
const SwContact *pCont = (SwContact*)GetUserCall(pObj);
//JP - 16.3.00 Bug 73920: this function might be called by the
- // InsertDocument, when a PageDesc-Attribute is
- // set on a node. Then the SdrObject must not have
- // an UserCall.
+ // InsertDocument, when a PageDesc-Attribute is
+ // set on a node. Then the SdrObject must not have
+ // an UserCall.
if( !pCont || !pCont->ISA(SwDrawContact) )
continue;
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 9dd089c1df4d..614e9adbdd9f 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -2,7 +2,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
@@ -353,7 +353,7 @@ void SwViewImp::InvalidateAccessibleCursorPosition( const SwFrm *pFrm )
}
void SwViewImp::InvalidateAccessibleEditableState( sal_Bool bAllShells,
- const SwFrm *pFrm )
+ const SwFrm *pFrm )
{
if( bAllShells )
{
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 2656b9bd84c2..5b7e034885f2 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -2,7 +2,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
@@ -49,7 +49,7 @@
#include <hints.hxx>
#include <fntcache.hxx>
-#include <statstr.hrc> // Text fuer SfxProgress
+#include <statstr.hrc> // Text fuer SfxProgress
#include <comcore.hrc>
#include <IDocumentFieldsAccess.hxx>
@@ -85,7 +85,7 @@ void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions
//#i14016# - consider empty pages on calculation of the scaling for a page to be printed.
-void ViewShell::PrintProspect(
+void ViewShell::PrintProspect(
OutputDevice *pOutDev,
const SwPrintData &rPrintData,
sal_Int32 nRenderer // the index in the vector of prospect pages to be printed
@@ -103,7 +103,7 @@ void ViewShell::PrintProspect(
// output device is now provided by a call from outside the Writer)
pPrinter->Push();
- std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
+ std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
rPrintData.GetRenderData().GetPagePairsForProspectPrinting()[ nRenderer ];
#if OSL_DEBUG_LEVEL > 1
DBG_ASSERT( rPagesToPrint.first == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.first ) == 1, "first Page not valid" );
@@ -112,7 +112,7 @@ void ViewShell::PrintProspect(
// create a new shell for the Printer
ViewShell aShell( *this, 0, pPrinter );
-
+
SET_CURR_SHELL( &aShell );
aShell.PrepareForPrint( rPrintData );
@@ -212,7 +212,7 @@ void ViewShell::PrintProspect(
Size aTmpPrtSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), aMapMode ) );
// calculate start point for equal border on all sides
- Point aSttPt( (aTmpPrtSize.Width() - nMaxColSz) / 2,
+ Point aSttPt( (aTmpPrtSize.Width() - nMaxColSz) / 2,
(aTmpPrtSize.Height() - nMaxRowSz) / 2 );
for( int nC = 0; nC < 2; ++nC )
{
@@ -236,7 +236,7 @@ void ViewShell::PrintProspect(
SwPaintQueue::Repaint();
//!! applying/modifying view options and formatting the dcoument should now only be done in getRendererCount!
-
+
pFntCache->Flush();
// restore settings of OutputDevice (should be done always now since the
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9bd24ca56b25..ae5a86e2a8cd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2,7 +2,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
@@ -614,7 +614,7 @@ void ViewShell::LayoutIdle()
ViewShell *pSh = this;
do
- { if ( !pSh->GetWin() )
+ { if ( !pSh->GetWin() )
return;
pSh = (ViewShell*)pSh->GetNext();
@@ -904,7 +904,7 @@ void ViewShell::SetFirstVisPageInvalid()
{
ViewShell *pSh = this;
do
- { pSh->Imp()->SetFirstVisPageInvalid();
+ { pSh->Imp()->SetFirstVisPageInvalid();
pSh = (ViewShell*)pSh->GetNext();
} while ( pSh != this );
@@ -1600,12 +1600,12 @@ BOOL ViewShell::CheckInvalidForPaint( const SwRect &rRect )
{
SwRegionRects aRegion( rRect );
for ( USHORT i = 0; i < pRegion->Count(); ++i )
- { const SwRect &rTmp = (*pRegion)[i];
+ { const SwRect &rTmp = (*pRegion)[i];
if ( !rRect.IsInside( rTmp ) )
{
InvalidateWindows( rTmp );
if ( rTmp.IsOver( VisArea() ) )
- { aRegion -= rTmp;
+ { aRegion -= rTmp;
bRet = TRUE;
}
}
@@ -1823,7 +1823,7 @@ void ViewShell::CheckBrowseView( BOOL bBrowseChgd )
SwPageFrm *pPg = (SwPageFrm*)GetLayout()->Lower();
do
- { pPg->InvalidateSize();
+ { pPg->InvalidateSize();
pPg->_InvalidatePrt();
pPg->InvaPercentLowers();
if ( bBrowseChgd )
@@ -1902,7 +1902,7 @@ void ViewShell::ApplyViewOptions( const SwViewOption &rOpt )
ViewShell *pSh = this;
do
- { pSh->StartAction();
+ { pSh->StartAction();
pSh = (ViewShell*)pSh->GetNext();
} while ( pSh != this );
@@ -1927,7 +1927,7 @@ void ViewShell::ApplyViewOptions( const SwViewOption &rOpt )
pSh = this;
do
- { pSh->EndAction();
+ { pSh->EndAction();
pSh = (ViewShell*)pSh->GetNext();
} while ( pSh != this );
@@ -1947,7 +1947,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
SET_CURR_SHELL( this );
- BOOL bReformat = FALSE;
+ BOOL bReformat = FALSE;
if( pOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
{
@@ -2052,7 +2052,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
ViewShell *pSh = (ViewShell*)this->GetNext();
BOOL bOnlineSpl = rOpt.IsOnlineSpell();
while( pSh != this )
- { pSh->pOpt->SetOnlineSpell( bOnlineSpl );
+ { pSh->pOpt->SetOnlineSpell( bOnlineSpl );
Window *pTmpWin = pSh->GetWin();
if( pTmpWin )
pTmpWin->Invalidate();
@@ -2140,7 +2140,7 @@ void ViewShell::SetRestoreActions(USHORT nSet)
DBG_ASSERT(!GetRestoreActions()||!nSet, "mehrfaches Restore der Actions ?");
Imp()->SetRestoreActions(nSet);
}
-USHORT ViewShell::GetRestoreActions() const
+USHORT ViewShell::GetRestoreActions() const
{
return Imp()->GetRestoreActions();
}
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index c0aaf60485e4..6540aa182020 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -2,7 +2,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
@@ -295,7 +295,7 @@ ViewShell::~ViewShell()
}
delete pImp;
- pImp = 0; // Set to zero, because ~SwFrm relies on it.
+ pImp = 0; // Set to zero, because ~SwFrm relies on it.
if ( pDoc )
{
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index dcd8ac49feab..a1dcb9ee3426 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -1,8 +1,8 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/**************************************************************************
+/**************************************************************************
*
* 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
@@ -81,7 +81,7 @@
#include <tabfrm.hxx>
#include <txtfrm.hxx> // MinPrtLine
#include <viscrs.hxx> // SwShellCrsr
-#include <fmtpdsc.hxx> // SwFmtPageDesc
+#include <fmtpdsc.hxx> // SwFmtPageDesc
#include <globals.hrc>
@@ -91,8 +91,8 @@ class SwQueuedPaint
{
public:
SwQueuedPaint *pNext;
- ViewShell *pSh;
- SwRect aRect;
+ ViewShell *pSh;
+ SwRect aRect;
SwQueuedPaint( ViewShell *pNew, const SwRect &rRect ) :
pNext( 0 ),
@@ -143,7 +143,7 @@ void SwPaintQueue::Repaint()
{
SwQueuedPaint *pPt = pQueue;
do
- { ViewShell *pSh = pPt->pSh;
+ { ViewShell *pSh = pPt->pSh;
SET_CURR_SHELL( pSh );
if ( pSh->IsPreView() )
{
@@ -161,7 +161,7 @@ void SwPaintQueue::Repaint()
} while ( pPt );
do
- { pPt = pQueue;
+ { pPt = pQueue;
pQueue = pQueue->pNext;
delete pPt;
} while ( pQueue );
@@ -371,7 +371,7 @@ SwDoc * ViewShell::CreatePrtDoc( SfxObjectShellRef &rDocShellRef)
if( pFESh->IsTableMode() )
{
SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
-
+
const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
if( pCntntFrm )
@@ -466,7 +466,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
if( pFESh->IsTableMode() )
{
SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
-
+
const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
if( pCntntFrm )
@@ -532,7 +532,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
}
-sal_Bool ViewShell::PrintOrPDFExport(
+sal_Bool ViewShell::PrintOrPDFExport(
OutputDevice *pOutDev,
const SwPrtOptions &rPrintData,
sal_Int32 nRenderer /* the index in the vector of pages to be printed */ )
@@ -578,7 +578,7 @@ sal_Bool ViewShell::PrintOrPDFExport(
pOutDevDoc = GetDoc();
pShell = new ViewShell( *this, 0, pOutDev );
}
-
+
SdrView *pDrawView = pShell->GetDrawView();
if (pDrawView)
{
@@ -640,9 +640,9 @@ sal_Bool ViewShell::PrintOrPDFExport(
pViewSh2 = nPage == 0 ? /* post-it page? */
rPrintData.GetRenderData().m_pPostItShell : pShell;
::SetSwVisArea( pViewSh2, pStPage->Frm() );
-
+
pStPage->GetUpper()->Paint( pStPage->Frm(), &rPrintData );
-
+
SwPaintQueue::Repaint();
}
@@ -744,8 +744,8 @@ SwDrawViewSave::~SwDrawViewSave()
void ViewShell::PrepareForPrint( const SwPrintData &rOptions )
{
pOpt->SetGraphic ( TRUE == rOptions.bPrintGraphic );
- pOpt->SetTable ( TRUE == rOptions.bPrintTable );
- pOpt->SetDraw ( TRUE == rOptions.bPrintDraw );
+ pOpt->SetTable ( TRUE == rOptions.bPrintTable );
+ pOpt->SetDraw ( TRUE == rOptions.bPrintDraw );
pOpt->SetControl ( TRUE == rOptions.bPrintControl );
pOpt->SetPageBack( TRUE == rOptions.bPrintPageBackground );
pOpt->SetBlackFont( TRUE == rOptions.bPrintBlackFont );
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 0c1601abcd28..8073ec4552e7 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -2,7 +2,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
@@ -65,9 +65,9 @@ class SwASC_AttrIter
public:
SwASC_AttrIter( SwASCWriter& rWrt, const SwTxtNode& rNd, xub_StrLen nStt );
- void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+ void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
- xub_StrLen WhereNext() const { return nAktSwPos; }
+ xub_StrLen WhereNext() const { return nAktSwPos; }
BOOL OutAttr( xub_StrLen nSwPos );
};
@@ -221,9 +221,9 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
*/
SwNodeFnTab aASCNodeFnTab = {
-/* RES_TXTNODE */ OutASC_SwTxtNode,
-/* RES_GRFNODE */ 0,
-/* RES_OLENODE */ 0
+/* RES_TXTNODE */ OutASC_SwTxtNode,
+/* RES_GRFNODE */ 0,
+/* RES_OLENODE */ 0
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index d304102ccfce..47cbe0a72638 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -2,7 +2,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
@@ -110,9 +110,9 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
pArr = new sal_Char [ ASC_BUFFLEN + 2 ];
pItemSet = new SfxItemSet( pDoc->GetAttrPool(),
- RES_CHRATR_FONT, RES_CHRATR_LANGUAGE,
- RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_LANGUAGE,
- RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE,
+ RES_CHRATR_FONT, RES_CHRATR_LANGUAGE,
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_LANGUAGE,
+ RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE,
0 );
// set defaults from the options
@@ -333,7 +333,7 @@ ULONG SwASCIIParser::ReadChars()
if( SVSTREAM_OK != rInput.GetError() || 0 == (lGCount =
rInput.Read( pArr + nArrOffset,
ASC_BUFFLEN - nArrOffset )))
- break; // aus der WHILE-Schleife heraus
+ break; // aus der WHILE-Schleife heraus
/*
#98380#
@@ -406,13 +406,13 @@ ULONG SwASCIIParser::ReadChars()
switch( *pStt )
{
//JP 12.11.2001: task 94636 - don't ignore all behind the zero character,
-// change it to the default "control character"
-// case 0:
-// pEnd = pStt;
-// bIns = false ;
-// break;
+// change it to the default "control character"
+// case 0:
+// pEnd = pStt;
+// bIns = false ;
+// break;
- case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() )
+ case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() )
{
bIns = false;
*pStt = 0;
@@ -424,7 +424,7 @@ ULONG SwASCIIParser::ReadChars()
}
break;
- case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() )
+ case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() )
{
bIns = false;
*pStt = 0;
@@ -476,7 +476,7 @@ ULONG SwASCIIParser::ReadChars()
*pStt = '#'; // Ersatzdarstellung
break;
- case '\t': break;
+ case '\t': break;
default:
if( ' ' > *pStt )
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index a2403bf4ae19..bb8c2eb570c2 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -2,7 +2,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
@@ -34,13 +34,13 @@
#include <pam.hxx>
#include <doc.hxx>
#include <ndtxt.hxx>
-#include <mdiexp.hxx> // ...Percent()
+#include <mdiexp.hxx> // ...Percent()
#include <docary.hxx>
#include <fmtcntnt.hxx>
#include <frmfmt.hxx>
#include <wrtasc.hxx>
-#include <statstr.hrc> // ResId fuer Statusleiste
+#include <statstr.hrc> // ResId fuer Statusleiste
//-----------------------------------------------------------------
@@ -58,12 +58,12 @@ SwASCWriter::SwASCWriter( const String& rFltNm )
if( 5 < rFltNm.Len() )
switch( rFltNm.Copy( 5 ).ToInt32() )
{
- case 437: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_437 ); break;
- case 850: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_850 ); break;
- case 860: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_860 ); break;
- case 861: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_861 ); break;
- case 863: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_863 ); break;
- case 865: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_865 ); break;
+ case 437: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_437 ); break;
+ case 850: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_850 ); break;
+ case 860: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_860 ); break;
+ case 861: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_861 ); break;
+ case 863: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_863 ); break;
+ case 865: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_865 ); break;
}
break;
@@ -102,7 +102,7 @@ ULONG SwASCWriter::WriteStream()
{
sal_Char cLineEnd[ 3 ];
sal_Char* pCEnd = cLineEnd;
- if( bASCII_ParaAsCR ) // falls vorgegeben ist.
+ if( bASCII_ParaAsCR ) // falls vorgegeben ist.
*pCEnd++ = '\015';
else if( bASCII_ParaAsBlanc )
*pCEnd++ = ' ';
@@ -110,8 +110,8 @@ ULONG SwASCWriter::WriteStream()
switch( GetAsciiOptions().GetParaFlags() )
{
case LINEEND_CR: *pCEnd++ = '\015'; break;
- case LINEEND_LF: *pCEnd++ = '\012'; break;
- case LINEEND_CRLF: *pCEnd++ = '\015', *pCEnd++ = '\012'; break;
+ case LINEEND_LF: *pCEnd++ = '\012'; break;
+ case LINEEND_CRLF: *pCEnd++ = '\015', *pCEnd++ = '\012'; break;
}
*pCEnd = 0;
@@ -166,7 +166,7 @@ ULONG SwASCWriter::WriteStream()
pCurPam = NewSwPaM( *pDoc, pIdx->GetIndex(),
pIdx->GetNode().EndOfSectionIndex() );
pCurPam->Exchange();
- continue; // while-Schleife neu aufsetzen !!
+ continue; // while-Schleife neu aufsetzen !!
}
}
else
@@ -194,7 +194,7 @@ ULONG SwASCWriter::WriteStream()
}
Out( aASCNodeFnTab, *pNd, *this );
}
- bTstFly = FALSE; // eimal Testen reicht
+ bTstFly = FALSE; // eimal Testen reicht
}
if( !pCurPam->Move( fnMoveForward, fnGoNode ) )
@@ -205,7 +205,7 @@ ULONG SwASCWriter::WriteStream()
pDoc->GetDocShell() ); // Wie weit ?
}
- } while( CopyNextPam( &pPam ) ); // bis alle Pam bearbeitet
+ } while( CopyNextPam( &pPam ) ); // bis alle Pam bearbeitet
Strm().SetStreamCharSet( eOld );
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index e260f9546c81..3942fa7cd6c0 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.hxx
@@ -2,7 +2,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
@@ -50,6 +50,6 @@ public:
};
-#endif // _WRTASC_HXX
+#endif // _WRTASC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx
index 3d1543c413ec..7c511fbb92f8 100644
--- a/sw/source/filter/basflt/docfact.cxx
+++ b/sw/source/filter/basflt/docfact.cxx
@@ -2,7 +2,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
@@ -37,10 +37,10 @@
/******************************************************************************
- * Methode : SwDocFac::SwDocFac( SwDoc *pDoc )
- * Beschreibung:
- * Erstellt : OK 01-24-94 11:32am
- * Aenderung : OK 01-24-94 11:32am
+ * Methode : SwDocFac::SwDocFac( SwDoc *pDoc )
+ * Beschreibung:
+ * Erstellt : OK 01-24-94 11:32am
+ * Aenderung : OK 01-24-94 11:32am
******************************************************************************/
@@ -52,10 +52,10 @@ SwDocFac::SwDocFac( SwDoc *pDc )
}
/******************************************************************************
- * Methode : SwDocFac::~SwDocFac()
- * Beschreibung:
- * Erstellt : OK 01-24-94 11:33am
- * Aenderung : OK 01-24-94 11:33am
+ * Methode : SwDocFac::~SwDocFac()
+ * Beschreibung:
+ * Erstellt : OK 01-24-94 11:33am
+ * Aenderung : OK 01-24-94 11:33am
******************************************************************************/
@@ -66,10 +66,10 @@ SwDocFac::~SwDocFac()
}
/******************************************************************************
- * Methode : SwDoc *SwDocFac::GetDoc()
- * Beschreibung: Diese Methode legt immer einen Drucker an.
- * Erstellt : OK 01-24-94 11:34am
- * Aenderung : OK 01-24-94 11:34am
+ * Methode : SwDoc *SwDocFac::GetDoc()
+ * Beschreibung: Diese Methode legt immer einen Drucker an.
+ * Erstellt : OK 01-24-94 11:34am
+ * Aenderung : OK 01-24-94 11:34am
******************************************************************************/
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 2e1b53fea8bc..9676bd3fc993 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -31,7 +31,7 @@
#define _SVSTDARR_STRINGS
#include <string.h>
-#include <stdio.h> // sscanf
+#include <stdio.h> // sscanf
#include <hintids.hxx>
#include <i18npool/lang.h>
#include <i18npool/mslangid.hxx>
@@ -301,7 +301,7 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium,
else
nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll );
- pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !!
+ pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !!
}
else
{
@@ -389,7 +389,7 @@ BOOL SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOptions*
</FilterFlags>
*/
-#define FILTER_OPTION_ROOT String::CreateFromAscii( \
+#define FILTER_OPTION_ROOT String::CreateFromAscii( \
RTL_CONSTASCII_STRINGPARAM( "Office.Writer/FilterFlags" ) )
SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames,
@@ -888,10 +888,10 @@ String NameFromCharSet(rtl_TextEncoding nChrSet)
// for the automatic conversion (mail/news/...)
// The user data contains the options for the ascii import/export filter.
// The format is:
-// 1. CharSet - as ascii chars
-// 2. LineEnd - as CR/LR/CRLF
-// 3. Fontname
-// 4. Language
+// 1. CharSet - as ascii chars
+// 2. LineEnd - as CR/LR/CRLF
+// 3. Fontname
+// 4. Language
// the delimetercharacter is ","
//
@@ -905,10 +905,10 @@ void SwAsciiOptions::ReadUserData( const String& rStr )
{
switch( nCnt )
{
- case 0: // CharSet
+ case 0: // CharSet
eCharSet = CharSetFromName(sToken);
break;
- case 1: // LineEnd
+ case 1: // LineEnd
if( sToken.EqualsIgnoreCaseAscii( "CRLF" ))
eCRLF_Flag = LINEEND_CRLF;
else if( sToken.EqualsIgnoreCaseAscii( "LF" ))
@@ -916,10 +916,10 @@ void SwAsciiOptions::ReadUserData( const String& rStr )
else
eCRLF_Flag = LINEEND_CR;
break;
- case 2: // fontname
+ case 2: // fontname
sFont = sToken;
break;
- case 3: // Language
+ case 3: // Language
nLanguage = MsLangId::convertIsoStringToLanguage( sToken );
break;
}
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index ca128c7c38c1..8dd56acc256e 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 09647719165a..5543e56c7e4d 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -2,7 +2,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
@@ -49,8 +49,8 @@
#include <doc.hxx>
#include <pam.hxx>
#include <editsh.hxx>
-#include <undobj.hxx> // fuer Undo Insert-Dokument
-#include <swundo.hxx> // fuer Undo Insert-Dokument
+#include <undobj.hxx> // fuer Undo Insert-Dokument
+#include <swundo.hxx> // fuer Undo Insert-Dokument
#include <swtable.hxx>
#include <tblsel.hxx>
#include <pagedesc.hxx>
@@ -196,7 +196,7 @@ ULONG SwReader::Read( const Reader& rOptions )
pDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE );
- if( !IsError( nError )) // dann setzen wir das Ende mal richtig
+ if( !IsError( nError )) // dann setzen wir das Ende mal richtig
{
aEndPos--;
pCNd = aEndPos.GetNode().GetCntntNode();
@@ -341,8 +341,8 @@ ULONG SwReader::Read( const Reader& rOptions )
/*
* !!! man muss selbst den Status vom Stream zuruecksetzen. !!!
- * Beim seekg wird der akt. Status, eof- und bad-Bit
- * gesetzt, warum weiss keiner
+ * Beim seekg wird der akt. Status, eof- und bad-Bit
+ * gesetzt, warum weiss keiner
*/
if( pStrm )
{
@@ -375,7 +375,7 @@ ULONG SwReader::Read( const Reader& rOptions )
// Wenn der Pam nur fuers Lesen konstruiert wurde, jetzt zerstoeren.
if( !pCrsr )
{
- delete pPam; // ein neues aufgemacht.
+ delete pPam; // ein neues aufgemacht.
// --> FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
// SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
@@ -393,7 +393,7 @@ ULONG SwReader::Read( const Reader& rOptions )
pDoc->SetRedlineMode_intern( eOld );
pDoc->SetOle2Link( aOLELink );
- if( pCrsr ) // das Doc ist jetzt modifiziert
+ if( pCrsr ) // das Doc ist jetzt modifiziert
pDoc->SetModified();
// --> OD 2005-02-11 #i38810# - If links have been updated, the document
// have to be modified. During update of links the OLE link at the document
@@ -546,7 +546,7 @@ SwDoc* Reader::GetTemplateDoc()
{
pTemplate = pDocSh->GetDoc();
pTemplate->SetOle2Link( Link() );
- pTemplate->DoUndo( FALSE ); // always FALSE
+ pTemplate->DoUndo( FALSE ); // always FALSE
pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode );
pTemplate->RemoveAllFmtLanguageDependencies();
@@ -612,7 +612,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode );
pTemplate->getPrinter( true );
pTemplate->RemoveAllFmtLanguageDependencies();
- aChkDateTime = Date( 1, 1, 2300 ); // 2300. Jahrtausend sollte reichen
+ aChkDateTime = Date( 1, 1, 2300 ); // 2300. Jahrtausend sollte reichen
aTemplateNm.AssignAscii( "$$Dummy$$" );
}
@@ -968,7 +968,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
}
else
{
- delete pPam; // loesche den hier erzeugten Pam
+ delete pPam; // loesche den hier erzeugten Pam
// Alles erfolgreich geschrieben? Sag' das dem Dokument!
if ( !IsError( nError ) && !pDoc )
{
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 6caa08440fbe..238524a6bb66 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index e5392e0668f8..8c819ccdf8cf 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2,7 +2,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
@@ -123,18 +123,18 @@
#define HTML_HEADSPACE (12*20)
-#define CSS1_BACKGROUND_ATTR 1
-#define CSS1_BACKGROUND_PAGE 2
-#define CSS1_BACKGROUND_TABLE 3
-#define CSS1_BACKGROUND_FLY 4
-#define CSS1_BACKGROUND_SECTION 5
+#define CSS1_BACKGROUND_ATTR 1
+#define CSS1_BACKGROUND_PAGE 2
+#define CSS1_BACKGROUND_TABLE 3
+#define CSS1_BACKGROUND_FLY 4
+#define CSS1_BACKGROUND_SECTION 5
-#define CSS1_FRMSIZE_WIDTH 0x01
-#define CSS1_FRMSIZE_VARHEIGHT 0x02
-#define CSS1_FRMSIZE_MINHEIGHT 0x04
-#define CSS1_FRMSIZE_FIXHEIGHT 0x08
-#define CSS1_FRMSIZE_ANYHEIGHT 0x0e
-#define CSS1_FRMSIZE_PIXEL 0x10
+#define CSS1_FRMSIZE_WIDTH 0x01
+#define CSS1_FRMSIZE_VARHEIGHT 0x02
+#define CSS1_FRMSIZE_MINHEIGHT 0x04
+#define CSS1_FRMSIZE_FIXHEIGHT 0x08
+#define CSS1_FRMSIZE_ANYHEIGHT 0x0e
+#define CSS1_FRMSIZE_PIXEL 0x10
using namespace ::com::sun::star;
@@ -341,8 +341,8 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
OSL_ENSURE( FUNIT_MM == eUnit, "Masseinheit wird nicht unterstuetzt" );
case FUNIT_MM:
// 0.01mm = 0.57twip
- nMul = 25400; // 25.4 * 1000
- nDiv = 1440; // 72 * 20;
+ nMul = 25400; // 25.4 * 1000
+ nDiv = 1440; // 72 * 20;
nFac = 100;
pUnit = sCSS1_UNIT_mm;
break;
@@ -353,13 +353,13 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
case FUNIT_CM:
#ifdef EXACT_VALUES
// 0.001cm = 0.57twip
- nMul = 25400; // 2.54 * 10000
- nDiv = 1440; // 72 * 20;
+ nMul = 25400; // 2.54 * 10000
+ nDiv = 1440; // 72 * 20;
nFac = 1000;
#else
// 0.01cm = 5.7twip (ist zwar ungenau, aber die UI ist auch ungenau)
- nMul = 2540; // 2.54 * 1000
- nDiv = 1440; // 72 * 20;
+ nMul = 2540; // 2.54 * 1000
+ nDiv = 1440; // 72 * 20;
nFac = 100;
#endif
pUnit = sCSS1_UNIT_cm;
@@ -391,7 +391,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
#else
// 0.01pc = 2.40twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 1000;
- nDiv = 240; // 12 * 20;
+ nDiv = 240; // 12 * 20;
nFac = 100;
#endif
pUnit = sCSS1_UNIT_pc;
@@ -408,12 +408,12 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
#ifdef EXACT_VALUES
// 0.0001in = 0.144twip
nMul = 100000;
- nDiv = 1440; // 72 * 20;
+ nDiv = 1440; // 72 * 20;
nFac = 10000;
#else
// 0.01in = 14.4twip (ist zwar ungenau, aber die UI ist auch ungenau)
nMul = 1000;
- nDiv = 1440; // 72 * 20;
+ nDiv = 1440; // 72 * 20;
nFac = 100;
#endif
pUnit = sCSS1_UNIT_inch;
@@ -758,13 +758,13 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
// OOO_STRING_SVTOOLS_HTML_insertedtext
// OOO_STRING_SVTOOLS_HTML_language
// OOO_STRING_SVTOOLS_HTML_person
- case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) )
+ case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) )
{
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote );
}
break;
- case 'C': if( bChrFmt )
+ case 'C': if( bChrFmt )
{
if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) )
{
@@ -778,7 +778,7 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
}
}
break;
- case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) )
+ case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) )
{
rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance);
@@ -809,23 +809,23 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
}
}
break;
- case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) )
+ case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) )
{
rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis );
}
break;
- case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) )
+ case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) )
// HR nicht ausgeben!
bStop = (nDeep==0);
break;
- case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) )
+ case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) )
{
rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard );
}
break;
- case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) )
+ case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) )
{
// Listing als PRE exportieren bzw. von
// PRE abgeleitete Vorlage exportieren
@@ -834,13 +834,13 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
nDeep = CSS1_FMT_CMPREF;
}
break;
- case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) )
+ case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) )
{
rRefPoolId = RES_POOLCOLL_HTML_PRE;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt );
}
break;
- case 'S': if( bChrFmt )
+ case 'S': if( bChrFmt )
{
if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) )
{
@@ -854,19 +854,19 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
}
}
break;
- case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) )
+ case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) )
{
rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype );
}
break;
- case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) )
+ case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) )
{
rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable );
}
break;
- case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) )
+ case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) )
{
// XMP als PRE exportieren (aber nicht die
// Vorlage als Style)
@@ -1139,7 +1139,7 @@ const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, USHORT nDeep )
BOOL lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 )
{
- return ((const SvxFontItem &)r1).GetFamilyName() ==
+ return ((const SvxFontItem &)r1).GetFamilyName() ==
((const SvxFontItem &)r2).GetFamilyName() &&
((const SvxFontItem &)r1).GetFamily() ==
((const SvxFontItem &)r2).GetFamily();
@@ -1153,7 +1153,7 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet,
{
OSL_ENSURE( bSetDefaults || bClearSame,
"SwHTMLWriter::SubtractItemSet: Bei diesen Flags passiert nix" );
- SfxItemSet aRefItemSet( *rRefItemSet.GetPool(), rRefItemSet.GetRanges() );
+ SfxItemSet aRefItemSet( *rRefItemSet.GetPool(), rRefItemSet.GetRanges() );
aRefItemSet.Set( rRefItemSet );
// und mit dem Attr-Set der Vorlage vergleichen
@@ -1288,11 +1288,11 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
const sal_Char *pStr = 0;
switch( rFontItem.GetFamily() )
{
- case FAMILY_ROMAN: pStr = sCSS1_PV_serif; break;
- case FAMILY_SWISS: pStr = sCSS1_PV_sans_serif; break;
- case FAMILY_SCRIPT: pStr = sCSS1_PV_cursive; break;
- case FAMILY_DECORATIVE: pStr = sCSS1_PV_fantasy; break;
- case FAMILY_MODERN: pStr = sCSS1_PV_monospace; break;
+ case FAMILY_ROMAN: pStr = sCSS1_PV_serif; break;
+ case FAMILY_SWISS: pStr = sCSS1_PV_sans_serif; break;
+ case FAMILY_SCRIPT: pStr = sCSS1_PV_cursive; break;
+ case FAMILY_DECORATIVE: pStr = sCSS1_PV_fantasy; break;
+ case FAMILY_MODERN: pStr = sCSS1_PV_monospace; break;
default:
;
}
@@ -1311,12 +1311,12 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
{
static sal_uInt16 aWhichIds[] =
{
- RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT,
- RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE,
- RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
- RES_CHRATR_POSTURE, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_POSTURE,
- RES_CHRATR_WEIGHT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_CTL_WEIGHT,
- 0, 0, 0
+ RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT,
+ RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE,
+ RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
+ RES_CHRATR_POSTURE, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_POSTURE,
+ RES_CHRATR_WEIGHT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_CTL_WEIGHT,
+ 0, 0, 0
};
for( sal_uInt16 i=0; aWhichIds[i]; i += 3 )
@@ -1379,13 +1379,13 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
if( pDCCharFmt )
{
SfxItemSet aTstItemSet( *pDCCharFmt->GetAttrSet().GetPool(),
- RES_CHRATR_FONT, RES_CHRATR_FONT,
- RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
- RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
- RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
- RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT,
- RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT,
- RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
+ RES_CHRATR_FONT, RES_CHRATR_FONT,
+ RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
+ RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
+ RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT,
+ RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT,
+ RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
0 );
aTstItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True );
return HasScriptDependentItems( aTstItemSet, sal_False );
@@ -1650,7 +1650,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
USHORT nRefPoolId = 0;
USHORT nDeep = GetCSS1Selector( &rFmt, aSelector, nRefPoolId );
if( !nDeep )
- return rWrt; // von keiner HTML-Vorlage abgeleitet
+ return rWrt; // von keiner HTML-Vorlage abgeleitet
USHORT nPoolFmtId = rFmt.GetPoolFmtId();
@@ -1727,16 +1727,16 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
const String& rNm = rFmt.GetName();
switch( rNm.GetChar(0) )
{
- case 'D': if( rNm.EqualsAscii("DD 1") || rNm.EqualsAscii("DT 1") )
+ case 'D': if( rNm.EqualsAscii("DD 1") || rNm.EqualsAscii("DT 1") )
rHTMLWrt.nDfltBottomMargin = 0;
break;
- case 'L': if(rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_listing) )
+ case 'L': if(rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_listing) )
rHTMLWrt.nDfltBottomMargin = 0;
break;
- case 'P': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_preformtxt) )
+ case 'P': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_preformtxt) )
rHTMLWrt.nDfltBottomMargin = 0;
break;
- case 'X': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_xmp) )
+ case 'X': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_xmp) )
rHTMLWrt.nDfltBottomMargin = 0;
break;
}
@@ -1834,9 +1834,9 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
const sal_Char *pPseudo = 0;
switch( rPageDesc.GetPoolFmtId() )
{
- case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break;
- case RES_POOLPAGE_LEFT: pPseudo = sCSS1_left; break;
- case RES_POOLPAGE_RIGHT: pPseudo = sCSS1_right; break;
+ case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break;
+ case RES_POOLPAGE_LEFT: pPseudo = sCSS1_left; break;
+ case RES_POOLPAGE_RIGHT: pPseudo = sCSS1_right; break;
}
if( pPseudo )
{
@@ -2596,8 +2596,8 @@ static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt )
const sal_Char *pStr = 0;
switch( ((const SvxCaseMapItem&)rHt).GetCaseMap() )
{
- case SVX_CASEMAP_NOT_MAPPED: pStr = sCSS1_PV_normal; break;
- case SVX_CASEMAP_KAPITAELCHEN: pStr = sCSS1_PV_small_caps; break;
+ case SVX_CASEMAP_NOT_MAPPED: pStr = sCSS1_PV_normal; break;
+ case SVX_CASEMAP_KAPITAELCHEN: pStr = sCSS1_PV_small_caps; break;
default:
;
}
@@ -2656,8 +2656,8 @@ static Writer& OutCSS1_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nScript = CSS1_OUTMODE_WESTERN;
switch( rHt.Which() )
{
- case RES_CHRATR_CJK_FONT: nScript = CSS1_OUTMODE_CJK; break;
- case RES_CHRATR_CTL_FONT: nScript = CSS1_OUTMODE_CTL; break;
+ case RES_CHRATR_CJK_FONT: nScript = CSS1_OUTMODE_CJK; break;
+ case RES_CHRATR_CTL_FONT: nScript = CSS1_OUTMODE_CTL; break;
}
if( !rHTMLWrt.IsCSS1Script( nScript ) )
return rWrt;
@@ -2690,8 +2690,8 @@ static Writer& OutCSS1_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nScript = CSS1_OUTMODE_WESTERN;
switch( rHt.Which() )
{
- case RES_CHRATR_CJK_FONTSIZE: nScript = CSS1_OUTMODE_CJK; break;
- case RES_CHRATR_CTL_FONTSIZE: nScript = CSS1_OUTMODE_CTL; break;
+ case RES_CHRATR_CJK_FONTSIZE: nScript = CSS1_OUTMODE_CJK; break;
+ case RES_CHRATR_CTL_FONTSIZE: nScript = CSS1_OUTMODE_CTL; break;
}
if( !rHTMLWrt.IsCSS1Script( nScript ) )
return rWrt;
@@ -2720,8 +2720,8 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nScript = CSS1_OUTMODE_WESTERN;
switch( rHt.Which() )
{
- case RES_CHRATR_CJK_POSTURE: nScript = CSS1_OUTMODE_CJK; break;
- case RES_CHRATR_CTL_POSTURE: nScript = CSS1_OUTMODE_CTL; break;
+ case RES_CHRATR_CJK_POSTURE: nScript = CSS1_OUTMODE_CJK; break;
+ case RES_CHRATR_CTL_POSTURE: nScript = CSS1_OUTMODE_CTL; break;
}
if( !rHTMLWrt.IsCSS1Script( nScript ) )
return rWrt;
@@ -2729,8 +2729,8 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt )
const sal_Char *pStr = 0;
switch( ((const SvxPostureItem&)rHt).GetPosture() )
{
- case ITALIC_NONE: pStr = sCSS1_PV_normal; break;
- case ITALIC_OBLIQUE: pStr = sCSS1_PV_oblique; break;
+ case ITALIC_NONE: pStr = sCSS1_PV_normal; break;
+ case ITALIC_OBLIQUE: pStr = sCSS1_PV_oblique; break;
case ITALIC_NORMAL:
if( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) )
{
@@ -2770,7 +2770,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt )
}
// Breite als n.n pt
- nValue = (nValue + 1) / 2; // 1/10pt
+ nValue = (nValue + 1) / 2; // 1/10pt
sOut.Append( ByteString::CreateFromInt32( (sal_Int32)(nValue / 10) ) );
sOut.Append( '.' );
sOut.Append( ByteString::CreateFromInt32( (sal_Int32)(nValue % 10) ) );
@@ -2798,8 +2798,8 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nScript = CSS1_OUTMODE_WESTERN;
switch( rHt.Which() )
{
- case RES_CHRATR_CJK_LANGUAGE: nScript = CSS1_OUTMODE_CJK; break;
- case RES_CHRATR_CTL_LANGUAGE: nScript = CSS1_OUTMODE_CTL; break;
+ case RES_CHRATR_CJK_LANGUAGE: nScript = CSS1_OUTMODE_CJK; break;
+ case RES_CHRATR_CTL_LANGUAGE: nScript = CSS1_OUTMODE_CTL; break;
}
if( !rHTMLWrt.IsCSS1Script( nScript ) )
return rWrt;
@@ -2851,8 +2851,8 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nScript = CSS1_OUTMODE_WESTERN;
switch( rHt.Which() )
{
- case RES_CHRATR_CJK_WEIGHT: nScript = CSS1_OUTMODE_CJK; break;
- case RES_CHRATR_CTL_WEIGHT: nScript = CSS1_OUTMODE_CTL; break;
+ case RES_CHRATR_CJK_WEIGHT: nScript = CSS1_OUTMODE_CJK; break;
+ case RES_CHRATR_CTL_WEIGHT: nScript = CSS1_OUTMODE_CTL; break;
}
if( !rHTMLWrt.IsCSS1Script( nScript ) )
return rWrt;
@@ -2860,11 +2860,11 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
const sal_Char *pStr = 0;
switch( ((const SvxWeightItem&)rHt).GetWeight() )
{
- case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light; break;
- case WEIGHT_LIGHT: pStr = sCSS1_PV_light; break;
- case WEIGHT_SEMILIGHT: pStr = sCSS1_PV_demi_light; break;
- case WEIGHT_NORMAL: pStr = sCSS1_PV_normal; break;
- case WEIGHT_SEMIBOLD: pStr = sCSS1_PV_demi_bold; break;
+ case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light; break;
+ case WEIGHT_LIGHT: pStr = sCSS1_PV_light; break;
+ case WEIGHT_SEMILIGHT: pStr = sCSS1_PV_demi_light; break;
+ case WEIGHT_NORMAL: pStr = sCSS1_PV_normal; break;
+ case WEIGHT_SEMIBOLD: pStr = sCSS1_PV_demi_bold; break;
case WEIGHT_BOLD:
if( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) )
{
@@ -2875,7 +2875,7 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
pStr = sCSS1_PV_bold;
}
break;
- case WEIGHT_ULTRABOLD: pStr = sCSS1_PV_extra_bold; break;
+ case WEIGHT_ULTRABOLD: pStr = sCSS1_PV_extra_bold; break;
default:
pStr = sCSS1_PV_normal;;
}
@@ -2909,7 +2909,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
if( rHTMLWrt.bOutTable && rHTMLWrt.bCfgNetscape4 )
return rWrt;
- const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)rHt;
+ const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)rHt;
USHORT nHeight = 0;
USHORT nPrcHeight = 0;
@@ -2968,10 +2968,10 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
const sal_Char* pStr = 0;
switch( ((const SvxAdjustItem&)rHt).GetAdjust() )
{
- case SVX_ADJUST_LEFT: pStr = sCSS1_PV_left; break;
- case SVX_ADJUST_RIGHT: pStr = sCSS1_PV_right; break;
- case SVX_ADJUST_BLOCK: pStr = sCSS1_PV_justify; break;
- case SVX_ADJUST_CENTER: pStr = sCSS1_PV_center; break;
+ case SVX_ADJUST_LEFT: pStr = sCSS1_PV_left; break;
+ case SVX_ADJUST_RIGHT: pStr = sCSS1_PV_right; break;
+ case SVX_ADJUST_BLOCK: pStr = sCSS1_PV_justify; break;
+ case SVX_ADJUST_CENTER: pStr = sCSS1_PV_center; break;
default:
;
}
@@ -3259,7 +3259,7 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
const SvxFmtBreakItem *pBreakItem,
const SwFmtPageDesc *pPDescItem,
- const SvxFmtKeepItem *pKeepItem )
+ const SvxFmtKeepItem *pKeepItem )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -3302,9 +3302,9 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
{
switch( pPDesc->GetPoolFmtId() )
{
- case RES_POOLPAGE_LEFT: pBreakBefore = sCSS1_PV_left; break;
- case RES_POOLPAGE_RIGHT: pBreakBefore = sCSS1_PV_right; break;
- default: pBreakBefore = sCSS1_PV_always; break;
+ case RES_POOLPAGE_LEFT: pBreakBefore = sCSS1_PV_left; break;
+ case RES_POOLPAGE_RIGHT: pBreakBefore = sCSS1_PV_right; break;
+ default: pBreakBefore = sCSS1_PV_always; break;
}
}
else if( !pBreakBefore )
@@ -3372,7 +3372,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
return rWrt;
// Erstmal ein par Werte holen
-// const Brush &rBrush = ((const SvxBrushItem &)rHt).GetBrush();
+// const Brush &rBrush = ((const SvxBrushItem &)rHt).GetBrush();
const Color & rColor = ((const SvxBrushItem &)rHt).GetColor();
const String *pLink = pGrfName ? pGrfName
: ((const SvxBrushItem &)rHt).GetGraphicLink();
@@ -3415,7 +3415,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm,
String::CreateFromAscii("JPG"),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
- if( !nErr ) // fehlerhaft, da ist nichts auszugeben
+ if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
sGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(rWrt.GetBaseURL()), sGrfNm,
@@ -3590,7 +3590,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
}
else
{
- nWidth *= 5; // 1/100pt
+ nWidth *= 5; // 1/100pt
// Breite als n.nn pt
sOut += ByteString::CreateFromInt32( nWidth / 100 );
@@ -3725,37 +3725,37 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt )
SwAttrFnTab aCSS1AttrFnTab = {
-/* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap,
-/* RES_CHRATR_CHARSETCOLOR */ 0,
-/* RES_CHRATR_COLOR */ OutCSS1_SvxColor,
-/* RES_CHRATR_CONTOUR */ 0,
-/* RES_CHRATR_CROSSEDOUT */ OutCSS1_SvxCrossedOut,
-/* RES_CHRATR_ESCAPEMENT */ 0,
-/* RES_CHRATR_FONT */ OutCSS1_SvxFont,
-/* RES_CHRATR_FONTSIZE */ OutCSS1_SvxFontHeight,
-/* RES_CHRATR_KERNING */ OutCSS1_SvxKerning,
-/* RES_CHRATR_LANGUAGE */ OutCSS1_SvxLanguage,
-/* RES_CHRATR_POSTURE */ OutCSS1_SvxPosture,
+/* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap,
+/* RES_CHRATR_CHARSETCOLOR */ 0,
+/* RES_CHRATR_COLOR */ OutCSS1_SvxColor,
+/* RES_CHRATR_CONTOUR */ 0,
+/* RES_CHRATR_CROSSEDOUT */ OutCSS1_SvxCrossedOut,
+/* RES_CHRATR_ESCAPEMENT */ 0,
+/* RES_CHRATR_FONT */ OutCSS1_SvxFont,
+/* RES_CHRATR_FONTSIZE */ OutCSS1_SvxFontHeight,
+/* RES_CHRATR_KERNING */ OutCSS1_SvxKerning,
+/* RES_CHRATR_LANGUAGE */ OutCSS1_SvxLanguage,
+/* RES_CHRATR_POSTURE */ OutCSS1_SvxPosture,
/* RES_CHRATR_PROPORTIONALFONTSIZE*/0,
-/* RES_CHRATR_SHADOWED */ 0,
-/* RES_CHRATR_UNDERLINE */ OutCSS1_SvxUnderline,
-/* RES_CHRATR_WEIGHT */ OutCSS1_SvxFontWeight,
-/* RES_CHRATR_WORDLINEMODE */ 0,
-/* RES_CHRATR_AUTOKERN */ 0,
-/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink,
-/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen
+/* RES_CHRATR_SHADOWED */ 0,
+/* RES_CHRATR_UNDERLINE */ OutCSS1_SvxUnderline,
+/* RES_CHRATR_WEIGHT */ OutCSS1_SvxFontWeight,
+/* RES_CHRATR_WORDLINEMODE */ 0,
+/* RES_CHRATR_AUTOKERN */ 0,
+/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink,
+/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen
/* RES_CHRATR_NOLINEBREAK */ 0, // Neu: nicht umbrechen
-/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu: Zeichenhintergrund
-/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont,
-/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight,
-/* RES_CHRATR_CJK_LANGUAGE */ OutCSS1_SvxLanguage,
-/* RES_CHRATR_CJK_POSTURE */ OutCSS1_SvxPosture,
-/* RES_CHRATR_CJK_WEIGHT */ OutCSS1_SvxFontWeight,
-/* RES_CHRATR_CTL_FONT */ OutCSS1_SvxFont,
-/* RES_CHRATR_CTL_FONTSIZE */ OutCSS1_SvxFontHeight,
-/* RES_CHRATR_CTL_LANGUAGE */ OutCSS1_SvxLanguage,
-/* RES_CHRATR_CTL_POSTURE */ OutCSS1_SvxPosture,
-/* RES_CHRATR_CTL_WEIGHT */ OutCSS1_SvxFontWeight,
+/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu: Zeichenhintergrund
+/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont,
+/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight,
+/* RES_CHRATR_CJK_LANGUAGE */ OutCSS1_SvxLanguage,
+/* RES_CHRATR_CJK_POSTURE */ OutCSS1_SvxPosture,
+/* RES_CHRATR_CJK_WEIGHT */ OutCSS1_SvxFontWeight,
+/* RES_CHRATR_CTL_FONT */ OutCSS1_SvxFont,
+/* RES_CHRATR_CTL_FONTSIZE */ OutCSS1_SvxFontHeight,
+/* RES_CHRATR_CTL_LANGUAGE */ OutCSS1_SvxLanguage,
+/* RES_CHRATR_CTL_POSTURE */ OutCSS1_SvxPosture,
+/* RES_CHRATR_CTL_WEIGHT */ OutCSS1_SvxFontWeight,
/* RES_CHRATR_ROTATE */ 0,
/* RES_CHRATR_EMPHASIS_MARK */ 0,
/* RES_CHRATR_TWO_LINES */ 0,
@@ -3777,26 +3777,26 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_TXTATR_UNKNOWN_CONTAINER */ 0,
/* RES_TXTATR_DUMMY5 */ 0,
-/* RES_TXTATR_FIELD */ 0,
-/* RES_TXTATR_FLYCNT */ 0,
-/* RES_TXTATR_FTN */ 0,
+/* RES_TXTATR_FIELD */ 0,
+/* RES_TXTATR_FLYCNT */ 0,
+/* RES_TXTATR_FTN */ 0,
/* RES_TXTATR_DUMMY4 */ 0,
/* RES_TXTATR_DUMMY3 */ 0,
-/* RES_TXTATR_DUMMY1 */ 0, // Dummy:
-/* RES_TXTATR_DUMMY2 */ 0, // Dummy:
-
-/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing,
-/* RES_PARATR_ADJUST */ OutCSS1_SvxAdjust,
-/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit,
-/* RES_PARATR_WIDOWS */ OutCSS1_SvxWidows,
-/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans,
-/* RES_PARATR_TABSTOP */ 0,
+/* RES_TXTATR_DUMMY1 */ 0, // Dummy:
+/* RES_TXTATR_DUMMY2 */ 0, // Dummy:
+
+/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing,
+/* RES_PARATR_ADJUST */ OutCSS1_SvxAdjust,
+/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit,
+/* RES_PARATR_WIDOWS */ OutCSS1_SvxWidows,
+/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans,
+/* RES_PARATR_TABSTOP */ 0,
/* RES_PARATR_HYPHENZONE*/ 0,
-/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
-/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
-/* RES_PARATR_NUMRULE */ 0, // Dummy:
-/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
-/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
+/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
+/* RES_PARATR_NUMRULE */ 0, // Dummy:
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
/* RES_PARATR_FORBIDDEN_RULES */ 0, // new
/* RES_PARATR_VERTALIGN */ 0, // new
/* RES_PARATR_SNAPTOGRID*/ 0, // new
@@ -3809,41 +3809,41 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_LIST_RESTARTVALUE */ 0, // new
/* RES_PARATR_LIST_ISCOUNTED */ 0, // new
-/* RES_FILL_ORDER */ 0,
-/* RES_FRM_SIZE */ 0,
-/* RES_PAPER_BIN */ 0,
-/* RES_LR_SPACE */ OutCSS1_SvxLRSpace,
-/* RES_UL_SPACE */ OutCSS1_SvxULSpace,
-/* RES_PAGEDESC */ 0,
-/* RES_BREAK */ 0,
-/* RES_CNTNT */ 0,
-/* RES_HEADER */ 0,
-/* RES_FOOTER */ 0,
-/* RES_PRINT */ 0,
-/* RES_OPAQUE */ 0,
-/* RES_PROTECT */ 0,
-/* RES_SURROUND */ 0,
-/* RES_VERT_ORIENT */ 0,
-/* RES_HORI_ORIENT */ 0,
-/* RES_ANCHOR */ 0,
-/* RES_BACKGROUND */ OutCSS1_SvxBrush,
-/* RES_BOX */ OutCSS1_SvxBox,
-/* RES_SHADOW */ 0,
-/* RES_FRMMACRO */ 0,
-/* RES_COL */ 0,
-/* RES_KEEP */ 0,
-/* RES_URL */ 0,
-/* RES_EDIT_IN_READONLY */ 0,
-/* RES_LAYOUT_SPLIT */ 0,
-/* RES_CHAIN */ 0,
-/* RES_TEXTGRID */ 0,
-/* RES_LINENUMBER */ 0,
-/* RES_FTN_AT_TXTEND */ 0,
-/* RES_END_AT_TXTEND */ 0,
-/* RES_COLUMNBALANCE */ 0,
-/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection,
+/* RES_FILL_ORDER */ 0,
+/* RES_FRM_SIZE */ 0,
+/* RES_PAPER_BIN */ 0,
+/* RES_LR_SPACE */ OutCSS1_SvxLRSpace,
+/* RES_UL_SPACE */ OutCSS1_SvxULSpace,
+/* RES_PAGEDESC */ 0,
+/* RES_BREAK */ 0,
+/* RES_CNTNT */ 0,
+/* RES_HEADER */ 0,
+/* RES_FOOTER */ 0,
+/* RES_PRINT */ 0,
+/* RES_OPAQUE */ 0,
+/* RES_PROTECT */ 0,
+/* RES_SURROUND */ 0,
+/* RES_VERT_ORIENT */ 0,
+/* RES_HORI_ORIENT */ 0,
+/* RES_ANCHOR */ 0,
+/* RES_BACKGROUND */ OutCSS1_SvxBrush,
+/* RES_BOX */ OutCSS1_SvxBox,
+/* RES_SHADOW */ 0,
+/* RES_FRMMACRO */ 0,
+/* RES_COL */ 0,
+/* RES_KEEP */ 0,
+/* RES_URL */ 0,
+/* RES_EDIT_IN_READONLY */ 0,
+/* RES_LAYOUT_SPLIT */ 0,
+/* RES_CHAIN */ 0,
+/* RES_TEXTGRID */ 0,
+/* RES_LINENUMBER */ 0,
+/* RES_FTN_AT_TXTEND */ 0,
+/* RES_END_AT_TXTEND */ 0,
+/* RES_COLUMNBALANCE */ 0,
+/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection,
/* RES_HEADER_FOOTER_EAT_SPACING */ 0,
-/* RES_FRMATR_DUMMY9 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY9 */ 0, // Dummy:
/* RES_FOLLOW_TEXT_FLOW */ 0,
/* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0,
/* RES_FRMATR_DUMMY2 */ 0, // Dummy:
@@ -3852,26 +3852,26 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_FRMATR_DUMMY5 */ 0, // Dummy:
/* RES_GRFATR_MIRRORGRF */ 0,
-/* RES_GRFATR_CROPGRF */ 0,
-/* RES_GRFATR_ROTATION */ 0,
-/* RES_GRFATR_LUMINANCE */ 0,
-/* RES_GRFATR_CONTRAST */ 0,
-/* RES_GRFATR_CHANNELR */ 0,
-/* RES_GRFATR_CHANNELG */ 0,
-/* RES_GRFATR_CHANNELB */ 0,
-/* RES_GRFATR_GAMMA */ 0,
-/* RES_GRFATR_INVERT */ 0,
-/* RES_GRFATR_TRANSPARENCY */ 0,
-/* RES_GRFATR_DRWAMODE */ 0,
-/* RES_GRFATR_DUMMY1 */ 0,
-/* RES_GRFATR_DUMMY2 */ 0,
-/* RES_GRFATR_DUMMY3 */ 0,
-/* RES_GRFATR_DUMMY4 */ 0,
-/* RES_GRFATR_DUMMY5 */ 0,
-
-/* RES_BOXATR_FORMAT */ 0,
-/* RES_BOXATR_FORMULA */ 0,
-/* RES_BOXATR_VALUE */ 0
+/* RES_GRFATR_CROPGRF */ 0,
+/* RES_GRFATR_ROTATION */ 0,
+/* RES_GRFATR_LUMINANCE */ 0,
+/* RES_GRFATR_CONTRAST */ 0,
+/* RES_GRFATR_CHANNELR */ 0,
+/* RES_GRFATR_CHANNELG */ 0,
+/* RES_GRFATR_CHANNELB */ 0,
+/* RES_GRFATR_GAMMA */ 0,
+/* RES_GRFATR_INVERT */ 0,
+/* RES_GRFATR_TRANSPARENCY */ 0,
+/* RES_GRFATR_DRWAMODE */ 0,
+/* RES_GRFATR_DUMMY1 */ 0,
+/* RES_GRFATR_DUMMY2 */ 0,
+/* RES_GRFATR_DUMMY3 */ 0,
+/* RES_GRFATR_DUMMY4 */ 0,
+/* RES_GRFATR_DUMMY5 */ 0,
+
+/* RES_BOXATR_FORMAT */ 0,
+/* RES_BOXATR_FORMULA */ 0,
+/* RES_BOXATR_VALUE */ 0
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
index 7031a5ac5985..31b44b8a50ef 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 19d1d7771ab7..3134422f3779 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index e9e5c464e54b..0197bb89428b 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2,7 +2,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
@@ -125,9 +125,9 @@ using namespace ::com::sun::star;
#endif
-#define HTML_BULLETCHAR_DISC 34
-#define HTML_BULLETCHAR_CIRCLE 38
-#define HTML_BULLETCHAR_SQUARE 36
+#define HTML_BULLETCHAR_DISC 34
+#define HTML_BULLETCHAR_CIRCLE 38
+#define HTML_BULLETCHAR_SQUARE 36
#define COLFUZZY 20
@@ -135,10 +135,10 @@ using namespace ::com::sun::star;
HTMLOutEvent __FAR_DATA aAnchorEventTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT },
- { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT },
- { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT },
- { 0, 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT },
+ { 0, 0, 0 }
};
static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt );
@@ -199,7 +199,7 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl )
{
// output </pre> for the previous(!) pararagraph, if required.
// Preferable, the <pre> is exported by OutHTML_SwFmtOff for the
- // previous paragraph already, but that's not possible, because a very
+ // previous paragraph already, but that's not possible, because a very
// deep look at the next paragraph (this one) is required to figure
// out that a def list starts here.
@@ -278,13 +278,13 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
struct SwHTMLTxtCollOutputInfo
{
- ByteString aToken; // auszugendens End-Token
- SfxItemSet *pItemSet; // harte Attributierung
+ ByteString aToken; // auszugendens End-Token
+ SfxItemSet *pItemSet; // harte Attributierung
- BOOL bInNumBulList; // in einer Aufzaehlungs-Liste;
- BOOL bParaPossible; // ein </P> darf zusaetzlich ausgegeben werden
- BOOL bOutPara; // ein </P> soll ausgegeben werden
- BOOL bOutDiv; // write a </DIV>
+ BOOL bInNumBulList; // in einer Aufzaehlungs-Liste;
+ BOOL bParaPossible; // ein </P> darf zusaetzlich ausgegeben werden
+ BOOL bOutPara; // ein </P> soll ausgegeben werden
+ BOOL bOutDiv; // write a </DIV>
SwHTMLTxtCollOutputInfo() :
pItemSet( 0 ),
@@ -307,16 +307,16 @@ SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo()
struct SwHTMLFmtInfo
{
- const SwFmt *pFmt; // das Format selbst
- const SwFmt *pRefFmt; // das Vergleichs-Format
+ const SwFmt *pFmt; // das Format selbst
+ const SwFmt *pRefFmt; // das Vergleichs-Format
- ByteString aToken; // das auszugebende Token
- String aClass; // die auszugebende Klasse
+ ByteString aToken; // das auszugebende Token
+ String aClass; // die auszugebende Klasse
- SfxItemSet *pItemSet; // der auszugebende Attribut-Set
+ SfxItemSet *pItemSet; // der auszugebende Attribut-Set
- sal_Int32 nLeftMargin; // ein par default-Werte fuer
- sal_Int32 nRightMargin; // Absatz-Vorlagen
+ sal_Int32 nLeftMargin; // ein par default-Werte fuer
+ sal_Int32 nRightMargin; // Absatz-Vorlagen
short nFirstLineIndent;
USHORT nTopMargin;
@@ -371,7 +371,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
BOOL bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
pFmt->Which() == RES_CONDTXTFMTCOLL;
- const SwFmt *pReferenceFmt = 0; // Vergleichs-Format
+ const SwFmt *pReferenceFmt = 0; // Vergleichs-Format
sal_Bool bSetDefaults = sal_True, bClearSame = sal_True;
if( nDeep != 0 )
{
@@ -586,15 +586,15 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
USHORT nNumStart = USHRT_MAX;
BOOL bForceDL = FALSE;
BOOL bDT = FALSE;
- rInfo.bInNumBulList = FALSE; // Wir sind in einer Liste?
- BOOL bNumbered = FALSE; // Der aktuelle Absatz ist numeriert
- BOOL bPara = FALSE; // das aktuelle Token ist <P>
- rInfo.bParaPossible = FALSE; // ein <P> darf zusaetzlich ausgegeben werden
- BOOL bNoEndTag = FALSE; // kein End-Tag ausgeben
+ rInfo.bInNumBulList = FALSE; // Wir sind in einer Liste?
+ BOOL bNumbered = FALSE; // Der aktuelle Absatz ist numeriert
+ BOOL bPara = FALSE; // das aktuelle Token ist <P>
+ rInfo.bParaPossible = FALSE; // ein <P> darf zusaetzlich ausgegeben werden
+ BOOL bNoEndTag = FALSE; // kein End-Tag ausgeben
- rHWrt.bNoAlign = FALSE; // kein ALIGN=... moeglich
- BOOL bNoStyle = FALSE; // kein STYLE=... moeglich
- BYTE nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik
+ rHWrt.bNoAlign = FALSE; // kein ALIGN=... moeglich
+ BOOL bNoStyle = FALSE; // kein STYLE=... moeglich
+ BYTE nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik
// Sind wir in einer Aufzaehlungs- oder Numerierungliste?
const SwTxtNode* pTxtNd = rWrt.pCurPam->GetNode()->GetTxtNode();
@@ -663,8 +663,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
// Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
- USHORT nToken = 0; // Token fuer Tag-Wechsel
- BOOL bOutNewLine = FALSE; // nur ein LF ausgeben?
+ USHORT nToken = 0; // Token fuer Tag-Wechsel
+ BOOL bOutNewLine = FALSE; // nur ein LF ausgeben?
if( pFmtInfo->aToken.Len() )
{
// Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
@@ -686,7 +686,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.bNoAlign = TRUE;
break;
- case 'P': if( rInfo.aToken.Len() == 1 )
+ case 'P': if( rInfo.aToken.Len() == 1 )
{
bPara = TRUE;
}
@@ -775,7 +775,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
// nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang
// ausgeben
- rInfo.aToken.Erase(); // kein End-Tag ausgeben
+ rInfo.aToken.Erase(); // kein End-Tag ausgeben
rWrt.Strm() << SwHTMLWriter::sNewLine;
return;
@@ -795,7 +795,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// Unteren Absatz-Abstand beachten ? (nie im letzen Absatz von
// Tabellen)
- BOOL bUseParSpace = !rHWrt.bOutTable ||
+ BOOL bUseParSpace = !rHWrt.bOutTable ||
(rWrt.pCurPam->GetPoint()->nNode.GetIndex() !=
rWrt.pCurPam->GetMark()->nNode.GetIndex());
// Wenn Styles exportiert werden, wird aus eingerueckten Absaetzen
@@ -1013,9 +1013,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// - ein unterer Abstand oder
// - eine Absatz-Ausrichtung existiert, ode
// - Styles exportiert werden und,
- // - die Textkoerper-Vorlage geaendert wurde, oder
- // - ein Benutzer-Format exportiert wird, oder
- // - Absatz-Attribute existieren
+ // - die Textkoerper-Vorlage geaendert wurde, oder
+ // - ein Benutzer-Format exportiert wird, oder
+ // - Absatz-Attribute existieren
if( !bPara ||
(!rInfo.bInNumBulList && !rHWrt.nDefListLvl) ||
(rInfo.bInNumBulList && !bNumbered) ||
@@ -1233,34 +1233,34 @@ HTMLSttEndPos::~HTMLSttEndPos()
typedef HTMLSttEndPos *HTMLSttEndPosPtr;
SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5, 5 )
-enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut
- HTML_REAL_VALUE, // Attribut mit Wert
- HTML_ON_VALUE, // Attribut entspricht On-Tag
- HTML_OFF_VALUE, // Attribut entspricht Off-Tag
- HTML_CHRFMT_VALUE, // Attribut fuer Zeichenvorlage
- HTML_COLOR_VALUE, // Attribut fuer Vordergrundfarbe
- HTML_STYLE_VALUE, // Attribut muss als Style exp.
- HTML_DROPCAP_VALUE, // DropCap-Attributs
- HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles
+enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut
+ HTML_REAL_VALUE, // Attribut mit Wert
+ HTML_ON_VALUE, // Attribut entspricht On-Tag
+ HTML_OFF_VALUE, // Attribut entspricht Off-Tag
+ HTML_CHRFMT_VALUE, // Attribut fuer Zeichenvorlage
+ HTML_COLOR_VALUE, // Attribut fuer Vordergrundfarbe
+ HTML_STYLE_VALUE, // Attribut muss als Style exp.
+ HTML_DROPCAP_VALUE, // DropCap-Attributs
+ HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles
class HTMLEndPosLst
{
- _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste
- _HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste
- SvXub_StrLens aScriptChgLst; // positions where script changes
+ _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste
+ _HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste
+ SvXub_StrLens aScriptChgLst; // positions where script changes
// 0 is not contained in this list,
// but the text length
- SvUShorts aScriptLst; // the script that is valif up to the position
+ SvUShorts aScriptLst; // the script that is valif up to the position
// contained in aScriptChgList at the same index
- SwDoc *pDoc; // das aktuelle Dokument
- SwDoc* pTemplate; // die HTML-Vorlage (oder 0)
+ SwDoc *pDoc; // das aktuelle Dokument
+ SwDoc* pTemplate; // die HTML-Vorlage (oder 0)
const Color* pDfltColor;// die Default-Vordergrund-Farbe
- SvStringsSortDtor& rScriptTxtStyles; //
+ SvStringsSortDtor& rScriptTxtStyles; //
ULONG nHTMLMode;
- BOOL bOutStyles : 1; // werden Styles exportiert
+ BOOL bOutStyles : 1; // werden Styles exportiert
// die Position eines Items in der Start-/Ende-Liste suchen
@@ -1530,9 +1530,9 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
eState = HTML_DROPCAP_VALUE;
break;
-// default:
-// eState = HTML_NOT_SUPPORTED;
-// break;
+// default:
+// eState = HTML_NOT_SUPPORTED;
+// break;
}
return eState;
@@ -2098,7 +2098,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( xub_StrLen nPos ,
}
void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, xub_StrLen nPos,
- HTMLOutContext *pContext )
+ HTMLOutContext *pContext )
{
rHWrt.bTagOn = TRUE;
@@ -2183,7 +2183,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
xub_StrLen nEnde = rStr.Len();
// Besonderheit: leere Node und HR-Vorlage (horizontaler Strich)
- // nur ein <HR> ausgeben
+ // nur ein <HR> ausgeben
USHORT nPoolId = pNd->GetAnyFmtColl().GetPoolFmtId();
if( !nEnde && (RES_POOLCOLL_HTML_HR==nPoolId ||
@@ -2487,7 +2487,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset );
nAttrPos++;
- if( RES_TXTATR_FIELD == pHt->Which() ) // Felder nicht
+ if( RES_TXTATR_FIELD == pHt->Which() ) // Felder nicht
continue; // ausgeben
if ( pHt->GetEnd() && !pHt->HasDummyChar() )
@@ -2540,7 +2540,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// Die an der aktuellen Position verankerten Rahmen ausgeben
if( bFlysLeft )
- bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(),
+ bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(),
nStrPos, HTML_POS_INSIDE,
&aContext );
@@ -2560,8 +2560,8 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
{
// Wenn erlaubt, wird das Ding als Spacer exportiert
- bOutChar = FALSE; // Space nicht ausgeben
- bWriteBreak = FALSE; // der Absatz ist aber auch nicht leer
+ bOutChar = FALSE; // Space nicht ausgeben
+ bWriteBreak = FALSE; // der Absatz ist aber auch nicht leer
HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
OutHTML_HoriSpacer( rWrt,
((const SvxKerningItem&)pHt->GetAttr()).GetValue() );
@@ -2597,7 +2597,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
RES_SCRIPTFLD != nFldWhich ) )
bWriteBreak = FALSE;
}
- bOutChar = FALSE; // keine 255 ausgeben
+ bOutChar = FALSE; // keine 255 ausgeben
}
} while( ++nAttrPos < nCntAttr && nStrPos ==
*( pHt = pNd->GetSwpHints()[ nAttrPos ] )->GetStart() );
@@ -2766,7 +2766,7 @@ sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal ) const
{
nVal = Application::GetDefaultDevice()->LogicToPixel(
Size( nVal, nVal ), MapMode( MAP_TWIP ) ).Width();
- if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein
+ if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein
nVal = 1;
}
return nVal;
@@ -2795,8 +2795,8 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
// die Default-Farbe nur Schreiben, wenn sie als Hint vorkommt
//if( rHTMLWrt.bTagOn && !rHTMLWrt.bTxtAttr && rHTMLWrt.pDfltColor
- // && rColor == *rHTMLWrt.pDfltColor )
- // return rWrt;
+ // && rColor == *rHTMLWrt.pDfltColor )
+ // return rWrt;
if( !rHTMLWrt.bTxtAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
{
@@ -3178,7 +3178,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn )
if( bEvents )
HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable,
rHTMLWrt.bCfgStarBasic, rHTMLWrt.eDestEnc,
- &rHTMLWrt.aNonConvertableCharacters );
+ &rHTMLWrt.aNonConvertableCharacters );
rWrt.Strm() << ">";
return rWrt;
@@ -3346,37 +3346,37 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
SwAttrFnTab aHTMLAttrFnTab = {
-/* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr,
-/* RES_CHRATR_CHARSETCOLOR */ 0,
-/* RES_CHRATR_COLOR */ OutHTML_SvxColor,
-/* RES_CHRATR_CONTOUR */ 0,
-/* RES_CHRATR_CROSSEDOUT */ OutHTML_SwCrossedOut,
-/* RES_CHRATR_ESCAPEMENT */ OutHTML_SvxEscapement,
-/* RES_CHRATR_FONT */ OutHTML_SvxFont,
-/* RES_CHRATR_FONTSIZE */ OutHTML_SvxFontHeight,
-/* RES_CHRATR_KERNING */ OutHTML_CSS1Attr,
-/* RES_CHRATR_LANGUAGE */ OutHTML_SvxLanguage,
-/* RES_CHRATR_POSTURE */ OutHTML_SwPosture,
+/* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr,
+/* RES_CHRATR_CHARSETCOLOR */ 0,
+/* RES_CHRATR_COLOR */ OutHTML_SvxColor,
+/* RES_CHRATR_CONTOUR */ 0,
+/* RES_CHRATR_CROSSEDOUT */ OutHTML_SwCrossedOut,
+/* RES_CHRATR_ESCAPEMENT */ OutHTML_SvxEscapement,
+/* RES_CHRATR_FONT */ OutHTML_SvxFont,
+/* RES_CHRATR_FONTSIZE */ OutHTML_SvxFontHeight,
+/* RES_CHRATR_KERNING */ OutHTML_CSS1Attr,
+/* RES_CHRATR_LANGUAGE */ OutHTML_SvxLanguage,
+/* RES_CHRATR_POSTURE */ OutHTML_SwPosture,
/* RES_CHRATR_PROPORTIONALFONTSIZE*/0,
-/* RES_CHRATR_SHADOWED */ 0,
-/* RES_CHRATR_UNDERLINE */ OutHTML_SwUnderline,
-/* RES_CHRATR_WEIGHT */ OutHTML_SwWeight,
-/* RES_CHRATR_WORDLINEMODE */ 0,
-/* RES_CHRATR_AUTOKERN */ 0,
-/* RES_CHRATR_BLINK */ OutHTML_SwBlink,
-/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen
+/* RES_CHRATR_SHADOWED */ 0,
+/* RES_CHRATR_UNDERLINE */ OutHTML_SwUnderline,
+/* RES_CHRATR_WEIGHT */ OutHTML_SwWeight,
+/* RES_CHRATR_WORDLINEMODE */ 0,
+/* RES_CHRATR_AUTOKERN */ 0,
+/* RES_CHRATR_BLINK */ OutHTML_SwBlink,
+/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen
/* RES_CHRATR_NOLINEBREAK */ 0, // Neu: nicht umbrechen
-/* RES_CHRATR_BACKGROUND */ OutHTML_CSS1Attr, // Neu: Zeichenhintergrund
-/* RES_CHRATR_CJK_FONT */ OutHTML_SvxFont,
-/* RES_CHRATR_CJK_FONTSIZE */ OutHTML_SvxFontHeight,
-/* RES_CHRATR_CJK_LANGUAGE */ OutHTML_SvxLanguage,
-/* RES_CHRATR_CJK_POSTURE */ OutHTML_SwPosture,
-/* RES_CHRATR_CJK_WEIGHT */ OutHTML_SwWeight,
-/* RES_CHRATR_CTL_FONT */ OutHTML_SvxFont,
-/* RES_CHRATR_CTL_FONTSIZE */ OutHTML_SvxFontHeight,
-/* RES_CHRATR_CTL_LANGUAGE */ OutHTML_SvxLanguage,
-/* RES_CHRATR_CTL_POSTURE */ OutHTML_SwPosture,
-/* RES_CHRATR_CTL_WEIGHT */ OutHTML_SwWeight,
+/* RES_CHRATR_BACKGROUND */ OutHTML_CSS1Attr, // Neu: Zeichenhintergrund
+/* RES_CHRATR_CJK_FONT */ OutHTML_SvxFont,
+/* RES_CHRATR_CJK_FONTSIZE */ OutHTML_SvxFontHeight,
+/* RES_CHRATR_CJK_LANGUAGE */ OutHTML_SvxLanguage,
+/* RES_CHRATR_CJK_POSTURE */ OutHTML_SwPosture,
+/* RES_CHRATR_CJK_WEIGHT */ OutHTML_SwWeight,
+/* RES_CHRATR_CTL_FONT */ OutHTML_SvxFont,
+/* RES_CHRATR_CTL_FONTSIZE */ OutHTML_SvxFontHeight,
+/* RES_CHRATR_CTL_LANGUAGE */ OutHTML_SvxLanguage,
+/* RES_CHRATR_CTL_POSTURE */ OutHTML_SwPosture,
+/* RES_CHRATR_CTL_WEIGHT */ OutHTML_SwWeight,
/* RES_CHRATR_ROTATE */ 0,
/* RES_CHRATR_EMPHASIS_MARK */ 0,
/* RES_CHRATR_TWO_LINES */ 0,
@@ -3398,26 +3398,26 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_TXTATR_UNKNOWN_CONTAINER */ 0,
/* RES_TXTATR_DUMMY5 */ 0,
-/* RES_TXTATR_FIELD */ OutHTML_SwFmtFld,
-/* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt,
-/* RES_TXTATR_FTN */ OutHTML_SwFmtFtn,
+/* RES_TXTATR_FIELD */ OutHTML_SwFmtFld,
+/* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt,
+/* RES_TXTATR_FTN */ OutHTML_SwFmtFtn,
/* RES_TXTATR_DUMMY4 */ 0,
/* RES_TXTATR_DUMMY3 */ 0,
-/* RES_TXTATR_DUMMY1 */ 0, // Dummy:
-/* RES_TXTATR_DUMMY2 */ 0, // Dummy:
-
-/* RES_PARATR_LINESPACING */ 0,
-/* RES_PARATR_ADJUST */ OutHTML_SvxAdjust,
-/* RES_PARATR_SPLIT */ 0,
-/* RES_PARATR_WIDOWS */ 0,
-/* RES_PARATR_ORPHANS */ 0,
-/* RES_PARATR_TABSTOP */ 0,
+/* RES_TXTATR_DUMMY1 */ 0, // Dummy:
+/* RES_TXTATR_DUMMY2 */ 0, // Dummy:
+
+/* RES_PARATR_LINESPACING */ 0,
+/* RES_PARATR_ADJUST */ OutHTML_SvxAdjust,
+/* RES_PARATR_SPLIT */ 0,
+/* RES_PARATR_WIDOWS */ 0,
+/* RES_PARATR_ORPHANS */ 0,
+/* RES_PARATR_TABSTOP */ 0,
/* RES_PARATR_HYPHENZONE*/ 0,
-/* RES_PARATR_DROP */ OutHTML_CSS1Attr,
-/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
-/* RES_PARATR_NUMRULE */ 0, // Dummy:
-/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
-/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_DROP */ OutHTML_CSS1Attr,
+/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
+/* RES_PARATR_NUMRULE */ 0, // Dummy:
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
/* RES_PARATR_FORBIDDEN_RULES */ 0, // new
/* RES_PARATR_VERTALIGN */ 0, // new
/* RES_PARATR_SNAPTOGRID*/ 0, // new
@@ -3429,41 +3429,41 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_PARATR_LIST_RESTARTVALUE */ 0, // new
/* RES_PARATR_LIST_ISCOUNTED */ 0, // new
-/* RES_FILL_ORDER */ 0,
-/* RES_FRM_SIZE */ 0,
-/* RES_PAPER_BIN */ 0,
-/* RES_LR_SPACE */ 0,
-/* RES_UL_SPACE */ 0,
-/* RES_PAGEDESC */ 0,
-/* RES_BREAK */ 0,
-/* RES_CNTNT */ 0,
-/* RES_HEADER */ 0,
-/* RES_FOOTER */ 0,
-/* RES_PRINT */ 0,
-/* RES_OPAQUE */ 0,
-/* RES_PROTECT */ 0,
-/* RES_SURROUND */ 0,
-/* RES_VERT_ORIENT */ 0,
-/* RES_HORI_ORIENT */ 0,
-/* RES_ANCHOR */ 0,
-/* RES_BACKGROUND */ 0,
-/* RES_BOX */ 0,
-/* RES_SHADOW */ 0,
-/* RES_FRMMACRO */ 0,
-/* RES_COL */ 0,
-/* RES_KEEP */ 0,
-/* RES_URL */ 0,
-/* RES_EDIT_IN_READONLY */ 0,
-/* RES_LAYOUT_SPLIT */ 0,
-/* RES_FRMATR_DUMMY1 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY2 */ 0, // Dummy:
-/* RES_AUTO_STYLE */ 0, // Dummy:
-/* RES_FRMATR_DUMMY4 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY5 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY6 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY7 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY8 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY9 */ 0, // Dummy:
+/* RES_FILL_ORDER */ 0,
+/* RES_FRM_SIZE */ 0,
+/* RES_PAPER_BIN */ 0,
+/* RES_LR_SPACE */ 0,
+/* RES_UL_SPACE */ 0,
+/* RES_PAGEDESC */ 0,
+/* RES_BREAK */ 0,
+/* RES_CNTNT */ 0,
+/* RES_HEADER */ 0,
+/* RES_FOOTER */ 0,
+/* RES_PRINT */ 0,
+/* RES_OPAQUE */ 0,
+/* RES_PROTECT */ 0,
+/* RES_SURROUND */ 0,
+/* RES_VERT_ORIENT */ 0,
+/* RES_HORI_ORIENT */ 0,
+/* RES_ANCHOR */ 0,
+/* RES_BACKGROUND */ 0,
+/* RES_BOX */ 0,
+/* RES_SHADOW */ 0,
+/* RES_FRMMACRO */ 0,
+/* RES_COL */ 0,
+/* RES_KEEP */ 0,
+/* RES_URL */ 0,
+/* RES_EDIT_IN_READONLY */ 0,
+/* RES_LAYOUT_SPLIT */ 0,
+/* RES_FRMATR_DUMMY1 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY2 */ 0, // Dummy:
+/* RES_AUTO_STYLE */ 0, // Dummy:
+/* RES_FRMATR_DUMMY4 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY5 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY6 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY7 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY8 */ 0, // Dummy:
+/* RES_FRMATR_DUMMY9 */ 0, // Dummy:
/* RES_FOLLOW_TEXT_FLOW */ 0,
/* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0,
/* RES_FRMATR_DUMMY2 */ 0, // Dummy:
@@ -3471,27 +3471,27 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_FRMATR_DUMMY4 */ 0, // Dummy:
/* RES_FRMATR_DUMMY5 */ 0, // Dummy:
-/* RES_GRFATR_MIRRORGRF */ 0,
-/* RES_GRFATR_CROPGRF */ 0,
-/* RES_GRFATR_ROTATION */ 0,
-/* RES_GRFATR_LUMINANCE */ 0,
-/* RES_GRFATR_CONTRAST */ 0,
-/* RES_GRFATR_CHANNELR */ 0,
-/* RES_GRFATR_CHANNELG */ 0,
-/* RES_GRFATR_CHANNELB */ 0,
-/* RES_GRFATR_GAMMA */ 0,
-/* RES_GRFATR_INVERT */ 0,
-/* RES_GRFATR_TRANSPARENCY */ 0,
-/* RES_GRFATR_DRWAMODE */ 0,
-/* RES_GRFATR_DUMMY1 */ 0,
-/* RES_GRFATR_DUMMY2 */ 0,
-/* RES_GRFATR_DUMMY3 */ 0,
-/* RES_GRFATR_DUMMY4 */ 0,
-/* RES_GRFATR_DUMMY5 */ 0,
-
-/* RES_BOXATR_FORMAT */ 0,
-/* RES_BOXATR_FORMULA */ 0,
-/* RES_BOXATR_VALUE */ 0
+/* RES_GRFATR_MIRRORGRF */ 0,
+/* RES_GRFATR_CROPGRF */ 0,
+/* RES_GRFATR_ROTATION */ 0,
+/* RES_GRFATR_LUMINANCE */ 0,
+/* RES_GRFATR_CONTRAST */ 0,
+/* RES_GRFATR_CHANNELR */ 0,
+/* RES_GRFATR_CHANNELG */ 0,
+/* RES_GRFATR_CHANNELB */ 0,
+/* RES_GRFATR_GAMMA */ 0,
+/* RES_GRFATR_INVERT */ 0,
+/* RES_GRFATR_TRANSPARENCY */ 0,
+/* RES_GRFATR_DRWAMODE */ 0,
+/* RES_GRFATR_DUMMY1 */ 0,
+/* RES_GRFATR_DUMMY2 */ 0,
+/* RES_GRFATR_DUMMY3 */ 0,
+/* RES_GRFATR_DUMMY4 */ 0,
+/* RES_GRFATR_DUMMY5 */ 0,
+
+/* RES_BOXATR_FORMAT */ 0,
+/* RES_BOXATR_FORMULA */ 0,
+/* RES_BOXATR_VALUE */ 0
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index c64bcb63ea44..b30d9ddf5f78 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -2,7 +2,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
@@ -65,11 +65,11 @@ using namespace ::com::sun::star::container;
static HTMLOutEvent __FAR_DATA aBodyEventTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC },
- { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC },
- { OOO_STRING_SVTOOLS_HTML_O_SDonfocus, OOO_STRING_SVTOOLS_HTML_O_onfocus, SFX_EVENT_ACTIVATEDOC },
- { OOO_STRING_SVTOOLS_HTML_O_SDonblur, OOO_STRING_SVTOOLS_HTML_O_onblur, SFX_EVENT_DEACTIVATEDOC },
- { 0, 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonfocus, OOO_STRING_SVTOOLS_HTML_O_onfocus, SFX_EVENT_ACTIVATEDOC },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonblur, OOO_STRING_SVTOOLS_HTML_O_onblur, SFX_EVENT_DEACTIVATEDOC },
+ { 0, 0, 0 }
};
@@ -104,8 +104,8 @@ void SwHTMLParser::EndScript()
aScriptSource.ConvertLineEnd();
// MIB 23.5.97: SGML-Kommentare brauchen nicht mehr entfernt zu werden,
-// weil JS das jetzt selber kann.
-// RemoveSGMLComment( aScriptSource, TRUE );
+// weil JS das jetzt selber kann.
+// RemoveSGMLComment( aScriptSource, TRUE );
// Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
// Modulnamen in einem Feld merken merken
@@ -287,7 +287,7 @@ void SwHTMLWriter::OutBasic()
BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
OSL_ENSURE( pBasicMan, "Wo ist der Basic-Manager?" );
//JP 17.07.96: Bug 29538 - nur das DocumentBasic schreiben
- if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() )
+ if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() )
{
SFX_APP()->LeaveBasicCall();
return;
@@ -329,7 +329,7 @@ void SwHTMLWriter::OutBasic()
}
const String& rModName = pModule->GetName();
- Strm() << SwHTMLWriter::sNewLine; // nicht einruecken!
+ Strm() << SwHTMLWriter::sNewLine; // nicht einruecken!
HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(),
sLang, eType, aEmptyStr,
&rLibName, &rModName,
@@ -342,7 +342,7 @@ void SwHTMLWriter::OutBasic()
static const char* aEventNames[] =
{
- "OnLoad", "OnPrepareUnload", "OnFocus", "OnUnfocus"
+ "OnLoad", "OnPrepareUnload", "OnFocus", "OnUnfocus"
};
void SwHTMLWriter::OutBasicBodyEvents()
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 7794bd8418a6..f4c8f5e1aca6 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2,7 +2,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
@@ -175,9 +175,9 @@ BOOL SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
case SVX_CSS1_PBREAK_AUTO:
bSetBreak = bSetPageDesc = TRUE;
break;
-// case SVX_CSS1_PBREAK_AVOID:
+// case SVX_CSS1_PBREAK_AVOID:
// Hier koennte man SvxKeepItem am Absatz davor einfuegen
-// break;
+// break;
default:
;
}
@@ -1190,24 +1190,24 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( USHORT nToken2, const String& rClass ) const
const sal_Char* sName = 0;
switch( nToken2 )
{
- case HTML_EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS; break;
- case HTML_CITIATION_ON: nPoolId = RES_POOLCHR_HTML_CITIATION; break;
- case HTML_STRONG_ON: nPoolId = RES_POOLCHR_HTML_STRONG; break;
- case HTML_CODE_ON: nPoolId = RES_POOLCHR_HTML_CODE; break;
- case HTML_SAMPLE_ON: nPoolId = RES_POOLCHR_HTML_SAMPLE; break;
- case HTML_KEYBOARD_ON: nPoolId = RES_POOLCHR_HTML_KEYBOARD; break;
- case HTML_VARIABLE_ON: nPoolId = RES_POOLCHR_HTML_VARIABLE; break;
- case HTML_DEFINSTANCE_ON: nPoolId = RES_POOLCHR_HTML_DEFINSTANCE; break;
- case HTML_TELETYPE_ON: nPoolId = RES_POOLCHR_HTML_TELETYPE; break;
-
- case HTML_SHORTQUOTE_ON: sName = OOO_STRING_SVTOOLS_HTML_shortquote; break;
- case HTML_LANGUAGE_ON: sName = OOO_STRING_SVTOOLS_HTML_language; break;
- case HTML_AUTHOR_ON: sName = OOO_STRING_SVTOOLS_HTML_author; break;
- case HTML_PERSON_ON: sName = OOO_STRING_SVTOOLS_HTML_person; break;
- case HTML_ACRONYM_ON: sName = OOO_STRING_SVTOOLS_HTML_acronym; break;
- case HTML_ABBREVIATION_ON: sName = OOO_STRING_SVTOOLS_HTML_abbreviation; break;
- case HTML_INSERTEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_insertedtext; break;
- case HTML_DELETEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_deletedtext; break;
+ case HTML_EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS; break;
+ case HTML_CITIATION_ON: nPoolId = RES_POOLCHR_HTML_CITIATION; break;
+ case HTML_STRONG_ON: nPoolId = RES_POOLCHR_HTML_STRONG; break;
+ case HTML_CODE_ON: nPoolId = RES_POOLCHR_HTML_CODE; break;
+ case HTML_SAMPLE_ON: nPoolId = RES_POOLCHR_HTML_SAMPLE; break;
+ case HTML_KEYBOARD_ON: nPoolId = RES_POOLCHR_HTML_KEYBOARD; break;
+ case HTML_VARIABLE_ON: nPoolId = RES_POOLCHR_HTML_VARIABLE; break;
+ case HTML_DEFINSTANCE_ON: nPoolId = RES_POOLCHR_HTML_DEFINSTANCE; break;
+ case HTML_TELETYPE_ON: nPoolId = RES_POOLCHR_HTML_TELETYPE; break;
+
+ case HTML_SHORTQUOTE_ON: sName = OOO_STRING_SVTOOLS_HTML_shortquote; break;
+ case HTML_LANGUAGE_ON: sName = OOO_STRING_SVTOOLS_HTML_language; break;
+ case HTML_AUTHOR_ON: sName = OOO_STRING_SVTOOLS_HTML_author; break;
+ case HTML_PERSON_ON: sName = OOO_STRING_SVTOOLS_HTML_person; break;
+ case HTML_ACRONYM_ON: sName = OOO_STRING_SVTOOLS_HTML_acronym; break;
+ case HTML_ABBREVIATION_ON: sName = OOO_STRING_SVTOOLS_HTML_abbreviation; break;
+ case HTML_INSERTEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_insertedtext; break;
+ case HTML_DELETEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_deletedtext; break;
}
// die Vorlage suchen oder anlegen (geht nur mit Namen)
@@ -1323,7 +1323,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl,
}
String sName;
- if( USER_FMT & nTxtColl ) // eine vom Reader angelegte
+ if( USER_FMT & nTxtColl ) // eine vom Reader angelegte
{
OSL_ENSURE( !this, "Wo kommt die Benutzer-Vorlage her?" );
pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
@@ -1489,12 +1489,12 @@ BOOL SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
BOOL bAutoWidth )
{
// abs-pos
- // left/top none auto twip perc
+ // left/top none auto twip perc
//
- // none Z Z - -
- // auto Z Z - -
- // twip Z Z S/R -
- // perc - - - -
+ // none Z Z - -
+ // auto Z Z - -
+ // twip Z Z S/R -
+ // perc - - - -
//
// - das Tag wird absolut positioniert und left/top sind beide
// gegeben und enthalten auch keine %-Angabe, oder
@@ -1503,9 +1503,9 @@ BOOL SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
return ( ( SVX_CSS1_POS_ABSOLUTE == rPropInfo.ePosition &&
SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eLeftType &&
SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eTopType &&
- (SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType ||
- SVX_CSS1_LTYPE_TWIP != rPropInfo.eTopType) ) ||
- ( SVX_ADJUST_END != rPropInfo.eFloat ) ) &&
+ (SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType ||
+ SVX_CSS1_LTYPE_TWIP != rPropInfo.eTopType) ) ||
+ ( SVX_ADJUST_END != rPropInfo.eFloat ) ) &&
( bAutoWidth ||
SVX_CSS1_LTYPE_TWIP == rPropInfo.eWidthType ||
SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType );
@@ -1519,8 +1519,8 @@ void SwCSS1Parser::AddClassName( String& rFmtName, const String& rClass )
OSL_ENSURE( rClass.Len(), "Style-Klasse ohne Laenge?" );
// ??????????
-// String aTmp( rClass );
-// GetpApp()->GetAppInternational().ToLower( aTmp );
+// String aTmp( rClass );
+// GetpApp()->GetAppInternational().ToLower( aTmp );
(rFmtName += '.') += rClass;
}
@@ -1919,13 +1919,13 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn )
pPageEntry->GetPropertyInfo() );
SetPageDescAttrs( GetRightPageDesc(), pPageEntry->GetItemSet(),
pPageEntry->GetPropertyInfo() );
-// if( pNamedPageDescs )
-// {
-// for( USHORT i=0; i<pNamedPageDescs->Count(); i++ )
-// SetPageDescAttrs( (*pNamedPageDescs)[i],
-// pPageEntry->GetItemSet(),
-// pPageEntry->GetPropertyInfo() );
-// }
+// if( pNamedPageDescs )
+// {
+// for( USHORT i=0; i<pNamedPageDescs->Count(); i++ )
+// SetPageDescAttrs( (*pNamedPageDescs)[i],
+// pPageEntry->GetItemSet(),
+// pPageEntry->GetPropertyInfo() );
+// }
}
@@ -1951,27 +1951,27 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn )
pPageEntry->GetPropertyInfo() );
// und jetzt noch die benannten Vorlagen
-// for( USHORT i=0; i < GetPageCount(); i++ )
-// {
-// pPageEntry = GetPage( i );
-// const String& rKey = pPageEntry->GetKey();
-// if( !rKey.Len() || rKey.GetChar(0) == ':' )
-// continue;
+// for( USHORT i=0; i < GetPageCount(); i++ )
+// {
+// pPageEntry = GetPage( i );
+// const String& rKey = pPageEntry->GetKey();
+// if( !rKey.Len() || rKey.GetChar(0) == ':' )
+// continue;
//
-// String aName( rKey );
-// GetpApp()->GetAppInternational().ToLower( aName );
-// USHORT nPage = pDoc->MakePageDesc( aName );
-// SwPageDesc *pPageDesc = &pDoc->_GetPageDesc( nPage );
+// String aName( rKey );
+// GetpApp()->GetAppInternational().ToLower( aName );
+// USHORT nPage = pDoc->MakePageDesc( aName );
+// SwPageDesc *pPageDesc = &pDoc->_GetPageDesc( nPage );
//
-// // Die neue Seitenvorlage entsteht aus dem Master durch kopieren.
-// pDoc->CopyPageDesc( *pMasterPageDesc, *pPageDesc );
-// SetPageDescAttrs( pPageDesc, pPageEntry->GetItemSet(),
-// pPageEntry->GetPropertyInfo() );
+// // Die neue Seitenvorlage entsteht aus dem Master durch kopieren.
+// pDoc->CopyPageDesc( *pMasterPageDesc, *pPageDesc );
+// SetPageDescAttrs( pPageDesc, pPageEntry->GetItemSet(),
+// pPageEntry->GetPropertyInfo() );
//
-// if( !pNamedPageDescs )
-// pNamedPageDescs = new SwHTMLPageDescs;
-// pNamedPageDescs->Insert( pPageDesc, pNamedPageDescs->Count() );
-// }
+// if( !pNamedPageDescs )
+// pNamedPageDescs = new SwHTMLPageDescs;
+// pNamedPageDescs->Insert( pPageDesc, pNamedPageDescs->Count() );
+// }
return TRUE;
}
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 049ba78cce4d..85ffe829af0e 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -2,7 +2,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
@@ -56,23 +56,23 @@ using namespace ::com::sun::star;
class _HTMLAttrContext_SaveDoc
{
- SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung
- SwPosition *pPos; // hierhin beim verlassen den
+ SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung
+ SwPosition *pPos; // hierhin beim verlassen den
// Kontexts zurueckgesprungen
- _HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute,
+ _HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute,
// wenn Attributierung nicht
// beibehalten werden soll.
- USHORT nContextStMin; // In Umgebung gueltige Stack-
+ USHORT nContextStMin; // In Umgebung gueltige Stack-
// Untergrenze, wenn der Stack
// geschuetzt werden soll.
- USHORT nContextStAttrMin; // In Umgebung gueltige Stack-
+ USHORT nContextStAttrMin; // In Umgebung gueltige Stack-
// Untergrenze, wenn die Attribute
// nicht beibehalten werden sollen.
- BOOL bStripTrailingPara : 1; // letzen Absatz entfernen?
- BOOL bKeepNumRules : 1; // Numerierung beibehalten?
- BOOL bPopStack : 1; // Stack-Elemente oberhalb des
+ BOOL bStripTrailingPara : 1; // letzen Absatz entfernen?
+ BOOL bKeepNumRules : 1; // Numerierung beibehalten?
+ BOOL bPopStack : 1; // Stack-Elemente oberhalb des
// zu schliessenden entfernen?
BOOL bFixHeaderDist : 1;
BOOL bFixFooterDist : 1;
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 3e47fe1b4aa6..b10945464f32 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -2,7 +2,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
@@ -71,27 +71,27 @@
using namespace ::com::sun::star;
-const sal_uInt32 HTML_FRMOPTS_MARQUEE =
+const sal_uInt32 HTML_FRMOPTS_MARQUEE =
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE;
-const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 =
+const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL },
- { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE },
- { OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SDRTEXTANI_SLIDE },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL },
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE },
+ { OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SDRTEXTANI_SLIDE },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLMarqDirectionTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT },
- { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT },
+ { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT },
+ { 0, 0 }
};
/* */
@@ -181,7 +181,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
SwFmtAnchor aAnchor( FLY_AS_CHAR );
if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
- SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
+ SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
pDoc->GetNodes()[pPam->GetPoint()->nNode]->FindFlyStartNode();
@@ -238,23 +238,23 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
switch( rSwItem.Which() )
{
- case RES_CHRATR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
- case RES_CHRATR_CROSSEDOUT: nEEWhich = EE_CHAR_STRIKEOUT; break;
- case RES_CHRATR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT; break;
- case RES_CHRATR_FONT: nEEWhich = EE_CHAR_FONTINFO; break;
- case RES_CHRATR_CJK_FONT: nEEWhich = EE_CHAR_FONTINFO_CJK; break;
- case RES_CHRATR_CTL_FONT: nEEWhich = EE_CHAR_FONTINFO_CTL; break;
- case RES_CHRATR_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT; break;
- case RES_CHRATR_CJK_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CJK; break;
- case RES_CHRATR_CTL_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CTL; break;
- case RES_CHRATR_KERNING: nEEWhich = EE_CHAR_KERNING; break;
- case RES_CHRATR_POSTURE: nEEWhich = EE_CHAR_ITALIC; break;
- case RES_CHRATR_CJK_POSTURE: nEEWhich = EE_CHAR_ITALIC_CJK; break;
- case RES_CHRATR_CTL_POSTURE: nEEWhich = EE_CHAR_ITALIC_CTL; break;
- case RES_CHRATR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE; break;
- case RES_CHRATR_WEIGHT: nEEWhich = EE_CHAR_WEIGHT; break;
- case RES_CHRATR_CJK_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CJK; break;
- case RES_CHRATR_CTL_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CTL; break;
+ case RES_CHRATR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
+ case RES_CHRATR_CROSSEDOUT: nEEWhich = EE_CHAR_STRIKEOUT; break;
+ case RES_CHRATR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT; break;
+ case RES_CHRATR_FONT: nEEWhich = EE_CHAR_FONTINFO; break;
+ case RES_CHRATR_CJK_FONT: nEEWhich = EE_CHAR_FONTINFO_CJK; break;
+ case RES_CHRATR_CTL_FONT: nEEWhich = EE_CHAR_FONTINFO_CTL; break;
+ case RES_CHRATR_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT; break;
+ case RES_CHRATR_CJK_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CJK; break;
+ case RES_CHRATR_CTL_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CTL; break;
+ case RES_CHRATR_KERNING: nEEWhich = EE_CHAR_KERNING; break;
+ case RES_CHRATR_POSTURE: nEEWhich = EE_CHAR_ITALIC; break;
+ case RES_CHRATR_CJK_POSTURE: nEEWhich = EE_CHAR_ITALIC_CJK; break;
+ case RES_CHRATR_CTL_POSTURE: nEEWhich = EE_CHAR_ITALIC_CTL; break;
+ case RES_CHRATR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE; break;
+ case RES_CHRATR_WEIGHT: nEEWhich = EE_CHAR_WEIGHT; break;
+ case RES_CHRATR_CJK_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CJK; break;
+ case RES_CHRATR_CTL_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CTL; break;
case RES_BACKGROUND:
case RES_CHRATR_BACKGROUND:
{
@@ -406,10 +406,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
eAniDir = SDRTEXTANI_RIGHT;
// die fuer das Scrollen benoetigten Attribute umsetzen
- sal_uInt16 aWhichMap[7] = { XATTR_FILL_FIRST, XATTR_FILL_LAST,
+ sal_uInt16 aWhichMap[7] = { XATTR_FILL_FIRST, XATTR_FILL_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
- EE_CHAR_START, EE_CHAR_END,
- 0 };
+ EE_CHAR_START, EE_CHAR_END,
+ 0 };
SfxItemSet aItemSet( pModel->GetItemPool(), aWhichMap );
aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
aItemSet.Put( SdrTextAutoGrowHeightItem( sal_True ) );
@@ -555,7 +555,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// und das Objekt in das Dok einfuegen
InsertDrawObject( pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
- aPropInfo );
+ aPropInfo );
// Das Zeichen-Objekt der Tabelle bekanntmachen. Ist ein bisserl
// umstaendlich, weil noch ueber den Parser gegangen wird, obwohl die
@@ -648,23 +648,23 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
sal_uInt16 nSwWhich = 0;
switch( nEEWhich )
{
- case EE_CHAR_COLOR: nSwWhich = RES_CHRATR_COLOR; break;
- case EE_CHAR_STRIKEOUT: nSwWhich = RES_CHRATR_CROSSEDOUT; break;
- case EE_CHAR_ESCAPEMENT: nSwWhich = RES_CHRATR_ESCAPEMENT; break;
- case EE_CHAR_FONTINFO: nSwWhich = RES_CHRATR_FONT; break;
- case EE_CHAR_FONTINFO_CJK: nSwWhich = RES_CHRATR_CJK_FONT; break;
- case EE_CHAR_FONTINFO_CTL: nSwWhich = RES_CHRATR_CTL_FONT; break;
- case EE_CHAR_FONTHEIGHT: nSwWhich = RES_CHRATR_FONTSIZE; break;
+ case EE_CHAR_COLOR: nSwWhich = RES_CHRATR_COLOR; break;
+ case EE_CHAR_STRIKEOUT: nSwWhich = RES_CHRATR_CROSSEDOUT; break;
+ case EE_CHAR_ESCAPEMENT: nSwWhich = RES_CHRATR_ESCAPEMENT; break;
+ case EE_CHAR_FONTINFO: nSwWhich = RES_CHRATR_FONT; break;
+ case EE_CHAR_FONTINFO_CJK: nSwWhich = RES_CHRATR_CJK_FONT; break;
+ case EE_CHAR_FONTINFO_CTL: nSwWhich = RES_CHRATR_CTL_FONT; break;
+ case EE_CHAR_FONTHEIGHT: nSwWhich = RES_CHRATR_FONTSIZE; break;
case EE_CHAR_FONTHEIGHT_CJK:nSwWhich = RES_CHRATR_CJK_FONTSIZE; break;
case EE_CHAR_FONTHEIGHT_CTL:nSwWhich = RES_CHRATR_CTL_FONTSIZE; break;
- case EE_CHAR_KERNING: nSwWhich = RES_CHRATR_KERNING; break;
- case EE_CHAR_ITALIC: nSwWhich = RES_CHRATR_POSTURE; break;
- case EE_CHAR_ITALIC_CJK: nSwWhich = RES_CHRATR_CJK_POSTURE; break;
- case EE_CHAR_ITALIC_CTL: nSwWhich = RES_CHRATR_CTL_POSTURE; break;
- case EE_CHAR_UNDERLINE: nSwWhich = RES_CHRATR_UNDERLINE; break;
- case EE_CHAR_WEIGHT: nSwWhich = RES_CHRATR_WEIGHT; break;
- case EE_CHAR_WEIGHT_CJK: nSwWhich = RES_CHRATR_CJK_WEIGHT; break;
- case EE_CHAR_WEIGHT_CTL: nSwWhich = RES_CHRATR_CTL_WEIGHT; break;
+ case EE_CHAR_KERNING: nSwWhich = RES_CHRATR_KERNING; break;
+ case EE_CHAR_ITALIC: nSwWhich = RES_CHRATR_POSTURE; break;
+ case EE_CHAR_ITALIC_CJK: nSwWhich = RES_CHRATR_CJK_POSTURE; break;
+ case EE_CHAR_ITALIC_CTL: nSwWhich = RES_CHRATR_CTL_POSTURE; break;
+ case EE_CHAR_UNDERLINE: nSwWhich = RES_CHRATR_UNDERLINE; break;
+ case EE_CHAR_WEIGHT: nSwWhich = RES_CHRATR_WEIGHT; break;
+ case EE_CHAR_WEIGHT_CJK: nSwWhich = RES_CHRATR_CJK_WEIGHT; break;
+ case EE_CHAR_WEIGHT_CTL: nSwWhich = RES_CHRATR_CTL_WEIGHT; break;
}
if( nSwWhich )
@@ -718,9 +718,9 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
const sal_Char *pStr = 0;
switch( eAniKind )
{
- case SDRTEXTANI_SCROLL: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break;
- case SDRTEXTANI_SLIDE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_slide; break;
- case SDRTEXTANI_ALTERNATE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_alternate; break;
+ case SDRTEXTANI_SCROLL: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break;
+ case SDRTEXTANI_SLIDE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_slide; break;
+ case SDRTEXTANI_ALTERNATE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_alternate; break;
default:
;
}
@@ -733,8 +733,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
SdrTextAniDirection eAniDir = pTextObj->GetTextAniDirection();
switch( eAniDir )
{
- case SDRTEXTANI_LEFT: pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break;
- case SDRTEXTANI_RIGHT: pStr = OOO_STRING_SVTOOLS_HTML_AL_right; break;
+ case SDRTEXTANI_LEFT: pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break;
+ case SDRTEXTANI_RIGHT: pStr = OOO_STRING_SVTOOLS_HTML_AL_right; break;
default:
;
}
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 511fcbb27c43..a97ee39c0d9a 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -2,7 +2,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
@@ -58,71 +58,71 @@ struct HTMLNumFmtTblEntry
static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] =
{
- { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD },
- { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD },
- { "DATE", RES_DATEFLD },
- { "TIME", RES_TIMEFLD },
- { OOO_STRING_SW_HTML_FT_datetime,RES_DATETIMEFLD },
- { OOO_STRING_SW_HTML_FT_page, RES_PAGENUMBERFLD },
- { OOO_STRING_SW_HTML_FT_docinfo, RES_DOCINFOFLD },
- { OOO_STRING_SW_HTML_FT_docstat, RES_DOCSTATFLD },
- { OOO_STRING_SW_HTML_FT_filename,RES_FILENAMEFLD },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD },
+ { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD },
+ { "DATE", RES_DATEFLD },
+ { "TIME", RES_TIMEFLD },
+ { OOO_STRING_SW_HTML_FT_datetime,RES_DATETIMEFLD },
+ { OOO_STRING_SW_HTML_FT_page, RES_PAGENUMBERFLD },
+ { OOO_STRING_SW_HTML_FT_docinfo, RES_DOCINFOFLD },
+ { OOO_STRING_SW_HTML_FT_docstat, RES_DOCSTATFLD },
+ { OOO_STRING_SW_HTML_FT_filename,RES_FILENAMEFLD },
+ { 0, 0 }
};
static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] =
{
- { "SSYS", NF_DATE_SYSTEM_SHORT },
- { "LSYS", NF_DATE_SYSTEM_LONG },
- { "DMY", NF_DATE_SYS_DDMMYY, },
- { "DMYY", NF_DATE_SYS_DDMMYYYY, },
- { "DMMY", NF_DATE_SYS_DMMMYY, },
- { "DMMYY", NF_DATE_SYS_DMMMYYYY, },
- { "DMMMY", NF_DATE_DIN_DMMMMYYYY },
- { "DMMMYY", NF_DATE_DIN_DMMMMYYYY },
- { "DDMMY", NF_DATE_SYS_NNDMMMYY },
- { "DDMMMY", NF_DATE_SYS_NNDMMMMYYYY },
- { "DDMMMYY", NF_DATE_SYS_NNDMMMMYYYY },
- { "DDDMMMY", NF_DATE_SYS_NNNNDMMMMYYYY },
- { "DDDMMMYY", NF_DATE_SYS_NNNNDMMMMYYYY },
- { "MY", NF_DATE_SYS_MMYY },
- { "MD", NF_DATE_DIN_MMDD },
- { "YMD", NF_DATE_DIN_YYMMDD },
- { "YYMD", NF_DATE_DIN_YYYYMMDD },
- { 0, NF_NUMERIC_START }
+ { "SSYS", NF_DATE_SYSTEM_SHORT },
+ { "LSYS", NF_DATE_SYSTEM_LONG },
+ { "DMY", NF_DATE_SYS_DDMMYY, },
+ { "DMYY", NF_DATE_SYS_DDMMYYYY, },
+ { "DMMY", NF_DATE_SYS_DMMMYY, },
+ { "DMMYY", NF_DATE_SYS_DMMMYYYY, },
+ { "DMMMY", NF_DATE_DIN_DMMMMYYYY },
+ { "DMMMYY", NF_DATE_DIN_DMMMMYYYY },
+ { "DDMMY", NF_DATE_SYS_NNDMMMYY },
+ { "DDMMMY", NF_DATE_SYS_NNDMMMMYYYY },
+ { "DDMMMYY", NF_DATE_SYS_NNDMMMMYYYY },
+ { "DDDMMMY", NF_DATE_SYS_NNNNDMMMMYYYY },
+ { "DDDMMMYY", NF_DATE_SYS_NNNNDMMMMYYYY },
+ { "MY", NF_DATE_SYS_MMYY },
+ { "MD", NF_DATE_DIN_MMDD },
+ { "YMD", NF_DATE_DIN_YYMMDD },
+ { "YYMD", NF_DATE_DIN_YYYYMMDD },
+ { 0, NF_NUMERIC_START }
};
static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] =
{
- { "SYS", NF_TIME_HHMMSS },
- { "SSMM24", NF_TIME_HHMM },
- { "SSMM12", NF_TIME_HHMMAMPM },
- { 0, NF_NUMERIC_START }
+ { "SYS", NF_TIME_HHMMSS },
+ { "SSMM24", NF_TIME_HHMM },
+ { "SSMM12", NF_TIME_HHMMAMPM },
+ { 0, NF_NUMERIC_START }
};
static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] =
{
- { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER },
- { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER },
- { OOO_STRING_SW_HTML_FF_uroman, SVX_NUM_ROMAN_UPPER },
- { OOO_STRING_SW_HTML_FF_lroman, SVX_NUM_ROMAN_LOWER },
- { OOO_STRING_SW_HTML_FF_arabic, SVX_NUM_ARABIC },
- { OOO_STRING_SW_HTML_FF_none, SVX_NUM_NUMBER_NONE },
- { OOO_STRING_SW_HTML_FF_char, SVX_NUM_CHAR_SPECIAL },
- { OOO_STRING_SW_HTML_FF_page, SVX_NUM_PAGEDESC },
- { OOO_STRING_SW_HTML_FF_ulettern, SVX_NUM_CHARS_UPPER_LETTER_N },
- { OOO_STRING_SW_HTML_FF_llettern, SVX_NUM_CHARS_LOWER_LETTER_N },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER },
+ { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER },
+ { OOO_STRING_SW_HTML_FF_uroman, SVX_NUM_ROMAN_UPPER },
+ { OOO_STRING_SW_HTML_FF_lroman, SVX_NUM_ROMAN_LOWER },
+ { OOO_STRING_SW_HTML_FF_arabic, SVX_NUM_ARABIC },
+ { OOO_STRING_SW_HTML_FF_none, SVX_NUM_NUMBER_NONE },
+ { OOO_STRING_SW_HTML_FF_char, SVX_NUM_CHAR_SPECIAL },
+ { OOO_STRING_SW_HTML_FF_page, SVX_NUM_PAGEDESC },
+ { OOO_STRING_SW_HTML_FF_ulettern, SVX_NUM_CHARS_UPPER_LETTER_N },
+ { OOO_STRING_SW_HTML_FF_llettern, SVX_NUM_CHARS_LOWER_LETTER_N },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] =
{
- { OOO_STRING_SW_HTML_FS_company, EU_COMPANY },
- { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME },
- { OOO_STRING_SW_HTML_FS_name, EU_NAME },
- { OOO_STRING_SW_HTML_FS_shortcut, EU_SHORTCUT },
- { OOO_STRING_SW_HTML_FS_street, EU_STREET },
+ { OOO_STRING_SW_HTML_FS_company, EU_COMPANY },
+ { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME },
+ { OOO_STRING_SW_HTML_FS_name, EU_NAME },
+ { OOO_STRING_SW_HTML_FS_shortcut, EU_SHORTCUT },
+ { OOO_STRING_SW_HTML_FS_street, EU_STREET },
{ OOO_STRING_SW_HTML_FS_country, EU_COUNTRY },
{ OOO_STRING_SW_HTML_FS_zip, EU_ZIP },
{ OOO_STRING_SW_HTML_FS_city, EU_CITY },
@@ -133,75 +133,75 @@ static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] =
{ OOO_STRING_SW_HTML_FS_fax, EU_FAX },
{ OOO_STRING_SW_HTML_FS_email, EU_EMAIL },
{ OOO_STRING_SW_HTML_FS_state, EU_STATE },
- { 0, 0 }
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] =
{
- { OOO_STRING_SW_HTML_FF_name, AF_NAME },
- { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FF_name, AF_NAME },
+ { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] =
{
- { OOO_STRING_SW_HTML_FS_random, PG_RANDOM },
- { OOO_STRING_SW_HTML_FS_next, PG_NEXT },
- { OOO_STRING_SW_HTML_FS_prev, PG_PREV },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FS_random, PG_RANDOM },
+ { OOO_STRING_SW_HTML_FS_next, PG_NEXT },
+ { OOO_STRING_SW_HTML_FS_prev, PG_PREV },
+ { 0, 0 }
};
// UGLY: these are extensions of nsSwDocInfoSubType (in inc/docufld.hxx)
// these are necessary for importing document info fields written by
// older versions of OOo (< 3.0) which did not have DI_CUSTOM fields
- const SwDocInfoSubType DI_INFO1 = DI_SUBTYPE_END + 1;
- const SwDocInfoSubType DI_INFO2 = DI_SUBTYPE_END + 2;
- const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3;
- const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4;
+ const SwDocInfoSubType DI_INFO1 = DI_SUBTYPE_END + 1;
+ const SwDocInfoSubType DI_INFO2 = DI_SUBTYPE_END + 2;
+ const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3;
+ const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4;
static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] =
{
- { OOO_STRING_SW_HTML_FS_title, DI_TITEL },
- { OOO_STRING_SW_HTML_FS_theme, DI_THEMA },
- { OOO_STRING_SW_HTML_FS_keys, DI_KEYS },
+ { OOO_STRING_SW_HTML_FS_title, DI_TITEL },
+ { OOO_STRING_SW_HTML_FS_theme, DI_THEMA },
+ { OOO_STRING_SW_HTML_FS_keys, DI_KEYS },
{ OOO_STRING_SW_HTML_FS_comment, DI_COMMENT },
- { "INFO1", DI_INFO1 },
- { "INFO2", DI_INFO2 },
- { "INFO3", DI_INFO3 },
- { "INFO4", DI_INFO4 },
- { OOO_STRING_SW_HTML_FS_custom, DI_CUSTOM },
- { OOO_STRING_SW_HTML_FS_create, DI_CREATE },
- { OOO_STRING_SW_HTML_FS_change, DI_CHANGE },
- { 0, 0 }
+ { "INFO1", DI_INFO1 },
+ { "INFO2", DI_INFO2 },
+ { "INFO3", DI_INFO3 },
+ { "INFO4", DI_INFO4 },
+ { OOO_STRING_SW_HTML_FS_custom, DI_CUSTOM },
+ { OOO_STRING_SW_HTML_FS_create, DI_CREATE },
+ { OOO_STRING_SW_HTML_FS_change, DI_CHANGE },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] =
{
- { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR },
- { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME },
- { OOO_STRING_SW_HTML_FF_date, DI_SUB_DATE },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR },
+ { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME },
+ { OOO_STRING_SW_HTML_FF_date, DI_SUB_DATE },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] =
{
- { OOO_STRING_SW_HTML_FS_page, DS_PAGE },
- { OOO_STRING_SW_HTML_FS_para, DS_PARA },
- { OOO_STRING_SW_HTML_FS_word, DS_WORD },
- { OOO_STRING_SW_HTML_FS_char, DS_CHAR },
- { OOO_STRING_SW_HTML_FS_tbl, DS_TBL },
- { OOO_STRING_SW_HTML_FS_grf, DS_GRF },
- { OOO_STRING_SW_HTML_FS_ole, DS_OLE },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FS_page, DS_PAGE },
+ { OOO_STRING_SW_HTML_FS_para, DS_PARA },
+ { OOO_STRING_SW_HTML_FS_word, DS_WORD },
+ { OOO_STRING_SW_HTML_FS_char, DS_CHAR },
+ { OOO_STRING_SW_HTML_FS_tbl, DS_TBL },
+ { OOO_STRING_SW_HTML_FS_grf, DS_GRF },
+ { OOO_STRING_SW_HTML_FS_ole, DS_OLE },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLFileNameFldFmtTable[] =
{
- { OOO_STRING_SW_HTML_FF_name, FF_NAME },
- { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME },
- { OOO_STRING_SW_HTML_FF_path, FF_PATH },
- { OOO_STRING_SW_HTML_FF_name_noext, FF_NAME_NOEXT },
- { 0, 0 }
+ { OOO_STRING_SW_HTML_FF_name, FF_NAME },
+ { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME },
+ { OOO_STRING_SW_HTML_FF_path, FF_PATH },
+ { OOO_STRING_SW_HTML_FF_name_noext, FF_NAME_NOEXT },
+ { 0, 0 }
};
/* */
@@ -364,7 +364,7 @@ void SwHTMLParser::NewField()
if( aValue.Len() )
nSub |= FIXEDFLD;
- SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
+ SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
if( pFmtOption )
{
const String& rFmt = pFmtOption->GetString();
@@ -396,7 +396,7 @@ void SwHTMLParser::NewField()
{
USHORT nSub = 0;
- SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
+ SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
sal_uInt32 nNumFmt;
LanguageType eLang;
double dValue = GetTableDataOptionsValNum(
@@ -405,7 +405,7 @@ void SwHTMLParser::NewField()
short nFmtType = pFormatter->GetType( nNumFmt );
switch( nFmtType )
{
- case NUMBERFORMAT_DATE: nSub = DATEFLD; break;
+ case NUMBERFORMAT_DATE: nSub = DATEFLD; break;
case NUMBERFORMAT_TIME: nSub = TIMEFLD; break;
}
diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx
index 812e895ca287..6b4f80c280b4 100644
--- a/sw/source/filter/html/htmlfld.hxx
+++ b/sw/source/filter/html/htmlfld.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index e86060f85d59..50dd594c50f2 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -2,7 +2,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
@@ -54,16 +54,16 @@ const sal_Char *SwHTMLWriter::GetNumFormat( USHORT nFmt )
switch( (SvxExtNumType)nFmt )
{
- case SVX_NUM_CHARS_UPPER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_uletter; break;
- case SVX_NUM_CHARS_LOWER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_lletter; break;
- case SVX_NUM_ROMAN_UPPER: pFmtStr = OOO_STRING_SW_HTML_FF_uroman; break;
- case SVX_NUM_ROMAN_LOWER: pFmtStr = OOO_STRING_SW_HTML_FF_lroman; break;
- case SVX_NUM_ARABIC: pFmtStr = OOO_STRING_SW_HTML_FF_arabic; break;
- case SVX_NUM_NUMBER_NONE: pFmtStr = OOO_STRING_SW_HTML_FF_none; break;
- case SVX_NUM_CHAR_SPECIAL: pFmtStr = OOO_STRING_SW_HTML_FF_char; break;
- case SVX_NUM_PAGEDESC: pFmtStr = OOO_STRING_SW_HTML_FF_page; break;
- case SVX_NUM_CHARS_UPPER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_ulettern; break;
- case SVX_NUM_CHARS_LOWER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_llettern; break;
+ case SVX_NUM_CHARS_UPPER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_uletter; break;
+ case SVX_NUM_CHARS_LOWER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_lletter; break;
+ case SVX_NUM_ROMAN_UPPER: pFmtStr = OOO_STRING_SW_HTML_FF_uroman; break;
+ case SVX_NUM_ROMAN_LOWER: pFmtStr = OOO_STRING_SW_HTML_FF_lroman; break;
+ case SVX_NUM_ARABIC: pFmtStr = OOO_STRING_SW_HTML_FF_arabic; break;
+ case SVX_NUM_NUMBER_NONE: pFmtStr = OOO_STRING_SW_HTML_FF_none; break;
+ case SVX_NUM_CHAR_SPECIAL: pFmtStr = OOO_STRING_SW_HTML_FF_char; break;
+ case SVX_NUM_PAGEDESC: pFmtStr = OOO_STRING_SW_HTML_FF_page; break;
+ case SVX_NUM_CHARS_UPPER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_ulettern; break;
+ case SVX_NUM_CHARS_LOWER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_llettern; break;
default:
;
}
@@ -81,14 +81,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
USHORT nField = pFldTyp->Which();
ULONG nFmt = pFld->GetFormat();
- const sal_Char *pTypeStr=0, // TYPE
- *pSubStr=0, // SUBTYPE
- *pFmtStr=0; // FORMAT (SW)
- String aValue; // VALUE (SW)
- BOOL bNumFmt=FALSE; // SDNUM (Number-Formatter-Format)
- BOOL bNumValue=FALSE; // SDVAL (Number-Formatter-Value)
- double dNumValue = 0.0; // SDVAL (Number-Formatter-Value)
- BOOL bFixed=FALSE; // SDFIXED
+ const sal_Char *pTypeStr=0, // TYPE
+ *pSubStr=0, // SUBTYPE
+ *pFmtStr=0; // FORMAT (SW)
+ String aValue; // VALUE (SW)
+ BOOL bNumFmt=FALSE; // SDNUM (Number-Formatter-Format)
+ BOOL bNumValue=FALSE; // SDVAL (Number-Formatter-Value)
+ double dNumValue = 0.0; // SDVAL (Number-Formatter-Value)
+ BOOL bFixed=FALSE; // SDFIXED
String aName; // NAME (CUSTOM)
switch( nField )
@@ -97,21 +97,21 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
pTypeStr = OOO_STRING_SW_HTML_FT_sender;
switch( (SwExtUserSubType)pFld->GetSubType() )
{
- case EU_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_company; break;
- case EU_FIRSTNAME: pSubStr = OOO_STRING_SW_HTML_FS_firstname; break;
- case EU_NAME: pSubStr = OOO_STRING_SW_HTML_FS_name; break;
- case EU_SHORTCUT: pSubStr = OOO_STRING_SW_HTML_FS_shortcut; break;
- case EU_STREET: pSubStr = OOO_STRING_SW_HTML_FS_street; break;
- case EU_COUNTRY: pSubStr = OOO_STRING_SW_HTML_FS_country; break;
- case EU_ZIP: pSubStr = OOO_STRING_SW_HTML_FS_zip; break;
- case EU_CITY: pSubStr = OOO_STRING_SW_HTML_FS_city; break;
- case EU_TITLE: pSubStr = OOO_STRING_SW_HTML_FS_title; break;
- case EU_POSITION: pSubStr = OOO_STRING_SW_HTML_FS_position; break;
- case EU_PHONE_PRIVATE: pSubStr = OOO_STRING_SW_HTML_FS_pphone; break;
- case EU_PHONE_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_cphone; break;
- case EU_FAX: pSubStr = OOO_STRING_SW_HTML_FS_fax; break;
- case EU_EMAIL: pSubStr = OOO_STRING_SW_HTML_FS_email; break;
- case EU_STATE: pSubStr = OOO_STRING_SW_HTML_FS_state; break;
+ case EU_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_company; break;
+ case EU_FIRSTNAME: pSubStr = OOO_STRING_SW_HTML_FS_firstname; break;
+ case EU_NAME: pSubStr = OOO_STRING_SW_HTML_FS_name; break;
+ case EU_SHORTCUT: pSubStr = OOO_STRING_SW_HTML_FS_shortcut; break;
+ case EU_STREET: pSubStr = OOO_STRING_SW_HTML_FS_street; break;
+ case EU_COUNTRY: pSubStr = OOO_STRING_SW_HTML_FS_country; break;
+ case EU_ZIP: pSubStr = OOO_STRING_SW_HTML_FS_zip; break;
+ case EU_CITY: pSubStr = OOO_STRING_SW_HTML_FS_city; break;
+ case EU_TITLE: pSubStr = OOO_STRING_SW_HTML_FS_title; break;
+ case EU_POSITION: pSubStr = OOO_STRING_SW_HTML_FS_position; break;
+ case EU_PHONE_PRIVATE: pSubStr = OOO_STRING_SW_HTML_FS_pphone; break;
+ case EU_PHONE_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_cphone; break;
+ case EU_FAX: pSubStr = OOO_STRING_SW_HTML_FS_fax; break;
+ case EU_EMAIL: pSubStr = OOO_STRING_SW_HTML_FS_email; break;
+ case EU_STATE: pSubStr = OOO_STRING_SW_HTML_FS_state; break;
default:
;
}
@@ -123,8 +123,8 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
pTypeStr = OOO_STRING_SW_HTML_FT_author;
switch( (SwAuthorFormat)nFmt & 0xff)
{
- case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
- case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_FF_shortcut; break;
+ case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
+ case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_FF_shortcut; break;
}
OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" );
bFixed = ((const SwAuthorField*)pFld)->IsFixed();
@@ -146,9 +146,9 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
SwPageNumSubType eSubType = (SwPageNumSubType)pFld->GetSubType();
switch( eSubType )
{
- case PG_RANDOM: pSubStr = OOO_STRING_SW_HTML_FS_random; break;
- case PG_NEXT: pSubStr = OOO_STRING_SW_HTML_FS_next; break;
- case PG_PREV: pSubStr = OOO_STRING_SW_HTML_FS_prev; break;
+ case PG_RANDOM: pSubStr = OOO_STRING_SW_HTML_FS_random; break;
+ case PG_NEXT: pSubStr = OOO_STRING_SW_HTML_FS_next; break;
+ case PG_PREV: pSubStr = OOO_STRING_SW_HTML_FS_prev; break;
}
OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
@@ -179,14 +179,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
switch( nSubType )
{
- case DI_TITEL: pSubStr = OOO_STRING_SW_HTML_FS_title; break;
- case DI_THEMA: pSubStr = OOO_STRING_SW_HTML_FS_theme; break;
- case DI_KEYS: pSubStr = OOO_STRING_SW_HTML_FS_keys; break;
+ case DI_TITEL: pSubStr = OOO_STRING_SW_HTML_FS_title; break;
+ case DI_THEMA: pSubStr = OOO_STRING_SW_HTML_FS_theme; break;
+ case DI_KEYS: pSubStr = OOO_STRING_SW_HTML_FS_keys; break;
case DI_COMMENT: pSubStr = OOO_STRING_SW_HTML_FS_comment; break;
- case DI_CREATE: pSubStr = OOO_STRING_SW_HTML_FS_create; break;
- case DI_CHANGE: pSubStr = OOO_STRING_SW_HTML_FS_change; break;
- case DI_CUSTOM: pSubStr = OOO_STRING_SW_HTML_FS_custom; break;
- default: pTypeStr = 0; break;
+ case DI_CREATE: pSubStr = OOO_STRING_SW_HTML_FS_create; break;
+ case DI_CHANGE: pSubStr = OOO_STRING_SW_HTML_FS_change; break;
+ case DI_CUSTOM: pSubStr = OOO_STRING_SW_HTML_FS_custom; break;
+ default: pTypeStr = 0; break;
}
if( DI_CUSTOM == nSubType ) {
@@ -237,14 +237,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
USHORT nSubType = pFld->GetSubType();
switch( nSubType )
{
- case DS_PAGE: pSubStr = OOO_STRING_SW_HTML_FS_page; break;
- case DS_PARA: pSubStr = OOO_STRING_SW_HTML_FS_para; break;
- case DS_WORD: pSubStr = OOO_STRING_SW_HTML_FS_word; break;
- case DS_CHAR: pSubStr = OOO_STRING_SW_HTML_FS_char; break;
- case DS_TBL: pSubStr = OOO_STRING_SW_HTML_FS_tbl; break;
- case DS_GRF: pSubStr = OOO_STRING_SW_HTML_FS_grf; break;
- case DS_OLE: pSubStr = OOO_STRING_SW_HTML_FS_ole; break;
- default: pTypeStr = 0; break;
+ case DS_PAGE: pSubStr = OOO_STRING_SW_HTML_FS_page; break;
+ case DS_PARA: pSubStr = OOO_STRING_SW_HTML_FS_para; break;
+ case DS_WORD: pSubStr = OOO_STRING_SW_HTML_FS_word; break;
+ case DS_CHAR: pSubStr = OOO_STRING_SW_HTML_FS_char; break;
+ case DS_TBL: pSubStr = OOO_STRING_SW_HTML_FS_tbl; break;
+ case DS_GRF: pSubStr = OOO_STRING_SW_HTML_FS_grf; break;
+ case DS_OLE: pSubStr = OOO_STRING_SW_HTML_FS_ole; break;
+ default: pTypeStr = 0; break;
}
pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
}
@@ -254,10 +254,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
pTypeStr = OOO_STRING_SW_HTML_FT_filename;
switch( (SwFileNameFormat)(nFmt & ~FF_FIXED) )
{
- case FF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
- case FF_PATHNAME: pFmtStr = OOO_STRING_SW_HTML_FF_pathname; break;
- case FF_PATH: pFmtStr = OOO_STRING_SW_HTML_FF_path; break;
- case FF_NAME_NOEXT: pFmtStr = OOO_STRING_SW_HTML_FF_name_noext; break;
+ case FF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break;
+ case FF_PATHNAME: pFmtStr = OOO_STRING_SW_HTML_FF_pathname; break;
+ case FF_PATH: pFmtStr = OOO_STRING_SW_HTML_FF_path; break;
+ case FF_NAME_NOEXT: pFmtStr = OOO_STRING_SW_HTML_FF_name_noext; break;
default:
;
}
@@ -370,9 +370,9 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
sal_uInt16 *pWhichIds = 0;
switch( nScript )
{
- case CSS1_OUTMODE_WESTERN: pWhichIds = aWesternWhichIds; break;
- case CSS1_OUTMODE_CJK: pWhichIds = aCJKWhichIds; break;
- case CSS1_OUTMODE_CTL: pWhichIds = aCTLWhichIds; break;
+ case CSS1_OUTMODE_WESTERN: pWhichIds = aWesternWhichIds; break;
+ case CSS1_OUTMODE_CJK: pWhichIds = aCJKWhichIds; break;
+ case CSS1_OUTMODE_CTL: pWhichIds = aCTLWhichIds; break;
}
rHTMLWrt.bTagOn = TRUE;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index ec4812a522cb..25db83fde906 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -2,7 +2,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
@@ -78,25 +78,25 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////
-const ULONG HTML_FRMOPTS_IMG_ALL =
+const ULONG HTML_FRMOPTS_IMG_ALL =
HTML_FRMOPT_ALT |
HTML_FRMOPT_SIZE |
HTML_FRMOPT_ANYSIZE |
HTML_FRMOPT_BORDER |
HTML_FRMOPT_NAME;
-const ULONG HTML_FRMOPTS_IMG_CNTNR =
+const ULONG HTML_FRMOPTS_IMG_CNTNR =
HTML_FRMOPTS_IMG_ALL |
HTML_FRMOPT_ABSSIZE;
-const ULONG HTML_FRMOPTS_IMG =
+const ULONG HTML_FRMOPTS_IMG =
HTML_FRMOPTS_IMG_ALL |
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE |
HTML_FRMOPT_BRCLEAR;
-const ULONG HTML_FRMOPTS_IMG_CSS1 =
+const ULONG HTML_FRMOPTS_IMG_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
-const ULONG HTML_FRMOPTS_DIV =
+const ULONG HTML_FRMOPTS_DIV =
HTML_FRMOPT_ID |
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SIZE |
@@ -108,22 +108,22 @@ const ULONG HTML_FRMOPTS_DIV =
HTML_FRMOPT_BRCLEAR |
HTML_FRMOPT_DIR;
-const ULONG HTML_FRMOPTS_MULTICOL =
+const ULONG HTML_FRMOPTS_MULTICOL =
HTML_FRMOPT_ID |
HTML_FRMOPT_WIDTH |
HTML_FRMOPT_ANYSIZE |
HTML_FRMOPT_ABSSIZE |
HTML_FRMOPT_DIR;
-const ULONG HTML_FRMOPTS_MULTICOL_CNTNR =
+const ULONG HTML_FRMOPTS_MULTICOL_CNTNR =
HTML_FRMOPTS_MULTICOL;
-const ULONG HTML_FRMOPTS_MULTICOL_CSS1 =
+const ULONG HTML_FRMOPTS_MULTICOL_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SIZE |
HTML_FRMOPT_S_SPACE |
HTML_FRMOPT_S_BORDER|
HTML_FRMOPT_S_BACKGROUND;
-const ULONG HTML_FRMOPTS_SPACER =
+const ULONG HTML_FRMOPTS_SPACER =
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SIZE |
HTML_FRMOPT_ANYSIZE |
@@ -131,7 +131,7 @@ const ULONG HTML_FRMOPTS_SPACER =
HTML_FRMOPT_MARGINSIZE |
HTML_FRMOPT_ABSSIZE;
-const ULONG HTML_FRMOPTS_CNTNR =
+const ULONG HTML_FRMOPTS_CNTNR =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE |
HTML_FRMOPT_S_WIDTH |
@@ -147,30 +147,30 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFmt );
static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
const SwFrmFmt& rFrmFmt, BOOL bSpan );
static Writer& OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFmt,
- BOOL bInCntnr );
+ BOOL bInCntnr );
static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
- BOOL bInCntnr );
+ BOOL bInCntnr );
static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
- const SdrObject& rSdrObj );
+ const SdrObject& rSdrObj );
//-----------------------------------------------------------------------
extern HTMLOutEvent __FAR_DATA aAnchorEventTable[];
static HTMLOutEvent __FAR_DATA aImageEventTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SVX_EVENT_IMAGE_LOAD },
- { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SVX_EVENT_IMAGE_ABORT },
- { OOO_STRING_SVTOOLS_HTML_O_SDonerror, OOO_STRING_SVTOOLS_HTML_O_onerror, SVX_EVENT_IMAGE_ERROR },
- { 0, 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SVX_EVENT_IMAGE_LOAD },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SVX_EVENT_IMAGE_ABORT },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonerror, OOO_STRING_SVTOOLS_HTML_O_onerror, SVX_EVENT_IMAGE_ERROR },
+ { 0, 0, 0 }
};
static HTMLOutEvent __FAR_DATA aIMapEventTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT },
- { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT },
- { 0, 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT },
+ { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT },
+ { 0, 0, 0 }
};
@@ -379,7 +379,7 @@ void SwHTMLWriter::CollectFlyFrms()
BOOL SwHTMLWriter::OutFlyFrm( ULONG nNdIdx, xub_StrLen nCntntIdx, BYTE nPos,
HTMLOutContext *pContext )
{
- BOOL bFlysLeft = FALSE; // Noch Flys an aktueller Node-Position da?
+ BOOL bFlysLeft = FALSE; // Noch Flys an aktueller Node-Position da?
// OutFlyFrm kan rekursiv aufgerufen werden. Deshalb muss man
// manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben
@@ -412,7 +412,7 @@ BOOL SwHTMLWriter::OutFlyFrm( ULONG nNdIdx, xub_StrLen nCntntIdx, BYTE nPos,
{
delete pHTMLPosFlyFrms;
pHTMLPosFlyFrms = 0;
- bRestart = TRUE; // nicht wirklich, nur raus
+ bRestart = TRUE; // nicht wirklich, nur raus
// aus der Schleife
}
@@ -487,17 +487,17 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt,
switch( nOutMode )
{
- case HTML_OUT_TBLNODE: // OK
+ case HTML_OUT_TBLNODE: // OK
OSL_ENSURE( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" );
OutHTML_FrmFmtTableNode( *this, rFrmFmt );
break;
- case HTML_OUT_GRFNODE: // OK
+ case HTML_OUT_GRFNODE: // OK
OutHTML_FrmFmtGrfNode( *this, rFrmFmt, pCntnrStr != 0 );
break;
- case HTML_OUT_OLENODE: // OK
+ case HTML_OUT_OLENODE: // OK
OutHTML_FrmFmtOLENode( *this, rFrmFmt, pCntnrStr != 0 );
break;
- case HTML_OUT_OLEGRF: // OK
+ case HTML_OUT_OLEGRF: // OK
OutHTML_FrmFmtOLENodeGrf( *this, rFrmFmt, pCntnrStr != 0 );
break;
case HTML_OUT_DIV:
@@ -505,14 +505,14 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt,
OSL_ENSURE( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" );
OutHTML_FrmFmtAsDivOrSpan( *this, rFrmFmt, HTML_OUT_SPAN==nOutMode );
break;
- case HTML_OUT_MULTICOL: // OK
+ case HTML_OUT_MULTICOL: // OK
OutHTML_FrmFmtAsMulticol( *this, rFrmFmt, pCntnrStr != 0 );
break;
- case HTML_OUT_SPACER: // OK
+ case HTML_OUT_SPACER: // OK
OSL_ENSURE( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" );
OutHTML_FrmFmtAsSpacer( *this, rFrmFmt );
break;
- case HTML_OUT_CONTROL: // OK
+ case HTML_OUT_CONTROL: // OK
OutHTML_DrawFrmFmtAsControl( *this,
(const SwDrawFrmFmt &)rFrmFmt, *pSdrObject,
pCntnrStr != 0 );
@@ -912,7 +912,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
rBox.CalcLineSpace(BOX_LINE_RIGHT) );
OSL_ENSURE( nWidth>0, "Gibt es 0 twip breite Grafiken!?" );
- if( nWidth<=0 ) // sollte nicht passieren
+ if( nWidth<=0 ) // sollte nicht passieren
nWidth = 1;
if( rRealSize.Width() != nWidth )
@@ -1221,7 +1221,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
// Grafik als (JPG-)File speichern
if( rHTMLWrt.GetOrigFileName() )
rGrfName = *rHTMLWrt.GetOrigFileName();
- USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName,
+ USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName,
String::CreateFromAscii("JPG"),
(XOUTBMP_USE_GIF_IF_SENSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE));
@@ -1369,7 +1369,7 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
const SwFrmFmt& rFrmFmt,
- BOOL bInCntnr )
+ BOOL bInCntnr )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -1422,7 +1422,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
rWrt.Strm() << '>';
rHTMLWrt.bLFPossible = TRUE;
- rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
+ rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
@@ -1439,9 +1439,9 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
-// rHTMLWrt.ChangeParaToken( 0 ); // MIB 8.7.97: Passiert jetzt in Out_SwDoc
+// rHTMLWrt.ChangeParaToken( 0 ); // MIB 8.7.97: Passiert jetzt in Out_SwDoc
- rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
+ rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, FALSE );
@@ -1508,7 +1508,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
rWrt.Strm() << '>';
- rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken
+ rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken
rHTMLWrt.bLFPossible = TRUE;
const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
@@ -1530,7 +1530,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
- rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
+ rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, FALSE );
@@ -1614,7 +1614,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
USHORT nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm,
String::CreateFromAscii("JPG"), nFlags, &aMM100Size );
- if( nErr ) // fehlerhaft, da ist nichts auszugeben
+ if( nErr ) // fehlerhaft, da ist nichts auszugeben
{
rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
return rWrt;
@@ -1641,7 +1641,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
- const SdrObject& rSdrObj )
+ const SdrObject& rSdrObj )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -1684,7 +1684,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sOut += (bHeader ? "HEADER" : "FOOTER" );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer() );
- rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
+ rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
// Einen Spacer fuer den Absatnd zusammenbasteln. Da durch das
// <DL> bzw. </DL> immer einer Absatz-Abstand entsteht, wird der
@@ -1738,7 +1738,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.GetBuffer() );
}
- rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
+ rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE );
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 0eb14de5d311..fb2d1ae1320d 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -2,7 +2,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
@@ -59,30 +59,30 @@ enum SwHTMLFrmType
HTML_FRMTYPE_END
};
-#define HTML_OUT_TBLNODE 0x00
-#define HTML_OUT_GRFNODE 0x01
-#define HTML_OUT_OLENODE 0x02
-#define HTML_OUT_DIV 0x03
-#define HTML_OUT_MULTICOL 0x04
-#define HTML_OUT_SPACER 0x05
-#define HTML_OUT_CONTROL 0x06
-#define HTML_OUT_AMARQUEE 0x07
-#define HTML_OUT_MARQUEE 0x08
-#define HTML_OUT_GRFFRM 0x09
-#define HTML_OUT_OLEGRF 0x0a
-#define HTML_OUT_SPAN 0x0b
-#define HTML_OUT_MASK 0x0f
-
-#define HTML_POS_PREFIX 0x00
-#define HTML_POS_BEFORE 0x10
-#define HTML_POS_INSIDE 0x20
-#define HTML_POS_ANY 0x30
-#define HTML_POS_MASK 0x30
-
-#define HTML_CNTNR_NONE 0x00
-#define HTML_CNTNR_SPAN 0x40
-#define HTML_CNTNR_DIV 0x80
-#define HTML_CNTNR_MASK 0xc0
+#define HTML_OUT_TBLNODE 0x00
+#define HTML_OUT_GRFNODE 0x01
+#define HTML_OUT_OLENODE 0x02
+#define HTML_OUT_DIV 0x03
+#define HTML_OUT_MULTICOL 0x04
+#define HTML_OUT_SPACER 0x05
+#define HTML_OUT_CONTROL 0x06
+#define HTML_OUT_AMARQUEE 0x07
+#define HTML_OUT_MARQUEE 0x08
+#define HTML_OUT_GRFFRM 0x09
+#define HTML_OUT_OLEGRF 0x0a
+#define HTML_OUT_SPAN 0x0b
+#define HTML_OUT_MASK 0x0f
+
+#define HTML_POS_PREFIX 0x00
+#define HTML_POS_BEFORE 0x10
+#define HTML_POS_INSIDE 0x20
+#define HTML_POS_ANY 0x30
+#define HTML_POS_MASK 0x30
+
+#define HTML_CNTNR_NONE 0x00
+#define HTML_CNTNR_SPAN 0x40
+#define HTML_CNTNR_DIV 0x80
+#define HTML_CNTNR_MASK 0xc0
const USHORT MAX_FRMTYPES = HTML_FRMTYPE_END;
@@ -96,12 +96,12 @@ extern BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
class SwHTMLPosFlyFrm
{
- const SwFrmFmt *pFrmFmt; // der Rahmen
- const SdrObject *pSdrObject; // ggf. Sdr-Objekt
- SwNodeIndex *pNdIdx; // Node-Index
- UINT32 nOrdNum; // Aus SwPosFlyFrm
- xub_StrLen nCntntIdx; // seine Position im Content
- BYTE nOutputMode; // Ausgabe-Infos
+ const SwFrmFmt *pFrmFmt; // der Rahmen
+ const SdrObject *pSdrObject; // ggf. Sdr-Objekt
+ SwNodeIndex *pNdIdx; // Node-Index
+ UINT32 nOrdNum; // Aus SwPosFlyFrm
+ xub_StrLen nCntntIdx; // seine Position im Content
+ BYTE nOutputMode; // Ausgabe-Infos
public:
@@ -116,7 +116,7 @@ public:
const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- xub_StrLen GetCntntIndex() const { return nCntntIdx; }
+ xub_StrLen GetCntntIndex() const { return nCntntIdx; }
BYTE GetOutMode() const { return nOutputMode; }
diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx
index 454faca19a88..7547d44d1e98 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -2,7 +2,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
@@ -38,95 +38,95 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4!
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(DIV, PREFIX, NONE), // IE 4
+ TE(DIV, PREFIX, NONE), // SW
+ TE(DIV, PREFIX, NONE) // Netscape 4!
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(DIV, PREFIX, NONE), // IE 4
+ TE(DIV, PREFIX, NONE), // SW
+ TE(DIV, PREFIX, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, PREFIX, NONE), // IE 4
- TE(MULTICOL,PREFIX, NONE), // SW
- TE(MULTICOL,PREFIX, DIV) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, PREFIX, NONE), // IE 4
+ TE(MULTICOL,PREFIX, NONE), // SW
+ TE(MULTICOL,PREFIX, DIV) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(DIV, PREFIX, NONE), // IE 4
+ TE(DIV, PREFIX, NONE), // SW
+ TE(DIV, PREFIX, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(DIV, PREFIX, NONE), // IE 4
- TE(DIV, PREFIX, NONE), // SW
- TE(DIV, PREFIX, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(DIV, PREFIX, NONE), // IE 4
+ TE(DIV, PREFIX, NONE), // SW
+ TE(DIV, PREFIX, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, PREFIX, NONE), // IE 4
- TE(GRFNODE, PREFIX, NONE), // SW
- TE(GRFNODE, PREFIX, SPAN) // Netscape 4
+ TE(GRFNODE, INSIDE, NONE), // HTML 3.2
+ TE(GRFNODE, PREFIX, NONE), // IE 4
+ TE(GRFNODE, PREFIX, NONE), // SW
+ TE(GRFNODE, PREFIX, SPAN) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLENODE, PREFIX, SPAN) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, PREFIX, NONE), // IE 4
+ TE(OLENODE, PREFIX, NONE), // SW
+ TE(OLENODE, PREFIX, SPAN) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLENODE, PREFIX, SPAN) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, PREFIX, NONE), // IE 4
+ TE(OLENODE, PREFIX, NONE), // SW
+ TE(OLENODE, PREFIX, SPAN) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, PREFIX, NONE), // IE 4
- TE(OLENODE, PREFIX, NONE), // SW
- TE(OLEGRF, PREFIX, SPAN) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, PREFIX, NONE), // IE 4
+ TE(OLENODE, PREFIX, NONE), // SW
+ TE(OLEGRF, PREFIX, SPAN) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, PREFIX, NONE), // IE 4
- TE(OLEGRF, PREFIX, NONE), // SW
- TE(OLEGRF, PREFIX, SPAN) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLEGRF, PREFIX, NONE), // IE 4
+ TE(OLEGRF, PREFIX, NONE), // SW
+ TE(OLEGRF, PREFIX, SPAN) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,PREFIX, NONE), // IE 4
- TE(AMARQUEE,PREFIX, NONE), // SW
- TE(GRFFRM, PREFIX, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(AMARQUEE,PREFIX, NONE), // IE 4
+ TE(AMARQUEE,PREFIX, NONE), // SW
+ TE(GRFFRM, PREFIX, SPAN) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, PREFIX, NONE), // IE 4
- TE(CONTROL, PREFIX, NONE), // SW
+ TE(CONTROL, INSIDE, NONE), // HTML 3.2
+ TE(CONTROL, PREFIX, NONE), // IE 4
+ TE(CONTROL, PREFIX, NONE), // SW
// Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus.
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(CONTROL, INSIDE, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, PREFIX, NONE), // IE 4
- TE(GRFFRM, PREFIX, NONE), // SW
- TE(GRFFRM, PREFIX, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, PREFIX, NONE), // IE 4
+ TE(GRFFRM, PREFIX, NONE), // SW
+ TE(GRFFRM, PREFIX, SPAN) // Netscape 4
}
};
@@ -134,96 +134,96 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(TBLNODE, BEFORE, NONE), // IE 4
- TE(TBLNODE, BEFORE, NONE), // SW
- TE(TBLNODE, BEFORE, NONE) // Netscape 4
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(TBLNODE, BEFORE, NONE), // IE 4
+ TE(TBLNODE, BEFORE, NONE), // SW
+ TE(TBLNODE, BEFORE, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(DIV, BEFORE, NONE), // SW
- TE(TBLNODE, BEFORE, NONE) // Netscape 4
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(DIV, BEFORE, NONE), // IE 4
+ TE(DIV, BEFORE, NONE), // SW
+ TE(TBLNODE, BEFORE, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(GRFFRM, BEFORE, NONE), // IE 4
- TE(MULTICOL,BEFORE, NONE), // SW
- TE(MULTICOL,BEFORE, DIV) // Netscape 4
+ TE(GRFFRM, BEFORE, NONE), // HTML 3.2
+ TE(GRFFRM, BEFORE, NONE), // IE 4
+ TE(MULTICOL,BEFORE, NONE), // SW
+ TE(MULTICOL,BEFORE, DIV) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(SPACER, BEFORE, NONE), // SW
- TE(SPACER, BEFORE, NONE) // Netscape 4
+ TE(GRFFRM, BEFORE, NONE), // HTML 3.2
+ TE(DIV, BEFORE, NONE), // IE 4
+ TE(SPACER, BEFORE, NONE), // SW
+ TE(SPACER, BEFORE, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(DIV, BEFORE, NONE), // IE 4
- TE(DIV, BEFORE, NONE), // SW
- TE(DIV, BEFORE, NONE) // Netscape 4
+ TE(GRFFRM, BEFORE, NONE), // HTML 3.2
+ TE(DIV, BEFORE, NONE), // IE 4
+ TE(DIV, BEFORE, NONE), // SW
+ TE(DIV, BEFORE, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, BEFORE, NONE), // HTML 3.2
- TE(GRFNODE, BEFORE, NONE), // IE 4
- TE(GRFNODE, BEFORE, NONE), // SW
- TE(GRFNODE, BEFORE, NONE) // Netscape 4
+ TE(GRFNODE, BEFORE, NONE), // HTML 3.2
+ TE(GRFNODE, BEFORE, NONE), // IE 4
+ TE(GRFNODE, BEFORE, NONE), // SW
+ TE(GRFNODE, BEFORE, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLENODE, BEFORE, NONE) // Netscape 4
+ TE(OLENODE, BEFORE, NONE), // HTML 3.2
+ TE(OLENODE, BEFORE, NONE), // IE 4
+ TE(OLENODE, BEFORE, NONE), // SW
+ TE(OLENODE, BEFORE, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLENODE, BEFORE, NONE) // Netscape 4
+ TE(OLENODE, BEFORE, NONE), // HTML 3.2
+ TE(OLENODE, BEFORE, NONE), // IE 4
+ TE(OLENODE, BEFORE, NONE), // SW
+ TE(OLENODE, BEFORE, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, BEFORE, NONE), // HTML 3.2
- TE(OLENODE, BEFORE, NONE), // IE 4
- TE(OLENODE, BEFORE, NONE), // SW
- TE(OLEGRF, BEFORE, NONE) // Netscape 4
+ TE(OLEGRF, BEFORE, NONE), // HTML 3.2
+ TE(OLENODE, BEFORE, NONE), // IE 4
+ TE(OLENODE, BEFORE, NONE), // SW
+ TE(OLEGRF, BEFORE, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, BEFORE, NONE), // HTML 3.2
- TE(OLEGRF, BEFORE, NONE), // IE 4
- TE(OLEGRF, BEFORE, NONE), // SW
- TE(OLEGRF, BEFORE, NONE) // Netscape 4
+ TE(OLEGRF, BEFORE, NONE), // HTML 3.2
+ TE(OLEGRF, BEFORE, NONE), // IE 4
+ TE(OLEGRF, BEFORE, NONE), // SW
+ TE(OLEGRF, BEFORE, NONE) // Netscape 4
},
{
// Laufschrift (fuer Netscape 4 im Container, damit
// die LAufschrift an der richtigen Stelle erscheint
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(AMARQUEE,BEFORE, NONE), // IE 4
- TE(AMARQUEE,BEFORE, NONE), // SW
- TE(GRFFRM, BEFORE, NONE) // Netscape 4
+ TE(GRFFRM, BEFORE, NONE), // HTML 3.2
+ TE(AMARQUEE,BEFORE, NONE), // IE 4
+ TE(AMARQUEE,BEFORE, NONE), // SW
+ TE(GRFFRM, BEFORE, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, BEFORE, NONE), // IE 4
- TE(CONTROL, BEFORE, NONE), // SW
+ TE(CONTROL, INSIDE, NONE), // HTML 3.2
+ TE(CONTROL, BEFORE, NONE), // IE 4
+ TE(CONTROL, BEFORE, NONE), // SW
// hier koennte man einen Container draus machen (Import fehlt)
- TE(CONTROL, BEFORE, NONE) // Netscape 4
+ TE(CONTROL, BEFORE, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, BEFORE, NONE), // HTML 3.2
- TE(GRFFRM, BEFORE, NONE), // IE 4
- TE(GRFFRM, BEFORE, NONE), // SW
- TE(GRFFRM, BEFORE, NONE) // Netscape 4
+ TE(GRFFRM, BEFORE, NONE), // HTML 3.2
+ TE(GRFFRM, BEFORE, NONE), // IE 4
+ TE(GRFFRM, BEFORE, NONE), // SW
+ TE(GRFFRM, BEFORE, NONE) // Netscape 4
}
};
@@ -231,95 +231,95 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, INSIDE, NONE), // HTML 3.2
- TE(TBLNODE, INSIDE, NONE), // IE 4
- TE(TBLNODE, INSIDE, NONE), // SW
- TE(TBLNODE, INSIDE, NONE) // Netscape 4
+ TE(TBLNODE, INSIDE, NONE), // HTML 3.2
+ TE(TBLNODE, INSIDE, NONE), // IE 4
+ TE(TBLNODE, INSIDE, NONE), // SW
+ TE(TBLNODE, INSIDE, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TBLNODE, INSIDE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(MULTICOL,INSIDE, NONE), // SW
+ TE(MULTICOL,INSIDE, SPAN) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPACER, INSIDE, NONE), // SW
- TE(SPACER, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPACER, INSIDE, NONE), // SW
+ TE(SPACER, INSIDE, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, NONE) // Netscape 4
+ TE(GRFNODE, INSIDE, NONE), // HTML 3.2
+ TE(GRFNODE, INSIDE, NONE), // IE 4
+ TE(GRFNODE, INSIDE, NONE), // SW
+ TE(GRFNODE, INSIDE, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLEGRF, INSIDE, NONE), // IE 4
+ TE(OLEGRF, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, NONE) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,INSIDE, NONE), // IE 4
- TE(AMARQUEE,INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(AMARQUEE,INSIDE, NONE), // IE 4
+ TE(AMARQUEE,INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
+ TE(CONTROL, INSIDE, NONE), // HTML 3.2
+ TE(CONTROL, INSIDE, NONE), // IE 4
+ TE(CONTROL, INSIDE, NONE), // SW
// hier koennte man einen Container draus machen (Import fehlt)
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(CONTROL, INSIDE, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
}
};
@@ -327,95 +327,95 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(TBLNODE, BEFORE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(TBLNODE, BEFORE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(MULTICOL,INSIDE, NONE), // SW
+ TE(MULTICOL,INSIDE, SPAN) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(SPAN, INSIDE, NONE), // IE 4
- TE(SPAN, INSIDE, NONE), // SW
- TE(SPAN, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(SPAN, INSIDE, NONE), // IE 4
+ TE(SPAN, INSIDE, NONE), // SW
+ TE(SPAN, INSIDE, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, SPAN) // Netscape 4
+ TE(GRFNODE, INSIDE, NONE), // HTML 3.2
+ TE(GRFNODE, INSIDE, NONE), // IE 4
+ TE(GRFNODE, INSIDE, NONE), // SW
+ TE(GRFNODE, INSIDE, SPAN) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, SPAN) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, SPAN) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, SPAN) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, SPAN) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, SPAN) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, SPAN) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, SPAN) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLEGRF, INSIDE, NONE), // IE 4
+ TE(OLEGRF, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, SPAN) // Netscape 4
},
{
// Laufschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(AMARQUEE,INSIDE, NONE), // IE 4
- TE(AMARQUEE,INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(AMARQUEE,INSIDE, NONE), // IE 4
+ TE(AMARQUEE,INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, SPAN) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
+ TE(CONTROL, INSIDE, NONE), // HTML 3.2
+ TE(CONTROL, INSIDE, NONE), // IE 4
+ TE(CONTROL, INSIDE, NONE), // SW
// Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus.
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(CONTROL, INSIDE, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, SPAN) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, SPAN) // Netscape 4
}
};
@@ -423,95 +423,95 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// Textrahmen mit Tabelle
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
},
{
// Textrahmen mit Tabelle und Ueberschrift
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
},
{
// spaltiger Rahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(MULTICOL,INSIDE, NONE), // SW
- TE(MULTICOL,INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(MULTICOL,INSIDE, NONE), // SW
+ TE(MULTICOL,INSIDE, NONE) // Netscape 4
},
{
// leerer Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(SPACER, INSIDE, NONE), // SW
- TE(SPACER, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(SPACER, INSIDE, NONE), // SW
+ TE(SPACER, INSIDE, NONE) // Netscape 4
},
{
// sonstiger Textreahmen
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
},
{
// Grafik-Node
- TE(GRFNODE, INSIDE, NONE), // HTML 3.2
- TE(GRFNODE, INSIDE, NONE), // IE 4
- TE(GRFNODE, INSIDE, NONE), // SW
- TE(GRFNODE, INSIDE, NONE) // Netscape 4
+ TE(GRFNODE, INSIDE, NONE), // HTML 3.2
+ TE(GRFNODE, INSIDE, NONE), // IE 4
+ TE(GRFNODE, INSIDE, NONE), // SW
+ TE(GRFNODE, INSIDE, NONE) // Netscape 4
},
{
// Plugin
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, NONE) // Netscape 4
},
{
// Applet
- TE(OLENODE, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLENODE, INSIDE, NONE) // Netscape 4
+ TE(OLENODE, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLENODE, INSIDE, NONE) // Netscape 4
},
{
// Floating-Frame
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLENODE, INSIDE, NONE), // IE 4
- TE(OLENODE, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLENODE, INSIDE, NONE), // IE 4
+ TE(OLENODE, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, NONE) // Netscape 4
},
{
// sonstige OLE-Objekte
- TE(OLEGRF, INSIDE, NONE), // HTML 3.2
- TE(OLEGRF, INSIDE, NONE), // IE 4
- TE(OLEGRF, INSIDE, NONE), // SW
- TE(OLEGRF, INSIDE, NONE) // Netscape 4
+ TE(OLEGRF, INSIDE, NONE), // HTML 3.2
+ TE(OLEGRF, INSIDE, NONE), // IE 4
+ TE(OLEGRF, INSIDE, NONE), // SW
+ TE(OLEGRF, INSIDE, NONE) // Netscape 4
},
{
// Laufschrift (kann immer als MARQUEE exportiert werden, weil
// der Inhalt an der richtigen Stelle erscheint
- TE(MARQUEE, INSIDE, NONE), // HTML 3.2
- TE(MARQUEE, INSIDE, NONE), // IE 4
- TE(MARQUEE, INSIDE, NONE), // SW
- TE(MARQUEE, INSIDE, NONE) // Netscape 4
+ TE(MARQUEE, INSIDE, NONE), // HTML 3.2
+ TE(MARQUEE, INSIDE, NONE), // IE 4
+ TE(MARQUEE, INSIDE, NONE), // SW
+ TE(MARQUEE, INSIDE, NONE) // Netscape 4
},
{
// Controls
- TE(CONTROL, INSIDE, NONE), // HTML 3.2
- TE(CONTROL, INSIDE, NONE), // IE 4
- TE(CONTROL, INSIDE, NONE), // SW
- TE(CONTROL, INSIDE, NONE) // Netscape 4
+ TE(CONTROL, INSIDE, NONE), // HTML 3.2
+ TE(CONTROL, INSIDE, NONE), // IE 4
+ TE(CONTROL, INSIDE, NONE), // SW
+ TE(CONTROL, INSIDE, NONE) // Netscape 4
},
{
// sonstige Zeichen-Objekte
- TE(GRFFRM, INSIDE, NONE), // HTML 3.2
- TE(GRFFRM, INSIDE, NONE), // IE 4
- TE(GRFFRM, INSIDE, NONE), // SW
- TE(GRFFRM, INSIDE, NONE) // Netscape 4
+ TE(GRFFRM, INSIDE, NONE), // HTML 3.2
+ TE(GRFFRM, INSIDE, NONE), // IE 4
+ TE(GRFFRM, INSIDE, NONE), // SW
+ TE(GRFFRM, INSIDE, NONE) // Netscape 4
}
};
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 1225495391b5..fd63a1e09de5 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -2,7 +2,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
@@ -98,29 +98,29 @@ const sal_uInt16 TABINDEX_MAX = 32767;
static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET },
- { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET },
+ { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST },
+ { 0, 0 }
};
static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL },
- { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART },
- { OOO_STRING_SVTOOLS_HTML_ET_text, FormSubmitEncoding_TEXT },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL },
+ { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART },
+ { OOO_STRING_SVTOOLS_HTML_ET_text, FormSubmitEncoding_TEXT },
+ { 0, 0 }
};
enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT };
static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF },
- { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD },
- { OOO_STRING_SVTOOLS_HTML_WW_soft, HTML_WM_SOFT },
- { OOO_STRING_SVTOOLS_HTML_WW_physical,HTML_WM_HARD },
- { OOO_STRING_SVTOOLS_HTML_WW_virtual, HTML_WM_SOFT },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF },
+ { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD },
+ { OOO_STRING_SVTOOLS_HTML_WW_soft, HTML_WM_SOFT },
+ { OOO_STRING_SVTOOLS_HTML_WW_physical,HTML_WM_HARD },
+ { OOO_STRING_SVTOOLS_HTML_WW_virtual, HTML_WM_SOFT },
+ { 0, 0 }
};
HTMLEventType __FAR_DATA aEventTypeTable[] =
@@ -188,28 +188,28 @@ const sal_Char * __FAR_DATA aEventOptionTable[] =
class SwHTMLForm_Impl
{
- SwDocShell *pDocSh;
+ SwDocShell *pDocSh;
- SvKeyValueIterator *pHeaderAttrs;
+ SvKeyValueIterator *pHeaderAttrs;
// gecachte Interfaces
- uno::Reference< drawing::XDrawPage > xDrawPage;
- uno::Reference< container::XIndexContainer > xForms;
- uno::Reference< drawing::XShapes > xShapes;
- uno::Reference< XMultiServiceFactory > xServiceFactory;
+ uno::Reference< drawing::XDrawPage > xDrawPage;
+ uno::Reference< container::XIndexContainer > xForms;
+ uno::Reference< drawing::XShapes > xShapes;
+ uno::Reference< XMultiServiceFactory > xServiceFactory;
- uno::Reference< script::XEventAttacherManager > xControlEventManager;
- uno::Reference< script::XEventAttacherManager > xFormEventManager;
+ uno::Reference< script::XEventAttacherManager > xControlEventManager;
+ uno::Reference< script::XEventAttacherManager > xFormEventManager;
// Kontext-Informationen
- uno::Reference< container::XIndexContainer > xFormComps;
- uno::Reference< beans::XPropertySet > xFCompPropSet;
- uno::Reference< drawing::XShape > xShape;
+ uno::Reference< container::XIndexContainer > xFormComps;
+ uno::Reference< beans::XPropertySet > xFCompPropSet;
+ uno::Reference< drawing::XShape > xShape;
- String sText;
- SvStringsDtor aStringList;
- SvStringsDtor aValueList;
- SvUShorts aSelectedList;
+ String sText;
+ SvStringsDtor aStringList;
+ SvStringsDtor aValueList;
+ SvUShorts aSelectedList;
public:
@@ -380,11 +380,11 @@ const uno::Reference< script::XEventAttacherManager >&
class SwHTMLImageWatcher :
public cppu::WeakImplHelper2< awt::XImageConsumer, XEventListener >
{
- uno::Reference< drawing::XShape > xShape; // das control
- uno::Reference< XImageProducerSupplier > xSrc;
- uno::Reference< awt::XImageConsumer > xThis; // man selbst
- sal_Bool bSetWidth;
- sal_Bool bSetHeight;
+ uno::Reference< drawing::XShape > xShape; // das control
+ uno::Reference< XImageProducerSupplier > xSrc;
+ uno::Reference< awt::XImageConsumer > xThis; // man selbst
+ sal_Bool bSetWidth;
+ sal_Bool bSetHeight;
void clear();
@@ -557,7 +557,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
pLayout->GetBrowseWidthByTable( *pDoc );
if ( nBrowseWidth )
- {
+ {
pLayout->Resize( nBrowseWidth, sal_True, sal_True,
bLastGrf ? HTMLTABLE_RESIZE_NOW
: 500 );
@@ -660,10 +660,10 @@ static void lcl_html_setFixedFontProperty(
class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
{
- uno::Reference< drawing::XShape > xShape;
- Size aTextSz;
- sal_Bool bMinWidth;
- sal_Bool bMinHeight;
+ uno::Reference< drawing::XShape > xShape;
+ Size aTextSz;
+ sal_Bool bMinWidth;
+ sal_Bool bMinHeight;
public:
@@ -729,7 +729,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() );
}
-
+
pTempViewFrame = SfxViewFrame::LoadHiddenDocument( *pDocSh, 0 );
CallStartAction();
pDoc->GetEditShell( &pVSh );
@@ -1169,7 +1169,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
sal_Int16 nSurround = text::WrapTextMode_NONE;
if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
- SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
+ SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
pDoc->GetNodes()[pPam->GetPoint()->nNode]->FindFlyStartNode();
@@ -1591,7 +1591,7 @@ void SwHTMLParser::InsertInput()
bSetEvent = sal_True;
break;
- case HTML_O_SDONBLUR: // eigtl. nur EDIT
+ case HTML_O_SDONBLUR: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
@@ -1605,14 +1605,14 @@ void SwHTMLParser::InsertInput()
bSetEvent = sal_True;
break;
- case HTML_O_SDONCHANGE: // eigtl. nur EDIT
+ case HTML_O_SDONCHANGE: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = sal_True;
break;
- case HTML_O_SDONSELECT: // eigtl. nur EDIT
+ case HTML_O_SDONSELECT: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
case HTML_O_ONSELECT:
nEvent = HTML_ET_ONSELECT;
@@ -1748,8 +1748,8 @@ void SwHTMLParser::InsertInput()
aTmp <<= OUString(sText);
- Size aSz( 0, 0 ); // defaults
- Size aTextSz( 0, 0 ); // Text-Size
+ Size aSz( 0, 0 ); // defaults
+ Size aTextSz( 0, 0 ); // Text-Size
sal_Bool bMinWidth = sal_False, bMinHeight = sal_False;
sal_Bool bUseSize = sal_False;
switch( eType )
@@ -2439,7 +2439,7 @@ void SwHTMLParser::NewSelect()
}
else
{
- if( nSelectEntryCnt <= 1 ) // 4 Zeilen als default
+ if( nSelectEntryCnt <= 1 ) // 4 Zeilen als default
nSelectEntryCnt = 4;
if( bMultiple )
diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx
index 90088dffa029..d1c510ac7225 100644
--- a/sw/source/filter/html/htmlform.hxx
+++ b/sw/source/filter/html/htmlform.hxx
@@ -2,7 +2,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
@@ -32,10 +32,10 @@
enum HTMLEventType
{
- HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM,
- HTML_ET_ONGETFOCUS, HTML_ET_ONLOSEFOCUS,
- HTML_ET_ONCLICK, HTML_ET_ONCLICK_ITEM,
- HTML_ET_ONCHANGE, HTML_ET_ONSELECT,
+ HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM,
+ HTML_ET_ONGETFOCUS, HTML_ET_ONLOSEFOCUS,
+ HTML_ET_ONCLICK, HTML_ET_ONCLICK_ITEM,
+ HTML_ET_ONCHANGE, HTML_ET_ONSELECT,
HTML_ET_END
};
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 0fa6692ee52b..bf3c44628baa 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -2,7 +2,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
@@ -100,7 +100,7 @@ struct HTMLControl
{
// die Form, zu der das Control gehoert
uno::Reference< container::XIndexContainer > xFormComps;
- ULONG nNdIdx; // der Node, in dem es verankert ist
+ ULONG nNdIdx; // der Node, in dem es verankert ist
xub_StrLen nCount; // wie viele Controls sind in dem Node
HTMLControl( const uno::Reference< container::XIndexContainer > & rForm,
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 342b63d3674c..916c2f06b714 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ struct SwHTMLFootEndNote_Impl
SvStringsDtor aNames;
String sName;
- String sContent; // Infos fuer die letzte Fussnote
+ String sContent; // Infos fuer die letzte Fussnote
BOOL bEndNote;
BOOL bFixed;
};
@@ -385,7 +385,7 @@ void SwHTMLWriter::OutFootEndNotes()
Strm() << "\">";
bLFPossible = TRUE;
- IncIndentLevel(); // Inhalt von <DIV> einruecken
+ IncIndentLevel(); // Inhalt von <DIV> einruecken
OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode();
@@ -398,7 +398,7 @@ void SwHTMLWriter::OutFootEndNotes()
Out_SwDoc( pCurPam );
}
- DecIndentLevel(); // Inhalt von <DIV> einruecken
+ DecIndentLevel(); // Inhalt von <DIV> einruecken
if( bLFPossible )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE );
@@ -504,7 +504,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
USHORT lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
String *pParts,
- BOOL bEndNote )
+ BOOL bEndNote )
{
USHORT nParts = 0;
sal_Int16 eFmt = rInfo.aFmt.GetNumberingType();
@@ -519,17 +519,17 @@ USHORT lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
}
if( rInfo.nFtnOffset > 0 )
{
- pParts[1] = String::CreateFromInt32( (sal_Int32)rInfo.nFtnOffset );
+ pParts[1] = String::CreateFromInt32( (sal_Int32)rInfo.nFtnOffset );
nParts = 2;
}
if( rInfo.GetPrefix().Len() > 0 )
{
- pParts[2] = rInfo.GetPrefix();
+ pParts[2] = rInfo.GetPrefix();
nParts = 3;
}
if( rInfo.GetSuffix().Len() > 0 )
{
- pParts[3] = rInfo.GetSuffix();
+ pParts[3] = rInfo.GetSuffix();
nParts = 4;
}
@@ -597,12 +597,12 @@ void SwHTMLWriter::OutFootEndNoteInfo()
}
if( rInfo.aQuoVadis.Len() > 0 )
{
- aParts[6] = rInfo.aQuoVadis;
+ aParts[6] = rInfo.aQuoVadis;
nParts = 7;
}
if( rInfo.aErgoSum.Len() > 0 )
{
- aParts[7] = rInfo.aErgoSum;
+ aParts[7] = rInfo.aErgoSum;
nParts = 8;
}
if( nParts > 0 )
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 5883fcbc13b2..dfde354e9bb9 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -2,7 +2,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
@@ -88,7 +88,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT },
{ OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT },
- { 0, 0 }
+ { 0, 0 }
};
@@ -102,7 +102,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] =
{ OOO_STRING_SVTOOLS_HTML_VA_bottom, text::VertOrientation::TOP },
{ OOO_STRING_SVTOOLS_HTML_VA_baseline, text::VertOrientation::TOP },
{ OOO_STRING_SVTOOLS_HTML_VA_absbottom, text::VertOrientation::LINE_BOTTOM },
- { 0, 0 }
+ { 0, 0 }
};
SV_IMPL_PTRARR( ImageMaps, ImageMapPtr )
@@ -159,7 +159,7 @@ void SwHTMLParser::ConnectImageMaps()
// Grafik muss nicht skaliert werden
pGrfNd->ScaleImageMap();
}
- nMissingImgMaps--; // eine Map weniger suchen
+ nMissingImgMaps--; // eine Map weniger suchen
}
}
nIdx = rNds[nIdx]->EndOfSectionIndex() + 1;
@@ -517,7 +517,7 @@ IMAGE_SETEVENT:
USHORT nPoolId = static_cast< USHORT >(pDoc->IsVisitedURL( rURL )
? RES_POOLCHR_INET_VISIT
: RES_POOLCHR_INET_NORMAL);
- const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId );
+ const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId );
aHBorderLine.SetColor( pCharFmt->GetColor().GetValue() );
aVBorderLine.SetColor( aHBorderLine.GetColor() );
}
@@ -560,7 +560,7 @@ IMAGE_SETEVENT:
{
case SVX_CSS1_LTYPE_TWIP:
aTwipSz.Width() = aPropInfo.nWidth;
- nWidth = 1; // != 0
+ nWidth = 1; // != 0
bPrcWidth = FALSE;
break;
case SVX_CSS1_LTYPE_PERCENTAGE:
@@ -575,7 +575,7 @@ IMAGE_SETEVENT:
{
case SVX_CSS1_LTYPE_TWIP:
aTwipSz.Height() = aPropInfo.nHeight;
- nHeight = 1; // != 0
+ nHeight = 1; // != 0
bPrcHeight = FALSE;
break;
case SVX_CSS1_LTYPE_PERCENTAGE:
@@ -588,8 +588,8 @@ IMAGE_SETEVENT:
}
Size aGrfSz( 0, 0 );
- BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen?
- BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen?
+ BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen?
+ BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen?
BOOL bRequestGrfNow = FALSE;
BOOL bSetScaleImageMap = FALSE;
BYTE nPrcWidth = 0, nPrcHeight = 0;
@@ -679,7 +679,7 @@ IMAGE_SETEVENT:
ImageMap aEmptyImgMap( aName );
SwFmtURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
aFrmSet.Put( aURL );
- nMissingImgMaps++; // es fehlen noch Image-Maps
+ nMissingImgMaps++; // es fehlen noch Image-Maps
// die Grafik muss beim SetTwipSize skaliert werden, wenn
// wir keine Groesse am Node gesetzt haben oder die Groesse
@@ -895,9 +895,9 @@ void SwHTMLParser::InsertBodyOptions()
break;
case HTML_O_ONERROR:
-// if( bAnyStarBasic )
-// InsertBasicDocEvent( SFX_EVENT_ACTIVATEDOC,
-// pOption->GetString() );
+// if( bAnyStarBasic )
+// InsertBasicDocEvent( SFX_EVENT_ACTIVATEDOC,
+// pOption->GetString() );
break;
case HTML_O_STYLE:
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 08e0e7e7c6c3..0d167f7bba3a 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -2,7 +2,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
@@ -57,18 +57,18 @@
using namespace ::com::sun::star;
// TODO: Unicode: Are these characters the correct ones?
-#define HTML_BULLETCHAR_DISC (0xe008)
-#define HTML_BULLETCHAR_CIRCLE (0xe009)
-#define HTML_BULLETCHAR_SQUARE (0xe00b)
+#define HTML_BULLETCHAR_DISC (0xe008)
+#define HTML_BULLETCHAR_CIRCLE (0xe009)
+#define HTML_BULLETCHAR_SQUARE (0xe00b)
// <UL TYPE=...>
static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC },
- { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE },
- { OOO_STRING_SVTOOLS_HTML_ULTYPE_square, HTML_BULLETCHAR_SQUARE },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC },
+ { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE },
+ { OOO_STRING_SVTOOLS_HTML_ULTYPE_square, HTML_BULLETCHAR_SQUARE },
+ { 0, 0 }
};
/* */
@@ -161,7 +161,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
// <--
aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
+ aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL;
}
@@ -213,7 +213,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
case 'a': aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
case 'I': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); break;
case 'i': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); break;
- default: bChangeNumFmt = sal_False;
+ default: bChangeNumFmt = sal_False;
}
break;
@@ -422,7 +422,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
if( rInfo.GetDepth()>0 && (!nToken || pCntxt) )
{
rInfo.DecDepth();
- if( !rInfo.GetDepth() ) // wars der letze Level ?
+ if( !rInfo.GetDepth() ) // wars der letze Level ?
{
// Die noch nicht angepassten Formate werden jetzt noch
// angepasst, damit es sich besser Editieren laesst.
@@ -491,7 +491,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
SetTxtCollAttrs();
if( bSetAttrs )
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
}
@@ -537,7 +537,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// einen neuen Absatz aufmachen
if( pPam->GetPoint()->nContent.GetIndex() )
AppendTxtNode( AM_NOSPACE, sal_False );
- bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt!
+ bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt!
// --> OD 2008-04-02 #refactorlists#
// if( HTML_LISTHEADER_ON==nToken )
@@ -568,7 +568,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
// <--
aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
+ aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
aNumFmt.SetLSpace( (sal_uInt16)(-HTML_NUMBUL_INDENT) );
aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
@@ -672,7 +672,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl,
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -905,10 +905,10 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
sal_Char cType = 0;
switch( eType )
{
- case SVX_NUM_CHARS_UPPER_LETTER: cType = 'A'; break;
- case SVX_NUM_CHARS_LOWER_LETTER: cType = 'a'; break;
- case SVX_NUM_ROMAN_UPPER: cType = 'I'; break;
- case SVX_NUM_ROMAN_LOWER: cType = 'i'; break;
+ case SVX_NUM_CHARS_UPPER_LETTER: cType = 'A'; break;
+ case SVX_NUM_CHARS_LOWER_LETTER: cType = 'a'; break;
+ case SVX_NUM_ROMAN_UPPER: cType = 'I'; break;
+ case SVX_NUM_ROMAN_LOWER: cType = 'i'; break;
}
if( cType )
(((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += cType;
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index d747b79746f7..a3665415ef49 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -2,7 +2,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
@@ -31,19 +31,19 @@
#include <swtypes.hxx>
#include <string.h>
-#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2)
-#define HTML_NUMBUL_INDENT (-MM50)
+#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2)
+#define HTML_NUMBUL_INDENT (-MM50)
class SwTxtNode;
class SwNumRule;
class SwHTMLNumRuleInfo
{
- sal_uInt16 aNumStarts[MAXLEVEL];
- SwNumRule * pNumRule; // Aktuelle Numerierung
- sal_uInt16 nDeep; // aktuelle Num-Tiefe (1, 2, 3, ...)
- sal_Bool bRestart : 1; // Export: Numerierung neu starten
- sal_Bool bNumbered : 1; // Export: Absatz ist numeriert
+ sal_uInt16 aNumStarts[MAXLEVEL];
+ SwNumRule * pNumRule; // Aktuelle Numerierung
+ sal_uInt16 nDeep; // aktuelle Num-Tiefe (1, 2, 3, ...)
+ sal_Bool bRestart : 1; // Export: Numerierung neu starten
+ sal_Bool bNumbered : 1; // Export: Absatz ist numeriert
public:
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 9def84968f67..ef95684e4a56 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -2,7 +2,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
@@ -83,49 +83,49 @@ static char const sHTML_O_Hidden_False[] = "FALSE";
}
-const ULONG HTML_FRMOPTS_EMBED_ALL =
+const ULONG HTML_FRMOPTS_EMBED_ALL =
HTML_FRMOPT_ALT |
HTML_FRMOPT_SIZE |
HTML_FRMOPT_NAME;
-const ULONG HTML_FRMOPTS_EMBED_CNTNR =
+const ULONG HTML_FRMOPTS_EMBED_CNTNR =
HTML_FRMOPTS_EMBED_ALL |
HTML_FRMOPT_ABSSIZE;
-const ULONG HTML_FRMOPTS_EMBED =
+const ULONG HTML_FRMOPTS_EMBED =
HTML_FRMOPTS_EMBED_ALL |
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE |
HTML_FRMOPT_BRCLEAR |
HTML_FRMOPT_NAME;
-const ULONG HTML_FRMOPTS_HIDDEN_EMBED =
+const ULONG HTML_FRMOPTS_HIDDEN_EMBED =
HTML_FRMOPT_ALT |
HTML_FRMOPT_NAME;
-const ULONG HTML_FRMOPTS_APPLET_ALL =
+const ULONG HTML_FRMOPTS_APPLET_ALL =
HTML_FRMOPT_ALT |
HTML_FRMOPT_SIZE;
-const ULONG HTML_FRMOPTS_APPLET_CNTNR =
+const ULONG HTML_FRMOPTS_APPLET_CNTNR =
HTML_FRMOPTS_APPLET_ALL |
HTML_FRMOPT_ABSSIZE;
-const ULONG HTML_FRMOPTS_APPLET =
+const ULONG HTML_FRMOPTS_APPLET =
HTML_FRMOPTS_APPLET_ALL |
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE |
HTML_FRMOPT_BRCLEAR;
-const ULONG HTML_FRMOPTS_IFRAME_ALL =
+const ULONG HTML_FRMOPTS_IFRAME_ALL =
HTML_FRMOPT_ALT |
HTML_FRMOPT_SIZE;
-const ULONG HTML_FRMOPTS_IFRAME_CNTNR =
+const ULONG HTML_FRMOPTS_IFRAME_CNTNR =
HTML_FRMOPTS_IFRAME_ALL |
HTML_FRMOPT_ABSSIZE;
-const ULONG HTML_FRMOPTS_IFRAME =
+const ULONG HTML_FRMOPTS_IFRAME =
HTML_FRMOPTS_IFRAME_ALL |
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE |
HTML_FRMOPT_BORDER |
HTML_FRMOPT_BRCLEAR;
-const ULONG HTML_FRMOPTS_OLE_CSS1 =
+const ULONG HTML_FRMOPTS_OLE_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
@@ -405,7 +405,7 @@ void SwHTMLParser::InsertEmbed()
{
// Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen
aSize.Width() = 0; aSize.Height() = 0;
- aSpace.Width() = 0; aSpace.Height() = 0;
+ aSpace.Width() = 0; aSpace.Height() = 0;
bPrcWidth = bPrcHeight = FALSE;
}
@@ -1381,7 +1381,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
String::CreateFromAscii("JPG"),
(XOUTBMP_USE_GIF_IF_POSSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE) );
- if( nErr ) // fehlerhaft, da ist nichts auszugeben
+ if( nErr ) // fehlerhaft, da ist nichts auszugeben
{
rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
return rWrt;
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 97c55d1a1aab..c688c7949da0 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -2,7 +2,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
@@ -153,7 +153,7 @@ void SwHTMLParser::NewDivision( int nToken )
if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
{
- SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
+ SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
SwFrmFmt *pHdFtFmt;
@@ -360,7 +360,7 @@ void SwHTMLParser::NewDivision( int nToken )
// (ersten) Node des Bereich verschieben.
if( pOldTxtNd )
MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
- sal_True );
+ sal_True );
if( pPostIts )
{
@@ -416,7 +416,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
{
// Attribute beenden
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -425,7 +425,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
void SwHTMLParser::FixHeaderFooterDistance( sal_Bool bHeader,
const SwPosition *pOldPos )
{
- SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
+ SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
SwFrmFmt *pHdFtFmt =
@@ -755,7 +755,7 @@ void SwHTMLParser::NewMultiCol()
// to the section's first node.
if( pOldTxtNd )
MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
- sal_True );
+ sal_True );
if( pPostIts )
{
@@ -824,14 +824,14 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
SwCntntNode* pSrcCntntNd = pSrcNd->GetCntntNode();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet()
+ if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet()
.GetItemState( RES_PAGEDESC, sal_False, &pItem ) &&
((SwFmtPageDesc *)pItem)->GetPageDesc() )
{
pDestCntntNd->SetAttr( *pItem );
pSrcCntntNd->ResetAttr( RES_PAGEDESC );
}
- if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet()
+ if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet()
.GetItemState( RES_BREAK, sal_False, &pItem ) )
{
switch( ((SvxFmtBreakItem *)pItem)->GetBreak() )
@@ -852,7 +852,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
SwFrmFmt *pFrmFmt = pSrcNd->GetTableNode()->GetTable().GetFrmFmt();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pFrmFmt->GetAttrSet().
+ if( SFX_ITEM_SET == pFrmFmt->GetAttrSet().
GetItemState( RES_PAGEDESC, sal_False, &pItem ) )
{
pDestCntntNd->SetAttr( *pItem );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index b0e3bfa79e4c..ee4cd64e6678 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2,7 +2,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
@@ -87,7 +87,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] =
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE },
{ OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER },
{ OOO_STRING_SVTOOLS_HTML_VA_bottom, text::VertOrientation::BOTTOM },
- { 0, 0 }
+ { 0, 0 }
};
@@ -127,22 +127,22 @@ struct HTMLTableOptions
class _HTMLTableContext
{
- SwHTMLNumRuleInfo aNumRuleInfo; // Vor der Tabelle gueltige Numerierung
+ SwHTMLNumRuleInfo aNumRuleInfo; // Vor der Tabelle gueltige Numerierung
- SwTableNode *pTblNd; // der Tabellen-Node
+ SwTableNode *pTblNd; // der Tabellen-Node
SwFrmFmt *pFrmFmt; // der Fly frame::Frame, in dem die Tabelle steht
- SwPosition *pPos; // die Position hinter der Tabelle
+ SwPosition *pPos; // die Position hinter der Tabelle
sal_uInt16 nContextStAttrMin;
sal_uInt16 nContextStMin;
- sal_Bool bRestartPRE : 1;
- sal_Bool bRestartXMP : 1;
- sal_Bool bRestartListing : 1;
+ sal_Bool bRestartPRE : 1;
+ sal_Bool bRestartXMP : 1;
+ sal_Bool bRestartListing : 1;
public:
- _HTMLAttrTable aAttrTab; // und die Attribute
+ _HTMLAttrTable aAttrTab; // und die Attribute
_HTMLTableContext( SwPosition *pPs, sal_uInt16 nCntxtStMin,
sal_uInt16 nCntxtStAttrMin ) :
@@ -185,11 +185,11 @@ public:
class HTMLTableCnts
{
- HTMLTableCnts *pNext; // der naechste Inhalt
+ HTMLTableCnts *pNext; // der naechste Inhalt
// von den beiden naechsten Pointern darf nur einer gesetzt sein!
- const SwStartNode *pStartNode; // ein Abastz
- HTMLTable *pTable; // eine Tabelle
+ const SwStartNode *pStartNode; // ein Abastz
+ HTMLTable *pTable; // eine Tabelle
SwHTMLTableLayoutCnts* pLayoutInfo;
@@ -202,7 +202,7 @@ public:
HTMLTableCnts( const SwStartNode* pStNd );
HTMLTableCnts( HTMLTable* pTab );
- ~HTMLTableCnts(); // nur in ~HTMLTableCell erlaubt
+ ~HTMLTableCnts(); // nur in ~HTMLTableCell erlaubt
// Ermitteln des SwStartNode bzw. der HTMLTable
const SwStartNode *GetStartNode() const { return pStartNode; }
@@ -231,18 +231,18 @@ class HTMLTableCell
{
// !!!ACHTUNG!!!!! Fuer jeden neuen Pointer muss die SetProtected-
// Methode (und natuerlich der Destruktor) bearbeitet werden.
- HTMLTableCnts *pContents; // der Inhalt der Zelle
- SvxBrushItem *pBGBrush; // Hintergrund der Zelle
+ HTMLTableCnts *pContents; // der Inhalt der Zelle
+ SvxBrushItem *pBGBrush; // Hintergrund der Zelle
// !!!ACHTUNG!!!!!
sal_uInt32 nNumFmt;
- sal_uInt16 nRowSpan; // ROWSPAN der Zelle
- sal_uInt16 nColSpan; // COLSPAN der Zelle
- sal_uInt16 nWidth; // WIDTH der Zelle
+ sal_uInt16 nRowSpan; // ROWSPAN der Zelle
+ sal_uInt16 nColSpan; // COLSPAN der Zelle
+ sal_uInt16 nWidth; // WIDTH der Zelle
double nValue;
sal_Int16 eVertOri; // vertikale Ausrichtung der Zelle
- sal_Bool bProtected : 1; // Zelle darf nicht belegt werden
- sal_Bool bRelWidth : 1; // nWidth ist %-Angabe
+ sal_Bool bProtected : 1; // Zelle darf nicht belegt werden
+ sal_Bool bRelWidth : 1; // nWidth ist %-Angabe
sal_Bool bHasNumFmt : 1;
sal_Bool bHasValue : 1;
sal_Bool bNoWrap : 1;
@@ -250,9 +250,9 @@ class HTMLTableCell
public:
- HTMLTableCell(); // neue Zellen sind immer leer
+ HTMLTableCell(); // neue Zellen sind immer leer
- ~HTMLTableCell(); // nur in ~HTMLTableRow erlaubt
+ ~HTMLTableCell(); // nur in ~HTMLTableRow erlaubt
// Belegen einer nicht-leeren Zelle
void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
@@ -301,23 +301,23 @@ SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5,5)
class HTMLTableRow
{
- HTMLTableCells *pCells; // die Zellen der Zeile
+ HTMLTableCells *pCells; // die Zellen der Zeile
sal_Bool bIsEndOfGroup : 1;
sal_Bool bSplitable : 1;
- sal_uInt16 nHeight; // Optionen von <TR>/<TD>
- sal_uInt16 nEmptyRows; // wieviele Leere Zeilen folgen
+ sal_uInt16 nHeight; // Optionen von <TR>/<TD>
+ sal_uInt16 nEmptyRows; // wieviele Leere Zeilen folgen
SvxAdjust eAdjust;
sal_Int16 eVertOri;
- SvxBrushItem *pBGBrush; // Hintergrund der Zelle aus STYLE
+ SvxBrushItem *pBGBrush; // Hintergrund der Zelle aus STYLE
public:
- sal_Bool bBottomBorder; // kommt hinter der Zeile eine Linie?
+ sal_Bool bBottomBorder; // kommt hinter der Zeile eine Linie?
- HTMLTableRow( sal_uInt16 nCells=0 ); // die Zellen der Zeile sind leer
+ HTMLTableRow( sal_uInt16 nCells=0 ); // die Zellen der Zeile sind leer
~HTMLTableRow();
@@ -362,7 +362,7 @@ class HTMLTableColumn
{
sal_Bool bIsEndOfGroup;
- sal_uInt16 nWidth; // Optionen von <COL>
+ sal_uInt16 nWidth; // Optionen von <COL>
sal_Bool bRelWidth;
SvxAdjust eAdjust;
@@ -375,7 +375,7 @@ class HTMLTableColumn
public:
- sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie
+ sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie
HTMLTableColumn();
@@ -418,87 +418,87 @@ class HTMLTable
String aDir;
SdrObjects *pResizeDrawObjs;// SDR-Objekte
- SvUShorts *pDrawObjPrcWidths; // Spalte des Zeichen-Objekts und dessen
+ SvUShorts *pDrawObjPrcWidths; // Spalte des Zeichen-Objekts und dessen
// relative Breite
- HTMLTableRows *pRows; // die Zeilen der Tabelle
+ HTMLTableRows *pRows; // die Zeilen der Tabelle
HTMLTableColumns *pColumns; // die Spalten der Tabelle
- sal_uInt16 nRows; // Anzahl Zeilen
- sal_uInt16 nCols; // Anzahl Spalten
- sal_uInt16 nFilledCols; // Anzahl tatsaechlich gefuellter Spalten
+ sal_uInt16 nRows; // Anzahl Zeilen
+ sal_uInt16 nCols; // Anzahl Spalten
+ sal_uInt16 nFilledCols; // Anzahl tatsaechlich gefuellter Spalten
- sal_uInt16 nCurRow; // aktuelle Zeile
- sal_uInt16 nCurCol; // aktuelle Spalte
+ sal_uInt16 nCurRow; // aktuelle Zeile
+ sal_uInt16 nCurCol; // aktuelle Spalte
- sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz)
- sal_uInt16 nRightMargin; // Abstand zum rechten Rand (aus Absatz)
+ sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz)
+ sal_uInt16 nRightMargin; // Abstand zum rechten Rand (aus Absatz)
- sal_uInt16 nCellPadding; // Abstand Umrandung zum Text
- sal_uInt16 nCellSpacing; // Abstand zwischen zwei Zellen
+ sal_uInt16 nCellPadding; // Abstand Umrandung zum Text
+ sal_uInt16 nCellSpacing; // Abstand zwischen zwei Zellen
sal_uInt16 nHSpace;
sal_uInt16 nVSpace;
- sal_uInt16 nBoxes; // Wievele Boxen enthaelt die Tabelle
+ sal_uInt16 nBoxes; // Wievele Boxen enthaelt die Tabelle
- const SwStartNode *pPrevStNd; // der Table-Node oder der Start-Node
+ const SwStartNode *pPrevStNd; // der Table-Node oder der Start-Node
// der vorhergehenden Section
- const SwTable *pSwTable; // die SW-Tabelle (nur auf dem Top-Level)
- SwTableBox *pBox1; // die TableBox, die beim Erstellen
+ const SwTable *pSwTable; // die SW-Tabelle (nur auf dem Top-Level)
+ SwTableBox *pBox1; // die TableBox, die beim Erstellen
// der Top-Level-Tabelle angelegt wird
SwTableBoxFmt *pBoxFmt; // das frame::Frame-Format einer SwTableBox
SwTableLineFmt *pLineFmt; // das frame::Frame-Format einer SwTableLine
SwTableLineFmt *pLineFrmFmtNoHeight;
- SvxBrushItem *pBGBrush; // Hintergrund der Tabelle
- SvxBrushItem *pInhBGBrush; // "geerbter" Hintergrund der Tabelle
- const SwStartNode *pCaptionStartNode; // Start-Node der Tabellen-Ueberschrift
+ SvxBrushItem *pBGBrush; // Hintergrund der Tabelle
+ SvxBrushItem *pInhBGBrush; // "geerbter" Hintergrund der Tabelle
+ const SwStartNode *pCaptionStartNode; // Start-Node der Tabellen-Ueberschrift
- SvxBorderLine aTopBorderLine; // die Linie fuer die Umrandung
+ SvxBorderLine aTopBorderLine; // die Linie fuer die Umrandung
SvxBorderLine aBottomBorderLine;// die Linie fuer die Umrandung
- SvxBorderLine aLeftBorderLine; // die Linie fuer die Umrandung
- SvxBorderLine aRightBorderLine; // die Linie fuer die Umrandung
- SvxBorderLine aBorderLine; // die Linie fuer die Umrandung
- SvxBorderLine aInhLeftBorderLine; // die Linie fuer die Umrandung
- SvxBorderLine aInhRightBorderLine; // die Linie fuer die Umrandung
- sal_Bool bTopBorder; // besitzt die Tabelle oben eine Linie
+ SvxBorderLine aLeftBorderLine; // die Linie fuer die Umrandung
+ SvxBorderLine aRightBorderLine; // die Linie fuer die Umrandung
+ SvxBorderLine aBorderLine; // die Linie fuer die Umrandung
+ SvxBorderLine aInhLeftBorderLine; // die Linie fuer die Umrandung
+ SvxBorderLine aInhRightBorderLine; // die Linie fuer die Umrandung
+ sal_Bool bTopBorder; // besitzt die Tabelle oben eine Linie
sal_Bool bRightBorder; // besitzt die Tabelle rechts eine Linie
- sal_Bool bTopAlwd; // duerfen die Raender gesetzt werden?
+ sal_Bool bTopAlwd; // duerfen die Raender gesetzt werden?
sal_Bool bRightAlwd;
- sal_Bool bFillerTopBorder; // bekommt eine linke/rechter Filler-
- sal_Bool bFillerBottomBorder; // Zelle eine obere/untere Umrandung?
+ sal_Bool bFillerTopBorder; // bekommt eine linke/rechter Filler-
+ sal_Bool bFillerBottomBorder; // Zelle eine obere/untere Umrandung?
sal_Bool bInhLeftBorder;
sal_Bool bInhRightBorder;
- sal_Bool bBordersSet; // die Umrandung wurde bereits gesetzt
+ sal_Bool bBordersSet; // die Umrandung wurde bereits gesetzt
sal_Bool bForceFrame;
- sal_Bool bTableAdjustOfTag; // stammt nTableAdjust aus <TABLE>?
- sal_uInt32 nHeadlineRepeat; // repeating rows
+ sal_Bool bTableAdjustOfTag; // stammt nTableAdjust aus <TABLE>?
+ sal_uInt32 nHeadlineRepeat; // repeating rows
sal_Bool bIsParentHead;
sal_Bool bHasParentSection;
sal_Bool bMakeTopSubTable;
sal_Bool bHasToFly;
sal_Bool bFixedCols;
- sal_Bool bColSpec; // Gab es COL(GROUP)-Elemente?
- sal_Bool bPrcWidth; // Breite ist eine %-Angabe
+ sal_Bool bColSpec; // Gab es COL(GROUP)-Elemente?
+ sal_Bool bPrcWidth; // Breite ist eine %-Angabe
- SwHTMLParser *pParser; // der aktuelle Parser
- HTMLTable *pTopTable; // die Tabelle auf dem Top-Level
+ SwHTMLParser *pParser; // der aktuelle Parser
+ HTMLTable *pTopTable; // die Tabelle auf dem Top-Level
HTMLTableCnts *pParentContents;
- _HTMLTableContext *pContext; // der Kontext der Tabelle
+ _HTMLTableContext *pContext; // der Kontext der Tabelle
SwHTMLTableLayout *pLayoutInfo;
// die folgenden Parameter stammen aus der dem <TABLE>-Tag
- sal_uInt16 nWidth; // die Breite der Tabelle
- sal_uInt16 nHeight; // absolute Hoehe der Tabelle
+ sal_uInt16 nWidth; // die Breite der Tabelle
+ sal_uInt16 nHeight; // absolute Hoehe der Tabelle
SvxAdjust eTableAdjust; // drawing::Alignment der Tabelle
sal_Int16 eVertOri; // Default vertikale Ausr. der Zellen
- sal_uInt16 nBorder; // Breite der auesseren Umrandung
- HTMLTableFrame eFrame; // Rahmen um die Tabelle
- HTMLTableRules eRules; // Ramhen in der Tabelle
- sal_Bool bTopCaption; // Ueberschrift ueber der Tabelle
+ sal_uInt16 nBorder; // Breite der auesseren Umrandung
+ HTMLTableFrame eFrame; // Rahmen um die Tabelle
+ HTMLTableRules eRules; // Ramhen in der Tabelle
+ sal_Bool bTopCaption; // Ueberschrift ueber der Tabelle
void InitCtor( const HTMLTableOptions *pOptions );
@@ -572,7 +572,7 @@ class HTMLTable
public:
- sal_Bool bFirstCell; // wurde schon eine Zelle angelegt?
+ sal_Bool bFirstCell; // wurde schon eine Zelle angelegt?
HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
sal_Bool bParHead, sal_Bool bHasParentSec,
@@ -714,7 +714,7 @@ HTMLTableCnts::HTMLTableCnts( HTMLTable* pTab ):
HTMLTableCnts::~HTMLTableCnts()
{
- delete pTable; // die Tabellen brauchen wir nicht mehr
+ delete pTable; // die Tabellen brauchen wir nicht mehr
delete pNext;
}
@@ -1087,7 +1087,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
if( nCellPadding )
{
if( nCellPadding==USHRT_MAX )
- nCellPadding = MIN_BORDER_DIST; // default
+ nCellPadding = MIN_BORDER_DIST; // default
else
{
nCellPadding = pParser->ToTwips( nCellPadding );
@@ -1413,9 +1413,9 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
{
SwFrmFmt *pFrmFmt = 0; // frame::Frame-Format
sal_Int16 eVOri = text::VertOrientation::NONE;
- const SvxBrushItem *pBGBrushItem = 0; // Hintergrund
+ const SvxBrushItem *pBGBrushItem = 0; // Hintergrund
sal_Bool bTopLine = sal_False, bBottomLine = sal_False, bLastBottomLine = sal_False;
- sal_Bool bReUsable = sal_False; // Format nochmals verwendbar?
+ sal_Bool bReUsable = sal_False; // Format nochmals verwendbar?
sal_uInt16 nEmptyRows = 0;
sal_Bool bHasNumFmt = sal_False;
sal_Bool bHasValue = sal_False;
@@ -1469,7 +1469,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
if( bHasNumFmt )
bHasValue = pCell->GetValue( nValue );
- if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows &&
+ if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows &&
!pBGBrushItem && !bHasNumFmt )
{
pFrmFmt = pColumn->GetFrmFmt( bBottomLine, eVOri );
@@ -2018,7 +2018,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent,
if( nCol+nColSpan==pParent->nCols && pParent->bRightBorder )
{
- bInhRightBorder = sal_True; // erstmal nur merken
+ bInhRightBorder = sal_True; // erstmal nur merken
aInhRightBorderLine = pParent->aRightBorderLine;
nInhRightBorderWidth =
GetBorderWidth( aInhRightBorderLine, sal_True ) + MIN_BORDER_DIST;
@@ -2026,7 +2026,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent,
if( ((*pParent->pColumns)[nCol])->bLeftBorder )
{
- bInhLeftBorder = sal_True; // erstmal nur merken
+ bInhLeftBorder = sal_True; // erstmal nur merken
aInhLeftBorderLine = 0==nCol ? pParent->aLeftBorderLine
: pParent->aBorderLine;
nInhLeftBorderWidth =
@@ -2166,8 +2166,8 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
if( !nColSpan || (sal_uInt32)nCurCol + nColSpan > USHRT_MAX )
nColSpan = 1;
- sal_uInt16 nColsReq = nCurCol + nColSpan; // benoetigte Spalten
- sal_uInt16 nRowsReq = nCurRow + nRowSpan; // benoetigte Zeilen
+ sal_uInt16 nColsReq = nCurCol + nColSpan; // benoetigte Spalten
+ sal_uInt16 nRowsReq = nCurRow + nRowSpan; // benoetigte Zeilen
sal_uInt16 i, j;
// falls wir mehr Spalten benoetigen als wir zur Zeit haben,
@@ -2279,14 +2279,14 @@ inline void HTMLTable::CloseSection( sal_Bool bHead )
if( nCurRow>0 && nCurRow<=nRows )
((*pRows)[nCurRow-1])->SetEndOfGroup();
if( bHead /*&& nCurRow==1*/ )
-// bHeadlineRepeat = sal_True;
+// bHeadlineRepeat = sal_True;
nHeadlineRepeat = nCurRow;
}
void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOrient,
SvxBrushItem *pBGBrushItem )
{
- sal_uInt16 nRowsReq = nCurRow+1; // Anzahl benoetigter Zeilen;
+ sal_uInt16 nRowsReq = nCurRow+1; // Anzahl benoetigter Zeilen;
// die naechste Zeile anlegen, falls sie nicht schon da ist
if( nRows<nRowsReq )
@@ -2373,7 +2373,7 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, sal_Bool bRel
if( !nSpan )
nSpan = 1;
- sal_uInt16 nColsReq = nCurCol + nSpan; // benoetigte Spalten
+ sal_uInt16 nColsReq = nCurCol + nSpan; // benoetigte Spalten
if( nCols < nColsReq )
{
@@ -2475,7 +2475,7 @@ void HTMLTable::_MakeTable( SwTableBox *pBox )
erste Zeile: ohne Absatz-Einzuege
zweite Zeile: mit Absatz-Einzuegen
-ALIGN= LEFT RIGHT CENTER -
+ALIGN= LEFT RIGHT CENTER -
-------------------------------------------------------------------------
xxx bei Tabellen mit WIDTH=nn% ist die Prozent-Angabe von Bedeutung:
xxx nn = 100 text::HoriOrientation::FULL text::HoriOrientation::FULL text::HoriOrientation::FULL text::HoriOrientation::FULL %
@@ -3006,12 +3006,12 @@ xub_StrLen SwHTMLParser::StripTrailingLF()
{
// MIB 6.6.97: Warum sollte man bei leeren Absaetzen nur ein LF loeschen?
// Das stimmt doch irgendwi nicht ...
-// if( nLFCount == nLen )
-// {
-// // nur Lfs, dann nur ein LF loeschen
-// nLFCount = 1;
-// }
-// else if( nLFCount > 2 )
+// if( nLFCount == nLen )
+// {
+// // nur Lfs, dann nur ein LF loeschen
+// nLFCount = 1;
+// }
+// else if( nLFCount > 2 )
if( nLFCount > 2 )
{
// Bei Netscape entspricht ein Absatz-Ende zwei LFs
@@ -3182,8 +3182,8 @@ class _CellSaveStruct : public _SectionSaveStruct
String aBGImage;
Color aBGColor;
- HTMLTableCnts* pCnts; // Liste aller Inhalte
- HTMLTableCnts* pCurrCnts; // der aktuelle Inhalt oder 0
+ HTMLTableCnts* pCnts; // Liste aller Inhalte
+ HTMLTableCnts* pCurrCnts; // der aktuelle Inhalt oder 0
SwNodeIndex *pNoBreakEndParaIdx;// Absatz-Index eines </NOBR>
double nValue;
@@ -3191,7 +3191,7 @@ class _CellSaveStruct : public _SectionSaveStruct
sal_uInt32 nNumFmt;
sal_uInt16 nRowSpan, nColSpan, nWidth, nHeight;
- xub_StrLen nNoBreakEndCntntPos; // Zeichen-Index eines </NOBR>
+ xub_StrLen nNoBreakEndCntntPos; // Zeichen-Index eines </NOBR>
SvxAdjust eAdjust;
sal_Int16 eVertOri;
@@ -3201,8 +3201,8 @@ class _CellSaveStruct : public _SectionSaveStruct
sal_Bool bHasNumFmt : 1;
sal_Bool bHasValue : 1;
sal_Bool bBGColor : 1;
- sal_Bool bNoWrap : 1; // NOWRAP-Option
- sal_Bool bNoBreak : 1; // NOBREAK-Tag
+ sal_Bool bNoWrap : 1; // NOWRAP-Option
+ sal_Bool bNoBreak : 1; // NOBREAK-Tag
public:
@@ -3279,15 +3279,15 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
aHTMLTblVAlignTable, eVertOri );
break;
case HTML_O_WIDTH:
- nWidth = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape
+ nWidth = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape
bPrcWidth = (pOption->GetString().Search('%') != STRING_NOTFOUND);
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
case HTML_O_HEIGHT:
- nHeight = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape
+ nHeight = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape
if( pOption->GetString().Search('%') != STRING_NOTFOUND)
- nHeight = 0; // keine %-Angaben beruecksichtigen
+ nHeight = 0; // keine %-Angaben beruecksichtigen
break;
case HTML_O_BGCOLOR:
// Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netscape
@@ -3587,13 +3587,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
static sal_uInt16 aWhichIds[] =
{
- RES_PARATR_SPLIT, RES_PARATR_SPLIT,
- RES_PAGEDESC, RES_PAGEDESC,
- RES_BREAK, RES_BREAK,
- RES_BACKGROUND, RES_BACKGROUND,
- RES_KEEP, RES_KEEP,
- RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
- RES_FRAMEDIR, RES_FRAMEDIR,
+ RES_PARATR_SPLIT, RES_PARATR_SPLIT,
+ RES_PAGEDESC, RES_PAGEDESC,
+ RES_BREAK, RES_BREAK,
+ RES_BACKGROUND, RES_BACKGROUND,
+ RES_KEEP, RES_KEEP,
+ RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
+ RES_FRAMEDIR, RES_FRAMEDIR,
0
};
@@ -3651,14 +3651,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
// oder es gibt bereits Inhalt an der entsprechenden Stelle.
OSL_ENSURE( !bForceFrame || pCurTable->HasParentSection(),
"Tabelle im Rahmen hat keine Umgebung!" );
-// SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck
-// in die umgebende Zelle
-// if( bForceFrame && !pCurTable->HasParentSection() )
-// {
-// pCurTable->SetParentContents(
-// InsertTableContents( sal_False, SVX_ADJUST_END ) );
-// pCurTable->SetHasParentSection( sal_True );
-// }
+// SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck
+// in die umgebende Zelle
+// if( bForceFrame && !pCurTable->HasParentSection() )
+// {
+// pCurTable->SetParentContents(
+// InsertTableContents( sal_False, SVX_ADJUST_END ) );
+// pCurTable->SetHasParentSection( sal_True );
+// }
sal_Bool bAppend = sal_False;
if( bForceFrame )
@@ -3837,8 +3837,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
// automatisch verankerte Rahmen muessen noch um
// eine Position nach vorne verschoben werden.
//if( FLY_AUTO_CNTNT==eAnchorId )
- // aMoveFlyFrms.C40_INSERT( SwFrmFmt, pFrmFmt,
- // aMoveFlyFrms.Count() );
+ // aMoveFlyFrms.C40_INSERT( SwFrmFmt, pFrmFmt,
+ // aMoveFlyFrms.Count() );
}
// eine SwTable mit einer Box anlegen und den PaM in den
@@ -3876,14 +3876,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
const SfxPoolItem* pItem2;
- if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet()
+ if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet()
.GetItemState( RES_PAGEDESC, sal_False, &pItem2 ) &&
((SwFmtPageDesc *)pItem2)->GetPageDesc() )
{
pFrmFmt->SetFmtAttr( *pItem2 );
pOldTxtNd->ResetAttr( RES_PAGEDESC );
}
- if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet()
+ if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet()
.GetItemState( RES_BREAK, sal_True, &pItem2 ) )
{
switch( ((SvxFmtBreakItem *)pItem2)->GetBreak() )
@@ -3964,7 +3964,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
}
if( !nToken )
- nToken = GetNextToken(); // Token nach <TABLE>
+ nToken = GetNextToken(); // Token nach <TABLE>
sal_Bool bDone = sal_False;
while( (IsParserWorking() && !bDone) || bPending )
@@ -4369,7 +4369,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
}
if( !nToken )
- nToken = GetNextToken(); // naechstes Token
+ nToken = GetNextToken(); // naechstes Token
sal_Bool bDone = sal_False;
while( (IsParserWorking() && !bDone) || bPending )
@@ -4396,10 +4396,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
SkipToken( -1 );
bDone = sal_True;
}
-// else
-// {
-// NextToken( nToken );
-// }
+// else
+// {
+// NextToken( nToken );
+// }
break;
case HTML_TABLEROW_ON:
case HTML_THEAD_ON:
@@ -4441,10 +4441,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
// spaltige Rahmen koennen wir hier leider nicht einguegen
break;
case HTML_FORM_ON:
- NewForm( sal_False ); // keinen neuen Absatz aufmachen!
+ NewForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_FORM_OFF:
- EndForm( sal_False ); // keinen neuen Absatz aufmachen!
+ EndForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_COMMENT:
NextToken( nToken );
@@ -4548,7 +4548,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
}
if( !nToken )
- nToken = GetNextToken(); // naechstes Token
+ nToken = GetNextToken(); // naechstes Token
sal_Bool bDone = sal_False;
while( (IsParserWorking() && !bDone) || bPending )
@@ -4575,10 +4575,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
SkipToken( -1 );
bDone = sal_True;
}
-// else
-// {
-// NextToken( nToken );
-// }
+// else
+// {
+// NextToken( nToken );
+// }
break;
case HTML_THEAD_ON:
case HTML_TFOOT_ON:
@@ -4604,7 +4604,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
bDone = pTable->IsOverflowing();
break;
case HTML_TABLEROW_ON:
- BuildTableRow( pCurTable, sal_True, pSaveStruct->eAdjust,
+ BuildTableRow( pCurTable, sal_True, pSaveStruct->eAdjust,
pSaveStruct->eVertOri );
bDone = pTable->IsOverflowing();
break;
@@ -4612,10 +4612,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
// spaltige Rahmen koennen wir hier leider nicht einguegen
break;
case HTML_FORM_ON:
- NewForm( sal_False ); // keinen neuen Absatz aufmachen!
+ NewForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_FORM_OFF:
- EndForm( sal_False ); // keinen neuen Absatz aufmachen!
+ EndForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_TEXTTOKEN:
// Blank-Strings sind Folge von CR+LF und kein Text
@@ -4677,7 +4677,7 @@ inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() :
inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
{
pTable->CloseColGroup( nColGrpSpan, nColGrpWidth,
- bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri );
+ bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri );
}
void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
@@ -4746,7 +4746,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
}
if( !nToken )
- nToken = GetNextToken(); // naechstes Token
+ nToken = GetNextToken(); // naechstes Token
sal_Bool bDone = sal_False;
while( (IsParserWorking() && !bDone) || bPending )
@@ -4773,10 +4773,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
SkipToken( -1 );
bDone = sal_True;
}
-// else
-// {
-// NextToken( nToken );
-// }
+// else
+// {
+// NextToken( nToken );
+// }
break;
case HTML_COLGROUP_ON:
case HTML_THEAD_ON:
@@ -4834,7 +4834,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
}
break;
case HTML_COL_OFF:
- break; // Ignorieren
+ break; // Ignorieren
case HTML_MULTICOL_ON:
// spaltige Rahmen koennen wir hier leider nicht einguegen
break;
@@ -4877,7 +4877,7 @@ class _CaptionSaveStruct : public _SectionSaveStruct
public:
- _HTMLAttrTable aAttrTab; // und die Attribute
+ _HTMLAttrTable aAttrTab; // und die Attribute
_CaptionSaveStruct( SwHTMLParser& rParser, const SwPosition& rPos ) :
_SectionSaveStruct( rParser ), aSavePos( rPos )
@@ -4982,7 +4982,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
}
if( !nToken )
- nToken = GetNextToken(); // naechstes Token
+ nToken = GetNextToken(); // naechstes Token
// </CAPTION> wird laut DTD benoetigt
sal_Bool bDone = sal_False;
@@ -5033,7 +5033,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
pPendStack = pTmp;
OSL_ENSURE( !pTmp, "weiter kann es nicht gehen!" );
- nNxtToken = 0; // neu lesen
+ nNxtToken = 0; // neu lesen
}
if( IsParserWorking() )
@@ -5192,7 +5192,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions *pOptions,
case HTML_O_HEIGHT:
nHeight = (sal_uInt16)pOption->GetNumber();
if( pOption->GetString().Search('%') != STRING_NOTFOUND )
- nHeight = 0; // keine %-Anagben benutzen!!!
+ nHeight = 0; // keine %-Anagben benutzen!!!
break;
case HTML_O_CELLPADDING:
nCellPadding = (sal_uInt16)pOption->GetNumber();
@@ -5344,7 +5344,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// </TABLE> wird laut DTD benoetigt
if( !nToken )
- nToken = GetNextToken(); // naechstes Token
+ nToken = GetNextToken(); // naechstes Token
sal_Bool bDone = sal_False;
while( (IsParserWorking() && !bDone) || bPending )
@@ -5373,10 +5373,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
SkipToken( -1 );
bDone = sal_True;
}
-// else
-// {
-// NextToken( nToken );
-// }
+// else
+// {
+// NextToken( nToken );
+// }
break;
case HTML_TABLE_OFF:
bDone = sal_True;
@@ -5409,10 +5409,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
// spaltige Rahmen koennen wir hier leider nicht einguegen
break;
case HTML_FORM_ON:
- NewForm( sal_False ); // keinen neuen Absatz aufmachen!
+ NewForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_FORM_OFF:
- EndForm( sal_False ); // keinen neuen Absatz aufmachen!
+ EndForm( sal_False ); // keinen neuen Absatz aufmachen!
break;
case HTML_TEXTTOKEN:
// Blank-Strings sind u. U. eine Folge von CR+LF und kein Text
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1ed154ffea00..c520e6a5be80 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -2,7 +2,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
@@ -282,7 +282,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
SwWriteTableCol *pCol = aCols[nCol];
-// sal_Bool bOutWidth = nColSpan>1 || pCol->GetOutWidth();
+// sal_Bool bOutWidth = nColSpan>1 || pCol->GetOutWidth();
sal_Bool bOutWidth = sal_True; //nColSpan==1 && pCol->GetOutWidth();
const SwStartNode* pSttNd = pBox->GetSttNd();
@@ -320,7 +320,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
}
}
- rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile
+ rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile
ByteString sOut( '<' );
sOut += (bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata );
@@ -463,7 +463,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.Strm() << sOut.GetBuffer();
rWrt.bLFPossible = sal_True;
- rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
+ rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
if( pSttNd )
{
@@ -494,7 +494,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
aTableWrt.Write( rWrt );
}
- rWrt.DecIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
+ rWrt.DecIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
if( rWrt.bLFPossible )
rWrt.OutNewLine();
@@ -531,7 +531,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
}
}
- rWrt.OutNewLine(); // <TR> in neuer Zeile
+ rWrt.OutNewLine(); // <TR> in neuer Zeile
rWrt.Strm() << '<' << OOO_STRING_SVTOOLS_HTML_tablerow;
if( pBrushItem )
{
@@ -561,7 +561,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
rWrt.DecIndentLevel(); // Inhalt von <TR>...</TR> einruecken
- rWrt.OutNewLine(); // </TR> in neuer Zeile
+ rWrt.OutNewLine(); // </TR> in neuer Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False );
}
@@ -569,7 +569,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
sal_Bool bTHead, const SwFrmFmt *pFrmFmt,
- const String *pCaption, sal_Bool bTopCaption,
+ const String *pCaption, sal_Bool bTopCaption,
sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
{
sal_uInt16 nRow;
@@ -629,7 +629,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.ChangeParaToken( 0 );
if( rWrt.bLFPossible )
- rWrt.OutNewLine(); // <TABLE> in neue Zeile
+ rWrt.OutNewLine(); // <TABLE> in neue Zeile
ByteString sOut( '<' );
sOut += OOO_STRING_SVTOOLS_HTML_table;
@@ -722,16 +722,16 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
const sal_Char *pFrame = 0;
switch( nFrameMask )
{
- case 0: pFrame = OOO_STRING_SVTOOLS_HTML_TF_void ;break;
- case 1: pFrame = OOO_STRING_SVTOOLS_HTML_TF_above ;break;
- case 2: pFrame = OOO_STRING_SVTOOLS_HTML_TF_below ;break;
- case 3: pFrame = OOO_STRING_SVTOOLS_HTML_TF_hsides ;break;
- case 4: pFrame = OOO_STRING_SVTOOLS_HTML_TF_lhs ;break;
- case 8: pFrame = OOO_STRING_SVTOOLS_HTML_TF_rhs ;break;
- case 12: pFrame = OOO_STRING_SVTOOLS_HTML_TF_vsides ;break;
+ case 0: pFrame = OOO_STRING_SVTOOLS_HTML_TF_void ;break;
+ case 1: pFrame = OOO_STRING_SVTOOLS_HTML_TF_above ;break;
+ case 2: pFrame = OOO_STRING_SVTOOLS_HTML_TF_below ;break;
+ case 3: pFrame = OOO_STRING_SVTOOLS_HTML_TF_hsides ;break;
+ case 4: pFrame = OOO_STRING_SVTOOLS_HTML_TF_lhs ;break;
+ case 8: pFrame = OOO_STRING_SVTOOLS_HTML_TF_rhs ;break;
+ case 12: pFrame = OOO_STRING_SVTOOLS_HTML_TF_vsides ;break;
//FRAME=BOX ist der default wenn BORDER>0
//case 15:
- //default: pFrame = OOO_STRING_SVTOOLS_HTML_TF_box ;break; // geht nicht
+ //default: pFrame = OOO_STRING_SVTOOLS_HTML_TF_box ;break; // geht nicht
};
if( pFrame )
(((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_frame ) += '=') += pFrame;
@@ -806,7 +806,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
(((sOutStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=')
+= (bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom);
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.GetBuffer(), sal_True );
- HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, sal_False );
}
@@ -1166,7 +1166,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( text::HoriOrientation::NONE!=eDivHoriOri )
{
if( rHTMLWrt.bLFPossible )
- rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile
+ rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile
if( text::HoriOrientation::CENTER==eDivHoriOri )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
else
@@ -1176,7 +1176,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer(),
sal_True );
}
- rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken
+ rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken
rHTMLWrt.bLFPossible = sal_True;
}
@@ -1215,8 +1215,8 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( text::HoriOrientation::NONE!=eDivHoriOri )
{
- rHTMLWrt.DecIndentLevel(); // Inhalt von <CENTER> einruecken
- rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile
+ rHTMLWrt.DecIndentLevel(); // Inhalt von <CENTER> einruecken
+ rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center
: OOO_STRING_SVTOOLS_HTML_division, sal_False );
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index 99343566048a..2e67a7a12676 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index ab9f16c36cc7..4195cc1493c1 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -2,7 +2,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
@@ -55,10 +55,10 @@
#define LOOP_CHECK_RESTART \
nOldInPos = STRING_MAXLEN;
#define LOOP_CHECK_CHECK( where ) \
- DBG_ASSERT( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \
- if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \
- break; \
- else \
+ DBG_ASSERT( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \
+ if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \
+ break; \
+ else \
nOldInPos = nInPos;
#else
@@ -662,8 +662,8 @@ CSS1Token CSS1Parser::GetNextToken()
sTmpBuffer2.append( cNextCh );
switch( cNextCh )
{
- case '(': nNestCnt++; break;
- case ')': nNestCnt--; break;
+ case '(': nNestCnt++; break;
+ case ')': nNestCnt--; break;
}
cNextCh = GetNextChar();
} while( (nNestCnt>1 || ')'!=cNextCh) && !IsEOF() );
@@ -729,7 +729,7 @@ void CSS1Parser::ParseStyleSheet()
// url ueberspringen wir ungeprueft
nToken = GetNextToken();
break;
- case CSS1_IDENT: // Look-Aheads
+ case CSS1_IDENT: // Look-Aheads
case CSS1_DOT_W_WS:
case CSS1_HASH:
// /Feature: PrintExt
@@ -756,7 +756,7 @@ void CSS1Parser::ParseStyleSheet()
switch( nToken )
{
- case CSS1_IDENT: // Look-Aheads
+ case CSS1_IDENT: // Look-Aheads
case CSS1_DOT_W_WS:
case CSS1_HASH:
// /Feature: PrintExt
@@ -1027,7 +1027,7 @@ CSS1Selector *CSS1Parser::ParseSelector()
// term
// : unary_operator?
// [ NUMBER | STRING | PERCENTAGE | LENGTH | EMS | EXS | IDENT |
-// HEXCOLOR | URL | RGB ]
+// HEXCOLOR | URL | RGB ]
//
// operator
// : '/' | ',' | /* empty */
@@ -1100,7 +1100,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty )
case CSS1_RGB:
case CSS1_HEXCOLOR:
pNew = new CSS1Expression( nToken, aToken, nValue, cOp );
- nValue = 0; // sonst landet das auch im naechsten Ident
+ nValue = 0; // sonst landet das auch im naechsten Ident
cSign = 0;
cOp = 0;
break;
@@ -1359,7 +1359,7 @@ BOOL CSS1Expression::GetColor( Color &rColor ) const
rColor.SetGreen( aColors[1] );
rColor.SetBlue( aColors[2] );
- bRet = TRUE; // etwas anderes als eine Farbe kann es nicht sein
+ bRet = TRUE; // etwas anderes als eine Farbe kann es nicht sein
}
break;
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 570f96b7e969..3a6fa46e698e 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -2,7 +2,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
@@ -45,8 +45,8 @@ enum CSS1Token
CSS1_STRING,
CSS1_NUMBER,
CSS1_PERCENTAGE,
- CSS1_LENGTH, // eine absolute Groesse in 1/100 MM
- CSS1_PIXLENGTH, // eine Pixel-Groesse
+ CSS1_LENGTH, // eine absolute Groesse in 1/100 MM
+ CSS1_PIXLENGTH, // eine Pixel-Groesse
CSS1_EMS,
CSS1_EMX,
CSS1_HEXCOLOR,
@@ -111,9 +111,9 @@ enum CSS1SelectorType
// Selektoren verkettet
class CSS1Selector
{
- CSS1SelectorType eType; // Art des Selektors
- String aSelector; // der Selektor selbst
- CSS1Selector *pNext; // die naechste Komponente
+ CSS1SelectorType eType; // Art des Selektors
+ String aSelector; // der Selektor selbst
+ CSS1Selector *pNext; // die naechste Komponente
public:
@@ -144,11 +144,11 @@ public:
//
struct CSS1Expression
{
- sal_Unicode cOp; // Art der Verkuepfung mit dem Vorgaenger
- CSS1Token eType; // der Typ des Wertes
- String aValue; // und sein Wert als String
- double nValue; // und als Zahl (TWIPs fuer LENGTH)
- CSS1Expression *pNext; // die naechste Komponente
+ sal_Unicode cOp; // Art der Verkuepfung mit dem Vorgaenger
+ CSS1Token eType; // der Typ des Wertes
+ String aValue; // und sein Wert als String
+ double nValue; // und als Zahl (TWIPs fuer LENGTH)
+ CSS1Expression *pNext; // die naechste Komponente
public:
@@ -202,31 +202,31 @@ inline sal_Int32 CSS1Expression::GetSLength() const
// und DeclarationParsed() an abgeleitete Parser uebergeben. Bsp:
//
// H1, H2 { font-weight: bold; text-align: right }
-// | | | |
+// | | | |
// | | | DeclP( 'text-align', 'right' )
-// | | DeclP( 'font-weight', 'bold' )
+// | | DeclP( 'font-weight', 'bold' )
// | SelP( 'H2', sal_False )
// SelP( 'H1', sal_True )
//
class CSS1Parser
{
- sal_Bool bWhiteSpace : 1; // White-Space gelesen?
- sal_Bool bEOF : 1; // Ende des "Files" ?
+ sal_Bool bWhiteSpace : 1; // White-Space gelesen?
+ sal_Bool bEOF : 1; // Ende des "Files" ?
- sal_Unicode cNextCh; // naechstes Zeichen
+ sal_Unicode cNextCh; // naechstes Zeichen
- xub_StrLen nInPos; // aktuelle Position im Input-String
+ xub_StrLen nInPos; // aktuelle Position im Input-String
- sal_uInt32 nlLineNr; // akt. Zeilen Nummer
- sal_uInt32 nlLinePos; // akt. Spalten Nummer
+ sal_uInt32 nlLineNr; // akt. Zeilen Nummer
+ sal_uInt32 nlLinePos; // akt. Spalten Nummer
- double nValue; // der Wert des Tokens als Zahl
+ double nValue; // der Wert des Tokens als Zahl
- CSS1ParserState eState; // der akteulle Zustand der Parsers
- CSS1Token nToken; // das aktuelle Token
+ CSS1ParserState eState; // der akteulle Zustand der Parsers
+ CSS1Token nToken; // das aktuelle Token
- String aIn; // der zu parsende String
- String aToken; // das Token als String
+ String aIn; // der zu parsende String
+ String aToken; // das Token als String
// Parsen vorbereiten
void InitRead( const String& rIn );
@@ -244,8 +244,8 @@ class CSS1Parser
sal_uInt32 IncLineNr() { return ++nlLineNr; }
sal_uInt32 IncLinePos() { return ++nlLinePos; }
- inline sal_uInt32 SetLineNr( sal_uInt32 nlNum ); // inline unten
- inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline unten
+ inline sal_uInt32 SetLineNr( sal_uInt32 nlNum ); // inline unten
+ inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline unten
// Parsen von Teilen der Grammatik
void ParseRule();
@@ -284,8 +284,8 @@ public:
CSS1Parser();
virtual ~CSS1Parser();
- inline sal_uInt32 GetLineNr() const { return nlLineNr; }
- inline sal_uInt32 GetLinePos() const { return nlLinePos; }
+ inline sal_uInt32 GetLineNr() const { return nlLineNr; }
+ inline sal_uInt32 GetLinePos() const { return nlLinePos; }
};
inline sal_uInt32 CSS1Parser::SetLineNr( sal_uInt32 nlNum )
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index d588171c8720..cf5e71b813ef 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2,7 +2,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
@@ -78,161 +78,161 @@ SV_IMPL_PTRARR( CSS1Selectors, CSS1Selector* )
static CSS1PropertyEnum __READONLY_DATA aFontSizeTable[] =
{
- { sCSS1_PV_xx_small, 0 },
- { sCSS1_PV_x_small, 1 },
- { sCSS1_PV_small, 2 },
- { sCSS1_PV_medium, 3 },
- { sCSS1_PV_large, 4 },
- { sCSS1_PV_x_large, 5 },
- { sCSS1_PV_xx_large, 6 },
- { 0, 0 }
+ { sCSS1_PV_xx_small, 0 },
+ { sCSS1_PV_x_small, 1 },
+ { sCSS1_PV_small, 2 },
+ { sCSS1_PV_medium, 3 },
+ { sCSS1_PV_large, 4 },
+ { sCSS1_PV_x_large, 5 },
+ { sCSS1_PV_xx_large, 6 },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aFontFamilyTable[] =
{
- { sCSS1_PV_serif, FAMILY_ROMAN },
- { sCSS1_PV_sans_serif, FAMILY_SWISS },
- { sCSS1_PV_cursive, FAMILY_SCRIPT },
- { sCSS1_PV_fantasy, FAMILY_DECORATIVE },
- { sCSS1_PV_monospace, FAMILY_MODERN },
- { 0, 0 }
+ { sCSS1_PV_serif, FAMILY_ROMAN },
+ { sCSS1_PV_sans_serif, FAMILY_SWISS },
+ { sCSS1_PV_cursive, FAMILY_SCRIPT },
+ { sCSS1_PV_fantasy, FAMILY_DECORATIVE },
+ { sCSS1_PV_monospace, FAMILY_MODERN },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aFontWeightTable[] =
{
- { sCSS1_PV_extra_light, WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS)
- { sCSS1_PV_light, WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE)
- { sCSS1_PV_demi_light, WEIGHT_NORMAL }, // WEIGHT_SEMILIGHT (OBS)
- { sCSS1_PV_medium, WEIGHT_NORMAL }, // WEIGHT_MEDIUM (OBS)
- { sCSS1_PV_normal, WEIGHT_NORMAL }, // WEIGHT_MEDIUM
- { sCSS1_PV_demi_bold, WEIGHT_NORMAL }, // WEIGHT_SEMIBOLD (OBS)
- { sCSS1_PV_bold, WEIGHT_BOLD }, // WEIGHT_BOLD (OBSOLETE)
- { sCSS1_PV_extra_bold, WEIGHT_BOLD }, // WEIGHT_ULTRABOLD (OBS)
- { sCSS1_PV_bolder, WEIGHT_BOLD },
- { sCSS1_PV_lighter, WEIGHT_NORMAL },
- { 0, 0 }
+ { sCSS1_PV_extra_light, WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS)
+ { sCSS1_PV_light, WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE)
+ { sCSS1_PV_demi_light, WEIGHT_NORMAL }, // WEIGHT_SEMILIGHT (OBS)
+ { sCSS1_PV_medium, WEIGHT_NORMAL }, // WEIGHT_MEDIUM (OBS)
+ { sCSS1_PV_normal, WEIGHT_NORMAL }, // WEIGHT_MEDIUM
+ { sCSS1_PV_demi_bold, WEIGHT_NORMAL }, // WEIGHT_SEMIBOLD (OBS)
+ { sCSS1_PV_bold, WEIGHT_BOLD }, // WEIGHT_BOLD (OBSOLETE)
+ { sCSS1_PV_extra_bold, WEIGHT_BOLD }, // WEIGHT_ULTRABOLD (OBS)
+ { sCSS1_PV_bolder, WEIGHT_BOLD },
+ { sCSS1_PV_lighter, WEIGHT_NORMAL },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aFontStyleTable[] =
{
- { sCSS1_PV_normal, ITALIC_NONE },
- { sCSS1_PV_italic, ITALIC_NORMAL },
- { sCSS1_PV_oblique, ITALIC_NORMAL },
- { 0, 0 }
+ { sCSS1_PV_normal, ITALIC_NONE },
+ { sCSS1_PV_italic, ITALIC_NORMAL },
+ { sCSS1_PV_oblique, ITALIC_NORMAL },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aFontVariantTable[] =
{
- { sCSS1_PV_normal, SVX_CASEMAP_NOT_MAPPED },
- { sCSS1_PV_small_caps, SVX_CASEMAP_KAPITAELCHEN },
- { 0, 0 }
+ { sCSS1_PV_normal, SVX_CASEMAP_NOT_MAPPED },
+ { sCSS1_PV_small_caps, SVX_CASEMAP_KAPITAELCHEN },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aDirectionTable[] =
{
- { sCSS1_PV_ltr, FRMDIR_HORI_LEFT_TOP },
- { sCSS1_PV_rtl, FRMDIR_HORI_RIGHT_TOP },
- { sCSS1_PV_inherit, FRMDIR_ENVIRONMENT },
- { 0, 0 }
+ { sCSS1_PV_ltr, FRMDIR_HORI_LEFT_TOP },
+ { sCSS1_PV_rtl, FRMDIR_HORI_RIGHT_TOP },
+ { sCSS1_PV_inherit, FRMDIR_ENVIRONMENT },
+ { 0, 0 }
};
/* */
static CSS1PropertyEnum __READONLY_DATA aBGRepeatTable[] =
{
- { sCSS1_PV_repeat, GPOS_TILED },
- { sCSS1_PV_repeat_x, GPOS_TILED },
- { sCSS1_PV_repeat_y, GPOS_TILED },
- { sCSS1_PV_no_repeat, GPOS_NONE },
- { 0, 0 }
+ { sCSS1_PV_repeat, GPOS_TILED },
+ { sCSS1_PV_repeat_x, GPOS_TILED },
+ { sCSS1_PV_repeat_y, GPOS_TILED },
+ { sCSS1_PV_no_repeat, GPOS_NONE },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aBGHoriPosTable[] =
{
- { sCSS1_PV_left, GPOS_LT },
- { sCSS1_PV_center, GPOS_MT },
- { sCSS1_PV_right, GPOS_RT },
- { 0, 0 }
+ { sCSS1_PV_left, GPOS_LT },
+ { sCSS1_PV_center, GPOS_MT },
+ { sCSS1_PV_right, GPOS_RT },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aBGVertPosTable[] =
{
- { sCSS1_PV_top, GPOS_LT },
- { sCSS1_PV_middle, GPOS_LM },
- { sCSS1_PV_bottom, GPOS_LB },
- { 0, 0 }
+ { sCSS1_PV_top, GPOS_LT },
+ { sCSS1_PV_middle, GPOS_LM },
+ { sCSS1_PV_bottom, GPOS_LB },
+ { 0, 0 }
};
/* */
static CSS1PropertyEnum __READONLY_DATA aTextAlignTable[] =
{
- { sCSS1_PV_left, SVX_ADJUST_LEFT },
- { sCSS1_PV_center, SVX_ADJUST_CENTER },
- { sCSS1_PV_right, SVX_ADJUST_RIGHT },
- { sCSS1_PV_justify, SVX_ADJUST_BLOCK },
- { 0, 0 }
+ { sCSS1_PV_left, SVX_ADJUST_LEFT },
+ { sCSS1_PV_center, SVX_ADJUST_CENTER },
+ { sCSS1_PV_right, SVX_ADJUST_RIGHT },
+ { sCSS1_PV_justify, SVX_ADJUST_BLOCK },
+ { 0, 0 }
};
/* */
static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] =
{
- { sCSS1_PV_thin, 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0
- { sCSS1_PV_medium, 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1
- { sCSS1_PV_thick, 2 }, // DEF_LINE_WIDTH_2 / DEF_DOUBLE_LINE2
- { 0, 0 }
+ { sCSS1_PV_thin, 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0
+ { sCSS1_PV_medium, 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1
+ { sCSS1_PV_thick, 2 }, // DEF_LINE_WIDTH_2 / DEF_DOUBLE_LINE2
+ { 0, 0 }
};
enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE, CSS1_BS_DOTTED, CSS1_BS_DASHED };
static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] =
{
- { sCSS1_PV_none, CSS1_BS_NONE },
- { sCSS1_PV_dotted, CSS1_BS_DOTTED },
- { sCSS1_PV_dashed, CSS1_BS_DASHED },
- { sCSS1_PV_solid, CSS1_BS_SINGLE },
- { sCSS1_PV_double, CSS1_BS_DOUBLE },
- { sCSS1_PV_groove, CSS1_BS_SINGLE },
- { sCSS1_PV_ridge, CSS1_BS_SINGLE },
- { sCSS1_PV_inset, CSS1_BS_SINGLE },
- { sCSS1_PV_outset, CSS1_BS_SINGLE },
- { 0, 0 }
+ { sCSS1_PV_none, CSS1_BS_NONE },
+ { sCSS1_PV_dotted, CSS1_BS_DOTTED },
+ { sCSS1_PV_dashed, CSS1_BS_DASHED },
+ { sCSS1_PV_solid, CSS1_BS_SINGLE },
+ { sCSS1_PV_double, CSS1_BS_DOUBLE },
+ { sCSS1_PV_groove, CSS1_BS_SINGLE },
+ { sCSS1_PV_ridge, CSS1_BS_SINGLE },
+ { sCSS1_PV_inset, CSS1_BS_SINGLE },
+ { sCSS1_PV_outset, CSS1_BS_SINGLE },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aFloatTable[] =
{
- { sCSS1_PV_left, SVX_ADJUST_LEFT },
- { sCSS1_PV_right, SVX_ADJUST_RIGHT },
- { sCSS1_PV_none, SVX_ADJUST_END },
- { 0, 0 }
+ { sCSS1_PV_left, SVX_ADJUST_LEFT },
+ { sCSS1_PV_right, SVX_ADJUST_RIGHT },
+ { sCSS1_PV_none, SVX_ADJUST_END },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aPositionTable[] =
{
- { sCSS1_PV_absolute, SVX_CSS1_POS_ABSOLUTE },
- { sCSS1_PV_relative, SVX_CSS1_POS_RELATIVE },
- { sCSS1_PV_static, SVX_CSS1_POS_STATIC },
- { 0, 0 }
+ { sCSS1_PV_absolute, SVX_CSS1_POS_ABSOLUTE },
+ { sCSS1_PV_relative, SVX_CSS1_POS_RELATIVE },
+ { sCSS1_PV_static, SVX_CSS1_POS_STATIC },
+ { 0, 0 }
};
// Feature: PrintExt
static CSS1PropertyEnum __READONLY_DATA aSizeTable[] =
{
- { sCSS1_PV_auto, SVX_CSS1_STYPE_AUTO },
- { sCSS1_PV_landscape, SVX_CSS1_STYPE_LANDSCAPE },
- { sCSS1_PV_portrait, SVX_CSS1_STYPE_PORTRAIT },
- { 0, 0 }
+ { sCSS1_PV_auto, SVX_CSS1_STYPE_AUTO },
+ { sCSS1_PV_landscape, SVX_CSS1_STYPE_LANDSCAPE },
+ { sCSS1_PV_portrait, SVX_CSS1_STYPE_PORTRAIT },
+ { 0, 0 }
};
static CSS1PropertyEnum __READONLY_DATA aPageBreakTable[] =
{
- { sCSS1_PV_auto, SVX_CSS1_PBREAK_AUTO },
- { sCSS1_PV_always, SVX_CSS1_PBREAK_ALWAYS },
- { sCSS1_PV_avoid, SVX_CSS1_PBREAK_AVOID },
- { sCSS1_PV_left, SVX_CSS1_PBREAK_LEFT },
- { sCSS1_PV_right, SVX_CSS1_PBREAK_RIGHT },
- { 0, 0 }
+ { sCSS1_PV_auto, SVX_CSS1_PBREAK_AUTO },
+ { sCSS1_PV_always, SVX_CSS1_PBREAK_ALWAYS },
+ { sCSS1_PV_avoid, SVX_CSS1_PBREAK_AVOID },
+ { sCSS1_PV_left, SVX_CSS1_PBREAK_LEFT },
+ { sCSS1_PV_right, SVX_CSS1_PBREAK_RIGHT },
+ { 0, 0 }
};
// /Feature: PrintExt
@@ -566,10 +566,10 @@ SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( USHORT nLine, BOOL bCreat
USHORT nPos = 0;
switch( nLine )
{
- case BOX_LINE_TOP: nPos = 0; break;
- case BOX_LINE_BOTTOM: nPos = 1; break;
- case BOX_LINE_LEFT: nPos = 2; break;
- case BOX_LINE_RIGHT: nPos = 3; break;
+ case BOX_LINE_TOP: nPos = 0; break;
+ case BOX_LINE_BOTTOM: nPos = 1; break;
+ case BOX_LINE_LEFT: nPos = 2; break;
+ case BOX_LINE_RIGHT: nPos = 3; break;
}
if( !aBorderInfos[nPos] && bCreate )
@@ -718,7 +718,7 @@ BOOL operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
return rE1.aKey==rE2.aKey;
}
-BOOL operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
+BOOL operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
{
return rE1.aKey<rE2.aKey;
}
@@ -745,7 +745,7 @@ BOOL SvxCSS1Parser::SelectorParsed( const CSS1Selector *pSelector,
// Dieses ist der erste Selektor einer Rule, also muessen
// die bisher geparsten Items auf die Styles verteilt werden
-// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() );
+// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() );
for( USHORT i=0; i<aSelectors.Count(); i++ )
{
StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo );
@@ -774,7 +774,7 @@ BOOL SvxCSS1Parser::DeclarationParsed( const String& rProperty,
ParseProperty( rProperty, pExpr );
- return TRUE; // die Deklaration brauchen wir nicht mehr. Loeschen!
+ return TRUE; // die Deklaration brauchen wir nicht mehr. Loeschen!
}
/* */
@@ -857,7 +857,7 @@ BOOL SvxCSS1Parser::ParseStyleSheet( const String& rIn )
BOOL bSuccess = CSS1Parser::ParseStyleSheet( rIn );
// die bisher geparsten Items auf die Styles verteilt werden
-// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() );
+// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() );
for( USHORT i=0; i<aSelectors.Count(); i++ )
{
StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo );
@@ -884,7 +884,7 @@ BOOL SvxCSS1Parser::ParseStyleOption( const String& rIn,
BOOL bSuccess = CSS1Parser::ParseStyleOption( rIn );
rItemSet.ClearItem( aItemIds.nDirection );
-// pPropInfo->CreateBoxItem( *pItemSet, GetDfltBorderDist() );
+// pPropInfo->CreateBoxItem( *pItemSet, GetDfltBorderDist() );
pItemSet = 0;
pPropInfo = 0;
@@ -949,7 +949,7 @@ void SvxCSS1Parser::SetBorderWidth( SvxBorderLine& aBorderLine, USHORT nWidth,
USHORT i = (nSize / sizeof(USHORT)) - 4;
while( i>0 &&
- nWidth <= ((aWidths[i] + aWidths[i-4]) / 2) )
+ nWidth <= ((aWidths[i] + aWidths[i-4]) / 2) )
{
DBG_ASSERT( aWidths[i] > aWidths[i-4],
"Linienbreiten sind nicht sortiert!" );
@@ -967,14 +967,14 @@ sal_uInt32 SvxCSS1Parser::GetFontHeight( USHORT nSize ) const
switch( nSize )
{
- case 0: nHeight = 8*20; break;
- case 1: nHeight = 10*20; break;
- case 2: nHeight = 11*20; break;
- case 3: nHeight = 12*20; break;
- case 4: nHeight = 17*20; break;
- case 5: nHeight = 20*20; break;
+ case 0: nHeight = 8*20; break;
+ case 1: nHeight = 10*20; break;
+ case 2: nHeight = 11*20; break;
+ case 3: nHeight = 12*20; break;
+ case 4: nHeight = 17*20; break;
+ case 5: nHeight = 20*20; break;
case 6:
- default: nHeight = 32*20; break;
+ default: nHeight = 32*20; break;
}
return nHeight;
@@ -1242,7 +1242,7 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr,
switch( pExpr->GetType() )
{
case CSS1_IDENT:
- case CSS1_STRING: // MS-IE, was sonst
+ case CSS1_STRING: // MS-IE, was sonst
{
USHORT nWeight;
if( SvxCSS1Parser::GetEnum( aFontWeightTable, pExpr->GetString(),
@@ -1402,7 +1402,7 @@ static void ParseCSS1_color( const CSS1Expression *pExpr,
case CSS1_IDENT:
case CSS1_RGB:
case CSS1_HEXCOLOR:
- case CSS1_STRING: // Wegen MS-IE
+ case CSS1_STRING: // Wegen MS-IE
{
Color aColor;
if( pExpr->GetColor( aColor ) )
@@ -1573,7 +1573,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
case CSS1_IDENT:
case CSS1_HEXCOLOR:
- case CSS1_STRING: // Wegen MS-IE
+ case CSS1_STRING: // Wegen MS-IE
{
USHORT nEnum;
const String &rValue = pExpr->GetString();
@@ -1659,7 +1659,7 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr,
break;
case CSS1_IDENT:
case CSS1_HEXCOLOR:
- case CSS1_STRING: // Wegen MS-IE
+ case CSS1_STRING: // Wegen MS-IE
if( pExpr->GetString().EqualsIgnoreCaseAscii( sCSS1_PV_transparent ) )
{
bTransparent = TRUE;
@@ -1730,7 +1730,7 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr,
if( nHeight )
{
- if( nHeight < rParser.GetMinFixLineSpace() )
+ if( nHeight < rParser.GetMinFixLineSpace() )
nHeight = rParser.GetMinFixLineSpace();
SvxLineSpacingItem aLSItem( nHeight, aItemIds.nLineSpacing );
aLSItem.SetLineHeight( nHeight );
@@ -2382,15 +2382,15 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
bSetMargins[2] = bSetMargins[3] = TRUE;
break;
case 1:
- nMargins[1] = nMargins[3] = nMargin; // right + left
+ nMargins[1] = nMargins[3] = nMargin; // right + left
bSetMargins[1] = bSetMargins[3] = TRUE;
break;
case 2:
- nMargins[2] = nMargin; // bottom
+ nMargins[2] = nMargin; // bottom
bSetMargins[2] = TRUE;
break;
case 3:
- nMargins[3] = nMargin; // left
+ nMargins[3] = nMargin; // left
bSetMargins[3] = TRUE;
break;
}
@@ -2520,10 +2520,10 @@ static BOOL ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
{
switch( nWhichLine )
{
- case BOX_LINE_TOP: rPropInfo.nTopBorderDistance = nDist; break;
- case BOX_LINE_BOTTOM: rPropInfo.nBottomBorderDistance = nDist;break;
- case BOX_LINE_LEFT: rPropInfo.nLeftBorderDistance = nDist; break;
- case BOX_LINE_RIGHT: rPropInfo.nRightBorderDistance = nDist; break;
+ case BOX_LINE_TOP: rPropInfo.nTopBorderDistance = nDist; break;
+ case BOX_LINE_BOTTOM: rPropInfo.nBottomBorderDistance = nDist;break;
+ case BOX_LINE_LEFT: rPropInfo.nLeftBorderDistance = nDist; break;
+ case BOX_LINE_RIGHT: rPropInfo.nRightBorderDistance = nDist; break;
}
}
@@ -2602,8 +2602,8 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
{
DBG_ASSERT( pExpr, "kein Ausdruck" );
- USHORT nWidth = USHRT_MAX; // die Linien-Dicke
- USHORT nNWidth = 1; // benannte Linien-Dicke (und default)
+ USHORT nWidth = USHRT_MAX; // die Linien-Dicke
+ USHORT nNWidth = 1; // benannte Linien-Dicke (und default)
CSS1BorderStyle eStyle = CSS1_BS_NONE; // Linien-Style
Color aColor;
BOOL bColor = FALSE;
@@ -2697,8 +2697,8 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr,
{
DBG_ASSERT( pExpr, "kein Ausdruck" );
- USHORT nWidth = USHRT_MAX; // die Linien-Dicke
- USHORT nNWidth = 1; // benannte Linien-Dicke (und default)
+ USHORT nWidth = USHRT_MAX; // die Linien-Dicke
+ USHORT nNWidth = 1; // benannte Linien-Dicke (und default)
switch( pExpr->GetType() )
{
@@ -2938,7 +2938,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr,
break;
case CSS1_PIXLENGTH:
- case CSS1_NUMBER: // wegen Netscape und IE
+ case CSS1_NUMBER: // wegen Netscape und IE
{
long nWidthL = (long)pExpr->GetNumber();
long nPWidth = bHori ? 0 : nWidthL;
@@ -3146,7 +3146,7 @@ static void ParseCSS1_so_language( const CSS1Expression *pExpr,
const SvxCSS1Parser& rParser )
{
if( CSS1_IDENT == pExpr->GetType() ||
- CSS1_STRING == pExpr->GetType() )
+ CSS1_STRING == pExpr->GetType() )
{
LanguageType eLang = MsLangId::convertIsoStringToLanguage( pExpr->GetString() );
if( LANGUAGE_DONTKNOW != eLang )
@@ -3175,14 +3175,14 @@ struct CSS1PropEntry
{
union
{
- const sal_Char *sName;
- String *pName;
+ const sal_Char *sName;
+ String *pName;
};
FnParseCSS1Prop pFunc;
};
#define CSS1_PROP_ENTRY(p) \
- { { sCSS1_P_##p }, ParseCSS1_##p }
+ { { sCSS1_P_##p }, ParseCSS1_##p }
// die Tabelle mit den Zuordnungen
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 9ab53c43ed3c..d2ebe3eafd00 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -2,7 +2,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
@@ -47,58 +47,58 @@ class FontList;
enum SvxCSS1Position
{
- SVX_CSS1_POS_NONE, // nichts angegeben
- SVX_CSS1_POS_STATIC, // normal
- SVX_CSS1_POS_ABSOLUTE, // absolut
- SVX_CSS1_POS_RELATIVE, // relativ
+ SVX_CSS1_POS_NONE, // nichts angegeben
+ SVX_CSS1_POS_STATIC, // normal
+ SVX_CSS1_POS_ABSOLUTE, // absolut
+ SVX_CSS1_POS_RELATIVE, // relativ
SVX_CSS1_POS_END
};
enum SvxCSS1LengthType
{
- SVX_CSS1_LTYPE_NONE, // nichts angegeben
- SVX_CSS1_LTYPE_AUTO, // automatisch
- SVX_CSS1_LTYPE_TWIP, // twip
- SVX_CSS1_LTYPE_PERCENTAGE, // %-Angabe
+ SVX_CSS1_LTYPE_NONE, // nichts angegeben
+ SVX_CSS1_LTYPE_AUTO, // automatisch
+ SVX_CSS1_LTYPE_TWIP, // twip
+ SVX_CSS1_LTYPE_PERCENTAGE, // %-Angabe
SVX_CSS1_LTYPE_END
};
// Feature: PrintExt
enum SvxCSS1SizeType
{
- SVX_CSS1_STYPE_NONE, // nichts angegeben
- SVX_CSS1_STYPE_AUTO, // automatisch
- SVX_CSS1_STYPE_TWIP, // twip
- SVX_CSS1_STYPE_LANDSCAPE, // Landscape
- SVX_CSS1_STYPE_PORTRAIT, // Landscape
+ SVX_CSS1_STYPE_NONE, // nichts angegeben
+ SVX_CSS1_STYPE_AUTO, // automatisch
+ SVX_CSS1_STYPE_TWIP, // twip
+ SVX_CSS1_STYPE_LANDSCAPE, // Landscape
+ SVX_CSS1_STYPE_PORTRAIT, // Landscape
SVX_CSS1_STYPE_END
};
enum SvxCSS1PageBreak
{
- SVX_CSS1_PBREAK_NONE, // nichts angegeben
- SVX_CSS1_PBREAK_AUTO, // automatisch
- SVX_CSS1_PBREAK_ALWAYS, // immer
- SVX_CSS1_PBREAK_AVOID, // nie
- SVX_CSS1_PBREAK_LEFT, // naechste Seite ist eine linke
- SVX_CSS1_PBREAK_RIGHT, // naechste Seite ist eine rechte
+ SVX_CSS1_PBREAK_NONE, // nichts angegeben
+ SVX_CSS1_PBREAK_AUTO, // automatisch
+ SVX_CSS1_PBREAK_ALWAYS, // immer
+ SVX_CSS1_PBREAK_AVOID, // nie
+ SVX_CSS1_PBREAK_LEFT, // naechste Seite ist eine linke
+ SVX_CSS1_PBREAK_RIGHT, // naechste Seite ist eine rechte
SVX_CSS1_PBREAK_END
};
// /Feature: PrintExt
#define CSS1_SCRIPT_WESTERN 0x01
-#define CSS1_SCRIPT_CJK 0x02
-#define CSS1_SCRIPT_CTL 0x04
-#define CSS1_SCRIPT_ALL 0x07
+#define CSS1_SCRIPT_CJK 0x02
+#define CSS1_SCRIPT_CTL 0x04
+#define CSS1_SCRIPT_ALL 0x07
/* */
struct CSS1PropertyEnum
{
- const sal_Char *pName; // Wert einer Property
- sal_uInt16 nEnum; // und der dazugehoerige Wert eines Enums
+ const sal_Char *pName; // Wert einer Property
+ sal_uInt16 nEnum; // und der dazugehoerige Wert eines Enums
};
@@ -121,7 +121,7 @@ class SvxCSS1PropertyInfo
public:
- String aId; // ID fuer Bookmarks, Rahmen etc.
+ String aId; // ID fuer Bookmarks, Rahmen etc.
sal_Bool bTopMargin : 1;
sal_Bool bBottomMargin : 1;
@@ -212,7 +212,7 @@ inline sal_Bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& r
return rE1.aKey==rE2.aKey;
}
-inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
+inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
{
return rE1.aKey<rE2.aKey;
}
@@ -227,7 +227,7 @@ inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& r
class SvxCSS1Parser : public CSS1Parser
{
- CSS1Selectors aSelectors; // Liste der "offenen" Selectoren
+ CSS1Selectors aSelectors; // Liste der "offenen" Selectoren
SvxCSS1Map aIds;
SvxCSS1Map aClasses;
@@ -236,24 +236,24 @@ class SvxCSS1Parser : public CSS1Parser
String sBaseURL;
- SfxItemSet *pSheetItemSet; // der Item-Set fuer Style-Sheets
- SfxItemSet *pItemSet; // der aktuelle Item-Set
+ SfxItemSet *pSheetItemSet; // der Item-Set fuer Style-Sheets
+ SfxItemSet *pItemSet; // der aktuelle Item-Set
SvxCSS1MapEntry *pSearchEntry;
SvxCSS1PropertyInfo *pSheetPropInfo;
SvxCSS1PropertyInfo *pPropInfo;
- sal_uInt16 nMinFixLineSpace; // Mindest-Abstand fuer festen Zeilenabstand
+ sal_uInt16 nMinFixLineSpace; // Mindest-Abstand fuer festen Zeilenabstand
- rtl_TextEncoding eDfltEnc;
- sal_uInt16 nScriptFlags;
+ rtl_TextEncoding eDfltEnc;
+ sal_uInt16 nScriptFlags;
sal_Bool bIgnoreFontFamily;
void ParseProperty( const String& rProperty,
const CSS1Expression *pExpr );
- SvUShorts aWhichMap; // Which-Map des Parser
+ SvUShorts aWhichMap; // Which-Map des Parser
using CSS1Parser::ParseStyleOption;
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 3551d8357cd8..e12c0ecb1fa9 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -2,7 +2,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
@@ -84,7 +84,7 @@ protected:
SvxCSS1PropertyInfo& rPropInfo );
using CSS1Parser::ParseStyleSheet;
-
+
public:
SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const String& rBaseURL, BOOL bNewDoc );
virtual ~SwCSS1Parser();
@@ -104,7 +104,7 @@ public:
// eine TextFmtColl zu einer Pool-Id ermitteln
SwTxtFmtColl *GetTxtFmtColl( USHORT nTxtColl, const String& rClass );
- // This methods do the same as the one of SwDoc, but change the
+ // This methods do the same as the one of SwDoc, but change the
// encoding if required.
SwTxtFmtColl *GetTxtCollFromPool( USHORT nPoolId ) const;
SwCharFmt *GetCharFmtFromPool( USHORT nPoolId ) const;
@@ -133,7 +133,7 @@ public:
const SvxCSS1PropertyInfo& rPropInfo );
// Fuellen eines DropCap-Attributs
- void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet,
+ void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet,
const String *pName=0 );
BOOL SetFmtBreak( SfxItemSet& rItemSet,
@@ -147,7 +147,7 @@ public:
static BOOL MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
BOOL bAutoWidth=FALSE );
- static sal_uInt16 GetScriptFromClass( String& rClass,
+ static sal_uInt16 GetScriptFromClass( String& rClass,
sal_Bool bSubClassOnly = sal_True );
BOOL IsBodyBGColorSet() const { return bBodyBGColorSet; }
@@ -171,14 +171,14 @@ public:
inline void SetTDTagStyles();
inline void SetATagStyles();
inline void SetDelayedStyles();
-
+
virtual void SetDfltEncoding( rtl_TextEncoding eEnc );
};
inline void SwCSS1Parser::AddFirstLetterExt( String& rFmtName )
{
- rFmtName.AppendAscii( ".FL", 3 ); // first letter
+ rFmtName.AppendAscii( ".FL", 3 ); // first letter
}
inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( BOOL bCreate )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c5c116812a6e..0fd023a202a2 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2,7 +2,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
@@ -94,9 +94,9 @@
#include <expfld.hxx>
#include <poolfmt.hxx>
#include <pagedesc.hxx>
-#include <IMark.hxx> // fuer SwBookmark ...
+#include <IMark.hxx> // fuer SwBookmark ...
#include <docsh.hxx>
-#include <editsh.hxx> // fuer Start/EndAction
+#include <editsh.hxx> // fuer Start/EndAction
#include <docufld.hxx>
#include <swcss1.hxx>
#include <htmlvsh.hxx>
@@ -113,9 +113,9 @@
#include <statstr.hrc> // ResId fuer Statusleiste
#include <swerror.h>
-#define FONTSIZE_MASK 7
-#define FONTCOLOR_MASK (1<<15)
-#define FONT_MASK (1<<14)
+#define FONTSIZE_MASK 7
+#define FONTCOLOR_MASK (1<<15)
+#define FONT_MASK (1<<14)
#define HTML_ESC_PROP 80
#define HTML_ESC_SUPER DFLT_ESC_SUPER
@@ -135,22 +135,22 @@ using namespace ::com::sun::star;
// <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw.
HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT },
- { OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER },
- { OOO_STRING_SVTOOLS_HTML_AL_middle, SVX_ADJUST_CENTER }, // Netscape
- { OOO_STRING_SVTOOLS_HTML_AL_right, SVX_ADJUST_RIGHT },
- { OOO_STRING_SVTOOLS_HTML_AL_justify, SVX_ADJUST_BLOCK },
- { OOO_STRING_SVTOOLS_HTML_AL_char, SVX_ADJUST_LEFT },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT },
+ { OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER },
+ { OOO_STRING_SVTOOLS_HTML_AL_middle, SVX_ADJUST_CENTER }, // Netscape
+ { OOO_STRING_SVTOOLS_HTML_AL_right, SVX_ADJUST_RIGHT },
+ { OOO_STRING_SVTOOLS_HTML_AL_justify, SVX_ADJUST_BLOCK },
+ { OOO_STRING_SVTOOLS_HTML_AL_char, SVX_ADJUST_LEFT },
+ { 0, 0 }
};
// <SPACER TYPE=...>
static HTMLOptionEnum __FAR_DATA aHTMLSpacerTypeTable[] =
{
- { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK },
- { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI },
- { OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical, HTML_SPTYPE_VERT },
- { 0, 0 }
+ { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK },
+ { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI },
+ { OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical, HTML_SPTYPE_VERT },
+ { 0, 0 }
};
SV_IMPL_PTRARR( _HTMLAttrs, _HTMLAttrPtr )
@@ -387,7 +387,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
SwDocShell* pDocSh = pDoc->GetDocShell();
if( pDocSh )
{
- bViewCreated = TRUE; // nicht, synchron laden
+ bViewCreated = TRUE; // nicht, synchron laden
// es ist ein Sprungziel vorgegeben.
@@ -416,7 +416,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
else if( sCmp.EqualsAscii( pMarkToOutline ) ||
sCmp.EqualsAscii( pMarkToText ) ||
sCmp.EqualsAscii( pMarkToFrame ) )
- eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges!
+ eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges!
else
// ansonsten ist das ein normaler (Book)Mark
nPos = STRING_LEN;
@@ -529,7 +529,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser()
{
// einen temporaeren Index anlegen, auf Pos 0 so wird er nicht bewegt!
pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() );
- if( !IsNewDoc() ) // in ein Dokument einfuegen ?
+ if( !IsNewDoc() ) // in ein Dokument einfuegen ?
{
const SwPosition* pPos = pPam->GetPoint();
@@ -823,8 +823,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
// nun noch das SplitNode vom Anfang aufheben
else if( !IsNewDoc() )
{
- if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>,
- pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node
+ if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>,
+ pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node
SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
SwNodeIndex aPrvIdx( pPos->nNode );
if( pTxtNode && pTxtNode->CanJoinPrev( &aPrvIdx ) &&
@@ -933,7 +933,7 @@ void SwHTMLParser::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
{
// dann uns selbst beenden
pRegisteredIn->Remove( this );
- ReleaseRef(); // ansonsten sind wir fertig!
+ ReleaseRef(); // ansonsten sind wir fertig!
}
break;
}
@@ -1262,7 +1262,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
case HTML_BODY_ON:
- case HTML_IMAGE: // Warum auch immer Netscape das tut.
+ case HTML_IMAGE: // Warum auch immer Netscape das tut.
aUnknownToken.Erase();
break;
case HTML_TEXTTOKEN:
@@ -1707,7 +1707,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
!pPam->GetNode()->FindFootnoteStartNode() ) )
{
if ( nParaCnt < 5 )
- Show(); // bis hierhin schon mal anzeigen
+ Show(); // bis hierhin schon mal anzeigen
SvxAdjust eAdjust = aAttrTab.pAdjust
? ((const SvxAdjustItem&)aAttrTab.pAdjust->GetItem()).
@@ -1918,7 +1918,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
case HTML_HTML_OFF:
case HTML_HEAD_ON:
case HTML_TITLE_OFF:
- break; // nicht weiter auswerten, oder???
+ break; // nicht weiter auswerten, oder???
case HTML_HTML_ON:
{
const HTMLOptions *pHTMLOptions = GetOptions();
@@ -2327,11 +2327,11 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
}
else switch( nWhich )
{
- case RES_CHRATR_FONT: nIdx = 0; break;
- case RES_CHRATR_FONTSIZE: nIdx = 1; break;
- case RES_CHRATR_LANGUAGE: nIdx = 2; break;
- case RES_CHRATR_POSTURE: nIdx = 3; break;
- case RES_CHRATR_WEIGHT: nIdx = 4; break;
+ case RES_CHRATR_FONT: nIdx = 0; break;
+ case RES_CHRATR_FONTSIZE: nIdx = 1; break;
+ case RES_CHRATR_LANGUAGE: nIdx = 2; break;
+ case RES_CHRATR_POSTURE: nIdx = 3; break;
+ case RES_CHRATR_WEIGHT: nIdx = 4; break;
}
if( nIdx != -1 )
{
@@ -2821,7 +2821,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
pCNd->SetAttr( *pAttr->pItem );
break;
}
- OSL_ENSURE( !this,
+ OSL_ENSURE( !this,
"LRSpace ueber mehrere Absaetze gesetzt!" );
// kein break (hier sollen wir trotzdem nie hinkommen;
default:
@@ -3221,7 +3221,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
{
ULONG nOldEnd = nEndIdx.GetIndex();
ULONG nTmpIdx;
- if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd ||
+ if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd ||
( nTmpIdx = pDoc->GetNodes().GetEndOfAutotext().GetIndex()) >= nOldEnd )
{
nTmpIdx = pDoc->GetNodes().GetEndOfInserts().GetIndex();
@@ -3599,8 +3599,8 @@ void SwHTMLParser::NewFontAttr( int nToken )
String aFace, aId, aStyle, aClass, aLang, aDir;
Color aColor;
- ULONG nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe
- USHORT nSize = 0; // Fontgroesse in Netscape-Notation (1-7)
+ ULONG nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe
+ USHORT nSize = 0; // Fontgroesse in Netscape-Notation (1-7)
BOOL bColor = FALSE;
const HTMLOptions *pHTMLOptions = GetOptions();
@@ -3693,8 +3693,8 @@ void SwHTMLParser::NewFontAttr( int nToken )
OSL_ENSURE( !nSize == !nFontHeight, "HTML-Font-Size != Font-Height" );
String aFontName, aStyleName;
- FontFamily eFamily = FAMILY_DONTKNOW; // Family und Pitch,
- FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden
+ FontFamily eFamily = FAMILY_DONTKNOW; // Family und Pitch,
+ FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden
rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
if( aFace.Len() && !pCSS1Parser->IsIgnoreFontFamily() )
@@ -3928,7 +3928,7 @@ void SwHTMLParser::EndPara( BOOL bReal )
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -3983,13 +3983,13 @@ void SwHTMLParser::NewHeading( int nToken )
USHORT nTxtColl;
switch( nToken )
{
- case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break;
- case HTML_HEAD2_ON: nTxtColl = RES_POOLCOLL_HEADLINE2; break;
- case HTML_HEAD3_ON: nTxtColl = RES_POOLCOLL_HEADLINE3; break;
- case HTML_HEAD4_ON: nTxtColl = RES_POOLCOLL_HEADLINE4; break;
- case HTML_HEAD5_ON: nTxtColl = RES_POOLCOLL_HEADLINE5; break;
- case HTML_HEAD6_ON: nTxtColl = RES_POOLCOLL_HEADLINE6; break;
- default: nTxtColl = RES_POOLCOLL_STANDARD; break;
+ case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break;
+ case HTML_HEAD2_ON: nTxtColl = RES_POOLCOLL_HEADLINE2; break;
+ case HTML_HEAD3_ON: nTxtColl = RES_POOLCOLL_HEADLINE3; break;
+ case HTML_HEAD4_ON: nTxtColl = RES_POOLCOLL_HEADLINE4; break;
+ case HTML_HEAD5_ON: nTxtColl = RES_POOLCOLL_HEADLINE5; break;
+ case HTML_HEAD6_ON: nTxtColl = RES_POOLCOLL_HEADLINE6; break;
+ default: nTxtColl = RES_POOLCOLL_STANDARD; break;
}
// den Kontext anlegen
@@ -4056,7 +4056,7 @@ void SwHTMLParser::EndHeading()
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -4112,7 +4112,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, USHORT nColl )
eMode = AM_SPACE;
break;
case HTML_ADDRESS_ON:
- eMode = AM_NOSPACE; // ADDRESS kann auf einen <P> ohne </P> folgen
+ eMode = AM_NOSPACE; // ADDRESS kann auf einen <P> ohne </P> folgen
break;
case HTML_DT_ON:
case HTML_DD_ON:
@@ -4187,7 +4187,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -4320,7 +4320,7 @@ void SwHTMLParser::EndDefList()
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -4403,7 +4403,7 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl,
if( pCntxt )
{
EndContext( pCntxt );
- SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
+ SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen
delete pCntxt;
}
@@ -4417,11 +4417,11 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl,
BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly,
BOOL bSurroundOnly ) const
{
- // bNoSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen
- // ohne Umlauf
- // bSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen
- // mit Umlauf aber keinen ohne Umlauf
- // sonst: Der Absatz enthaelt irgendeinen Rahmen
+ // bNoSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen
+ // ohne Umlauf
+ // bSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen
+ // mit Umlauf aber keinen ohne Umlauf
+ // sonst: Der Absatz enthaelt irgendeinen Rahmen
SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode;
const SwSpzFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
@@ -4497,16 +4497,16 @@ const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const
void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
{
- SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage
- SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs
+ SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage
+ SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs
USHORT nTopColl = pContext ? pContext->GetTxtFmtColl() : 0;
const String& rTopClass = pContext ? pContext->GetClass() : (const String&) aEmptyStr;
USHORT nDfltColl = RES_POOLCOLL_TEXT;
- BOOL bInPRE=FALSE; // etwas Kontext Info
+ BOOL bInPRE=FALSE; // etwas Kontext Info
- USHORT nLeftMargin = 0, nRightMargin = 0; // die Einzuege und
- short nFirstLineIndent = 0; // Abstaende
+ USHORT nLeftMargin = 0, nRightMargin = 0; // die Einzuege und
+ short nFirstLineIndent = 0; // Abstaende
USHORT i;
for( i = nContextStAttrMin; i < aContexts.Count(); i++ )
@@ -4890,7 +4890,7 @@ void SwHTMLParser::InsertSpacer()
// den unteren Absatz-Abstand des vorherigen Nodes aendern,
// wenn moeglich
- SetAttr(); // noch offene Absatz-Attribute setzen
+ SetAttr(); // noch offene Absatz-Attribute setzen
pTxtNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1]
->GetTxtNode();
@@ -4914,7 +4914,7 @@ void SwHTMLParser::InsertSpacer()
NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (USHORT)nSize, RES_UL_SPACE ) );
EndAttr( aAttrTab.pULSpace, 0, FALSE );
- AppendTxtNode(); // nicht am Abstand drehen!
+ AppendTxtNode(); // nicht am Abstand drehen!
}
}
break;
@@ -5038,9 +5038,9 @@ void SwHTMLParser::InsertLineBreak()
// 6.) Wenn von keinem Rahmen der Umlauf geaendert wird, wird ein
// harter Zeilenumbruch eingefuegt
- String aId, aStyle, aClass; // die ID der Bookmark
+ String aId, aStyle, aClass; // die ID der Bookmark
BOOL bClearLeft = FALSE, bClearRight = FALSE;
- BOOL bCleared = FALSE; // wurde ein CLEAR ausgefuehrt?
+ BOOL bCleared = FALSE; // wurde ein CLEAR ausgefuehrt?
// dann holen wir mal die Optionen
const HTMLOptions *pHTMLOptions = GetOptions();
@@ -5156,7 +5156,7 @@ void SwHTMLParser::InsertLineBreak()
{
// wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird
// ein Zeilenumbruch eingef?gt
- String sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
+ String sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
pDoc->InsertString( *pPam, sTmp );
}
else if( pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index f6f7eac37b64..24595edd27d9 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -2,7 +2,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
@@ -100,13 +100,13 @@ class _HTMLAttr
xub_StrLen nSttCntnt, nEndCntnt;
sal_Bool bInsAtStart : 1;
sal_Bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
- sal_Bool bValid : 1; // ist das Attribut gueltig?
+ sal_Bool bValid : 1; // ist das Attribut gueltig?
SfxPoolItem* pItem;
- sal_uInt16 nCount; // Anzahl noch zu schliessender Attrs mit einem Wert
- _HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten
- _HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs
- _HTMLAttr **ppHead; // der Listenkopf
+ sal_uInt16 nCount; // Anzahl noch zu schliessender Attrs mit einem Wert
+ _HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten
+ _HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs
+ _HTMLAttr **ppHead; // der Listenkopf
_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
_HTMLAttr **pHd=0 );
@@ -135,8 +135,8 @@ public:
sal_Bool IsLikePara() const { return bLikePara; }
void SetLikePara( sal_Bool bPara=sal_True ) { bLikePara = bPara; }
- SfxPoolItem& GetItem() { return *pItem; }
- const SfxPoolItem& GetItem() const { return *pItem; }
+ SfxPoolItem& GetItem() { return *pItem; }
+ const SfxPoolItem& GetItem() const { return *pItem; }
_HTMLAttr *GetNext() const { return pNext; }
void InsertNext( _HTMLAttr *pNxt ) { pNext = pNxt; }
@@ -161,13 +161,13 @@ public:
struct _HTMLAttrTable
{
_HTMLAttr
- *pKeep, // ::com::sun::star::frame::Frame-Attribure
+ *pKeep, // ::com::sun::star::frame::Frame-Attribure
*pBox,
*pBrush,
*pBreak,
*pPageDesc,
- *pLRSpace, // Absatz-Attribute
+ *pLRSpace, // Absatz-Attribute
*pULSpace,
*pLineSpacing,
*pAdjust,
@@ -177,10 +177,10 @@ struct _HTMLAttrTable
*pOrphans,
*pDirection,
- *pCharFmts, // Text-Attribute
+ *pCharFmts, // Text-Attribute
*pINetFmt,
- *pBold, // Zeichen-Attribute
+ *pBold, // Zeichen-Attribute
*pBoldCJK,
*pBoldCTL,
*pItalic,
@@ -198,8 +198,8 @@ struct _HTMLAttrTable
*pFontColor,
*pEscapement,
*pCaseMap,
- *pKerning, // (nur fuer SPACER)
- *pCharBrush, // Zeichen-Hintergrund
+ *pKerning, // (nur fuer SPACER)
+ *pCharBrush, // Zeichen-Hintergrund
*pLanguage,
*pLanguageCJK,
*pLanguageCTL
@@ -209,44 +209,44 @@ struct _HTMLAttrTable
class _HTMLAttrContext_SaveDoc;
enum SwHTMLAppendMode {
- AM_NORMAL, // keine Absatz-Abstand-Behandlung
- AM_NOSPACE, // Abstand hart auf 0cm setzen
- AM_SPACE, // Abstand hart auf 0.5cm setzen
- AM_SOFTNOSPACE, // Abstand nicht setzen aber 0cm merken
- AM_NONE // gar kein Append
+ AM_NORMAL, // keine Absatz-Abstand-Behandlung
+ AM_NOSPACE, // Abstand hart auf 0cm setzen
+ AM_SPACE, // Abstand hart auf 0.5cm setzen
+ AM_SOFTNOSPACE, // Abstand nicht setzen aber 0cm merken
+ AM_NONE // gar kein Append
};
class _HTMLAttrContext
{
- _HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute
+ _HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute
- String aClass; // die Klasse des Kontexts
+ String aClass; // die Klasse des Kontexts
_HTMLAttrContext_SaveDoc *pSaveDocContext;
SfxItemSet *pFrmItemSet;
- sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt
+ sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt
- sal_uInt16 nTxtFmtColl; // eine in dem Kontext begonnene Vorlage oder 0
+ sal_uInt16 nTxtFmtColl; // eine in dem Kontext begonnene Vorlage oder 0
- sal_uInt16 nLeftMargin; // ein veraenderter linker Rand
- sal_uInt16 nRightMargin; // ein veraenderter rechter Rand
- sal_uInt16 nFirstLineIndent; // ein veraenderter Erstzeilen-Einzug
+ sal_uInt16 nLeftMargin; // ein veraenderter linker Rand
+ sal_uInt16 nRightMargin; // ein veraenderter rechter Rand
+ sal_uInt16 nFirstLineIndent; // ein veraenderter Erstzeilen-Einzug
- sal_uInt16 nUpperSpace;
- sal_uInt16 nLowerSpace;
+ sal_uInt16 nUpperSpace;
+ sal_uInt16 nLowerSpace;
SwHTMLAppendMode eAppend;
- sal_Bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
- sal_Bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
- sal_Bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
- sal_Bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf
- sal_Bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf.
- sal_Bool bFinishPREListingXMP : 1;
- sal_Bool bRestartPRE : 1;
- sal_Bool bRestartXMP : 1;
- sal_Bool bRestartListing : 1;
+ sal_Bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
+ sal_Bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
+ sal_Bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
+ sal_Bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf
+ sal_Bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf.
+ sal_Bool bFinishPREListingXMP : 1;
+ sal_Bool bRestartPRE : 1;
+ sal_Bool bRestartXMP : 1;
+ sal_Bool bRestartListing : 1;
public:
void ClearSaveDocContext();
@@ -360,21 +360,21 @@ SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1, 1 )
typedef SwFrmFmt *SwFrmFmtPtr;
SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2, 2 )
-#define HTML_CNTXT_PROTECT_STACK 0x0001
-#define HTML_CNTXT_STRIP_PARA 0x0002
-#define HTML_CNTXT_KEEP_NUMRULE 0x0004
-#define HTML_CNTXT_HEADER_DIST 0x0008
-#define HTML_CNTXT_FOOTER_DIST 0x0010
-#define HTML_CNTXT_KEEP_ATTRS 0x0020
+#define HTML_CNTXT_PROTECT_STACK 0x0001
+#define HTML_CNTXT_STRIP_PARA 0x0002
+#define HTML_CNTXT_KEEP_NUMRULE 0x0004
+#define HTML_CNTXT_HEADER_DIST 0x0008
+#define HTML_CNTXT_FOOTER_DIST 0x0010
+#define HTML_CNTXT_KEEP_ATTRS 0x0020
-#define CONTEXT_FLAGS_ABSPOS \
+#define CONTEXT_FLAGS_ABSPOS \
(HTML_CNTXT_PROTECT_STACK | \
HTML_CNTXT_STRIP_PARA)
-#define HTML_FF_BOX 0x0001
-#define HTML_FF_BACKGROUND 0x0002
-#define HTML_FF_PADDING 0x0004
-#define HTML_FF_DIRECTION 0x0008
+#define HTML_FF_BOX 0x0001
+#define HTML_FF_BACKGROUND 0x0002
+#define HTML_FF_PADDING 0x0004
+#define HTML_FF_DIRECTION 0x0008
class SwHTMLParser : public SfxHTMLParser, public SwClient
{
@@ -382,115 +382,115 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
friend class _CellSaveStruct;
friend class _CaptionSaveStruct;
- String aPathToFile;
- String sBaseURL;
- String sSaveBaseURL;
- String aBasicLib;
- String aBasicModule;
- String aScriptSource; // Inhalt des aktuellen Script-Blocks
- String aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA)
- String aScriptURL; // URL eines Scripts
- String aStyleSource; // Inhalt des aktuellen Style-Sheets
- String aContents; // Text des akteullen Marquee, Feldes etc.
- String sTitle;
- String aUnknownToken; // ein gestartetes unbekanntes Token
- String aBulletGrfs[MAXLEVEL];
- String sJmpMark;
-
- SvUShorts aBaseFontStack; // Stack fuer <BASEFONT>
+ String aPathToFile;
+ String sBaseURL;
+ String sSaveBaseURL;
+ String aBasicLib;
+ String aBasicModule;
+ String aScriptSource; // Inhalt des aktuellen Script-Blocks
+ String aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA)
+ String aScriptURL; // URL eines Scripts
+ String aStyleSource; // Inhalt des aktuellen Style-Sheets
+ String aContents; // Text des akteullen Marquee, Feldes etc.
+ String sTitle;
+ String aUnknownToken; // ein gestartetes unbekanntes Token
+ String aBulletGrfs[MAXLEVEL];
+ String sJmpMark;
+
+ SvUShorts aBaseFontStack; // Stack fuer <BASEFONT>
// Bit 0-2: Fontgroesse (1-7)
- SvUShorts aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL>
+ SvUShorts aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL>
// Bit 0-2: Fontgroesse (1-7)
// Bit 15: Fontfarbe wurde gesetzt
- _HTMLAttrs aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr.
- _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute
- _HTMLAttrTable aAttrTab; // "offene" Attribute
+ _HTMLAttrs aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr.
+ _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute
+ _HTMLAttrTable aAttrTab; // "offene" Attribute
_HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext
- SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, deren Anker verschoben wird
- SvXub_StrLens aMoveFlyCnts;// und deren Content-Positionen
+ SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, deren Anker verschoben wird
+ SvXub_StrLens aMoveFlyCnts;// und deren Content-Positionen
- SwApplet_Impl *pAppletImpl; // das aktuelle Applet
+ SwApplet_Impl *pAppletImpl; // das aktuelle Applet
- SwCSS1Parser *pCSS1Parser; // der Style-Sheet-Parser
+ SwCSS1Parser *pCSS1Parser; // der Style-Sheet-Parser
SwHTMLNumRuleInfo *pNumRuleInfo;
- SwPendingStack *pPendStack;
+ SwPendingStack *pPendStack;
- SwDoc *pDoc;
- SwPaM *pPam; // SwPosition duerfte doch reichen, oder ??
- ViewShell *pActionViewShell; // ViewShell, an der das StartAction
+ SwDoc *pDoc;
+ SwPaM *pPam; // SwPosition duerfte doch reichen, oder ??
+ ViewShell *pActionViewShell; // ViewShell, an der das StartAction
// gerufen wurde.
- SwNodeIndex *pSttNdIdx;
+ SwNodeIndex *pSttNdIdx;
- HTMLTable *pTable; // die aktuelle "auesserste" Tabelle
+ HTMLTable *pTable; // die aktuelle "auesserste" Tabelle
SwHTMLForm_Impl *pFormImpl;// die aktuelle Form
- SdrObject *pMarquee; // aktuelles Marquee
- SwField *pField; // aktuelles Feld
- ImageMap *pImageMap; // aktuelle Image-Map
- ImageMaps *pImageMaps;// alle gelesenen Image-Maps
+ SdrObject *pMarquee; // aktuelles Marquee
+ SwField *pField; // aktuelles Feld
+ ImageMap *pImageMap; // aktuelle Image-Map
+ ImageMaps *pImageMaps;// alle gelesenen Image-Maps
SwHTMLFootEndNote_Impl *pFootEndNoteImpl;
- Size aHTMLPageSize; // die Seitengroesse der HTML-Vorlage
+ Size aHTMLPageSize; // die Seitengroesse der HTML-Vorlage
- sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
- sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks
- ULONG nEventId;
+ sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
+ sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks
+ ULONG nEventId;
- sal_uInt16 nBaseFontStMin; //
- sal_uInt16 nFontStMin; //
- sal_uInt16 nDefListDeep; //
- sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn>
- sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module
- sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch?
- sal_uInt16 nParaCnt;
- sal_uInt16 nContextStMin; // Untergrenze fuer PopContext
- sal_uInt16 nContextStAttrMin; // Untergrenze fuer Attributierung
- sal_uInt16 nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox
- sal_uInt16 nOpenParaToken; // ein geoeffnetes Absatz-Element
+ sal_uInt16 nBaseFontStMin; //
+ sal_uInt16 nFontStMin; //
+ sal_uInt16 nDefListDeep; //
+ sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn>
+ sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module
+ sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch?
+ sal_uInt16 nParaCnt;
+ sal_uInt16 nContextStMin; // Untergrenze fuer PopContext
+ sal_uInt16 nContextStAttrMin; // Untergrenze fuer Attributierung
+ sal_uInt16 nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox
+ sal_uInt16 nOpenParaToken; // ein geoeffnetes Absatz-Element
enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
#if OSL_DEBUG_LEVEL > 1
- sal_uInt16 nContinue; // Tiefe der Continue-Aufrufe
+ sal_uInt16 nContinue; // Tiefe der Continue-Aufrufe
#endif
- SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz
+ SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz
HTMLScriptLanguage eScriptLang; // die aktuelle Script-Language
- sal_Bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument?
+ sal_Bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument?
- sal_Bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert
+ sal_Bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert
// Flag um doppeltes init durch Rekursion
// zu verhindern.
- sal_Bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron)
- sal_Bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen
+ sal_Bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron)
+ sal_Bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen
sal_Bool bSetModEnabled : 1;
- sal_Bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame
+ sal_Bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame
sal_Bool bInField : 1;
- sal_Bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh.
+ sal_Bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh.
// 8
- sal_Bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen
- sal_Bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren.
- sal_Bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt.
- sal_Bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren?
- sal_Bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen?
+ sal_Bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen
+ sal_Bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren.
+ sal_Bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt.
+ sal_Bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren?
+ sal_Bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen?
sal_Bool bFixMarqueeHeight : 1;
- sal_Bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt
+ sal_Bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt
sal_Bool bNoParSpace : 1;
// 16
- sal_Bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul
- sal_Bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich
+ sal_Bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul
+ sal_Bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich
- sal_Bool bInTitle : 1; // Wir sind im Titel
+ sal_Bool bInTitle : 1; // Wir sind im Titel
- sal_Bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark
+ sal_Bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark
sal_Bool bUpdateDocStat : 1;
- sal_Bool bFixSelectWidth : 1; // Breite eines Selects neu setzen?
- sal_Bool bFixSelectHeight : 1; // Breite eines Selects neu setzen?
+ sal_Bool bFixSelectWidth : 1; // Breite eines Selects neu setzen?
+ sal_Bool bFixSelectHeight : 1; // Breite eines Selects neu setzen?
sal_Bool bTextArea : 1;
// 24
sal_Bool bSelect : 1;
@@ -561,7 +561,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem,
_HTMLAttrContext *pCntxt );
void SplitPREListingXMP( _HTMLAttrContext *pCntxt );
- void FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos );
+ void FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos );
void EndContext( _HTMLAttrContext *pContext );
void ClearContext( _HTMLAttrContext *pContext );
@@ -669,9 +669,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void EndTag( int nToken );
// Font-Attribute behandeln
- void NewBasefontAttr(); // fuer <BASEFONT>
+ void NewBasefontAttr(); // fuer <BASEFONT>
void EndBasefontAttr();
- void NewFontAttr( int nToken ); // fuer <FONT>, <BIG> und <SMALL>
+ void NewFontAttr( int nToken ); // fuer <FONT>, <BIG> und <SMALL>
void EndFontAttr( int nToken );
// Tags, die durch Zeichenvorlagen realisiert werden
@@ -734,18 +734,18 @@ private:
// die eigentlichen Einfuege-Methoden fuer <IMG>, <EMBED> und <APPLET>
// und <PARAM>
- void InsertImage(); // htmlgrin.cxx
- void InsertEmbed(); // htmlplug.cxx
+ void InsertImage(); // htmlgrin.cxx
+ void InsertEmbed(); // htmlplug.cxx
#ifdef SOLAR_JAVA
- void NewObject(); // htmlplug.cxx
+ void NewObject(); // htmlplug.cxx
#endif
- void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx)
+ void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx)
#ifdef SOLAR_JAVA
- void InsertApplet(); // htmlplug.cxx
+ void InsertApplet(); // htmlplug.cxx
#endif
- void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx)
- void InsertParam(); // htmlplug.cxx
+ void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx)
+ void InsertParam(); // htmlplug.cxx
void InsertFloatingFrame();
void EndFloatingFrame() { bInFloatingFrame = sal_False; }
@@ -851,7 +851,7 @@ private:
// Einfuegen von Tabellen (htmltab.cxx)
-public: // wird in Tabellen benoetigt
+public: // wird in Tabellen benoetigt
// einen Boxen-Inhalt hinter dem angegebenen Node einfuegen
const SwStartNode *InsertTableSection( const SwStartNode *pPrevStNd );
@@ -910,7 +910,7 @@ private:
sal_Bool HasCurrentParaFlys( sal_Bool bNoSurroundOnly = sal_False,
sal_Bool bSurroundOnly = sal_False ) const;
-public: // wird in Tabellen benoetigt
+public: // wird in Tabellen benoetigt
// generieren eines BrushItems (mit new) oder 0
SvxBrushItem* CreateBrushItem( const Color *pColor,
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 8efc9c191701..60e51075f9b7 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -2,7 +2,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
@@ -71,10 +71,10 @@
#include <pam.hxx>
#include <doc.hxx>
#include <ndtxt.hxx>
-#include <mdiexp.hxx> // ...Percent()
+#include <mdiexp.hxx> // ...Percent()
#include <fltini.hxx>
#include <viewopt.hxx>
-#include <IMark.hxx> // fuer SwBookmark ...
+#include <IMark.hxx> // fuer SwBookmark ...
#include <poolfmt.hxx>
#include <pagedesc.hxx>
#include <section.hxx>
@@ -87,7 +87,7 @@
#include <htmlfly.hxx>
#include <swmodule.hxx>
-#include <statstr.hrc> // ResId fuer Statusleiste
+#include <statstr.hrc> // ResId fuer Statusleiste
#include <swerror.h>
#define MAX_INDENT_LEVEL 20
@@ -157,7 +157,7 @@ ULONG SwHTMLWriter::WriteStream()
nHTMLMode |= HTMLMODE_ABS_POS_FLY|HTMLMODE_ABS_POS_DRAW;
if( HTML_CFG_WRITER==nExportMode )
-// nHTMLMode |= HTMLMODE_FLY_MARGINS | HTMLMODE_FRSTLINE_IN_NUMBUL;
+// nHTMLMode |= HTMLMODE_FLY_MARGINS | HTMLMODE_FRSTLINE_IN_NUMBUL;
nHTMLMode |= HTMLMODE_FLY_MARGINS;
if( HTML_CFG_NS40==nExportMode )
@@ -194,8 +194,8 @@ ULONG SwHTMLWriter::WriteStream()
eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
// fuer Netscape optimieren heisst Spacer- und Multicol ausgeben
-// bCfgMultiCol = pHtmlOptions->IsNetscape3();
-// bCfgSpacer = pHtmlOptions->IsNetscape3();
+// bCfgMultiCol = pHtmlOptions->IsNetscape3();
+// bCfgSpacer = pHtmlOptions->IsNetscape3();
// wenn Styles exportiert werden, wird ein Style einem HTML-Tag manchmal
// vorgezogen, wenn nicht fuer Netscape exportiert wird
@@ -318,7 +318,7 @@ ULONG SwHTMLWriter::WriteStream()
(((((((sOut += OOO_STRING_SVTOOLS_HTML_division)
+= ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"")
+= aName) += '\"')
- += '>') += aStartTags;
+ += '>') += aStartTags;
aStartTags = sOut;
}
@@ -736,7 +736,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
{
- sal_Bool bSaveWriteAll = bWriteAll; // sichern
+ sal_Bool bSaveWriteAll = bWriteAll; // sichern
// suche die naechste text::Bookmark-Position aus der text::Bookmark-Tabelle
nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
@@ -779,7 +779,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
else if( pNd == &pDoc->GetNodes().GetEndOfContent() )
break;
- pCurPam->GetPoint()->nNode++; // Bewegen
+ pCurPam->GetPoint()->nNode++; // Bewegen
sal_uInt32 nPos = pCurPam->GetPoint()->nNode.GetIndex();
if( bShowProgress )
@@ -800,9 +800,9 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
// beim Aufrufer
OutAndSetDefList( 0 );
- } while( CopyNextPam( &pPam ) ); // bis alle PaM's bearbeitet
+ } while( CopyNextPam( &pPam ) ); // bis alle PaM's bearbeitet
- bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck
+ bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck
}
@@ -929,12 +929,12 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head );
- IncIndentLevel(); // Inhalt von <HEAD> einruecken
+ IncIndentLevel(); // Inhalt von <HEAD> einruecken
// DokumentInfo
ByteString sIndent;
GetIndentString( sIndent );
-// OutNewLine();
+// OutNewLine();
using namespace ::com::sun::star;
uno::Reference<document::XDocumentProperties> xDocProps;
SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -986,7 +986,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
//else
//{
// In HTML-Dokumenten nehmen wir immer die HTML-Vorlage
- // pPageDesc = pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML );
+ // pPageDesc = pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML );
//}
// und nun ... das Style-Sheet!!!
@@ -996,10 +996,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
}
// und nun ... das BASIC und JavaScript!
- if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich
+ if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich
OutBasic();
- DecIndentLevel(); // Inhalt von <HEAD> einruecken
+ DecIndentLevel(); // Inhalt von <HEAD> einruecken
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, sal_False );
@@ -1039,7 +1039,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
OutCSS1_BodyTagStyleOpt( *this, rItemSet, aEmbGrfName );
// Events anhaengen
- if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich
+ if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich
OutBasicBodyEvents();
Strm() << '>';
@@ -1085,7 +1085,7 @@ void SwHTMLWriter::OutBookmarks()
sal_uInt16 nPos;
for( nPos = 0; nPos < aOutlineMarkPoss.Count() &&
aOutlineMarkPoss[nPos] < nNode; nPos++ )
- ;
+ ;
while( nPos < aOutlineMarkPoss.Count() && aOutlineMarkPoss[nPos] == nNode )
{
@@ -1108,7 +1108,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark,
sal_uInt16 nPos;
if( aImplicitMarks.Seek_Entry( &sMark, &nPos ) )
{
- sMark.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5
+ sMark.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5
OutAnchor( sMark );
aImplicitMarks.DeleteAndDestroy( nPos, 1 );
}
@@ -1134,7 +1134,7 @@ void SwHTMLWriter::OutHyperlinkHRefValue( const String& rURL )
sCmp.EqualsAscii( pMarkToOutline ) ||
sCmp.EqualsAscii( pMarkToText ) )
{
- sURL.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5
+ sURL.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5
}
}
}
@@ -1177,7 +1177,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm,
String::CreateFromAscii( "JPG" ),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
- if( !nErr ) // fehlerhaft, da ist nichts auszugeben
+ if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
rEmbGrfNm = URIHelper::SmartRel2Abs(
INetURLObject( GetBaseURL() ), rEmbGrfNm,
@@ -1345,7 +1345,7 @@ sal_uInt16 SwHTMLWriter::GetHTMLFontSize( sal_uInt32 nHeight ) const
// einen anderen Dokument-Teil auszugeben, wie z.B. Header/Footer
HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, ULONG nStt,
ULONG nEnd, sal_Bool bSaveNum,
- const SwFrmFmt *pFrmFmt ) :
+ const SwFrmFmt *pFrmFmt ) :
rWrt( rWriter ),
pOldPam( rWrt.pCurPam ),
pOldEnd( rWrt.GetEndPaM() ),
@@ -1399,7 +1399,7 @@ HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, ULONG nStt,
HTMLSaveData::~HTMLSaveData()
{
- delete rWrt.pCurPam; // Pam wieder loeschen
+ delete rWrt.pCurPam; // Pam wieder loeschen
rWrt.pCurPam = pOldPam;
rWrt.SetEndPaM( pOldEnd );
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 9efc9015b36f..f561b2e19b78 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -2,7 +2,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
@@ -72,61 +72,61 @@ extern SwAttrFnTab aHTMLAttrFnTab;
// BORDER geht nur bei OutHTML_Image
// ANYSIZE gibt an, ob auch VAR_SIZE und MIN_SIZE angaben exportiert werden
// ABSSIZE gibt an, ob Abstand und Umrandung ignoriert werden sollen
-const sal_uInt32 HTML_FRMOPT_ALIGN = 1<<0;
-const sal_uInt32 HTML_FRMOPT_S_ALIGN = 1<<1;
-
-const sal_uInt32 HTML_FRMOPT_WIDTH = 1<<2;
-const sal_uInt32 HTML_FRMOPT_HEIGHT = 1<<3;
-const sal_uInt32 HTML_FRMOPT_SIZE = HTML_FRMOPT_WIDTH|HTML_FRMOPT_HEIGHT;
-const sal_uInt32 HTML_FRMOPT_S_WIDTH = 1<<4;
-const sal_uInt32 HTML_FRMOPT_S_HEIGHT = 1<<5;
-const sal_uInt32 HTML_FRMOPT_S_SIZE = HTML_FRMOPT_S_WIDTH|HTML_FRMOPT_S_HEIGHT;
-const sal_uInt32 HTML_FRMOPT_ANYSIZE = 1<<6;
-const sal_uInt32 HTML_FRMOPT_ABSSIZE = 1<<7;
-const sal_uInt32 HTML_FRMOPT_MARGINSIZE = 1<<8;
-
-const sal_uInt32 HTML_FRMOPT_SPACE = 1<<9;
-const sal_uInt32 HTML_FRMOPT_S_SPACE = 1<<10;
-
-const sal_uInt32 HTML_FRMOPT_BORDER = 1<<11;
-const sal_uInt32 HTML_FRMOPT_S_BORDER = 1<<12;
-const sal_uInt32 HTML_FRMOPT_S_NOBORDER = 1<<13;
+const sal_uInt32 HTML_FRMOPT_ALIGN = 1<<0;
+const sal_uInt32 HTML_FRMOPT_S_ALIGN = 1<<1;
+
+const sal_uInt32 HTML_FRMOPT_WIDTH = 1<<2;
+const sal_uInt32 HTML_FRMOPT_HEIGHT = 1<<3;
+const sal_uInt32 HTML_FRMOPT_SIZE = HTML_FRMOPT_WIDTH|HTML_FRMOPT_HEIGHT;
+const sal_uInt32 HTML_FRMOPT_S_WIDTH = 1<<4;
+const sal_uInt32 HTML_FRMOPT_S_HEIGHT = 1<<5;
+const sal_uInt32 HTML_FRMOPT_S_SIZE = HTML_FRMOPT_S_WIDTH|HTML_FRMOPT_S_HEIGHT;
+const sal_uInt32 HTML_FRMOPT_ANYSIZE = 1<<6;
+const sal_uInt32 HTML_FRMOPT_ABSSIZE = 1<<7;
+const sal_uInt32 HTML_FRMOPT_MARGINSIZE = 1<<8;
+
+const sal_uInt32 HTML_FRMOPT_SPACE = 1<<9;
+const sal_uInt32 HTML_FRMOPT_S_SPACE = 1<<10;
+
+const sal_uInt32 HTML_FRMOPT_BORDER = 1<<11;
+const sal_uInt32 HTML_FRMOPT_S_BORDER = 1<<12;
+const sal_uInt32 HTML_FRMOPT_S_NOBORDER = 1<<13;
const sal_uInt32 HTML_FRMOPT_S_BACKGROUND = 1<<14;
-const sal_uInt32 HTML_FRMOPT_NAME = 1<<15;
-const sal_uInt32 HTML_FRMOPT_ALT = 1<<16;
-const sal_uInt32 HTML_FRMOPT_BRCLEAR = 1<<17;
-const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18;
-const sal_uInt32 HTML_FRMOPT_ID = 1<<19;
-const sal_uInt32 HTML_FRMOPT_DIR = 1<<20;
+const sal_uInt32 HTML_FRMOPT_NAME = 1<<15;
+const sal_uInt32 HTML_FRMOPT_ALT = 1<<16;
+const sal_uInt32 HTML_FRMOPT_BRCLEAR = 1<<17;
+const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18;
+const sal_uInt32 HTML_FRMOPT_ID = 1<<19;
+const sal_uInt32 HTML_FRMOPT_DIR = 1<<20;
-const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL =
- HTML_FRMOPT_ALT |
- HTML_FRMOPT_SIZE |
+const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL =
+ HTML_FRMOPT_ALT |
+ HTML_FRMOPT_SIZE |
HTML_FRMOPT_ABSSIZE |
HTML_FRMOPT_NAME;
const sal_uInt32 HTML_FRMOPTS_GENIMG_CNTNR = HTML_FRMOPTS_GENIMG_ALL;
-const sal_uInt32 HTML_FRMOPTS_GENIMG =
+const sal_uInt32 HTML_FRMOPTS_GENIMG =
HTML_FRMOPTS_GENIMG_ALL |
- HTML_FRMOPT_ALIGN |
- HTML_FRMOPT_SPACE |
+ HTML_FRMOPT_ALIGN |
+ HTML_FRMOPT_SPACE |
HTML_FRMOPT_BRCLEAR;
-#define HTMLMODE_BLOCK_SPACER 0x00010000
-#define HTMLMODE_FLOAT_FRAME 0x00020000
-#define HTMLMODE_VERT_SPACER 0x00040000
-#define HTMLMODE_NBSP_IN_TABLES 0x00080000
-#define HTMLMODE_LSPACE_IN_NUMBUL 0x00100000
-#define HTMLMODE_NO_BR_AT_PAREND 0x00200000
-#define HTMLMODE_PRINT_EXT 0x00400000
-#define HTMLMODE_ABS_POS_FLY 0x00800000
-#define HTMLMODE_ABS_POS_DRAW 0x01000000
-#define HTMLMODE_FLY_MARGINS 0x02000000
-#define HTMLMODE_BORDER_NONE 0x04000000
-#define HTMLMODE_FONT_GENERIC 0x08000000
-#define HTMLMODE_FRSTLINE_IN_NUMBUL 0x10000000
+#define HTMLMODE_BLOCK_SPACER 0x00010000
+#define HTMLMODE_FLOAT_FRAME 0x00020000
+#define HTMLMODE_VERT_SPACER 0x00040000
+#define HTMLMODE_NBSP_IN_TABLES 0x00080000
+#define HTMLMODE_LSPACE_IN_NUMBUL 0x00100000
+#define HTMLMODE_NO_BR_AT_PAREND 0x00200000
+#define HTMLMODE_PRINT_EXT 0x00400000
+#define HTMLMODE_ABS_POS_FLY 0x00800000
+#define HTMLMODE_ABS_POS_DRAW 0x01000000
+#define HTMLMODE_FLY_MARGINS 0x02000000
+#define HTMLMODE_BORDER_NONE 0x04000000
+#define HTMLMODE_FONT_GENERIC 0x08000000
+#define HTMLMODE_FRSTLINE_IN_NUMBUL 0x10000000
#define HTMLMODE_NO_CONTROL_CENTERING 0x20000000
#define HTML_DLCOLL_DD 0x4000
@@ -139,55 +139,55 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG =
// Die folgenden Flags bestimmen nur, welche Descriptoren, Tags, Optionen etc.
// ausgegeben werden ...
// bit 0,1,2
-#define CSS1_OUTMODE_SPAN_NO_ON 0x0000U
-#define CSS1_OUTMODE_SPAN_TAG_ON 0x0001U
-#define CSS1_OUTMODE_STYLE_OPT_ON 0x0002U
-#define CSS1_OUTMODE_RULE_ON 0x0003U
-#define CSS1_OUTMODE_SPAN_TAG1_ON 0x0004U
-#define CSS1_OUTMODE_ANY_ON 0x0007U
+#define CSS1_OUTMODE_SPAN_NO_ON 0x0000U
+#define CSS1_OUTMODE_SPAN_TAG_ON 0x0001U
+#define CSS1_OUTMODE_STYLE_OPT_ON 0x0002U
+#define CSS1_OUTMODE_RULE_ON 0x0003U
+#define CSS1_OUTMODE_SPAN_TAG1_ON 0x0004U
+#define CSS1_OUTMODE_ANY_ON 0x0007U
// bit 3,4,5
-#define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U
-#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3))
-#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3))
-#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3))
-#define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3))
-#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3))
+#define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U
+#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3))
+#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3))
+#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3))
+#define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3))
+#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3))
#define CSS1_OUTMODE_ONOFF(a) (CSS1_OUTMODE_##a##_ON|CSS1_OUTMODE_##a##_OFF)
-#define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG)
-#define CSS1_OUTMODE_STYLE_OPT CSS1_OUTMODE_ONOFF(STYLE_OPT)
-#define CSS1_OUTMODE_RULE CSS1_OUTMODE_ONOFF(RULE)
-#define CSS1_OUTMODE_SPAN_TAG1 CSS1_OUTMODE_ONOFF(TAG1)
+#define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG)
+#define CSS1_OUTMODE_STYLE_OPT CSS1_OUTMODE_ONOFF(STYLE_OPT)
+#define CSS1_OUTMODE_RULE CSS1_OUTMODE_ONOFF(RULE)
+#define CSS1_OUTMODE_SPAN_TAG1 CSS1_OUTMODE_ONOFF(TAG1)
// Die folgenden Flags legen fest, was ausgegeben wird
// bit 6,7,8,9
-#define CSS1_OUTMODE_TEMPLATE 0x0000U
-#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6))
-#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6))
-#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6))
-#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6))
-#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6))
-#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6))
-#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6))
-#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6))
-#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6))
+#define CSS1_OUTMODE_TEMPLATE 0x0000U
+#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6))
+#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6))
+#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6))
+#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6))
+#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6))
+#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6))
+#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6))
+#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6))
+#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6))
// bit 10
-#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10))
+#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10))
// bit 11,12,13
// don't care about script
-#define CSS1_OUTMODE_ANY_SCRIPT 0x0000U
+#define CSS1_OUTMODE_ANY_SCRIPT 0x0000U
// no cjk or ctl items
-#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11))
+#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11))
// no western or ctl items
-#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11))
+#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11))
// no western or cjk items
-#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11))
+#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11))
// no western, cjk or ctl items
-#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11))
-#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11))
+#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11))
+#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11))
// der HTML-Writer
struct HTMLControl;
@@ -204,7 +204,7 @@ class SwHTMLWriter : public Writer
SwHTMLPosFlyFrms *pHTMLPosFlyFrms;
SwHTMLNumRuleInfo *pNumRuleInfo;// aktuelle Numerierung
SwHTMLNumRuleInfo *pNextNumRuleInfo;
- sal_uInt32 nHTMLMode; // Beschreibung der Export-Konfiguration
+ sal_uInt32 nHTMLMode; // Beschreibung der Export-Konfiguration
FieldUnit eCSS1Unit;
@@ -220,126 +220,126 @@ protected:
public:
#if defined(UNX)
- static const sal_Char sNewLine; // nur \012 oder \015
+ static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char __FAR_DATA sNewLine[]; // \015\012
#endif
- SvStringsDtor aImgMapNames; // geschriebene Image Maps
+ SvStringsDtor aImgMapNames; // geschriebene Image Maps
SvStringsSortDtor aImplicitMarks;// implizite Stprungmarken
- SvStringsDtor aOutlineMarks; // geschriebene Image Maps
+ SvStringsDtor aOutlineMarks; // geschriebene Image Maps
SvStringsSortDtor aNumRuleNames;// Names of exported num rules
SvStringsSortDtor aScriptParaStyles;// script dependent para styles
SvStringsSortDtor aScriptTextStyles;// script dependent text styles
SvULongs aOutlineMarkPoss;
- HTMLControls aHTMLControls; // die zu schreibenden ::com::sun::star::form::Forms
+ HTMLControls aHTMLControls; // die zu schreibenden ::com::sun::star::form::Forms
SwHTMLFmtInfos aChrFmtInfos;
SwHTMLFmtInfos aTxtCollInfos;
- INetFmts aINetFmts; // die "offenen" INet-Attribute
+ INetFmts aINetFmts; // die "offenen" INet-Attribute
SwHTMLTxtFtns *pFootEndNotes;
- String aCSS1Selector; // der Selektor eines Styles
+ String aCSS1Selector; // der Selektor eines Styles
String aNonConvertableCharacters;
- String aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen
+ String aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > *pxFormComps; // die aktuelle Form
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > *pxFormComps; // die aktuelle Form
- SwDoc *pTemplate; // die HTML-Vorlage
- Color *pDfltColor; // default Farbe
- SwNodeIndex *pStartNdIdx; // Index des ersten Absatz
+ SwDoc *pTemplate; // die HTML-Vorlage
+ Color *pDfltColor; // default Farbe
+ SwNodeIndex *pStartNdIdx; // Index des ersten Absatz
const SwPageDesc *pCurrPageDesc;// Die aktuelle Seiten-Vorlage
const SwFmtFtn *pFmtFtn;
- sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
+ sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7
- sal_uInt32 nWarn; // Result-Code fuer Warnungen
- sal_uInt32 nLastLFPos; // letzte Position eines LF
+ sal_uInt32 nWarn; // Result-Code fuer Warnungen
+ sal_uInt32 nLastLFPos; // letzte Position eines LF
- sal_uInt16 nLastParaToken; // fuers Absaetze zusammenhalten
- sal_Int32 nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
- sal_uInt16 nImgMapCnt; // zum eindeutig
+ sal_uInt16 nLastParaToken; // fuers Absaetze zusammenhalten
+ sal_Int32 nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
+ sal_uInt16 nImgMapCnt; // zum eindeutig
sal_uInt16 nFormCntrlCnt;
sal_uInt16 nEndNote;
sal_uInt16 nFootNote;
- sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen)
- sal_Int32 nDfltLeftMargin; // die dafaults, der nicht geschrieben
- sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage)
- short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen)
- short nDfltFirstLineIndent; // nicht zu schreibender default
- sal_uInt16 nDfltTopMargin; // die defaults, der nicht geschrieben
- sal_uInt16 nDfltBottomMargin; // werden muessen (aus der Vorlage)
- sal_uInt16 nIndentLvl; // wie weit ist eingerueckt?
- xub_StrLen nWhishLineLen; // wie lang darf eine Zeile werden?
- sal_uInt16 nDefListLvl; // welcher DL-Level existiert gerade
- sal_Int32 nDefListMargin; // Wie weit wird in DL eingerueckt
+ sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen)
+ sal_Int32 nDfltLeftMargin; // die dafaults, der nicht geschrieben
+ sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage)
+ short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen)
+ short nDfltFirstLineIndent; // nicht zu schreibender default
+ sal_uInt16 nDfltTopMargin; // die defaults, der nicht geschrieben
+ sal_uInt16 nDfltBottomMargin; // werden muessen (aus der Vorlage)
+ sal_uInt16 nIndentLvl; // wie weit ist eingerueckt?
+ xub_StrLen nWhishLineLen; // wie lang darf eine Zeile werden?
+ sal_uInt16 nDefListLvl; // welcher DL-Level existiert gerade
+ sal_Int32 nDefListMargin; // Wie weit wird in DL eingerueckt
sal_uInt16 nHeaderFooterSpace;
sal_uInt16 nTxtAttrsToIgnore;
sal_uInt16 nExportMode;
sal_uInt16 nCSS1OutMode;
- sal_uInt16 nCSS1Script; // contains default script (that's the one
+ sal_uInt16 nCSS1Script; // contains default script (that's the one
// that is not contained in class names)
- sal_uInt16 nDirection; // the current direction
+ sal_uInt16 nDirection; // the current direction
- rtl_TextEncoding eDestEnc;
- LanguageType eLang;
+ rtl_TextEncoding eDestEnc;
+ LanguageType eLang;
// Beschreibung der Export-Konfiguration
// 0
- sal_Bool bCfgOutStyles : 1; // Styles exportieren
- sal_Bool bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen
- sal_Bool bCfgFormFeed : 1; // Form-Feeds exportieren
- sal_Bool bCfgStarBasic : 1; // StarBasic exportieren
+ sal_Bool bCfgOutStyles : 1; // Styles exportieren
+ sal_Bool bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen
+ sal_Bool bCfgFormFeed : 1; // Form-Feeds exportieren
+ sal_Bool bCfgStarBasic : 1; // StarBasic exportieren
sal_Bool bCfgCpyLinkedGrfs : 1;
// Beschreibung dessen, was exportiert wird
- sal_Bool bFirstLine : 1; // wird die 1. Zeile ausgegeben ?
- sal_Bool bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende
+ sal_Bool bFirstLine : 1; // wird die 1. Zeile ausgegeben ?
+ sal_Bool bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende
// Die folgenden beiden Flags geben an, wir Attribute exportiert werden:
// bTxtAttr bOutOpts
- // 0 0 Style-Sheets
- // 1 0 Hints: Jedes Attribut wird als eignes Tag
- // geschrieben und es gibt ein End-Tag
- // 0 1 (Absatz-)Attribute: Das Attribut wird als Option
- // eines bereits geschrieben Tags exportiert. Es
- // gibt kein End-Tag.
+ // 0 0 Style-Sheets
+ // 1 0 Hints: Jedes Attribut wird als eignes Tag
+ // geschrieben und es gibt ein End-Tag
+ // 0 1 (Absatz-)Attribute: Das Attribut wird als Option
+ // eines bereits geschrieben Tags exportiert. Es
+ // gibt kein End-Tag.
sal_Bool bTxtAttr : 1;
// 8
sal_Bool bOutOpts : 1;
- sal_Bool bOutTable : 1; // wird der Tabelleninhalt geschrieben?
+ sal_Bool bOutTable : 1; // wird der Tabelleninhalt geschrieben?
sal_Bool bOutHeader : 1;
sal_Bool bOutFooter : 1;
sal_Bool bOutFlyFrame : 1;
// Flags fuer Style-Export
- sal_Bool bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben
- sal_Bool bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben
- sal_Bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
+ sal_Bool bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben
+ sal_Bool bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben
+ sal_Bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
// modifiziert.
// 16
sal_Bool bCSS1IgnoreFirstPageDesc : 1;
// was muss/kann/darf nicht ausgegeben werden?
- sal_Bool bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=...
- sal_Bool bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg.
- sal_Bool bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
- sal_Bool bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden
+ sal_Bool bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=...
+ sal_Bool bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg.
+ sal_Bool bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
+ sal_Bool bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden
// sonstiges
- sal_Bool bPreserveForm : 1; // die aktuelle Form beibehalten
+ sal_Bool bPreserveForm : 1; // die aktuelle Form beibehalten
- sal_Bool bCfgNetscape4 : 1; // Netscape4 Hacks
+ sal_Bool bCfgNetscape4 : 1; // Netscape4 Hacks
// 23
SwHTMLWriter( const String& rBaseURL );
virtual ~SwHTMLWriter();
- void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich
+ void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich
// gebe alle an in aktuellen Ansatz stehenden ::com::sun::star::text::Bookmarks aus
void OutAnchor( const String& rName );
@@ -462,7 +462,7 @@ public:
String& rClass, sal_uInt16& rRefPoolId,
String *pPseudo=0 );
- static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate );
+ static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate );
static const SwFmt *GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep );
static void SubtractItemSet( SfxItemSet& rItemSet,
@@ -534,8 +534,8 @@ struct HTMLSaveData
{
SwHTMLWriter& rWrt;
SwPaM* pOldPam, *pOldEnd;
- SwHTMLNumRuleInfo *pOldNumRuleInfo; // Owner = this
- SwHTMLNumRuleInfo *pOldNextNumRuleInfo; // Owner = HTML-Writer
+ SwHTMLNumRuleInfo *pOldNumRuleInfo; // Owner = this
+ SwHTMLNumRuleInfo *pOldNextNumRuleInfo; // Owner = HTML-Writer
sal_uInt16 nOldDefListLvl;
sal_uInt16 nOldDirection;
sal_Bool bOldWriteAll : 1;
@@ -546,7 +546,7 @@ struct HTMLSaveData
HTMLSaveData( SwHTMLWriter&, ULONG nStt, ULONG nEnd,
sal_Bool bSaveNum=sal_True,
- const SwFrmFmt *pFrmFmt=0 );
+ const SwFrmFmt *pFrmFmt=0 );
~HTMLSaveData();
};
@@ -601,6 +601,6 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt );
-#endif // _WRTHTML_HXX
+#endif // _WRTHTML_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltbase.hxx b/sw/source/filter/inc/fltbase.hxx
index 6665ebd7a449..b7b8957f9f72 100644
--- a/sw/source/filter/inc/fltbase.hxx
+++ b/sw/source/filter/inc/fltbase.hxx
@@ -2,7 +2,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
@@ -34,15 +34,15 @@
class SwFilterBase
{
protected:
- SvStream *pIn;
- sal_Char *pReadBuff; // Groessenangabe
- INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
+ SvStream *pIn;
+ sal_Char *pReadBuff; // Groessenangabe
+ INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
- CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz)
-// CharSet eZielChar; // Ziel-Zeichensatz
+ CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz)
+// CharSet eZielChar; // Ziel-Zeichensatz
- USHORT nTab; // z.Zt. bearbeitete Tabelle
- USHORT nReadBuffSize;// temporaerer Lesepuffer mit
+ USHORT nTab; // z.Zt. bearbeitete Tabelle
+ USHORT nReadBuffSize;// temporaerer Lesepuffer mit
// ----------------------------------------------------------
inline void ReadChar( char &rC );
@@ -54,7 +54,7 @@ protected:
inline void Read( USHORT &rN1, USHORT &rN2 );
inline void Read( USHORT &rN1, USHORT &rN2, USHORT &rN3, USHORT &rN4 );
inline void Read( double &rF );
- void Read( String &rS ); // liest 0-terminierten C-String!
+ void Read( String &rS ); // liest 0-terminierten C-String!
inline void ClearBytesLeft( void );
};
diff --git a/sw/source/filter/inc/fltglbls.hxx b/sw/source/filter/inc/fltglbls.hxx
index 97fd88e6f7a9..16a313a169bb 100644
--- a/sw/source/filter/inc/fltglbls.hxx
+++ b/sw/source/filter/inc/fltglbls.hxx
@@ -2,7 +2,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
@@ -54,43 +54,43 @@ extern LotGlob *pLotGlob;
class FilterGlobals
{
protected:
- SvPtrarr aTblFmts;
- USHORT nColStart;
- USHORT nColEnd;
- USHORT nRowStart;
- USHORT nRowEnd;
- USHORT nAnzCols;
- USHORT nAnzRows;
+ SvPtrarr aTblFmts;
+ USHORT nColStart;
+ USHORT nColEnd;
+ USHORT nRowStart;
+ USHORT nRowEnd;
+ USHORT nAnzCols;
+ USHORT nAnzRows;
public:
FilterGlobals( SwDoc& rDoc, const SwPaM& rPam );
~FilterGlobals();
- SwDoc *pD;
- SwPaM *pPam;
- const SwTable *pTable;
+ SwDoc *pD;
+ SwPaM *pPam;
+ const SwTable *pTable;
SvNumberFormatter *pNumFormatter;
- LanguageType eDefLanguage;
- ULONG nStandard;
- ULONG nDefFormat; // = 0xFFFFFFFF
+ LanguageType eDefLanguage;
+ ULONG nStandard;
+ ULONG nDefFormat; // = 0xFFFFFFFF
void SetRange( USHORT nCS, USHORT nCE, USHORT nRS, USHORT nRE );
BOOL IsInColRange( USHORT nCol )
- { return ( nCol >= nColStart && nCol <= nColEnd ); }
+ { return ( nCol >= nColStart && nCol <= nColEnd ); }
BOOL IsInRowRange( USHORT nRow )
- { return ( nRow >= nRowStart && nRow <= nRowEnd ); }
+ { return ( nRow >= nRowStart && nRow <= nRowEnd ); }
BOOL IsInRange( USHORT nCol, USHORT nRow )
- { return IsInRowRange(nRow) && IsInColRange(nCol); }
+ { return IsInRowRange(nRow) && IsInColRange(nCol); }
- void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; }
- void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; }
+ void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; }
+ void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; }
void Normalize( USHORT &rCol, USHORT &rRow )
- { NormalizeCol( rCol ); NormalizeRow( rRow ); }
+ { NormalizeCol( rCol ); NormalizeRow( rRow ); }
- USHORT AnzCols() const { return nAnzCols; }
- USHORT AnzRows() const { return nAnzRows; }
+ USHORT AnzCols() const { return nAnzCols; }
+ USHORT AnzRows() const { return nAnzRows; }
BOOL ColRangeLimitter( USHORT &rCS, USHORT &rCE );
@@ -98,8 +98,8 @@ public:
void CreateTable();
void InsertAttr( const SfxPoolItem& rItem );
- inline void ColLimitter( USHORT &rCol );
- inline void RowLimitter( USHORT &rRow );
+ inline void ColLimitter( USHORT &rCol );
+ inline void RowLimitter( USHORT &rRow );
};
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 8f69b3761b26..e1a0e560ff73 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -2,7 +2,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
@@ -81,7 +81,7 @@ void GetWW8Writer( const String&, const String&, WriterRef& );
// Absatz-Einzug abgezogen werden muss.
class SW_DLLPUBLIC SwRelNumRuleSpaces
{
- SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
+ SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
BOOL bNewDoc;
void SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule );
@@ -95,7 +95,7 @@ public:
const SwNodeIndex& rEnd );
};
-#define SW_SV_BRUSH_25 0
+#define SW_SV_BRUSH_25 0
#define SW_SV_BRUSH_50 1
#define SW_SV_BRUSH_75 2
#define SW_SV_BRUSH_NULL 3
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index ff6b588bd92d..7851d15f55e8 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -2,7 +2,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
@@ -69,11 +69,11 @@ public:
SwNodeIndex nMkNode;
SwNodeIndex nPtNode;
SfxPoolItem * pAttr;// Format Attribute
- long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks
+ long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks
xub_StrLen nMkCntnt;// Nachbildung von Mark()
xub_StrLen nPtCntnt;// Nachbildung von GetPoint()
- BOOL bOld; // to mark Attributes *before* skipping field results
+ BOOL bOld; // to mark Attributes *before* skipping field results
BOOL bLocked;
BOOL bCopied;
BOOL bConsumedByField;
@@ -84,7 +84,7 @@ public:
void SetStartPos(const SwPosition & rStartPos);
SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos);
- SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck );
+ SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck );
};
class SW_DLLPUBLIC SwFltControlStack
@@ -121,7 +121,7 @@ public:
SwFltControlStack(SwDoc* pDo, ULONG nFieldFl);
virtual ~SwFltControlStack();
- BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
+ BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
@@ -156,7 +156,7 @@ public:
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
void SetFrmFmt(SwFrmFmt * _pFrmFmt);
- const SwFrmFmt* GetFrmFmt() const;
+ const SwFrmFmt* GetFrmFmt() const;
SwFrmFmt* GetFrmFmt();
};
@@ -174,18 +174,18 @@ public:
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
{
public:
- DateTime aStamp;
- DateTime aStampPrev;
- RedlineType_t eType;
- RedlineType_t eTypePrev;
- USHORT nAutorNo;
- USHORT nAutorNoPrev;
-
- SwFltRedline(RedlineType_t eType_,
- USHORT nAutorNo_,
+ DateTime aStamp;
+ DateTime aStampPrev;
+ RedlineType_t eType;
+ RedlineType_t eTypePrev;
+ USHORT nAutorNo;
+ USHORT nAutorNoPrev;
+
+ SwFltRedline(RedlineType_t eType_,
+ USHORT nAutorNo_,
const DateTime& rStamp_,
- RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT,
- USHORT nAutorNoPrev_ = USHRT_MAX,
+ RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT,
+ USHORT nAutorNoPrev_ = USHRT_MAX,
const DateTime* pStampPrev_ = 0)
: SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_), eType(eType_),
eTypePrev(eTypePrev_), nAutorNo(nAutorNo_), nAutorNoPrev(nAutorNoPrev_)
@@ -196,12 +196,12 @@ public:
SwFltRedline(const SwFltRedline& rCpy):
SfxPoolItem(RES_FLTR_REDLINE),
- aStamp( rCpy.aStamp ),
- aStampPrev( rCpy.aStampPrev ),
- eType( rCpy.eType ),
- eTypePrev( rCpy.eTypePrev ),
- nAutorNo( rCpy.nAutorNo ),
- nAutorNoPrev( rCpy.nAutorNoPrev )
+ aStamp( rCpy.aStamp ),
+ aStampPrev( rCpy.aStampPrev ),
+ eType( rCpy.eType ),
+ eTypePrev( rCpy.eTypePrev ),
+ nAutorNo( rCpy.nAutorNo ),
+ nAutorNoPrev( rCpy.nAutorNoPrev )
{}
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem& rItem) const;
@@ -210,11 +210,11 @@ public:
class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
{
- friend class SwFltShell; // darf aName und aVal uebersetzen
+ friend class SwFltShell; // darf aName und aVal uebersetzen
long nHandle;
String aName;
String aVal;
- BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
+ BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
BOOL bRef;
BOOL bPgRef;
public:
@@ -224,14 +224,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
- const String& GetName() const { return aName; }
- const String& GetValSys() const { return aVal; }
- BOOL IsOnlyRef() const { return bOnlyRef; }
- BOOL IsRef() const { return bRef; }
- void SetRef(BOOL b = TRUE) { bRef = b; }
- BOOL IsPgRef() const { return bPgRef; }
- void SetPgRef(BOOL b = TRUE) { bPgRef = b; }
- long GetHandle() const { return nHandle; }
+ const String& GetName() const { return aName; }
+ const String& GetValSys() const { return aVal; }
+ BOOL IsOnlyRef() const { return bOnlyRef; }
+ BOOL IsRef() const { return bRef; }
+ void SetRef(BOOL b = TRUE) { bRef = b; }
+ BOOL IsPgRef() const { return bPgRef; }
+ void SetPgRef(BOOL b = TRUE) { bPgRef = b; }
+ long GetHandle() const { return nHandle; }
};
class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
@@ -246,8 +246,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
- SwTOXBase* GetBase() { return pTOXBase; }
- USHORT GetCols() const { return nCols; }
+ SwTOXBase* GetBase() { return pTOXBase; }
+ USHORT GetCols() const { return nCols; }
void SetHadBreakItem( BOOL bVal ) { bHadBreakItem = bVal; }
void SetHadPageDescItem( BOOL bVal ) { bHadPageDescItem = bVal; }
BOOL HadBreakItem() const { return bHadBreakItem; }
@@ -300,7 +300,7 @@ protected:
RndStdIds eFlyAnchor;
BOOL bFlyAbsPos;
- SwDoc& GetDoc() { return rDoc; }
+ SwDoc& GetDoc() { return rDoc; }
SfxItemSet* NewFlyDefaults();
SwFltOutBase(SwDoc& rDocu);
virtual ~SwFltOutBase();
@@ -345,7 +345,7 @@ class SwFltOutDoc : public SwFltOutBase
SwTwips nTableWidth;
USHORT usTableX;
USHORT usTableY;
- BOOL bReadNoTbl; // Keine Tabellen
+ BOOL bReadNoTbl; // Keine Tabellen
SwTableBox* GetBox(USHORT ny, USHORT nx = USHRT_MAX);
BOOL SeekCell( short nRow, short nCol, BOOL bPam );
@@ -358,8 +358,8 @@ public:
nTableWidth(0), bReadNoTbl(FALSE)
{}
- void SetReadNoTable() { bReadNoTbl = TRUE; }
- BOOL IsTableWidthSet() const { return 0 != nTableWidth; }
+ void SetReadNoTable() { bReadNoTbl = TRUE; }
+ BOOL IsTableWidthSet() const { return 0 != nTableWidth; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
@@ -392,7 +392,7 @@ public:
class SwFltFormatCollection : public SwFltOutBase
{
SwTxtFmtColl* pColl;
- SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
+ SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
BOOL bHasFly;
public:
SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
@@ -409,10 +409,10 @@ public:
void Derived(SwTxtFmtColl* pBase)
{ pColl->SetDerivedFrom(pBase); }
-// SwTxtFmtColl* Search(String, CharSet eSrc);
- SwTxtFmtColl* GetColl() { return pColl; }
- void SetHasFly() { bHasFly = TRUE; }
- SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
+// SwTxtFmtColl* Search(String, CharSet eSrc);
+ SwTxtFmtColl* GetColl() { return pColl; }
+ void SetHasFly() { bHasFly = TRUE; }
+ SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
virtual const SfxPoolItem& GetAttr(USHORT nWhich);
@@ -444,7 +444,7 @@ class SwFltShell
SwFltFormatCollection* pColls[256];
SwFltOutBase* pOut;
-// SwFltFormatCollection* pFormat; // set when in style-mode
+// SwFltFormatCollection* pFormat; // set when in style-mode
SwPageDesc* pCurrentPageDesc;
SwPosition* pSavedPos; // set, when in footnote or header/footer -mode
#ifdef None
@@ -462,7 +462,7 @@ class SwFltShell
} eSubMode;
// Fly items:
- USHORT nAktStyle; // zur Indizierung pStyleFlyTable
+ USHORT nAktStyle; // zur Indizierung pStyleFlyTable
//
SwFltControlStack aStack;
SwFltEndStack aEndStack;
@@ -480,18 +480,18 @@ public:
SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, BOOL bNew, ULONG = 0);
~SwFltShell();
- SwDoc& GetDoc() { return *aStack.pDoc; }
+ SwDoc& GetDoc() { return *aStack.pDoc; }
- CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet;
+ CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet;
eSrcCharSet = eNew;
return eOld;
}
- void SetUseStdPageDesc() { bStdPD = TRUE; }
- void SetProtect() { bProtect = TRUE; }
+ void SetUseStdPageDesc() { bStdPD = TRUE; }
+ void SetProtect() { bProtect = TRUE; }
SwPageDesc* MakePageDesc(SwPageDesc* pFirstPageDesc = NULL);
- SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; }
- void NextTab() { (*this) << BYTE(0x09); }
- void NextLine() { (*this) << BYTE(0x0a); }
+ SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; }
+ void NextTab() { (*this) << BYTE(0x09); }
+ void NextLine() { (*this) << BYTE(0x0a); }
void NextParagraph();
void NextPage();
void NextSection() { pCurrentPageDesc = MakePageDesc(); }
@@ -504,15 +504,15 @@ public:
SwFltShell& operator << ( Graphic& );
SwFltShell& operator << ( SwFltBookmark& aBook );
void SetBookEnd(long nHandle);
- SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI
+ SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI
SwFltShell& operator << ( const sal_Unicode );
SwFltShell& operator << ( const SwField& );
SwFltShell& operator << ( const SfxPoolItem& rItem )
{ *pOut << rItem; return *this; }
-// SwFltShell& operator >> (SfxPoolItem&);
+// SwFltShell& operator >> (SfxPoolItem&);
// methode zum beenden einer sub-sektion, zB Fusznote etc
- void End() { eSubMode = None; }
+ void End() { eSubMode = None; }
// methoden zur verwaltung von Header/Footer
void BeginHeader(SwPageDesc* =NULL);
void BeginFooter(SwPageDesc* =NULL);
@@ -597,7 +597,7 @@ public:
void EndStyle()
{
-// OSL_ENSURE(eSubMode == Style, "wrong state for style");
+// OSL_ENSURE(eSubMode == Style, "wrong state for style");
nAktStyle = 0;
pOut = pOutDoc;
eSubMode = None;
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 0872e3434656..cfbe19a05922 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -2,7 +2,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
@@ -70,13 +70,13 @@ namespace sw
{
/** MSOffice appears to set the charset of unicode fonts to MS 932
- Arial Unicode MS for example is a unicode font, but word sets
+ Arial Unicode MS for example is a unicode font, but word sets
exported uses of it to the MS 932 charset
@param eTextEncoding
the OOo encoding to convert from
- @return
+ @return
a msoffice equivalent charset identifier
@author
@@ -167,8 +167,8 @@ namespace sw
/** Clips a value to MAX/MIN 16bit value to make it safe for use
as a position value to give to writer. i.e. +-57.8cm. Sometimes
we see ridiculous values for positioning in rtf and word document,
- this captures such ones and clips them to values which are
- still outside the document, but of a value that doesn't cause
+ this captures such ones and clips them to values which are
+ still outside the document, but of a value that doesn't cause
problems for writer's layout, e.g. see
http://www.openoffice.org/issues/show_bug.cgi?id=i9245
@@ -186,14 +186,14 @@ namespace sw
Mapping a word style to a writer style has to consider mapping
the word builtin styles like "Normal" as the default root style
to our default root style which is called "Default" in english,
- and "Normal" in german.
-
+ and "Normal" in german.
+
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
b) styles "Normal" and "Default" in a single document, where
- we can not use the original names, and must come up with an
+ we can not use the original names, and must come up with an
alternative name for one of them..
And it needs to report to the importer if the style being mapped to
@@ -208,7 +208,7 @@ namespace sw
{
private:
//I hate these things stupid pImpl things, but its warranted here
- ParaMapper *mpImpl;
+ ParaMapper *mpImpl;
public:
ParaStyleMapper(SwDoc &rDoc);
~ParaStyleMapper();
@@ -224,21 +224,21 @@ namespace sw
@param rName
The name of the word style
- @param eSti
+ @param eSti
The style id of the word style, we are really only interested
in knowing if the style has either a builtin standard id, or is
a user defined style.
-
+
@return
The equivalent writer style packaged as a StyleResult to use
for this word style.
-
+
It will only return a failure in the pathological case of
catastropic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
- StyleResult GetStyle(const String& rName, ww::sti eSti);
+ StyleResult GetStyle(const String& rName, ww::sti eSti);
};
/** Knows which writer style a given word style should be imported as
@@ -246,14 +246,14 @@ namespace sw
Mapping a word style to a writer style has to consider mapping
the word builtin styles like "Normal" as the default root style
to our default root style which is called "Default" in english,
- and "Normal" in german.
-
+ and "Normal" in german.
+
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
b) styles "Normal" and "Default" in a single document, where
- we can not use the original names, and must come up with an
+ we can not use the original names, and must come up with an
alternative name for one of them..
And it needs to report to the importer if the style being mapped to
@@ -268,7 +268,7 @@ namespace sw
{
private:
//I hate these things stupid pImpl things, but its warranted here
- CharMapper *mpImpl;
+ CharMapper *mpImpl;
public:
CharStyleMapper(SwDoc &rDoc);
~CharStyleMapper();
@@ -284,25 +284,25 @@ namespace sw
@param rName
The name of the word style
- @param eSti
+ @param eSti
The style id of the word style, we are really only interested
in knowing if the style has either a builtin standard id, or is
a user defined style.
-
+
@return
The equivalent writer style packaged as a StyleResult to use
for this word style.
-
+
It will only return a failure in the pathological case of
catastropic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
- StyleResult GetStyle(const String& rName, ww::sti eSti);
+ StyleResult GetStyle(const String& rName, ww::sti eSti);
};
/** Find suitable names for exporting this font
-
+
Given a fontname description find the best primary and secondary
fallback font to use from MSWord's persp font
@@ -319,7 +319,7 @@ namespace sw
bool HasDistinctSecondary() const;
FontMapExport(const String &rFontDescription);
};
-
+
class InsertedTableClient : public SwClient
{
public:
@@ -328,11 +328,11 @@ namespace sw
};
/** Handle requirements for table formatting in insert->file mode.
-
+
When inserting a table into a document which already has been
formatted and laid out (e.g using insert->file) then tables
must be handled in a special way, (or so previous comments and
- code in the filters leads me to believe).
+ code in the filters leads me to believe).
Before the document is finalized the new tables need to have
their layout frms deleted and recalculated. This TableManager
@@ -340,7 +340,7 @@ namespace sw
a document should be registered with this manager with
InsertTable, and before finialization DelAndMakeTblFrms should
be called.
-
+
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
@@ -454,8 +454,8 @@ namespace sw
/** Given a SwNoTxtNode (ole/graphic) get original size
Get the uncropped and unscaled size of the underlying graphic or
- ole object associated with a given SwNoTxtNode.
-
+ ole object associated with a given SwNoTxtNode.
+
This function will swap in the graphic if it is swapped out from
the graphic or object cache, but will swap it out if that was the
case, i.e. rNd is logically unchanged before and after
@@ -464,7 +464,7 @@ namespace sw
@param rNd
the SwNoTxtNode whose objects original size we want
- @return
+ @return
the uncropped unscaled size of the SwNoTxtNode
@author
@@ -478,9 +478,9 @@ namespace sw
sal_uInt16 mnScript;
rtl_TextEncoding meCharSet;
bool mbRTL;
- CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript,
- rtl_TextEncoding eCharSet, bool bRTL)
- : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet),
+ CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript,
+ rtl_TextEncoding eCharSet, bool bRTL)
+ : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet),
mbRTL(bRTL)
{
}
@@ -489,7 +489,7 @@ namespace sw
typedef std::vector<CharRunEntry> CharRuns;
typedef CharRuns::const_iterator cCharRunIter;
- /** Collect the ranges of Text which share
+ /** Collect the ranges of Text which share
Word generally requires characters which share the same direction,
the same script, and occasionally (depending on the format) the
@@ -512,13 +512,13 @@ namespace sw
@return STL container of CharRuns which describe the shared
direction, script and optionally script of the contigious sequences
of characters
-
+
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
@see #i22537# for example
*/
- CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
+ CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
xub_StrLen nStart = 0, bool bSplitOnCharSet = false);
}
}
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index 1e96a5fc4b3a..1764599be1af 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -2,7 +2,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
@@ -44,14 +44,14 @@ class RTFVertOrient
public:
RTFVertOrient( USHORT nValue ) { Value.nVal = nValue; }
- RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) {
+ RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) {
Value.Flags.nOrient = nOrient;
Value.Flags.nRelOrient = nRelOrient;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
+ USHORT GetOrient() const { return Value.Flags.nOrient; }
USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
@@ -75,9 +75,9 @@ public:
Value.Flags.nRelAnchor = 0;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
+ USHORT GetOrient() const { return Value.Flags.nOrient; }
USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
class RTFProtect
@@ -99,10 +99,10 @@ public:
Value.Flags.bPos = bPos;
}
- BOOL GetCntnt() const { return Value.Flags.bCntnt; }
- BOOL GetSize() const { return Value.Flags.bSize; }
- BOOL GetPos() const { return Value.Flags.bPos; }
- USHORT GetValue() const { return Value.nVal; }
+ BOOL GetCntnt() const { return Value.Flags.bCntnt; }
+ BOOL GetSize() const { return Value.Flags.bSize; }
+ BOOL GetPos() const { return Value.Flags.bPos; }
+ USHORT GetValue() const { return Value.nVal; }
};
@@ -125,7 +125,7 @@ public:
BYTE GetOrder() const { return (BYTE)Value.Flags.nOrder; }
BOOL GetGoldCut() const { return (BOOL)Value.Flags.nGoldCut; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
#endif // _RTF_HXX
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index c4790db74c12..855d4bb25444 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -2,7 +2,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
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _WRT_FN_HXX
#define _WRT_FN_HXX
-#include "hintids.hxx" // fuer die Konstanten
+#include "hintids.hxx" // fuer die Konstanten
// einige Forward-Deklarationen
class SwNode;
@@ -64,6 +64,6 @@ SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
-#endif // _WRT_FN_HXX
+#endif // _WRT_FN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 8bf5424e3408..c78a6c486b9c 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class SvxBrushItem;
class SvxBorderLine;
//---------------------------------------------------------------------------
-// Code aus dem HTML-Filter fuers schreiben von Tabellen
+// Code aus dem HTML-Filter fuers schreiben von Tabellen
//---------------------------------------------------------------------------
#define COLFUZZY 20
@@ -57,18 +57,18 @@ class SvxBorderLine;
class SwWriteTableCell
{
- const SwTableBox *pBox; // SwTableBox der Zelle
- const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile
+ const SwTableBox *pBox; // SwTableBox der Zelle
+ const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile
- long nHeight; // fixe/Mindest-Hoehe der Zeile
+ long nHeight; // fixe/Mindest-Hoehe der Zeile
- USHORT nWidthOpt; // Breite aus Option;
+ USHORT nWidthOpt; // Breite aus Option;
- USHORT nRow; // Start-Zeile
- USHORT nCol; // Start-Spalte
+ USHORT nRow; // Start-Zeile
+ USHORT nCol; // Start-Spalte
- USHORT nRowSpan; // ueberspannte Zeilen
- USHORT nColSpan; // ueberspannte Spalten
+ USHORT nRowSpan; // ueberspannte Zeilen
+ USHORT nColSpan; // ueberspannte Spalten
BOOL bPrcWidthOpt;
@@ -112,10 +112,10 @@ SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5, 5 )
class SwWriteTableRow
{
- SwWriteTableCells aCells; // Alle Zellen der Rows
+ SwWriteTableCells aCells; // Alle Zellen der Rows
const SvxBrushItem *pBackground;// Hintergrund
- long nPos; // End-Position (twips) der Zeile
+ long nPos; // End-Position (twips) der Zeile
BOOL mbUseLayoutHeights;
// Forbidden and not implemented.
@@ -129,10 +129,10 @@ protected:
public:
- USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen
+ USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen
USHORT nBottomBorder;
- BOOL bTopBorder : 1; // Welche Umrandungen sind da?
+ BOOL bTopBorder : 1; // Welche Umrandungen sind da?
BOOL bBottomBorder : 1;
SwWriteTableRow( long nPos, BOOL bUseLayoutHeights );
@@ -149,11 +149,11 @@ public:
}
const SvxBrushItem *GetBackground() const { return pBackground; }
- BOOL HasTopBorder() const { return bTopBorder; }
- BOOL HasBottomBorder() const { return bBottomBorder; }
+ BOOL HasTopBorder() const { return bTopBorder; }
+ BOOL HasBottomBorder() const { return bBottomBorder; }
- long GetPos() const { return nPos; }
- const SwWriteTableCells& GetCells() const { return aCells; }
+ long GetPos() const { return nPos; }
+ const SwWriteTableCells& GetCells() const { return aCells; }
inline int operator==( const SwWriteTableRow& rRow ) const;
inline int operator<( const SwWriteTableRow& rRow2 ) const;
@@ -181,29 +181,29 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 )
class SwWriteTableCol
{
- USHORT nPos; // End Position der Spalte
+ USHORT nPos; // End Position der Spalte
USHORT nWidthOpt;
BOOL bRelWidthOpt : 1;
- BOOL bOutWidth : 1; // Spaltenbreite ausgeben?
+ BOOL bOutWidth : 1; // Spaltenbreite ausgeben?
public:
- BOOL bLeftBorder : 1; // Welche Umrandungen sind da?
+ BOOL bLeftBorder : 1; // Welche Umrandungen sind da?
BOOL bRightBorder : 1;
SwWriteTableCol( USHORT nPosition );
- USHORT GetPos() const { return nPos; }
+ USHORT GetPos() const { return nPos; }
- void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; }
- BOOL HasLeftBorder() const { return bLeftBorder; }
+ void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; }
+ BOOL HasLeftBorder() const { return bLeftBorder; }
- void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; }
- BOOL HasRightBorder() const { return bRightBorder; }
+ void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; }
+ BOOL HasRightBorder() const { return bRightBorder; }
- void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; }
- BOOL GetOutWidth() const { return bOutWidth; }
+ void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; }
+ BOOL GetOutWidth() const { return bOutWidth; }
inline int operator==( const SwWriteTableCol& rCol ) const;
inline int operator<( const SwWriteTableCol& rCol ) const;
@@ -212,8 +212,8 @@ public:
{
nWidthOpt = nWidth; bRelWidthOpt = bRel;
}
- USHORT GetWidthOpt() const { return nWidthOpt; }
- BOOL HasRelWidthOpt() const { return bRelWidthOpt; }
+ USHORT GetWidthOpt() const { return nWidthOpt; }
+ BOOL HasRelWidthOpt() const { return bRelWidthOpt; }
};
inline int SwWriteTableCol::operator==( const SwWriteTableCol& rCol ) const
@@ -239,27 +239,27 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5, 5 )
class SW_DLLPUBLIC SwWriteTable
{
protected:
- SwWriteTableCols aCols; // alle Spalten
- SwWriteTableRows aRows; // alle Zellen
+ SwWriteTableCols aCols; // alle Spalten
+ SwWriteTableRows aRows; // alle Zellen
- UINT32 nBorderColor; // Umrandungsfarbe
+ UINT32 nBorderColor; // Umrandungsfarbe
- USHORT nCellSpacing; // Dicke der inneren Umrandung
- USHORT nCellPadding; // Absatnd Umrandung-Inhalt
+ USHORT nCellSpacing; // Dicke der inneren Umrandung
+ USHORT nCellPadding; // Absatnd Umrandung-Inhalt
- USHORT nBorder; // Dicke der ausseren Umrandung
- USHORT nInnerBorder; // Dicke der inneren Umrandung
- USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
+ USHORT nBorder; // Dicke der ausseren Umrandung
+ USHORT nInnerBorder; // Dicke der inneren Umrandung
+ USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
- USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
+ USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
USHORT nLeftSub;
USHORT nRightSub;
- long nTabWidth; // Absolute/Relative Breite der Tabelle
+ long nTabWidth; // Absolute/Relative Breite der Tabelle
- BOOL bRelWidths : 1; // Breiten relativ ausgeben?
- BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+ BOOL bRelWidths : 1; // Breiten relativ ausgeben?
+ BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
#if OSL_DEBUG_LEVEL > 1
BOOL bGetLineHeightCalled : 1;
#endif
@@ -299,7 +299,7 @@ protected:
public:
static long GetBoxWidth( const SwTableBox *pBox );
-
+
USHORT GetRawWidth( USHORT nCol, USHORT nColSpan ) const;
USHORT GetAbsWidth( USHORT nCol, USHORT nColSpan ) const;
USHORT GetRelWidth( USHORT nCol, USHORT nColSpan ) const;
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index e2053fd5eaa7..78ee77167409 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -2,7 +2,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
@@ -143,9 +143,9 @@ namespace ww
stiUser = 0x0ffe, // user styles are distinguished by name
stiNil = 0x0fff // max for 12 bits
};
-
+
/** Find the WinWord sti index of an english style name.
-
+
When importing a RTF document we would like to treat styles as similiar
to how word does as possible, to this end word will treat some styles
with special names as inbuilt styles, and some as user defined styles.
@@ -170,10 +170,10 @@ namespace ww
sti GetCanonicalStiFromEnglishName(const String &rString) throw();
/** Find the WinWord sti index of an old <= Word2 stc (style code)
-
- When importing a Word 2 document we would like to treat styles as
- similiar to how word 8 does as possible, to this end word will treat
- some styles with special codes as inbuilt styles, and some as user
+
+ When importing a Word 2 document we would like to treat styles as
+ similiar to how word 8 does as possible, to this end word will treat
+ some styles with special codes as inbuilt styles, and some as user
defined styles.
@param
@@ -189,7 +189,7 @@ namespace ww
sti GetCanonicalStiFromStc(sal_uInt8 stc) throw();
/** Find the WinWord english name from a sti index
-
+
Map the word style index to it's english name
@param
@@ -204,7 +204,7 @@ namespace ww
const sal_Char* GetEnglishNameFromSti(sti eSti) throw();
/** Determine if the WinWord sti is standard Character Style
-
+
@param
sti the Style index
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index d6c4e41a74dc..bee4b8bbc889 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -2,7 +2,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
@@ -65,10 +65,10 @@
// bestimme, ob es sich um ein IMPORT/TOC - Feld handelt.
-// return: 0 - weder noch,
-// 1 - TOC
-// 2 - IMPORT
-// 3 - INDEX
+// return: 0 - weder noch,
+// 1 - TOC
+// 2 - IMPORT
+// 3 - INDEX
enum RTF_FLD_TYPES {
RTFFLD_UNKNOWN = 0,
RTFFLD_TOC,
@@ -92,21 +92,21 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
{
// Strings sind PascalStrings; Laenge steht an 1. Stellen, dadurch wird
// sich der Aufruf von strlen erspart!!!
- sal_Char __READONLY_DATA sTOC[]= "\x03""toc";
- sal_Char __READONLY_DATA sIMPORT[]= "\x06""import";
- sal_Char __READONLY_DATA sINDEX[]= "\x05""index";
- sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol";
- sal_Char __READONLY_DATA sPAGE[]= "\x04""page";
+ sal_Char __READONLY_DATA sTOC[]= "\x03""toc";
+ sal_Char __READONLY_DATA sIMPORT[]= "\x06""import";
+ sal_Char __READONLY_DATA sINDEX[]= "\x05""index";
+ sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol";
+ sal_Char __READONLY_DATA sPAGE[]= "\x04""page";
sal_Char __READONLY_DATA sNUMPAGES[]= "\x08""numpages";
- sal_Char __READONLY_DATA sDATE[]= "\x04""date";
- sal_Char __READONLY_DATA sTIME[]= "\x04""time";
- sal_Char __READONLY_DATA sDATA[]= "\x04""data";
- sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield";
- sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture";
- sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink";
- sal_Char __READONLY_DATA sREF[]= "\x03""ref";
- sal_Char __READONLY_DATA sPAGEREF[]= "\x07""pageref";
- sal_Char __READONLY_DATA sEQ[]= "\x02""eq";
+ sal_Char __READONLY_DATA sDATE[]= "\x04""date";
+ sal_Char __READONLY_DATA sTIME[]= "\x04""time";
+ sal_Char __READONLY_DATA sDATA[]= "\x04""data";
+ sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield";
+ sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture";
+ sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink";
+ sal_Char __READONLY_DATA sREF[]= "\x03""ref";
+ sal_Char __READONLY_DATA sPAGEREF[]= "\x07""pageref";
+ sal_Char __READONLY_DATA sEQ[]= "\x02""eq";
sal_Char __READONLY_DATA sINCLUDETEXT[]="\x0B""includetext";
struct _Dummy_RTF_FLD_TYPES
@@ -126,10 +126,10 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
{RTFFLD_DATA, sDATA},
{RTFFLD_MERGEFLD, sMERGEFLD},
{RTFFLD_IMPORT, sIMPORT2},
- {RTFFLD_HYPERLINK, sHYPERLINK},
- {RTFFLD_REF, sREF},
- {RTFFLD_PAGEREF, sPAGEREF},
- {RTFFLD_EQ, sEQ},
+ {RTFFLD_HYPERLINK, sHYPERLINK},
+ {RTFFLD_REF, sREF},
+ {RTFFLD_PAGEREF, sPAGEREF},
+ {RTFFLD_EQ, sEQ},
{RTFFLD_INCLUDETEXT, sINCLUDETEXT}
};
@@ -155,7 +155,7 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
( !nFndPos || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos-1) )) ) &&
( nFndPos+nLen == sNm.Len() || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos+nLen) ) ) ) )
{
-// rName = sNm.Copy( nFndPos, nLen );
+// rName = sNm.Copy( nFndPos, nLen );
rName = rName.Copy( nFndPos, static_cast< xub_StrLen >(nLen) );
nFndPos += nTokenStt + static_cast< xub_StrLen >(nLen);
while( rNext.GetChar( nFndPos ) == ' ' ) ++nFndPos;
@@ -164,7 +164,7 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
return aFldNmArr[n].eFldType;
}
}
- return RTFFLD_UNKNOWN; // nichts gefunden.
+ return RTFFLD_UNKNOWN; // nichts gefunden.
}
static USHORT CheckNumberFmtStr( const String& rNStr )
@@ -191,7 +191,7 @@ static USHORT CheckNumberFmtStr( const String& rNStr )
if( rNStr.EqualsAscii( pCmp, 0, static_cast< xub_StrLen >(nLen) ))
return static_cast< USHORT >(2 <= n ? n : (n + SVX_NUM_CHARS_UPPER_LETTER_N));
}
- return SVX_NUM_PAGEDESC; // default-Wert
+ return SVX_NUM_PAGEDESC; // default-Wert
}
class RtfFieldSwitch
@@ -202,11 +202,11 @@ public:
RtfFieldSwitch( const String& rParam );
sal_Unicode GetSwitch( String& rParam );
- BOOL IsAtEnd() const { return nCurPos >= sParam.Len(); }
- xub_StrLen GetCurPos() const { return nCurPos; }
- void Erase( xub_StrLen nEndPos ) { sParam.Erase( 0, nEndPos ); }
- void Insert( const String& rIns ) { sParam.Insert( rIns, 0 ); }
- const String& GetStr() const { return sParam; }
+ BOOL IsAtEnd() const { return nCurPos >= sParam.Len(); }
+ xub_StrLen GetCurPos() const { return nCurPos; }
+ void Erase( xub_StrLen nEndPos ) { sParam.Erase( 0, nEndPos ); }
+ void Insert( const String& rIns ) { sParam.Insert( rIns, 0 ); }
+ const String& GetStr() const { return sParam; }
};
RtfFieldSwitch::RtfFieldSwitch( const String& rParam )
@@ -297,9 +297,9 @@ void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData,
case 0:
switch( nSttKey )
{
- case 'u': rData.sUp += sParam; break;
- case 'd': rData.sDown += sParam; break;
- default: rData.sText += sParam; break;
+ case 'u': rData.sUp += sParam; break;
+ case 'd': rData.sDown += sParam; break;
+ default: rData.sText += sParam; break;
}
break;
@@ -408,8 +408,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
case RTFFLD_IMPORT:
{
//JP 11.03.96: vertraegt sich nicht so ganz mit Internet!
-// if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' )))
-// aSaveStr.Erase( nPos+4 );
+// if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' )))
+// aSaveStr.Erase( nPos+4 );
aSaveStr.EraseLeadingAndTrailingChars();
if( aSaveStr.Len() )
@@ -425,7 +425,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
INetURLObject(GetBaseURL()), aSaveStr,
URIHelper::GetMaybeFileHdl() );
}
-// SkipGroup(); // ueberlese den Rest
+// SkipGroup(); // ueberlese den Rest
}
break;
@@ -462,7 +462,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
aPF.ChangeFormat( CheckNumberFmtStr( aSaveStr ));
}
pDoc->InsertPoolItem( *pPam, SwFmtFld( aPF ), 0 );
- SkipGroup(); // ueberlese den Rest
+ SkipGroup(); // ueberlese den Rest
}
break;
case RTFFLD_DATE:
@@ -520,7 +520,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
delete pFld;
}
}
- SkipGroup(); // ueberlese den Rest
+ SkipGroup(); // ueberlese den Rest
}
break;
@@ -533,8 +533,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
// im SWG geben die DATA Felder den Namen der Datenbank
// an. Dieser kann als Field oder als DBInfo interpretiert
// werden:
- // \\data -> Datenbank-Name als Field
- // DATA -> Datenbank-Info
+ // \\data -> Datenbank-Name als Field
+ // DATA -> Datenbank-Info
BOOL bField = rFieldStr.GetChar( 0 ) != 'D';
// nur der Name interressiert
@@ -549,20 +549,20 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
static_cast<SwDBNameFieldType*>(pFldType), SwDBData())), 0);
}
else
- pDoc->ChgDBData( aData ); // MS: Keine DBInfo verwenden
- SkipGroup(); // ueberlese den Rest
+ pDoc->ChgDBData( aData ); // MS: Keine DBInfo verwenden
+ SkipGroup(); // ueberlese den Rest
}
break;
case RTFFLD_MERGEFLD:
{
// ein Datenbank - Feld: nur der Name interressiert
// bis zum Ende vom String ist das der Feldname
- SwDBFieldType aTmp( pDoc, aSaveStr, SwDBData() ); //
+ SwDBFieldType aTmp( pDoc, aSaveStr, SwDBData() ); //
SwDBField aDBFld( (SwDBFieldType*)pDoc->InsertFldType( aTmp ));
aDBFld.ChangeFormat( UF_STRING );
pDoc->InsertPoolItem(*pPam, SwFmtFld( aDBFld ), 0);
- SkipGroup(); // ueberlese den Rest
+ SkipGroup(); // ueberlese den Rest
}
break;
@@ -632,7 +632,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
if( !IsNewGroup() ) AttrGroupEnd();
SetNewGroup( FALSE );
- SkipGroup(); // ueberlese den Rest
+ SkipGroup(); // ueberlese den Rest
}
break;
@@ -657,8 +657,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
URIHelper::GetMaybeFileHdl() );
break;
- case 'l': case 'L': sMark = sParam; break;
- case 't': case 'T': sFrame = sParam; break;
+ case 'l': case 'L': sMark = sParam; break;
+ case 't': case 'T': sFrame = sParam; break;
}
}
@@ -683,12 +683,12 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
//Translate and apply
switch( aData.nJustificationCode )
{
- case 0: aData.nJustificationCode = 1; break;
- case 1: aData.nJustificationCode = 3; break;
- case 2: aData.nJustificationCode = 4; break;
- case 4: aData.nJustificationCode = 2; break;
-// case 3:
- default: aData.nJustificationCode = 0; break;
+ case 0: aData.nJustificationCode = 1; break;
+ case 1: aData.nJustificationCode = 3; break;
+ case 2: aData.nJustificationCode = 4; break;
+ case 4: aData.nJustificationCode = 2; break;
+// case 3:
+ default: aData.nJustificationCode = 0; break;
}
SwFmtRuby aRuby( aData.sUp );
@@ -774,7 +774,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
pDoc->InsertPoolItem( *pPam, SwFmtFld( aFld ), 0);
}
- SkipGroup(); // ueberlese den Rest
+ SkipGroup(); // ueberlese den Rest
}
break;
@@ -953,16 +953,16 @@ void SwRTFParser::ReadXEField()
}
break;
- case RTF_LINE: cCh = '\n'; goto INSINGLECHAR;
- case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
- case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
- case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
- case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
- case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
- case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
- case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
- case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
- case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
+ case RTF_LINE: cCh = '\n'; goto INSINGLECHAR;
+ case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
+ case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
+ case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
+ case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
+ case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
+ case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
+ case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
+ case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
+ case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
INSINGLECHAR:
sFieldStr += ByteString::ConvertToUnicode( cCh,
RTL_TEXTENCODING_MS_1252 );
@@ -990,7 +990,7 @@ INSINGLECHAR:
}
}
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
@@ -998,7 +998,7 @@ void SwRTFParser::ReadField()
{
bReadSwFly = false; //#it may be that any uses of this need to be removed and replaced
int nRet = 0;
- int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
int bFldInst = FALSE, bFldRslt = FALSE;
String sFieldStr, sFieldNm;
BYTE cCh;
@@ -1149,16 +1149,16 @@ void SwRTFParser::ReadField()
}
break;
- case RTF_LINE: cCh = '\n'; goto INSINGLECHAR;
- case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
- case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
- case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
- case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
- case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
- case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
- case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
- case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
- case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
+ case RTF_LINE: cCh = '\n'; goto INSINGLECHAR;
+ case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
+ case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
+ case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
+ case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
+ case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
+ case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
+ case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
+ case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
+ case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
INSINGLECHAR:
sFieldStr += ByteString::ConvertToUnicode( cCh,
RTL_TEXTENCODING_MS_1252 );
@@ -1169,7 +1169,7 @@ INSINGLECHAR:
sFieldStr += aToken;
break;
- case RTF_PICT: // Pic-Daten einlesen!
+ case RTF_PICT: // Pic-Daten einlesen!
if( RTFFLD_IMPORT == nRet )
{
Graphic aGrf;
@@ -1220,7 +1220,7 @@ INSINGLECHAR:
if (RTFFLD_IMPORT == nRet && sFieldNm.Len())
InsPicture( sFieldNm );
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 3b30757ffb37..26a2c05176ac 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -2,7 +2,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
@@ -77,7 +77,7 @@
using namespace ::com::sun::star;
-#define ANCHOR(p) ((SwFmtAnchor*)p)
+#define ANCHOR(p) ((SwFmtAnchor*)p)
// steht in shellio.hxx
extern SwCntntNode* GoNextNds( SwNodeIndex * pIdx, BOOL bChk );
@@ -245,9 +245,9 @@ void SwRTFParser::SetFlysInDoc()
//JP 21.09.98: wenn ein DropCap ist, dann Text im Node belassen, am
- // Absatz das Absatz Attribut setzen. Ggfs noch die
- // FontSize zuruecksetzen, damit das DropCap nicht zu
- // gro? wird.
+ // Absatz das Absatz Attribut setzen. Ggfs noch die
+ // FontSize zuruecksetzen, damit das DropCap nicht zu
+ // gro? wird.
if( pFlySave->nDropAnchor )
{
SwTxtNode* pSttNd = pFlySave->nSttNd.GetNode().GetTxtNode();
@@ -311,7 +311,7 @@ void SwRTFParser::SetFlysInDoc()
if( pNd->IsNoTxtNode() )
{
// die Size muss noch korrigiert werden!
- nAktPageDesc = 0; // Standart PageDesc
+ nAktPageDesc = 0; // Standart PageDesc
if( SFX_ITEM_SET != pFlySave->aFlySet.GetItemState(
RES_FRM_SIZE, FALSE ) )
_SetPictureSize( *(SwNoTxtNode*)pNd, aRg.aStart,
@@ -459,9 +459,9 @@ void SwRTFParser::SetFlysInDoc()
//JP 02.08.99: that is wrong. The anchor is ever the NEXT!
//JP 05.08.99: there are an Bug in the ExportFilter which will
- // be fixed in the Version 517 - by SWG-Export
- // the fly will be after the paragraph - but in RTF
- // the flys will be before the paragraph.
+ // be fixed in the Version 517 - by SWG-Export
+ // the fly will be after the paragraph - but in RTF
+ // the flys will be before the paragraph.
if( !bSwPageDesc || 5430 < GetVersionNo() )
pFlySave->nSttNd++;
@@ -610,7 +610,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
aSz.SetHeightSizeType( ((SwFmtFrmSize*)pItem)->GetHeightSizeType() );
aSz.SetHeight( ((SwFmtFrmSize*)pItem)->GetHeight() );
}
- if( MINFLY > nTokenValue ) nTokenValue = MINFLY;
+ if( MINFLY > nTokenValue ) nTokenValue = MINFLY;
aSet.Put( aSz );
}
break;
@@ -629,7 +629,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
nTokenValue = -nTokenValue;
aSz.SetHeightSizeType( ATT_FIX_SIZE );
}
- if( MINFLY > nTokenValue ) nTokenValue = MINFLY;
+ if( MINFLY > nTokenValue ) nTokenValue = MINFLY;
aSz.SetHeight( nTokenValue );
aSet.Put( aSz );
}
@@ -644,8 +644,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
{
SvxULSpaceItem aUL( RES_UL_SPACE );
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aUL.SetUpper( nVal ); aUL.SetLower( nVal );
- aLR.SetLeft( nVal ); aLR.SetRight( nVal );
+ aUL.SetUpper( nVal ); aUL.SetLower( nVal );
+ aLR.SetLeft( nVal ); aLR.SetRight( nVal );
pSet->Put( aUL );
pSet->Put( aLR );
}
@@ -654,14 +654,14 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
case RTF_DFRMTXTX:
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetLeft( nVal ); aLR.SetRight( nVal );
+ aLR.SetLeft( nVal ); aLR.SetRight( nVal );
pSet->Put( aLR );
}
break;
case RTF_DFRMTXTY:
{
SvxULSpaceItem aUL( RES_UL_SPACE );
- aUL.SetUpper( nVal ); aUL.SetLower( nVal );
+ aUL.SetUpper( nVal ); aUL.SetLower( nVal );
pSet->Put( aUL );
}
break;
@@ -718,7 +718,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
aFrmDir.SetValue( FRMDIR_VERT_TOP_RIGHT );
break;
- case RTF_DROPCAPLI: // Dropcaps !!
+ case RTF_DROPCAPLI: // Dropcaps !!
if( bChkDropCap )
{
nDropCapLines = USHORT( nTokenValue );
@@ -738,8 +738,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
// fuer die "alten" Writer - haben die Spaltigkeit falsch heraus-
// geschrieben
- case RTF_COLS: nCols = USHORT( nTokenValue ); break;
- case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break;
+ case RTF_COLS: nCols = USHORT( nTokenValue ); break;
+ case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break;
case RTF_COLNO:
nAktCol = USHORT( nTokenValue );
if( RTF_COLW == GetNextToken() )
@@ -748,7 +748,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
if( RTF_COLSR == GetNextToken() )
nSpace = USHORT( nTokenValue );
else
- SkipToken( -1 ); // wieder zurueck
+ SkipToken( -1 ); // wieder zurueck
if( --nAktCol == ( aColumns.Count() / 2 ) )
{
@@ -766,7 +766,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
if( RTF_SHADINGDEF == (nToken & ~0xff) )
{
ReadBackgroundAttr( nToken, aSet );
- GetNextToken(); // Klammer ueberlesen
+ GetNextToken(); // Klammer ueberlesen
}
else
nSkip = -1;
@@ -777,7 +777,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
bReadSwFly = true; // alles kommt in den akt. Fly
SvxLRSpaceItem aLR( RES_LR_SPACE );
SvxULSpaceItem aUL( RES_UL_SPACE );
- nCols = USHRT_MAX; // neu aufsetzen
+ nCols = USHRT_MAX; // neu aufsetzen
nColSpace = USHRT_MAX;
do {
nVal = USHORT(nTokenValue);
@@ -829,10 +829,10 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
aHori.SetRelationOrient( aHO.GetRelation() );
}
break;
- case RTF_FLYOUTLEFT: aLR.SetLeft( nVal ); break;
- case RTF_FLYOUTRIGHT: aLR.SetRight( nVal ); break;
- case RTF_FLYOUTUPPER: aUL.SetUpper( nVal ); break;
- case RTF_FLYOUTLOWER: aUL.SetLower( nVal ); break;
+ case RTF_FLYOUTLEFT: aLR.SetLeft( nVal ); break;
+ case RTF_FLYOUTRIGHT: aLR.SetRight( nVal ); break;
+ case RTF_FLYOUTUPPER: aUL.SetUpper( nVal ); break;
+ case RTF_FLYOUTLOWER: aUL.SetLower( nVal ); break;
case RTF_FLYANCHOR:
switch( GetNextToken() )
{
@@ -853,11 +853,11 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
break;
// JP 26.09.94: die Bindung an die Spalte gibt es nicht mehr !!
-// case RTF_FLY_COLUMN:
+// case RTF_FLY_COLUMN:
}
break;
- case RTF_COLS: nCols = USHORT( nTokenValue ); break;
- case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break;
+ case RTF_COLS: nCols = USHORT( nTokenValue ); break;
+ case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break;
case RTF_COLNO:
nAktCol = USHORT( nTokenValue );
if( RTF_COLW == GetNextToken() )
@@ -866,7 +866,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
if( RTF_COLSR == GetNextToken() )
nSpace = USHORT( nTokenValue );
else
- SkipToken( -1 ); // wieder zurueck
+ SkipToken( -1 ); // wieder zurueck
if( --nAktCol == ( aColumns.Count() / 2 ) )
{
@@ -909,7 +909,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
}
else
SkipGroup();
- GetNextToken(); // Klammer ueberlesen
+ GetNextToken(); // Klammer ueberlesen
break;
}
} while( IsParserWorking() &&
@@ -996,7 +996,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
pSet->Put( aCol );
}
- if( pSet != &aSet ) // wurde der Set uebergeben, dann wars das
+ if( pSet != &aSet ) // wurde der Set uebergeben, dann wars das
return ;
// ein neues FlyFormat anlegen oder das alte benutzen ?
@@ -1062,8 +1062,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
nToken = GetNextToken();
// BUG 22036: kommt zwischen Fly-Attributen ein unbekanntes,
- // dann erzeuge nie 2 FlyFrames, sondern fasse
- // beide zusammen !!!
+ // dann erzeuge nie 2 FlyFrames, sondern fasse
+ // beide zusammen !!!
while( RTF_APOCTL == ( nToken & ~(0xff | RTF_SWGDEFS) ))
{
if( RTF_FLY_INPARA == nToken )
@@ -1113,8 +1113,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
pPam->GetPoint()->nNode == pFlySave->nSttNd &&
!pPam->GetPoint()->nContent.GetIndex() )
{
-// // dann erzeuge mindestens einen leeren TextNode
-// pDoc->AppendTxtNode(*pPam);
+// // dann erzeuge mindestens einen leeren TextNode
+// pDoc->AppendTxtNode(*pPam);
// dann zerstoere den FlySave wieder.
aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
@@ -1295,10 +1295,10 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
}
SwFlyFrmFmt* pFlyFmt = pDoc->Insert( *pPam,
- rGrfNm, aEmptyStr, // Name der Graphic !!
+ rGrfNm, aEmptyStr, // Name der Graphic !!
pGrf,
- &aFlySet, // Attribute fuer den FlyFrm
- pGrfAttrSet, NULL ); // Attribute fuer die Grafik
+ &aFlySet, // Attribute fuer den FlyFrm
+ pGrfAttrSet, NULL ); // Attribute fuer die Grafik
pGrfNd = pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()->
GetIndex()+1 ]->GetGrfNode();
@@ -1321,11 +1321,11 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
{
SwXFrame::GetOrCreateSdrObject( pFlyFmt );
pDoc->SetFlyFrmTitle( *(pFlyFmt), aIt->second );
- }
+ }
++aIt;
}
- }
-
+ }
+
}
if( pGrfAttrSet )
@@ -1391,7 +1391,7 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
}
//JP 8.11.2001: bug 94450 - if no size exist, then the size is set by
- // the swapin of the graphic.
+ // the swapin of the graphic.
SwGrfNode* pGrfNd;
if( !aSize.Width() && !aSize.Height() &&
0 != (pGrfNd = (SwGrfNode*)rNd.GetGrfNode() ) && pGrfNd->IsGrfLink() )
@@ -1504,7 +1504,7 @@ void SwRTFParser::ReadOLEData()
SvxRTFPictureType aPicType, aOleType;
int nToken, bValidOle = TRUE, bWeiter = TRUE;
- int nOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
String* pStr = 0;
String sObjClass, sObjName, sObjData;
@@ -1515,7 +1515,7 @@ void SwRTFParser::ReadOLEData()
USHORT nVal = USHORT( nTokenValue );
switch( nToken )
{
- case '}': --nOpenBrakets; pStr = 0; break;
+ case '}': --nOpenBrakets; pStr = 0; break;
case '{':
{
if( RTF_IGNOREFLAG != GetNextToken() )
@@ -1536,19 +1536,19 @@ void SwRTFParser::ReadOLEData()
break;
case RTF_OBJECT:
- case RTF_OBJEMB: // default ist embedded
- case RTF_LINKSELF: // ??
- case RTF_OBJLOCK: // ??
- case RTF_OBJUPDATE: // ??
- case RTF_OBJTIME: // ??
+ case RTF_OBJEMB: // default ist embedded
+ case RTF_LINKSELF: // ??
+ case RTF_OBJLOCK: // ??
+ case RTF_OBJUPDATE: // ??
+ case RTF_OBJTIME: // ??
case RTF_OBJSETSIZE:
case RTF_OBJALIGN:
case RTF_OBJTRANSY:
case RTF_OBJATTPH:
break;
- case RTF_OBJLINK: // ?? welche Daten sind das ??
- case RTF_OBJAUTLINK: // ?? -""- ??
+ case RTF_OBJLINK: // ?? welche Daten sind das ??
+ case RTF_OBJAUTLINK: // ?? -""- ??
case RTF_OBJSUB:
case RTF_OBJPUB:
case RTF_OBJICEMB:
@@ -1556,7 +1556,7 @@ void SwRTFParser::ReadOLEData()
case RTF_OBJHTML:
case RTF_OBJALIAS:
case RTF_OBJSECT:
- bValidOle = FALSE; // diese Typen koennen wir nicht
+ bValidOle = FALSE; // diese Typen koennen wir nicht
break;
case RTF_OBJCLASS:
@@ -1579,21 +1579,21 @@ void SwRTFParser::ReadOLEData()
bWeiter = FALSE;
}
break;
- case RTF_RSLTBMP: // diese sollten wir ignorieren
+ case RTF_RSLTBMP: // diese sollten wir ignorieren
case RTF_RSLTMERGE:
case RTF_RSLTPICT:
case RTF_RSLTRTF:
case RTF_RSLTTXT:
break;
- case RTF_OBJW: aOleType.nWidth = nVal; break;
- case RTF_OBJH: aOleType.nHeight = nVal; break;
- case RTF_OBJCROPT: aOleType.nCropT = (short)nTokenValue; break;
- case RTF_OBJCROPB: aOleType.nCropB = (short)nTokenValue; break;
- case RTF_OBJCROPL: aOleType.nCropL = (short)nTokenValue; break;
- case RTF_OBJCROPR: aOleType.nCropR = (short)nTokenValue; break;
- case RTF_OBJSCALEX: aOleType.nScalX = nVal; break;
- case RTF_OBJSCALEY: aOleType.nScalY = nVal; break;
+ case RTF_OBJW: aOleType.nWidth = nVal; break;
+ case RTF_OBJH: aOleType.nHeight = nVal; break;
+ case RTF_OBJCROPT: aOleType.nCropT = (short)nTokenValue; break;
+ case RTF_OBJCROPB: aOleType.nCropB = (short)nTokenValue; break;
+ case RTF_OBJCROPL: aOleType.nCropL = (short)nTokenValue; break;
+ case RTF_OBJCROPR: aOleType.nCropR = (short)nTokenValue; break;
+ case RTF_OBJSCALEX: aOleType.nScalX = nVal; break;
+ case RTF_OBJSCALEY: aOleType.nScalY = nVal; break;
case RTF_TEXTTOKEN:
if( 1 < nOpenBrakets && pStr )
@@ -1618,24 +1618,24 @@ void SwRTFParser::ReadOLEData()
if( bValidOle )
{
- bValidOle = FALSE; // erstmal
+ bValidOle = FALSE; // erstmal
}
- if( !bWeiter ) // dann stehen wir noch im Result
+ if( !bWeiter ) // dann stehen wir noch im Result
{
// ist das Ole-Object Ok?
// -> dann solange SkipGroup rufen, bis zur letzten
- // schliessenden Klammer
+ // schliessenden Klammer
// ansonsten alle Token verarbeiten, bis zur letzten
- // schliessenden Klammer
+ // schliessenden Klammer
bWeiter = TRUE;
while( nOpenBrakets && IsParserWorking() && bWeiter )
{
switch( nToken = GetNextToken() )
{
- case '}': --nOpenBrakets; break;
- case '{': ++nOpenBrakets; break;
+ case '}': --nOpenBrakets; break;
+ case '{': ++nOpenBrakets; break;
}
if( nOpenBrakets && !bValidOle )
NextToken( nToken );
@@ -1645,7 +1645,7 @@ void SwRTFParser::ReadOLEData()
if( !bValidOle && '}' != nToken )
SkipGroup();
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
#endif
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 2504997518f4..e00c1df65eb3 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -68,7 +68,7 @@ SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, BYTE nNumLvl )
void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
{
int nToken;
- int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
int nLvlTxtLevel = 0, nLvlNumberLevel = 0;
String sLvlText, sLvlNumber;
SwNumFmt* pCurNumFmt;
@@ -114,9 +114,9 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
// Unknown und alle bekannten nicht ausgewerteten Gruppen
// sofort ueberspringen
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-// RTF_PANOSE != nToken && RTF_FALT != nToken &&
-// RTF_FALT != nToken && RTF_FNAME != nToken &&
-// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
+// RTF_PANOSE != nToken && RTF_FALT != nToken &&
+// RTF_FALT != nToken && RTF_FNAME != nToken &&
+// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
nToken = SkipToken( -2 );
else
{
@@ -136,12 +136,12 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
sal_Int16 eType = SVX_NUM_ARABIC;
switch( nTokenValue )
{
- case 1: eType = SVX_NUM_ROMAN_UPPER; break;
- case 2: eType = SVX_NUM_ROMAN_LOWER; break;
- case 3: eType = SVX_NUM_CHARS_UPPER_LETTER_N; break;
- case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+ case 1: eType = SVX_NUM_ROMAN_UPPER; break;
+ case 2: eType = SVX_NUM_ROMAN_LOWER; break;
+ case 3: eType = SVX_NUM_CHARS_UPPER_LETTER_N; break;
+ case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break;
case 255:
- case 23: eType = SVX_NUM_CHAR_SPECIAL; break;
+ case 23: eType = SVX_NUM_CHAR_SPECIAL; break;
}
if( pCurNumFmt )
pCurNumFmt->SetNumberingType(eType);
@@ -153,8 +153,8 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
SvxAdjust eAdj = SVX_ADJUST_LEFT;
switch( nTokenValue )
{
- case 1: eAdj = SVX_ADJUST_CENTER; break;
- case 2: eAdj = SVX_ADJUST_RIGHT; break;
+ case 1: eAdj = SVX_ADJUST_CENTER; break;
+ case 2: eAdj = SVX_ADJUST_RIGHT; break;
}
if( pCurNumFmt )
pCurNumFmt->SetNumAdjust( eAdj );
@@ -294,7 +294,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
void SwRTFParser::ReadListTable()
{
int nToken;
- int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
bNewNumList = TRUE;
BYTE nNumLvl = 0;
@@ -305,7 +305,7 @@ void SwRTFParser::ReadListTable()
{
switch( ( nToken = GetNextToken() ))
{
- case '}': if( --nNumOpenBrakets && IsParserWorking() )
+ case '}': if( --nNumOpenBrakets && IsParserWorking() )
{
// Style konnte vollstaendig gelesen werden,
// also ist das noch ein stabiler Status
@@ -326,9 +326,9 @@ void SwRTFParser::ReadListTable()
// Unknown und alle bekannten nicht ausgewerteten Gruppen
// sofort ueberspringen
else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-// RTF_PANOSE != nToken && RTF_FALT != nToken &&
-// RTF_FALT != nToken && RTF_FNAME != nToken &&
-// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
+// RTF_PANOSE != nToken && RTF_FALT != nToken &&
+// RTF_FALT != nToken && RTF_FNAME != nToken &&
+// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
nToken = SkipToken( -2 );
else
{
@@ -361,8 +361,8 @@ void SwRTFParser::ReadListTable()
}
break;
- case RTF_LISTID: aEntry.nListId = nTokenValue; break;
- case RTF_LISTTEMPLATEID: aEntry.nListTemplateId = nTokenValue; break;
+ case RTF_LISTID: aEntry.nListId = nTokenValue; break;
+ case RTF_LISTTEMPLATEID: aEntry.nListTemplateId = nTokenValue; break;
case RTF_LISTRESTARTHDN:
break;
@@ -398,7 +398,7 @@ void SwRTFParser::ReadListTable()
if( pCurRule && pCurRule->IsContinusNum() )
lcl_ExpandNumFmts( *pCurRule );
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule )
@@ -413,7 +413,7 @@ BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule )
for( BYTE n = 0; bRet && n < MAXLEVEL; ++n )
{
const SwNumFmt* pOFmt = pOrigRule->GetNumFmt( n ),
- * pFmt = pRule->GetNumFmt( n );
+ * pFmt = pRule->GetNumFmt( n );
if( pFmt && pOFmt )
{
SwCharFmt* pOCFmt = pOFmt->GetCharFmt(),
@@ -443,7 +443,7 @@ BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule )
void SwRTFParser::ReadListOverrideTable()
{
int nToken;
- int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
SwListEntry aEntry;
SwNumRule* pRule = 0, *pOrigRule = 0;
BYTE nNumLvl = 0;
@@ -533,9 +533,9 @@ void SwRTFParser::ReadListOverrideTable()
}
break;
- case RTF_LISTOVERRIDE: aEntry.Clear(); break;
- case RTF_LISTID: aEntry.nListId = nTokenValue; break;
- case RTF_LS: aEntry.nListNo = nTokenValue; break;
+ case RTF_LISTOVERRIDE: aEntry.Clear(); break;
+ case RTF_LISTID: aEntry.nListId = nTokenValue; break;
+ case RTF_LS: aEntry.nListNo = nTokenValue; break;
case RTF_LISTOVERRIDECOUNT:
if( nTokenValue )
{
@@ -662,7 +662,7 @@ void SwRTFParser::ReadListOverrideTable()
} while( 0 != (pStyle = GetStyleTbl().Next()) );
}
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
SwNumRule* SwRTFParser::GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList )
@@ -783,7 +783,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
{
switch( nToken = GetNextToken() )
{
- case RTF_PNLVL: nListNo = 3;
+ case RTF_PNLVL: nListNo = 3;
bContinus = FALSE;
nLevel = MAXLEVEL <= (unsigned long) nTokenValue
? MAXLEVEL - 1
@@ -847,7 +847,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
}
FontUnderline eUnderline;
- int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
+ int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
while( nNumOpenBrakets && IsParserWorking() )
{
switch( ( nToken = GetNextToken() ))
@@ -885,11 +885,11 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
case RTF_PNCARD:
case RTF_PNORD:
case RTF_PNORDT:
- case RTF_PNDEC: pCurNumFmt->SetNumberingType(SVX_NUM_ARABIC); break;
- case RTF_PNUCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); break;
- case RTF_PNUCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_UPPER); break;
- case RTF_PNLCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); break;
- case RTF_PNLCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_LOWER); break;
+ case RTF_PNDEC: pCurNumFmt->SetNumberingType(SVX_NUM_ARABIC); break;
+ case RTF_PNUCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); break;
+ case RTF_PNUCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_UPPER); break;
+ case RTF_PNLCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); break;
+ case RTF_PNLCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_LOWER); break;
case RTF_PNF:
{
@@ -998,9 +998,9 @@ NUMATTR_SETUNDERLINE:
}
break;
- case RTF_PNQC: pCurNumFmt->SetNumAdjust( SVX_ADJUST_CENTER ); break;
- case RTF_PNQL: pCurNumFmt->SetNumAdjust( SVX_ADJUST_LEFT ); break;
- case RTF_PNQR: pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT ); break;
+ case RTF_PNQC: pCurNumFmt->SetNumAdjust( SVX_ADJUST_CENTER ); break;
+ case RTF_PNQL: pCurNumFmt->SetNumAdjust( SVX_ADJUST_LEFT ); break;
+ case RTF_PNQR: pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT ); break;
case RTF_PNSTART:
pCurNumFmt->SetStart( USHORT( nTokenValue ));
@@ -1009,7 +1009,7 @@ NUMATTR_SETUNDERLINE:
case RTF_PNNUMONCE:
case RTF_PNACROSS:
case RTF_PNHANG:
- case RTF_PNRESTART: break;
+ case RTF_PNRESTART: break;
case RTF_PNTXTA:
{
@@ -1070,7 +1070,7 @@ NUMATTR_SETUNDERLINE:
}
}
- SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
+ SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
return pCurRule;
}
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
index d2fa7f37368e..e3b1e644edbb 100644
--- a/sw/source/filter/rtf/rtftbl.cxx
+++ b/sw/source/filter/rtf/rtftbl.cxx
@@ -2,7 +2,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
@@ -145,7 +145,7 @@ void SwRTFParser::ReadTable( int nToken )
if (CantUseTables())
{
// alle Tabellen-Tokens ueberlesen
- nToken = GetNextToken(); // RTF_TROWD ueberlesen
+ nToken = GetNextToken(); // RTF_TROWD ueberlesen
do {
if( RTF_TABLEDEF != (nToken & ~(0xff | RTF_SWGDEFS)) &&
RTF_UNKNOWNCONTROL != nToken )
@@ -175,7 +175,7 @@ void SwRTFParser::ReadTable( int nToken )
if( RTF_TROWD == nToken || !pTableNode )
{
if( RTF_TROWD == nToken )
- nToken = GetNextToken(); // RTF_TROWD ueberlesen
+ nToken = GetNextToken(); // RTF_TROWD ueberlesen
// Flags fuer die gemergten Boxen loeschen
aMergeBoxes.Remove( 0, aMergeBoxes.Count() );
@@ -458,7 +458,7 @@ void SwRTFParser::ReadTable( int nToken )
case RTF_CLTXLRTB:
case RTF_CLTXTBRL:
- case RTF_INTBL: // das wissen wir !
+ case RTF_INTBL: // das wissen wir !
case RTF_CLMGF:
case RTF_CLVMGF:
case RTF_CLVMRG:
@@ -529,7 +529,7 @@ void SwRTFParser::ReadTable( int nToken )
int nC = aMergeBackup.Count();
for (USHORT i = 0; i < nC; ++i)
aMergeBoxes.Insert(aMergeBackup[i], i);
- SkipToken( -1 ); // zum Letzen gueltigen zurueck
+ SkipToken( -1 ); // zum Letzen gueltigen zurueck
return;
}
@@ -635,9 +635,9 @@ void SwRTFParser::ReadTable( int nToken )
}
aBoxFmts.Remove( 0, n );
- if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden
+ if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden
nAktBox = n;
- else // es mussen noch Boxen geloescht werden
+ else // es mussen noch Boxen geloescht werden
{
// remove ContentIndex of other Bound
pPam->SetMark(); pPam->DeleteMark();
@@ -727,7 +727,7 @@ void SwRTFParser::ReadTable( int nToken )
}
else
{
- SkipToken( -1 ); // zum Letzen gueltigen zurueck
+ SkipToken( -1 ); // zum Letzen gueltigen zurueck
return;
}
@@ -832,7 +832,7 @@ void SwRTFParser::ReadTable( int nToken )
OSL_ENSURE(!bFailure, "RTF Table failure");
if (bFailure)
{
- SkipToken( -1 ); // zum Letzen gueltigen zurueck
+ SkipToken( -1 ); // zum Letzen gueltigen zurueck
return;
}
@@ -867,7 +867,7 @@ void SwRTFParser::ReadTable( int nToken )
pStk->MoveFullNode(aOldPos, aNewPos);
}
}
- SkipToken( -1 ); // zum Letzen gueltigen zurueck
+ SkipToken( -1 ); // zum Letzen gueltigen zurueck
}
// in die naechste Box dieser Line (opt.: falls es nicht die letzte ist)
@@ -945,7 +945,7 @@ void SwRTFParser::NewTblLine()
if( !bMakeCopy &&
64000 < pTableNode->GetTable().GetTabSortBoxes().Count() )
{
- bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen!
+ bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen!
}
if( bMakeCopy )
@@ -964,7 +964,7 @@ void SwRTFParser::NewTblLine()
pLns = &pTableNode->GetTable().GetTabLines();
}
else
-// pDoc->InsertRow( aBoxes );
+// pDoc->InsertRow( aBoxes );
pTableNode->GetTable().AppendRow( pDoc );
pBox = (*pLns)[ pLns->Count()-1 ]->GetTabBoxes()[0];
@@ -1018,8 +1018,8 @@ void SwRTFParser::CheckInsNewTblLine()
{
if( nInsTblRow > GetOpenBrakets() || IsPardTokenRead() )
nInsTblRow = USHRT_MAX;
- else if( !pTableNode ) // Tabelle nicht mehr vorhanden ?
- NewTblLine(); // evt. Line copieren
+ else if( !pTableNode ) // Tabelle nicht mehr vorhanden ?
+ NewTblLine(); // evt. Line copieren
}
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index e0aeb4e45594..63e7e1be2011 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -2,7 +2,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
@@ -1881,7 +1881,7 @@ void SwRTFParser::NextToken( int nToken )
case RTF_REVDTTM:
if (pRedlineInsert != NULL)
pRedlineInsert->aStamp = sw::ms::DTTM2DateTime(nTokenValue);
-
+
break;
case RTF_REVDTTMDEL:
@@ -2737,7 +2737,7 @@ void SwRTFParser::MakeStyleTab()
const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
for( USHORT n = rColls.Count(); n; )
//if( MAXLEVEL > (nLvl = rColls[ --n ]->GetOutlineLevel() ))//#outline level,zhaojianwei
- // nValidOutlineLevels |= 1 << nLvl;
+ // nValidOutlineLevels |= 1 << nLvl;
if( rColls[ --n ]->IsAssignedToListLevelOfOutlineStyle())
nValidOutlineLevels |= 1 << rColls[ n ]->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
}
@@ -3918,11 +3918,11 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
if( !nPos )
{
pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
- //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
- if(nOutlineLevel < MAXLEVEL ) //->add by zhaojianwei
+ //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
+ if(nOutlineLevel < MAXLEVEL ) //->add by zhaojianwei
pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
else
- pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei
+ pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei
return pColl;
}
@@ -3946,11 +3946,11 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
if (!rbCollExist)
{
- //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
- if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei
+ //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
+ if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei
pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
else
- pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei
+ pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei
}
return pColl;
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index c6bd7bdbc44c..b995d4dedbbd 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -2,7 +2,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
@@ -90,7 +90,7 @@ class SwNodeIdx : public SvxNodeIdx
SwNodeIndex aIdx;
public:
SwNodeIdx( const SwNodeIndex& rIdx ) : aIdx( rIdx ) {}
- virtual ULONG GetIdx() const;
+ virtual ULONG GetIdx() const;
virtual SvxNodeIdx* Clone() const;
};
@@ -113,9 +113,9 @@ class SwxPosition : public SvxPosition
{
SwPaM* pPam;
public:
- SwxPosition( SwPaM* pCrsr ) : pPam( pCrsr ) {}
+ SwxPosition( SwPaM* pCrsr ) : pPam( pCrsr ) {}
- virtual ULONG GetNodeIdx() const;
+ virtual ULONG GetNodeIdx() const;
virtual xub_StrLen GetCntIdx() const;
// erzeuge von sich selbst eine Kopie
@@ -128,11 +128,11 @@ public:
// zum zwischenspeichern der Flys:
struct SwFlySave
{
- SfxItemSet aFlySet;
- SwNodeIndex nSttNd, nEndNd;
- xub_StrLen nEndCnt;
- SwTwips nPageWidth;
- USHORT nDropLines, nDropAnchor;
+ SfxItemSet aFlySet;
+ SwNodeIndex nSttNd, nEndNd;
+ xub_StrLen nEndCnt;
+ SwTwips nPageWidth;
+ USHORT nDropLines, nDropAnchor;
SwFlySave( const SwPaM& rPam, SfxItemSet& rSet );
int IsEqualFly( const SwPaM& rPos, SfxItemSet& rSet );
@@ -301,8 +301,8 @@ class SwRTFParser : public SvxRTFParser
sw::util::InsertedTablesManager maInsertedTables;
SwRTFStyleTbl aTxtCollTbl;
SwRTFCharStyleTbl aCharFmtTbl;
- SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen
- SvBools aMergeBoxes; // Flags fuer gemergte Zellen
+ SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen
+ SvBools aMergeBoxes; // Flags fuer gemergte Zellen
SwListArr aListArr;
SvPtrarr aTblFmts;
SvPtrarr aRubyCharFmts;
@@ -314,9 +314,9 @@ class SwRTFParser : public SvxRTFParser
SwTableNode* pTableNode, *pOldTblNd; // fuers Lesen von Tabellen: akt. Tab
SwNodeIndex* pSttNdIdx;
SwNodeIndex* pRegionEndIdx;
- SwDoc* pDoc;
- SwPaM* pPam; // SwPosition duerfte doch reichen, oder ??
- SwRelNumRuleSpaces* pRelNumRule; // Liste aller benannten NumRules
+ SwDoc* pDoc;
+ SwPaM* pPam; // SwPosition duerfte doch reichen, oder ??
+ SwRelNumRuleSpaces* pRelNumRule; // Liste aller benannten NumRules
String sNestedFieldStr;
SwFltRedline *pRedlineInsert;
@@ -325,29 +325,29 @@ class SwRTFParser : public SvxRTFParser
String sBaseURL;
USHORT nAktPageDesc, nAktFirstPageDesc;
- USHORT nAktBox; // akt. Box
- USHORT nInsTblRow; // beim nach \row kein \pard -> neue Line anlegen
- USHORT nNewNumSectDef; // jeder SectionWechsel kann neue Rules definieren
+ USHORT nAktBox; // akt. Box
+ USHORT nInsTblRow; // beim nach \row kein \pard -> neue Line anlegen
+ USHORT nNewNumSectDef; // jeder SectionWechsel kann neue Rules definieren
USHORT nRowsToRepeat;
bool bSwPageDesc;
- bool bReadSwFly; // lese Swg-Fly (wichtig fuer Bitmaps!)
+ bool bReadSwFly; // lese Swg-Fly (wichtig fuer Bitmaps!)
// --> OD 2008-12-22 #i83368#
bool mbReadCellWhileReadSwFly;
// <--
- bool mbReadNoTbl; // verhinder Tabelle in Tabelle/FootNote
+ bool mbReadNoTbl; // verhinder Tabelle in Tabelle/FootNote
bool mbIsFootnote;
- bool bFootnoteAutoNum; // automatische Numerierung ?
- bool bStyleTabValid; // Styles schon erzeugt ?
- bool bInPgDscTbl; // beim PageDescTbl lesen
- bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen
- bool bFirstContinue; // 1.Call ins Continue
+ bool bFootnoteAutoNum; // automatische Numerierung ?
+ bool bStyleTabValid; // Styles schon erzeugt ?
+ bool bInPgDscTbl; // beim PageDescTbl lesen
+ bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen
+ bool bFirstContinue; // 1.Call ins Continue
bool bContainsPara; // If there is no paragraph in the section
bool bContainsTablePara; // If there is an table in this section
bool bForceNewTable; // Forces a beginning of a new table
bool bNestedField;
bool bTrowdRead; // True, iff an \trowd definition was read after the last \row
-
+
int nReadFlyDepth;
int nZOrder;
@@ -412,13 +412,13 @@ class SwRTFParser : public SvxRTFParser
SfxItemSet& rSet, const SvxRTFPictureType* = 0 );
void SetFlysInDoc();
- void GetPageSize( Size& rSize ); // Groesse der PagePrintArea
+ void GetPageSize( Size& rSize ); // Groesse der PagePrintArea
// fuers Einlesen von Tabellen
void GotoNextBox();
void NewTblLine();
- void DelLastNode(); // loesche den letzten Node (Tabelle/Fly/Ftn/..)
+ void DelLastNode(); // loesche den letzten Node (Tabelle/Fly/Ftn/..)
void AddNumRule( SwNumRule* pRule );
void SetNumRelSpaces();
@@ -432,12 +432,12 @@ protected:
// wird fuer jedes Token gerufen, das in CallParser erkannt wird
virtual void NextToken( int nToken );
-// virtual void ReadUnknownData();
+// virtual void ReadUnknownData();
virtual void ReadBitmapData();
#ifdef READ_OLE_OBJECT
virtual void ReadOLEData();
#endif
- virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
+ virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
virtual bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const;
// fuer Tokens, die im ReadAttr nicht ausgewertet werden
virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet );
@@ -468,12 +468,12 @@ public:
const String& rBaseURL,
int bReadNewDoc = TRUE );
- virtual SvParserState CallParser(); // Aufruf des Parsers
+ virtual SvParserState CallParser(); // Aufruf des Parsers
virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const;
// fuers asynchrone lesen aus dem SvStream
-// virtual void SaveState( int nToken );
-// virtual void RestoreState();
+// virtual void SaveState( int nToken );
+// virtual void RestoreState();
virtual void Continue( int nToken );
};
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index aa68e4f25d7f..a2cce0c8e7da 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -2,7 +2,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
@@ -194,8 +194,8 @@ BOOL Writer::CopyNextPam( SwPaM ** ppPam )
{
if( (*ppPam)->GetNext() == pOrigPam )
{
- *ppPam = pOrigPam; // wieder auf den Anfangs-Pam setzen
- return FALSE; // Ende vom Ring
+ *ppPam = pOrigPam; // wieder auf den Anfangs-Pam setzen
+ return FALSE; // Ende vom Ring
}
// ansonsten kopiere den die Werte aus dem naechsten Pam
@@ -262,7 +262,7 @@ void Writer::SetStream(SvStream *const pStream)
SvStream& Writer::OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen )
-{ // in einen Stream aus
+{ // in einen Stream aus
// Pointer an das Bufferende setzen
sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
for( BYTE n = 0; n < nLen; ++n )
@@ -357,15 +357,15 @@ ULONG Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const St
BOOL Writer::CopyLocalFileToINet( String& rFileNm )
{
- if( !pOrigFileName ) // can be happen, by example if we
+ if( !pOrigFileName ) // can be happen, by example if we
return FALSE; // write into the clipboard
BOOL bRet = FALSE;
INetURLObject aFileUrl( rFileNm ), aTargetUrl( *pOrigFileName );
// JP 01.11.00: what is the correct question for the portal??
-// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() )
-// return bRet;
+// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() )
+// return bRet;
// this is our old without the Mail-Export
if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() &&
INET_PROT_FILE != aTargetUrl.GetProtocol() &&
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 171d5d39bc11..dc2f9c20f553 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index b154452bd39c..58e3cbde1b3c 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ sal_Int16 SwWriteTableCell::GetVertOri() const
{
const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
const SfxPoolItem *pItem;
- if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, FALSE, &pItem ) )
{
sal_Int16 eBoxVertOri =
((const SwFmtVertOrient *)pItem)->GetVertOrient();
@@ -611,7 +611,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
SwWriteTableRow *pRow = aRows[nOldRow];
SwWriteTableRow *pEndRow = aRows[nRow];
-// if( nLine==0 && nParentLineHeight==0 )
+// if( nLine==0 && nParentLineHeight==0 )
if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 )
nHeadEndRow = nRow;
@@ -744,16 +744,16 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
pEndRow->nBottomBorder = nBottomBorder;
}
}
-// MIB: 13.12.2000: Why should a cell that contains a subtable
-// not have borders? Moreover, switching them, off switches off
-// the fill border lines between the columns and rows. (#74222#)
-// else
-// {
-// aCols[nOldCol]->bLeftBorder = FALSE;
-// aCols[nCol]->bRightBorder = FALSE;
-// pRow->bTopBorder = FALSE;
-// pEndRow->bBottomBorder = FALSE;
-// }
+// MIB: 13.12.2000: Why should a cell that contains a subtable
+// not have borders? Moreover, switching them, off switches off
+// the fill border lines between the columns and rows. (#74222#)
+// else
+// {
+// aCols[nOldCol]->bLeftBorder = FALSE;
+// aCols[nCol]->bRightBorder = FALSE;
+// pRow->bTopBorder = FALSE;
+// pEndRow->bBottomBorder = FALSE;
+// }
}
else
{
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index cd032117b56c..c233e7a852cb 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -60,15 +60,15 @@
#include <doc.hxx>
#include <ndtxt.hxx>
#include <frmatr.hxx>
-#include <fldbas.hxx> // RES_SETEXPFLD
-#include <charatr.hxx> // class SwFmtRefMark
-#include <swtable.hxx> // class SwTableLines, ...
+#include <fldbas.hxx> // RES_SETEXPFLD
+#include <charatr.hxx> // class SwFmtRefMark
+#include <swtable.hxx> // class SwTableLines, ...
#include <tox.hxx>
-#include <expfld.hxx> // SwExpField
-#include <section.hxx> // class SwSection
-#include <tblsel.hxx> // class SwSelBoxes
+#include <expfld.hxx> // SwExpField
+#include <section.hxx> // class SwSection
+#include <tblsel.hxx> // class SwSelBoxes
#include <pagedesc.hxx>
-#include <docsh.hxx> // class SwDocSh
+#include <docsh.hxx> // class SwDocSh
#include <fltshell.hxx>
#include <viewsh.hxx>
#include <shellres.hxx>
@@ -98,10 +98,10 @@ SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt )
{
// Anfang vom Bereich merken
nMkCntnt = rStartPos.nContent.GetIndex();
- pAttr = pHt; // speicher eine Kopie vom Attribut
- bOld = FALSE; // used for marking Attributes *before* skipping field results
- bLocked = TRUE; // locke das Attribut --> darf erst
- bCopied = FALSE; // gesetzt werden, wenn es wieder geunlocked ist
+ pAttr = pHt; // speicher eine Kopie vom Attribut
+ bOld = FALSE; // used for marking Attributes *before* skipping field results
+ bLocked = TRUE; // locke das Attribut --> darf erst
+ bCopied = FALSE; // gesetzt werden, wenn es wieder geunlocked ist
bConsumedByField = FALSE;
}
@@ -109,10 +109,10 @@ SwFltStackEntry::SwFltStackEntry(const SwFltStackEntry& rEntry) :
nMkNode(rEntry.nMkNode),
nPtNode(rEntry.nPtNode)
{
- pAttr = rEntry.pAttr->Clone();
+ pAttr = rEntry.pAttr->Clone();
nMkCntnt= rEntry.nMkCntnt;
- bOld = rEntry.bOld;
- bLocked = bCopied = TRUE; // when rEntry were NOT bLocked we would never have been called
+ bOld = rEntry.bOld;
+ bLocked = bCopied = TRUE; // when rEntry were NOT bLocked we would never have been called
bConsumedByField = rEntry.bConsumedByField;
}
@@ -131,7 +131,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
// Cursor-Position auch der Bereich vom Attribut weiter
// verschoben wird.
// Das ist aber nicht das gewollte!
- bLocked = FALSE; // freigeben und das ENDE merken
+ bLocked = FALSE; // freigeben und das ENDE merken
nPtNode = rEndPos.nNode.GetIndex()-1;
nPtCntnt = rEndPos.nContent.GetIndex();
}
@@ -262,7 +262,7 @@ void SwFltControlStack::StealAttr(const SwPosition* pPos, USHORT nAttrId /* = 0
pEntry = (*this)[ nCnt ];
if (pEntry->nPtNode.GetIndex()+1 == pPos->nNode.GetIndex() &&
(!nAttrId || nAttrId == pEntry->pAttr->Which()))
- DeleteAndDestroy(nCnt); // loesche aus dem Stack
+ DeleteAndDestroy(nCnt); // loesche aus dem Stack
}
}
@@ -320,7 +320,7 @@ void SwFltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId,
if (!nAttrId ){
bF = true;
}else if( nAttrId == pEntry->pAttr->Which()){
- if( nAttrId != RES_FLTR_BOOKMARK ){ // Handle abfragen
+ if( nAttrId != RES_FLTR_BOOKMARK ){ // Handle abfragen
bF = true;
}else if( nHand == ((SwFltBookmark*)(pEntry->pAttr))->GetHandle() )
{
@@ -345,8 +345,8 @@ void SwFltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId,
continue;
}
SetAttrInDoc(rPos, pEntry);
- DeleteAndDestroy(i); // loesche aus dem Stack
- i--; nCnt--; // Danach rutschen alle folgenden nach unten
+ DeleteAndDestroy(i); // loesche aus dem Stack
+ i--; nCnt--; // Danach rutschen alle folgenden nach unten
}
}
@@ -370,13 +370,13 @@ static void MakeBookRegionOrPoint(SwFltStackEntry* pEntry, SwDoc* pDoc,
{
if (pEntry->MakeRegion(pDoc, rRegion, bCheck )){
const SwNodes& rNds = pDoc->GetNodes();
-// BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
-// const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode();
-// const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode();
+// BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
+// const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode();
+// const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode();
if( rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode()
!= rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode() ){
- rRegion.Exchange(); // Ungueltiger Bereich
- rRegion.DeleteMark(); // -> beide auf Mark
+ rRegion.Exchange(); // Ungueltiger Bereich
+ rRegion.DeleteMark(); // -> beide auf Mark
}
}else{
MakePoint(pEntry, pDoc, rRegion);
@@ -394,24 +394,24 @@ extern BOOL CheckNodesRange( const SwNodeIndex& rStt,
// rNds sind die Doc-Nodes
// rEnd ist Bereichs-Ende,
// rTmpStart ist ReinRaus-Parameter: Anfang des zu untersuchenden Bereiches rein,
-// Anfang des gueltigen Bereichs raus
+// Anfang des gueltigen Bereichs raus
// rTmpEnd ist raus-Parameter
// Return-Bool ist TRUE fuer gueltigen Bereich
static BOOL IterateNumrulePiece( const SwNodeIndex& rEnd,
SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd )
{
while( ( rTmpStart <= rEnd )
- && !( rTmpStart.GetNode().IsTxtNode() ) ) // suche gueltigen Anfang
+ && !( rTmpStart.GetNode().IsTxtNode() ) ) // suche gueltigen Anfang
rTmpStart++;
rTmpEnd = rTmpStart;
while( ( rTmpEnd <= rEnd )
- && ( rTmpEnd.GetNode().IsTxtNode() ) ) // suche gueltiges Ende + 1
+ && ( rTmpEnd.GetNode().IsTxtNode() ) ) // suche gueltiges Ende + 1
rTmpEnd++;
- rTmpEnd--; // gueltiges Ende
+ rTmpEnd--; // gueltiges Ende
- return rTmpStart <= rTmpEnd; // gueltig ?
+ return rTmpStart <= rTmpEnd; // gueltig ?
}
void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* pEntry)
@@ -445,7 +445,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
break;
case RES_TXTATR_TOXMARK:
break;
- case RES_FLTR_NUMRULE: // Numrule 'reinsetzen
+ case RES_FLTR_NUMRULE: // Numrule 'reinsetzen
{
const String& rNumNm = ((SfxStringItem*)pEntry->pAttr)->GetValue();
SwNumRule* pRul = pDoc->FindNumRulePtr( rNumNm );
@@ -476,7 +476,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
break;
case RES_FLTR_NUMRULE_NUM:
break;
- case RES_FLTR_BOOKMARK: // eigentlich nur fuer den Ende-Stack
+ case RES_FLTR_BOOKMARK: // eigentlich nur fuer den Ende-Stack
{
SwFltBookmark* pB = (SwFltBookmark*)pEntry->pAttr;
const String& rName = ((SwFltBookmark*)pEntry->pAttr)->GetName();
@@ -493,7 +493,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
{
SwFieldType* pFT = pDoc->GetFldType(RES_SETEXPFLD, rName, false);
if (!pFT)
- { // FieldType anlegen
+ { // FieldType anlegen
SwSetExpFieldType aS(pDoc, rName, nsSwGetSetExpType::GSE_STRING);
pFT = pDoc->InsertFldType(aS);
}
@@ -558,7 +558,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
}
break;
case RES_FLTR_SECTION:
- MakePoint(pEntry, pDoc, aRegion); // bislang immer Point==Mark
+ MakePoint(pEntry, pDoc, aRegion); // bislang immer Point==Mark
pDoc->InsertSwSection(aRegion,
*(static_cast<SwFltSection*>(pEntry->pAttr))->GetSectionData(),
0, 0, false);
@@ -619,7 +619,7 @@ SfxPoolItem* SwFltControlStack::GetFmtStackAttr(USHORT nWhich, USHORT * pPos)
{
if (pPos)
*pPos = nSize;
- return (SfxPoolItem*)pEntry->pAttr; // Ok, dann Ende
+ return (SfxPoolItem*)pEntry->pAttr; // Ok, dann Ende
}
}
return 0;
@@ -632,10 +632,10 @@ const SfxPoolItem* SwFltControlStack::GetFmtAttr(const SwPosition& rPos, USHORT
return (const SfxPoolItem*)pHt;
// im Stack ist das Attribut nicht vorhanden, also befrage das Dokument
-// SwCntntNode * pNd = rPaM.GetCntntNode();
+// SwCntntNode * pNd = rPaM.GetCntntNode();
SwCntntNode * pNd = pDoc->GetNodes()[ rPos.nNode ]->GetCntntNode();
- if (!pNd) // kein ContentNode, dann das dflt. Attribut
+ if (!pNd) // kein ContentNode, dann das dflt. Attribut
return &pDoc->GetAttrPool().GetDefaultItem(nWhich);
return &pNd->GetAttr(nWhich);
}
@@ -916,7 +916,7 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN
pOutDoc = new SwFltOutDoc( *pDoc, pPaM, aStack, aEndStack );
pOut = pOutDoc;
- if( !bNewDoc ){ // in ein Dokument einfuegen ?
+ if( !bNewDoc ){ // in ein Dokument einfuegen ?
// Da immer ganze Zeile eingelesen werden, muessen
// evtl. Zeilen eingefuegt / aufgebrochen werden
const SwPosition* pPos = pPaM->GetPoint();
@@ -924,10 +924,10 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN
USHORT nCntPos = pPos->nContent.GetIndex();
if( nCntPos && pSttNd->GetTxt().Len() )
// EinfuegePos nicht in leerer Zeile
- pDoc->SplitNode( *pPos, false ); // neue Zeile erzeugen
- if( pSttNd->GetTxt().Len() ){ // EinfuegePos nicht am Ende der Zeile
- pDoc->SplitNode( *pPos, false ); // neue Zeile
- pPaM->Move( fnMoveBackward ); // gehe in leere Zeile
+ pDoc->SplitNode( *pPos, false ); // neue Zeile erzeugen
+ if( pSttNd->GetTxt().Len() ){ // EinfuegePos nicht am Ende der Zeile
+ pDoc->SplitNode( *pPos, false ); // neue Zeile
+ pPaM->Move( fnMoveBackward ); // gehe in leere Zeile
}
// verhinder das Einlesen von Tabellen in Fussnoten / Tabellen
@@ -939,7 +939,7 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN
pOutDoc->SetReadNoTable();
}
pCurrentPageDesc = &((SwPageDesc&)const_cast<const SwDoc *>(pDoc)
- ->GetPageDesc( 0 )); // Standard
+ ->GetPageDesc( 0 )); // Standard
}
@@ -949,7 +949,7 @@ SwFltShell::~SwFltShell()
if (eSubMode == Style)
EndStyle();
- if( pOutDoc->IsInTable() ) // falls nicht ordentlich abgeschlossen
+ if( pOutDoc->IsInTable() ) // falls nicht ordentlich abgeschlossen
EndTable();
if( pOutDoc->IsInFly() )
EndFly();
@@ -972,7 +972,7 @@ SwFltShell::~SwFltShell()
const SwNode* pEndNd = &rDoc.GetNodes().GetEndOfContent();
SwNodeIndex aEndIdx( *pEndNd, -1L );
const SwStartNode* pSttNd = pEndNd->StartOfSectionNode();
- SwNodeIndex aSttIdx( *pSttNd, 1L ); // +1 -> hinter StartNode
+ SwNodeIndex aSttIdx( *pSttNd, 1L ); // +1 -> hinter StartNode
// Section einfuegen
// Section einfuegen
rDoc.GetNodes().InsertTextSection(
@@ -989,7 +989,7 @@ SwFltShell::~SwFltShell()
GetDoc().ChgPageDesc( 0,
const_cast<const SwDoc &>(GetDoc()).
- GetPageDesc( 0 )); // PageDesc "Standard"
+ GetPageDesc( 0 )); // PageDesc "Standard"
for (i=nPageDescOffset;i<GetDoc().GetPageDescCnt();i++)
{
const SwPageDesc& rPD = const_cast<const SwDoc &>(GetDoc()).
@@ -1027,7 +1027,7 @@ String SwFltShell::QuoteStr( const String& rIn )
switch( sOut.GetChar( n ) )
{
case 0x0a:
- sOut.Erase( n, 1 ); // 0xd 0xa wird zu \n
+ sOut.Erase( n, 1 ); // 0xd 0xa wird zu \n
break;
case 0x0b:
@@ -1208,9 +1208,9 @@ const SfxPoolItem& SwFltOutDoc::GetNodeOrStyAttr(USHORT nWhich)
{
SwCntntNode * pNd = GetDoc().GetNodes()[ pPaM->GetPoint()->nNode ]
->GetCntntNode();
- if (pNd) // ContentNode: Attribut mit Parent
+ if (pNd) // ContentNode: Attribut mit Parent
return pNd->GetAttr(nWhich);
- else // kein ContentNode, dann das dflt. Attribut
+ else // kein ContentNode, dann das dflt. Attribut
return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
}
@@ -1375,7 +1375,7 @@ BOOL SwFltOutDoc::BeginTable()
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
*pTabSavedPos, 1, 1, text::HoriOrientation::LEFT, 0, 0, FALSE, FALSE ); // TODO MULTIHEADER
nTableWidth = 0;
- ((SwTable*)pTable)->LockModify(); // Nichts automatisch anpassen!
+ ((SwTable*)pTable)->LockModify(); // Nichts automatisch anpassen!
// set pam in 1. table cell
usTableX =
usTableY = 0;
@@ -1389,7 +1389,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */)
OSL_ENSURE(pTable, "GetBox ohne Tabelle");
return 0;
}
- if( nx == USHRT_MAX ) // aktuelle Zelle
+ if( nx == USHRT_MAX ) // aktuelle Zelle
nx = usTableX;
// get structs to table cells
@@ -1398,7 +1398,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */)
OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableLines");
return 0;
}
- if( ny >= pTableLines->Count() ){ // Notbremse
+ if( ny >= pTableLines->Count() ){ // Notbremse
OSL_ENSURE( FALSE, "SwFltOutDoc:GetBox:ny >= Count()");
ny = pTableLines->Count() - 1;
}
@@ -1412,7 +1412,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */)
OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableBoxes");
return 0;
}
- if( nx >= pTableBoxes->Count() ){ // Notbremse
+ if( nx >= pTableBoxes->Count() ){ // Notbremse
OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:nx >= Count()");
nx = pTableBoxes->Count() - 1;
}
@@ -1476,7 +1476,7 @@ void SwFltOutDoc::SetTableWidth(SwTwips nSwWidth)
}
OSL_ENSURE( nSwWidth > MINLAY, "Tabellenbreite <= MINLAY" );
if( nSwWidth != nTableWidth ){
- if( nTableWidth ) // Nicht beim ersten Setzen
+ if( nTableWidth ) // Nicht beim ersten Setzen
SplitTable();
pTable->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE, nSwWidth));
nTableWidth = nSwWidth;
@@ -1614,10 +1614,10 @@ void SwFltOutDoc::EndTable()
pTableNode->MakeFrms(&pPaM->GetPoint()->nNode);
}
- *pPaM->GetPoint() = *pTabSavedPos; // restore Cursor
+ *pPaM->GetPoint() = *pTabSavedPos; // restore Cursor
delete pTabSavedPos;
pTabSavedPos = 0;
- ((SwTable*)pTable)->UnlockModify(); // Test, nuetzt nichts gegen Assert
+ ((SwTable*)pTable)->UnlockModify(); // Test, nuetzt nichts gegen Assert
pTable = 0;
nTableWidth = 0;
}
@@ -1674,7 +1674,7 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
SwFmtFrmSize aSz( ATT_VAR_SIZE, MINFLY, MINFLY );
// Default: Breite 100% ( = PMW:Auto )
- aSz.SetWidthPercent( 100 ); // Hoehe: Auto
+ aSz.SetWidthPercent( 100 ); // Hoehe: Auto
p->Put( aSz );
p->Put( SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::FRAME ));
return p;
@@ -1692,7 +1692,7 @@ BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
OSL_ENSURE(!pMoreAttrs, "SwFltOutBase:BeginFly mit pMoreAttrs" );
#endif
eFlyAnchor = eAnchor;
- bFlyAbsPos = bAbsolutePos; // Bloedsinn eigentlich
+ bFlyAbsPos = bAbsolutePos; // Bloedsinn eigentlich
return TRUE;
}
@@ -1748,7 +1748,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
// create Fly:
- OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // rekursiv geht noch nicht
+ OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // rekursiv geht noch nicht
pFlySavedPos = new SwPosition(*pPaM->GetPoint());
@@ -1759,9 +1759,9 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
pSet->Put(*pMoreAttrs);
// dieses NICHT bei Seitengebundenem Fly mit Seiten-NUMMER !
- aAnchor.SetAnchor(pPaM->GetPoint()); // braucht erstaunlicherweise
+ aAnchor.SetAnchor(pPaM->GetPoint()); // braucht erstaunlicherweise
// den Stack nicht
-// aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) );
+// aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) );
pSet->Put( aAnchor );
SwFrmFmt* pF = MakeFly( eAnchor, pSet );
@@ -1808,7 +1808,7 @@ void SwFltOutDoc::EndFly()
rStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
- *pPaM->GetPoint() = *pFlySavedPos; // restore Cursor
+ *pPaM->GetPoint() = *pFlySavedPos; // restore Cursor
delete pFlySavedPos;
pFlySavedPos = 0;
SwFltOutBase::EndFly();
@@ -1826,7 +1826,7 @@ void SwFltOutDoc::EndFly()
/*virtual*/ void SwFltFormatCollection::SetFlyFrmAttr(const SfxPoolItem& rAttr)
{
if (!pFlyAttrs)
- pFlyAttrs = new SfxItemSet( GetDoc().GetAttrPool(),
+ pFlyAttrs = new SfxItemSet( GetDoc().GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
pFlyAttrs->Put( rAttr );
}
@@ -1850,7 +1850,7 @@ BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
return TRUE;
}
-void SwFltFormatCollection::EndFly() // Wird nie aufgerufen
+void SwFltFormatCollection::EndFly() // Wird nie aufgerufen
{
}
@@ -1904,7 +1904,7 @@ void SwFltShell::EndFly()
OSL_ENSURE(FALSE, "EndFly ohne Fly");
return;
}
- if (pOutDoc->IsInTable()){ // Table verschraenkt mit Fly macht keinen Sinn
+ if (pOutDoc->IsInTable()){ // Table verschraenkt mit Fly macht keinen Sinn
OSL_ENSURE(FALSE, "EndFly in Table ( verschraenkt )");
EndTable(); // -> Table beenden
}
@@ -1918,7 +1918,7 @@ void SwFltShell::EndFly()
void SwFltShell::BeginFootnote()
{
- if( pOut->IsInFly() ){ // Passiert z.B. bei Fussnote in Fly
+ if( pOut->IsInFly() ){ // Passiert z.B. bei Fussnote in Fly
OSL_ENSURE(FALSE, "Fussnote in Fly nicht erlaubt");
return;
}
@@ -1930,8 +1930,8 @@ void SwFltShell::BeginFootnote()
// Alle Attribute schliessen, da sonst Attribute entstehen koennen,
// die in Fussnoten reinragen
aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
+// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
+// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
// Fussnoten im PMW uebernommen werden
SwFmtFtn aFtn;
@@ -1942,7 +1942,7 @@ void SwFltShell::BeginFootnote()
SwTxtNode* pTxt = pPaM->GetNode()->GetTxtNode();
SwTxtAttr *const pFN = pTxt->GetTxtAttrForCharAt(
pPaM->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
- if( !pFN ){ // Passiert z.B. bei Fussnote in Fly
+ if( !pFN ){ // Passiert z.B. bei Fussnote in Fly
OSL_ENSURE(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
return;
}
@@ -1960,11 +1960,11 @@ void SwFltShell::EndFootnote()
// Alle Attribute schliessen, da sonst Attribute
// entstehen koennen, die aus Fussnoten rausragen
aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
+// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
+// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
// Fussnoten im PMW uebernommen werden
- *pPaM->GetPoint() = *pSavedPos; // restore Cursor
+ *pPaM->GetPoint() = *pSavedPos; // restore Cursor
delete pSavedPos;
pSavedPos = 0;
}
@@ -2005,21 +2005,21 @@ void SwFltShell::BeginFooter(SwPageDesc* /*pPD*/)
void SwFltShell::EndHeaderFooter()
{
- *pPaM->GetPoint() = *pSavedPos; // restore Cursor
+ *pPaM->GetPoint() = *pSavedPos; // restore Cursor
delete pSavedPos;
pSavedPos = 0;
}
SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
{
- if(bStdPD) // keine Neuen PageDescs
+ if(bStdPD) // keine Neuen PageDescs
return pCurrentPageDesc;
BOOL bFollow = (pFirstPageDesc != 0);
SwPageDesc* pNewPD;
USHORT nPos;
if (bFollow && pFirstPageDesc->GetFollow() != pFirstPageDesc)
- return pFirstPageDesc; // Fehler: hat schon Follow
+ return pFirstPageDesc; // Fehler: hat schon Follow
// Erkennung doppelter Namen fehlt noch (Wahrscheinlichkeit
// fuer dopp. Namen ist gering)
@@ -2030,7 +2030,7 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
pNewPD = &((SwPageDesc&)const_cast<const SwDoc &>(GetDoc()).
GetPageDesc(nPos));
if (bFollow)
- { // Dieser ist der folgende von pPageDesc
+ { // Dieser ist der folgende von pPageDesc
pFirstPageDesc->SetFollow(pNewPD);
pNewPD->SetFollow(pNewPD);
}
@@ -2051,7 +2051,7 @@ SwFltFormatCollection::SwFltFormatCollection(
pFlyAttrs( 0 ),
bHasFly( FALSE )
{
- Reset(); // Default-Attrs loeschen und Auto-Flag
+ Reset(); // Default-Attrs loeschen und Auto-Flag
}
SwFltFormatCollection::SwFltFormatCollection(
@@ -2061,7 +2061,7 @@ SwFltFormatCollection::SwFltFormatCollection(
bHasFly( FALSE )
{
pColl = _rDoc.MakeTxtFmtColl(rName, (SwTxtFmtColl*)_rDoc.GetDfltTxtFmtColl());
- Reset(); // Default-Attrs loeschen und Auto-Flag
+ Reset(); // Default-Attrs loeschen und Auto-Flag
}
void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext)
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 8c3f415486ab..efd0c788f38a 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -2,7 +2,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
@@ -347,7 +347,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs)
//~ Ww1: new-NULL
if (rFib.GetStream().Read(pA, rFib.GetFIB().cbSttbfffnGet()
- sizeof(nCountBytes)) == (ULONG)rFib.GetFIB().cbSttbfffnGet()
- - sizeof(nCountBytes)) // lese alle Fonts
+ - sizeof(nCountBytes)) // lese alle Fonts
{} //nothing
long nLeft = rFib.GetFIB().cbSttbfffnGet()
@@ -361,15 +361,15 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs)
break;
nMax++;
nLeft -= nNextSiz;
- if(nLeft < 1) // naechste Laenge muss gelesen werden koennen
+ if(nLeft < 1) // naechste Laenge muss gelesen werden koennen
break;
p = (W1_FFN *)(((char*)p) + nNextSiz);
}
if (nMax)
{
- pFontA = new W1_FFN*[nMax]; // alloziere Index-Array
+ pFontA = new W1_FFN*[nMax]; // alloziere Index-Array
//~ Ww1: new-NULL
- pFontA[0] = pA; // fuelle Index-Array
+ pFontA[0] = pA; // fuelle Index-Array
USHORT i;
for(i=1, p=pA; i<nMax; i++)
{
@@ -378,7 +378,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs)
}
}
else
- pFontA = 0; // Keine Eintraege -> kein Array
+ pFontA = 0; // Keine Eintraege -> kein Array
}
}
bOK = TRUE;
@@ -500,8 +500,8 @@ USHORT Ww1SingleSprmByteSized::Size(BYTE* pSprm)
{
USHORT nRet;
nRet = SVBT8ToByte(pSprm);
- nRet += sizeof(SVBT8); // var. l. byte-size
-// pSprm += sizeof(SVBT8); // var. l. byte-size
+ nRet += sizeof(SVBT8); // var. l. byte-size
+// pSprm += sizeof(SVBT8); // var. l. byte-size
nRet = nRet + nCountBytes;
return nRet;
}
@@ -511,7 +511,7 @@ USHORT Ww1SingleSprmWordSized::Size(BYTE* pSprm)
USHORT nRet;
nRet = SVBT16ToShort(pSprm);
nRet += sizeof(SVBT16); // var. l. word-size
-// pSprm += sizeof(SVBT16); // var. l. word-size
+// pSprm += sizeof(SVBT16); // var. l. word-size
nRet = nRet + nCountBytes;
return nRet;
}
@@ -602,7 +602,7 @@ void Ww1Sprm::InitTab()
pSingleSprm = new Ww1SingleSprm( 0, DUMPNAME(pUnknown));
aTab[ 2] = new Ww1SingleSprmByte(DUMPNAME("sprmPStc")); // 2 pap.istd (style code)
- aTab[ 3] = new Ww1SingleSprmByteSized(0, DUMPNAME("sprmPIstdPermute")); // 3 pap.istd permutation
+ aTab[ 3] = new Ww1SingleSprmByteSized(0, DUMPNAME("sprmPIstdPermute")); // 3 pap.istd permutation
aTab[ 4] = new Ww1SingleSprmByte(DUMPNAME("sprmPIncLevel")); // 4 pap.istddifference
aTab[ 5] = new Ww1SingleSprmPJc(DUMPNAME("sprmPJc")); // 5 pap.jc (justification)
aTab[ 6] = new Ww1SingleSprmBool(DUMPNAME("sprmPFSideBySide")); // 6 pap.fSideBySide
@@ -619,7 +619,7 @@ void Ww1Sprm::InitTab()
aTab[ 17] = new Ww1SingleSprmPDxaLeft(DUMPNAME("sprmPDxaLeft")); // 17 pap.dxaLeft
aTab[ 18] = new Ww1SingleSprmWord(DUMPNAME("sprmPNest")); // 18 pap.dxaNest
aTab[ 19] = new Ww1SingleSprmPDxaLeft1(DUMPNAME("sprmPDxaLeft1")); // 19 pap.dxaLeft1
- aTab[ 20] = new Ww1SingleSprmPDyaLine(DUMPNAME("sprmPDyaLine")); // 20 pap.lspd an LSPD
+ aTab[ 20] = new Ww1SingleSprmPDyaLine(DUMPNAME("sprmPDyaLine")); // 20 pap.lspd an LSPD
aTab[ 21] = new Ww1SingleSprmPDyaBefore(DUMPNAME("sprmPDyaBefore")); // 21 pap.dyaBefore
aTab[ 22] = new Ww1SingleSprmPDyaAfter(DUMPNAME("sprmPDyaAfter")); // 22 pap.dyaAfter
aTab[ 23] = new Ww1SingleSprmTab(0, DUMPNAME(pUnknown)); // 23 pap.itbdMac, pap.rgdxaTab
@@ -819,7 +819,7 @@ BYTE* Ww1Plc::GetData(USHORT nIndex)
Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb )
: pIdxA(0), nMax(0)
{
- if( nCb > 2 ) // ueberhaupt Eintraege ?
+ if( nCb > 2 ) // ueberhaupt Eintraege ?
{
SVBT16 nCountBytes;
DBG_ASSERT(nCb > sizeof(nCountBytes), "Ww1StringList");
@@ -834,7 +834,7 @@ Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb )
// Alloziere PString-Array
//~ Ww1: new-NULL
if (rSt.Read(pA, nCb - sizeof(nCountBytes))
- == (ULONG)nCb - sizeof(nCountBytes)) // lese alle
+ == (ULONG)nCb - sizeof(nCountBytes)) // lese alle
{}// do nothing
// Zaehle, wieviele Fonts enthalten
long nLeft = nCb - sizeof(nCountBytes);
@@ -847,32 +847,32 @@ Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb )
break;
nMax++;
nLeft -= nNextSiz;
- if(nLeft < 1) // naechste Laenge muss gelesen werden koennen
+ if(nLeft < 1) // naechste Laenge muss gelesen werden koennen
break;
p = p + nNextSiz;
}
if (nMax)
{
- pIdxA = new sal_Char*[nMax+1]; // alloziere Index-Array
- pIdxA[0] = pA; // Index 0 : alles
+ pIdxA = new sal_Char*[nMax+1]; // alloziere Index-Array
+ pIdxA[0] = pA; // Index 0 : alles
// ab Index 1 C-Strings
- pIdxA[1] = pA + 1; // fuelle Index-Array
+ pIdxA[1] = pA + 1; // fuelle Index-Array
USHORT i = 2;
p = pA;
BYTE nL = *p;
while(1)
{
- p += nL + 1; // Neues Laengen-Byte
- nL = *p; // merke Laenge
- *p = '\0'; // mach C-String draus
+ p += nL + 1; // Neues Laengen-Byte
+ nL = *p; // merke Laenge
+ *p = '\0'; // mach C-String draus
if( i > nMax )
break;
- pIdxA[i] = p + 1; // Ptr auf C-String
+ pIdxA[i] = p + 1; // Ptr auf C-String
i++;
}
}
else
- pIdxA = 0; // Keine Eintraege -> kein Array
+ pIdxA = 0; // Keine Eintraege -> kein Array
}
}
}
@@ -993,10 +993,10 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes)
if (nOffset)
{
DBG_ASSERT(nOffset>(USHORT)(Count()*sizeof(SVBT32)), "calc error");
-// rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1; // SH: +1 ?????
+// rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1; // SH: +1 ?????
rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2;
nOffset += sizeof(SVBT8);
- if( nOffset + rnCountBytes < 511 ) // SH: Assert schlug 1 zu frueh zu
+ if( nOffset + rnCountBytes < 511 ) // SH: Assert schlug 1 zu frueh zu
rnCountBytes++; // SH: Ich weiss nicht genau,
// ob das letzte Byte des PAPX
// genutzt wird, aber so vergessen
@@ -1017,7 +1017,7 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes)
BOOL Ww1FkpChp::Fill(USHORT nIndex, W1_CHP& aChp)
{
DBG_ASSERT( nIndex < Count(), "Ww1FkpChp::Fill() Index out of Range" );
- memset(&aChp, 0, sizeof(aChp)); // Default, da verkuerzt gespeichert
+ memset(&aChp, 0, sizeof(aChp)); // Default, da verkuerzt gespeichert
USHORT nOffset = GetData(nIndex)[0] * 2;
if (nOffset)
{
@@ -1095,7 +1095,7 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
nFkpIndex = 0;
}
if (pPap != NULL)
-// if (nFkpIndex < pPap->Count())
+// if (nFkpIndex < pPap->Count())
if (nFkpIndex <= pPap->Count())
ulRet = pPap->Where(nFkpIndex) - rFib.GetFIB().fcMinGet();
return ulRet;
@@ -1104,7 +1104,7 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
void Ww1Pap::operator++(int)
{
if (pPap != NULL)
-// if (++nFkpIndex >= pPap->Count())
+// if (++nFkpIndex >= pPap->Count())
if (++nFkpIndex > pPap->Count())
{
delete pPap;
@@ -1196,7 +1196,7 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
nFkpIndex = 0;
}
if (pChp != NULL)
-// if (nFkpIndex < pChp->Count())
+// if (nFkpIndex < pChp->Count())
if (nFkpIndex <= pChp->Count())
ulRet = pChp->Where(nFkpIndex) -
rFib.GetFIB().fcMinGet() - ulOffset;
@@ -1206,7 +1206,7 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
void Ww1Chp::operator++(int)
{
if (pChp != NULL)
-// if (++nFkpIndex >= pChp->Count())
+// if (++nFkpIndex >= pChp->Count())
if (++nFkpIndex > pChp->Count())
{
delete pChp;
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 49547f65b892..7182ab139efb 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -2,7 +2,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
@@ -113,9 +113,9 @@ class Ww1Fib
public:
Ww1Fib(SvStream&);
friend ostream& operator <<(ostream&, Ww1Fib&);
- W1_FIB& GetFIB() { return aFib; }
- BOOL GetError() { return !bOK; }
- SvStream& GetStream() { return rStream; }
+ W1_FIB& GetFIB() { return aFib; }
+ BOOL GetError() { return !bOK; }
+ SvStream& GetStream() { return rStream; }
};
/////////////////////////////////////////////////////////////////// Dop
@@ -153,7 +153,7 @@ protected:
public:
Ww1PlainText(Ww1Fib& rWwFib, ULONG nFilePos, ULONG nCountBytes);
// innerhalb des textes
- ULONG Where() const { return ulSeek; }
+ ULONG Where() const { return ulSeek; }
void Seek( ULONG ulNew )
{
DBG_ASSERT(ulNew < ulCountBytes, "Ww1PlainText");
@@ -161,7 +161,7 @@ public:
ulSeek = ulNew;
}
- ULONG Count() const { return ulCountBytes; }
+ ULONG Count() const { return ulCountBytes; }
void SetCount(ULONG ulNew)
{
ulNew += ulSeek;
@@ -173,7 +173,7 @@ public:
DBG_ASSERT(ulSeek+1<ulCountBytes, "Ww1PlainText");
ulSeek++;
}
- BOOL GetError() { return !bOK; }
+ BOOL GetError() { return !bOK; }
sal_Unicode Out( Ww1Shell&, ULONG& );
sal_Unicode Out( String&, ULONG=0xffffffff);
sal_Unicode Out( sal_Unicode& );
@@ -183,7 +183,7 @@ public:
String GetText( ULONG ulOffset, ULONG nLen ) const;
enum Consts { MinChar = 32 };
- static BOOL IsChar( sal_Unicode c ) { return c >= MinChar; }
+ static BOOL IsChar( sal_Unicode c ) { return c >= MinChar; }
};
/////////////////////////////////////////////////////////////// DocText
@@ -262,15 +262,15 @@ class Ww1Style
public:
Ww1Style();
~Ww1Style();
- BOOL IsUsed() const { return bUsed; }
+ BOOL IsUsed() const { return bUsed; }
void SetDefaults(BYTE);
- void SetParent(Ww1StyleSheet* newParent) { pParent = newParent; }
- void SetName(const String& rName) { bUsed = TRUE; aName = rName; }
- const String& GetName() const { return aName; }
-// Ww1Style& GetNext();
+ void SetParent(Ww1StyleSheet* newParent) { pParent = newParent; }
+ void SetName(const String& rName) { bUsed = TRUE; aName = rName; }
+ const String& GetName() const { return aName; }
+// Ww1Style& GetNext();
Ww1Style& GetBase();
- USHORT GetnBase() const { return stcBase; }
- USHORT GetnNext() const { return stcNext; }
+ USHORT GetnBase() const { return stcBase; }
+ USHORT GetnNext() const { return stcNext; }
USHORT ReadName(BYTE*&, USHORT&, USHORT stc);
USHORT ReadChpx(BYTE*&, USHORT&);
USHORT ReadPapx(BYTE*&, USHORT&);
@@ -390,7 +390,7 @@ public:
class Ww1SingleSprmByteSized : public Ww1SingleSprm {
public:
-// ostream& Dump(ostream&, BYTE*, USHORT);
+// ostream& Dump(ostream&, BYTE*, USHORT);
USHORT Size(BYTE*);
Ww1SingleSprmByteSized(USHORT nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
@@ -399,7 +399,7 @@ public:
class Ww1SingleSprmWordSized : public Ww1SingleSprm {
public:
-// ostream& Dump(ostream&, BYTE*, USHORT);
+// ostream& Dump(ostream&, BYTE*, USHORT);
USHORT Size(BYTE*);
Ww1SingleSprmWordSized(USHORT nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
@@ -409,7 +409,7 @@ public:
class Ww1SingleSprmByte : public Ww1SingleSprm {
public:
ostream& Dump(ostream&, BYTE*, USHORT);
-// USHORT Size(BYTE*);
+// USHORT Size(BYTE*);
Ww1SingleSprmByte(sal_Char* sName = 0) :
Ww1SingleSprm(1, sName) {
}
@@ -418,7 +418,7 @@ public:
class Ww1SingleSprmBool : public Ww1SingleSprmByte {
public:
ostream& Dump(ostream&, BYTE*, USHORT);
-// USHORT Size(BYTE*);
+// USHORT Size(BYTE*);
Ww1SingleSprmBool(sal_Char* sName = 0) :
Ww1SingleSprmByte(sName) {
}
@@ -427,7 +427,7 @@ public:
class Ww1SingleSprm4State : public Ww1SingleSprmByte {
public:
ostream& Dump(ostream&, BYTE*, USHORT);
-// USHORT Size(BYTE*);
+// USHORT Size(BYTE*);
Ww1SingleSprm4State(sal_Char* sName = 0) :
Ww1SingleSprmByte(sName) {
}
@@ -436,7 +436,7 @@ public:
class Ww1SingleSprmWord : public Ww1SingleSprm {
public:
ostream& Dump(ostream&, BYTE*, USHORT);
-// USHORT Size(BYTE*);
+// USHORT Size(BYTE*);
Ww1SingleSprmWord(sal_Char* sName = 0)
: Ww1SingleSprm(2, sName) {}
};
@@ -444,7 +444,7 @@ public:
class Ww1SingleSprmLong : public Ww1SingleSprm {
public:
ostream& Dump(ostream&, BYTE*, USHORT);
-// USHORT Size(BYTE*);
+// USHORT Size(BYTE*);
Ww1SingleSprmLong(sal_Char* sName = 0) :
Ww1SingleSprm(4, sName) {
}
@@ -529,14 +529,14 @@ public:
class Ww1SingleSprmPBrc : public Ww1SingleSprmWord {
protected:
-// SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC*);
+// SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC*);
// spezielle start-routine, je nach sprm verschieden versorgt
// mit einem BoxItem.
void Start(Ww1Shell&, BYTE, W1_BRC10*, USHORT, Ww1Manager&, SvxBoxItem&);
void Start(Ww1Shell&, BYTE, W1_BRC*, USHORT, Ww1Manager&, SvxBoxItem&);
using Ww1SingleSprm::Start;
-
+
public:
Ww1SingleSprmPBrc(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
@@ -558,14 +558,14 @@ public:
// SH: Ab sofort alle 4 Umrandungen ueber nur 1 Klasse.
class Ww1SingleSprmPBrc10 : public Ww1SingleSprmPBrc
{
- USHORT nLine; // BRC_TOP, BRC_LEFT, ...
-
+ USHORT nLine; // BRC_TOP, BRC_LEFT, ...
+
using Ww1SingleSprmPBrc::Start;
-
+
public:
Ww1SingleSprmPBrc10(USHORT nL, sal_Char* sName)
: Ww1SingleSprmPBrc(sName), nLine(nL) {}
-
+
void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
};
@@ -652,10 +652,10 @@ public:
//class Ww1SingleSprmTDxaLeft : public Ww1SingleSprmWord {
//public:
-// Ww1SingleSprmTDxaLeft(sal_Char* sName) :
-// Ww1SingleSprmWord(sName) {
-// }
-// void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
+// Ww1SingleSprmTDxaLeft(sal_Char* sName) :
+// Ww1SingleSprmWord(sName) {
+// }
+// void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
//};
class Ww1SingleSprmTDxaGapHalf : public Ww1SingleSprmWord {
@@ -757,7 +757,7 @@ protected:
BYTE nId = *pSprm++;
return GetSize(nId, pSprm) + 1; }
// gibt fuer nTh element id, size & zeiger auf daten:
-// BOOL Fill(USHORT, BYTE&, USHORT&, BYTE*&);
+// BOOL Fill(USHORT, BYTE&, USHORT&, BYTE*&);
public:
// SH: brauche ich public
// gibt fuer nTh element id, size & zeiger auf daten:
@@ -955,10 +955,10 @@ class Ww1StringList
public:
Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb );
~Ww1StringList()
- { if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } }
+ { if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } }
const String GetStr( USHORT nNum ) const;
- USHORT Count() const { return nMax; }
- BOOL GetError() const { return (nMax != 0) && !pIdxA; }
+ USHORT Count() const { return nMax; }
+ BOOL GetError() const { return (nMax != 0) && !pIdxA; }
};
class Ww1PlcBookmarkTxt: public Ww1StringList
@@ -972,15 +972,15 @@ public:
class Ww1PlcBookmarkPos : public Ww1Plc
{
-// USHORT Fill(USHORT, BYTE&, String&, String&, String&);
+// USHORT Fill(USHORT, BYTE&, String&, String&, String&);
public:
Ww1PlcBookmarkPos(Ww1Fib& _rFib, ULONG start, USHORT nBytes, BOOL bEnd)
: Ww1Plc(_rFib, start, nBytes, (bEnd) ? 0 : 2)
{}
- BYTE* GetData(USHORT nIndex) { return Ww1Plc::GetData(nIndex); }
+ BYTE* GetData(USHORT nIndex) { return Ww1Plc::GetData(nIndex); }
// Position als CP
- ULONG WhereCP(USHORT nIndex) { return Ww1Plc::Where(nIndex); }
+ ULONG WhereCP(USHORT nIndex) { return Ww1Plc::Where(nIndex); }
// absolut im file
ULONG Where(USHORT nIndex)
{
@@ -988,7 +988,7 @@ public:
? Ww1Plc::Where(nIndex) + rFib.GetFIB().fcMinGet()
: 0xffffffff;
}
-// friend ostream& operator <<(ostream&, Ww1PlcBookmarks&);
+// friend ostream& operator <<(ostream&, Ww1PlcBookmarks&);
};
//////////////////////////////////////////////////////////////// PlcHdd
@@ -1016,7 +1016,7 @@ protected:
public:
Ww1Fkp(SvStream&, ULONG, USHORT);
friend ostream& operator <<(ostream&, Ww1Fkp&);
- USHORT Count() const { return SVBT8ToByte(aFkp+511); }
+ USHORT Count() const { return SVBT8ToByte(aFkp+511); }
ULONG Where(USHORT); // wie im entsprechenden fkp
};
@@ -1036,7 +1036,7 @@ class Ww1FkpChp : public Ww1Fkp
{
#ifdef DUMP
SvStream& rStream;
- SvStream& GetStream() { return rStream; }
+ SvStream& GetStream() { return rStream; }
#endif
public:
Ww1FkpChp(SvStream& rStream, ULONG ulFilePos)
@@ -1089,8 +1089,8 @@ class Ww1Assoc
public:
Ww1Assoc(Ww1Fib&);
- ~Ww1Assoc() { delete pBuffer; }
- BOOL GetError() const { return !bOK; }
+ ~Ww1Assoc() { delete pBuffer; }
+ BOOL GetError() const { return !bOK; }
friend ostream& operator <<(ostream&, Ww1Assoc&);
void Out(Ww1Shell&);
};
@@ -1147,7 +1147,7 @@ public:
if (grpfIhdt & 0x0002) nFtnFollowSep = nextIhdd++;
if (grpfIhdt & 0x0004) nFtnNote = nextIhdd++;
}
-// ~Ww1HeaderFooter() {}
+// ~Ww1HeaderFooter() {}
void SetGrpfIhdt(USHORT grpfIhdt)
{
if (grpfIhdt & 0x0001) nEvenHeadL = nextIhdd++;
@@ -1249,15 +1249,15 @@ public:
Ww1Fields(Ww1Fib& rFibL, ULONG ulFilePos, USHORT nBytes)
: Ww1PlcFields(rFibL, ulFilePos, nBytes), nPlcIndex(0), pField(0)
{}
-// ~Ww1Fields() {}
+// ~Ww1Fields() {}
// innerhalb des textes
- ULONG Where() { return Where(nPlcIndex); }
+ ULONG Where() { return Where(nPlcIndex); }
void operator++(int)
{
DBG_ASSERT(nPlcIndex+1 <= Count(), "Ww1Fields");
nPlcIndex++;
}
- void Seek(ULONG ulNew) { Ww1PlcFields::Seek(ulNew, nPlcIndex); }
+ void Seek(ULONG ulNew) { Ww1PlcFields::Seek(ulNew, nPlcIndex); }
W1_FLD* GetData()
{
DBG_ASSERT(nPlcIndex < Count(), "Ww1Fields");
@@ -1316,8 +1316,8 @@ class Ww1Bookmarks
USHORT nPlcIdx[2];
USHORT nIsEnd;
BOOL bOK;
-// ULONG Where(USHORT nIndex) { // innerhalb des textes
-// return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); }
+// ULONG Where(USHORT nIndex) { // innerhalb des textes
+// return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); }
public:
Ww1Bookmarks(Ww1Fib& rFib);
~Ww1Bookmarks()
@@ -1325,11 +1325,11 @@ public:
delete pPos[1];
delete pPos[0];
}
- ULONG Where() const { return pPos[nIsEnd]->WhereCP(nPlcIdx[nIsEnd]); }
+ ULONG Where() const { return pPos[nIsEnd]->WhereCP(nPlcIdx[nIsEnd]); }
void operator++(int);
- BOOL GetError() const { return !bOK; }
+ BOOL GetError() const { return !bOK; }
long GetHandle() const;
- BOOL GetIsEnd() const { return ( nIsEnd ) ? TRUE : FALSE; }
+ BOOL GetIsEnd() const { return ( nIsEnd ) ? TRUE : FALSE; }
const String GetName() const;
long Len() const;
friend ostream& operator <<(ostream&, Ww1Bookmarks&);
@@ -1348,7 +1348,7 @@ public:
Ww1Footnotes(Ww1Fib& rFibL)
: Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(FALSE)
{}
-// ~Ww1Footnotes() {}
+// ~Ww1Footnotes() {}
// innerhalb des textes
ULONG Where()
{
@@ -1375,15 +1375,15 @@ public:
Ww1Sep(Ww1Fib& rFibL, USHORT grpfIhdt)
: Ww1PlcSep(rFibL), aHdd(rFibL, grpfIhdt), nPlcIndex(0) {}
- Ww1HeaderFooter& GetHdd() { return aHdd; }
- void operator++(int) { nPlcIndex++; }
- BYTE* GetData() { return Ww1PlcSep::GetData(nPlcIndex); }
+ Ww1HeaderFooter& GetHdd() { return aHdd; }
+ void operator++(int) { nPlcIndex++; }
+ BYTE* GetData() { return Ww1PlcSep::GetData(nPlcIndex); }
// innerhalb des textes
- ULONG Where() { return Ww1PlcSep::Where(nPlcIndex); }
+ ULONG Where() { return Ww1PlcSep::Where(nPlcIndex); }
void SetGrpfIhdt(BYTE grpfIhdt)
{
GetHdd().SetGrpfIhdt(grpfIhdt);
-// GetHdd().Start(rOut, rMan);
+// GetHdd().Start(rOut, rMan);
}
void Start(Ww1Shell&, Ww1Manager&);
void Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode& c)
@@ -1416,7 +1416,7 @@ class Ww1Pap : public Ww1PlcPap
public:
Ww1Pap(Ww1Fib& rFib);
- ~Ww1Pap() { delete pPap; }
+ ~Ww1Pap() { delete pPap; }
ULONG Where( BOOL bSetIndex = TRUE ); // innerhalb des textes
void operator++(int);
BOOL FillStart(BYTE*& pB, USHORT& nSize)
@@ -1483,7 +1483,7 @@ class Ww1Chp : public Ww1PlcChp
public:
Ww1Chp( Ww1Fib& rFib );
- ~Ww1Chp() { delete pChp; }
+ ~Ww1Chp() { delete pChp; }
ULONG Where( BOOL bSetIndex = TRUE ); // innerhalb des textes
void operator++(int);
BOOL FillStart(W1_CHP& rChp)
@@ -1506,7 +1506,7 @@ public:
delete pChp;
pChp = NULL;
}
- BOOL Pushed() { return nPushedPlcIndex != 0xffff; }
+ BOOL Pushed() { return nPushedPlcIndex != 0xffff; }
void Pop()
{
DBG_ASSERT(Pushed(), "Ww1Chp");
@@ -1557,15 +1557,15 @@ class Ww1Manager
public:
Ww1Manager(SvStream& rStrm, ULONG nFieldFlgs);
- BOOL GetError() const { return !bOK; }
+ BOOL GetError() const { return !bOK; }
// Fuer Tabellen
- void SetInTtp(BOOL bSet = TRUE) { bInTtp = bSet; }
- BOOL IsInTtp() const { return bInTtp; }
- void SetInStyle(BOOL bSet = TRUE) { bInStyle = bSet; }
- BOOL IsInStyle() const { return bInStyle; }
- void SetStopAll(BOOL bSet = TRUE) { bStopAll = bSet; }
- BOOL IsStopAll() const { return bStopAll; }
+ void SetInTtp(BOOL bSet = TRUE) { bInTtp = bSet; }
+ BOOL IsInTtp() const { return bInTtp; }
+ void SetInStyle(BOOL bSet = TRUE) { bInStyle = bSet; }
+ BOOL IsInStyle() const { return bInStyle; }
+ void SetStopAll(BOOL bSet = TRUE) { bStopAll = bSet; }
+ BOOL IsStopAll() const { return bStopAll; }
BOOL HasInTable();
BOOL HasTtp();
BOOL LastHasTtp();
@@ -1574,13 +1574,13 @@ public:
BOOL HasPPc();
BOOL HasPDxaAbs();
- Ww1Fib& GetFib() { return aFib; }
- Ww1PlainText& GetText() { return *pDoc; }
- Ww1Dop& GetDop() { return aDop; }
- Ww1Sep& GetSep() { return aSep; }
+ Ww1Fib& GetFib() { return aFib; }
+ Ww1PlainText& GetText() { return *pDoc; }
+ Ww1Dop& GetDop() { return aDop; }
+ Ww1Sep& GetSep() { return aSep; }
// innerhalb des textes
- ULONG Where() { return pDoc->Where(); }
- void Fill( sal_Unicode& rChr ) { pDoc->Out( rChr ); }
+ ULONG Where() { return pDoc->Where(); }
+ void Fill( sal_Unicode& rChr ) { pDoc->Out( rChr ); }
BYTE Fill( String& rStr, ULONG ulLen)
{
ulLen += pDoc->Where();
@@ -1589,7 +1589,7 @@ public:
SvxFontItem GetFont(USHORT nFCode);
friend Ww1Shell& operator <<(Ww1Shell&, Ww1Manager&);
friend ostream& operator <<(ostream&, Ww1Manager&);
- BOOL Pushed() { return pDoc != &aDoc; }
+ BOOL Pushed() { return pDoc != &aDoc; }
void Pop();
void Push0(Ww1PlainText* pDoc, ULONG, Ww1Fields* = 0);
void Push1(Ww1PlainText* pDoc, ULONG ulSeek, ULONG ulSeek2 = 0,
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 07b570f44906..c33b233c0228 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@
#include <expfld.hxx>
#include <docufld.hxx>
#include <ftninfo.hxx>
-#include <section.hxx> // class SwSection
+#include <section.hxx> // class SwSection
#include <fltini.hxx>
#include <w1par.hxx>
@@ -140,8 +140,8 @@ Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This)
cUnknown = This.pDoc->Out(rOut, *This.pSeek);
}
This.SetStopAll(TRUE);
- This.OutStop(rOut, cUnknown); // Damit die Attribute am Ende geschlossen
- This.SetStopAll(FALSE); // werden
+ This.OutStop(rOut, cUnknown); // Damit die Attribute am Ende geschlossen
+ This.SetStopAll(FALSE); // werden
return rOut;
}
@@ -232,7 +232,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
bLHasTtp = HasTtp();
}
- OutStop( rOut, cUnknown ); // Attrs ggfs. beenden
+ OutStop( rOut, cUnknown ); // Attrs ggfs. beenden
// meta-zeichen interpretieren:
if (!Ww1PlainText::IsChar(cUnknown))
@@ -253,7 +253,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
break;
case 0x0b: // linebreak
if (rOut.IsInTable())
-// rOut.NextBand(); // war Stuss
+// rOut.NextBand(); // war Stuss
;
else
rOut.NextLine();
@@ -271,7 +271,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
break;
}
- OutStart( rOut ); // Attrs ggfs. starten und Naechste Pos berechnen
+ OutStart( rOut ); // Attrs ggfs. starten und Naechste Pos berechnen
}
SvxFontItem Ww1Manager::GetFont(USHORT nFCode)
@@ -331,7 +331,7 @@ void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, USHORT)
}
const String & rName = GetName();
- if( rName.EqualsAscii( "_Toc", 0, 4 ) ) // "_Toc*" ist ueberfluessig
+ if( rName.EqualsAscii( "_Toc", 0, 4 ) ) // "_Toc*" ist ueberfluessig
return;
if( rOut.IsFlagSet( SwFltControlStack::HYPO )
@@ -402,7 +402,7 @@ void Ww1Footnotes::Stop(Ww1Shell& /*rOut*/, Ww1Manager& rMan, sal_Unicode& c)
if (bStarted && rMan.Where() > Where())
{
DBG_ASSERT(nPlcIndex < Count(), "Ww1Footnotes");
-// DBG_ASSERT(c==0x02, "Ww1Footnotes"); // scheint Stuss zu sein
+// DBG_ASSERT(c==0x02, "Ww1Footnotes"); // scheint Stuss zu sein
c = ' ';
(*this)++;
}
@@ -454,17 +454,17 @@ static WWDateTime GetTimeDatePara( const String& rForm,
SwDateFormat* pDate = 0 )
{
WWDateTime eDT = WW_BOTH;
- if( STRING_NOTFOUND == rForm.Search( 'H' )) // H -> 24h
+ if( STRING_NOTFOUND == rForm.Search( 'H' )) // H -> 24h
{
if( pTime )
*pTime = TF_SSMM_24;
}
- else if( STRING_NOTFOUND == rForm.Search( 'H' )) // h -> 24h
+ else if( STRING_NOTFOUND == rForm.Search( 'H' )) // h -> 24h
{
if( pTime )
*pTime = TF_SSMM_12;
}
- else // keine Zeit
+ else // keine Zeit
{
eDT = (WWDateTime)( eDT & ~(USHORT)WW_TIME );
}
@@ -472,7 +472,7 @@ static WWDateTime GetTimeDatePara( const String& rForm,
xub_StrLen nDPos = 0;
while( STRING_NOTFOUND != nDPos )
{
- nDPos = rForm.Search( 'M', nDPos ); // M -> Datum
+ nDPos = rForm.Search( 'M', nDPos ); // M -> Datum
if( !nDPos )
break;
sal_Unicode cPrev = rForm.GetChar( nDPos - 1 );
@@ -483,7 +483,7 @@ static WWDateTime GetTimeDatePara( const String& rForm,
++nDPos;
}
- if( STRING_NOTFOUND != nDPos ) // Monat -> Datum ?
+ if( STRING_NOTFOUND != nDPos ) // Monat -> Datum ?
{
static SwDateFormat __READONLY_DATA aDateA[32] =
{
@@ -512,13 +512,13 @@ static WWDateTime GetTimeDatePara( const String& rForm,
STRING_NOTFOUND != rForm.SearchAscii( "ddd" ) ||
STRING_NOTFOUND != rForm.SearchAscii( "DDD" );
- // M, MM -> numeric month
- // MMM, MMMM -> text. month
+ // M, MM -> numeric month
+ // MMM, MMMM -> text. month
BOOL bLitMonth = STRING_NOTFOUND != rForm.SearchAscii( "MMM" );
- // MMMM -> full month
+ // MMMM -> full month
BOOL bFullMonth = STRING_NOTFOUND != rForm.SearchAscii( "MMMM" );
- // jj, JJ -> 2-col-year
- // jjjj, JJJJ -> 4-col-year
+ // jj, JJ -> 2-col-year
+ // jjjj, JJJJ -> 4-col-year
BOOL bFullYear = STRING_NOTFOUND != rForm.SearchAscii( "jjj" ) ||
STRING_NOTFOUND != rForm.SearchAscii( "JJJ" ) ||
STRING_NOTFOUND != rForm.SearchAscii( "yyy" ) ||
@@ -554,7 +554,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, USHORT nDepth)
String sType; // der typ als string
String sFormel; // die formel
String sFormat;
- String sDTFormat; // Datum / Zeit-Format
+ String sDTFormat; // Datum / Zeit-Format
W1_FLD* pData = GetData(); // die an den plc gebunden daten
DBG_ASSERT(pData->chGet()==19, "Ww1Fields"); // sollte beginn sein
@@ -636,10 +636,10 @@ oncemore:
REF_BOOKMARK,
0,
REF_CONTENT );
-// pField = new SwGetExpField((SwGetExpFieldType*)
-// rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING);
-// ,
-// nsSwGetSetExpType::GSE_STRING, VVF_SYS);
+// pField = new SwGetExpField((SwGetExpFieldType*)
+// rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING);
+// ,
+// nsSwGetSetExpType::GSE_STRING, VVF_SYS);
break;
case 6: // set command
{
@@ -729,15 +729,15 @@ oncemore:
case 23: // print date
case 25:{// edit time
USHORT nSub;
- USHORT nReg = 0; // RegInfoFormat, DefaultFormat fuer DocInfoFelder
+ USHORT nReg = 0; // RegInfoFormat, DefaultFormat fuer DocInfoFelder
switch( rbType )
{
default:
- case 21: nSub = DI_CREATE; nReg = DI_SUB_DATE; break;
- case 23: nSub = DI_PRINT; nReg = DI_SUB_DATE; break;
- case 22: nSub = DI_CHANGE; nReg = DI_SUB_DATE; break;
- case 25: nSub = DI_CHANGE; nReg = DI_SUB_TIME; break;
+ case 21: nSub = DI_CREATE; nReg = DI_SUB_DATE; break;
+ case 23: nSub = DI_PRINT; nReg = DI_SUB_DATE; break;
+ case 22: nSub = DI_CHANGE; nReg = DI_SUB_DATE; break;
+ case 25: nSub = DI_CHANGE; nReg = DI_SUB_TIME; break;
}
switch( GetTimeDatePara( sDTFormat ) )
{
@@ -782,7 +782,7 @@ oncemore:
SwTimeFormat aTime = TF_SYSTEM;
WWDateTime eDT = GetTimeDatePara(sDTFormat, &aTime, &aDate);
- if( eDT == WW_DONTKNOW ) // kein D/T-Formatstring
+ if( eDT == WW_DONTKNOW ) // kein D/T-Formatstring
eDT = ( rbType == 32 ) ? WW_TIME : WW_DATE; // benutze ID
if( eDT & WW_DATE )
@@ -832,7 +832,7 @@ oncemore:
String aName( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "Ww" )));
aName += String::CreateFromInt32( nPlcIndex );
- SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false);
+ SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false);
if (pFT == 0)
{
SwSetExpFieldType aS(&rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_FORMULA);
@@ -854,10 +854,10 @@ oncemore:
break;
aFName.SearchAndReplaceAscii( "\\\\", String( '\\' ));
-// char* pBook = FindNextPara( pNext, 0 ); //!! Bookmark/Feld-Name
-// //!! erstmal nicht
+// char* pBook = FindNextPara( pNext, 0 ); //!! Bookmark/Feld-Name
+// //!! erstmal nicht
-// ConvertFFileName( aPara, pFName ); //!! WW1 ????
+// ConvertFFileName( aPara, pFName ); //!! WW1 ????
aFName = URIHelper::SmartRel2Abs(
INetURLObject(rOut.GetBaseURL()), aFName );
@@ -890,15 +890,15 @@ oncemore:
pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr );
((SwSetExpField*)pField)->SetInputFlag( TRUE );
((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
-// pField.SetPromptText( aQ ); //!! fehlt noch
-// aFld.SetPar2( aDef ); //!! dito
+// pField.SetPromptText( aQ ); //!! fehlt noch
+// aFld.SetPar2( aDef ); //!! dito
// das Ignorieren des Bookmarks ist nicht implementiert
}
case 39: // fillin command
pField = new SwInputField(
(SwInputFieldType*)rOut.GetSysFldType( RES_INPUTFLD ),
aEmptyStr, sFormel,
- INP_TXT, 0 ); // sichtbar ( geht z.Zt. nicht anders )
+ INP_TXT, 0 ); // sichtbar ( geht z.Zt. nicht anders )
break;
case 51: // macro button
{
@@ -963,9 +963,9 @@ oncemore:
case 4: // index entry
// wwpar5: 1351/1454
case 5: // footnote ref
-// pField = new SwGetRefField(
-// (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD),
-// sFormel, REF_FOOTNOTE, 0, REF_BEGIN);
+// pField = new SwGetRefField(
+// (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD),
+// sFormel, REF_FOOTNOTE, 0, REF_BEGIN);
case 7: // if command
case 8: // create index
// wwpar5: 1351/1454
@@ -1076,7 +1076,7 @@ void Ww1Pap::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
aSprm.Stop(rOut, rMan);
}else{
DBG_ASSERT( !nPlcIndex || rMan.IsStopAll(), "Pap-Attribut-Stop verloren" );
-// rMan.IsStopAll() ist nicht schoen.
+// rMan.IsStopAll() ist nicht schoen.
}
}
}
@@ -1231,7 +1231,7 @@ void Ww1Style::Out(Ww1Shell& rOut, Ww1Manager& rMan)
{
// Zuerst Basis, damit Attribute des Basis-Styles erkannt werden
// first: Base................................................
- if(pParent->GetStyle(stcBase).IsUsed() ) // Basis gueltig ?
+ if(pParent->GetStyle(stcBase).IsUsed() ) // Basis gueltig ?
rOut.BaseStyle(stcBase);
// next of all: CHP...............................................
@@ -1307,12 +1307,12 @@ sal_Unicode Ww1PlainText::Out( sal_Unicode& rRead )
void Ww1SprmPapx::Start(Ww1Shell& rOut, Ww1Manager& rMan)
{
- if( !rMan.IsInStyle() ){ // Innerhalb Style gehts ueber die
+ if( !rMan.IsInStyle() ){ // Innerhalb Style gehts ueber die
// normalen Attribute
if (!rOut.IsInFly()
- && !rOut.IsInTable() // Nicht innerhalb Tabelle!
+ && !rOut.IsInTable() // Nicht innerhalb Tabelle!
&& ( rMan.HasPPc() || rMan.HasPDxaAbs())){ // Fly-Start
- rOut.BeginFly(); // eAnchor );
+ rOut.BeginFly(); // eAnchor );
}
if (!rOut.IsInTable() && rMan.HasInTable())
{
@@ -1327,15 +1327,15 @@ void Ww1SprmPapx::Stop(Ww1Shell& rOut, Ww1Manager& rMan)
{
Ww1Sprm::Stop(rOut, rMan);
- if( !rMan.IsInStyle() ) // Innerhalb Style gehts ueber die
- { // normalen Attribute
+ if( !rMan.IsInStyle() ) // Innerhalb Style gehts ueber die
+ { // normalen Attribute
if (rOut.IsInTable() &&( rMan.IsStopAll() || !rMan.HasInTable()))
rOut.EndTable();
if( rOut.IsInFly() &&
( rMan.IsStopAll()
- || ( !rMan.HasPPc() && !rMan.HasPDxaAbs() // Fly-Ende
- && !rOut.IsInTable()))) // Nicht innerhalb Tabelle!
+ || ( !rMan.HasPPc() && !rMan.HasPDxaAbs() // Fly-Ende
+ && !rOut.IsInTable()))) // Nicht innerhalb Tabelle!
rOut.EndFly();
}
}
@@ -1479,7 +1479,7 @@ void Ww1Dop::Out(Ww1Shell& rOut)
rFmt.SetFmtAttr(aUL);
SwFtnInfo aInfo;
- aInfo = rOut.GetDoc().GetFtnInfo(); // Copy-Ctor privat
+ aInfo = rOut.GetDoc().GetFtnInfo(); // Copy-Ctor privat
// wo positioniert ? ( 0 == Section, 1 == Page,
// 2 == beim Text -> Page, 3 == Doc )
switch( rDOP.fpcGet() ){
@@ -1487,7 +1487,7 @@ void Ww1Dop::Out(Ww1Shell& rOut)
case 2: aInfo.ePos = FTNPOS_PAGE; break;
default: aInfo.ePos = FTNPOS_CHAPTER; break;
}
-// aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC;
+// aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC;
// Da Sw unter Chapter anscheinend was anderes versteht als PMW
// hier also immer Doc !
aInfo.eNum = FTNNUM_DOC;
@@ -1640,16 +1640,16 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
{
const RES_POOL_COLLFMT_TYPE RES_NONE = RES_POOLCOLL_DOC_END;
RES_POOL_COLLFMT_TYPE aType = RES_NONE;
-// aType = RES_POOLCOLL_JAKETADRESS; break;
-// aType = RES_POOLCOLL_LISTS_BEGIN; break;
-// aType = RES_POOLCOLL_SENDADRESS; break;
-// aType = RES_POOLCOLL_SIGNATURE; break;
-// aType = RES_POOLCOLL_TEXT_NEGIDENT; break;
-// aType = RES_POOLCOLL_TOX_IDXH; break;
+// aType = RES_POOLCOLL_JAKETADRESS; break;
+// aType = RES_POOLCOLL_LISTS_BEGIN; break;
+// aType = RES_POOLCOLL_SENDADRESS; break;
+// aType = RES_POOLCOLL_SIGNATURE; break;
+// aType = RES_POOLCOLL_TEXT_NEGIDENT; break;
+// aType = RES_POOLCOLL_TOX_IDXH; break;
switch (stc)
{
case 222: // Null
- aType = RES_POOLCOLL_TEXT; break; //???
+ aType = RES_POOLCOLL_TEXT; break; //???
case 223: // annotation reference
break;
case 224: // annotation text
@@ -1718,7 +1718,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
aType = RES_POOLCOLL_TEXT_IDENT; break;
case 0: // Normal
aType = RES_POOLCOLL_STANDARD; break;
-// aType = RES_POOLCOLL_TEXT; break; // Das ist "textkoerper"
+// aType = RES_POOLCOLL_TEXT; break; // Das ist "textkoerper"
}
if (aType == RES_NONE)
rOut.BeginStyle(stc, GetStyle(stc).GetName() );
@@ -1727,7 +1727,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
OutDefaults(rOut, rMan, stc);
GetStyle(stc).Out(rOut, rMan);
rOut.EndStyle();
-// rMan.SetInApo(FALSE);
+// rMan.SetInApo(FALSE);
}
// OutOneWithBase() liest einen Style mit OutOne() einen Style ein
// Jedoch liest er, wenn noch nicht geschehen, den Basisstyle rekursiv ein
@@ -1960,7 +1960,7 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
}
break;
case 97: // embedded bitmap
-// case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap,
+// case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap,
// aber leider anderes Format
{
ULONG nSiz = GuessPicSize(pPic);
@@ -2046,7 +2046,7 @@ void Ww1HeaderFooter::Start(Ww1Shell& rOut, Ww1Manager& rMan)
void Ww1HeaderFooter::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
{
if (!rMan.Pushed() && eHeaderFooterMode != None
-// && rMan.GetText().Where() >= rMan.GetText().Count()
+// && rMan.GetText().Where() >= rMan.GetText().Count()
)
{
Start(rOut, rMan);
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index c90e39b173a7..a7605be0b8c2 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -2,7 +2,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
@@ -32,12 +32,12 @@
#include <pam.hxx> // fuer SwPam
#include <doc.hxx>
-#include <ndtxt.hxx> // class SwTxtNode
-#include <fltini.hxx> // Ww1Reader
+#include <ndtxt.hxx> // class SwTxtNode
+#include <fltini.hxx> // Ww1Reader
#include <w1par.hxx>
#include <swfltopt.hxx>
-#include <mdiexp.hxx> // StatLine...()
-#include <swerror.h> // ERR_WW1_...
+#include <mdiexp.hxx> // StatLine...()
+#include <swerror.h> // ERR_WW1_...
#include <statstr.hrc> // ResId fuer Statusleiste
//----------------------------------------
@@ -46,7 +46,7 @@
static ULONG WW1_Read_FieldIniFlags()
{
-// USHORT i;
+// USHORT i;
static const sal_Char* aNames[ 1 ] = { "WinWord/WW1F" };
sal_uInt32 aVal[ 1 ];
SwFilterOptions aOpt( 1, aNames, aVal );
@@ -76,7 +76,7 @@ ULONG WW1Reader::Read(SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam, const St
OSL_ENSURE(pStrm!=NULL, "W1-Read ohne Stream");
if (pStrm != NULL)
{
- BOOL bNew = !bInsertMode; // Neues Doc ( kein Einfuegen )
+ BOOL bNew = !bInsertMode; // Neues Doc ( kein Einfuegen )
// erstmal eine shell konstruieren: die ist schnittstelle
// zum writer-dokument
@@ -109,7 +109,7 @@ ULONG WW1Reader::Read(SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam, const St
// das nicht unterstuetzt. Stattdessen temporaer
// nur eine Warnung, bis die entsprechende
// Meldung und Behandlung weiter oben eingebaut ist.
-// nRet = WARN_WW6_FASTSAVE_ERR;
+// nRet = WARN_WW6_FASTSAVE_ERR;
// Zum Einchecken mit neuem String:
nRet = ERR_WW6_FASTSAVE_ERR;
}
diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx
index 01f5d66a7d97..0df49450a7a6 100644
--- a/sw/source/filter/ww1/w1par.hxx
+++ b/sw/source/filter/ww1/w1par.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6d5fdacc1ec7..e36f9735ac1f 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -2,7 +2,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
@@ -66,8 +66,8 @@ using namespace ::com::sun::star;
void Ww1Sprm::Stop( Ww1Shell& rOut, Ww1Manager& rMan)
{
if(IsUsed())
-// for(USHORT i=0;i<Count();i++)
- for(short i=Count()-1;i>=0;i--){ // rueckwaerts
+// for(USHORT i=0;i<Count();i++)
+ for(short i=Count()-1;i>=0;i--){ // rueckwaerts
BYTE nId;
USHORT nSize;
BYTE* pSprm;
@@ -215,7 +215,7 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
switch(pBrc->dxpLine1WidthGet())
{
default: OSL_ENSURE(FALSE, "unknown linewidth");
- case 0: return 0; // keine Linie
+ case 0: return 0; // keine Linie
case 1: nCode = DEF_LINE_WIDTH_0; break;
case 2: nCode = DEF_LINE_WIDTH_1; break;
case 3: nCode = DEF_LINE_WIDTH_2; break;
@@ -310,7 +310,7 @@ void Ww1SingleSprmPBrc10::Start(
rOut.GetFlyFrmAttr(RES_BOX) :rOut.GetAttr(RES_BOX));
const SvxBoxItem &rBoxItem = (const SvxBoxItem&)rItem;
SvxBoxItem aBox( rBoxItem );
-// rOut >> aBox;
+// rOut >> aBox;
SvxBorderLine aLine;
aBox.SetLine(SetBorder(&aLine, pBrc), nBrcTrans[nLine] );
Ww1SingleSprmPBrc::Start(rOut, nId, pBrc, nSize, rMan, aBox);
@@ -351,7 +351,7 @@ void Ww1SingleSprmPDyaLine::Start(
SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
if(TRUE)
{// MultilineSpace(proportional)
- long n = nSpace * 100 / 240; // W1: 240 = 100%, SW: 100 = 100%
+ long n = nSpace * 100 / 240; // W1: 240 = 100%, SW: 100 = 100%
if(n>200)
n = 200; // SW_UI-Maximum
aLSpc.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
@@ -369,17 +369,17 @@ void Ww1SingleSprmPChgTabsPapx::Start(
Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/)
{
#if OSL_DEBUG_LEVEL > 1
-// rOut << 'T';
+// rOut << 'T';
#endif
- short nLeftPMgn = 0; // Koordinaten etwa gleich ??
-// ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn
-// : nLeftParaMgn; // Absatz L-Space
+ short nLeftPMgn = 0; // Koordinaten etwa gleich ??
+// ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn
+// : nLeftParaMgn; // Absatz L-Space
short i;
BYTE nDel = pSprm[1];
- BYTE* pDel = pSprm + 2; // Del - Array
+ BYTE* pDel = pSprm + 2; // Del - Array
BYTE nIns = pSprm[nDel*2+2];
- BYTE* pIns = pSprm + 2*nDel + 3; // Ins - Array
+ BYTE* pIns = pSprm + 2*nDel + 3; // Ins - Array
W1_TBD* pTyp = (W1_TBD*)(pSprm + 2*nDel + 2*nIns + 3);// Typ - Array
SvxTabStopItem aAttr( (SvxTabStopItem&)rOut.GetNodeOrStyAttr( RES_PARATR_TABSTOP ));
@@ -399,10 +399,10 @@ void Ww1SingleSprmPChgTabsPapx::Start(
aTabStop.GetTabPos() = nPos;
switch( pTyp[i].jcGet() ){
case 0: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_LEFT; break;
- case 1: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_CENTER; break;
+ case 1: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_CENTER; break;
case 2: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_RIGHT; break;
- case 3: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL; break;
- case 4: continue; // ignoriere Bar
+ case 3: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL; break;
+ case 4: continue; // ignoriere Bar
}
switch( pTyp[i].tlcGet() ){
@@ -415,7 +415,7 @@ void Ww1SingleSprmPChgTabsPapx::Start(
USHORT nPos2 = aAttr.GetPos( nPos );
if( nPos2 != SVX_TAB_NOTFOUND )
- aAttr.Remove( nPos2, 1 ); // sonst weigert sich das Insert()
+ aAttr.Remove( nPos2, 1 ); // sonst weigert sich das Insert()
aAttr.Insert( aTabStop );
}
@@ -447,7 +447,7 @@ void Ww1SingleSprmSColumns::Start(
void Ww1SingleSprmPTtp::Start(
Ww1Shell& /*rOut*/, BYTE, BYTE*, USHORT, Ww1Manager& rMan)
{
- rMan.SetInTtp( TRUE ); // Besonderheit: wird bei InTable::Stop und
+ rMan.SetInTtp( TRUE ); // Besonderheit: wird bei InTable::Stop und
// nicht bei InTtp::Stop zurueckgesetzt,
// da Auswertung in InTable
}
@@ -491,7 +491,7 @@ void Ww1SingleSprmTDefTable10::Start(
Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT nSize, Ww1Manager& /*rMan*/)
{
USHORT i;
- BYTE *p = pSprm + 2; // LaengenWord ueberlesen
+ BYTE *p = pSprm + 2; // LaengenWord ueberlesen
BYTE nCount = *p;
p++;
nSize -= 3;
@@ -503,26 +503,26 @@ void Ww1SingleSprmTDefTable10::Start(
return;
// Erstmal die Zellenpositionen einlesen
- short nPos = SVBT16ToShort( p ); // signed, kann auch neg. sein !!!
+ short nPos = SVBT16ToShort( p ); // signed, kann auch neg. sein !!!
-// if( !rOut.IsTableWidthSet() ){ // Muss Tabellenbreite und -Ausrichtung
+// if( !rOut.IsTableWidthSet() ){ // Muss Tabellenbreite und -Ausrichtung
// noch gesetzt werden ?
{
short nWholeWidth = SVBT16ToShort( p + 2 * nCount ) - nPos;
- rOut.SetTableWidth( (USHORT)nWholeWidth ); // Tabellenbreite setzen
+ rOut.SetTableWidth( (USHORT)nWholeWidth ); // Tabellenbreite setzen
// Pos der Tabelle setzen
- long nMidTab = nPos + nWholeWidth / 2; // TabellenMitte
+ long nMidTab = nPos + nWholeWidth / 2; // TabellenMitte
const SwFrmFmt &rFmt = rOut.GetPageDesc().GetMaster();
const SvxLRSpaceItem& rLR = rFmt.GetLRSpace();
long nRight = rFmt.GetFrmSize().GetWidth()
- rLR.GetLeft() - rLR.GetRight();
sal_Int16 eOri = text::HoriOrientation::LEFT;
- if( nPos > MINLAY ){ // per Zuppeln positioniert
- if ( nMidTab <= nRight / 3 ) // 1/3 der Seite
+ if( nPos > MINLAY ){ // per Zuppeln positioniert
+ if ( nMidTab <= nRight / 3 ) // 1/3 der Seite
eOri = text::HoriOrientation::LEFT;
- else if ( nMidTab <= 2 * nRight / 3 ) // 2/3 der Seite
+ else if ( nMidTab <= 2 * nRight / 3 ) // 2/3 der Seite
eOri = text::HoriOrientation::CENTER;
else
eOri = text::HoriOrientation::RIGHT;
@@ -532,7 +532,7 @@ void Ww1SingleSprmTDefTable10::Start(
BYTE* pEndPos = p+2;
BYTE* pTc0 = ( nSize >= nCount * 10 ) ? pEndPos + 2 * nCount : 0;
- USHORT nCellsDeleted = 0; // fuer gemergte Zellen
+ USHORT nCellsDeleted = 0; // fuer gemergte Zellen
for( i = 0; i < nCount; i++ ){
// Info sammeln
@@ -549,10 +549,10 @@ void Ww1SingleSprmTDefTable10::Start(
pEndPos+=2;
nPos = nPos1;
- if( pTc0 ){ // gibts TCs ueberhaupt ?
+ if( pTc0 ){ // gibts TCs ueberhaupt ?
W1_TC* pTc2 = (W1_TC*)pTc0;
BOOL bMerged2 = pTc2->fMergedGet();
-// OSL_ENSURE( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" );
+// OSL_ENSURE( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" );
if( !bMerged2 ){
// und nun die Umrandungen
SvxBoxItem aBox( (SvxBoxItem&)rOut.GetCellAttr( RES_BOX ));
@@ -569,7 +569,7 @@ void Ww1SingleSprmTDefTable10::Start(
rOut.DeleteCell( i - nCellsDeleted );
nCellsDeleted++;
}
- pTc0+=sizeof(W1_TC); // 10
+ pTc0+=sizeof(W1_TC); // 10
}
}
}
@@ -589,41 +589,41 @@ void Ww1SingleSprmPpc::Start(
{
BYTE nPpc = SVBT8ToByte(pSprm);
- if (rOut.IsInTable()) // Flys in Tabellen kann PMW
- return; // nicht
+ if (rOut.IsInTable()) // Flys in Tabellen kann PMW
+ return; // nicht
- RndStdIds eAnchor; // Bindung
+ RndStdIds eAnchor; // Bindung
sal_Int16 eHRel; // Seite oder Seitenrand
sal_Int16 eVRel; // Seite oder Seitenrand
- switch ( ( nPpc & 0x30 ) >> 4 ){ // Y - Bindung bestimmt Sw-Bindung
+ switch ( ( nPpc & 0x30 ) >> 4 ){ // Y - Bindung bestimmt Sw-Bindung
case 0: eAnchor = FLY_AT_PARA; // Vert Margin
eVRel = text::RelOrientation::PRINT_AREA;
-// if( nYPos < 0 )
-// nYPos = 0; // koennen wir nicht
+// if( nYPos < 0 )
+// nYPos = 0; // koennen wir nicht
break;
-/* case 1:*/ // Vert. Seite
+/* case 1:*/ // Vert. Seite
default:eAnchor = FLY_AT_PAGE; // Vert Page oder unknown
eVRel = text::RelOrientation::FRAME;
- break; // 2=Vert. Paragraph, 3=Use Default
+ break; // 2=Vert. Paragraph, 3=Use Default
}
switch ( ( nPpc & 0xc0 ) >> 6 ){ // X - Bindung -> Koordinatentransformation
- case 0: // Hor. Spalte
- case 1: // Hor. Absatz
+ case 0: // Hor. Spalte
+ case 1: // Hor. Absatz
eHRel = text::RelOrientation::PRINT_AREA;
-// nXPos += nPgLeft; // in Seiten-Koordinaten umrechnen
+// nXPos += nPgLeft; // in Seiten-Koordinaten umrechnen
break;
-/* case 2:*/ // Hor. Seite
+/* case 2:*/ // Hor. Seite
default:
eHRel = text::RelOrientation::FRAME;
break;
}
if( !rOut.IsInFly() && rMan.IsInStyle() ){
- rOut.BeginFly( eAnchor ); // Starte StyleFly
+ rOut.BeginFly( eAnchor ); // Starte StyleFly
}else{
- rOut.SetFlyAnchor( eAnchor ); // Setze Anker
+ rOut.SetFlyAnchor( eAnchor ); // Setze Anker
}
}
@@ -633,21 +633,21 @@ void Ww1SingleSprmPDxaAbs::Start(
short nXPos = SVBT16ToShort(pSprm);
if( rMan.IsInStyle() && !rOut.IsInFly() ){
- rOut.BeginFly(); // Fly ohne PPc-Attribut
+ rOut.BeginFly(); // Fly ohne PPc-Attribut
}
sal_Int16 eHRel = text::RelOrientation::FRAME;
sal_Int16 eHAlign = text::HoriOrientation::NONE;
- switch( nXPos ){ // besondere X-Positionen ?
+ switch( nXPos ){ // besondere X-Positionen ?
case 0:
case -12: eHAlign = text::HoriOrientation::NONE; nXPos = 0; break; // Mogel: innen -> links
// eigentich text::HoriOrientation::LEFT, aber dann verrueckt
// ein Abstand nach aussen den Fly
case -4: eHAlign = text::HoriOrientation::CENTER; nXPos = 0; break; // zentriert
- case -8: // rechts
+ case -8: // rechts
case -16: eHAlign = text::HoriOrientation::RIGHT; nXPos = 0; break; // Mogel: aussen -> rechts
-// default: nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei
+// default: nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei
}
rOut.SetFlyXPos( nXPos, eHRel, eHAlign );
}
@@ -659,11 +659,11 @@ void Ww1SingleSprmPDyaAbs::Start(
sal_Int16 eVRel = text::RelOrientation::FRAME;
sal_Int16 eVAlign = text::VertOrientation::NONE;
- switch( nYPos ){ // besondere Y-Positionen ?
+ switch( nYPos ){ // besondere Y-Positionen ?
case -4: eVAlign = text::VertOrientation::TOP; nYPos = 0; break; // oben
case -8: eVAlign = text::VertOrientation::CENTER; nYPos = 0; break; // zentriert
case -12: eVAlign = text::VertOrientation::BOTTOM; nYPos = 0; break; // unten
-// default: nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei
+// default: nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei
}
rOut.SetFlyYPos( nYPos, eVRel, eVAlign );
}
@@ -678,7 +678,7 @@ void Ww1SingleSprmPDxaWidth::Start(
void Ww1SingleSprmPFromText::Start(
Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/)
{
- if( rOut.IsInFly() ){ // Kommt auch ausserhalb eines Flys vor, hat
+ if( rOut.IsInFly() ){ // Kommt auch ausserhalb eines Flys vor, hat
// dann aber offensichtlich nichts zu bedeuten.
// Einen impliziten Fly-Anfang bedeutet es
// definitiv nicht
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index 0cc2d7cf8c62..2009b93cda52 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -2,7 +2,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
@@ -56,22 +56,22 @@ struct W1_FIB /////////////////////////////////////////////////////////
SVBT16 fFlags;
USHORT fFlagsGet() {
return SVBT16ToShort(fFlags); }
- // SVBT16 fDot :1;// 0xa 0001
+ // SVBT16 fDot :1;// 0xa 0001
BOOL fDotGet() {
return 0 != ((fFlagsGet() >> 0) & 1); }
- // SVBT16 fGlsy :1;// 0002
+ // SVBT16 fGlsy :1;// 0002
BOOL fGlsyGet() {
return 0 != ((fFlagsGet() >> 1) & 1); }
- // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format.
+ // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format.
BOOL fComplexGet() {
return 0 != ((fFlagsGet() >> 2) & 1); }
- // SVBT16 fHasPic :1;// 0008 file contains 1 or more pictures
+ // SVBT16 fHasPic :1;// 0008 file contains 1 or more pictures
BOOL fHasPicGet() {
return 0 != ((fFlagsGet() >> 3) & 1); }
- // SVBT16 cQuickSaves :4;// 00F0 count of times file was quicksaved
+ // SVBT16 cQuickSaves :4;// 00F0 count of times file was quicksaved
USHORT cQuickSavesGet() {
return (USHORT)((fFlagsGet() >> 4) & 0xf); }
- // SVBT16 u1 :8;// FF00 unused
+ // SVBT16 u1 :8;// FF00 unused
USHORT u1Get() {
return (USHORT)((fFlagsGet() >> 8) & 0xff); }
SVBT16 nFibBack;// 0xc
@@ -213,46 +213,46 @@ struct W1_FIB /////////////////////////////////////////////////////////
SVBT32 fcPlcfsea;// 0xac file offset of PLC reserved for private use. The SEA is 6 bytes long.
ULONG fcPlcfseaGet() {
return SVBT32ToUInt32(fcPlcfsea); }
- SVBT16 cbPlcfsea;// 0xb0 count of bytes of private use PLC.
+ SVBT16 cbPlcfsea;// 0xb0 count of bytes of private use PLC.
USHORT cbPlcfseaGet() {
return SVBT16ToShort(cbPlcfsea); }
- SVBT32 fcSttbfffn;// 0xb2 file offset of font information STTBF. See the FFN file structure definition.
+ SVBT32 fcSttbfffn;// 0xb2 file offset of font information STTBF. See the FFN file structure definition.
ULONG fcSttbfffnGet() {
return SVBT32ToUInt32(fcSttbfffn); }
- SVBT16 cbSttbfffn;// 0xb6 count of bytes in sttbfffn.
+ SVBT16 cbSttbfffn;// 0xb6 count of bytes in sttbfffn.
USHORT cbSttbfffnGet() {
return SVBT16ToShort(cbSttbfffn); }
- SVBT32 fcPlcffldMom;// 0xb8 offset in doc stream to the PLC of field positions in the main document.
+ SVBT32 fcPlcffldMom;// 0xb8 offset in doc stream to the PLC of field positions in the main document.
ULONG fcPlcffldMomGet() {
return SVBT32ToUInt32(fcPlcffldMom); }
SVBT16 cbPlcffldMom;// 0xbc
USHORT cbPlcffldMomGet() {
return SVBT16ToShort(cbPlcffldMom); }
- SVBT32 fcPlcffldHdr;// 0xbe offset in doc stream to the PLC of field positions in the header subdocument.
+ SVBT32 fcPlcffldHdr;// 0xbe offset in doc stream to the PLC of field positions in the header subdocument.
ULONG fcPlcffldHdrGet() {
return SVBT32ToUInt32(fcPlcffldHdr); }
SVBT16 cbPlcffldHdr;// 0xc2
USHORT cbPlcffldHdrGet() {
return SVBT16ToShort(cbPlcffldHdr); }
- SVBT32 fcPlcffldFtn;// 0xc4 offset in doc stream to the PLC of field positions in the footnote subdocument.
+ SVBT32 fcPlcffldFtn;// 0xc4 offset in doc stream to the PLC of field positions in the footnote subdocument.
ULONG fcPlcffldFtnGet() {
return SVBT32ToUInt32(fcPlcffldFtn); }
SVBT16 cbPlcffldFtn;// 0xc8
USHORT cbPlcffldFtnGet() {
return SVBT16ToShort(cbPlcffldFtn); }
- SVBT32 fcPlcffldAtn;// 0xca offset in doc stream to the PLC of field positions in the annotation subdocument.
+ SVBT32 fcPlcffldAtn;// 0xca offset in doc stream to the PLC of field positions in the annotation subdocument.
ULONG fcPlcffldAtnGet() {
return SVBT32ToUInt32(fcPlcffldAtn); }
SVBT16 cbPlcffldAtn;// 0xce
USHORT cbPlcffldAtnGet() {
return SVBT16ToShort(cbPlcffldAtn); }
- SVBT32 fcPlcffldMcr;// 0xd0 offset in doc stream to the PLC of field positions in the macro subdocument.
+ SVBT32 fcPlcffldMcr;// 0xd0 offset in doc stream to the PLC of field positions in the macro subdocument.
ULONG fcPlcffldMcrGet() {
return SVBT32ToUInt32(fcPlcffldMcr); }
SVBT16 cbPlcffldMcr;// 0xd4
@@ -419,13 +419,13 @@ struct W1_DOP ///////////////////////////////////// Document Properties
// SVBT16 irmProps : 7;
USHORT irmPropsGet() {
return (USHORT)((fRvsFlagsGet() >> 8) & 0x7f); }
- // SVBT16 fRevMarking : 1;// when 1, Word will mark revisions as the document is edited
+ // SVBT16 fRevMarking : 1;// when 1, Word will mark revisions as the document is edited
BOOL fRevMarkingGet() {
return 0 != ((fRvsFlagsGet() >> 15) & 1); }
SVBT16 fSveFlags;
USHORT fSveFlagsGet() {
return SVBT16ToShort(fSveFlags); }
- // SVBT16 fBackup : 1;// always make backup when document saved when 1.
+ // SVBT16 fBackup : 1;// always make backup when document saved when 1.
BOOL fBackupGet() {
return 0 != ((fSveFlagsGet() >> 0) & 1); }
// SVBT16 fExactCWords : 1;
@@ -437,10 +437,10 @@ struct W1_DOP ///////////////////////////////////// Document Properties
// SVBT16 fPagResults : 1;
BOOL fPagResultsGet() {
return 0 != ((fSveFlagsGet() >> 3) & 1); }
- // SVBT16 fLockAtn : 1;// when 1, annotations are locked for editing
+ // SVBT16 fLockAtn : 1;// when 1, annotations are locked for editing
BOOL fLockAtnGet() {
return 0 != ((fSveFlagsGet() >> 4) & 1); }
- // SVBT16 fMirrorMargins : 1;// swap margins on left/right pages when 1.
+ // SVBT16 fMirrorMargins : 1;// swap margins on left/right pages when 1.
BOOL fMirrorMarginsGet() {
return 0 != ((fSveFlagsGet() >> 5) & 1); }
// SVBT16 : 10;// unused
@@ -468,80 +468,80 @@ struct W1_DOP ///////////////////////////////////// Document Properties
SVBT16 dxaGutter;
USHORT dxaGutterGet() {
return SVBT16ToShort(dxaGutter); }
- SVBT16 dxaTab;// 720 twips default tab width
+ SVBT16 dxaTab;// 720 twips default tab width
USHORT dxaTabGet() {
return SVBT16ToShort(dxaTab); }
- SVBT16 wSpare;//
+ SVBT16 wSpare;//
USHORT wSpareGet() {
return SVBT16ToShort(wSpare); }
- SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips
+ SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips
USHORT dxaHotZGet() {
return SVBT16ToShort(dxaHotZ); }
- SVBT16 rgwSpare[2];// reserved
- SVBT32 dttmCreated;// DTTM date and time document was created
+ SVBT16 rgwSpare[2];// reserved
+ SVBT32 dttmCreated;// DTTM date and time document was created
ULONG dttmCreatedGet() {
return SVBT32ToUInt32(dttmCreated); }
- SVBT32 dttmRevised;// DTTM date and time document was last revised
+ SVBT32 dttmRevised;// DTTM date and time document was last revised
ULONG dttmRevisedGet() {
return SVBT32ToUInt32(dttmRevised); }
- SVBT32 dttmLastPrint;// DTTM date and time document was last printed
+ SVBT32 dttmLastPrint;// DTTM date and time document was last printed
ULONG dttmLastPrintGet() {
return SVBT32ToUInt32(dttmLastPrint); }
- SVBT16 nRevision;// number of times document has been revised since its creation
+ SVBT16 nRevision;// number of times document has been revised since its creation
USHORT nRevisionGet() {
return SVBT16ToShort(nRevision); }
- SVBT32 tmEdited;// time document was last edited
+ SVBT32 tmEdited;// time document was last edited
ULONG tmEditedGet() {
return SVBT32ToUInt32(tmEdited); }
- SVBT32 cWords;// count of words tallied by last Word Count execution
+ SVBT32 cWords;// count of words tallied by last Word Count execution
ULONG cWordsGet() {
return SVBT32ToUInt32(cWords); }
- SVBT32 cCh;// count of characters tallied by last Word Count execution
+ SVBT32 cCh;// count of characters tallied by last Word Count execution
ULONG cChGet() {
return SVBT32ToUInt32(cCh); }
- SVBT16 cPg;// count of pages tallied by last Word Count execution
+ SVBT16 cPg;// count of pages tallied by last Word Count execution
USHORT cPgGet() {
return SVBT16ToShort(cPg); }
- SVBT16 rgwSpareDocSum[2];
+ SVBT16 rgwSpareDocSum[2];
};
// cbDOP is 66.
struct W1_CHP /////////////////////////////////////////////////////////
{
- SVBT16 fChar;
- SVBT16 ftc;// Font Code
- SVBT8 hps;// Font size in half points
- SVBT8 hpsPos;// Sub/Superscript ( signed number, 0 = normal )
- SVBT16 fText;
- SVBT32 fcPic;// not stored in File
- SVBT8 fnPic;// internal
- SVBT16 hpsLargeChp;// ???
+ SVBT16 fChar;
+ SVBT16 ftc;// Font Code
+ SVBT8 hps;// Font size in half points
+ SVBT8 hpsPos;// Sub/Superscript ( signed number, 0 = normal )
+ SVBT16 fText;
+ SVBT32 fcPic;// not stored in File
+ SVBT8 fnPic;// internal
+ SVBT16 hpsLargeChp;// ???
W1_CHP() { memset( this, 0, sizeof( *this)); }
- USHORT fCharGet() { return SVBT16ToShort(fChar); }
+ USHORT fCharGet() { return SVBT16ToShort(fChar); }
void fCharSet(USHORT n) { ShortToSVBT16(n, fChar); }
- BOOL fBoldGet() { return 0 != ((fCharGet() >> 0) & 1); }
- void fBoldSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffe ) | ( b << 0 ) ); }
- BOOL fItalicGet() { return 0 != ((fCharGet() >> 1) & 1); }
+ BOOL fBoldGet() { return 0 != ((fCharGet() >> 0) & 1); }
+ void fBoldSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffe ) | ( b << 0 ) ); }
+ BOOL fItalicGet() { return 0 != ((fCharGet() >> 1) & 1); }
void fItalicSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffd ) | ( b << 1 ) ); }
- BOOL fStrikeGet() { return 0 != ((fCharGet() >> 2) & 1); }
- BOOL fOutlineGet() { return 0 != ((fCharGet() >> 3) & 1); }
- BOOL fFldVanishGet() { return 0 != ((fCharGet() >> 4) & 1); }
- BOOL fSmallCapsGet() { return 0 != ((fCharGet() >> 5) & 1); }
- BOOL fCapsGet() { return 0 != ((fCharGet() >> 6) & 1); }
- BOOL fVanishGet() { return 0 != ((fCharGet() >> 7) & 1); }
- BOOL fRMarkGet() { return 0 != ((fCharGet() >> 8) & 1); }
- BOOL fSpecGet() { return 0 != ((fCharGet() >> 9) & 1); }
- BOOL fsIcoGet() { return 0 != ((fCharGet() >> 10) & 1); }
- BOOL fsFtcGet() { return 0 != ((fCharGet() >> 11) & 1); }
- void fsFtcSet(BOOL b) { fCharSet( ( fCharGet() & 0xf7ff ) | ( b << 11 ) ); }
- BOOL fsHpsGet() { return 0 != ((fCharGet() >> 12) & 1); }
- void fsHpsSet(BOOL b) { fCharSet( ( fCharGet() & 0xefff ) | ( b << 12 ) ); }
- BOOL fsKulGet() { return 0 != ((fCharGet() >> 13) & 1); }
- void fsKulSet(BOOL b) { fCharSet( ( fCharGet() & 0xdfff ) | ( b << 13 ) ); }
- BOOL fsPosGet() { return 0 != ((fCharGet() >> 14) & 1); }
- BOOL fsSpaceGet() { return 0 != ((fCharGet() >> 15) & 1); }
+ BOOL fStrikeGet() { return 0 != ((fCharGet() >> 2) & 1); }
+ BOOL fOutlineGet() { return 0 != ((fCharGet() >> 3) & 1); }
+ BOOL fFldVanishGet() { return 0 != ((fCharGet() >> 4) & 1); }
+ BOOL fSmallCapsGet() { return 0 != ((fCharGet() >> 5) & 1); }
+ BOOL fCapsGet() { return 0 != ((fCharGet() >> 6) & 1); }
+ BOOL fVanishGet() { return 0 != ((fCharGet() >> 7) & 1); }
+ BOOL fRMarkGet() { return 0 != ((fCharGet() >> 8) & 1); }
+ BOOL fSpecGet() { return 0 != ((fCharGet() >> 9) & 1); }
+ BOOL fsIcoGet() { return 0 != ((fCharGet() >> 10) & 1); }
+ BOOL fsFtcGet() { return 0 != ((fCharGet() >> 11) & 1); }
+ void fsFtcSet(BOOL b) { fCharSet( ( fCharGet() & 0xf7ff ) | ( b << 11 ) ); }
+ BOOL fsHpsGet() { return 0 != ((fCharGet() >> 12) & 1); }
+ void fsHpsSet(BOOL b) { fCharSet( ( fCharGet() & 0xefff ) | ( b << 12 ) ); }
+ BOOL fsKulGet() { return 0 != ((fCharGet() >> 13) & 1); }
+ void fsKulSet(BOOL b) { fCharSet( ( fCharGet() & 0xdfff ) | ( b << 13 ) ); }
+ BOOL fsPosGet() { return 0 != ((fCharGet() >> 14) & 1); }
+ BOOL fsSpaceGet() { return 0 != ((fCharGet() >> 15) & 1); }
// SVBT16 fBold :1;// 1 == opposite boldness of style
// SVBT16 fItalic :1;// 1 == opposite of style
// SVBT16 fStrike :1;// 1 == opposite of style
@@ -559,28 +559,28 @@ struct W1_CHP /////////////////////////////////////////////////////////
// SVBT16 fsPos :1;// 1 == Char position (hpsPos) different to style
// SVBT16 fsSpace :1;// 1 == Char Spacing (qpsSpace) different to style
- USHORT ftcGet() { return SVBT16ToShort(ftc); }
- void ftcSet(USHORT n) { ShortToSVBT16(n, ftc); }
- void hpsSet(BYTE n) { ByteToSVBT8(n, hps); }
- BYTE hpsGet() { return SVBT8ToByte(hps); }
+ USHORT ftcGet() { return SVBT16ToShort(ftc); }
+ void ftcSet(USHORT n) { ShortToSVBT16(n, ftc); }
+ void hpsSet(BYTE n) { ByteToSVBT8(n, hps); }
+ BYTE hpsGet() { return SVBT8ToByte(hps); }
- BYTE hpsPosGet() { return SVBT8ToByte(hpsPos); }
- USHORT fTextGet() { return SVBT16ToShort(fText); }
+ BYTE hpsPosGet() { return SVBT8ToByte(hpsPos); }
+ USHORT fTextGet() { return SVBT16ToShort(fText); }
void fTextSet(USHORT n) { ShortToSVBT16(n, fText); }
- USHORT qpsSpaceGet() { return (USHORT)((fTextGet() >> 0) & 0x3f); }
- USHORT wSpare2Get() { return (USHORT)((fTextGet() >> 6) & 3); }
- USHORT icoGet() { return (USHORT)((fTextGet() >> 8) & 0xf); }
- USHORT kulGet() { return (USHORT)((fTextGet() >> 12) & 7); }
- void kulSet(USHORT n) { fTextSet( ( fTextGet() & 0x8fff ) | ( ( n & 7 ) << 12 ) ); }
- BOOL fSysVanishGet() { return 0 != ((fTextGet() >> 15) & 1); }
+ USHORT qpsSpaceGet() { return (USHORT)((fTextGet() >> 0) & 0x3f); }
+ USHORT wSpare2Get() { return (USHORT)((fTextGet() >> 6) & 3); }
+ USHORT icoGet() { return (USHORT)((fTextGet() >> 8) & 0xf); }
+ USHORT kulGet() { return (USHORT)((fTextGet() >> 12) & 7); }
+ void kulSet(USHORT n) { fTextSet( ( fTextGet() & 0x8fff ) | ( ( n & 7 ) << 12 ) ); }
+ BOOL fSysVanishGet() { return 0 != ((fTextGet() >> 15) & 1); }
// SVBT16 qpsSpace :6;// Char Spacing, -7 .. 56; 57 = -7, 63 = -1
// SVBT16 wSpare2 : 2;// reserved
// SVBT16 ico :4;// color of Text: 0=black, 1=blue, 2=cyan, 3=green, 4=magenta, 5=red, 6=yellow, 7=white
// SVBT16 kul: 3;// Underline code: 0=none, 1=single, 2=by word, 3=double, 4=dotted
// SVBT16 fSysVanish: 1;// used internally
- ULONG fcPicGet() { return SVBT32ToUInt32(fcPic); }
- USHORT fnPicGet() { return SVBT8ToByte(fnPic); }
+ ULONG fcPicGet() { return SVBT32ToUInt32(fcPic); }
+ USHORT fnPicGet() { return SVBT8ToByte(fnPic); }
USHORT hpsLargeChpGet() { return SVBT16ToShort(hpsLargeChp); }
void Out(Ww1Shell&, Ww1Manager&);
@@ -588,24 +588,24 @@ struct W1_CHP /////////////////////////////////////////////////////////
struct W1_FFN ///////////////////////////////////////// Font Descriptor
{
- SVBT8 cbFfnM1;// 0x0 total length of FFN - 1.
+ SVBT8 cbFfnM1;// 0x0 total length of FFN - 1.
USHORT cbFfnM1Get() {
return SVBT8ToByte(cbFfnM1); }
SVBT8 fFlags;
USHORT fFlagsGet() {
return SVBT8ToByte(fFlags); }
- // SVBT8 prg : 2;// 0x1:03 pitch request
+ // SVBT8 prg : 2;// 0x1:03 pitch request
USHORT prgGet() {
return (USHORT)((fFlagsGet() >> 0) & 3); }
- // SVBT8 fTrueType : 1;// 0x1:04 when 1, font is a TrueType font
+ // SVBT8 fTrueType : 1;// 0x1:04 when 1, font is a TrueType font
BOOL fTrueTypeGet() {
return 0 != ((fFlagsGet() >> 2) & 1); }
- // SVBT8 : 1;// 0x1:08 reserved
- // SVBT8 ff : 3;// 0x1:70 font family id
+ // SVBT8 : 1;// 0x1:08 reserved
+ // SVBT8 ff : 3;// 0x1:70 font family id
USHORT ffGet() {
return (USHORT)((fFlagsGet() >> 4) & 7); }
- // SVBT8 : 1;// 0x1:80 reserved
- BYTE szFfn[65];// 0x6 zero terminated string that records name of font.
+ // SVBT8 : 1;// 0x1:80 reserved
+ BYTE szFfn[65];// 0x6 zero terminated string that records name of font.
// Vorsicht: Dieses Array kann auch kleiner sein!!!
// Possibly followed by a second sz which records the name of an
// alternate font to use if the first named font does not exist
@@ -664,14 +664,14 @@ struct W1_BRC //////////////////////////////////////////// Border Code
// 3 == double
BYTE brcTypeGet() {
return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 3) & 0x0003); }
- // SVBT16 fShadow : 1;// 0020 when 1, border is drawn with shadow. Must be 0
+ // SVBT16 fShadow : 1;// 0020 when 1, border is drawn with shadow. Must be 0
// when BRC is a substructure of the TC
BYTE fShadowGet() {
return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 5) & 0x0001); }
// SVBT16 ico : 5;// 07C0 color code (see chp.ico)
BYTE icoGet() {
return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 6) & 0x001f); }
- // SVBT16 dxpSpace : 5;// F800 width of space to maintain between border and
+ // SVBT16 dxpSpace : 5;// F800 width of space to maintain between border and
// text within border. Must be 0 when BRC is a
// substructure of the TC. Stored in points for Windows.
BYTE dxpSpaceGet() {
@@ -729,83 +729,83 @@ struct W1_PIC /////////////////////////////////////// PictureStructure
USHORT cbHeaderGet() {
return SVBT16ToShort(cbHeader); }
struct MFP {
- SVBT16 mm;// 0x6 int
+ SVBT16 mm;// 0x6 int
USHORT mmGet() {
return SVBT16ToShort(mm); }
- SVBT16 xExt;// 0x8 int
+ SVBT16 xExt;// 0x8 int
USHORT xExtGet() {
return SVBT16ToShort(xExt); }
- SVBT16 yExt;// 0xa int
+ SVBT16 yExt;// 0xa int
USHORT yExtGet() {
return SVBT16ToShort(yExt); }
- SVBT16 hMF;// 0xc int
+ SVBT16 hMF;// 0xc int
USHORT hMFGet() {
return SVBT16ToShort(hMF); }
} mfp;
union W1_MFP_BMP {
- SVBT8 bm[14];// 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
- SVBT8 rcWinMF[14];// 0xe rc (rectangle - 8 bytes) rect for window origin and extents when metafile is stored -- ignored if 0
+ SVBT8 bm[14];// 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
+ SVBT8 rcWinMF[14];// 0xe rc (rectangle - 8 bytes) rect for window origin and extents when metafile is stored -- ignored if 0
} MFP_BMP;
- SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
+ SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
USHORT dxaGoalGet() {
return SVBT16ToShort(dxaGoal); }
- SVBT16 dyaGoal;// 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
+ SVBT16 dyaGoal;// 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
USHORT dyaGoalGet() {
return SVBT16ToShort(dyaGoal); }
- SVBT16 mx;// 0x20 horizontal scaling factor supplied by user in .1% units.
+ SVBT16 mx;// 0x20 horizontal scaling factor supplied by user in .1% units.
USHORT mxGet() {
return SVBT16ToShort(mx); }
- SVBT16 my;// 0x22 vertical scaling factor supplied by user in .1% units.
+ SVBT16 my;// 0x22 vertical scaling factor supplied by user in .1% units.
USHORT myGet() {
return SVBT16ToShort(my); }
- SVBT16 dxaCropLeft;// 0x24 the amount the picture has been cropped on the left in twips.
+ SVBT16 dxaCropLeft;// 0x24 the amount the picture has been cropped on the left in twips.
USHORT dxaCropLeftGet() {
return SVBT16ToShort(dxaCropLeft); }
- SVBT16 dyaCropTop;// 0x26 the amount the picture has been cropped on the top in twips.
+ SVBT16 dyaCropTop;// 0x26 the amount the picture has been cropped on the top in twips.
USHORT dyaCropTopGet() {
return SVBT16ToShort(dyaCropTop); }
SVBT16 dxaCropRight;// 0x28 the amount the picture has been cropped on the right in twips.
USHORT dxaCropRightGet() {
return SVBT16ToShort(dxaCropRight); }
- SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
+ SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
USHORT dyaCropBottomGet() {
return SVBT16ToShort(dyaCropBottom); }
SVBT16 flags;
USHORT flagsGet() {
return SVBT16ToShort(flags); }
-// brcl : 4;// 000F Obsolete, superseded by brcTop, etc. In
+// brcl : 4;// 000F Obsolete, superseded by brcTop, etc. In
BYTE brclGet() {
return sal::static_int_cast< BYTE, sal_uInt16 >(flagsGet() & 0xf); }
-// fFrameEmpty : 1;// 0010 picture consists of a single frame
+// fFrameEmpty : 1;// 0010 picture consists of a single frame
BOOL fFrameEmptyGet() {
return sal::static_int_cast< BYTE, sal_uInt16 >((flagsGet() >> 4) & 1); }
// win6 stuff:
-// fBitmap : 1;// 0020 ==1, when picture is just a bitmap
-// BOOL fBitmapGet() {
-// return (flagsGet() >> 5) & 1; }
-// fDrawHatch : 1;// 0040 ==1, when picture is an active OLE object
-// BOOL fDrawHatchGet() {
-// return (flagsGet() >> 6) & 1; }
-// fError : 1;// 0080 ==1, when picture is just an error message
-// BOOL fErrorGet() {
-// return (flagsGet() >> 7) & 1; }
-// bpp : 8;// FF00 bits per pixel, 0 = unknown
-// BYTE bppGet() {
-// return (flagsGet() >> 8) & 0xff; }
-// SVBT16 rgbrc[4];
-// USHORT rgbrcGet(USHORT nIndex) {
-// return SVBT16ToShort(rgbrc[nIndex]); }
-// W1_BRC brcTop;// 0x2e specification for border above picture
-// W1_BRC brcLeft;// 0x30 specification for border to the left
-// W1_BRC brcBottom;// 0x32 specification for border below picture
-// W1_BRC brcRight;// 0x34 specification for border to the right
-// SVBT16 dxaOrigin;// 0x36 horizontal offset of hand annotation origin
-// USHORT dxaOriginGet() {
-// return SVBT16ToShort(dxaOrigin); }
-// SVBT16 dyaOrigin;// 0x38 vertical offset of hand annotation origin
-// USHORT dyaOriginGet() {
-// return SVBT16ToShort(dyaOrigin); }
- SVBT8 rgb;// 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
+// fBitmap : 1;// 0020 ==1, when picture is just a bitmap
+// BOOL fBitmapGet() {
+// return (flagsGet() >> 5) & 1; }
+// fDrawHatch : 1;// 0040 ==1, when picture is an active OLE object
+// BOOL fDrawHatchGet() {
+// return (flagsGet() >> 6) & 1; }
+// fError : 1;// 0080 ==1, when picture is just an error message
+// BOOL fErrorGet() {
+// return (flagsGet() >> 7) & 1; }
+// bpp : 8;// FF00 bits per pixel, 0 = unknown
+// BYTE bppGet() {
+// return (flagsGet() >> 8) & 0xff; }
+// SVBT16 rgbrc[4];
+// USHORT rgbrcGet(USHORT nIndex) {
+// return SVBT16ToShort(rgbrc[nIndex]); }
+// W1_BRC brcTop;// 0x2e specification for border above picture
+// W1_BRC brcLeft;// 0x30 specification for border to the left
+// W1_BRC brcBottom;// 0x32 specification for border below picture
+// W1_BRC brcRight;// 0x34 specification for border to the right
+// SVBT16 dxaOrigin;// 0x36 horizontal offset of hand annotation origin
+// USHORT dxaOriginGet() {
+// return SVBT16ToShort(dxaOrigin); }
+// SVBT16 dyaOrigin;// 0x38 vertical offset of hand annotation origin
+// USHORT dyaOriginGet() {
+// return SVBT16ToShort(dyaOrigin); }
+ SVBT8 rgb;// 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
BYTE* rgbGet() {
return rgb; }
};
@@ -818,11 +818,11 @@ struct W1_TBD /////////////////////////////////////////////////////////
// SVBT8 jc : 3;// 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar
BYTE jcGet() {
return aBits1Get() & 0x07; }
-// SVBT8 tlc : 3;// 0x38 tab leader code: 0=no leader, 1=dotted leader,
+// SVBT8 tlc : 3;// 0x38 tab leader code: 0=no leader, 1=dotted leader,
// 2=hyphenated leader, 3=single line leader, 4=heavy line leader
BYTE tlcGet() {
return (aBits1Get() >> 3 ) & 0x07; }
-// * int :2 C0 reserved
+// * int :2 C0 reserved
};
struct W1_TC //////////////////////////////////////////////////////////
@@ -835,9 +835,9 @@ struct W1_TC //////////////////////////////////////////////////////////
BYTE fMergedGet() {
return (aBits1Get() >> 1 ) & 0x01; }
SVBT8 aBits2;
-// SVBT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
-// SVBT16 fMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell.
-// SVBT16 fUnused : 14;// FFFC reserved
+// SVBT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
+// SVBT16 fMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell.
+// SVBT16 fUnused : 14;// FFFC reserved
W1_BRC10 rgbrc[4];// notational convenience for referring to brcTop, brcLeft, etc fields.
W1_BRC10* rgbrcGet() {
return rgbrc; }
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index 6d2f1e8d793b..545a33843ab8 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -2,7 +2,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
@@ -35,13 +35,13 @@
#include "writerwordglue.hxx"
#include "wrtww8.hxx"
-namespace sw
+namespace sw
{
using sw::types::msword_cast;
WW8FFData::WW8FFData()
- :
+ :
mnType(0),
mnResult(0),
mbOwnHelp(false),
@@ -66,7 +66,7 @@ void WW8FFData::setHelp(const ::rtl::OUString & rHelp)
msHelp = rHelp;
mbOwnHelp = true;
}
-
+
void WW8FFData::setStatus(const ::rtl::OUString & rStatus)
{
msStatus = rStatus;
@@ -84,13 +84,13 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const ::rtl::OUString & rStr
{
sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength());
*pDataStrm << nStrLen;
- SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero);
+ SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero);
}
void WW8FFData::Write(SvStream * pDataStrm)
{
ULONG nDataStt = pDataStrm->Tell();
-
+
static const sal_uInt8 aHeader[] =
{
0,0,0,0, // len of struct
@@ -107,72 +107,72 @@ void WW8FFData::Write(SvStream * pDataStrm)
0xff, 0xff, 0xff, 0xff,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
-
+
aData[4] = mnType | (mnResult << 2);
-
+
if (mbOwnHelp)
aData[4] |= (1 << 7);
-
+
aData[5] = (mnTextType << 3);
if (mbOwnStat)
aData[5] |= 1;
-
+
if (mbProtected)
aData[5] |= (1 << 1);
-
+
if (mbSize)
aData[5] |= (1 << 2);
-
+
if (mbRecalc)
aData[5] |= (1 << 6);
-
+
if (mbListBox)
aData[5] |= (1 << 7);
-
+
aData[6] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen & 0xffff);
aData[7] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen >> 8);
aData[8] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight & 0xffff);
aData[9] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight >> 8);
-
+
pDataStrm->Write(aData, sizeof(aData));
-
+
WriteOUString(pDataStrm, msName, true);
-
+
if (mnType == 0)
WriteOUString(pDataStrm, msDefault, true);
else
*pDataStrm << mnDefault;
-
+
WriteOUString(pDataStrm, msFormat, true);
WriteOUString(pDataStrm, msHelp, true);
WriteOUString(pDataStrm, msStatus, true);
WriteOUString(pDataStrm, msMacroEnter, true);
WriteOUString(pDataStrm, msMacroExit, true);
-
+
if (mnType == 2)
{
sal_uInt8 aData1[2] = { 0xff, 0xff };
pDataStrm->Write(aData1, sizeof(aData1));
-
+
sal_uInt32 nListboxEntries = msListEntries.size();
*pDataStrm << nListboxEntries;
-
+
::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin();
-
+
while (aIt != msListEntries.end())
{
const ::rtl::OUString & rEntry = *aIt;
WriteOUString(pDataStrm, rEntry, false);
-
+
aIt++;
}
}
-
+
SwWW8Writer::WriteLong( *pDataStrm, nDataStt,
pDataStrm->Tell() - nDataStt );
}
-
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx
index fcb46d5ff987..8ad7967b55f3 100644
--- a/sw/source/filter/ww8/WW8FFData.hxx
+++ b/sw/source/filter/ww8/WW8FFData.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ private:
sal_uInt8 mnType; // :2 0x3
sal_uInt8 mnResult; // :5 0x7c
bool mbOwnHelp; // :1 0x80
-
+
// offset 5
bool mbOwnStat; // :1 0x01
bool mbProtected; // :1 0x02
@@ -49,13 +49,13 @@ private:
sal_uInt8 mnTextType; // :3 0x38
bool mbRecalc; // :1 0x4
bool mbListBox; // :1 0x80
-
+
// offset 6
sal_uInt16 mnMaxLen; // :15 0x7fff maximum length of text field, 0 <=> no limit
-
+
// offset 8
sal_uInt16 mnCheckboxHeight;
-
+
// offset 10 and beyond
::rtl::OUString msName;
::rtl::OUString msDefault; // only for type == 0
@@ -65,16 +65,16 @@ private:
::rtl::OUString msStatus;
::rtl::OUString msMacroEnter;
::rtl::OUString msMacroExit;
-
+
::std::vector< ::rtl::OUString > msListEntries;
-
+
protected:
void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero);
-
+
public:
WW8FFData();
~WW8FFData();
-
+
void setType(sal_uInt8 nType) { mnType = nType; }
sal_uInt8 getType() const { return mnType; }
void setResult(sal_uInt8 nResult) { mnResult = nResult; }
@@ -109,9 +109,9 @@ public:
const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; }
void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; }
const ::rtl::OUString & getMacroExit() const { return msMacroExit; }
-
+
void addListboxEntry(const ::rtl::OUString & rEntry);
-
+
void Write(SvStream * pDataStrm);
};
}
diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx
index 5226f4b0d669..6a9cddd71052 100644
--- a/sw/source/filter/ww8/WW8FibData.cxx
+++ b/sw/source/filter/ww8/WW8FibData.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx
index b6a886be9886..0fd655dd861f 100644
--- a/sw/source/filter/ww8/WW8FibData.hxx
+++ b/sw/source/filter/ww8/WW8FibData.hxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ public:
void setReadOnlyRecommended(bool bReadOnlyRecommended);
void setWriteReservation(bool bWriteReservation);
-
+
bool getReadOnlyRecommended() const;
bool getWriteReservation() const;
};
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx
index 07271945430a..28f3135baf74 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -2,7 +2,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
@@ -41,66 +41,66 @@ namespace ww8
: mn_offset(0), mn_size(nSize)
{
rSt.Seek(nPos);
-
+
mp_data.reset(new BYTE[nSize]);
- rSt.Read(mp_data.get(), nSize);
+ rSt.Read(mp_data.get(), nSize);
}
-
+
WW8Struct::WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize)
- : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos),
+ : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos),
mn_size(nSize)
{
}
-
+
WW8Struct::~WW8Struct()
{
}
-
+
sal_uInt8 WW8Struct::getU8(sal_uInt32 nOffset)
{
sal_uInt8 nResult = 0;
-
+
if (nOffset < mn_size)
{
nResult = mp_data[mn_offset + nOffset];
}
-
+
return nResult;
}
-
- ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset,
+
+ ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset,
sal_uInt32 nCount)
{
::rtl::OUString aResult;
-
+
if (nCount > 0)
{
rtl_uString * pNew = 0;
rtl_uString_newFromStr_WithLength
(&pNew, reinterpret_cast<const sal_Unicode *>(&mp_data[mn_offset + nOffset]),
nCount);
-
+
aResult = rtl::OUString(pNew);
}
#ifdef DEBUG
char sBuffer[256];
- snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"",
+ snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"",
nOffset, nCount);
- ::std::clog << "<WW8Struct-getUString" << sBuffer << ">"
- << dbg_out(aResult) << "</WW8Struct-getUString>"
+ ::std::clog << "<WW8Struct-getUString" << sBuffer << ">"
+ << dbg_out(aResult) << "</WW8Struct-getUString>"
<< ::std::endl;
#endif
return aResult;
-
+
}
- ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset,
+ ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset,
sal_uInt32 nCount)
{
::rtl::OUString aResult;
-
+
if (nCount > 0)
{
::rtl::OString aOStr(reinterpret_cast<const sal_Char *>(&mp_data[mn_offset + nOffset]),
@@ -108,17 +108,17 @@ namespace ww8
::rtl::OUString aOUStr(rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_ASCII_US));
aResult = rtl::OUString(aOUStr);
}
-
+
#ifdef DEBUG
char sBuffer[256];
- snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"",
+ snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"",
nOffset, nCount);
- ::std::clog << "<WW8Struct-getString " << sBuffer << ">"
- << dbg_out(aResult) << "</WW8Struct-getUString>"
+ ::std::clog << "<WW8Struct-getString " << sBuffer << ">"
+ << dbg_out(aResult) << "</WW8Struct-getUString>"
<< ::std::endl;
#endif
- return aResult;
+ return aResult;
}
}
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 0741a221a248..e1ce52815788 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -2,7 +2,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
@@ -37,31 +37,31 @@
namespace ww8
{
typedef boost::shared_array<BYTE> DataArray_t;
-
+
class WW8Struct : public ::sw::ExternalData
{
DataArray_t mp_data;
sal_uInt32 mn_offset;
sal_uInt32 mn_size;
-
+
public:
WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize);
WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize);
virtual ~WW8Struct();
-
+
sal_uInt8 getU8(sal_uInt32 nOffset);
- sal_uInt16 getU16(sal_uInt32 nOffset)
+ sal_uInt16 getU16(sal_uInt32 nOffset)
{ return getU8(nOffset) + (getU8(nOffset + 1) << 8); }
sal_uInt32 getU32(sal_uInt32 nOffset)
{ return getU16(nOffset) + (getU16(nOffset + 1) << 16); }
-
+
::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
-
+
::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount);
};
-
+
typedef ::std::vector<rtl::OUString> StringVector_t;
template <class T>
class WW8Sttb : public WW8Struct
@@ -71,11 +71,11 @@ typedef ::std::vector<rtl::OUString> StringVector_t;
bool bDoubleByteCharacters;
StringVector_t m_Strings;
ExtrasVector_t m_Extras;
-
+
public:
WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize);
virtual ~WW8Sttb();
-
+
sal_uInt32 getCount() const;
::rtl::OUString getEntry(sal_uInt32 nEntry) const
{
@@ -86,48 +86,48 @@ typedef ::std::vector<rtl::OUString> StringVector_t;
{
return m_Strings;
}
-
+
const T * getExtra(sal_uInt32 nEntry) const
{
return dynamic_cast<const T *> (m_Extras[nEntry].get());
}
};
-
+
template <class T>
WW8Sttb<T>::WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize)
: WW8Struct(rSt, nPos, nSize), bDoubleByteCharacters(false)
{
sal_uInt32 nOffset = 0;
-
+
if (getU16(nOffset) == 0xffff)
{
bDoubleByteCharacters = true;
nOffset += 2;
}
-
+
sal_uInt16 nCount = getU16(nOffset);
sal_uInt16 ncbExtra = getU16(nOffset + 2);
-
+
nOffset += 4;
for (sal_uInt16 i = 0; i < nCount; i++)
{
if (bDoubleByteCharacters)
{
sal_uInt16 nStrLen = getU16(nOffset);
-
+
m_Strings.push_back(getUString(nOffset +2, nStrLen));
-
+
nOffset += 2 + 2 * nStrLen;
}
else
{
sal_uInt8 nStrLen = getU8(nOffset);
-
+
m_Strings.push_back(getUString(nOffset, nStrLen));
-
+
nOffset += 1 + nStrLen;
}
-
+
if (ncbExtra > 0)
{
ExtraPointer_t pExtra(new T(this, nOffset, ncbExtra));
@@ -137,7 +137,7 @@ typedef ::std::vector<rtl::OUString> StringVector_t;
}
}
}
-
+
template <class T>
WW8Sttb<T>::~WW8Sttb()
{
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 0400babd7380..ca8205dce3be 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -2,7 +2,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
@@ -29,9 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <iostream>
+#include <iostream>
#include <set>
-#include <stdio.h>
+#include <stdio.h>
#include "WW8TableInfo.hxx"
#include "fmtfsize.hxx"
#include "attributeoutputbase.hxx"
@@ -41,7 +41,7 @@
#include "ndtxt.hxx"
#include "dbgoutsw.hxx"
-namespace ww8
+namespace ww8
{
// WW8TableNodeInfoInner
@@ -92,7 +92,7 @@ void WW8TableNodeInfoInner::setShadowsAfter(sal_uInt32 nShadowsAfter)
void WW8TableNodeInfoInner::setEndOfLine(bool bEndOfLine)
{
- mbEndOfLine = bEndOfLine;
+ mbEndOfLine = bEndOfLine;
}
void WW8TableNodeInfoInner::setEndOfCell(bool bEndOfCell)
@@ -169,10 +169,10 @@ bool WW8TableNodeInfoInner::isFirstInTable() const
const SwNode * WW8TableNodeInfoInner::getNode() const
{
const SwNode * pResult = NULL;
-
+
if (mpParent != NULL)
pResult = mpParent->getNode();
-
+
return pResult;
}
@@ -180,14 +180,14 @@ TableBoxVectorPtr WW8TableNodeInfoInner::getTableBoxesOfRow()
{
TableBoxVectorPtr pResult(new TableBoxVector);
- WW8TableCellGrid::Pointer_t pCellGrid =
+ WW8TableCellGrid::Pointer_t pCellGrid =
mpParent->getParent()->getCellGridForTable(getTable(), false);
if (pCellGrid.get() == NULL)
{
const SwTableLine * pTabLine = getTableBox()->GetUpper();
const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes();
-
+
sal_uInt8 nBoxes = rTblBoxes.Count();
for ( sal_uInt8 n = 0; n < nBoxes; n++ )
{
@@ -209,27 +209,27 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase)
OSL_ENSURE(pFmt,"Impossible");
if (!pFmt)
return pResult;
-
+
const SwFmtFrmSize &rSize = pFmt->GetFrmSize();
unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth());
-
+
sal_uInt32 nPageSize = 0;
bool bRelBoxSize = false;
-
+
rBase.GetTablePageSize
( this, nPageSize, bRelBoxSize );
-
+
SwTwips nSz = 0;
- Widths::const_iterator aWidthsEnd = pWidths->end();
- for ( Widths::const_iterator aIt = pWidths->begin();
- aIt != aWidthsEnd;
+ Widths::const_iterator aWidthsEnd = pWidths->end();
+ for ( Widths::const_iterator aIt = pWidths->begin();
+ aIt != aWidthsEnd;
aIt++)
{
nSz += *aIt;
SwTwips nCalc = nSz;
if ( bRelBoxSize )
nCalc = ( nCalc * nPageSize ) / nTblSz;
-
+
pResult->push_back( nCalc );
}
@@ -240,11 +240,11 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow()
{
WidthsPtr pWidths;
- WW8TableCellGrid::Pointer_t pCellGrid =
+ WW8TableCellGrid::Pointer_t pCellGrid =
mpParent->getParent()->getCellGridForTable(getTable(), false);
if (pCellGrid.get() == NULL)
- {
+ {
const SwTableBox * pTabBox = getTableBox();
const SwTableLine * pTabLine = pTabBox->GetUpper();
const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes();
@@ -254,7 +254,7 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow()
sal_uInt32 nBoxes = rTabBoxes.Count();
if ( nBoxes > 32 )
nBoxes = 32;
-
+
for (sal_uInt32 n = 0; n < nBoxes; n++)
{
const SwFrmFmt* pBoxFmt = rTabBoxes[ n ]->GetFrmFmt();
@@ -273,9 +273,9 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
{
RowSpansPtr pResult(new RowSpans);
- WW8TableCellGrid::Pointer_t pCellGrid =
+ WW8TableCellGrid::Pointer_t pCellGrid =
mpParent->getParent()->getCellGridForTable(getTable(), false);
-
+
if (pCellGrid.get() == NULL)
{
const SwTableBox * pTabBox = getTableBox();
@@ -285,7 +285,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
sal_uInt32 nBoxes = rTabBoxes.Count();
if (nBoxes > 32)
nBoxes = 32;
-
+
for (sal_uInt32 n = 0; n < nBoxes; ++n)
{
pResult->push_back(rTabBoxes[n]->getRowSpan());
@@ -315,7 +315,7 @@ const SwRect & WW8TableNodeInfoInner::getRect() const
string WW8TableNodeInfoInner::toString() const
{
static char buffer[256];
- snprintf(buffer, sizeof(buffer),
+ snprintf(buffer, sizeof(buffer),
"<tableinner depth=\"%" SAL_PRIuUINT32 "\""
" cell=\"%" SAL_PRIuUINT32 "\""
" row=\"%" SAL_PRIuUINT32 "\""
@@ -330,15 +330,15 @@ string WW8TableNodeInfoInner::toString() const
mnShadowsBefore,
mnShadowsAfter,
mbVertMerge ? "yes" : "no");
-
+
return string(buffer);
}
// WW8TableTextNodeInfo
-WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent,
+WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent,
const SwNode * pNode)
: mpParent(pParent),
- mnDepth(0),
+ mnDepth(0),
mpNode(pNode),
mpNext(NULL),
mpNextNode(NULL)
@@ -352,38 +352,38 @@ WW8TableNodeInfo::~WW8TableNodeInfo()
::std::string WW8TableNodeInfo::toString() const
{
static char buffer[1024];
- snprintf(buffer, sizeof(buffer),
+ snprintf(buffer, sizeof(buffer),
"<tableNodeInfo p=\"%p\" depth=\"%" SAL_PRIuUINT32 "\">"
,this, getDepth());
::std::string sResult(buffer);
-
+
Inners_t::const_iterator aIt(mInners.begin());
Inners_t::const_iterator aEnd(mInners.end());
-
+
while (aIt != aEnd)
{
WW8TableNodeInfoInner::Pointer_t pInner = aIt->second;
sResult += pInner->toString();
-
+
aIt++;
}
-#ifdef DEBUG
+#ifdef DEBUG
sResult += dbg_out(*mpNode);
#endif
sResult += "</tableNodeInfo>";
-
+
return sResult;
}
void WW8TableNodeInfo::setDepth(sal_uInt32 nDepth)
{
mnDepth = nDepth;
-
+
Inners_t::iterator aIt = mInners.find(mnDepth);
if (aIt == mInners.end())
mInners[mnDepth] = WW8TableNodeInfoInner::Pointer_t(new WW8TableNodeInfoInner(this));
-
+
mInners[mnDepth]->setDepth(mnDepth);
}
@@ -393,7 +393,7 @@ void WW8TableNodeInfo::setEndOfLine(bool bEndOfLine)
pInner->setEndOfLine(bEndOfLine);
#ifdef DEBUG
- ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">"
+ ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">"
<< toString() << "</endOfLine>" << ::std::endl;
#endif
}
@@ -402,9 +402,9 @@ void WW8TableNodeInfo::setEndOfCell(bool bEndOfCell)
{
WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth);
pInner->setEndOfCell(bEndOfCell);
-
+
#ifdef DEBUG
- ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">"
+ ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">"
<< toString() << "</endOfCell>" << ::std::endl;
#endif
}
@@ -416,9 +416,9 @@ void WW8TableNodeInfo::setFirstInTable(bool bFirstInTable)
pInner->setFirstInTable(bFirstInTable);
#ifdef DEBUG
- ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">"
+ ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">"
<< toString() << "</firstInTable>" << ::std::endl;
-#endif
+#endif
}
void WW8TableNodeInfo::setVertMerge(bool bVertMerge)
@@ -426,10 +426,10 @@ void WW8TableNodeInfo::setVertMerge(bool bVertMerge)
WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth);
pInner->setVertMerge(bVertMerge);
-
+
#ifdef DEBUG
- ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">"
+ ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">"
<< toString() << "</vertMerge>" << ::std::endl;
#endif
}
@@ -449,8 +449,8 @@ void WW8TableNodeInfo::setNext(WW8TableNodeInfo * pNext)
mpNext = pNext;
#ifdef DEBUG
- ::std::clog << "<setnext><from>" << toString() << "</from><to>"
- << pNext->toString() << "</to></setnext>"
+ ::std::clog << "<setnext><from>" << toString() << "</from><to>"
+ << pNext->toString() << "</to></setnext>"
<< ::std::endl;
#endif
}
@@ -494,7 +494,7 @@ sal_uInt32 WW8TableNodeInfo::getDepth() const
{
if (mInners.size() > 0)
return mInners.begin()->second->getDepth();
-
+
return mnDepth;
}
@@ -542,7 +542,7 @@ sal_uInt32 WW8TableNodeInfo::getCell() const
{
return getInnerForDepth(mnDepth)->getCell();
}
-
+
sal_uInt32 WW8TableNodeInfo::getRow() const
{
return getInnerForDepth(mnDepth)->getRow();
@@ -556,26 +556,26 @@ const ww8::WW8TableNodeInfo::Inners_t & WW8TableNodeInfo::getInners() const
const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const
{
WW8TableNodeInfoInner::Pointer_t pResult;
-
+
if (mInners.size() > 0)
pResult = mInners.begin()->second;
-
+
return pResult;
}
const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getInnerForDepth(sal_uInt32 nDepth) const
{
WW8TableNodeInfoInner::Pointer_t pResult;
-
+
Inners_t::const_iterator aIt = mInners.find(nDepth);
if (aIt != mInners.end())
{
pResult = aIt->second;
}
-
+
return pResult;
}
-
+
// WW8TableInfo
WW8TableInfo::WW8TableInfo()
@@ -597,37 +597,37 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable)
SwRect aRect = aTableCellInfo.getRect();
#ifdef DEBUG
- static char sBuffer[1024];
+ static char sBuffer[1024];
::std::clog << "<CellFrm>" << ::std::endl;
- snprintf(sBuffer, sizeof(sBuffer),
+ snprintf(sBuffer, sizeof(sBuffer),
"<rect top=\"%ld\" bottom=\"%ld\" left=\"%ld\" right=\"%ld\"/>",
aRect.Top(), aRect.Bottom(), aRect.Left(), aRect.Right());
::std::clog << sBuffer << ::std::endl;
#endif
const SwTableBox * pTableBox = aTableCellInfo.getTableBox();
const SwStartNode * pSttNd = pTableBox->GetSttNd();
-
+
if (pSttNd != NULL)
{
SwPaM aPam(*pSttNd, 0);
-
+
bool bDone = false;
do
{
SwNode & rNode = aPam.GetPoint()->nNode.GetNode();
insertTableNodeInfo(&rNode, pTable, pTableBox, 0, 0, 1, & aRect);
-
+
if (rNode.IsEndNode())
{
SwEndNode * pEndNode = rNode.GetEndNode();
SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode();
-
+
if (pTmpSttNd == pSttNd)
- bDone = true;
+ bDone = true;
}
-
+
aPam.GetPoint()->nNode++;
}
while (!bDone);
@@ -645,12 +645,12 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable)
void WW8TableInfo::processSwTable(const SwTable * pTable)
{
-#ifdef DEBUG
+#ifdef DEBUG
::std::clog << "<processSwTable>" << ::std::endl;
#endif
WW8TableNodeInfo * pPrev = NULL;
-
+
SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
if (pFrmFmt != NULL && pTable->IsTblComplex())
{
@@ -664,21 +664,21 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
else
{
const SwTableLines & rLines = pTable->GetTabLines();
-
+
for (USHORT n = 0; n < rLines.Count(); n++)
{
const SwTableLine * pLine = rLines[n];
-
+
pPrev = processTableLine(pTable, pLine, n, 1, pPrev);
}
-
+
}
if (pPrev != NULL)
{
SwTableNode * pTableNode = pTable->GetTableNode();
SwEndNode * pEndNode = pTableNode->EndOfSectionNode();
-
+
pPrev->setNextNode(pEndNode);
}
#ifdef DEBUG
@@ -686,28 +686,28 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
#endif
}
-WW8TableNodeInfo *
-WW8TableInfo::processTableLine(const SwTable * pTable,
- const SwTableLine * pTableLine,
+WW8TableNodeInfo *
+WW8TableInfo::processTableLine(const SwTable * pTable,
+ const SwTableLine * pTableLine,
sal_uInt32 nRow,
sal_uInt32 nDepth, WW8TableNodeInfo * pPrev)
{
#ifdef DEBUG
- ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\""
+ ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\""
<< nDepth << "\">" << ::std::endl;
#endif
const SwTableBoxes & rBoxes = pTableLine->GetTabBoxes();
-
+
WW8TableNodeInfo::Pointer_t pTextNodeInfo;
-
+
for (USHORT n = 0; n < rBoxes.Count(); n++)
{
const SwTableBox * pBox = rBoxes[n];
-
+
pPrev = processTableBox(pTable, pBox, nRow, n, nDepth, n == rBoxes.Count() - 1, pPrev);
- }
-
+ }
+
#ifdef DEBUG
::std::clog << "</processTableLine>" << ::std::endl;
#endif
@@ -724,22 +724,22 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox,
sal_uInt32 nDepth)
{
#ifdef DEBUG
- ::std::clog << "<processTableBoxLines depth=\"" << nDepth
+ ::std::clog << "<processTableBoxLines depth=\"" << nDepth
<< "\" row=\"" << nRow << "\" cell=\"" << nCell << "\">" << ::std::endl;
#endif
const SwTableLines & rLines = pBox->GetTabLines();
WW8TableNodeInfo::Pointer_t pNodeInfo;
-
+
if (rLines.Count() > 0)
{
for (sal_uInt32 n = 0; n < rLines.Count(); n++)
{
const SwTableLine * pLine = rLines[n];
const SwTableBoxes & rBoxes = pLine->GetTabBoxes();
-
+
for (USHORT nBox = 0; nBox < rBoxes.Count(); nBox++)
- pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth);
+ pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth);
}
}
else
@@ -748,21 +748,21 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox,
const SwEndNode * pEndNd = pSttNd->EndOfSectionNode();
SwPaM aPaM(*pSttNd, 0);
SwPaM aEndPaM(*pEndNd, 0);
-
+
bool bDone = false;
- while (!bDone)
+ while (!bDone)
{
SwNode & rNode = aPaM.GetPoint()->nNode.GetNode();
-
- pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth);
-
+
+ pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth);
+
if (aPaM.GetPoint()->nNode == aEndPaM.GetPoint()->nNode)
bDone = true;
else
aPaM.GetPoint()->nNode++;
}
}
-
+
#ifdef DEBUG
::std::clog << "</processTableBoxLines>" << ::std::endl;
#endif
@@ -771,8 +771,8 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox,
}
WW8TableNodeInfo *
-WW8TableInfo::processTableBox(const SwTable * pTable,
- const SwTableBox * pBox,
+WW8TableInfo::processTableBox(const SwTable * pTable,
+ const SwTableBox * pBox,
sal_uInt32 nRow,
sal_uInt32 nCell,
sal_uInt32 nDepth,
@@ -790,30 +790,30 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
WW8TableNodeInfo::Pointer_t pEndOfCellInfo;
if (rLines.Count() > 0)
- {
+ {
pNodeInfo = processTableBoxLines(pBox, pTable, pBox, nRow, nCell, nDepth);
pNodeInfo->setEndOfCell(true);
if (bEndOfLine)
pNodeInfo->setEndOfLine(true);
-
+
for (sal_uInt32 n = 0; n < rLines.Count(); n++)
{
const SwTableLine * pLine = rLines[n];
-
+
pPrev = processTableLine(pTable, pLine, n, 1, pPrev);
}
}
else
- {
+ {
SwPaM aPaM(*pSttNd, 0);
-
+
bool bDone = false;
sal_uInt32 nDepthInsideCell = 0;
-
+
do
{
SwNode & rNode = aPaM.GetPoint()->nNode.GetNode();
-
+
if (rNode.IsStartNode())
{
if (nDepthInsideCell > 0)
@@ -821,24 +821,24 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
nDepthInsideCell++;
}
-
+
pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBox, nRow, nCell, nDepth);
-
+
if (pPrev != NULL)
pPrev->setNext(pNodeInfo.get());
-
+
pPrev = pNodeInfo.get();
-
+
if (nDepthInsideCell == 1 && rNode.IsTxtNode())
pEndOfCellInfo = pNodeInfo;
-
+
if (rNode.IsEndNode())
{
nDepthInsideCell--;
if (nDepthInsideCell == 0 && pEndOfCellInfo.get() == NULL)
pEndOfCellInfo = pNodeInfo;
-
+
SwEndNode * pEndNode = rNode.GetEndNode( );
SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode();
if (pTmpSttNd == pSttNd)
@@ -851,12 +851,12 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
if (pEndOfCellInfo.get() != NULL)
{
- pEndOfCellInfo->setEndOfCell(true);
-
+ pEndOfCellInfo->setEndOfCell(true);
+
if (bEndOfLine)
pEndOfCellInfo->setEndOfLine(true);
}
- }
+ }
#ifdef DEBUG
::std::clog << "</processTableBox>" << ::std::endl;
@@ -866,8 +866,8 @@ WW8TableInfo::processTableBox(const SwTable * pTable,
}
WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo
-(const SwNode * pNode,
- const SwTable * pTable,
+(const SwNode * pNode,
+ const SwTable * pTable,
const SwTableBox * pTableBox,
sal_uInt32 nRow,
sal_uInt32 nCell,
@@ -875,10 +875,10 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo
SwRect * pRect)
{
WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode);
-
+
if (pNodeInfo.get() == NULL)
{
- pNodeInfo =
+ pNodeInfo =
WW8TableNodeInfo::Pointer_t(new WW8TableNodeInfo(this, pNode));
mMap.insert(Map_t::value_type(pNode, pNodeInfo));
}
@@ -904,7 +904,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo
if (pRect)
{
WW8TableCellGrid::Pointer_t pCellGrid = getCellGridForTable(pTable);
-
+
pCellGrid->insert(*pRect, pNodeInfo.get());
pNodeInfo->setRect(*pRect);
}
@@ -941,26 +941,26 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::getTableNodeInfo
{
WW8TableNodeInfo::Pointer_t pResult;
Map_t::iterator aIt = mMap.find(pNode);
-
+
if (aIt != mMap.end())
pResult = (*aIt).second;
-
+
return pResult;
}
const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode)
{
const SwNode * pResult = NULL;
-
+
WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode);
-
+
if (pNodeInfo.get() != NULL)
{
WW8TableNodeInfo * pNextInfo = pNodeInfo->getNext();
-
+
if (pNextInfo != NULL)
pResult = pNextInfo->getNode();
- else
+ else
{
const SwNode * pNextNode = pNodeInfo->getNextNode();
@@ -968,7 +968,7 @@ const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode)
pResult = pNextNode;
}
}
-
+
return pResult;
}
@@ -1032,8 +1032,8 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const
::std::string CellInfo::toString() const
{
static char sBuffer[256];
-
- snprintf(sBuffer, sizeof(sBuffer),
+
+ snprintf(sBuffer, sizeof(sBuffer),
"<cellinfo left=\"%ld\""
" right=\"%ld\""
" top=\"%ld\""
@@ -1044,7 +1044,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const
top(),
bottom(),
m_pNodeInfo);
-
+
return sBuffer;
}
@@ -1087,7 +1087,7 @@ WW8TableCellGridRow::Pointer_t WW8TableCellGrid::getRow(long nTop, bool bCreate)
}
}
else
- pResult = m_aRows[nTop];
+ pResult = m_aRows[nTop];
return pResult;
}
@@ -1112,7 +1112,7 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop)
return getRow(nTop)->end();
}
-void WW8TableCellGrid::insert(const SwRect & rRect,
+void WW8TableCellGrid::insert(const SwRect & rRect,
WW8TableNodeInfo * pNodeInfo,
unsigned long * pFmtFrmWidth)
{
@@ -1149,15 +1149,15 @@ void WW8TableCellGrid::addShadowCells()
SwRect aRect = aCellIt->getRect();
long nRowSpan = 1;
while (aCellIt != aCellEndIt)
- {
+ {
WW8TableNodeInfo * pNodeInfo = aCellIt->getTableNodeInfo();
if (bBeginningOfCell)
{
RowTops_t::const_iterator aRowSpanIt(aTopsIt);
- aRowSpanIt++;
-
- if (aRowSpanIt != getRowTopsEnd() &&
+ aRowSpanIt++;
+
+ if (aRowSpanIt != getRowTopsEnd() &&
*aRowSpanIt < aCellIt->bottom())
{
aRect.Top(*aRowSpanIt);
@@ -1170,30 +1170,30 @@ void WW8TableCellGrid::addShadowCells()
bVertMerge = false;
nRowSpan = 1;
- while (aRowSpanIt != getRowTopsEnd() &&
+ while (aRowSpanIt != getRowTopsEnd() &&
*aRowSpanIt < aCellIt->bottom())
{
aRowSpanIt++;
nRowSpan++;
}
-
+
if (pNodeInfo != NULL)
pRowSpans->push_back(nRowSpan);
else
pRowSpans->push_back(-nRowSpan);
}
-
+
if (pNodeInfo != NULL)
{
pNodeInfo->setVertMerge(bVertMerge);
}
aCellIt++;
-
+
bBeginningOfCell = (aRect.Left() != aCellIt->left());
aRect = aCellIt->getRect();
}
-
+
WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt);
if (pRow.get() != NULL)
pRow->setRowSpans(pRowSpans);
@@ -1217,7 +1217,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
CellInfoMultiSet::const_iterator aCellEndIt = getCellsEnd(*aTopsIt);
GridColsPtr pWidths(new Widths);
TableBoxVectorPtr pTableBoxes(new TableBoxVector);
-
+
sal_uInt32 nShadows = 0;
sal_uInt32 nCell = 0;
bool bBeginningOfCell = true;
@@ -1267,7 +1267,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
if (bBeginningOfCell)
{
pWidths->push_back(aCellIt->getFmtFrmWidth());
-
+
if (pNodeInfo != NULL)
pTableBoxes->push_back(pNodeInfo->getTableBox());
else
@@ -1292,7 +1292,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
}
pLastNodeInfo->setShadowsAfter(nShadows);
-
+
if (pEndOfCellInfo == NULL)
{
pEndOfCellInfo = pLastNodeInfo;
@@ -1300,7 +1300,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
pEndOfCellInfo->setEndOfCell(true);
pLastNodeInfo->setEndOfLine(true);
-
+
WW8TableCellGridRow::Pointer_t pRow(getRow(*aTopsIt));
pRow->setTableBoxVector(pTableBoxes);
pRow->setWidths(pWidths);
@@ -1390,7 +1390,7 @@ string WW8TableCellGrid::toString()
}
sResult += "</WW8TableCellGrid>\n";
-
+
return sResult;
}
@@ -1398,7 +1398,7 @@ TableBoxVectorPtr WW8TableCellGrid::getTableBoxesOfRow
(WW8TableNodeInfoInner * pNodeInfoInner)
{
TableBoxVectorPtr pResult;
- WW8TableCellGridRow::Pointer_t pRow =
+ WW8TableCellGridRow::Pointer_t pRow =
getRow(pNodeInfoInner->getRect().Top(), false);
if (pRow.get() != NULL)
@@ -1414,7 +1414,7 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow
{
GridColsPtr pResult;
- WW8TableCellGridRow::Pointer_t pRow =
+ WW8TableCellGridRow::Pointer_t pRow =
getRow(pNodeInfoInner->getRect().Top(), false);
if (pRow.get() != NULL)
@@ -1423,27 +1423,27 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow
}
return pResult;
-}
+}
RowSpansPtr WW8TableCellGrid::getRowSpansOfRow
(WW8TableNodeInfoInner * pNodeInfoInner)
{
RowSpansPtr pResult;
-
- WW8TableCellGridRow::Pointer_t pRow =
+
+ WW8TableCellGridRow::Pointer_t pRow =
getRow(pNodeInfoInner->getRect().Top(), false);
if (pRow.get() != NULL)
{
pResult = pRow->getRowSpans();
}
-
+
return pResult;
}
WW8TableCellGridRow::WW8TableCellGridRow()
: m_pCellInfos(new CellInfoMultiSet)
-{
+{
}
WW8TableCellGridRow::~WW8TableCellGridRow()
@@ -1455,8 +1455,8 @@ void WW8TableCellGridRow::insert(const CellInfo & rCellInfo)
m_pCellInfos->insert(rCellInfo);
#ifdef DEBUG
- ::std::clog << "<gridRowInsert>"
- << rCellInfo.toString()
+ ::std::clog << "<gridRowInsert>"
+ << rCellInfo.toString()
<< "</gridRowInsert>"
<< ::std::endl;
#endif
@@ -1479,9 +1479,9 @@ void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr pTableBoxVector)
void WW8TableCellGridRow::setWidths(WidthsPtr pWidths)
{
- m_pWidths = pWidths;
+ m_pWidths = pWidths;
}
-
+
void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans)
{
m_pRowSpans = pRowSpans;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index bd913e93fe65..9dc10486f251 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -2,7 +2,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
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-
+
#ifndef WW8_TABLE_INFO_HXX
#define WW8_TABLE_INFO_HXX
#include <hash_map>
@@ -49,7 +49,7 @@ namespace ww8
using namespace ::std;
class WW8TableNodeInfo;
-typedef boost::shared_ptr<SwRect> SwRectPtr;
+typedef boost::shared_ptr<SwRect> SwRectPtr;
typedef ::std::vector<const SwTableBox *> TableBoxVector;
typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
typedef ::std::vector<sal_uInt32> GridCols;
@@ -74,13 +74,13 @@ class WW8TableNodeInfoInner
const SwTableBox * mpTableBox;
const SwTable * mpTable;
SwRect maRect;
-
+
public:
typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t;
WW8TableNodeInfoInner(WW8TableNodeInfo * pParent);
~WW8TableNodeInfoInner();
-
+
void setDepth(sal_uInt32 nDepth);
void setCell(sal_uInt32 nCell);
void setRow(sal_uInt32 nRow);
@@ -93,7 +93,7 @@ public:
void setTableBox(const SwTableBox * pTableBox);
void setTable(const SwTable * pTable);
void setRect(const SwRect & rRect);
-
+
sal_uInt32 getDepth() const;
sal_uInt32 getCell() const;
sal_uInt32 getRow() const;
@@ -106,7 +106,7 @@ public:
const SwTableBox * getTableBox() const;
const SwTable * getTable() const;
const SwRect & getRect() const;
-
+
const SwNode * getNode() const;
TableBoxVectorPtr getTableBoxesOfRow();
@@ -125,9 +125,9 @@ class WW8TableInfo;
class WW8TableNodeInfo
{
public:
- typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
+ typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
greater<sal_uInt32> > Inners_t;
-
+
private:
WW8TableInfo * mpParent;
sal_uInt32 mnDepth;
@@ -141,7 +141,7 @@ public:
WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTxtNode);
virtual ~WW8TableNodeInfo();
-
+
void setDepth(sal_uInt32 nDepth);
void setEndOfLine(bool bEndOfLine);
void setEndOfCell(bool bEndOfCell);
@@ -156,7 +156,7 @@ public:
void setNext(WW8TableNodeInfo * pNext);
void setNextNode(const SwNode * pNode);
void setRect(const SwRect & rRect);
-
+
WW8TableInfo * getParent() const;
sal_uInt32 getDepth() const;
bool isEndOfLine() const;
@@ -172,7 +172,7 @@ public:
const Inners_t & getInners() const;
const WW8TableNodeInfoInner::Pointer_t getFirstInner() const;
const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const;
-
+
sal_uInt32 getCell() const;
sal_uInt32 getRow() const;
@@ -180,16 +180,16 @@ public:
bool operator < (const WW8TableNodeInfo & rInfo) const;
};
-
+
struct hashNode
{
- size_t operator()(const SwNode * pNode) const
+ size_t operator()(const SwNode * pNode) const
{ return reinterpret_cast<size_t>(pNode); }
};
-
+
struct hashTable
{
- size_t operator()(const SwTable * pTable) const
+ size_t operator()(const SwTable * pTable) const
{ return reinterpret_cast<size_t>(pTable); }
};
@@ -210,7 +210,7 @@ public:
CellInfoMultiSet::const_iterator end() const;
void setTableBoxVector(TableBoxVectorPtr pTableBoxVector);
- void setWidths(WidthsPtr pGridCols);
+ void setWidths(WidthsPtr pGridCols);
void setRowSpans(RowSpansPtr pRowSpans);
TableBoxVectorPtr getTableBoxVector() const;
@@ -225,7 +225,7 @@ class WW8TableCellGrid
RowTops_t m_aRowTops;
Rows_t m_aRows;
-
+
WW8TableCellGridRow::Pointer_t getRow(long nTop, bool bCreate = true);
RowTops_t::const_iterator getRowTopsBegin() const;
RowTops_t::const_iterator getRowTopsEnd() const;
@@ -238,7 +238,7 @@ public:
WW8TableCellGrid();
~WW8TableCellGrid();
- void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
+ void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
unsigned long * pFmtFrmWidth = NULL);
void addShadowCells();
WW8TableNodeInfo * connectCells();
@@ -248,7 +248,7 @@ public:
TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo);
WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner * pNodeInfo);
RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo);
-};
+};
class WW8TableInfo
{
@@ -260,21 +260,21 @@ class WW8TableInfo
CellGridMap_t mCellGridMap;
typedef hash_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t;
- FirstInTableMap_t mFirstInTableMap;
+ FirstInTableMap_t mFirstInTableMap;
WW8TableNodeInfo *
- processTableLine(const SwTable * pTable,
+ processTableLine(const SwTable * pTable,
const SwTableLine * pTableLine,
- sal_uInt32 nRow,
+ sal_uInt32 nRow,
sal_uInt32 nDepth, WW8TableNodeInfo * pPrev);
WW8TableNodeInfo *
processTableBox(const SwTable * pTable,
const SwTableBox * pTableBox,
sal_uInt32 nRow,
- sal_uInt32 nCell,
+ sal_uInt32 nCell,
sal_uInt32 nDepth, bool bEndOfLine, WW8TableNodeInfo * pPrev);
-
+
WW8TableNodeInfo::Pointer_t
processTableBoxLines(const SwTableBox * pBox,
const SwTable * pTable,
@@ -282,25 +282,25 @@ class WW8TableInfo
sal_uInt32 nRow,
sal_uInt32 nCell,
sal_uInt32 nDepth);
-
+
WW8TableNodeInfo::Pointer_t
- insertTableNodeInfo(const SwNode * pNode,
- const SwTable * pTable,
+ insertTableNodeInfo(const SwNode * pNode,
+ const SwTable * pTable,
const SwTableBox * pTableBox,
sal_uInt32 nRow,
sal_uInt32 nCell,
sal_uInt32 nDepth,
SwRect * pRect = NULL);
- WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable,
+ WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable,
bool bCreate = true);
-
-public:
+
+public:
typedef boost::shared_ptr<WW8TableInfo> Pointer_t;
WW8TableInfo();
virtual ~WW8TableInfo();
-
+
void processSwTable(const SwTable * pTable);
WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable);
WW8TableNodeInfo::Pointer_t getTableNodeInfo(const SwNode * pNode);
@@ -309,7 +309,7 @@ public:
WW8TableNodeInfo * reorderByLayout(const SwTable * pTable);
};
-
+
class CellInfo
{
SwRect m_aRect;
@@ -320,7 +320,7 @@ public:
CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
CellInfo(const CellInfo & aRectAndTableInfo)
- : m_aRect(aRectAndTableInfo.m_aRect),
+ : m_aRect(aRectAndTableInfo.m_aRect),
m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
{
@@ -337,7 +337,7 @@ public:
long width() const { return m_aRect.Width(); }
long height() const { return m_aRect.Height(); }
SwRect getRect() const { return m_aRect; }
- WW8TableNodeInfo * getTableNodeInfo() const
+ WW8TableNodeInfo * getTableNodeInfo() const
{ return m_pNodeInfo; }
unsigned long getFmtFrmWidth() const
{
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 37ceb71897c8..a6326f14c887 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ public:
/// Output text (inside a run).
virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
-
+
/// Output text (without markup).
virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
@@ -252,7 +252,7 @@ public:
/// Start of the abstract numbering definition instance.
virtual void StartAbstractNumbering( USHORT nId );
-
+
/// End of the abstract numbering definition instance.
virtual void EndAbstractNumbering();
@@ -304,13 +304,13 @@ private:
/// Output graphic fly frames.
void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize );
void WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rSize );
-
+
void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
-
+
void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
@@ -517,7 +517,7 @@ protected:
virtual void RefField( const SwField& rFld, const String& rRef );
virtual void HiddenField( const SwField& rFld );
- virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd );
+ virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd );
virtual void PostitField( const SwField* pFld );
virtual bool DropdownField( const SwField* pFld );
@@ -584,7 +584,7 @@ private:
bool m_bParagraphOpened;
- // Remember that a column break has to be opened at the
+ // Remember that a column break has to be opened at the
// beginning of the next paragraph
DocxColBreakStatus m_nColBreakStatus;
@@ -603,13 +603,13 @@ public:
/// Occasionnaly need to use this serializer from the outside
::sax_fastparser::FSHelperPtr GetSerializer( ) { return m_pSerializer; }
-
+
/// Do we have any footnotes?
bool HasFootnotes();
/// Do we have any endnotes?
bool HasEndnotes();
-
+
/// Output the content of the footnotes.xml resp. endnotes.xml
void FootnotesEndnotes( bool bFootnotes );
};
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 2df417d6b877..ad916cdc3d50 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -2,7 +2,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
@@ -132,11 +132,11 @@ void DocxExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xu
it < end; ++it )
{
IMark* pMark = (*it);
-
+
xub_StrLen nStart = pMark->GetMarkStart().nContent.GetIndex();
xub_StrLen nEnd = pMark->GetMarkEnd().nContent.GetIndex();
- if ( nStart == nAktPos )
+ if ( nStart == nAktPos )
aStarts.push_back( pMark->GetName() );
if ( nEnd == nAktPos )
@@ -243,41 +243,41 @@ void DocxExport::DoComboBox(const rtl::OUString& rName,
{
m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND );
- m_pDocumentFS->singleElementNS( XML_w, XML_name,
+ m_pDocumentFS->singleElementNS( XML_w, XML_name,
FSNS( XML_w, XML_val ), OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
m_pDocumentFS->singleElementNS( XML_w, XML_enabled, FSEND );
if ( rHelp.getLength( ) > 0 )
- m_pDocumentFS->singleElementNS( XML_w, XML_helpText,
+ m_pDocumentFS->singleElementNS( XML_w, XML_helpText,
FSNS( XML_w, XML_val ), OUStringToOString( rHelp, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
-
+
if ( rToolTip.getLength( ) > 0 )
- m_pDocumentFS->singleElementNS( XML_w, XML_statusText,
+ m_pDocumentFS->singleElementNS( XML_w, XML_statusText,
FSNS( XML_w, XML_val ), OUStringToOString( rToolTip, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
m_pDocumentFS->startElementNS( XML_w, XML_ddList, FSEND );
-
+
// Output the 0-based index of the selected value
sal_uInt32 nListItems = rListItems.getLength();
sal_Int32 nId = 0;
sal_uInt32 nI = 0;
while ( ( nI < nListItems ) && ( nId == 0 ) )
{
- if ( rListItems[nI] == rSelected )
+ if ( rListItems[nI] == rSelected )
nId = nI;
nI++;
}
- m_pDocumentFS->singleElementNS( XML_w, XML_result,
+ m_pDocumentFS->singleElementNS( XML_w, XML_result,
FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ),
FSEND );
// Loop over the entries
-
+
for (sal_uInt32 i = 0; i < nListItems; i++)
{
m_pDocumentFS->singleElementNS( XML_w, XML_listEntry,
@@ -332,7 +332,7 @@ void DocxExport::ExportDocument_Impl()
WriteMainText();
WriteFootnotesEndnotes();
-
+
WriteNumbering();
WriteFonts();
@@ -384,7 +384,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
nRstLnNum = 0;
AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) );
- m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum );
+ m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum );
}
}
}
@@ -411,7 +411,7 @@ void DocxExport::OutputLinkedOLE( const OUString& )
ULONG DocxExport::ReplaceCr( BYTE )
{
- // Completely unused for Docx export... only here for code sharing
+ // Completely unused for Docx export... only here for code sharing
// purpose with binary export
return 0;
}
@@ -549,7 +549,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" ),
aName );
-
+
pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) );
@@ -562,7 +562,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" ),
aName );
-
+
pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) );
@@ -625,14 +625,14 @@ void DocxExport::WriteFonts()
}
-void DocxExport::WriteProperties( )
+void DocxExport::WriteProperties( )
{
// Write the core properties
SwDocShell* pDocShell( pDoc->GetDocShell( ) );
uno::Reference<document::XDocumentProperties> xDocProps;
if ( pDocShell )
{
- uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
pDocShell->GetModel( ), uno::UNO_QUERY );
xDocProps = xDPS->getDocumentProperties();
}
@@ -652,7 +652,7 @@ void DocxExport::WriteMainText()
// body
m_pDocumentFS->startElementNS( XML_w, XML_body, FSEND );
-
+
pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
// the text
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 0d6432a79805..a3ec5c1bbe7f 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx
index 1d715e7ff260..ed9f160c94b6 100644
--- a/sw/source/filter/ww8/docxfootnotes.hxx
+++ b/sw/source/filter/ww8/docxfootnotes.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/dump/dump8.cxx b/sw/source/filter/ww8/dump/dump8.cxx
index ecd8e4fb1944..67e9aa5ccea6 100644
--- a/sw/source/filter/ww8/dump/dump8.cxx
+++ b/sw/source/filter/ww8/dump/dump8.cxx
@@ -2,7 +2,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
@@ -127,7 +127,7 @@ void MyApp::Main()
Execute();
}
DeInit();
-// SvFactory::DeInit();
+// SvFactory::DeInit();
}
// -----------------------------------------------------------------------
diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx
index f9c6fe779409..b35a64bce7bf 100644
--- a/sw/source/filter/ww8/dump/dump8a.cxx
+++ b/sw/source/filter/ww8/dump/dump8a.cxx
@@ -2,7 +2,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
@@ -29,8 +29,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <string.h> // memset(), ...
-#include <io.h> // access()
+#include <string.h> // memset(), ...
+#include <io.h> // access()
#include <tools/solar.h>
#include <sot/storage.hxx>
@@ -47,12 +47,12 @@
WW8ScannerBase* pSBase = 0;
//WW8PLCFMan* pPLCFMan = 0;
-WW8Fib* pWwFib = 0;
-SvStorageRef* pxStor;
+WW8Fib* pWwFib = 0;
+SvStorageRef* pxStor;
SvStorageStreamRef xStrm;
-SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch,
+SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch,
// ansonsten entweder 0TABLE oder 1TABLE
-SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch,
+SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch,
// ansonsten DATA
typedef void (*FNDumpData)( void* );
@@ -235,7 +235,7 @@ static void DumpNumList()
for( USHORT nLevel = 0; nLevel < nWW8MaxListLevel; nLevel++ )
*xTableStream >> aStyleIdArr[ nLevel ];
*xTableStream >> nByte;
- xTableStream->SeekRel( 1 ); // Dummy ueberlesen
+ xTableStream->SeekRel( 1 ); // Dummy ueberlesen
*pOut << "ListId: " << nLstId
<< " TemplateId " << nTplId << endl1
@@ -334,7 +334,7 @@ static void DumpBookLow()
*pOut << endl1;
WW8PLCFspecial aStarts( &xStrm, pWwFib->fcPlcfbkf, pWwFib->lcbPlcfbkf, 4 );
- WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE );
+ WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE );
USHORT i = 0;
while( 1 ){
@@ -381,7 +381,7 @@ static void DumpBookHigh()
*pOut << indent2 << i << ". Cp:" << hex6 << nPos << dec;
*pOut << ( ( aBook.GetIsEnd() ) ? " Ende " : " Anfang" );
*pOut << " Handle: " << aBook.GetHandle();
-// *pOut << " Len: " << hex4 << aBook.GetLen() << dec;
+// *pOut << " Len: " << hex4 << aBook.GetLen() << dec;
ByteString sName( *aBook.GetName(), RTL_TEXTENCODING_MS_1252 );
if( sName.Len() )
*pOut << " Name: " << sName.GetBuffer() << endl1;
@@ -422,51 +422,51 @@ static BOOL DumpField2( WW8PLCFspecial& rPlc )
{
WW8_CP nSCode, nECode, nSRes, nERes;
void* pData;
- if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ?
+ if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ?
return FALSE;
rPlc++;
if( ((BYTE*)pData)[0] != 19 ){
*pOut << "Field Error, " << (USHORT)((BYTE*)pData)[0] << endl1;
- return TRUE; // nicht abbrechen
+ return TRUE; // nicht abbrechen
}
*pOut << " " << indent1 << begin1 << "Field" << " Cp: " << hex
<< nSCode << " Typ: " << dec << (USHORT)((BYTE*)pData)[1] << endl1;
- if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ?
+ if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ?
return FALSE;
DumpShortPlainText( nSCode, nECode - nSCode, "Code" ); // Code, bei nested abgeschnitten
- nSRes = nECode; // Default
+ nSRes = nECode; // Default
- while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ?
- DumpField2( rPlc ); // nested Field im Beschreibungsteil
- if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ?
+ while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ?
+ DumpField2( rPlc ); // nested Field im Beschreibungsteil
+ if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ?
return FALSE;
}
- if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ?
+ if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ?
rPlc++;
*pOut << " " << indent1 << "Field Seperator" << " Cp: " << hex << nSRes
<< ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1;
- if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ?
+ if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ?
return FALSE;
- while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ?
- DumpField2( rPlc ); // nested Field im Resultatteil
- if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ?
+ while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ?
+ DumpField2( rPlc ); // nested Field im Resultatteil
+ if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ?
return FALSE;
}
DumpShortPlainText( nSRes, nERes - nSRes, "Result" ); // Result, bei nested incl. nested Field
}else{
- nERes = nSRes; // Kein Result vorhanden
+ nERes = nSRes; // Kein Result vorhanden
}
rPlc++;
- if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ?
+ if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ?
*pOut << " " << end1 << " Field " << " Cp: " << hex << nERes
<< ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1;
}else{
@@ -496,7 +496,7 @@ static void DumpField1( WW8_FC nPos, long nLen, char* pName )
<< endl1;
-// while( DumpField2( aPlc ) ){}
+// while( DumpField2( aPlc ) ){}
while( (long)aPlc.GetIdx() < aPlc.GetIMax() )
{
DumpField3( aPlc );
@@ -525,7 +525,7 @@ static void DumpFonts()
sOut = ByteString( p->sFontname, RTL_TEXTENCODING_MS_1252 );
*pOut << "Id:" << i << " Name:\"" << sOut.GetBuffer() << '"'; // Name
- if( p->ibszAlt ) // gibt es einen alternativen Font ?
+ if( p->ibszAlt ) // gibt es einen alternativen Font ?
{
sOut = ByteString( p->sFontname.Copy( p->ibszAlt ),
RTL_TEXTENCODING_MS_1252 );
@@ -542,7 +542,7 @@ static void DumpFonts()
//-----------------------------------------
-// class DFib
+// class DFib
//-----------------------------------------
class DFib: public WW8Fib
@@ -755,7 +755,7 @@ void DFib::Dump()
}
//-----------------------------------------
-// class DStyle
+// class DStyle
//-----------------------------------------
class DStyle: public WW8Style
@@ -769,7 +769,7 @@ public:
};
//-----------------------------------------
-// universelle Hilfsroutinen
+// universelle Hilfsroutinen
//-----------------------------------------
static void DumpIt( SvStream& rSt, short nLen )
@@ -819,7 +819,7 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen )
indent( *pOut, rSt );
BYTE x[512];
- rSt.Read( x, 512 ); // Token und folgende lesen
+ rSt.Read( x, 512 ); // Token und folgende lesen
USHORT nId = WW8GetSprmId( nVersion, x, &nDelta );
@@ -846,9 +846,9 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen )
rSt.Seek( nSprmPos + 1 + nDelta + WW8SprmDataOfs( nId ) );// gehe zum eigentlichen
// Inhalt
if( rSprm.pOutFnc )
- rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion
+ rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion
else
- DumpItSmall( rSt, nSprmNL ); // oder Dumper
+ DumpItSmall( rSt, nSprmNL ); // oder Dumper
*pOut << endl1;
return nSprmsLen;
@@ -873,7 +873,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm )
BYTE* p = (BYTE*)pSprm;
USHORT nId = WW8GetSprmId( nVersion, p, 0 );
- *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez
+ *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez
*pOut << '/' << WW8GetSprmSizeBrutto( nVersion, p, &nId ); // Laenge incl. alles in Dez
*pOut << '/' << WW8GetSprmSizeNetto( nVersion, p, &nId ); // Laenge excl Token in Dez
@@ -884,7 +884,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm )
//-----------------------------------------
-// Hilfsroutinen: SEPX
+// Hilfsroutinen: SEPX
//-----------------------------------------
void DumpSepx( BYTE nVersion, long nPos )
{
@@ -901,7 +901,7 @@ void DumpSepx( BYTE nVersion, long nPos )
//-----------------------------------------
-// Hilfsroutinen: FKP.CHPX, FKP.PAPX
+// Hilfsroutinen: FKP.CHPX, FKP.PAPX
//-----------------------------------------
static void DumpPhe( WW8_PHE_Base& rPhe )
{
@@ -957,7 +957,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc )
int i;
WW8_FC aF[2];
BYTE c;
- long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an
+ long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an
short nOfs;
WW8_PHE_Base aPhe;
@@ -965,14 +965,14 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc )
{
xStrm->Seek( nPos + i * 4 );
indent( *pOut, *xStrm );
- xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs
+ xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs
xStrm->Seek( nStartOfs + i * nItemSize );
- xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX )
+ xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX )
if( ePlc == PAP )
xStrm->Read( &aPhe, sizeof( aPhe ) );
- nOfs= c * 2; // -> Byte Offset
+ nOfs= c * 2; // -> Byte Offset
xStrm->Seek( nPos + nOfs );
xStrm->Read( &c, 1 );
@@ -993,7 +993,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc )
break;
case PAP:
- short nLen = c * 2; // So weit bis zum naechsten !
+ short nLen = c * 2; // So weit bis zum naechsten !
short nIStd;
@@ -1015,18 +1015,18 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc )
}
//-----------------------------------------
-// WW8_DOP ( Document Properties )
+// WW8_DOP ( Document Properties )
//-----------------------------------------
//!!! WW8LoadDop gibt's jetzt auch in WW8scan.cxx
void DumpDop( WW8Fib& rFib )
{
// nicht loeschen!
- xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die
+ xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die
// Positions-Ausgabe der folgenden Anweisung
// mit dem alten Dumper uebereinstimmen zu lassen.
-// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1;
+// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1;
begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1;
WW8Dop* pD = new WW8Dop( *xTableStream, rFib.nFib, rFib.fcDop, rFib.lcbDop );
@@ -1153,7 +1153,7 @@ void DumpDop( WW8Fib& rFib )
}
//-----------------------------------------
-// PLCF.PCD ( Piece Table )
+// PLCF.PCD ( Piece Table )
//-----------------------------------------
#ifdef __WW8_NEEDS_PACK
@@ -1164,13 +1164,13 @@ struct WW8_PCD1
{
BYTE aBits1;
BYTE aBits2;
-// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag
-// BYTE fPaphNil : 1; // used internally by Word
-// BYTE fCopied : 1; // used internally by Word
- // * int :5
-// BYTE aBits2; // fn int:8, used internally by Word
- INT32 fc; // file offset of beginning of piece. The size of th
- INT16 prm; // PRM contains either a single sprm or else an inde
+// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag
+// BYTE fPaphNil : 1; // used internally by Word
+// BYTE fCopied : 1; // used internally by Word
+ // * int :5
+// BYTE aBits2; // fn int:8, used internally by Word
+ INT32 fc; // file offset of beginning of piece. The size of th
+ INT16 prm; // PRM contains either a single sprm or else an inde
};
#ifdef __WW8_NEEDS_PACK
@@ -1248,12 +1248,12 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen )
indent( *pOut, *xTableStream ) << "grpprl No. " << i << ", Len: " << cb << endl1;
long nPos = xTableStream->Tell();
- DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms
- xTableStream->Seek( nPos + cb ); // gehe hinter grpprl
+ DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms
+ xTableStream->Seek( nPos + cb ); // gehe hinter grpprl
nLen1 -= cb;
i++;
-// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen";
-// *pOut << endl1;
+// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen";
+// *pOut << endl1;
}
INT32 nLen2;
xTableStream->Read( &nLen2, 4 );
@@ -1268,7 +1268,7 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen )
}
//-----------------------------------------
-// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX
+// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX
//-----------------------------------------
static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
@@ -1304,7 +1304,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
return;
}
-// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm;
+// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm;
SvStream* pSt = &xTableStream;
WW8PLCF aPlc( pSt, nPos, nLen, pPlcSizeTab[ ePlc ] );
@@ -1411,7 +1411,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
}
//-----------------------------------------
-// Text ohne Attribute
+// Text ohne Attribute
//-----------------------------------------
static void DumpPlainText1( WW8_CP nStartCp, long nTextLen )
@@ -1430,7 +1430,7 @@ static void DumpPlainText1( WW8_CP nStartCp, long nTextLen )
*pOut << endl1;
indent( *pOut, *xStrm );
}
-// DumpChar( c );
+// DumpChar( c );
}
}
@@ -1456,7 +1456,7 @@ void DumpPlainText( WW8_CP nStartCp, long nTextLen, char* pName )
}
//-----------------------------------------
-// Text mit Attributen
+// Text mit Attributen
//-----------------------------------------
BOOL DumpChar( BYTE c )
@@ -1466,7 +1466,7 @@ BOOL DumpChar( BYTE c )
return FALSE;
}else{
switch (c){
- case 0xe4: // dt. Umlaute
+ case 0xe4: // dt. Umlaute
case 0xf6:
case 0xfc:
case 0xdf:
@@ -1486,7 +1486,7 @@ BOOL DumpChar( BYTE c )
}
//-----------------------------------------
-// Header / Footer
+// Header / Footer
//-----------------------------------------
static void DumpPlcText( WW8_FC nPos, long nLen, long nOfs,
@@ -1595,7 +1595,7 @@ void DumpTxtStoryEntry( void* pData )
short* ps = (short*)p;
*pOut << " fReusable: 0x" << *ps++ << endl1;
p = (long*)ps;
- ++p; // reserved
+ ++p; // reserved
*pOut << " " << indent1 << "lid: 0x" << *p++;
*pOut << " txidUndo: 0x" << *p++ << dec << endl1;
@@ -1760,27 +1760,27 @@ BOOL ReadEsherRec( SvStream& rStrm, UINT8& rVer, UINT16& rInst,
const char* _GetShapeTypeNm( UINT16 nId )
{
const char* aNmArr[ 202 + 2 + 1 ] = {
-/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon",
-/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc",
-/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing",
-/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4",
-/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3",
-/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16",
-/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow",
-/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout",
-/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow",
-/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow",
-/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess",
-/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation",
-/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage",
-/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted",
-/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour",
-/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4",
-/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft",
-/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90",
-/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank",
-/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound",
-/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???"
+/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon",
+/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc",
+/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing",
+/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4",
+/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3",
+/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16",
+/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow",
+/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout",
+/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow",
+/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow",
+/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess",
+/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation",
+/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage",
+/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted",
+/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour",
+/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4",
+/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft",
+/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90",
+/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank",
+/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound",
+/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???"
};
if( 203 < nId )
nId = 204;
@@ -1793,296 +1793,296 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp,
const char* pRecNm = 0;
switch( nId )
{
- case 4: pRecNm = "DFF_Prop_Rotation"; break;
+ case 4: pRecNm = "DFF_Prop_Rotation"; break;
// Protection
- case 119: pRecNm = "DFF_Prop_LockRotation"; break;
- case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break;
- case 121: pRecNm = "DFF_Prop_LockPosition"; break;
- case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break;
- case 123: pRecNm = "DFF_Prop_LockCropping"; break;
- case 124: pRecNm = "DFF_Prop_LockVertices"; break;
- case 125: pRecNm = "DFF_Prop_LockText"; break;
- case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break;
- case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break;
+ case 119: pRecNm = "DFF_Prop_LockRotation"; break;
+ case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break;
+ case 121: pRecNm = "DFF_Prop_LockPosition"; break;
+ case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break;
+ case 123: pRecNm = "DFF_Prop_LockCropping"; break;
+ case 124: pRecNm = "DFF_Prop_LockVertices"; break;
+ case 125: pRecNm = "DFF_Prop_LockText"; break;
+ case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break;
+ case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break;
// Text
- case 128: pRecNm = "DFF_Prop_lTxid"; break;
- case 129: pRecNm = "DFF_Prop_dxTextLeft"; break;
- case 130: pRecNm = "DFF_Prop_dyTextTop"; break;
- case 131: pRecNm = "DFF_Prop_dxTextRight"; break;
- case 132: pRecNm = "DFF_Prop_dyTextBottom"; break;
- case 133: pRecNm = "DFF_Prop_WrapText"; break;
- case 134: pRecNm = "DFF_Prop_scaleText"; break;
- case 135: pRecNm = "DFF_Prop_anchorText"; break;
- case 136: pRecNm = "DFF_Prop_txflTextFlow"; break;
- case 137: pRecNm = "DFF_Prop_cdirFont"; break;
- case 138: pRecNm = "DFF_Prop_hspNext"; break;
- case 139: pRecNm = "DFF_Prop_txdir"; break;
- case 187: pRecNm = "DFF_Prop_SelectText"; break;
- case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break;
- case 189: pRecNm = "DFF_Prop_RotateText"; break;
- case 190: pRecNm = "DFF_Prop_FitShapeToText"; break;
- case 191: pRecNm = "DFF_Prop_FitTextToShape"; break;
+ case 128: pRecNm = "DFF_Prop_lTxid"; break;
+ case 129: pRecNm = "DFF_Prop_dxTextLeft"; break;
+ case 130: pRecNm = "DFF_Prop_dyTextTop"; break;
+ case 131: pRecNm = "DFF_Prop_dxTextRight"; break;
+ case 132: pRecNm = "DFF_Prop_dyTextBottom"; break;
+ case 133: pRecNm = "DFF_Prop_WrapText"; break;
+ case 134: pRecNm = "DFF_Prop_scaleText"; break;
+ case 135: pRecNm = "DFF_Prop_anchorText"; break;
+ case 136: pRecNm = "DFF_Prop_txflTextFlow"; break;
+ case 137: pRecNm = "DFF_Prop_cdirFont"; break;
+ case 138: pRecNm = "DFF_Prop_hspNext"; break;
+ case 139: pRecNm = "DFF_Prop_txdir"; break;
+ case 187: pRecNm = "DFF_Prop_SelectText"; break;
+ case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break;
+ case 189: pRecNm = "DFF_Prop_RotateText"; break;
+ case 190: pRecNm = "DFF_Prop_FitShapeToText"; break;
+ case 191: pRecNm = "DFF_Prop_FitTextToShape"; break;
// GeoText
- case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break;
- case 193: pRecNm = "DFF_Prop_gtextRTF"; break;
- case 194: pRecNm = "DFF_Prop_gtextAlign"; break;
- case 195: pRecNm = "DFF_Prop_gtextSize"; break;
- case 196: pRecNm = "DFF_Prop_gtextSpacing"; break;
- case 197: pRecNm = "DFF_Prop_gtextFont"; break;
- case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break;
- case 241: pRecNm = "DFF_Prop_fGtext"; break;
- case 242: pRecNm = "DFF_Prop_gtextFVertical"; break;
- case 243: pRecNm = "DFF_Prop_gtextFKern"; break;
- case 244: pRecNm = "DFF_Prop_gtextFTight"; break;
- case 245: pRecNm = "DFF_Prop_gtextFStretch"; break;
- case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break;
- case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break;
- case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break;
- case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break;
- case 250: pRecNm = "DFF_Prop_gtextFBold"; break;
- case 251: pRecNm = "DFF_Prop_gtextFItalic"; break;
- case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break;
- case 253: pRecNm = "DFF_Prop_gtextFShadow"; break;
- case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break;
- case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break;
+ case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break;
+ case 193: pRecNm = "DFF_Prop_gtextRTF"; break;
+ case 194: pRecNm = "DFF_Prop_gtextAlign"; break;
+ case 195: pRecNm = "DFF_Prop_gtextSize"; break;
+ case 196: pRecNm = "DFF_Prop_gtextSpacing"; break;
+ case 197: pRecNm = "DFF_Prop_gtextFont"; break;
+ case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break;
+ case 241: pRecNm = "DFF_Prop_fGtext"; break;
+ case 242: pRecNm = "DFF_Prop_gtextFVertical"; break;
+ case 243: pRecNm = "DFF_Prop_gtextFKern"; break;
+ case 244: pRecNm = "DFF_Prop_gtextFTight"; break;
+ case 245: pRecNm = "DFF_Prop_gtextFStretch"; break;
+ case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break;
+ case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break;
+ case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break;
+ case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break;
+ case 250: pRecNm = "DFF_Prop_gtextFBold"; break;
+ case 251: pRecNm = "DFF_Prop_gtextFItalic"; break;
+ case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break;
+ case 253: pRecNm = "DFF_Prop_gtextFShadow"; break;
+ case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break;
+ case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break;
// Blip
- case 256: pRecNm = "DFF_Prop_cropFromTop"; break;
- case 257: pRecNm = "DFF_Prop_cropFromBottom"; break;
- case 258: pRecNm = "DFF_Prop_cropFromLeft"; break;
- case 259: pRecNm = "DFF_Prop_cropFromRight"; break;
- case 260: pRecNm = "DFF_Prop_pib"; break;
- case 261: pRecNm = "DFF_Prop_pibName"; break;
- case 262: pRecNm = "DFF_Prop_pibFlags"; break;
- case 263: pRecNm = "DFF_Prop_pictureTransparent"; break;
- case 264: pRecNm = "DFF_Prop_pictureContrast"; break;
- case 265: pRecNm = "DFF_Prop_pictureBrightness"; break;
- case 266: pRecNm = "DFF_Prop_pictureGamma"; break;
- case 267: pRecNm = "DFF_Prop_pictureId"; break;
- case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break;
- case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break;
- case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break;
- case 271: pRecNm = "DFF_Prop_pibPrint"; break;
- case 272: pRecNm = "DFF_Prop_pibPrintName"; break;
- case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break;
- case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break;
- case 317: pRecNm = "DFF_Prop_pictureGray"; break;
- case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break;
- case 319: pRecNm = "DFF_Prop_pictureActive"; break;
+ case 256: pRecNm = "DFF_Prop_cropFromTop"; break;
+ case 257: pRecNm = "DFF_Prop_cropFromBottom"; break;
+ case 258: pRecNm = "DFF_Prop_cropFromLeft"; break;
+ case 259: pRecNm = "DFF_Prop_cropFromRight"; break;
+ case 260: pRecNm = "DFF_Prop_pib"; break;
+ case 261: pRecNm = "DFF_Prop_pibName"; break;
+ case 262: pRecNm = "DFF_Prop_pibFlags"; break;
+ case 263: pRecNm = "DFF_Prop_pictureTransparent"; break;
+ case 264: pRecNm = "DFF_Prop_pictureContrast"; break;
+ case 265: pRecNm = "DFF_Prop_pictureBrightness"; break;
+ case 266: pRecNm = "DFF_Prop_pictureGamma"; break;
+ case 267: pRecNm = "DFF_Prop_pictureId"; break;
+ case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break;
+ case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break;
+ case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break;
+ case 271: pRecNm = "DFF_Prop_pibPrint"; break;
+ case 272: pRecNm = "DFF_Prop_pibPrintName"; break;
+ case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break;
+ case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break;
+ case 317: pRecNm = "DFF_Prop_pictureGray"; break;
+ case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break;
+ case 319: pRecNm = "DFF_Prop_pictureActive"; break;
// Geometry
- case 320: pRecNm = "DFF_Prop_geoLeft"; break;
- case 321: pRecNm = "DFF_Prop_geoTop"; break;
- case 322: pRecNm = "DFF_Prop_geoRight"; break;
- case 323: pRecNm = "DFF_Prop_geoBottom"; break;
- case 324: pRecNm = "DFF_Prop_shapePath"; break;
- case 325: pRecNm = "DFF_Prop_pVertices"; break;
- case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break;
- case 327: pRecNm = "DFF_Prop_adjustValue"; break;
- case 328: pRecNm = "DFF_Prop_adjust2Value"; break;
- case 329: pRecNm = "DFF_Prop_adjust3Value"; break;
- case 330: pRecNm = "DFF_Prop_adjust4Value"; break;
- case 331: pRecNm = "DFF_Prop_adjust5Value"; break;
- case 332: pRecNm = "DFF_Prop_adjust6Value"; break;
- case 333: pRecNm = "DFF_Prop_adjust7Value"; break;
- case 334: pRecNm = "DFF_Prop_adjust8Value"; break;
- case 335: pRecNm = "DFF_Prop_adjust9Value"; break;
- case 336: pRecNm = "DFF_Prop_adjust10Value"; break;
- case 378: pRecNm = "DFF_Prop_fShadowOK"; break;
- case 379: pRecNm = "DFF_Prop_f3DOK"; break;
- case 380: pRecNm = "DFF_Prop_fLineOK"; break;
- case 381: pRecNm = "DFF_Prop_fGtextOK"; break;
- case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break;
- case 383: pRecNm = "DFF_Prop_fFillOK"; break;
+ case 320: pRecNm = "DFF_Prop_geoLeft"; break;
+ case 321: pRecNm = "DFF_Prop_geoTop"; break;
+ case 322: pRecNm = "DFF_Prop_geoRight"; break;
+ case 323: pRecNm = "DFF_Prop_geoBottom"; break;
+ case 324: pRecNm = "DFF_Prop_shapePath"; break;
+ case 325: pRecNm = "DFF_Prop_pVertices"; break;
+ case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break;
+ case 327: pRecNm = "DFF_Prop_adjustValue"; break;
+ case 328: pRecNm = "DFF_Prop_adjust2Value"; break;
+ case 329: pRecNm = "DFF_Prop_adjust3Value"; break;
+ case 330: pRecNm = "DFF_Prop_adjust4Value"; break;
+ case 331: pRecNm = "DFF_Prop_adjust5Value"; break;
+ case 332: pRecNm = "DFF_Prop_adjust6Value"; break;
+ case 333: pRecNm = "DFF_Prop_adjust7Value"; break;
+ case 334: pRecNm = "DFF_Prop_adjust8Value"; break;
+ case 335: pRecNm = "DFF_Prop_adjust9Value"; break;
+ case 336: pRecNm = "DFF_Prop_adjust10Value"; break;
+ case 378: pRecNm = "DFF_Prop_fShadowOK"; break;
+ case 379: pRecNm = "DFF_Prop_f3DOK"; break;
+ case 380: pRecNm = "DFF_Prop_fLineOK"; break;
+ case 381: pRecNm = "DFF_Prop_fGtextOK"; break;
+ case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break;
+ case 383: pRecNm = "DFF_Prop_fFillOK"; break;
// FillStyle
- case 384: pRecNm = "DFF_Prop_fillType"; break;
- case 385: pRecNm = "DFF_Prop_fillColor"; break;
- case 386: pRecNm = "DFF_Prop_fillOpacity"; break;
- case 387: pRecNm = "DFF_Prop_fillBackColor"; break;
- case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break;
- case 389: pRecNm = "DFF_Prop_fillCrMod"; break;
- case 390: pRecNm = "DFF_Prop_fillBlip"; break;
- case 391: pRecNm = "DFF_Prop_fillBlipName"; break;
- case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break;
- case 393: pRecNm = "DFF_Prop_fillWidth"; break;
- case 394: pRecNm = "DFF_Prop_fillHeight"; break;
- case 395: pRecNm = "DFF_Prop_fillAngle"; break;
- case 396: pRecNm = "DFF_Prop_fillFocus"; break;
- case 397: pRecNm = "DFF_Prop_fillToLeft"; break;
- case 398: pRecNm = "DFF_Prop_fillToTop"; break;
- case 399: pRecNm = "DFF_Prop_fillToRight"; break;
- case 400: pRecNm = "DFF_Prop_fillToBottom"; break;
- case 401: pRecNm = "DFF_Prop_fillRectLeft"; break;
- case 402: pRecNm = "DFF_Prop_fillRectTop"; break;
- case 403: pRecNm = "DFF_Prop_fillRectRight"; break;
- case 404: pRecNm = "DFF_Prop_fillRectBottom"; break;
- case 405: pRecNm = "DFF_Prop_fillDztype"; break;
- case 406: pRecNm = "DFF_Prop_fillShadePreset"; break;
- case 407: pRecNm = "DFF_Prop_fillShadeColors"; break;
- case 408: pRecNm = "DFF_Prop_fillOriginX"; break;
- case 409: pRecNm = "DFF_Prop_fillOriginY"; break;
- case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break;
- case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break;
- case 412: pRecNm = "DFF_Prop_fillShadeType"; break;
- case 443: pRecNm = "DFF_Prop_fFilled"; break;
- case 444: pRecNm = "DFF_Prop_fHitTestFill"; break;
- case 445: pRecNm = "DFF_Prop_fillShape"; break;
- case 446: pRecNm = "DFF_Prop_fillUseRect"; break;
- case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break;
+ case 384: pRecNm = "DFF_Prop_fillType"; break;
+ case 385: pRecNm = "DFF_Prop_fillColor"; break;
+ case 386: pRecNm = "DFF_Prop_fillOpacity"; break;
+ case 387: pRecNm = "DFF_Prop_fillBackColor"; break;
+ case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break;
+ case 389: pRecNm = "DFF_Prop_fillCrMod"; break;
+ case 390: pRecNm = "DFF_Prop_fillBlip"; break;
+ case 391: pRecNm = "DFF_Prop_fillBlipName"; break;
+ case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break;
+ case 393: pRecNm = "DFF_Prop_fillWidth"; break;
+ case 394: pRecNm = "DFF_Prop_fillHeight"; break;
+ case 395: pRecNm = "DFF_Prop_fillAngle"; break;
+ case 396: pRecNm = "DFF_Prop_fillFocus"; break;
+ case 397: pRecNm = "DFF_Prop_fillToLeft"; break;
+ case 398: pRecNm = "DFF_Prop_fillToTop"; break;
+ case 399: pRecNm = "DFF_Prop_fillToRight"; break;
+ case 400: pRecNm = "DFF_Prop_fillToBottom"; break;
+ case 401: pRecNm = "DFF_Prop_fillRectLeft"; break;
+ case 402: pRecNm = "DFF_Prop_fillRectTop"; break;
+ case 403: pRecNm = "DFF_Prop_fillRectRight"; break;
+ case 404: pRecNm = "DFF_Prop_fillRectBottom"; break;
+ case 405: pRecNm = "DFF_Prop_fillDztype"; break;
+ case 406: pRecNm = "DFF_Prop_fillShadePreset"; break;
+ case 407: pRecNm = "DFF_Prop_fillShadeColors"; break;
+ case 408: pRecNm = "DFF_Prop_fillOriginX"; break;
+ case 409: pRecNm = "DFF_Prop_fillOriginY"; break;
+ case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break;
+ case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break;
+ case 412: pRecNm = "DFF_Prop_fillShadeType"; break;
+ case 443: pRecNm = "DFF_Prop_fFilled"; break;
+ case 444: pRecNm = "DFF_Prop_fHitTestFill"; break;
+ case 445: pRecNm = "DFF_Prop_fillShape"; break;
+ case 446: pRecNm = "DFF_Prop_fillUseRect"; break;
+ case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break;
// LineStyle
- case 448: pRecNm = "DFF_Prop_lineColor"; break;
- case 449: pRecNm = "DFF_Prop_lineOpacity"; break;
- case 450: pRecNm = "DFF_Prop_lineBackColor"; break;
- case 451: pRecNm = "DFF_Prop_lineCrMod"; break;
- case 452: pRecNm = "DFF_Prop_lineType"; break;
- case 453: pRecNm = "DFF_Prop_lineFillBlip"; break;
- case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break;
- case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break;
- case 456: pRecNm = "DFF_Prop_lineFillWidth"; break;
- case 457: pRecNm = "DFF_Prop_lineFillHeight"; break;
- case 458: pRecNm = "DFF_Prop_lineFillDztype"; break;
- case 459: pRecNm = "DFF_Prop_lineWidth"; break;
- case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break;
- case 461: pRecNm = "DFF_Prop_lineStyle"; break;
- case 462: pRecNm = "DFF_Prop_lineDashing"; break;
- case 463: pRecNm = "DFF_Prop_lineDashStyle"; break;
- case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break;
- case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break;
- case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break;
- case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break;
- case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break;
- case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break;
- case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break;
- case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break;
- case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break;
- case 508: pRecNm = "DFF_Prop_fLine"; break;
- case 509: pRecNm = "DFF_Prop_fHitTestLine"; break;
- case 510: pRecNm = "DFF_Prop_lineFillShape"; break;
- case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break;
+ case 448: pRecNm = "DFF_Prop_lineColor"; break;
+ case 449: pRecNm = "DFF_Prop_lineOpacity"; break;
+ case 450: pRecNm = "DFF_Prop_lineBackColor"; break;
+ case 451: pRecNm = "DFF_Prop_lineCrMod"; break;
+ case 452: pRecNm = "DFF_Prop_lineType"; break;
+ case 453: pRecNm = "DFF_Prop_lineFillBlip"; break;
+ case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break;
+ case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break;
+ case 456: pRecNm = "DFF_Prop_lineFillWidth"; break;
+ case 457: pRecNm = "DFF_Prop_lineFillHeight"; break;
+ case 458: pRecNm = "DFF_Prop_lineFillDztype"; break;
+ case 459: pRecNm = "DFF_Prop_lineWidth"; break;
+ case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break;
+ case 461: pRecNm = "DFF_Prop_lineStyle"; break;
+ case 462: pRecNm = "DFF_Prop_lineDashing"; break;
+ case 463: pRecNm = "DFF_Prop_lineDashStyle"; break;
+ case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break;
+ case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break;
+ case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break;
+ case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break;
+ case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break;
+ case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break;
+ case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break;
+ case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break;
+ case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break;
+ case 508: pRecNm = "DFF_Prop_fLine"; break;
+ case 509: pRecNm = "DFF_Prop_fHitTestLine"; break;
+ case 510: pRecNm = "DFF_Prop_lineFillShape"; break;
+ case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break;
// ShadowStyle
- case 512: pRecNm = "DFF_Prop_shadowType"; break;
- case 513: pRecNm = "DFF_Prop_shadowColor"; break;
- case 514: pRecNm = "DFF_Prop_shadowHighlight"; break;
- case 515: pRecNm = "DFF_Prop_shadowCrMod"; break;
- case 516: pRecNm = "DFF_Prop_shadowOpacity"; break;
- case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break;
- case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break;
- case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break;
- case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break;
- case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break;
- case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break;
- case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break;
- case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break;
- case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break;
- case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break;
- case 527: pRecNm = "DFF_Prop_shadowWeight"; break;
- case 528: pRecNm = "DFF_Prop_shadowOriginX"; break;
- case 529: pRecNm = "DFF_Prop_shadowOriginY"; break;
- case 574: pRecNm = "DFF_Prop_fShadow"; break;
- case 575: pRecNm = "DFF_Prop_fshadowObscured"; break;
+ case 512: pRecNm = "DFF_Prop_shadowType"; break;
+ case 513: pRecNm = "DFF_Prop_shadowColor"; break;
+ case 514: pRecNm = "DFF_Prop_shadowHighlight"; break;
+ case 515: pRecNm = "DFF_Prop_shadowCrMod"; break;
+ case 516: pRecNm = "DFF_Prop_shadowOpacity"; break;
+ case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break;
+ case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break;
+ case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break;
+ case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break;
+ case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break;
+ case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break;
+ case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break;
+ case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break;
+ case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break;
+ case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break;
+ case 527: pRecNm = "DFF_Prop_shadowWeight"; break;
+ case 528: pRecNm = "DFF_Prop_shadowOriginX"; break;
+ case 529: pRecNm = "DFF_Prop_shadowOriginY"; break;
+ case 574: pRecNm = "DFF_Prop_fShadow"; break;
+ case 575: pRecNm = "DFF_Prop_fshadowObscured"; break;
// PerspectiveStyle
- case 576: pRecNm = "DFF_Prop_perspectiveType"; break;
- case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break;
- case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break;
- case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break;
- case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break;
- case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break;
- case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break;
- case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break;
- case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break;
- case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break;
- case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break;
- case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break;
- case 639: pRecNm = "DFF_Prop_fPerspective"; break;
+ case 576: pRecNm = "DFF_Prop_perspectiveType"; break;
+ case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break;
+ case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break;
+ case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break;
+ case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break;
+ case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break;
+ case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break;
+ case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break;
+ case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break;
+ case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break;
+ case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break;
+ case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break;
+ case 639: pRecNm = "DFF_Prop_fPerspective"; break;
// 3D Object
- case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break;
- case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break;
- case 642: pRecNm = "DFF_Prop_c3DShininess"; break;
- case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break;
- case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break;
- case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break;
- case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break;
- case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break;
- case 648: pRecNm = "DFF_Prop_c3DCrMod"; break;
- case 700: pRecNm = "DFF_Prop_f3D"; break;
- case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break;
- case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break;
- case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break;
+ case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break;
+ case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break;
+ case 642: pRecNm = "DFF_Prop_c3DShininess"; break;
+ case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break;
+ case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break;
+ case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break;
+ case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break;
+ case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break;
+ case 648: pRecNm = "DFF_Prop_c3DCrMod"; break;
+ case 700: pRecNm = "DFF_Prop_f3D"; break;
+ case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break;
+ case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break;
+ case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break;
// 3D Style
- case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break;
- case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break;
- case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break;
- case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break;
- case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break;
- case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break;
- case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break;
- case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break;
- case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break;
- case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break;
- case 714: pRecNm = "DFF_Prop_c3DTolerance"; break;
- case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break;
- case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break;
- case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break;
- case 718: pRecNm = "DFF_Prop_c3DOriginX"; break;
- case 719: pRecNm = "DFF_Prop_c3DOriginY"; break;
- case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break;
- case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break;
- case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break;
- case 723: pRecNm = "DFF_Prop_c3DKeyX"; break;
- case 724: pRecNm = "DFF_Prop_c3DKeyY"; break;
- case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break;
- case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break;
- case 727: pRecNm = "DFF_Prop_c3DFillX"; break;
- case 728: pRecNm = "DFF_Prop_c3DFillY"; break;
- case 729: pRecNm = "DFF_Prop_c3DFillZ"; break;
- case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break;
- case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break;
- case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break;
- case 765: pRecNm = "DFF_Prop_fc3DParallel"; break;
- case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break;
- case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break;
+ case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break;
+ case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break;
+ case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break;
+ case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break;
+ case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break;
+ case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break;
+ case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break;
+ case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break;
+ case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break;
+ case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break;
+ case 714: pRecNm = "DFF_Prop_c3DTolerance"; break;
+ case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break;
+ case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break;
+ case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break;
+ case 718: pRecNm = "DFF_Prop_c3DOriginX"; break;
+ case 719: pRecNm = "DFF_Prop_c3DOriginY"; break;
+ case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break;
+ case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break;
+ case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break;
+ case 723: pRecNm = "DFF_Prop_c3DKeyX"; break;
+ case 724: pRecNm = "DFF_Prop_c3DKeyY"; break;
+ case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break;
+ case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break;
+ case 727: pRecNm = "DFF_Prop_c3DFillX"; break;
+ case 728: pRecNm = "DFF_Prop_c3DFillY"; break;
+ case 729: pRecNm = "DFF_Prop_c3DFillZ"; break;
+ case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break;
+ case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break;
+ case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break;
+ case 765: pRecNm = "DFF_Prop_fc3DParallel"; break;
+ case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break;
+ case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break;
// Shape
- case 769: pRecNm = "DFF_Prop_hspMaster"; break;
- case 771: pRecNm = "DFF_Prop_cxstyle"; break;
- case 772: pRecNm = "DFF_Prop_bWMode"; break;
- case 773: pRecNm = "DFF_Prop_bWModePureBW"; break;
- case 774: pRecNm = "DFF_Prop_bWModeBW"; break;
- case 826: pRecNm = "DFF_Prop_fOleIcon"; break;
- case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break;
- case 828: pRecNm = "DFF_Prop_fLockShapeType"; break;
- case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break;
- case 831: pRecNm = "DFF_Prop_fBackground"; break;
+ case 769: pRecNm = "DFF_Prop_hspMaster"; break;
+ case 771: pRecNm = "DFF_Prop_cxstyle"; break;
+ case 772: pRecNm = "DFF_Prop_bWMode"; break;
+ case 773: pRecNm = "DFF_Prop_bWModePureBW"; break;
+ case 774: pRecNm = "DFF_Prop_bWModeBW"; break;
+ case 826: pRecNm = "DFF_Prop_fOleIcon"; break;
+ case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break;
+ case 828: pRecNm = "DFF_Prop_fLockShapeType"; break;
+ case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break;
+ case 831: pRecNm = "DFF_Prop_fBackground"; break;
// Callout
- case 832: pRecNm = "DFF_Prop_spcot"; break;
- case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break;
- case 834: pRecNm = "DFF_Prop_spcoa"; break;
- case 835: pRecNm = "DFF_Prop_spcod"; break;
- case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break;
- case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break;
- case 889: pRecNm = "DFF_Prop_fCallout"; break;
- case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break;
- case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break;
- case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break;
- case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break;
- case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break;
- case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break;
+ case 832: pRecNm = "DFF_Prop_spcot"; break;
+ case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break;
+ case 834: pRecNm = "DFF_Prop_spcoa"; break;
+ case 835: pRecNm = "DFF_Prop_spcod"; break;
+ case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break;
+ case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break;
+ case 889: pRecNm = "DFF_Prop_fCallout"; break;
+ case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break;
+ case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break;
+ case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break;
+ case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break;
+ case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break;
+ case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break;
// GroupShape
- case 896: pRecNm = "DFF_Prop_wzName"; break;
- case 897: pRecNm = "DFF_Prop_wzDescription"; break;
- case 898: pRecNm = "DFF_Prop_pihlShape"; break;
- case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break;
- case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break;
- case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break;
- case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break;
- case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break;
- case 904: pRecNm = "DFF_Prop_lidRegroup"; break;
- case 953: pRecNm = "DFF_Prop_fEditedWrap"; break;
- case 954: pRecNm = "DFF_Prop_fBehindDocument"; break;
- case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break;
- case 956: pRecNm = "DFF_Prop_fIsButton"; break;
- case 957: pRecNm = "DFF_Prop_fOneD"; break;
- case 958: pRecNm = "DFF_Prop_fHidden"; break;
- case 959: pRecNm = "DFF_Prop_fPrint"; break;
+ case 896: pRecNm = "DFF_Prop_wzName"; break;
+ case 897: pRecNm = "DFF_Prop_wzDescription"; break;
+ case 898: pRecNm = "DFF_Prop_pihlShape"; break;
+ case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break;
+ case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break;
+ case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break;
+ case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break;
+ case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break;
+ case 904: pRecNm = "DFF_Prop_lidRegroup"; break;
+ case 953: pRecNm = "DFF_Prop_fEditedWrap"; break;
+ case 954: pRecNm = "DFF_Prop_fBehindDocument"; break;
+ case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break;
+ case 956: pRecNm = "DFF_Prop_fIsButton"; break;
+ case 957: pRecNm = "DFF_Prop_fOneD"; break;
+ case 958: pRecNm = "DFF_Prop_fHidden"; break;
+ case 959: pRecNm = "DFF_Prop_fPrint"; break;
}
*pOut << " " << indent1 << ' ';
@@ -2091,7 +2091,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp,
else
*pOut << "Prop" ;
- *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')';
+ *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')';
if( bBid )
*pOut << " Bid: 0x" << (UINT16)bBid;
@@ -2101,7 +2101,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp,
// ....
rStreamOffset += nOp;
}
-// else
+// else
*pOut << " op: 0x" << nOp;
*pOut << dec << endl1;
@@ -2113,39 +2113,39 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
const char* pRecNm = 0;
switch( nFbt )
{
- case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break;
- case 0xF006: pRecNm = "DFF_msofbtDgg"; break;
- case 0xF016: pRecNm = "DFF_msofbtCLSID"; break;
- case 0xF00B: pRecNm = "DFF_msofbtOPT"; break;
- case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break;
- case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break;
- case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break;
- case 0xF007: pRecNm = "DFF_msofbtBSE"; break;
- case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break;
- case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break;
- case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break;
- case 0xF008: pRecNm = "DFF_msofbtDg"; break;
- case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break;
- case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break;
- case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break;
- case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break;
- case 0xF009: pRecNm = "DFF_msofbtSpgr"; break;
- case 0xF00A: pRecNm = "DFF_msofbtSp"; break;
- case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break;
- case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break;
- case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break;
- case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break;
- case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break;
- case 0xF011: pRecNm = "DFF_msofbtClientData"; break;
- case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break;
- case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break;
- case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break;
- case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break;
- case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break;
- case 0xF014: pRecNm = "DFF_msofbtArcRule"; break;
- case 0xF015: pRecNm = "DFF_msofbtClientRule"; break;
- case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break;
- case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break;
+ case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break;
+ case 0xF006: pRecNm = "DFF_msofbtDgg"; break;
+ case 0xF016: pRecNm = "DFF_msofbtCLSID"; break;
+ case 0xF00B: pRecNm = "DFF_msofbtOPT"; break;
+ case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break;
+ case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break;
+ case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break;
+ case 0xF007: pRecNm = "DFF_msofbtBSE"; break;
+ case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break;
+ case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break;
+ case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break;
+ case 0xF008: pRecNm = "DFF_msofbtDg"; break;
+ case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break;
+ case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break;
+ case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break;
+ case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break;
+ case 0xF009: pRecNm = "DFF_msofbtSpgr"; break;
+ case 0xF00A: pRecNm = "DFF_msofbtSp"; break;
+ case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break;
+ case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break;
+ case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break;
+ case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break;
+ case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break;
+ case 0xF011: pRecNm = "DFF_msofbtClientData"; break;
+ case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break;
+ case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break;
+ case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break;
+ case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break;
+ case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break;
+ case 0xF014: pRecNm = "DFF_msofbtArcRule"; break;
+ case 0xF015: pRecNm = "DFF_msofbtClientRule"; break;
+ case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break;
+ case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break;
}
*pOut << hex6 << nPos << indent1;
@@ -2159,7 +2159,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
switch( nFbt )
{
- case 0xf00b: // DFF_msofbtOPT
+ case 0xf00b: // DFF_msofbtOPT
{
UINT16 nId; UINT32 nOp, nStreamOffset = nInst * 6;
BOOL bBid, bComplex;
@@ -2177,9 +2177,9 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
}
break;
- case 0xF00d: // DFF_msofbtClientTextbox
- case 0xF010: // DFF_msofbtClientAnchor
- case 0xF011: // DFF_msofbtClientData
+ case 0xF00d: // DFF_msofbtClientTextbox
+ case 0xF010: // DFF_msofbtClientAnchor
+ case 0xF011: // DFF_msofbtClientData
{
UINT32 nData;
if( 4 == nLength && WW8ReadUINT32( *xTableStream, nData ))
@@ -2188,7 +2188,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
}
break;
- case 0xf00a: // DFF_msofbtSp
+ case 0xf00a: // DFF_msofbtSp
{
UINT32 nId, nData;
if( WW8ReadUINT32( *xTableStream, nId ) &&
@@ -2202,8 +2202,8 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
}
break;
- case 0xf009: // DFF_msofbtSpgr
- case 0xf00f: // DFF_msofbtChildAnchor
+ case 0xf009: // DFF_msofbtSpgr
+ case 0xf00f: // DFF_msofbtChildAnchor
{
UINT32 nL, nT, nR, nB;
if( WW8ReadUINT32( *xTableStream, nL ) &&
@@ -2219,12 +2219,12 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
case 0xf006: //ESCHER_Dgg
{
- UINT32 spidMax, // The current maximum shape ID
- cidcl, // The number of ID clusters (FIDCLs)
- cspSaved, // The total number of shapes saved
+ UINT32 spidMax, // The current maximum shape ID
+ cidcl, // The number of ID clusters (FIDCLs)
+ cspSaved, // The total number of shapes saved
// (including deleted shapes, if undo
// information was saved)
- cdgSaved; // The total number of drawings saved
+ cdgSaved; // The total number of drawings saved
if( WW8ReadUINT32( *xTableStream, spidMax ) &&
WW8ReadUINT32( *xTableStream, cidcl ) &&
@@ -2276,26 +2276,26 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
}
break;
- case 0xF016: //ESCHER_CLSID
- case 0xF11A: //ESCHER_ColorMRU
- case 0xF11E: //ESCHER_SplitMenuColors
-// case 0xF001: //ESCHER_BstoreContainer
- case 0xF007: //ESCHER_BSE
- case 0xF018: //ESCHER_BlipFirst
- case 0xF117: //ESCHER_BlipLast
- case 0xF118: //ESCHER_RegroupItems
- case 0xF120: //ESCHER_ColorScheme
- case 0xF00C: //ESCHER_Textbox
- case 0xF00E: //ESCHER_Anchor
- case 0xF11F: //ESCHER_OleObject
- case 0xF11D: //ESCHER_DeletedPspl
- case 0xF005: //ESCHER_SolverContainer
- case 0xF012: //ESCHER_ConnectorRule
- case 0xF013: //ESCHER_AlignRule
- case 0xF014: //ESCHER_ArcRule
- case 0xF015: //ESCHER_ClientRule
- case 0xF017: //ESCHER_CalloutRule
- case 0xF119: //ESCHER_Selection
+ case 0xF016: //ESCHER_CLSID
+ case 0xF11A: //ESCHER_ColorMRU
+ case 0xF11E: //ESCHER_SplitMenuColors
+// case 0xF001: //ESCHER_BstoreContainer
+ case 0xF007: //ESCHER_BSE
+ case 0xF018: //ESCHER_BlipFirst
+ case 0xF117: //ESCHER_BlipLast
+ case 0xF118: //ESCHER_RegroupItems
+ case 0xF120: //ESCHER_ColorScheme
+ case 0xF00C: //ESCHER_Textbox
+ case 0xF00E: //ESCHER_Anchor
+ case 0xF11F: //ESCHER_OleObject
+ case 0xF11D: //ESCHER_DeletedPspl
+ case 0xF005: //ESCHER_SolverContainer
+ case 0xF012: //ESCHER_ConnectorRule
+ case 0xF013: //ESCHER_AlignRule
+ case 0xF014: //ESCHER_ArcRule
+ case 0xF015: //ESCHER_ClientRule
+ case 0xF017: //ESCHER_CalloutRule
+ case 0xF119: //ESCHER_Selection
case 0xf008: //ESCHER_Dg
{
int nCnt = 128;
@@ -2363,7 +2363,7 @@ void DumpEscherRecs( ULONG nPos, UINT32 nLength )
switch( nFbt )
{
case 0xF000:
- case 0xF001: //ESCHER_BstoreContainer
+ case 0xF001: //ESCHER_BstoreContainer
case 0xF002:
case 0xF003:
case 0xF004:
@@ -2399,7 +2399,7 @@ void DumpDrawing()
//-----------------------------------------
-// Hilfroutinen fuer Styles
+// Hilfroutinen fuer Styles
//-----------------------------------------
static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP )
@@ -2419,7 +2419,7 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP )
indent( *pOut, *xTableStream );
xTableStream->Read( &cbUPX, 2 );
- nLen-= 2;
+ nLen-= 2;
if ( cbUPX > nLen )
{
@@ -2443,13 +2443,13 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP )
xTableStream->Read( &id, 2 );
cbUPX-= 2;
- nLen-= 2;
+ nLen-= 2;
*pOut << "ID:" << id;
}
*pOut << endl1;
- ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert
+ ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert
// wird, gehts danach wieder richtig
DumpSprms( nVersion, *xTableStream, cbUPX );
@@ -2475,8 +2475,8 @@ static void DumpStyleGrupx( BYTE nVersion, short nLen, BOOL bPara )
begin( *pOut, *xTableStream ) << "Grupx, Len:" << nLen << endl1;
- if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx
- DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx
+ if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx
+ DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx
end( *pOut, *xTableStream ) << "Grupx" << endl1;
}
@@ -2486,12 +2486,12 @@ static void PrintStyleId( USHORT nId )
switch ( nId ){
case 0xffe: *pOut << "User "; break;
case 0xfff: *pOut << "Nil "; break;
- default: *pOut << nId << ' '; break;
+ default: *pOut << nId << ' '; break;
}
}
//-----------------------------------------
-// Styles
+// Styles
//-----------------------------------------
void DStyle::Dump1Style( USHORT nNr )
@@ -2503,7 +2503,7 @@ void DStyle::Dump1Style( USHORT nNr )
WW8_STD* pStd = Read1Style( nSkip, &aStr, &cbStd ); // lese Style
- if ( aStr.Len() ) // echter Style
+ if ( aStr.Len() ) // echter Style
{
*pOut << begin1;
switch ( pStd->sgc ){
@@ -2521,17 +2521,17 @@ void DStyle::Dump1Style( USHORT nNr )
*pOut << "No of Upx & Upe:" << pStd->cupx << ' ';
*pOut << "bchUpe:" << pStd->bchUpe << ' ';
*pOut << "nSkip:" << nSkip << endl1;
- }else{ // leerer Slot
+ }else{ // leerer Slot
*pOut << "empty Slot Nr:" << nNr << endl1;
}
- long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert
+ long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert
// wird, gehts danach wieder richtig
if( pStd && ( pStd->sgc == 1 || pStd->sgc == 2 ) )
DumpStyleGrupx( nVersion, nSkip, pStd->sgc == 1 );
- if ( aStr.Len() ) // echter Style
+ if ( aStr.Len() ) // echter Style
end( *pOut, *xTableStream ) << c << "-Style" << endl1;
xTableStream->Seek( nPos+nSkip );
@@ -2543,7 +2543,7 @@ void DStyle::Dump()
{
*pOut << hex6 << nStyleStart << ' ' << dec2 << indent1;
- *pOut << begin1 << cstd << " Styles, ";
+ *pOut << begin1 << cstd << " Styles, ";
*pOut << "Base:" << cbSTDBaseInFile;
*pOut << ", Written:" << (fStdStylenamesWritten) ? 'T' : 'F';
*pOut << ", MaxSti:" << stiMaxWhenSaved;
@@ -2559,7 +2559,7 @@ void DStyle::Dump()
}
//-----------------------------------------
-// Main
+// Main
//-----------------------------------------
//char cName [266];
@@ -2629,7 +2629,7 @@ int DoConvert( const String& rName, BYTE nVersion )
// welcher Table-Stream gueltig ist.
// Diesen oeffnen wir nun.
- switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7"
+ switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7"
{
case 6:
case 7:
@@ -2664,10 +2664,10 @@ int DoConvert( const String& rName, BYTE nVersion )
// erstmal die Lowlevel-Funktionen
- ((DFib*)pWwFib)->Dump(); // FIB
- DumpDop( *pWwFib ); // WW8_DOP
+ ((DFib*)pWwFib)->Dump(); // FIB
+ DumpDop( *pWwFib ); // WW8_DOP
- if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) ||
+ if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) ||
pWwFib->lcbClx )
DumpPcd( pWwFib->nVersion, pWwFib->fcClx, pWwFib->lcbClx );
@@ -2676,18 +2676,18 @@ int DoConvert( const String& rName, BYTE nVersion )
DumpBookHigh();
- DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX
+ DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX
DumpPLCF( pWwFib->fcPlcfbteChpx, pWwFib->lcbPlcfbteChpx, CHP ); // CHPX
DumpPLCF( pWwFib->fcPlcfbtePapx, pWwFib->lcbPlcfbtePapx, PAP ); // PAPX
{
- DStyle aStyle( *xTableStream, *pWwFib ); // Styles
+ DStyle aStyle( *xTableStream, *pWwFib ); // Styles
aStyle.Dump();
}
- DumpFonts(); // WW8_FFN
+ DumpFonts(); // WW8_FFN
// ... und jetzt die High-Level-Funktionen
@@ -2698,7 +2698,7 @@ int DoConvert( const String& rName, BYTE nVersion )
DumpField1( pWwFib->fcPlcffldMom, pWwFib->lcbPlcffldMom,
"MainText Fields" );
- DumpHeader( pSBase ); // Header / Footer
+ DumpHeader( pSBase ); // Header / Footer
DumpField1( pWwFib->fcPlcffldHdr, pWwFib->lcbPlcffldHdr,
"Header/Footer Fields" );
@@ -2734,7 +2734,7 @@ int DoConvert( const String& rName, BYTE nVersion )
void DeInit()
{
-// DELETEZ( aWwStor );
+// DELETEZ( aWwStor );
xStrm.Clear();
DELETEZ( pxStor );
DELETEZ( pOut );
diff --git a/sw/source/filter/ww8/dump/msvbasic.cxx b/sw/source/filter/ww8/dump/msvbasic.cxx
index 0acbb3dab7fc..7f9659b77b1a 100644
--- a/sw/source/filter/ww8/dump/msvbasic.cxx
+++ b/sw/source/filter/ww8/dump/msvbasic.cxx
@@ -2,7 +2,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
@@ -30,9 +30,9 @@
#include "precompiled_sw.hxx"
-#include <string.h> // memset(), ...
+#include <string.h> // memset(), ...
#ifndef UNX
-#include <io.h> // access()
+#include <io.h> // access()
#endif
#include <msvbasic.hxx>
@@ -286,7 +286,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
xVBAProject->Read(&junksize,2); // usually 18 02, sometimes 1e 02
//but sometimes its a run of numbers until 0xffff, gagh!!!
//*pOut << "position is " << xVBAProject->Tell() << "len is "
- // << junksize << endl;
+ // << junksize << endl;
}
UINT16 ftest;
@@ -395,7 +395,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow)
xVBAStream->GetError() )
{
DBG_WARNING("Not able to open vb module ");
-// DBG_WARNING((pOffsets[nIndex].sName).GetStr());
+// DBG_WARNING((pOffsets[nIndex].sName).GetStr());
}
else
{
@@ -403,7 +403,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow)
DecompressVBA(nIndex,xVBAStream);
/*
* if len was too big for a single string set that variable ?
- * if ((len > XX) && (pOverflow))
+ * if ((len > XX) && (pOverflow))
*pOverflow=1;
*/
if (bCommented)
diff --git a/sw/source/filter/ww8/dump/msvbasic.hxx b/sw/source/filter/ww8/dump/msvbasic.hxx
index bb12e9509511..86326c0015aa 100644
--- a/sw/source/filter/ww8/dump/msvbasic.hxx
+++ b/sw/source/filter/ww8/dump/msvbasic.hxx
@@ -2,7 +2,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
@@ -64,7 +64,7 @@ public:
//0 for failure, 1 for success
BOOL Open( const String &rToplevel, const String &rSublevel);
const String & Decompress( UINT16 nIndex, int *pOverflow=0);
- UINT16 GetNoStreams() const { return nOffsets; }
+ UINT16 GetNoStreams() const { return nOffsets; }
const String &GetStreamName( UINT16 nIndex ) const
{
DBG_ASSERT( nIndex < nOffsets, "Index out of range" );
diff --git a/sw/source/filter/ww8/dump/ww8darr.cxx b/sw/source/filter/ww8/dump/ww8darr.cxx
index ae33501a5bee..da2deb130277 100644
--- a/sw/source/filter/ww8/dump/ww8darr.cxx
+++ b/sw/source/filter/ww8/dump/ww8darr.cxx
@@ -2,7 +2,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
@@ -31,7 +31,7 @@
#include <stdlib.h>
-#include "ww8dout.hxx" // OutShort()
+#include "ww8dout.hxx" // OutShort()
#include "ww8darr.hxx"
@@ -44,17 +44,17 @@
SprmDumpInfo aSprmDumpTab[] = {
0, (FnOut)0, "NOP(0)",
2, OutShort, "sprmPIstd", // pap.istd (style code)
- 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation
+ 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation
4, OutByte, "sprmPIncLv1", // pap.istddifference
5, OutByte, "sprmPJc", // pap.jc (justification)
6, OutBool, "sprmPFSideBySide", // pap.fSideBySide
7, OutBool, "sprmPFKeep", // pap.fKeep
- 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow
+ 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow
9, OutBool, "sprmPPageBreakBefore", // pap.fPageBreakBefore
- 10, (FnOut)0, "sprmPBrcl", // pap.brcl
+ 10, (FnOut)0, "sprmPBrcl", // pap.brcl
11, (FnOut)0, "sprmPBrcp ", // pap.brcp
- 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure)
+ 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure)
13, OutByte, "sprmPNLvlAnm", // pap.nLvlAnm nn
14, OutBool, "sprmPFNoLineNumb", //ap.fNoLnn
@@ -67,9 +67,9 @@ SprmDumpInfo aSprmDumpTab[] = {
18, OutWord, "sprmPNest", // pap.dxaLeft
19, OutShort, "sprmPDxaLeft1", // pap.dxaLeft1
- 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD
+ 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD
21, OutWord, "sprmPDyaBefore", // pap.dyaBefore
- 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter
+ 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter
//??
@@ -124,7 +124,7 @@ SprmDumpInfo aSprmDumpTab[] = {
72, OutShort, "sprmCRMReason", // chp.idslRMReason an index to a table
73, (FnOut)0, "sprmCChse", // chp.fChsDiff and chp.chse see below 3 bytes
74, (FnOut)0, "sprmCSymbol", // chp.fSpec, chp.chSym and chp.ftcSym
- 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit
+ 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit
80, OutShort, "sprmCIstd", // chp.istd istd, see stylesheet definition short
81, (FnOut)0, "sprmCIstdPermute", // chp.istd permutation vector (see below)
@@ -169,7 +169,7 @@ SprmDumpInfo aSprmDumpTab[] = {
118, OutBool, "sprmCFObj", // chp.fObj 1 or 0 bit
119, (FnOut)0, "sprmPicBrcl", // pic.brcl brcl (see PIC structure definition) byte
- 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft,
+ 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft,
121, (FnOut)0, "sprmPicBrcTop", // pic.brcTop BRC word
122, (FnOut)0, "sprmPicBrcLeft", // pic.brcLeft BRC word
123, (FnOut)0, "sprmPicBrcBottom", // pic.brcBottom BRC word
diff --git a/sw/source/filter/ww8/dump/ww8darr.hxx b/sw/source/filter/ww8/dump/ww8darr.hxx
index 158fa11ab1f5..64a8e9c6e636 100644
--- a/sw/source/filter/ww8/dump/ww8darr.hxx
+++ b/sw/source/filter/ww8/dump/ww8darr.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/dump/ww8dout.cxx b/sw/source/filter/ww8/dump/ww8dout.cxx
index 771233b1f029..a0a77dd393f7 100644
--- a/sw/source/filter/ww8/dump/ww8dout.cxx
+++ b/sw/source/filter/ww8/dump/ww8dout.cxx
@@ -2,7 +2,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
@@ -29,9 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <stdio.h> // getchar
+#include <stdio.h> // getchar
-#include <tools/solar.h> // BYTE
+#include <tools/solar.h> // BYTE
#include "ww8dout.hxx"
#include <tools/stream.hxx>
@@ -39,7 +39,7 @@
extern SvStorageStreamRef xStrm;
extern SvStorageStreamRef xTableStream;
-extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch,
+extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch,
void DumpSprms( BYTE nVersion, SvStream& rSt, short nLen );
ostream* pOut = 0;
@@ -47,7 +47,7 @@ ostream* pOut = 0;
#define DumpVer8
//-----------------------------------------
-// Streams
+// Streams
//-----------------------------------------
@@ -152,7 +152,7 @@ ostream& __cdecl end1( ostream& s ) { level--; return s << indent1 << "END "; }
ostream& __cdecl end2( ostream& s ) { level--; return s << indent2 << "END "; }
//-----------------------------------------
-// Ausgabe-Funktionen
+// Ausgabe-Funktionen
//-----------------------------------------
void OutBool( SvStream& rSt, short )
@@ -285,7 +285,7 @@ void OutTab( SvStream& rSt, short )
rSt.Read( &nDel, sizeof( nDel ) );
*pOut << "Del " << (USHORT)nDel;
- if ( nDel ) *pOut << ": ";
+ if ( nDel ) *pOut << ": ";
else *pOut << ", ";
for( i=1; i<=nDel; i++){
@@ -296,7 +296,7 @@ void OutTab( SvStream& rSt, short )
}
rSt.Read( &nIns, sizeof( nIns ) );
*pOut << "Ins " << (USHORT)nIns;
- if ( nIns ) *pOut << ": ";
+ if ( nIns ) *pOut << ": ";
for( i=1; i<=nIns; i++){
rSt.Read( &nPos, sizeof( nPos ) );
@@ -304,7 +304,7 @@ void OutTab( SvStream& rSt, short )
if( i<nIns ) *pOut << ',';
else *pOut << ' ';
}
- if ( nIns ) *pOut << "Typ: ";
+ if ( nIns ) *pOut << "Typ: ";
for( i=1; i<=nIns; i++){
rSt.Read( &nType, sizeof( nType ) );
@@ -313,9 +313,9 @@ void OutTab( SvStream& rSt, short )
else *pOut << ' ';
}
-// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge,
+// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge,
// stimmt auch bei Laenge > 256
-// bei diesem Tab-Befehl anscheinend nicht noetig
+// bei diesem Tab-Befehl anscheinend nicht noetig
}
void OutTab190( SvStream& rSt, short nLen )
@@ -364,7 +364,7 @@ void OutHugeHex( SvStream& rSt, short nLen )
xDataStream->Read( &nLen, sizeof( nLen ) );
-// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1;
+// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1;
*pOut << endl1;
DumpSprms( 8, *xDataStream, nLen );
@@ -375,7 +375,7 @@ void OutTabD608( SvStream& rSt, short nLen )
{
BYTE nHi, nCols;
rSt.Read( &nHi, sizeof( nHi ) );
-// nLen += ((short)nHi) << 8;
+// nLen += ((short)nHi) << 8;
rSt.Read( &nCols, sizeof( nCols ) );
*pOut << " Cols: " << (short)nCols << ' ' << endl1 << indent2;
diff --git a/sw/source/filter/ww8/dump/ww8dout.hxx b/sw/source/filter/ww8/dump/ww8dout.hxx
index 5bcb34db96c2..56d786e34acf 100644
--- a/sw/source/filter/ww8/dump/ww8dout.hxx
+++ b/sw/source/filter/ww8/dump/ww8dout.hxx
@@ -2,7 +2,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
@@ -30,10 +30,10 @@
#define _WW8DOUT_HXX
#ifndef INC_FSTREAM
- #include <fstream.h> // ostream
+ #include <fstream.h> // ostream
#endif
#ifndef SOLAR_H
- #include <tools/solar.h> // BYTE
+ #include <tools/solar.h> // BYTE
#endif
class SvStream;
diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx
index 7ecb639a1b75..cf58b2814c69 100644
--- a/sw/source/filter/ww8/dump/ww8scan.cxx
+++ b/sw/source/filter/ww8/dump/ww8scan.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include <algorithm>
#include <functional>
-#include <string.h> // memset()
+#include <string.h> // memset()
#include <osl/endian.h>
#include <rtl/tencinfo.h>
@@ -41,12 +41,12 @@
#define ERR_SWG_READ_ERROR 1234
#define OSL_ENSURE( a, b )
-#else // dump
-#include <swerror.h> // ERR_WW6_...
-#include <errhdl.hxx> // OSL_ENSURE()
-#include <swtypes.hxx> // DELETEZ
+#else // dump
+#include <swerror.h> // ERR_WW6_...
+#include <errhdl.hxx> // OSL_ENSURE()
+#include <swtypes.hxx> // DELETEZ
-#endif // dump
+#endif // dump
#include <tools/debug.hxx>
#include "ww8scan.hxx"
@@ -239,7 +239,7 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
{ 72, 2, L_FIX}, // "sprmCRMReason" chp.idslRMReason an index to a table
{ 73, 3, L_FIX}, // "sprmCChse" chp.fChsDiff and chp.chse
{ 74, 0, L_VAR}, // "sprmCSymbol" chp.fSpec, chp.chSym and chp.ftcSym
- { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit
+ { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit
{ 79, 0, L_VAR}, // unknown
{ 80, 2, L_FIX}, // "sprmCIstd" chp.istd istd, see stylesheet definition
{ 81, 0, L_VAR}, // "sprmCIstdPermute" chp.istd permutation vector
@@ -602,7 +602,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{0x9031, 2, L_FIX}, // "sprmSDyaLinePitch"
// sep.dyaLinePitch;dya; WRONG:long; RIGHT:short; !
{0x5032, 2, L_FIX}, // "sprmSClm" ;;;
- {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex
+ {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex
{0x5400, 2, L_FIX}, // "sprmTJc" tap.jc;jc;word (low order byte is
// significant);
{0x9601, 2, L_FIX}, // "sprmTDxaLeft" tap.rgdxaCenter
@@ -837,7 +837,7 @@ const BYTE* WW8SprmIter::FindSprm(USHORT nId)
}
//-----------------------------------------
-// temporaerer Test
+// temporaerer Test
//-----------------------------------------
// WW8PLCFx_PCDAttrs halten sich an WW8PLCF_Pcd fest und besitzen deshalb keine
// eigenen Iteratoren. Alle sich auf Iteratoren beziehenden Methoden
@@ -905,9 +905,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
}
const BYTE* pSprms = pGrpprls[ nSprmIdx ];
- p->nSprmsLen = SVBT16ToShort( pSprms ); // Length
+ p->nSprmsLen = SVBT16ToShort( pSprms ); // Length
pSprms += 2;
- p->pMemPos = pSprms; // Position
+ p->pMemPos = pSprms; // Position
}
else
{
@@ -920,7 +920,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
{
aShortSprm[0] = (BYTE)( ( nPrm & 0xfe) >> 1 );
aShortSprm[1] = (BYTE)( nPrm >> 8 );
- p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge
+ p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge
// store Postion of internal mini storage in Data Pointer
p->pMemPos = aShortSprm;
@@ -1160,20 +1160,20 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
}
//-----------------------------------------
-// Hilfsroutinen fuer alle
+// Hilfsroutinen fuer alle
//-----------------------------------------
DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM)
{
/*
- mint short :6 0000003F minutes (0-59)
- hr short :5 000007C0 hours (0-23)
- dom short :5 0000F800 days of month (1-31)
- mon short :4 000F0000 months (1-12)
- yr short :9 1FF00000 years (1900-2411)-1900
- wdy short :3 E0000000 weekday(Sunday=0
+ mint short :6 0000003F minutes (0-59)
+ hr short :5 000007C0 hours (0-23)
+ dom short :5 0000F800 days of month (1-31)
+ mon short :4 000F0000 months (1-12)
+ yr short :9 1FF00000 years (1900-2411)-1900
+ wdy short :3 E0000000 weekday(Sunday=0
Monday=1
- ( wdy can be ignored ) Tuesday=2
+ ( wdy can be ignored ) Tuesday=2
Wednesday=3
Thursday=4
Friday=5
@@ -1182,13 +1182,13 @@ DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM)
DateTime aDateTime(Date( 0 ), Time( 0 ));
if( lDTTM )
{
- USHORT lMin = (USHORT)(lDTTM & 0x0000003F);
+ USHORT lMin = (USHORT)(lDTTM & 0x0000003F);
lDTTM >>= 6;
USHORT lHour= (USHORT)(lDTTM & 0x0000001F);
lDTTM >>= 5;
- USHORT lDay = (USHORT)(lDTTM & 0x0000001F);
+ USHORT lDay = (USHORT)(lDTTM & 0x0000001F);
lDTTM >>= 5;
- USHORT lMon = (USHORT)(lDTTM & 0x0000000F);
+ USHORT lMon = (USHORT)(lDTTM & 0x0000000F);
lDTTM >>= 4;
USHORT lYear= (USHORT)(lDTTM & 0x000001FF) + 1900;
aDateTime = DateTime(Date(lDay, lMon, lYear), Time(lHour, lMin));
@@ -1211,7 +1211,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace,
if( bVer67 )
{
UINT16 aBrc1 = SVBT16ToShort(aBits1);
- nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico
+ nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico
nSpace = (aBrc1 & 0xF800) >> 11;
nMSTotalWidth = aBrc1 & 0x07;
@@ -1228,7 +1228,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace,
else
{
nIdx = aBits1[1];
- nCol = aBits2[0]; // aBor.ico
+ nCol = aBits2[0]; // aBor.ico
nSpace = aBits2[1] & 0x1F; //space between line and object
//Specification in 8ths of a point, 1 Point = 20 Twips, so by 2.5
@@ -1429,7 +1429,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
long nCpStart, nCpEnd;
void* pData;
if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
- { // ausserhalb PLCFfpcd ?
+ { // ausserhalb PLCFfpcd ?
OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
break;
}
@@ -1462,7 +1462,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
}
}
// not found
- pPieceIter->SetIdx( nOldPos ); // not found
+ pPieceIter->SetIdx( nOldPos ); // not found
/*
If it was not found, then this is because it has fallen between two
stools, i.e. either it is the last cp/fc of the last piece, or it is
@@ -1489,7 +1489,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
pIsUnicode = &bIsUnicode;
if( pPieceIter )
- { // Complex File
+ { // Complex File
if( pNextPieceCp )
*pNextPieceCp = LONG_MAX;
@@ -1535,7 +1535,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
}
//-----------------------------------------
-// class WW8ScannerBase
+// class WW8ScannerBase
//-----------------------------------------
WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF )
@@ -1554,43 +1554,43 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF )
{
*pStr >> clxt;
nLeft--;
- if( 2 == clxt ) // PLCFfpcd ?
- break; // PLCFfpcd gefunden
- if( 1 == clxt ) // clxtGrpprl ?
+ if( 2 == clxt ) // PLCFfpcd ?
+ break; // PLCFfpcd gefunden
+ if( 1 == clxt ) // clxtGrpprl ?
nGrpprl++;
UINT16 nLen;
*pStr >> nLen;
nLeft -= 2 + nLen;
if( nLeft < 0 )
- return 0; // schiefgegangen
- pStr->SeekRel( nLen ); // ueberlies grpprl
+ return 0; // schiefgegangen
+ pStr->SeekRel( nLen ); // ueberlies grpprl
}
pStr->Seek( nClxPos );
nLeft = nClxLen;
pPieceGrpprls = new BYTE*[nGrpprl + 1];
memset( pPieceGrpprls, 0, ( nGrpprl + 1 ) * 4 );
nPieceGrpprls = nGrpprl;
- INT16 nAktGrpprl = 0; // lies Grpprls ein
+ INT16 nAktGrpprl = 0; // lies Grpprls ein
while( 1 )
{
*pStr >> clxt;
nLeft--;
- if( 2 == clxt) // PLCFfpcd ?
- break; // PLCFfpcd gefunden
+ if( 2 == clxt) // PLCFfpcd ?
+ break; // PLCFfpcd gefunden
UINT16 nLen;
*pStr >> nLen;
nLeft -= 2 + nLen;
if( nLeft < 0 )
- return 0; // schiefgegangen
- if( 1 == clxt ) // clxtGrpprl ?
+ return 0; // schiefgegangen
+ if( 1 == clxt ) // clxtGrpprl ?
{
- BYTE* p = new BYTE[nLen+2]; // alloziere
- ShortToSVBT16(nLen, p); // trage Laenge ein
- pStr->Read( p+2, nLen ); // lies grpprl
- pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein
+ BYTE* p = new BYTE[nLen+2]; // alloziere
+ ShortToSVBT16(nLen, p); // trage Laenge ein
+ pStr->Read( p+2, nLen ); // lies grpprl
+ pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein
}
else
- pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl
+ pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl
}
// lies Piece Table PLCF ein
INT32 nPLCFfLen;
@@ -1616,7 +1616,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
pMainTxbxBkd(0), pHdFtTxbx(0), pHdFtTxbxBkd(0), pMagicTables(0),
pPieceGrpprls(0)
{
- pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex
+ pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex
if( pPiecePLCF )
{
pPieceIter = new WW8PLCFpcd_Iter( *pPiecePLCF );
@@ -1633,10 +1633,10 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
}
// pChpPLCF and pPapPLCF may NOT be created before pPLCFx_PCD !!
- pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX
- pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX
+ pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX
+ pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX
- pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX
+ pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX
// Footnotes
pFtnPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->nVersion, 0,
@@ -1767,20 +1767,20 @@ WW8ScannerBase::~WW8ScannerBase()
}
//-----------------------------------------
-// Fields
+// Fields
//-----------------------------------------
static bool WW8SkipField(WW8PLCFspecial& rPLCF)
{
void* pData;
long nP;
- if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ?
+ if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ?
return false;
rPLCF++;
- if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ?
- return true; // Bei Fehler nicht abbrechen
+ if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ?
+ return true; // Bei Fehler nicht abbrechen
if( !rPLCF.Get( nP, pData ) )
return false;
@@ -1789,7 +1789,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF)
while((((BYTE*)pData)[0] & 0x1f ) == 0x13 )
{
// immer noch neue (nested) Anfaenge ?
- WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil
+ WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil
if( !rPLCF.Get( nP, pData ) )
return false;
}
@@ -1806,7 +1806,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF)
while ((((BYTE*)pData)[0] & 0x1f ) == 0x13)
{
// immer noch neue (nested) Anfaenge ?
- WW8SkipField( rPLCF ); // nested Field im Resultatteil
+ WW8SkipField( rPLCF ); // nested Field im Resultatteil
if( !rPLCF.Get( nP, pData ) )
return false;
}
@@ -1823,12 +1823,12 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = 0;
- if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ?
+ if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ?
goto Err;
rPLCF++;
- if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ?
+ if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ?
goto Err;
rF.nId = ((BYTE*)pData)[1];
@@ -1836,20 +1836,20 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
if( !rPLCF.Get( rF.nLCode, pData ) )
goto Err;
- rF.nSRes = rF.nLCode; // Default
- rF.nSCode++; // ohne Marken
- rF.nLCode -= rF.nSCode; // Pos zu Laenge
+ rF.nSRes = rF.nLCode; // Default
+ rF.nSCode++; // ohne Marken
+ rF.nLCode -= rF.nSCode; // Pos zu Laenge
while((((BYTE*)pData)[0] & 0x1f ) == 0x13 )
{
// immer noch neue (nested) Anfaenge ?
- WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil
+ WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil
rF.bCodeNest = true;
if( !rPLCF.Get( rF.nSRes, pData ) )
goto Err;
}
- if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ?
+ if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ?
rPLCF++;
if( !rPLCF.Get( rF.nLRes, pData ) )
@@ -1858,19 +1858,19 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
while((((BYTE*)pData)[0] & 0x1f ) == 0x13 )
{
// immer noch neue (nested) Anfaenge ?
- WW8SkipField( rPLCF ); // nested Field im Resultatteil
+ WW8SkipField( rPLCF ); // nested Field im Resultatteil
rF.bResNest = true;
if( !rPLCF.Get( rF.nLRes, pData ) )
goto Err;
}
- rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition
- rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge
- rF.nSRes++; // Endpos encl. Marken
+ rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition
+ rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge
+ rF.nSRes++; // Endpos encl. Marken
rF.nLRes--;
}else{
- rF.nLRes = 0; // Kein Result vorhanden
- rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge
+ rF.nLRes = 0; // Kein Result vorhanden
+ rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge
}
rPLCF++;
@@ -1878,9 +1878,9 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
{
// Field Ende ?
// INDEX-Fld hat Bit7 gesetzt!?!
- rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen
+ rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen
}else{
- rF.nId = 0; // Nein -> Feld ungueltig
+ rF.nId = 0; // Nein -> Feld ungueltig
}
rPLCF.SetIdx( nOldIdx );
@@ -1915,7 +1915,7 @@ String WW8ReadPString(SvStream& rStrm, rtl_TextEncoding eEnc,
}
if( bAtEndSeekRel1 )
- rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende.
+ rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende.
return String( aByteStr, eEnc );
@@ -1953,7 +1953,7 @@ String WW8Read_xstz(SvStream& rStrm, USHORT nChars, bool bAtEndSeekRel1)
}
if( bAtEndSeekRel1 )
- rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende.
+ rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende.
return aStr;
}
@@ -1978,7 +1978,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr,
long nTotalRead = 0;
WW8_CP nBehindTextCp = nAktStartCp + nTotalLen;
- WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6
+ WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6
do
{
bool bIsUnicode, bPosOk;
@@ -2019,7 +2019,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr,
}
//-----------------------------------------
-// WW8PLCFspecial
+// WW8PLCFspecial
//-----------------------------------------
// Bei nStartPos < 0 wird das erste Element des PLCFs genommen
@@ -2045,7 +2045,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, long nFilePos, long nPLCF,
if( nStruct ) // Pointer auf Inhalts-Array
pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1];
else
- pPLCF_Contents = 0; // kein Inhalt
+ pPLCF_Contents = 0; // kein Inhalt
if( nStartPos >= 0 )
SeekPos( nStartPos );
@@ -2061,7 +2061,7 @@ bool WW8PLCFspecial::SeekPos(long nP)
if( nP < pPLCF_PosArray[0] )
{
nIdx = 0;
- return false; // Not found: nP unterhalb kleinstem Eintrag
+ return false; // Not found: nP unterhalb kleinstem Eintrag
}
// Search from beginning?
@@ -2074,17 +2074,17 @@ bool WW8PLCFspecial::SeekPos(long nP)
for(int n = (1==nIdx ? 1 : 2); n; --n )
{
for( ; nI <=nEnd; ++nI)
- { // Suchen mit um 1 erhoehtem Index
+ { // Suchen mit um 1 erhoehtem Index
if( nP < pPLCF_PosArray[nI] )
- { // Position gefunden
- nIdx = nI - 1; // nI - 1 ist der richtige Index
- return true; // ... und fertig
+ { // Position gefunden
+ nIdx = nI - 1; // nI - 1 ist der richtige Index
+ return true; // ... und fertig
}
}
nI = 1;
nEnd = nIdx-1;
}
- nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
+ nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
return false;
}
@@ -2097,7 +2097,7 @@ bool WW8PLCFspecial::SeekPosExact(long nP)
if( nP < pPLCF_PosArray[0] )
{
nIdx = 0;
- return false; // Not found: nP unterhalb kleinstem Eintrag
+ return false; // Not found: nP unterhalb kleinstem Eintrag
}
// Search from beginning?
if( nP <=pPLCF_PosArray[nIdx] )
@@ -2111,15 +2111,15 @@ bool WW8PLCFspecial::SeekPosExact(long nP)
for( ; nI < nEnd; ++nI)
{
if( nP <=pPLCF_PosArray[nI] )
- { // Position gefunden
- nIdx = nI; // nI ist der richtige Index
- return true; // ... und fertig
+ { // Position gefunden
+ nIdx = nI; // nI ist der richtige Index
+ return true; // ... und fertig
}
}
nI = 0;
nEnd = nIdx;
}
- nIdx = nIMax; // Not found, groesser als alle Eintraege
+ nIdx = nIMax; // Not found, groesser als alle Eintraege
return false;
}
@@ -2141,7 +2141,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, long& rPos, void*& rpValue) const
}
//-----------------------------------------
-// WW8PLCF z.B. fuer SEPX
+// WW8PLCF z.B. fuer SEPX
//-----------------------------------------
// Ctor fuer *andere* als Fkps
@@ -2203,30 +2203,30 @@ void WW8PLCF::GeneratePLCF( SvStream* pSt, long nPN, long ncpN )
OSL_ENSURE( nIMax < (long)ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" );
nIMax = ncpN;
long nSiz = 6 * nIMax + 4;
- pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array
+ pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array
memset( pPLCF_PosArray, 0, (size_t)nSiz );
INT32 nFc;
USHORT i;
- for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege
- pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp
+ for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege
+ pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp
*pSt >> nFc;
pPLCF_PosArray[i] = nFc;
}
ULONG nLastFkpPos = ( ( nPN + nIMax - 1 ) << 9 );
- pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp
+ pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp
BYTE nb;
*pSt >> nb;
- pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp
+ pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp
*pSt >> nFc;
- pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp
+ pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp
// Pointer auf Inhalts-Array
pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1];
BYTE* p = pPLCF_Contents;
- for( i = 0; i < ncpN; i++ ) // Baue PNs
+ for( i = 0; i < ncpN; i++ ) // Baue PNs
{
ShortToSVBT16(nPN + i, p);
p+=2;
@@ -2253,19 +2253,19 @@ bool WW8PLCF::SeekPos(long nPos)
for(int n = (1==nIdx ? 1 : 2); n; --n )
{
- for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index
+ for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index
{
- if( nP < pPLCF_PosArray[nI] ) // Position gefunden
+ if( nP < pPLCF_PosArray[nI] ) // Position gefunden
{
- nIdx = nI - 1; // nI - 1 ist der richtige Index
- return true; // ... und fertig
+ nIdx = nI - 1; // nI - 1 ist der richtige Index
+ return true; // ... und fertig
}
}
nI = 1;
nEnd = nIdx-1;
}
- nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
+ nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
return false;
}
@@ -2291,14 +2291,14 @@ long WW8PLCF::Where() const
}
//-----------------------------------------
-// WW8PLCFpcd
+// WW8PLCFpcd
//-----------------------------------------
WW8PLCFpcd::WW8PLCFpcd( SvStream* pSt, long nFilePos, long nPLCF, long nStruct )
:nStru( nStruct )
{
nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
- pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array
+ pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array
long nOldPos = pSt->Tell();
@@ -2330,7 +2330,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos)
if( nP < rPLCF.pPLCF_PosArray[0] )
{
nIdx = 0;
- return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag
+ return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag
}
// Search from beginning?
if( (1 > nIdx) || (nP < rPLCF.pPLCF_PosArray[ nIdx-1 ]) )
@@ -2352,7 +2352,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos)
nI = 1;
nEnd = nIdx-1;
}
- nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege
+ nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege
return false;
}
@@ -2520,7 +2520,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc)
if (nFc < maEntries[0].mnFC)
{
nIdx = 0;
- return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag
+ return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag
}
// Search from beginning?
if( (1 > nIdx) || (nFc < maEntries[nIdx-1].mnFC) )
@@ -2542,7 +2542,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc)
nI = 1;
nEnd = nIdx-1;
}
- nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
+ nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege
return false;
}
@@ -2681,11 +2681,11 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
if (!pPLCF->Get( nPLCFStart, nPLCFEnd, pPage ))
{
pFkp = 0;
- return false; // PLCF fertig abgearbeitet
+ return false; // PLCF fertig abgearbeitet
}
(*pPLCF)++;
long nPo = SVBT16ToShort( (BYTE *)pPage );
- nPo <<= 9; // shift als LONG
+ nPo <<= 9; // shift als LONG
long nAktFkpFilePos = pFkp ? pFkp->GetFilePos() : -1;
if (nAktFkpFilePos == nPo)
@@ -2712,7 +2712,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
}
}
- SetStartFc( -1 ); // Nur das erste Mal
+ SetStartFc( -1 ); // Nur das erste Mal
return true;
}
@@ -2760,11 +2760,11 @@ void WW8PLCFx_Fc_FKP::SetIdx( ULONG nIdx )
pFkp = 0;
}
else
- { //Es gab einen Fkp
+ { //Es gab einen Fkp
//Lese PLCF um 1 Pos zurueck, um die Adresse des Fkp wiederzubekommen
pPLCF->SetIdx( ( nIdx >> 8 ) - 1 );
- if ( NewFkp() ) // und lese Fkp wieder ein
- pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein
+ if ( NewFkp() ) // und lese Fkp wieder ein
+ pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein
}
}
@@ -2782,7 +2782,7 @@ bool WW8PLCFx_Fc_FKP::SeekPos(WW8_FC nFcPos)
if( pFkp && pPLCF->Get( nPLCFStart, nPLCFEnd, pPage ) )
{
long nPo = SVBT16ToShort( (BYTE *)pPage );
- nPo <<= 9; // shift als LONG
+ nPo <<= 9; // shift als LONG
if (nPo != pFkp->GetFilePos())
pFkp = 0;
else
@@ -2802,13 +2802,13 @@ WW8_FC WW8PLCFx_Fc_FKP::Where()
if( nP != LONG_MAX )
return nP;
- pFkp = 0; // FKP beendet -> hole neuen
- return Where(); // am einfachsten rekursiv
+ pFkp = 0; // FKP beendet -> hole neuen
+ return Where(); // am einfachsten rekursiv
}
BYTE* WW8PLCFx_Fc_FKP::GetSprmsAndPos(WW8_FC& rStart, WW8_FC& rEnd, long& rLen)
{
- rLen = 0; // Default
+ rLen = 0; // Default
rStart = rEnd = LONG_MAX;
if( !pFkp ) // Fkp not there ?
@@ -2981,9 +2981,9 @@ void WW8PLCFx_Cp_FKP::SetPCDIdx( ULONG nIdx )
bool WW8PLCFx_Cp_FKP::SeekPos(WW8_CP nCpPos)
{
- if( pPcd ) // Complex
+ if( pPcd ) // Complex
{
- if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen
+ if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen
return false;
if (pPCDAttrs && !pPCDAttrs->GetIter()->SeekPos(nCpPos))
return false;
@@ -2997,8 +2997,8 @@ WW8_CP WW8PLCFx_Cp_FKP::Where()
{
WW8_FC nFc = WW8PLCFx_Fc_FKP::Where();
if( pPcd )
- return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln
- return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!!
+ return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln
+ return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!!
}
void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
@@ -3031,7 +3031,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
return;
}
- if( pPcd ) // Piece-Table vorhanden !!!
+ if( pPcd ) // Piece-Table vorhanden !!!
{
// Init ( noch kein ++ gerufen )
if( (nAttrStart > nAttrEnd) || (nAttrStart == -1) )
@@ -3103,7 +3103,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
If the FKP FC that was found was greater than the FC
of the end of the piece, scan piece by piece toward
the end of the document until a piece is found that
- contains a paragraph end mark.
+ contains a paragraph end mark.
*/
/*
@@ -3168,7 +3168,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
p->bRealLineEnd = bLineEnd;
}
}
- else // KEINE Piece-Table !!!
+ else // KEINE Piece-Table !!!
{
p->nStartPos = rSBase.WW8Fc2Cp( p->nStartPos );
p->nEndPos = rSBase.WW8Fc2Cp( p->nEndPos );
@@ -3183,13 +3183,13 @@ WW8PLCFx& WW8PLCFx_Cp_FKP::operator ++( int )
if ( !bComplex || !pPcd )
return *this;
- if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF
+ if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF
{
nAttrStart = nAttrEnd = LONG_MAX;
return *this;
}
- long nFkpLen; // Fkp-Eintrag
+ long nFkpLen; // Fkp-Eintrag
// Fkp-Eintrag holen
WW8PLCFx_Fc_FKP::GetSprmsAndPos(nAttrStart, nAttrEnd, nFkpLen);
@@ -3210,7 +3210,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt,
? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, 12, nStartCp)
: 0;
- pSprms = new BYTE[nArrMax]; // maximum length
+ pSprms = new BYTE[nArrMax]; // maximum length
}
WW8PLCFx_SEPX::~WW8PLCFx_SEPX()
@@ -3248,7 +3248,7 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p)
p->bRealLineEnd = false;
if (!pPLCF->Get( p->nStartPos, p->nEndPos, pData ))
{
- p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet
+ p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet
p->pMemPos = 0;
p->nSprmsLen = 0;
}
@@ -3257,25 +3257,25 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p)
long nPo = SVBT32ToUInt32( (BYTE*)pData+2 );
if (nPo == -1L)
{
- p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty
+ p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty
p->pMemPos = 0;
p->nSprmsLen = 0;
}
else
{
pStrm->Seek( nPo );
- *pStrm >> nSprmSiz; // read len
+ *pStrm >> nSprmSiz; // read len
if( nSprmSiz > nArrMax )
- { // passt nicht
+ { // passt nicht
delete[] pSprms;
- nArrMax = nSprmSiz; // Hole mehr Speicher
+ nArrMax = nSprmSiz; // Hole mehr Speicher
pSprms = new BYTE[nArrMax];
}
- pStrm->Read( pSprms, nSprmSiz ); // read Sprms
+ pStrm->Read( pSprms, nSprmSiz ); // read Sprms
p->nSprmsLen = nSprmSiz;
- p->pMemPos = pSprms; // return Position
+ p->pMemPos = pSprms; // return Position
}
}
}
@@ -3366,7 +3366,7 @@ const BYTE* WW8PLCFx_SEPX::HasSprm( USHORT nId, BYTE n2nd ) const
pSp += x;
}
- return 0; // Sprm nicht gefunden
+ return 0; // Sprm nicht gefunden
}
//-----------------------------------------
@@ -3424,7 +3424,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen )
if ( !pRef )
{
- rStart = LONG_MAX; // Es gibt keine Noten
+ rStart = LONG_MAX; // Es gibt keine Noten
rLen = 0;
return -1;
}
@@ -3433,7 +3433,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen )
if (!pRef->Get( rStart, nE, pData ))
{
- rStart = LONG_MAX; // PLCF fertig abgearbeitet
+ rStart = LONG_MAX; // PLCF fertig abgearbeitet
rLen = 0;
return -1;
}
@@ -3441,7 +3441,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen )
if(!pTxt->Get( nSt, rLen, pData ))
{
- rStart = LONG_MAX; // PLCF fertig abgearbeitet
+ rStart = LONG_MAX; // PLCF fertig abgearbeitet
rLen = 0;
return -1;
}
@@ -3461,7 +3461,7 @@ WW8PLCFx& WW8PLCFx_SubDoc::operator ++( int )
}
//-----------------------------------------
-// Felder
+// Felder
//-----------------------------------------
WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const WW8Fib& rMyFib, short nType)
@@ -3573,7 +3573,7 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p)
if (!pPLCF)
{
- p->nStartPos = LONG_MAX; // Es gibt keine Felder
+ p->nStartPos = LONG_MAX; // Es gibt keine Felder
return;
}
@@ -3581,18 +3581,18 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p)
long nP;
void *pData;
- if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ?
+ if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ?
{
- p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet
+ p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet
return;
}
p->nStartPos = nP;
(*pPLCF)++;
- if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ?
+ if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ?
{
- p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet
+ p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet
return;
}
@@ -3625,7 +3625,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF)
}
//-----------------------------------------
-// class WW8PLCF_Book
+// class WW8PLCF_Book
//-----------------------------------------
/* to be optimized like this: */
@@ -3637,7 +3637,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen,
rStrm.Seek( nStart );
UINT16 nLen2;
- rStrm >> nLen2; // bVer67: total length of structure
+ rStrm >> nLen2; // bVer67: total length of structure
// bVer8 : count of strings
if( bVer8 )
@@ -3745,7 +3745,7 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib)
nIMax = aBookNames.size();
- if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks
+ if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks
nIMax = pBook[0]->GetIMax();
if( pBook[1]->GetIMax() < nIMax )
nIMax = pBook[1]->GetIMax();
@@ -3782,7 +3782,7 @@ void WW8PLCFx_Book::SetIdx2( ULONG nI )
if( nIMax )
{
pBook[1]->SetIdx( nI & 0x7fffffff );
- nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1
+ nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1
}
}
@@ -3815,7 +3815,7 @@ long WW8PLCFx_Book::GetNoSprms( long& rStart, long& rEnd, long& rLen )
return -1;
}
- pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen
+ pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen
return pBook[nIsEnd]->GetIdx();
}
@@ -3975,7 +3975,7 @@ const String* WW8PLCFx_Book::GetName() const
}
//-----------------------------------------
-// WW8PLCFMan
+// WW8PLCFMan
//-----------------------------------------
#ifndef DUMP
@@ -4002,7 +4002,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
if ( (&rDesc == pPap) && rDesc.bRealLineEnd )
{
- if ( pPap->nEndPos != LONG_MAX ) // Para adjust
+ if ( pPap->nEndPos != LONG_MAX ) // Para adjust
{
nLineEnd = pPap->nEndPos;// nLineEnd zeigt *hinter* das <CR>
pPap->nEndPos--; // Absatzende um 1 Zeichen verkuerzen
@@ -4021,8 +4021,8 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
else if ( (&rDesc == pChp) || (&rDesc == pSep) )
{
// Char Adjust oder Sep Adjust Wenn Ende Char-Attr == Absatzende ...
- if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) )
- rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen
+ if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) )
+ rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen
}
}
@@ -4085,7 +4085,7 @@ USHORT WW8PLCFMan::GetId(const WW8PLCFxDesc* p) const
else if (p->nSprmsLen > 0)
nId = maSprmParser.GetSprmId(p->pMemPos);
else
- nId = 0; // Id = 0 for empty attributes
+ nId = 0; // Id = 0 for empty attributes
return nId;
}
@@ -4143,7 +4143,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp,
pPap = &aD[5];
pSep = &aD[6]; // Dummy
- pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText
+ pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText
}
pChp->pPLCFx = pBase->pChpPLCF;
@@ -4157,7 +4157,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp,
pMagicTables = pBase->pMagicTables;
- switch( nType ) // Feld-Initialisierung
+ switch( nType ) // Feld-Initialisierung
{
case MAN_HDFT:
pFld->pPLCFx = pBase->pFldHdFtPLCF;
@@ -4209,7 +4209,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp,
}
if( nStartCp || nCpO )
- SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen
+ SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen
// initialisieren der Member-Vars Low-Level
GetChpPLCF()->ResetAttrStartEnd();
@@ -4264,7 +4264,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp,
GetNewSprms( *p );
}
else
- GetNewSprms( *p ); // bei allen PLCFen initialisiert sein
+ GetNewSprms( *p ); // bei allen PLCFen initialisiert sein
}
else if( p->pPLCFx )
GetNewNoSprms( *p );
@@ -4283,9 +4283,9 @@ WW8PLCFMan::~WW8PLCFMan()
USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const
{
OSL_ENSURE(nPLCF,"What the hell");
- long nNext = LONG_MAX; // SuchReihenfolge:
+ long nNext = LONG_MAX; // SuchReihenfolge:
USHORT nNextIdx = nPLCF;// first ending found ( CHP, PAP, ( SEP ) ),
- bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP )
+ bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP )
USHORT i;
const WW8PLCFxDesc* pD;
for (i=0; i < nPLCF; i++)
@@ -4293,7 +4293,7 @@ USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const
pD = &aD[i];
if (pD != pPcdA)
{
- if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) )
+ if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) )
{
// sonst ist Anfang = Ende
nNext = pD->nEndPos;
@@ -4402,7 +4402,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
const WW8PLCFxDesc* p = &aD[nIdx];
if (!(p->pIdStk->empty()))
- pRes->nSprmId = p->pIdStk->top(); // get end position
+ pRes->nSprmId = p->pIdStk->top(); // get end position
else
{
OSL_ENSURE( !this, "No Id on the Stack" );
@@ -4435,12 +4435,12 @@ void WW8PLCFMan::GetNoSprmStart( short nIdx, WW8PLCFManResult* pRes ) const
GetSprmStart( nIdx+1, pRes );
}
else
- pRes->nSprmId = 0; // default: not found
+ pRes->nSprmId = 0; // default: not found
}
void WW8PLCFMan::GetNoSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
{
- pRes->nMemLen = -1; // Ende-Kennzeichen
+ pRes->nMemLen = -1; // Ende-Kennzeichen
if( &aD[nIdx] == pBkm )
pRes->nSprmId = eBKN;
@@ -4472,7 +4472,7 @@ bool WW8PLCFMan::TransferOpenSprms(std::stack<USHORT> &rStack)
void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
{
- WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln
+ WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln
p->bFirstSprm = false;
if( bStart )
@@ -4481,7 +4481,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
p->pIdStk->push(nLastId); // merke Id fuer Attribut-Ende
if( p->nSprmsLen )
- { /*
+ { /*
Pruefe, ob noch Sprm(s) abzuarbeiten sind
*/
if( p->pMemPos )
@@ -4506,7 +4506,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
p->nSprmsLen = 0;
}
if (p->nSprmsLen < maSprmParser.MinSprmLen())
- p->nStartPos = LONG_MAX; // es folgen Enden
+ p->nStartPos = LONG_MAX; // es folgen Enden
}
else
{
@@ -4571,8 +4571,8 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
}
else
{
- (*p->pPLCFx)++; // next Group of Sprms
- p->pMemPos = 0; // !!!
+ (*p->pPLCFx)++; // next Group of Sprms
+ p->pMemPos = 0; // !!!
p->nSprmsLen = 0;
GetNewSprms( *p );
}
@@ -4631,7 +4631,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart)
else
{ // NoSprm ohne Ende
(*p->pPLCFx)++;
- p->pMemPos = 0; // MemPos ungueltig
+ p->pMemPos = 0; // MemPos ungueltig
p->nSprmsLen = 0;
GetNewNoSprms( *p );
}
@@ -4645,18 +4645,18 @@ WW8PLCFMan& WW8PLCFMan::operator ++(int)
{
WW8PLCFxDesc* p = &aD[nIdx];
- p->bFirstSprm = true; // Default
+ p->bFirstSprm = true; // Default
if( p->pPLCFx->IsSprm() )
AdvSprm( nIdx, bStart );
- else // NoSprm
+ else // NoSprm
AdvNoSprm( nIdx, bStart );
}
return *this;
}
// Rueckgabe true fuer Anfang eines Attributes oder Fehler,
-// false fuer Ende d. Attr
+// false fuer Ende d. Attr
// Restliche Rueckgabewerte werden in der vom Aufrufer zu stellenden Struktur
// WW8PclxManResults geliefert.
bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const
@@ -4831,7 +4831,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
{
BYTE aBits1;
BYTE aBits2;
- BYTE aVer8Bits1; // nur ab WinWord 8 benutzt
+ BYTE aVer8Bits1; // nur ab WinWord 8 benutzt
rSt.Seek( nOffset );
/*
Wunsch-Nr vermerken, File-Versionsnummer ermitteln
@@ -4849,22 +4849,22 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
switch( nVersion )
{
case 6:
- nFibMin = 0x0065; // von 101 WinWord 6.0
+ nFibMin = 0x0065; // von 101 WinWord 6.0
// 102 "
// und 103 WinWord 6.0 fuer Macintosh
// 104 "
- nFibMax = 0x0069; // bis 105 WinWord 95
+ nFibMax = 0x0069; // bis 105 WinWord 95
break;
case 7:
- nFibMin = 0x0069; // von 105 WinWord 95
- nFibMax = 0x0069; // bis 105 WinWord 95
+ nFibMin = 0x0069; // von 105 WinWord 95
+ nFibMax = 0x0069; // bis 105 WinWord 95
break;
case 8:
- nFibMin = 0x006A; // von 106 WinWord 97
- nFibMax = 0x00c1; // bis 193 WinWord 97 (?)
+ nFibMin = 0x006A; // von 106 WinWord 97
+ nFibMax = 0x00c1; // bis 193 WinWord 97 (?)
break;
default:
- nFibMin = 0; // Programm-Fehler!
+ nFibMin = 0; // Programm-Fehler!
nFibMax = 0;
nFib = 1;
OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
@@ -4872,7 +4872,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
}
if ( (nFib < nFibMin) || (nFib > nFibMax) )
{
- nFibError = ERR_SWG_READ_ERROR; // Error melden
+ nFibError = ERR_SWG_READ_ERROR; // Error melden
return; // und hopp raus!
}
}
@@ -4896,7 +4896,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
rSt >> lKey1;
rSt >> lKey2;
rSt >> envr;
- rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld
+ rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld
// Inhalt von aVer8Bits1
//
// BYTE fMac :1;
@@ -4924,15 +4924,15 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
/*
// dies sind die 9 unused Felder:
- && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1
- && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2
- && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3
- && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4
- && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5
- && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6
- && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7
- && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8
- && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9
+ && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1
+ && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2
+ && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3
+ && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4
+ && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5
+ && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6
+ && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7
+ && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8
+ && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9
*/
rSt >> lidFE;
rSt >> clw;
@@ -5144,7 +5144,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
}
else if( bVer8 )
{
- fMac = aVer8Bits1 & 0x01 ;
+ fMac = aVer8Bits1 & 0x01 ;
fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1;
fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2;
fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3;
@@ -5171,10 +5171,10 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
nFibError = ERR_SWG_READ_ERROR;
}
- rSt.Seek( 0x372 ); // fcSttbListNames
+ rSt.Seek( 0x372 ); // fcSttbListNames
rSt >> fcSttbListNames;
rSt >> lcbSttbListNames;
- rSt.Seek( 0x382 ); // MagicTables
+ rSt.Seek( 0x382 ); // MagicTables
rSt >> fcMagicTable;
rSt >> lcbMagicTable;
if( 0 != rSt.GetError() )
@@ -5185,7 +5185,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
}
else
{
- nFibError = ERR_SWG_READ_ERROR; // Error melden
+ nFibError = ERR_SWG_READ_ERROR; // Error melden
}
}
@@ -5202,16 +5202,16 @@ WW8Fib::WW8Fib(BYTE nVer)
nFibBack = 0xbf;
nProduct = 0x204D;
- csw = 0x0e; // muss das sein ???
- cfclcb = 0x6c; // -""-
- clw = 0x16; // -""-
+ csw = 0x0e; // muss das sein ???
+ cfclcb = 0x6c; // -""-
+ clw = 0x16; // -""-
pnFbpChpFirst = pnFbpPapFirst = pnFbpLvcFirst = 0x000fffff;
fExtChar = true;
fWord97Saved = fWord2000Saved = true;
// diese Flags muessen nicht gesetzt werden; koennen aber.
- // wMagicCreated = wMagicRevised = 0x6a62;
- // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2;
+ // wMagicCreated = wMagicRevised = 0x6a62;
+ // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2;
//
wMagicCreated = 0x6143;
@@ -5249,14 +5249,14 @@ bool WW8Fib::Write(SvStream& rStrm)
Set_UInt16( pData, pnNext );
UINT16 nBits16 = 0;
- if( fDot ) nBits16 |= 0x0001;
- if( fGlsy) nBits16 |= 0x0002;
- if( fComplex ) nBits16 |= 0x0004;
- if( fHasPic ) nBits16 |= 0x0008;
+ if( fDot ) nBits16 |= 0x0001;
+ if( fGlsy) nBits16 |= 0x0002;
+ if( fComplex ) nBits16 |= 0x0004;
+ if( fHasPic ) nBits16 |= 0x0008;
nBits16 |= (0xf0 & ( cQuickSaves << 4 ));
- if( fEncrypted ) nBits16 |= 0x0100;
- if( fWhichTblStm ) nBits16 |= 0x0200;
- if( fExtChar ) nBits16 |= 0x1000;
+ if( fEncrypted ) nBits16 |= 0x0100;
+ if( fWhichTblStm ) nBits16 |= 0x0200;
+ if( fExtChar ) nBits16 |= 0x1000;
Set_UInt16( pData, nBits16 );
Set_UInt16( pData, nFibBack );
@@ -5267,11 +5267,11 @@ bool WW8Fib::Write(SvStream& rStrm)
BYTE nBits8 = 0;
if( bVer8 )
{
- if( fMac ) nBits8 |= 0x0001;
- if( fEmptySpecial ) nBits8 |= 0x0002;
- if( fLoadOverridePage ) nBits8 |= 0x0004;
- if( fFuturesavedUndo ) nBits8 |= 0x0008;
- if( fWord97Saved ) nBits8 |= 0x0010;
+ if( fMac ) nBits8 |= 0x0001;
+ if( fEmptySpecial ) nBits8 |= 0x0002;
+ if( fLoadOverridePage ) nBits8 |= 0x0004;
+ if( fFuturesavedUndo ) nBits8 |= 0x0008;
+ if( fWord97Saved ) nBits8 |= 0x0010;
if( fWord2000Saved ) nBits8 |= 0x0020;
}
// unter Ver67 these are only reserved
@@ -5477,7 +5477,7 @@ bool WW8Fib::Write(SvStream& rStrm)
if( bVer8 )
{
- pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser)
+ pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser)
Set_UInt32( pData, fcPlcfLst );
Set_UInt32( pData, lcbPlcfLst );
Set_UInt32( pData, fcPlfLfo );
@@ -5487,7 +5487,7 @@ bool WW8Fib::Write(SvStream& rStrm)
Set_UInt32( pData, fcPlcfHdrtxbxBkd );
Set_UInt32( pData, lcbPlcfHdrtxbxBkd );
- pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo)
+ pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo)
Set_UInt32( pData, fcSttbListNames );
Set_UInt32( pData, lcbSttbListNames );
@@ -5525,12 +5525,12 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
rSt.Seek(nStyleStart);
- USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure
+ USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure
// alte Version ?
if (rFib.nFib < 67)
- cbStshi = 4; // -> Laengenfeld fehlt
- else // neue Version:
+ cbStshi = 4; // -> Laengenfeld fehlt
+ else // neue Version:
// lies die Laenge der in der Datei gespeicherten Struktur
rSt >> cbStshi;
@@ -5571,7 +5571,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
if( 18 < nRead )
rSt.SeekRel( nRead-18 );
}
- while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
+ while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
// und kann vorzeitig per "break" verlassen werden.
if( 0 != rSt.GetError() )
@@ -5589,7 +5589,7 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd )
WW8_STD* pStd = 0;
UINT16 cbStd;
- rSt >> cbStd; // lies Laenge
+ rSt >> cbStd; // lies Laenge
UINT16 nRead = cbSTDBaseInFile;
if( cbStd >= cbSTDBaseInFile )
@@ -5636,18 +5636,18 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd )
if( 10 < nRead )
rSt.SeekRel( nRead-10 );
}
- while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
+ while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
// und kann vorzeitig per "break" verlassen werden.
if( (0 != rSt.GetError()) || !nRead )
- DELETEZ( pStd ); // per NULL den Error melden
+ DELETEZ( pStd ); // per NULL den Error melden
rSkip = cbStd - cbSTDBaseInFile;
}
else
- { // Fixed part zu kurz
+ { // Fixed part zu kurz
if( cbStd )
- rSt.SeekRel( cbStd ); // ueberlies Reste
+ rSt.SeekRel( cbStd ); // ueberlies Reste
rSkip = 0;
}
if( pcbStd )
@@ -5660,11 +5660,11 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
// Attention: MacWord-Documents have their Stylenames
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
- WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD
+ WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD
// String gewuenscht ?
if( pString )
- { // echter Style ?
+ { // echter Style ?
if ( pStd )
{
switch( rFib.nVersion )
@@ -5707,7 +5707,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
}
}
else
- *pString = aEmptyStr; // Kann keinen Namen liefern
+ *pString = aEmptyStr; // Kann keinen Namen liefern
}
return pStd;
}
@@ -5719,7 +5719,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
struct WW8_FFN_Ver6 : public WW8_FFN_BASE
{
// ab Ver6
- sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that
+ sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that
// records name of font.
// Maximal size of szFfn is 65 characters.
// Vorsicht: Dieses Array kann auch kleiner sein!!!
@@ -5731,8 +5731,8 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE
{
// ab Ver8 sind folgende beiden Felder eingeschoben,
// werden von uns ignoriert.
- sal_Char panose[ 10 ]; // 0x6 PANOSE
- sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE
+ sal_Char panose[ 10 ]; // 0x6 PANOSE
+ sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE
// ab Ver8 als Unicode
UINT16 szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that
@@ -5792,7 +5792,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
break;
nMax++;
nLeft -= nNextSiz;
- if( nLeft < 1 ) // can we read the given ammount of bytes ?
+ if( nLeft < 1 ) // can we read the given ammount of bytes ?
break;
// increase p by nNextSiz Bytes
p = (WW8_FFN *)( ( (BYTE*)p ) + nNextSiz );
@@ -5831,12 +5831,12 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc == RTL_TEXTENCODING_DONTKNOW))
eEnc = RTL_TEXTENCODING_MS_1252;
p->sFontname = String(pVer6->szFfn, eEnc);
-// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252);
+// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252);
if (p->ibszAlt)
{
p->sFontname.Append(';');
p->sFontname += String(pVer6->szFfn+p->ibszAlt, eEnc);
-// RTL_TEXTENCODING_MS_1252 );
+// RTL_TEXTENCODING_MS_1252 );
}
pVer6 = (WW8_FFN_Ver6*)( ((BYTE*)pVer6) + pVer6->cbFfnM1 + 1 );
}
@@ -5848,7 +5848,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
for(USHORT i=0; i<nMax; ++i, ++p)
{
p->cbFfnM1 = pVer8->cbFfnM1;
- c2 = *(((BYTE*)pVer8) + 1);
+ c2 = *(((BYTE*)pVer8) + 1);
p->prg = c2 & 0x02;
p->fTrueType = (c2 & 0x04) >> 2;
@@ -5904,11 +5904,11 @@ const WW8_FFN* WW8Fonts::GetFont( USHORT nNum ) const
// 1) Am Anfang des Einlesens muss WWPLCF_HdFt mit Fib und Dop konstruiert werden
// 2) Der Haupttext muss sequentiell ueber alle Sections gelesen werden
// 3) Fuer jedes vorkommende Header / Footer - Attribut des Haupttextes
-// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal
+// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal
// mit dem Parameter des Attributes gerufen werden. Dieser Aufruf muss *nach*
// dem letzten Aufruf von GetTextPos() passieren.
// 4) GetTextPos() darf mit genau einem der obenstehen WW_... aufgerufen werden
-// ( nicht verodern ! )
+// ( nicht verodern ! )
// -> dann liefert GetTextPos() vielleicht auch ein richtiges Ergebnis
WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
@@ -5929,7 +5929,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
footers in this PLCF, UpdateIndex does that task.
*/
for( BYTE nI = 0x1; nI <= 0x20; nI <<= 1 )
- if( nI & rDop.grpfIhdt ) // Bit gesetzt ?
+ if( nI & rDop.grpfIhdt ) // Bit gesetzt ?
nIdxOffset++;
nTextOfs = rFib.ccpText + rFib.ccpFtn; // Groesse des Haupttextes
@@ -5944,18 +5944,18 @@ bool WW8PLCF_HdFt::GetTextPos(BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart,
while (true)
{
if( nI & nWhich )
- break; // found
+ break; // found
if( grpfIhdt & nI )
- nIdx++; // uninteresting Header / Footer
- nI <<= 1; // text next bit
+ nIdx++; // uninteresting Header / Footer
+ nI <<= 1; // text next bit
if( nI > 0x20 )
- return false; // not found
+ return false; // not found
}
// nIdx ist HdFt-Index
WW8_CP nEnd;
void* pData;
- aPLCF.SetIdx( nIdx ); // Lookup suitable CP
+ aPLCF.SetIdx( nIdx ); // Lookup suitable CP
aPLCF.Get( rStart, nEnd, pData );
rLen = nEnd - rStart;
aPLCF++;
@@ -5968,7 +5968,7 @@ bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen)
WW8_CP nEnd;
void* pData;
- aPLCF.SetIdx( nIdx ); // Lookup suitable CP
+ aPLCF.SetIdx( nIdx ); // Lookup suitable CP
aPLCF.Get( rStart, nEnd, pData );
rLen = nEnd - rStart;
return true;
@@ -5983,7 +5983,7 @@ void WW8PLCF_HdFt::UpdateIndex( BYTE grpfIhdt )
}
//-----------------------------------------
-// WW8Dop
+// WW8Dop
//-----------------------------------------
WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize )
@@ -5995,8 +5995,8 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize )
rSt.Seek( nPos );
if( 2 > nSize || nRead != rSt.Read( pData, nRead ))
{
- memset( &nDataStart, 0, (&nDataEnd - &nDataStart) );
- nDopError = ERR_SWG_READ_ERROR; // Error melden
+ memset( &nDataStart, 0, (&nDataEnd - &nDataStart) );
+ nDopError = ERR_SWG_READ_ERROR; // Error melden
}
else
{
@@ -6118,23 +6118,23 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize )
if( nFib >= 103 )
{
a32Bit = Get_ULong( pData );
- fNoTabForInd = ( a32Bit & 0x00000001 ) ;
- fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ;
- fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ;
- fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ;
- fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ;
- fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ;
- fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ;
- fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ;
- fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ;
- fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ;
- fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ;
- fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ;
- fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ;
- fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ;
- fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ;
- fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ;
- fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ;
+ fNoTabForInd = ( a32Bit & 0x00000001 ) ;
+ fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ;
+ fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ;
+ fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ;
+ fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ;
+ fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ;
+ fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ;
+ fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ;
+ fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ;
+ fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ;
+ fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ;
+ fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ;
+ fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ;
+ fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ;
+ fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ;
+ fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ;
+ fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ;
fUsePrinterMetrics = ( a32Bit & 0x80000000 ) >> 31 ;
}
@@ -6153,16 +6153,16 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize )
a16Bit = Get_UShort( pData );
// die untersten 9 Bit sind uninteressant
- fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ;
- fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ;
- fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ;
- fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ;
- fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ;
- fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ;
+ fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ;
+ fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ;
+ fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ;
+ fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ;
+ fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ;
+ fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ;
a16Bit = Get_UShort( pData );
- fHaveVersions = 0 != ( a16Bit & 0x0001 );
- fAutoVersion = 0 != ( a16Bit & 0x0002 );
+ fHaveVersions = 0 != ( a16Bit & 0x0001 );
+ fAutoVersion = 0 != ( a16Bit & 0x0002 );
pData += 12;
@@ -6189,7 +6189,7 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize )
WW8Dop::WW8Dop()
{
// first set everything to a default of 0
- memset( &nDataStart, 0, (&nDataEnd - &nDataStart) );
+ memset( &nDataStart, 0, (&nDataEnd - &nDataStart) );
fWidowControl = 1;
fpc = 1;
@@ -6240,23 +6240,23 @@ WW8Dop::WW8Dop()
UINT32 WW8Dop::GetCompatabilityOptions() const
{
UINT32 a32Bit = 0;
- if (fNoTabForInd) a32Bit |= 0x00000001;
- if (fNoSpaceRaiseLower) a32Bit |= 0x00000002;
- if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004;
- if (fWrapTrailSpaces) a32Bit |= 0x00000008;
- if (fMapPrintTextColor) a32Bit |= 0x00000010;
- if (fNoColumnBalance) a32Bit |= 0x00000020;
- if (fConvMailMergeEsc) a32Bit |= 0x00000040;
- if (fSupressTopSpacing) a32Bit |= 0x00000080;
- if (fOrigWordTableRules) a32Bit |= 0x00000100;
- if (fTransparentMetafiles) a32Bit |= 0x00000200;
- if (fShowBreaksInFrames) a32Bit |= 0x00000400;
- if (fSwapBordersFacingPgs) a32Bit |= 0x00000800;
- if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000;
- if (fTruncDxaExpand) a32Bit |= 0x00020000;
- if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000;
- if (fNoLeading) a32Bit |= 0x00080000;
- if (fMWSmallCaps) a32Bit |= 0x00200000;
+ if (fNoTabForInd) a32Bit |= 0x00000001;
+ if (fNoSpaceRaiseLower) a32Bit |= 0x00000002;
+ if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004;
+ if (fWrapTrailSpaces) a32Bit |= 0x00000008;
+ if (fMapPrintTextColor) a32Bit |= 0x00000010;
+ if (fNoColumnBalance) a32Bit |= 0x00000020;
+ if (fConvMailMergeEsc) a32Bit |= 0x00000040;
+ if (fSupressTopSpacing) a32Bit |= 0x00000080;
+ if (fOrigWordTableRules) a32Bit |= 0x00000100;
+ if (fTransparentMetafiles) a32Bit |= 0x00000200;
+ if (fShowBreaksInFrames) a32Bit |= 0x00000400;
+ if (fSwapBordersFacingPgs) a32Bit |= 0x00000800;
+ if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000;
+ if (fTruncDxaExpand) a32Bit |= 0x00020000;
+ if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000;
+ if (fNoLeading) a32Bit |= 0x00080000;
+ if (fMWSmallCaps) a32Bit |= 0x00200000;
if (fUsePrinterMetrics) a32Bit |= 0x80000000;
return a32Bit;
}
@@ -6297,55 +6297,55 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
Set_UInt8( pData, a8Bit );
a8Bit = 0;
- if( fOnlyMacPics ) a8Bit |= 0x01;
- if( fOnlyWinPics ) a8Bit |= 0x02;
- if( fLabelDoc ) a8Bit |= 0x04;
- if( fHyphCapitals ) a8Bit |= 0x08;
- if( fAutoHyphen ) a8Bit |= 0x10;
- if( fFormNoFields ) a8Bit |= 0x20;
- if( fLinkStyles ) a8Bit |= 0x40;
- if( fRevMarking ) a8Bit |= 0x80;
+ if( fOnlyMacPics ) a8Bit |= 0x01;
+ if( fOnlyWinPics ) a8Bit |= 0x02;
+ if( fLabelDoc ) a8Bit |= 0x04;
+ if( fHyphCapitals ) a8Bit |= 0x08;
+ if( fAutoHyphen ) a8Bit |= 0x10;
+ if( fFormNoFields ) a8Bit |= 0x20;
+ if( fLinkStyles ) a8Bit |= 0x40;
+ if( fRevMarking ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
a8Bit = 0;
- if( fBackup ) a8Bit |= 0x01;
- if( fExactCWords ) a8Bit |= 0x02;
- if( fPagHidden ) a8Bit |= 0x04;
- if( fPagResults ) a8Bit |= 0x08;
- if( fLockAtn ) a8Bit |= 0x10;
- if( fMirrorMargins ) a8Bit |= 0x20;
- if( fReadOnlyRecommended ) a8Bit |= 0x40;
- if( fDfltTrueType ) a8Bit |= 0x80;
+ if( fBackup ) a8Bit |= 0x01;
+ if( fExactCWords ) a8Bit |= 0x02;
+ if( fPagHidden ) a8Bit |= 0x04;
+ if( fPagResults ) a8Bit |= 0x08;
+ if( fLockAtn ) a8Bit |= 0x10;
+ if( fMirrorMargins ) a8Bit |= 0x20;
+ if( fReadOnlyRecommended ) a8Bit |= 0x40;
+ if( fDfltTrueType ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
a8Bit = 0;
- if( fPagSuppressTopSpacing ) a8Bit |= 0x01;
- if( fProtEnabled ) a8Bit |= 0x02;
- if( fDispFormFldSel ) a8Bit |= 0x04;
- if( fRMView ) a8Bit |= 0x08;
- if( fRMPrint ) a8Bit |= 0x10;
- if( fWriteReservation ) a8Bit |= 0x20;
- if( fLockRev ) a8Bit |= 0x40;
- if( fEmbedFonts ) a8Bit |= 0x80;
+ if( fPagSuppressTopSpacing ) a8Bit |= 0x01;
+ if( fProtEnabled ) a8Bit |= 0x02;
+ if( fDispFormFldSel ) a8Bit |= 0x04;
+ if( fRMView ) a8Bit |= 0x08;
+ if( fRMPrint ) a8Bit |= 0x10;
+ if( fWriteReservation ) a8Bit |= 0x20;
+ if( fLockRev ) a8Bit |= 0x40;
+ if( fEmbedFonts ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
a8Bit = 0;
- if( copts_fNoTabForInd ) a8Bit |= 0x01;
- if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02;
- if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04;
- if( copts_fWrapTrailSpaces ) a8Bit |= 0x08;
- if( copts_fMapPrintTextColor ) a8Bit |= 0x10;
- if( copts_fNoColumnBalance ) a8Bit |= 0x20;
- if( copts_fConvMailMergeEsc ) a8Bit |= 0x40;
- if( copts_fSupressTopSpacing ) a8Bit |= 0x80;
+ if( copts_fNoTabForInd ) a8Bit |= 0x01;
+ if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02;
+ if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04;
+ if( copts_fWrapTrailSpaces ) a8Bit |= 0x08;
+ if( copts_fMapPrintTextColor ) a8Bit |= 0x10;
+ if( copts_fNoColumnBalance ) a8Bit |= 0x20;
+ if( copts_fConvMailMergeEsc ) a8Bit |= 0x40;
+ if( copts_fSupressTopSpacing ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
a8Bit = 0;
- if( copts_fOrigWordTableRules ) a8Bit |= 0x01;
- if( copts_fTransparentMetafiles ) a8Bit |= 0x02;
- if( copts_fShowBreaksInFrames ) a8Bit |= 0x04;
- if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08;
+ if( copts_fOrigWordTableRules ) a8Bit |= 0x01;
+ if( copts_fTransparentMetafiles ) a8Bit |= 0x02;
+ if( copts_fShowBreaksInFrames ) a8Bit |= 0x04;
+ if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08;
Set_UInt8( pData, a8Bit );
Set_UInt16( pData, dxaTab );
@@ -6372,10 +6372,10 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
a16Bit |= (0x0003 & epc );
a16Bit |= (0x003c & (nfcFtnRef << 2));
a16Bit |= (0x03c0 & (nfcEdnRef << 6));
- if( fPrintFormData ) a16Bit |= 0x0400;
- if( fSaveFormData ) a16Bit |= 0x0800;
- if( fShadeFormData ) a16Bit |= 0x1000;
- if( fWCFtnEdn ) a16Bit |= 0x8000;
+ if( fPrintFormData ) a16Bit |= 0x0400;
+ if( fSaveFormData ) a16Bit |= 0x0800;
+ if( fShadeFormData ) a16Bit |= 0x1000;
+ if( fWCFtnEdn ) a16Bit |= 0x8000;
Set_UInt16( pData, a16Bit );
Set_UInt32( pData, cLines );
@@ -6387,7 +6387,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
Set_UInt32( pData, lKeyProtDoc );
a16Bit = 0;
- if (wvkSaved)
+ if (wvkSaved)
a16Bit |= 0x0007;
a16Bit |= (0x0ff8 & (wScaleSaved << 3));
a16Bit |= (0x3000 & (zkSaved << 12));
@@ -6404,18 +6404,18 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
memcpy( pData, &dogrid, sizeof( WW8_DOGRID ));
pData += sizeof( WW8_DOGRID );
- a16Bit = 0x12; // lvl auf 9 setzen
- if( fHtmlDoc ) a16Bit |= 0x0200;
- if( fSnapBorder ) a16Bit |= 0x0800;
- if( fIncludeHeader ) a16Bit |= 0x1000;
- if( fIncludeFooter ) a16Bit |= 0x2000;
- if( fForcePageSizePag ) a16Bit |= 0x4000;
- if( fMinFontSizePag ) a16Bit |= 0x8000;
+ a16Bit = 0x12; // lvl auf 9 setzen
+ if( fHtmlDoc ) a16Bit |= 0x0200;
+ if( fSnapBorder ) a16Bit |= 0x0800;
+ if( fIncludeHeader ) a16Bit |= 0x1000;
+ if( fIncludeFooter ) a16Bit |= 0x2000;
+ if( fForcePageSizePag ) a16Bit |= 0x4000;
+ if( fMinFontSizePag ) a16Bit |= 0x8000;
Set_UInt16( pData, a16Bit );
a16Bit = 0;
- if( fHaveVersions ) a16Bit |= 0x0001;
- if( fAutoVersion ) a16Bit |= 0x0002;
+ if( fHaveVersions ) a16Bit |= 0x0001;
+ if( fAutoVersion ) a16Bit |= 0x0002;
Set_UInt16( pData, a16Bit );
pData += 12;
@@ -6435,7 +6435,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
Set_UInt16( pData, nfcEdnRef );
Set_UInt16( pData, hpsZoonFontPag );
Set_UInt16( pData, dywDispPag );
-
+
//500 -> 508, Appear to be repeated here in 2000+
pData += 8;
Set_UInt32(pData, GetCompatabilityOptions());
@@ -6503,16 +6503,16 @@ USHORT WW8DopTypography::GetConvertedLang() const
*/
switch(reserved1 & 0xE)
{
- case 2: //Japan
+ case 2: //Japan
nLang = LANGUAGE_JAPANESE;
break;
- case 4: //Chinese (Peoples Republic)
+ case 4: //Chinese (Peoples Republic)
nLang = LANGUAGE_CHINESE_SIMPLIFIED;
break;
- case 6: //Korean
+ case 6: //Korean
nLang = LANGUAGE_KOREAN;
break;
- case 8: //Chinese (Taiwan)
+ case 8: //Chinese (Taiwan)
nLang = LANGUAGE_CHINESE_TRADITIONAL;
break;
default:
@@ -6530,9 +6530,9 @@ USHORT WW8DopTypography::GetConvertedLang() const
}
//-----------------------------------------
-// Sprms
+// Sprms
//-----------------------------------------
-USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
+USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
const
{
SprmInfo aSprm = GetSprmInfo(nId);
@@ -6610,16 +6610,16 @@ USHORT wwSprmParser::GetSprmId(const sal_uInt8* pSp) const
ASSERT_RET_ON_FAIL(pSp, "Why GetSprmId with pSp of 0", 0);
USHORT nId = 0;
- switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7"
+ switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7"
{
case 6:
- case 7:
+ case 7:
nId = *pSp;
- if (0x0100 < nId)
+ if (0x0100 < nId)
nId = 0;
break;
default:
- case 8:
+ case 8:
nId = SVBT16ToShort(pSp);
if (0x0800 > nId)
nId = 0;
@@ -6655,8 +6655,8 @@ SEPr::SEPr() :
xaPage(12242), yaPage(15842), xaPageNUp(12242), yaPageNUp(15842),
dxaLeft(1800), dxaRight(1800), dyaTop(1440), dyaBottom(1440), dzaGutter(0),
dyaHdrTop(720), dyaHdrBottom(720), ccolM1(0), fEvenlySpaced(1),
- reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0),
- dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0),
+ reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0),
+ dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0),
reserved4(0)
{
memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing));
diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx
index f27ae65cdf89..403dcf412783 100644
--- a/sw/source/filter/ww8/dump/ww8scan.hxx
+++ b/sw/source/filter/ww8/dump/ww8scan.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <limits.h>
#endif
#include <sal/types.h>
-#include <tools/solar.h> // UINTXX
+#include <tools/solar.h> // UINTXX
#include <tools/table.hxx>
#include <tools/datetime.hxx>
#include <tools/stream.hxx>
@@ -44,7 +44,7 @@
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#include <ww8struc.hxx> // FIB, STSHI, STD
+#include <ww8struc.hxx> // FIB, STSHI, STD
#include <ww8scan.hxx>
@@ -85,7 +85,7 @@ String WW8Read_xstz(SvStream& rStrm,
// attention: the *extra data* of each string are SKIPPED and ignored
/* to be optimized like this: */
-void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm,
+void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm,
UINT32 nStart, INT32 nLen, USHORT nSkip,
rtl_TextEncoding eCS,
SvStrings &rArray, SvStrings* pExtraArray = 0 );
@@ -99,15 +99,15 @@ BYTE WW8SprmDataOfs( USHORT nId );
struct WW8FieldDesc
{
- long nLen; // Gesamtlaenge ( zum Text ueberlesen )
+ long nLen; // Gesamtlaenge ( zum Text ueberlesen )
WW8_CP nSCode; // Anfang Befehlscode
- long nLCode; // Laenge
- WW8_CP nSRes; // Anfang Ergebnis
- long nLRes; // Laenge ( == 0, falls kein Ergebnis )
- USHORT nId; // WW-Id fuer Felder
- BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert )
- BOOL bCodeNest:1; // Befehl rekursiv verwendet
- BOOL bResNest:1; // Befehl in Resultat eingefuegt
+ long nLCode; // Laenge
+ WW8_CP nSRes; // Anfang Ergebnis
+ long nLRes; // Laenge ( == 0, falls kein Ergebnis )
+ USHORT nId; // WW-Id fuer Felder
+ BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert )
+ BOOL bCodeNest:1; // Befehl rekursiv verwendet
+ BOOL bResNest:1; // Befehl in Resultat eingefuegt
};
BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF );
@@ -116,7 +116,7 @@ BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF );
struct WW8PLCFxSave1
{
ULONG nPLCFxPos;
- ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos
+ ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos
long nPLCFxMemOfs;
WW8_CP nAttrStart;
WW8_CP nAttrEnd;
@@ -128,12 +128,12 @@ struct WW8PLCFxSave1
u.a. fuer Felder, also genausoviele Attr wie Positionen,
falls Ctor-Param bNoEnd = false
*/
-class WW8PLCFspecial // Iterator fuer PLCFs
+class WW8PLCFspecial // Iterator fuer PLCFs
{
- INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
- BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
- long nIMax; // Anzahl der Elemente
- long nIdx; // Merker, wo wir gerade sind
+ INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
+ BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
+ long nIMax; // Anzahl der Elemente
+ long nIdx; // Merker, wo wir gerade sind
long nStru;
public:
@@ -141,9 +141,9 @@ public:
long nStruct, long nStartPos = -1, BOOL bNoEnd = FALSE );
~WW8PLCFspecial(){ delete( pPLCF_PosArray ); pPLCF_PosArray = 0; }
ULONG GetIdx() const { return (ULONG)nIdx; }
- void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer
+ void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer
long GetIMax(){ return nIMax; }
- BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert
+ BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert
// bzw. naechste groesseren Wert
BOOL SeekPosExact( long nPos );
long Where() { return ( nIdx >= nIMax ) ? LONG_MAX : pPLCF_PosArray[nIdx]; }
@@ -168,15 +168,15 @@ public:
class WW8SprmIter
{
// these members will be updated
- BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM)
- BYTE* pAktParams; // start of akt. SPRM's parameters
+ BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM)
+ BYTE* pAktParams; // start of akt. SPRM's parameters
USHORT nAktId;
short nAktSizeBrutto;
// these members will *not* be updated by UpdateMyMembers()
BYTE nVersion;
BYTE nDelta;
- short nRemLen; // length of remaining SPRMs (including akt. SPRM)
+ short nRemLen; // length of remaining SPRMs (including akt. SPRM)
void UpdateMyMembers();
public:
@@ -195,11 +195,11 @@ public:
/*
u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen
*/
-class WW8PLCF // Iterator fuer PLCFs
+class WW8PLCF // Iterator fuer PLCFs
{
- INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
- BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
- long nIMax; // Anzahl der Elemente
+ INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
+ BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
+ long nIMax; // Anzahl der Elemente
long nIdx;
long nStru;
@@ -245,8 +245,8 @@ class WW8PLCFpcd
{
friend class WW8PLCFpcd_Iter;
WW8Pcd_FC_sortArr aFC_sort; // sorted PCD entries by FC
- INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
- BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
+ INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
+ BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array
long nIMax;
long nStru;
@@ -266,12 +266,12 @@ class WW8PLCFpcd_Iter
public:
WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 );
-// ~WW8PLCFpcd_Iter() {}
+// ~WW8PLCFpcd_Iter() {}
ULONG GetIdx() const { return (ULONG)nIdx; }
void SetIdx( ULONG nI ) { nIdx = (long)nI; }
long GetIMax(){ return rPLCF.nIMax; }
BOOL SeekPos( long nPos );
-// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData );
+// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData );
long Where();
BOOL Get( long& rStart, long& rEnd, void*& rpValue );
ULONG FindIdx( WW8_FC nFC ) const { return rPLCF.FindIdx( nFC ); }
@@ -284,10 +284,10 @@ enum ePLCFT{ CHP=0, PAP, SEP, /*HED, FNR, ENR,*/ PLCF_END };
/*
pure virtual:
*/
-class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions
+class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions
{
- BYTE nVersion; // Versionsnummer des FIB
- BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... )
+ BYTE nVersion; // Versionsnummer des FIB
+ BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... )
public:
WW8PLCFx( BYTE nFibVersion, BOOL bSprm )
@@ -300,7 +300,7 @@ public:
virtual void SetIdx2( ULONG nIdx );
virtual BOOL SeekPos( WW8_CP nCpPos ) = 0;
virtual long Where() = 0;
-// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen );
+// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen );
virtual void GetSprms( WW8PLCFxDesc* p );
virtual long GetNoSprms( long& rStart, long&, long& rLen );
virtual WW8PLCFx& operator ++( int ) = 0;
@@ -316,10 +316,10 @@ class WW8PLCFx_PCDAttrs : public WW8PLCFx
{
WW8PLCFpcd_Iter* pPcdI;
WW8PLCFx_PCD* pPcd;
- BYTE** pGrpprls; // Attribute an Piece-Table
- SVBT32 aShortSprm; // mini storage: can contain ONE sprm with
+ BYTE** pGrpprls; // Attribute an Piece-Table
+ SVBT32 aShortSprm; // mini storage: can contain ONE sprm with
// 1 byte param
- UINT16 nGrpprls; // Attribut Anzahl davon
+ UINT16 nGrpprls; // Attribut Anzahl davon
public:
WW8PLCFx_PCDAttrs( BYTE nVersion, WW8PLCFx_PCD* pPLCFx_PCD, WW8ScannerBase* pBase );
@@ -334,7 +334,7 @@ public:
WW8PLCFpcd_Iter* GetIter() const { return pPcdI; }
};
-class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table
+class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table
{
WW8PLCFpcd_Iter* pPcdI;
BOOL bVer67;
@@ -347,7 +347,7 @@ public:
virtual void SetIdx( ULONG nI );
virtual BOOL SeekPos( WW8_CP nCpPos );
virtual long Where();
-// virtual void GetSprms( WW8PLCFxDesc* p );
+// virtual void GetSprms( WW8PLCFxDesc* p );
virtual long GetNoSprms( long& rStart, long&, long& rLen );
virtual WW8PLCFx& operator ++( int );
WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos );
@@ -366,13 +366,13 @@ public:
};
-class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps
+class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps
// arbeitet nur auf FCs, nicht auf CPs !
// ( Low-Level )
{
- class WW8Fkp // Iterator fuer Formatted Disk Page
+ class WW8Fkp // Iterator fuer Formatted Disk Page
{
struct WW8Grpprl
{
@@ -382,15 +382,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti
BOOL bMustDelete;
};
- WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing
+ WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing
- BYTE* pFkp; // gesamter Fkp
+ BYTE* pFkp; // gesamter Fkp
- long nItemSize; // entweder 1 Byte oder ein komplettes BX
- long nFilePos; // Offset in Stream where last read of 52 bytes took place
- short nIdx; // Pos-Merker
+ long nItemSize; // entweder 1 Byte oder ein komplettes BX
+ long nFilePos; // Offset in Stream where last read of 52 bytes took place
+ short nIdx; // Pos-Merker
ePLCFT ePLCF;
- BYTE nIMax; // Anzahl der Eintraege
+ BYTE nIMax; // Anzahl der Eintraege
BYTE nVersion;
public:
@@ -421,15 +421,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti
*/
BYTE* HasSprm( USHORT nId );
- ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps
+ ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps
BYTE GetVersion() const { return nVersion; }
};
WW8PLCFx_PCDAttrs* pPCDAttrs;
- SvStream* pFKPStrm; // Input-File
- SvStream* pDataStrm; // Input-File
+ SvStream* pFKPStrm; // Input-File
+ SvStream* pDataStrm; // Input-File
WW8PLCF* pPLCF;
WW8Fkp* pFkp;
WW8_FC nStartFc;
@@ -488,7 +488,7 @@ public:
-class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx
+class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx
{
SvStream* pStrm;
WW8PLCF* pPLCF;
@@ -548,7 +548,7 @@ public:
long Count() { return ( pRef ) ? pRef->GetIMax() : 0; }
};
-class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten
+class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten
{
WW8PLCFspecial* pPLCF;
WW8Fib& rFib;
@@ -567,12 +567,12 @@ public:
enum eBookStatus { BOOK_NORMAL = 0, BOOK_IGNORE = 0x1, BOOK_ONLY_REF = 0x2 };
-class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes
+class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes
{
- WW8PLCFspecial* pBook[2]; // Start- und EndPosition
- SvStrings aBookNames; // Name
+ WW8PLCFspecial* pBook[2]; // Start- und EndPosition
+ SvStrings aBookNames; // Name
eBookStatus* pStatus;
- long nIMax; // Anzahl der Booknotes
+ long nIMax; // Anzahl der Booknotes
USHORT nIsEnd;
public:
WW8PLCFx_Book( SvStream* pSt, SvStream* pTblSt, WW8Fib& rFib, WW8_CP nStartCp );
@@ -606,24 +606,24 @@ public:
*/
struct WW8PLCFManResult
{
- WW8_CP nCpPos; // Attribut-Anfangsposition
- long nMemLen; // Laenge dazu
- long nCp2OrIdx; // footnote-textpos oder Index in PLCF
- WW8_CP nAktCp; // wird nur vom Aufrufer benutzt
- BYTE* pMemPos; // Mem-Pos fuer Sprms
- USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! )
+ WW8_CP nCpPos; // Attribut-Anfangsposition
+ long nMemLen; // Laenge dazu
+ long nCp2OrIdx; // footnote-textpos oder Index in PLCF
+ WW8_CP nAktCp; // wird nur vom Aufrufer benutzt
+ BYTE* pMemPos; // Mem-Pos fuer Sprms
+ USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! )
// (2..255) oder Pseudo-Sprm-Id (256..260)
// bzw. ab Winword-Ver8 die Sprm-Id (800..)
- BYTE nFlags; // Absatz- oder Section-Anfang
+ BYTE nFlags; // Absatz- oder Section-Anfang
};
#define MAN_ANZ_PLCF 12
-#define MAN_MASK_NEW_PAP 1 // neue Zeile
-#define MAN_MASK_NEW_SEP 2 // neue Section
+#define MAN_MASK_NEW_PAP 1 // neue Zeile
+#define MAN_MASK_NEW_SEP 2 // neue Section
-#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor
+#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor
#define MAN_FTN 1
#define MAN_EDN 2
#define MAN_HDFT 3
@@ -643,14 +643,14 @@ struct WW8PLCFxDesc
{
WW8PLCFx* pPLCFx;
UShortStk* pIdStk;// Speicher fuer Attr-Id fuer Attr-Ende(n)
- BYTE* pMemPos; // wo liegen die Sprm(s)
+ BYTE* pMemPos; // wo liegen die Sprm(s)
long nStartPos;
long nEndPos;
- long nCp2OrIdx; // wo liegen die NoSprm(s)
- long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote
- long nCpOfs; // fuer Offset Header .. Footnote
- BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe
- BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende
+ long nCp2OrIdx; // wo liegen die NoSprm(s)
+ long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote
+ long nCpOfs; // fuer Offset Header .. Footnote
+ BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe
+ BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende
void Save( WW8PLCFxSave1& rSave ) const;
void Restore( const WW8PLCFxSave1& rSave );
};
@@ -660,11 +660,11 @@ struct WW8PLCFxDesc
class WW8PLCFMan
{
- long nCpO; // Origin Cp -- the basis for nNewCp
+ long nCpO; // Origin Cp -- the basis for nNewCp
- long nLineEnd; // zeigt *hinter* das <CR>
- long nLastWhereIdxCp; // last result of WhereIdx()
- USHORT nPLCF; // so viele PLCFe werden verwaltet
+ long nLineEnd; // zeigt *hinter* das <CR>
+ long nLastWhereIdxCp; // last result of WhereIdx()
+ USHORT nPLCF; // so viele PLCFe werden verwaltet
short nManType;
WW8PLCFxDesc aD[MAN_ANZ_PLCF];
@@ -700,13 +700,13 @@ public:
BOOL Get( WW8PLCFManResult* pResult );
WW8PLCFMan& operator ++( int );
- USHORT GetColl() const; // liefert aktuellen Style
+ USHORT GetColl() const; // liefert aktuellen Style
WW8PLCFx_FLD* GetFld() const;
WW8PLCFx_SubDoc* GetEdn() const { return (WW8PLCFx_SubDoc*)pEdn->pPLCFx; }
WW8PLCFx_SubDoc* GetFtn() const { return (WW8PLCFx_SubDoc*)pFtn->pPLCFx; }
WW8PLCFx_SubDoc* GetAtn() const { return (WW8PLCFx_SubDoc*)pAnd->pPLCFx; }
WW8PLCFx_Book* GetBook() const { return (WW8PLCFx_Book*)pBkm->pPLCFx; }
- long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer...
+ long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer...
/*
fragt, ob *aktueller Absatz* einen Sprm diesen Typs hat
@@ -725,9 +725,9 @@ public:
void SeekPos( long nNewCp );
void SaveAllPLCFx( WW8PLCFxSaveAll& rSave ) const;
void RestoreAllPLCFx( const WW8PLCFxSaveAll& rSave );
- WW8PLCFspecial* GetFdoa() { return pFdoa; }
- WW8PLCFspecial* GetTxbx() { return pTxbx; }
- WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; }
+ WW8PLCFspecial* GetFdoa() { return pFdoa; }
+ WW8PLCFspecial* GetTxbx() { return pTxbx; }
+ WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; }
short GetManType() { return nManType; }
};
@@ -749,34 +749,34 @@ friend class SwWw8ImplReader;
#endif
WW8Fib* pWw8Fib;
- WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs
- WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs
- WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs
- WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes
- WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes
- WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen
- WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text
- WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer
- WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text
- WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer
- WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes
- WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes
- WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen
- WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text
- WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer
- WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text
- WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese
- WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer
- WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese
- WW8PLCFx_Book* pBook; // Bookmarks
-
- WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator )
- WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu )
- WW8PLCFx_PCD* pPLCFx_PCD; // dito
- WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs;
- BYTE** pPieceGrpprls; // Attribute an Piece-Table
- UINT16 nPieceGrpprls; // Anzahl davon
- USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs
+ WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs
+ WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs
+ WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs
+ WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes
+ WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes
+ WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen
+ WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text
+ WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer
+ WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text
+ WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer
+ WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes
+ WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes
+ WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen
+ WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text
+ WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer
+ WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text
+ WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese
+ WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer
+ WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese
+ WW8PLCFx_Book* pBook; // Bookmarks
+
+ WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator )
+ WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu )
+ WW8PLCFx_PCD* pPLCFx_PCD; // dito
+ WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs;
+ BYTE** pPieceGrpprls; // Attribute an Piece-Table
+ UINT16 nPieceGrpprls; // Anzahl davon
+ USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs
// aufgespannt sind; z.B. bei Char #7 (Zellen-/Zeilenende)
WW8PLCFpcd* OpenPieceTable( SvStream* pStr, WW8Fib* pWwF );
@@ -811,7 +811,7 @@ public:
von uns verlangte Programm-Version:
in Ctor wird geprueft, ob sie zu nFib passt
*/
- BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95",
+ BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95",
// 7 steht fuer "nur WinWord 95"
// 8 steht fuer "nur WinWord 97"
/*
@@ -823,16 +823,16 @@ public:
(entspricht nur ungefaehr der tatsaechlichen Struktur
des Winword-FIB)
*/
- UINT16 wIdent; // 0x0 int magic number
- UINT16 nFib; // 0x2 FIB version written
- UINT16 nProduct; // 0x4 product version written by
- INT16 lid; // 0x6 language stamp---localized version;
- WW8_PN pnNext; // 0x8
+ UINT16 wIdent; // 0x0 int magic number
+ UINT16 nFib; // 0x2 FIB version written
+ UINT16 nProduct; // 0x4 product version written by
+ INT16 lid; // 0x6 language stamp---localized version;
+ WW8_PN pnNext; // 0x8
- UINT16 fDot :1; // 0xa 0001
+ UINT16 fDot :1; // 0xa 0001
UINT16 fGlsy :1;
UINT16 fComplex :1; // 0004 when 1, file is in complex, fast-saved format.
- UINT16 fHasPic :1; // 0008 file contains 1 or more pictures
+ UINT16 fHasPic :1; // 0008 file contains 1 or more pictures
UINT16 cQuickSaves :4; // 00F0 count of times file was quicksaved
UINT16 fEncrypted :1; //0100 1 if file is encrypted, 0 if not
UINT16 fWhichTblStm :1; //0200 When 0, this fib refers to the table stream
@@ -846,67 +846,67 @@ public:
UINT16 fExtChar :1; // 1000 =1, when using extended character set in file
// UINT16 u2 :3;
- UINT16 nFibBack; // 0xc
- INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted.
- INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment
- UINT8 envr; // 0x12 environment in which file was created
+ UINT16 nFibBack; // 0xc
+ INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted.
+ INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment
+ UINT8 envr; // 0x12 environment in which file was created
// 0 created by Win Word / 1 created by Mac Word
- BYTE fMac :1; // 0x13 when 1, this file was last saved in the Mac environment
+ BYTE fMac :1; // 0x13 when 1, this file was last saved in the Mac environment
BYTE fEmptySpecial :1;
BYTE fLoadOverridePage :1;
BYTE fFuturesavedUndo :1;
BYTE fWord97Saved :1;
BYTE :3;
- UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse)
+ UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse)
// 0 = ANSI / 256 Macintosh character set.
- UINT16 chseTables; // 0x16 default extended character set id for text in
+ UINT16 chseTables; // 0x16 default extended character set id for text in
// internal data structures: 0 = ANSI, 256 = Macintosh
- WW8_FC fcMin; // 0x18 file offset of first character of text
- WW8_FC fcMac; // 0x1c file offset of last character of text + 1
+ WW8_FC fcMin; // 0x18 file offset of first character of text
+ WW8_FC fcMac; // 0x1c file offset of last character of text + 1
// Einschub fuer WW8 *****************************************************
- UINT16 csw; // Count of fields in the array of "shorts"
+ UINT16 csw; // Count of fields in the array of "shorts"
// Marke: "rgsw" Beginning of the array of shorts
- UINT16 wMagicCreated; // unique number Identifying the File's creator
+ UINT16 wMagicCreated; // unique number Identifying the File's creator
// 0x6A62 is the creator ID for Word and is reserved.
// Other creators should choose a different value.
- UINT16 wMagicRevised; // identifies the File's last modifier
- UINT16 wMagicCreatedPrivate; // private data
- UINT16 wMagicRevisedPrivate; // private data
+ UINT16 wMagicRevised; // identifies the File's last modifier
+ UINT16 wMagicCreatedPrivate; // private data
+ UINT16 wMagicRevisedPrivate; // private data
/*
- INT16 pnFbpChpFirst_W6; // not used
- INT16 pnChpFirst_W6; // not used
- INT16 cpnBteChp_W6; // not used
- INT16 pnFbpPapFirst_W6; // not used
- INT16 pnPapFirst_W6; // not used
- INT16 cpnBtePap_W6; // not used
- INT16 pnFbpLvcFirst_W6; // not used
- INT16 pnLvcFirst_W6; // not used
- INT16 cpnBteLvc_W6; // not used
+ INT16 pnFbpChpFirst_W6; // not used
+ INT16 pnChpFirst_W6; // not used
+ INT16 cpnBteChp_W6; // not used
+ INT16 pnFbpPapFirst_W6; // not used
+ INT16 pnPapFirst_W6; // not used
+ INT16 cpnBtePap_W6; // not used
+ INT16 pnFbpLvcFirst_W6; // not used
+ INT16 pnLvcFirst_W6; // not used
+ INT16 cpnBteLvc_W6; // not used
*/
- INT16 lidFE; // Language id if document was written by Far East version
+ INT16 lidFE; // Language id if document was written by Far East version
// of Word (i.e. FIB.fFarEast is on)
- UINT16 clw; // Number of fields in the array of longs
+ UINT16 clw; // Number of fields in the array of longs
// Ende des Einschubs fuer WW8 *******************************************
// Marke: "rglw" Beginning of the array of longs
- WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1.
-
- // WW8_FC u4[4]; // 0x24
- WW8_CP ccpText; // 0x34 length of main document text stream
- WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream
- WW8_CP ccpHdr; // 0x3c length of header subdocument text stream
- WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream
- WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream
- WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream
- WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream
- WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream
+ WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1.
+
+ // WW8_FC u4[4]; // 0x24
+ WW8_CP ccpText; // 0x34 length of main document text stream
+ WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream
+ WW8_CP ccpHdr; // 0x3c length of header subdocument text stream
+ WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream
+ WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream
+ WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream
+ WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream
+ WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream
// Einschub fuer WW8 *****************************************************
- INT32 pnFbpChpFirst; // when there was insufficient memory for Word to expand
+ INT32 pnFbpChpFirst; // when there was insufficient memory for Word to expand
// the PLCFbte at save time, the PLCFbte is written
// to the file in a linked list of 512-byte pieces
// starting with this pn.
@@ -914,13 +914,13 @@ public:
// folgende Felder existieren zwar so in der Datei,
// wir benutzen jedoch unten deklarierte General-Variablen
// fuer Ver67 und Ver8 gemeinsam.
- INT32 pnChpFirst; // the page number of the lowest numbered page in the
+ INT32 pnChpFirst; // the page number of the lowest numbered page in the
// document that records CHPX FKP information
- INT32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex
+ INT32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex
// files if the number of entries in the PLCFbteChpx
// is less than this, the PLCFbteChpx is incomplete.
*/
- INT32 pnFbpPapFirst; // when there was insufficient memory for Word to expand
+ INT32 pnFbpPapFirst; // when there was insufficient memory for Word to expand
// the PLCFbte at save time, the PLCFbte is written to
// the file in a linked list of 512-byte pieces
// starting with this pn
@@ -928,251 +928,251 @@ public:
// folgende Felder existieren zwar so in der Datei,
// wir benutzen jedoch unten deklarierte General-Variablen
// fuer Ver67 und Ver8 gemeinsam.
- INT32 pnPapFirst; // the page number of the lowest numbered page in the
+ INT32 pnPapFirst; // the page number of the lowest numbered page in the
// document that records PAPX FKP information
- INT32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex
+ INT32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex
// files if the number of entries in the PLCFbtePapx is
// less than this, the PLCFbtePapx is incomplete.
*/
- INT32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand
+ INT32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand
// the PLCFbte at save time, the PLCFbte is written to
// the file in a linked list of 512-byte pieces
// starting with this pn
- INT32 pnLvcFirst; // the page number of the lowest numbered page in the
+ INT32 pnLvcFirst; // the page number of the lowest numbered page in the
// document that records LVC FKP information
- INT32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex
+ INT32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex
// files if the number of entries in the PLCFbtePapx is
// less than this, the PLCFbtePapx is incomplete.
- INT32 fcIslandFirst; // ?
- INT32 fcIslandLim; // ?
- UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs.
+ INT32 fcIslandFirst; // ?
+ INT32 fcIslandLim; // ?
+ UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs.
// Ende des Einschubs fuer WW8 *******************************************
// Marke: "rgfclcb" Beginning of array of FC/LCB pairs.
- WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table
+ WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table
// stream. During fast save Word will attempt to reuse
// this allocation if STSH is small enough to fit.
- INT32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation
- WW8_FC fcStshf; // 0x60 file offset of STSH in file.
- INT32 lcbStshf; // 0x64 count of bytes of current STSH allocation
- WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF.
- INT32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF
+ INT32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation
+ WW8_FC fcStshf; // 0x60 file offset of STSH in file.
+ INT32 lcbStshf; // 0x64 count of bytes of current STSH allocation
+ WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF.
+ INT32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF
// == 0 if no footnotes defined in document.
- WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF.
- INT32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF.
+ WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF.
+ INT32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF.
// == 0 if no footnotes defined in document
- WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF.
- INT32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF.
+ WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF.
+ INT32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF.
- WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF.
- INT32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF
+ WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF.
+ INT32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF
- WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF.
- INT32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF.
+ WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF.
+ INT32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF.
- WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF
- INT32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF.
+ WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF
+ INT32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF.
// ==0 if file was never viewed in Outline view.
// Should not be written by third party creators
- WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights.
- INT32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF.
+ WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights.
+ INT32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF.
// ==0 when file is non-complex.
- WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table.
- INT32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table.
- // == 0 for non-glossary documents.
- // !=0 for glossary documents.
+ WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table.
+ INT32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table.
+ // == 0 for non-glossary documents.
+ // !=0 for glossary documents.
- WW8_FC fcPlcfglsy; // 0xa8 file offset of glossary PLCF.
- INT32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF.
- // == 0 for non-glossary documents.
- // !=0 for glossary documents.
+ WW8_FC fcPlcfglsy; // 0xa8 file offset of glossary PLCF.
+ INT32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF.
+ // == 0 for non-glossary documents.
+ // !=0 for glossary documents.
- WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF.
- INT32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF.
- // == 0 if document contains no headers
+ WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF.
+ INT32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF.
+ // == 0 if document contains no headers
- WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF.
+ WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF.
INT32 lcbPlcfbteChpx;// 0xbc count of bytes of character property bin table PLCF.
- WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph property bin table.PLCF.
+ WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph property bin table.PLCF.
INT32 lcbPlcfbtePapx;// 0xc4 count of bytes of paragraph property bin table PLCF.
- WW8_FC fcPlcfsea; // 0xc8 file offset of PLCF reserved for private use. The SEA is 6 bytes long.
- INT32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF.
+ WW8_FC fcPlcfsea; // 0xc8 file offset of PLCF reserved for private use. The SEA is 6 bytes long.
+ INT32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF.
- WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition.
- INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn.
+ WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition.
+ INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn.
- WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document.
- INT32 lcbPlcffldMom; // 0xdc
+ WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document.
+ INT32 lcbPlcffldMom; // 0xdc
- WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument.
- INT32 lcbPlcffldHdr; // 0xe4
+ WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument.
+ INT32 lcbPlcffldHdr; // 0xe4
- WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument.
- INT32 lcbPlcffldFtn; // 0xec
+ WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument.
+ INT32 lcbPlcffldFtn; // 0xec
- WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument.
- INT32 lcbPlcffldAtn; // 0xf4
+ WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument.
+ INT32 lcbPlcffldAtn; // 0xf4
- WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument.
- INT32 lcbPlcffldMcr; // 9xfc
+ WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument.
+ INT32 lcbPlcffldMcr; // 9xfc
- WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document
- INT32 lcbSttbfbkmk; // 0x104
+ WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document
+ INT32 lcbSttbfbkmk; // 0x104
- WW8_FC fcPlcfbkf; // 0x108 offset in document stream of the PLCF that records the beginning CP offsets of bookmarks in the main document. See BKF
- INT32 lcbPlcfbkf; // 0x10c
+ WW8_FC fcPlcfbkf; // 0x108 offset in document stream of the PLCF that records the beginning CP offsets of bookmarks in the main document. See BKF
+ INT32 lcbPlcfbkf; // 0x10c
- WW8_FC fcPlcfbkl; // 0x110 offset in document stream of the PLCF that records the ending CP offsets of bookmarks recorded in the main document. See the BKL structure definition.
- INT32 lcbPlcfbkl; // 0x114 INT32
+ WW8_FC fcPlcfbkl; // 0x110 offset in document stream of the PLCF that records the ending CP offsets of bookmarks recorded in the main document. See the BKL structure definition.
+ INT32 lcbPlcfbkl; // 0x114 INT32
- WW8_FC fcCmds; // 0x118 FC
- INT32 lcbCmds; // 0x11c
+ WW8_FC fcCmds; // 0x118 FC
+ INT32 lcbCmds; // 0x11c
- WW8_FC fcPlcfmcr; // 0x120 FC
- INT32 lcbPlcfmcr; // 0x124
+ WW8_FC fcPlcfmcr; // 0x120 FC
+ INT32 lcbPlcfmcr; // 0x124
- WW8_FC fcSttbfmcr; // 0x128 FC
- INT32 lcbSttbfmcr; // 0x12c
+ WW8_FC fcSttbfmcr; // 0x128 FC
+ INT32 lcbSttbfmcr; // 0x12c
- WW8_FC fcPrDrvr; // 0x130 file offset of the printer driver information (names of drivers, port etc...)
- INT32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...)
+ WW8_FC fcPrDrvr; // 0x130 file offset of the printer driver information (names of drivers, port etc...)
+ INT32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...)
- WW8_FC fcPrEnvPort; // 0x138 file offset of the print environment in portrait mode.
- INT32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode.
+ WW8_FC fcPrEnvPort; // 0x138 file offset of the print environment in portrait mode.
+ INT32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode.
- WW8_FC fcPrEnvLand; // 0x140 file offset of the print environment in landscape mode.
- INT32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode.
+ WW8_FC fcPrEnvLand; // 0x140 file offset of the print environment in landscape mode.
+ INT32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode.
- WW8_FC fcWss; // 0x148 file offset of Window Save State data structure. See WSS.
- INT32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state.
+ WW8_FC fcWss; // 0x148 file offset of Window Save State data structure. See WSS.
+ INT32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state.
- WW8_FC fcDop; // 0x150 file offset of document property data structure.
- INT32 lcbDop; // 0x154 count of bytes of document properties.
+ WW8_FC fcDop; // 0x150 file offset of document property data structure.
+ INT32 lcbDop; // 0x154 count of bytes of document properties.
// cbDOP is 84 when nFib < 103
- WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC.
- INT32 cbSttbfAssoc; // 0x15C
+ WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC.
+ INT32 cbSttbfAssoc; // 0x15C
- WW8_FC fcClx; // 0x160 file offset of beginning of information for complex files.
- INT32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex.
+ WW8_FC fcClx; // 0x160 file offset of beginning of information for complex files.
+ INT32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex.
- WW8_FC fcPlcfpgdFtn; // 0x168 file offset of page descriptor PLCF for footnote subdocument.
- INT32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument.
- // ==0 if document has not been paginated. The length of the PGD is 8 bytes.
+ WW8_FC fcPlcfpgdFtn; // 0x168 file offset of page descriptor PLCF for footnote subdocument.
+ INT32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument.
+ // ==0 if document has not been paginated. The length of the PGD is 8 bytes.
- WW8_FC fcAutosaveSource; // 0x170 file offset of the name of the original file.
- INT32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file.
+ WW8_FC fcAutosaveSource; // 0x170 file offset of the name of the original file.
+ INT32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file.
- WW8_FC fcGrpStAtnOwners; // 0x178 group of strings recording the names of the owners of annotations
- INT32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings
+ WW8_FC fcGrpStAtnOwners; // 0x178 group of strings recording the names of the owners of annotations
+ INT32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings
- WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument
- INT32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument
+ WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument
+ INT32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument
// Einschubs fuer WW67 ***************************************************
- // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden
+ // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden
/*
// folgende Felder existieren zwar so in der Datei,
// wir benutzen jedoch unten deklarierte General-Variablen
// fuer Ver67 und Ver8 gemeinsam.
- WW8_PN pnChpFirst; // the page number of the lowest numbered page in
+ WW8_PN pnChpFirst; // the page number of the lowest numbered page in
// the document that records CHPX FKP information
- WW8_PN pnPapFirst; // the page number of the lowest numbered page in
+ WW8_PN pnPapFirst; // the page number of the lowest numbered page in
// the document that records PAPX FKP information
- WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex
+ WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex
// files if the number of entries in the PLCFbteChpx is
// less than this, the PLCFbteChpx is incomplete.
- WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex
+ WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex
// files if the number of entries in the PLCFbtePapx is
// less than this, the PLCFbtePapx is incomplete.
*/
// Ende des Einschubs fuer WW67 ******************************************
- WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document.
- // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes.
+ WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document.
+ // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes.
// ab Ver8 unused
- INT32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document
+ INT32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document
// ab Ver8 unused
- WW8_FC fcPlcfdoaHdr; // 0x19A file offset of the FDOA (drawn object) PLCF for the header document.
- // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes.
+ WW8_FC fcPlcfdoaHdr; // 0x19A file offset of the FDOA (drawn object) PLCF for the header document.
+ // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes.
// ab Ver8 unused
- INT32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document
+ INT32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document
// ab Ver8 unused
- WW8_FC fcPlcfspaMom; // offset in table stream of the FSPA PLCF for main document.
+ WW8_FC fcPlcfspaMom; // offset in table stream of the FSPA PLCF for main document.
// == 0 if document has no office art objects
// war in Ver67 nur leere Reserve
- INT32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document
+ INT32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document
// war in Ver67 nur leere Reserve
- WW8_FC fcPlcfspaHdr; // offset in table stream of the FSPA PLCF for header document.
+ WW8_FC fcPlcfspaHdr; // offset in table stream of the FSPA PLCF for header document.
// == 0 if document has no office art objects
// war in Ver67 nur leere Reserve
- INT32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document
+ INT32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document
// war in Ver67 nur leere Reserve
- WW8_FC fcPlcfAtnbkf; // 0x1B2 file offset of BKF (bookmark first) PLCF of the annotation subdocument
- INT32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument
+ WW8_FC fcPlcfAtnbkf; // 0x1B2 file offset of BKF (bookmark first) PLCF of the annotation subdocument
+ INT32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument
- WW8_FC fcPlcfAtnbkl; // 0x1BA file offset of BKL (bookmark last) PLCF of the annotation subdocument
- INT32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument
+ WW8_FC fcPlcfAtnbkl; // 0x1BA file offset of BKL (bookmark last) PLCF of the annotation subdocument
+ INT32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument
- WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block
- INT32 lcbPMS; // 0x1C6 length in bytes of PMS
+ WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block
+ INT32 lcbPMS; // 0x1C6 length in bytes of PMS
- WW8_FC fcFormFldSttbf; // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls
- INT32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf
+ WW8_FC fcFormFldSttbf; // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls
+ INT32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf
- WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream
- INT32 lcbPlcfendRef; // 0x1D6
+ WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream
+ INT32 lcbPlcfendRef; // 0x1D6
- WW8_FC fcPlcfendTxt; // 0x1DA file offset of PLCFendRef which points to endnote text in the endnote document
- // stream which corresponds with the PLCFendRef
- INT32 lcbPlcfendTxt; // 0x1DE
+ WW8_FC fcPlcfendTxt; // 0x1DA file offset of PLCFendRef which points to endnote text in the endnote document
+ // stream which corresponds with the PLCFendRef
+ INT32 lcbPlcfendTxt; // 0x1DE
- WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc
- INT32 lcbPlcffldEdn; // 0x1E6
+ WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc
+ INT32 lcbPlcffldEdn; // 0x1E6
- WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc.
- INT32 lcbPlcfpgdEdn; // 0x1EE
+ WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc.
+ INT32 lcbPlcfpgdEdn; // 0x1EE
- WW8_FC fcDggInfo; // offset in table stream of the office art object table data.
+ WW8_FC fcDggInfo; // offset in table stream of the office art object table data.
// The format of office art object table data is found in a separate document.
// war in Ver67 nur leere Reserve
- INT32 lcbDggInfo; // length in bytes of the office art object table data
+ INT32 lcbDggInfo; // length in bytes of the office art object table data
// war in Ver67 nur leere Reserve
- WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations...
- INT32 lcbSttbfRMark; // 0x1fe
- WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles...
- INT32 lcbSttbfCaption; // 0x206
- WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and
+ WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations...
+ INT32 lcbSttbfRMark; // 0x1fe
+ WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles...
+ INT32 lcbSttbfCaption; // 0x206
+ WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and
// indices into the caption STTBF for objects which get auto captions.
- INT32 lcbSttbAutoCaption; // 0x20e
+ INT32 lcbSttbAutoCaption; // 0x20e
- WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents...
- INT32 lcbPlcfwkb; // 0x216
+ WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents...
+ INT32 lcbPlcfwkb; // 0x216
- WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state
+ WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state
// war in Ver67 nur leere Reserve
- INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve
+ INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve
- WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc
- INT32 lcbPlcftxbxTxt; // 0x226
- WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc.
- INT32 lcbPlcffldTxbx; // 0x22e
+ WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc
+ INT32 lcbPlcftxbxTxt; // 0x226
+ WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc.
+ INT32 lcbPlcffldTxbx; // 0x22e
WW8_FC fcPlcfHdrtxbxTxt;// 0x232 ...PLCF of beginning CP in the header text box subdoc
INT32 lcbPlcfHdrtxbxTxt;// 0x236
WW8_FC fcPlcffldHdrTxbx;// 0x23a ...PLCF of field boundaries recorded in the header textbox subdoc.
@@ -1181,15 +1181,15 @@ public:
/*
spezielle Listenverwaltung fuer WW8
*/
- WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information.
- INT32 lcbPlcfLst; // 0x02e6 length
- WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information.
- INT32 lcbPlfLfo; // 0x02ee length
+ WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information.
+ INT32 lcbPlcfLst; // 0x02e6 length
+ WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information.
+ INT32 lcbPlfLfo; // 0x02ee length
/*
spezielle Break-Verwaltung fuer Text-Box-Stories in WW8
*/
- WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext
- INT32 lcbPlcftxbxBkd; // 0x02f6
+ WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext
+ INT32 lcbPlcftxbxBkd; // 0x02f6
WW8_FC fcPlcfHdrtxbxBkd;// 0x02fa PLCF fuer TextBox-Break-Deskriptoren im Header-/Footer-Bereich
INT32 lcbPlcfHdrtxbxBkd;// 0x02fe
@@ -1225,20 +1225,20 @@ protected:
SvStream& rSt;
long nStyleStart;
long nStyleLen;
-// WW8_STSHI* pStishi;
+// WW8_STSHI* pStishi;
- UINT16 cstd; // Count of styles in stylesheet
- UINT16 cbSTDBaseInFile; // Length of STD Base as stored in a file
- UINT16 fStdStylenamesWritten : 1; // Are built-in stylenames stored?
- UINT16 : 15; // Spare flags
- UINT16 stiMaxWhenSaved; // Max sti known when this file was written
- UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there?
- UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames
- UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document
+ UINT16 cstd; // Count of styles in stylesheet
+ UINT16 cbSTDBaseInFile; // Length of STD Base as stored in a file
+ UINT16 fStdStylenamesWritten : 1; // Are built-in stylenames stored?
+ UINT16 : 15; // Spare flags
+ UINT16 stiMaxWhenSaved; // Max sti known when this file was written
+ UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there?
+ UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames
+ UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document
public:
WW8Style( SvStream& rSt, WW8Fib& rFibPara );
-// ~WW8Style(){ delete( pStishi ); pStishi = 0; }
+// ~WW8Style(){ delete( pStishi ); pStishi = 0; }
WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd );
WW8_STD* Read1Style( short& rSkip, String* pString, short* pcbStd );
const UINT16 GetCount() const { return cstd; }
@@ -1248,9 +1248,9 @@ public:
class WW8Fonts
{
protected:
- WW8_FFN* pFontA; // Array of Pointers to Font Description
+ WW8_FFN* pFontA; // Array of Pointers to Font Description
// Hilfs-Vari
- USHORT nMax; // Array-Groesse
+ USHORT nMax; // Array-Groesse
public:
WW8Fonts( SvStream& rSt, WW8Fib& rFib );
~WW8Fonts(){ if( pFontA ) delete [] pFontA; }
@@ -1276,146 +1276,146 @@ public:
// Initialisier-Dummy:
BYTE nDataStart;
//-------------------------
- UINT16 fFacingPages : 1; // 1 when facing pages should be printed
- UINT16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled.
- UINT16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0
- UINT16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0
- UINT16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text
- UINT16 : 1; // 0 unused
+ UINT16 fFacingPages : 1; // 1 when facing pages should be printed
+ UINT16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled.
+ UINT16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0
+ UINT16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0
+ UINT16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text
+ UINT16 : 1; // 0 unused
//-------------------------
- UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic.
+ UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic.
//-------------------------
- UINT16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page
- UINT16 nFtn : 14; // 1 initial footnote number for document
- UINT16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied
- UINT16 : 7; // reserved
- UINT16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh
- UINT16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows
- UINT16 fLabelDoc : 1; // when 1, document was created as a print merge labels document
- UINT16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated
- UINT16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task
- UINT16 fFormNoFields : 1;
- UINT16 fLinkStyles : 1; // when 1, Word will merge styles from its template
- UINT16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited
- UINT16 fBackup : 1; // always make backup when document saved when 1.
- UINT16 fExactCWords : 1;
- UINT16 fPagHidden : 1; //
- UINT16 fPagResults : 1;
- UINT16 fLockAtn : 1; // when 1, annotations are locked for editing
- UINT16 fMirrorMargins : 1; // swap margins on left/right pages when 1.
- UINT16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1
- UINT16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x)
- UINT16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x).
- UINT16 fProtEnabled : 1; // when 1, document is protected from edit operations
- UINT16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields
- UINT16 fRMView : 1; // when 1, show revision markings on screen
- UINT16 fRMPrint : 1; // when 1, print revision marks when document is printed
- UINT16 fWriteReservation : 1;
- UINT16 fLockRev : 1; // when 1, the current revision marking state is locked
- UINT16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts
- // compatability options
- UINT16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent
- UINT16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters
- UINT16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break
- UINT16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line
- UINT16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers
- UINT16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts
+ UINT16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page
+ UINT16 nFtn : 14; // 1 initial footnote number for document
+ UINT16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied
+ UINT16 : 7; // reserved
+ UINT16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh
+ UINT16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows
+ UINT16 fLabelDoc : 1; // when 1, document was created as a print merge labels document
+ UINT16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated
+ UINT16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task
+ UINT16 fFormNoFields : 1;
+ UINT16 fLinkStyles : 1; // when 1, Word will merge styles from its template
+ UINT16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited
+ UINT16 fBackup : 1; // always make backup when document saved when 1.
+ UINT16 fExactCWords : 1;
+ UINT16 fPagHidden : 1; //
+ UINT16 fPagResults : 1;
+ UINT16 fLockAtn : 1; // when 1, annotations are locked for editing
+ UINT16 fMirrorMargins : 1; // swap margins on left/right pages when 1.
+ UINT16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1
+ UINT16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x)
+ UINT16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x).
+ UINT16 fProtEnabled : 1; // when 1, document is protected from edit operations
+ UINT16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields
+ UINT16 fRMView : 1; // when 1, show revision markings on screen
+ UINT16 fRMPrint : 1; // when 1, print revision marks when document is printed
+ UINT16 fWriteReservation : 1;
+ UINT16 fLockRev : 1; // when 1, the current revision marking state is locked
+ UINT16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts
+ // compatability options
+ UINT16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent
+ UINT16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters
+ UINT16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break
+ UINT16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line
+ UINT16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers
+ UINT16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts
UINT16 copts_fConvMailMergeEsc : 1;
- UINT16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page
- UINT16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh
- UINT16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures
- UINT16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames
- UINT16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages
-
- INT16 dxaTab; // 720 twips default tab width
- UINT16 wSpare; //
- UINT16 dxaHotZ; // width of hyphenation hot zone measured in twips
- UINT16 cConsecHypLim; // number of lines allowed to have consecutive hyphens
- UINT16 wSpare2; // reserved
- INT32 dttmCreated; // DTTM date and time document was created
- INT32 dttmRevised; // DTTM date and time document was last revised
- INT32 dttmLastPrint; // DTTM date and time document was last printed
- INT16 nRevision; // number of times document has been revised since its creation
- INT32 tmEdited; // time document was last edited
- INT32 cWords; // count of words tallied by last Word Count execution
- INT32 cCh; // count of characters tallied by last Word Count execution
- INT16 cPg; // count of pages tallied by last Word Count execution
- INT32 cParas; // count of paragraphs tallied by last Word Count execution
- UINT16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page
- UINT16 nEdn : 14; // beginning endnote number
- UINT16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document
- // UINT16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman
- // 3 Upper case Letter, 4 Lower case Letter
+ UINT16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page
+ UINT16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh
+ UINT16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures
+ UINT16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames
+ UINT16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages
+
+ INT16 dxaTab; // 720 twips default tab width
+ UINT16 wSpare; //
+ UINT16 dxaHotZ; // width of hyphenation hot zone measured in twips
+ UINT16 cConsecHypLim; // number of lines allowed to have consecutive hyphens
+ UINT16 wSpare2; // reserved
+ INT32 dttmCreated; // DTTM date and time document was created
+ INT32 dttmRevised; // DTTM date and time document was last revised
+ INT32 dttmLastPrint; // DTTM date and time document was last printed
+ INT16 nRevision; // number of times document has been revised since its creation
+ INT32 tmEdited; // time document was last edited
+ INT32 cWords; // count of words tallied by last Word Count execution
+ INT32 cCh; // count of characters tallied by last Word Count execution
+ INT16 cPg; // count of pages tallied by last Word Count execution
+ INT32 cParas; // count of paragraphs tallied by last Word Count execution
+ UINT16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page
+ UINT16 nEdn : 14; // beginning endnote number
+ UINT16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document
+ // UINT16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman
+ // 3 Upper case Letter, 4 Lower case Letter
// ersetzt durch gleichlautendes Feld unten
- // UINT16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman
- // 3 Upper case Letter, 4 Lower case Letter
+ // UINT16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman
+ // 3 Upper case Letter, 4 Lower case Letter
// ersetzt durch gleichlautendes Feld unten
- UINT16 fPrintFormData : 1; // only print data inside of form fields
- UINT16 fSaveFormData : 1; // only save document data that is inside of a form field.
- UINT16 fShadeFormData : 1; // shade form fields
- UINT16 : 2; // reserved
- UINT16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count
- INT32 cLines; // count of lines tallied by last Word Count operation
- INT32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation
- INT32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation
- INT16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation
- INT32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation
- INT32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation
- INT32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1.
- UINT16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View
- UINT16 wScaleSaved : 9; //
- UINT16 zkSaved : 2;
-
- // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft!
+ UINT16 fPrintFormData : 1; // only print data inside of form fields
+ UINT16 fSaveFormData : 1; // only save document data that is inside of a form field.
+ UINT16 fShadeFormData : 1; // shade form fields
+ UINT16 : 2; // reserved
+ UINT16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count
+ INT32 cLines; // count of lines tallied by last Word Count operation
+ INT32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation
+ INT32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation
+ INT16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation
+ INT32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation
+ INT32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation
+ INT32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1.
+ UINT16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View
+ UINT16 wScaleSaved : 9; //
+ UINT16 zkSaved : 2;
+
+ // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft!
/*
bei nFib >= 103 gehts weiter:
*/
- UINT32 fNoTabForInd :1; // see above in compatability options
- UINT32 fNoSpaceRaiseLower :1; // see above
- UINT32 fSupressSpbfAfterPageBreak :1; // see above
- UINT32 fWrapTrailSpaces :1; // see above
- UINT32 fMapPrintTextColor :1; // see above
- UINT32 fNoColumnBalance :1; // see above
- UINT32 fConvMailMergeEsc :1; // see above
- UINT32 fSupressTopSpacing :1; // see above
- UINT32 fOrigWordTableRules :1; // see above
- UINT32 fTransparentMetafiles :1; // see above
- UINT32 fShowBreaksInFrames :1; // see above
- UINT32 fSwapBordersFacingPgs :1; // see above
- UINT32 :4; // reserved
- UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top
+ UINT32 fNoTabForInd :1; // see above in compatability options
+ UINT32 fNoSpaceRaiseLower :1; // see above
+ UINT32 fSupressSpbfAfterPageBreak :1; // see above
+ UINT32 fWrapTrailSpaces :1; // see above
+ UINT32 fMapPrintTextColor :1; // see above
+ UINT32 fNoColumnBalance :1; // see above
+ UINT32 fConvMailMergeEsc :1; // see above
+ UINT32 fSupressTopSpacing :1; // see above
+ UINT32 fOrigWordTableRules :1; // see above
+ UINT32 fTransparentMetafiles :1; // see above
+ UINT32 fShowBreaksInFrames :1; // see above
+ UINT32 fSwapBordersFacingPgs :1; // see above
+ UINT32 :4; // reserved
+ UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top
// of page like MacWord 5.x
- UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points
- UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer
- UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text
- UINT32 :1; // reserved
- UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x
- UINT32 :10;// reserved
+ UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points
+ UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer
+ UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text
+ UINT32 :1; // reserved
+ UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x
+ UINT32 :10;// reserved
- // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft!
+ // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft!
/*
bei nFib > 105 gehts weiter:
*/
- INT16 adt; // Autoformat Document Type:
+ INT16 adt; // Autoformat Document Type:
// 0 for normal. 1 for letter, and 2 for email.
- WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX
- WW8_DOGRID dogrid; // siehe WW8STRUC.HXX
- UINT16 :1; // reserved
- UINT16 lvl :4; // Which outline levels are showing in outline view
- UINT16 :4; // reserved
- UINT16 fHtmlDoc :1; // This file is based upon an HTML file
- UINT16 :1; // reserved
- UINT16 fSnapBorder :1; // Snap table and page borders to page border
- UINT16 fIncludeHeader :1; // Place header inside page border
- UINT16 fIncludeFooter :1; // Place footer inside page border
- UINT16 fForcePageSizePag :1; // Are we in online view
- UINT16 fMinFontSizePag :1; // Are we auto-promoting
+ WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX
+ WW8_DOGRID dogrid; // siehe WW8STRUC.HXX
+ UINT16 :1; // reserved
+ UINT16 lvl :4; // Which outline levels are showing in outline view
+ UINT16 :4; // reserved
+ UINT16 fHtmlDoc :1; // This file is based upon an HTML file
+ UINT16 :1; // reserved
+ UINT16 fSnapBorder :1; // Snap table and page borders to page border
+ UINT16 fIncludeHeader :1; // Place header inside page border
+ UINT16 fIncludeFooter :1; // Place footer inside page border
+ UINT16 fForcePageSizePag :1; // Are we in online view
+ UINT16 fMinFontSizePag :1; // Are we auto-promoting
// fonts to >= hpsZoonFontPag?
- UINT16 fHaveVersions :1; // versioning is turned on
- UINT16 fAutoVersion :1; // autoversioning is enabled
- UINT16 :14; // reserved
+ UINT16 fHaveVersions :1; // versioning is turned on
+ UINT16 fAutoVersion :1; // autoversioning is enabled
+ UINT16 :14; // reserved
// hier 12 Byte ueberspringen: ASUMI
INT32 cChWS;
INT32 cChWSFtnEdn;
@@ -1472,7 +1472,7 @@ class WW8PLCF_HdFt
public:
WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop );
-// ~WW8PLCF_HdFt() {}
+// ~WW8PLCF_HdFt() {}
BOOL GetTextPos( BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, long& rLen );
BOOL GetTextPosExact( short nIdx, WW8_CP& rStart, long& rLen );
void UpdateIndex( BYTE grpfIhdt );
diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx
index 92797f9c6c64..c8ab5bd8d1eb 100644
--- a/sw/source/filter/ww8/dump/ww8struc.hxx
+++ b/sw/source/filter/ww8/dump/ww8struc.hxx
@@ -2,7 +2,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
@@ -38,17 +38,17 @@
inline BYTE Get_Byte( BYTE *& p )
- { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; }
+ { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; }
inline short Get_Short( BYTE *& p )
- { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; }
+ { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; }
inline USHORT Get_UShort( BYTE *& p )
- { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; }
+ { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; }
inline long Get_Long( BYTE *& p )
- { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; }
+ { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; }
inline ULONG Get_ULong( BYTE *& p )
- { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; }
+ { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; }
inline void Set_UInt8( BYTE *& p, UINT8 n )
{ ByteToSVBT8( n, *(SVBT8*)p ); p+= 1; }
@@ -85,50 +85,50 @@ typedef INT32 WW8_CP;
struct WW8_STD
{
// Base part of STD:
- UINT16 sti : 12; // invariant style identifier
- UINT16 fScratch : 1; // spare field for any temporary use,
+ UINT16 sti : 12; // invariant style identifier
+ UINT16 fScratch : 1; // spare field for any temporary use,
// always reset back to zero!
- UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong
- UINT16 fHasUpe : 1; // UPEs have been generated
- UINT16 fMassCopy : 1; // std has been mass-copied; if unused at
+ UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong
+ UINT16 fHasUpe : 1; // UPEs have been generated
+ UINT16 fMassCopy : 1; // std has been mass-copied; if unused at
// save time, style should be deleted
- UINT16 sgc : 4; // style type code
- UINT16 istdBase : 12; // base style
- UINT16 cupx : 4; // # of UPXs (and UPEs)
- UINT16 istdNext : 12; // next style
- UINT16 bchUpe; // offset to end of upx's, start of upe's
+ UINT16 sgc : 4; // style type code
+ UINT16 istdBase : 12; // base style
+ UINT16 cupx : 4; // # of UPXs (and UPEs)
+ UINT16 istdNext : 12; // next style
+ UINT16 bchUpe; // offset to end of upx's, start of upe's
//-------- jetzt neu:
// ab Ver8 gibts zwei Felder mehr:
- UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */
- UINT16 fHidden : 1; /* hidden from UI? */
- UINT16 : 14; /* unused bits */
+ UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */
+ UINT16 fHidden : 1; /* hidden from UI? */
+ UINT16 : 14; /* unused bits */
// Variable length part of STD:
- // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle
- // char grupx[];
+ // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle
+ // char grupx[];
// the UPEs are not stored on the file; they are a cache of the based-on
// chain
- // char grupe[];
+ // char grupe[];
};
/*
Basis zum Einlesen UND zum Arbeiten (wird jeweils unter
schiedlich beerbt)
*/
-struct WW8_FFN_BASE // Font Descriptor
+struct WW8_FFN_BASE // Font Descriptor
{
// ab Ver6
- BYTE cbFfnM1; // 0x0 total length of FFN - 1.
+ BYTE cbFfnM1; // 0x0 total length of FFN - 1.
- BYTE prg: 2; // 0x1:03 pitch request
- BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font
- // 0x1:08 reserved
- BYTE ff : 3; // 0x1:70 font family id
- // 0x1:80 reserved
+ BYTE prg: 2; // 0x1:03 pitch request
+ BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font
+ // 0x1:08 reserved
+ BYTE ff : 3; // 0x1:70 font family id
+ // 0x1:80 reserved
- short wWeight; // 0x2 base weight of font
- BYTE chs; // 0x4 character set identifier
- BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font
+ short wWeight; // 0x2 base weight of font
+ BYTE chs; // 0x4 character set identifier
+ BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font
};
/*
@@ -148,35 +148,35 @@ struct WW8_FFN : public WW8_FFN_BASE
-struct WW8_BRCVer6 // alter Border Code
+struct WW8_BRCVer6 // alter Border Code
{
SVBT16 aBits1;
-// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of
+// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of
// a single line of border in units of 0.75 points
// Must be nonzero when brcType is nonzero.
// 6 == dotted, 7 == dashed.
-// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double
-// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC
-// UINT16 ico : 5; // 07C0 color code (see chp.ico)
-// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border.
+// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double
+// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC
+// UINT16 ico : 5; // 07C0 color code (see chp.ico)
+// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border.
// Must be 0 when BRC is a substructure of the TC. Stored in points for Windows.
};
struct WW8_BRC : public WW8_BRCVer6 // Border Code
{
SVBT16 aBits2;
-// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of
+// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of
// a single line of border in units of 0.75 points
// Must be nonzero when brcType is nonzero.
// 6 == dotted, 7 == dashed.
-// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double
-// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC
-// UINT16 ico : 5; // 07C0 color code (see chp.ico)
-// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border.
+// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double
+// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC
+// UINT16 ico : 5; // 07C0 color code (see chp.ico)
+// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border.
// Must be 0 when BRC is a substructure of the TC. Stored in points for Windows.
};
-typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code
+typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code
#define WW8_TOP 0
#define WW8_LEFT 1
@@ -188,7 +188,7 @@ typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code
-struct WW8_BordersSO // fuer StarOffice-Border Code
+struct WW8_BordersSO // fuer StarOffice-Border Code
{
USHORT Out;
USHORT In;
@@ -248,45 +248,45 @@ struct WW8_BordersSO // fuer StarOffice-Border Code
#define DEF_DOUBLE_LINE9_IN DEF_LINE_WIDTH_0
#define DEF_DOUBLE_LINE9_DIST DEF_LINE_WIDTH_2
-#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3
-#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0
-#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2
+#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3
+#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0
+#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2
*/
// Deklarationen gemaess BOXITEM.HXX
-#define WW8_DECL_LINETAB_ARRAY \
- static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \
- { \
-/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \
-/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \
-/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \
-/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \
-/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \
-/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\
-/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\
-/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\
-/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\
-/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\
-/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\
-/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\
-/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\
-/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\
-/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\
-/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \
+#define WW8_DECL_LINETAB_ARRAY \
+ static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \
+ { \
+/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \
+/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \
+/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \
+/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \
+/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \
+/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\
+/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\
+/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\
+/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\
+/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\
+/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\
+/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\
+/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\
+/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\
+/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\
+/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \
};
-#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste
+#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste
-struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY
+struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY
{
sal_Char A;
sal_Char B;
};
struct WW8_DOPTYPOGRAPHY
-{ /*
+{ /*
Document Typography Info (DOPTYPOGRAPHY)
These options are Far East only, and are accessible
through the Typography tab of the Tools/Options dialog.
@@ -302,21 +302,21 @@ struct WW8_DOPTYPOGRAPHY
- short fKerningPunct : 1; // true if we're kerning punctuation
- short iJustification : 2; // Kinsoku method of justification:
- // 0 = always expand
- // 1 = compress punctuation
- // 2 = compress punctuation and kana.
- short iLevelOfKinsoku: 2; // Level of Kinsoku:
- // 0 = Level 1
- // 1 = Level 2
- // 2 = Custom
- short f2on1 : 1; // 2-page-on-1 feature is turned on.
- short :10; // reserved
- short cchFollowingPunct; // length of rgxchFPunct
- short cchLeadingPunct; // length of rgxchLPunct
+ short fKerningPunct : 1; // true if we're kerning punctuation
+ short iJustification : 2; // Kinsoku method of justification:
+ // 0 = always expand
+ // 1 = compress punctuation
+ // 2 = compress punctuation and kana.
+ short iLevelOfKinsoku: 2; // Level of Kinsoku:
+ // 0 = Level 1
+ // 1 = Level 2
+ // 2 = Custom
+ short f2on1 : 1; // 2-page-on-1 feature is turned on.
+ short :10; // reserved
+ short cchFollowingPunct; // length of rgxchFPunct
+ short cchLeadingPunct; // length of rgxchLPunct
- WW8_XCHAR rgxchFPunct[101]; // array of characters that should
+ WW8_XCHAR rgxchFPunct[101]; // array of characters that should
// never appear at the start of a line
WW8_XCHAR rgxchLPunct[51]; // array of characters that should
// never appear at the end of a line
@@ -324,10 +324,10 @@ struct WW8_DOPTYPOGRAPHY
struct WW8_DOGRID
{
- short xaGrid; // x-coord of the upper left-hand corner of the grid
- short yaGrid; // y-coord of the upper left-hand corner of the grid
- short dxaGrid; // width of each grid square
- short dyaGrid; // height of each grid square
+ short xaGrid; // x-coord of the upper left-hand corner of the grid
+ short yaGrid; // y-coord of the upper left-hand corner of the grid
+ short dxaGrid; // width of each grid square
+ short dyaGrid; // height of each grid square
@@ -339,164 +339,164 @@ struct WW8_DOGRID
- short dyGridDisplay:7; // the number of grid squares (in the y direction)
+ short dyGridDisplay:7; // the number of grid squares (in the y direction)
// between each gridline drawn on the screen. 0 means
// don't display any gridlines in the y direction.
- short fTurnItOff :1; // suppress display of gridlines
- short dxGridDisplay:7; // the number of grid squares (in the x direction)
+ short fTurnItOff :1; // suppress display of gridlines
+ short dxGridDisplay:7; // the number of grid squares (in the x direction)
// between each gridline drawn on the screen. 0 means
// don't display any gridlines in the y direction.
- short fFollowMargins:1; // if true, the grid will start at the left and top
+ short fFollowMargins:1; // if true, the grid will start at the left and top
// margins and ignore xaGrid and yaGrid.
};
struct WW8_PIC
{
- INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file.
- UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion).
+ INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file.
+ UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion).
struct {
- INT16 mm; // 0x6 int
- INT16 xExt; // 0x8 int
- INT16 yExt; // 0xa int
- INT16 hMF; // 0xc int
+ INT16 mm; // 0x6 int
+ INT16 xExt; // 0x8 int
+ INT16 yExt; // 0xa int
+ INT16 hMF; // 0xc int
}MFP;
-// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
- BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin
- // and extents when metafile is stored -- ignored if 0
- INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
- INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
- UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units.
- UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units.
- INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips.
- INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips.
- INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips.
- INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
- INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In
- INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame
- INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap
- INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object
- INT16 fError : 1; // 0080 ==1, when picture is just an error message
- INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown
+// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
+ BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin
+ // and extents when metafile is stored -- ignored if 0
+ INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
+ INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
+ UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units.
+ UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units.
+ INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips.
+ INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips.
+ INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips.
+ INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
+ INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In
+ INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame
+ INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap
+ INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object
+ INT16 fError : 1; // 0080 ==1, when picture is just an error message
+ INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown
WW8_BRC rgbrc[4];
-// BRC brcTop; // 0x2e specification for border above picture
-// BRC brcLeft; // 0x30 specification for border to the left
-// BRC brcBottom; // 0x32 specification for border below picture
-// BRC brcRight; // 0x34 specification for border to the right
- INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin
- INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin
-// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
+// BRC brcTop; // 0x2e specification for border above picture
+// BRC brcLeft; // 0x30 specification for border to the left
+// BRC brcBottom; // 0x32 specification for border below picture
+// BRC brcRight; // 0x34 specification for border to the right
+ INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin
+ INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin
+// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
};
struct WW8_PIC_SHADOW
{
- SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file.
- SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion).
+ SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file.
+ SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion).
struct {
- SVBT16 mm; // 0x6 int
- SVBT16 xExt; // 0x8 int
- SVBT16 yExt; // 0xa int
- SVBT16 hMF; // 0xc int
+ SVBT16 mm; // 0x6 int
+ SVBT16 xExt; // 0x8 int
+ SVBT16 yExt; // 0xa int
+ SVBT16 hMF; // 0xc int
}MFP;
-// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
- SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin
- // and extents when metafile is stored -- ignored if 0
- SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
- SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
- SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units.
- SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units.
- SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips.
- SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips.
- SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips.
- SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
+// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP.
+ SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin
+ // and extents when metafile is stored -- ignored if 0
+ SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within.
+ SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within.
+ SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units.
+ SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units.
+ SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips.
+ SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips.
+ SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips.
+ SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips.
SVBT8 aBits1; //0x2c
SVBT8 aBits2;
WW8_BRC rgbrc[4];
-// BRC brcTop; // 0x2e specification for border above picture
-// BRC brcLeft; // 0x30 specification for border to the left
-// BRC brcBottom; // 0x32 specification for border below picture
-// BRC brcRight; // 0x34 specification for border to the right
- SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin
- SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin
-// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
+// BRC brcTop; // 0x2e specification for border above picture
+// BRC brcLeft; // 0x30 specification for border to the left
+// BRC brcBottom; // 0x32 specification for border below picture
+// BRC brcRight; // 0x34 specification for border to the right
+ SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin
+ SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin
+// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
};
struct WW8_TBD
{
SVBT8 aBits1;
-// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar
-// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader,
+// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar
+// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader,
// 2=hyphenated leader, 3=single line leader, 4=heavy line leader
-// * int :2 C0 reserved
+// * int :2 C0 reserved
};
-struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format)
+struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format)
{
- BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
- BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell.
- BOOL bVertical : 1;// set to 1 when cell has vertical text flow
- BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0.
- BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font)
- BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3).
- BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty.
- BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary):
- // 0 top
- // 1 center
- // 2 bottom
- UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !!
+ BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
+ BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell.
+ BOOL bVertical : 1;// set to 1 when cell has vertical text flow
+ BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0.
+ BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font)
+ BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3).
+ BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty.
+ BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary):
+ // 0 top
+ // 1 center
+ // 2 bottom
+ UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !!
- WW8_BRC rgbrc[4]; // border codes
+ WW8_BRC rgbrc[4]; // border codes
//notational convenience for referring to brcTop, brcLeft, etc fields.
-// BRC brcTop; // specification of the top border of a table cell
-// BRC brcLeft; // specification of left border of table row
-// BRC brcBottom; // specification of bottom border of table row
-// BRC brcRight; // specification of right border of table row.
+// BRC brcTop; // specification of the top border of a table cell
+// BRC brcLeft; // specification of left border of table row
+// BRC brcBottom; // specification of bottom border of table row
+// BRC brcRight; // specification of right border of table row.
};
// cbTC (count of bytes of a TC) is 18(decimal), 12(hex).
-struct WW8_TCellVer6 // wird aus der Datei gelesen
+struct WW8_TCellVer6 // wird aus der Datei gelesen
{
SVBT8 aBits1Ver6;
SVBT8 aBits2Ver6;
-// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
-// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell.
-// UINT16 fUnused : 14; // FFFC reserved
+// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged.
+// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell.
+// UINT16 fUnused : 14; // FFFC reserved
WW8_BRCVer6 rgbrcVer6[4];
// notational convenience for referring to brcTop, brcLeft, etc fields:
-// BRC brcTop; // specification of the top border of a table cell
-// BRC brcLeft; // specification of left border of table row
-// BRC brcBottom; // specification of bottom border of table row
-// BRC brcRight; // specification of right border of table row.
+// BRC brcTop; // specification of the top border of a table cell
+// BRC brcLeft; // specification of left border of table row
+// BRC brcBottom; // specification of bottom border of table row
+// BRC brcRight; // specification of right border of table row.
};
// cbTC (count of bytes of a TC) is 10(decimal), A(hex).
-struct WW8_TCellVer8 // wird aus der Datei gelesen
+struct WW8_TCellVer8 // wird aus der Datei gelesen
{
- SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell
- SVBT16 aUnused; // reserve
- WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell
+ SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell
+ SVBT16 aUnused; // reserve
+ WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell
};
// cbTC (count of bytes of a TC) is 20(decimal), 14(hex).
-struct WW8_SHD // struct SHD fehlt in der Beschreibung
+struct WW8_SHD // struct SHD fehlt in der Beschreibung
{
private:
UINT16 aBits;
-// UINT16 nFore : 5; // 0x001f ForegroundColor
-// UINT16 nBack : 5; // 0x03e0 BackgroundColor
-// UINT16 nStyle : 5; // 0x7c00 Percentage and Style
-// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style
+// UINT16 nFore : 5; // 0x001f ForegroundColor
+// UINT16 nBack : 5; // 0x03e0 BackgroundColor
+// UINT16 nStyle : 5; // 0x7c00 Percentage and Style
+// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style
public:
WW8_SHD(){ aBits = 0; }
- BYTE GetFore() const { return (BYTE)( aBits & 0x1f); }
- BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); }
- BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); }
+ BYTE GetFore() const { return (BYTE)( aBits & 0x1f); }
+ BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); }
+ BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); }
- UINT16 GetValue() const { return aBits; }
+ UINT16 GetValue() const { return aBits; }
void SetValue( UINT16 nVal ){ aBits = nVal; }
void SetWWValue( SVBT16 nVal ){ aBits = (UINT16)SVBT16ToShort( nVal ); }
@@ -511,135 +511,135 @@ public:
struct WW8_ANLV
{
- SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman
- // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal
- SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text
- SVBT8 cbTextAfter; // 2
+ SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman
+ // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal
+ SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text
+ SVBT8 cbTextAfter; // 2
SVBT8 aBits1;
-// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify
-// BYTE fPrev : 1; // 0x04 when ==1, include previous levels
-// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent
-// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold.
-// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic
-// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not.
-// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not
+// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify
+// BYTE fPrev : 1; // 0x04 when ==1, include previous levels
+// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent
+// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold.
+// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic
+// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not.
+// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not
SVBT8 aBits2;
-// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not.
-// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber.
-// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character
-// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1.
-// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1.
-// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1.
-// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1.
-// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1.
+// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not.
+// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber.
+// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character
+// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1.
+// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1.
+// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1.
+// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1.
+// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1.
SVBT8 aBits3;
-// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1.
-// BYTE ico : 5; // 0xF1 color of autonumber
- SVBT16 ftc; // 6 font code of autonumber
- SVBT16 hps; // 8 font half point size (or 0=auto)
- SVBT16 iStartAt; // 0x0a starting value (0 to 65535)
- SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent)
- SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph
+// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1.
+// BYTE ico : 5; // 0xF1 color of autonumber
+ SVBT16 ftc; // 6 font code of autonumber
+ SVBT16 hps; // 8 font half point size (or 0=auto)
+ SVBT16 iStartAt; // 0x0a starting value (0 to 65535)
+ SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent)
+ SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph
};
// *cbANLV (count of bytes of ANLV) is 16 (decimal), 10(hex).
struct WW8_ANLD
{
- WW8_ANLV eAnlv; // 0
- SVBT8 fNumber1; // 0x10 number only 1 item per table cell
- SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down)
- SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary
- SVBT8 fSpareX; // 0x13 unused( should be 0)
- BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber
+ WW8_ANLV eAnlv; // 0
+ SVBT8 fNumber1; // 0x10 number only 1 item per table cell
+ SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down)
+ SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary
+ SVBT8 fSpareX; // 0x13 unused( should be 0)
+ BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber
};
struct WW8_OLST
{
- WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels)
- SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break
- SVBT8 fSpareOlst2; // 0x91 reserved
- SVBT8 fSpareOlst3; // 0x92 reserved
- SVBT8 fSpareOlst4; // 0x93 reserved
- BYTE rgch[64]; // 0x94 array of 64 chars text before/after number
+ WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels)
+ SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break
+ SVBT8 fSpareOlst2; // 0x91 reserved
+ SVBT8 fSpareOlst3; // 0x92 reserved
+ SVBT8 fSpareOlst4; // 0x93 reserved
+ BYTE rgch[64]; // 0x94 array of 64 chars text before/after number
};
// cbOLST is 212(decimal), D4(hex).
struct WW8_FDOA
{
- SVBT32 fc; // 0 FC pointing to drawing object data
- SVBT16 ctxbx; // 4 count of textboxes in the drawing object
+ SVBT32 fc; // 0 FC pointing to drawing object data
+ SVBT16 ctxbx; // 4 count of textboxes in the drawing object
};
struct WW8_DO
{
- SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0
- SVBT16 cb; // 2 size (count of bytes) of the entire DO
- SVBT8 bx; // 4 x position relative to anchor CP
- SVBT8 by; // 5 y position relative to anchor CP
- SVBT16 dhgt; // 6 height of DO
+ SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0
+ SVBT16 cb; // 2 size (count of bytes) of the entire DO
+ SVBT8 bx; // 4 x position relative to anchor CP
+ SVBT8 by; // 5 y position relative to anchor CP
+ SVBT16 dhgt; // 6 height of DO
SVBT16 aBits1;
-// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked
-// BYTE[] rgdp; // 0xa variable length array of drawing primitives
+// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked
+// BYTE[] rgdp; // 0xa variable length array of drawing primitives
};
struct WW8_DPHEAD
{
- SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu
- // 0=start of grouping, 1=line, 2=textbox, 3=rectangle,
- // 4=arc, 5=elipse, 6=polyline, 7=callout textbox,
- // 8=end of grouping, 9=sample primitve holding default values
- SVBT16 cb; // 2 size (count of bytes) of this DP
- SVBT16 xa; // 4 These 2 points describe the rectangle
- SVBT16 ya; // 6 enclosing this DP relative to the origin of
- SVBT16 dxa; // 8 the DO
- SVBT16 dya; // 0xa
+ SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu
+ // 0=start of grouping, 1=line, 2=textbox, 3=rectangle,
+ // 4=arc, 5=elipse, 6=polyline, 7=callout textbox,
+ // 8=end of grouping, 9=sample primitve holding default values
+ SVBT16 cb; // 2 size (count of bytes) of this DP
+ SVBT16 xa; // 4 These 2 points describe the rectangle
+ SVBT16 ya; // 6 enclosing this DP relative to the origin of
+ SVBT16 dxa; // 8 the DO
+ SVBT16 dya; // 0xa
};
struct WW8_DP_LINETYPE
{
- SVBT32 lnpc; // LiNe Property Color -- RGB color value
- SVBT16 lnpw; // line property weight in twips
- SVBT16 lnps; // line property style : 0=Solid, 1=Dashed
+ SVBT32 lnpc; // LiNe Property Color -- RGB color value
+ SVBT16 lnpw; // line property weight in twips
+ SVBT16 lnps; // line property style : 0=Solid, 1=Dashed
// 2=Dotted, 3=Dash Dot, 4=Dash Dot Dot, 5=Hollow
};
-struct WW8_DP_SHADOW // Schattierung!
+struct WW8_DP_SHADOW // Schattierung!
{
- SVBT16 shdwpi; // Shadow Property Intensity
- SVBT16 xaOffset; // x offset of shadow
- SVBT16 yaOffset; // y offset of shadow
+ SVBT16 shdwpi; // Shadow Property Intensity
+ SVBT16 xaOffset; // x offset of shadow
+ SVBT16 yaOffset; // y offset of shadow
};
struct WW8_DP_FILL
{
- SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value
- SVBT32 dlpcBg; // Property Color BackGround -- RGB color value
- SVBT16 flpp; // FiLl Property Pattern REVIEW davebu
+ SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value
+ SVBT32 dlpcBg; // Property Color BackGround -- RGB color value
+ SVBT16 flpp; // FiLl Property Pattern REVIEW davebu
};
struct WW8_DP_LINEEND
{
SVBT16 aStartBits;
-// UINT16 eppsStart : 2; // Start EndPoint Property Style
+// UINT16 eppsStart : 2; // Start EndPoint Property Style
// 0=None, 1=Hollow, 2=Filled
-// UINT16 eppwStart : 2; // Start EndPoint Property Weight
-// UINT16 epplStart : 2; // Start EndPoint Property length
-// UINT16 dummyStart : 10; // Alignment
+// UINT16 eppwStart : 2; // Start EndPoint Property Weight
+// UINT16 epplStart : 2; // Start EndPoint Property length
+// UINT16 dummyStart : 10; // Alignment
SVBT16 aEndBits;
-// UINT16 eppsEnd : 2; // End EndPoint Property Style
-// UINT16 eppwEnd : 2; // End EndPoint Property Weight
-// UINT16 epplEnd : 2; // End EndPoint Property length
-// UINT16 dummyEnd : 10; // Alignment
+// UINT16 eppsEnd : 2; // End EndPoint Property Style
+// UINT16 eppwEnd : 2; // End EndPoint Property Weight
+// UINT16 epplEnd : 2; // End EndPoint Property length
+// UINT16 dummyEnd : 10; // Alignment
};
struct WW8_DP_LINE
{
-// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive
- SVBT16 xaStart; // starting point for line
- SVBT16 yaStart; //
- SVBT16 xaEnd; // ending point for line
+// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive
+ SVBT16 xaStart; // starting point for line
+ SVBT16 yaStart; //
+ SVBT16 xaEnd; // ending point for line
SVBT16 yaEnd;
WW8_DP_LINETYPE aLnt;
WW8_DP_LINEEND aEpp;
@@ -652,9 +652,9 @@ struct WW8_DP_TXTBOX
WW8_DP_FILL aFill;
WW8_DP_SHADOW aShd;
SVBT16 aBits1;
-// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners
-// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu
- SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu
+// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners
+// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu
+ SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu
};
struct WW8_DP_RECT
@@ -663,8 +663,8 @@ struct WW8_DP_RECT
WW8_DP_FILL aFill;
WW8_DP_SHADOW aShd;
SVBT16 aBits1;
-// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners
-// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu
+// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners
+// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu
};
struct WW8_DP_ARC
@@ -672,10 +672,10 @@ struct WW8_DP_ARC
WW8_DP_LINETYPE aLnt;
WW8_DP_FILL aFill;
WW8_DP_SHADOW aShd;
- SVBT8 fLeft; // 0x24 00ff REVIEW davebu
- SVBT8 fUp; // 0x24 ff00 REVIEW davebu
-// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu
-// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu
+ SVBT8 fLeft; // 0x24 00ff REVIEW davebu
+ SVBT8 fUp; // 0x24 ff00 REVIEW davebu
+// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu
+// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu
};
struct WW8_DP_ELIPSE
@@ -692,25 +692,25 @@ struct WW8_DP_POLYLINE
WW8_DP_LINEEND aEpp;
WW8_DP_SHADOW aShd;
SVBT16 aBits1;
-// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon
-// UINT16 cpt : 15; // 0x28 00fe count of points
-// short xaFirst; // 0x2a These are the endpoints of the first line.
-// short yaFirst; // 0x2c
-// short xaEnd; // 0x2e
-// short yaEnd; // 0x30
-// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points
+// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon
+// UINT16 cpt : 15; // 0x28 00fe count of points
+// short xaFirst; // 0x2a These are the endpoints of the first line.
+// short yaFirst; // 0x2c
+// short xaEnd; // 0x2e
+// short yaEnd; // 0x30
+// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points
};
struct WW8_DP_CALLOUT_TXTBOX
{
- SVBT16 flags; // 0x0c REVIEW davebu flags
- SVBT16 dzaOffset; // 0x0e REVIEW davebu
- SVBT16 dzaDescent; // 0x10 REVIEW davebu
- SVBT16 dzaLength; // 0x12 REVIEW davebu
- WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox
- WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox
- WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline
- WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline
+ SVBT16 flags; // 0x0c REVIEW davebu flags
+ SVBT16 dzaOffset; // 0x0e REVIEW davebu
+ SVBT16 dzaDescent; // 0x10 REVIEW davebu
+ SVBT16 dzaLength; // 0x12 REVIEW davebu
+ WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox
+ WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox
+ WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline
+ WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline
};
struct WW8_DP_DEFAULTS
@@ -719,29 +719,29 @@ struct WW8_DP_DEFAULTS
WW8_DP_FILL aFill;
WW8_DP_LINEEND aEpp;
WW8_DP_SHADOW aShd;
- SVBT16 dzaOffset; // 0x2a REVIEW davebu
- SVBT16 dzaDescent; // 0x2c REVIEW davebu
- SVBT16 dzaLength; // 0x2e REVIEW davebu
+ SVBT16 dzaOffset; // 0x2a REVIEW davebu
+ SVBT16 dzaDescent; // 0x2c REVIEW davebu
+ SVBT16 dzaLength; // 0x2e REVIEW davebu
SVBT16 aBits3;
-// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners
-// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu
- SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu
+// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners
+// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu
+ SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu
};
struct WW8_PCD
{
SVBT8 aBits1;
-// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks.
-// BYTE fPaphNil : 1; // used internally by Word
-// BYTE fCopied : 1; // used internally by Word
-// * int :5
- SVBT8 aBits2; // fn int:8, used internally by Word
- SVBT32 fc; // file offset of beginning of piece. The size of the
+// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks.
+// BYTE fPaphNil : 1; // used internally by Word
+// BYTE fCopied : 1; // used internally by Word
+// * int :5
+ SVBT8 aBits2; // fn int:8, used internally by Word
+ SVBT32 fc; // file offset of beginning of piece. The size of the
// ithpiece can be determined by subtracting rgcp[i] of
// the containing plcfpcd from its rgcp[i+1].
- SVBT16 prm; // PRM contains either a single sprm or else an index number
+ SVBT16 prm; // PRM contains either a single sprm or else an index number
// of the grpprl which contains the sprms that modify the
// properties of the piece.
};
@@ -749,21 +749,21 @@ struct WW8_PCD
struct WW8_PHE_Base
{
BYTE aBits1; //
-// 0 0 fSpare int :1 0001 reserved
-// fUnk int :1 0002 phe entry is invalid
-// when == 1
-// fDiffLines int :1 0004 when 1, total
-// height of paragraph is known but lines in
-// paragraph have different heights.
-// * int :5 00F8 reserved
- BYTE nlMac; // when fDiffLines is 0 is number of lines in
-// // paragraph
- SVBT16 dxaCol; // width of lines in paragraph
+// 0 0 fSpare int :1 0001 reserved
+// fUnk int :1 0002 phe entry is invalid
+// when == 1
+// fDiffLines int :1 0004 when 1, total
+// height of paragraph is known but lines in
+// paragraph have different heights.
+// * int :5 00F8 reserved
+ BYTE nlMac; // when fDiffLines is 0 is number of lines in
+// // paragraph
+ SVBT16 dxaCol; // width of lines in paragraph
SVBT16 dyl;
-// 4 4 dylLine int when fDiffLines is 0,
-// is height of every line in paragraph.in pixels
-// 4 4 dylHeight uns when fDiffLines is 1,
-// is the total height in pixels of the paragraph
+// 4 4 dylLine int when fDiffLines is 0,
+// is height of every line in paragraph.in pixels
+// 4 4 dylHeight uns when fDiffLines is 1,
+// is the total height in pixels of the paragraph
};
/*
@@ -771,38 +771,38 @@ eigentlich muessten wir das jetzt in etwa *so* praezisieren:
struct WW8_PHE_Ver6 : public WW8_PHE_Base
{
- // 6 Bytes gross
+ // 6 Bytes gross
};
struct WW8_PHE_Ver6 : public WW8_PHE_Base
{
SVBT16 a;
SVBT16 b;
- SVBT16 c; // 12 Byte gross
+ SVBT16 c; // 12 Byte gross
};
*/
// AnnoTation Refernce Descriptor (ATRD)
-struct WW8_ATRD // fuer die 8-Version
+struct WW8_ATRD // fuer die 8-Version
{
- SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials
+ SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials
// of annotation author
- SVBT16 ibst; // index into GrpXstAtnOwners
- SVBT16 ak; // not used
- SVBT16 grfbmc; // not used
- SVBT32 ITagBkmk; // when not -1, this tag identifies the
+ SVBT16 ibst; // index into GrpXstAtnOwners
+ SVBT16 ak; // not used
+ SVBT16 grfbmc; // not used
+ SVBT32 ITagBkmk; // when not -1, this tag identifies the
// annotation bookmark that locates the
// range of CPs in the main document which
// this annotation references.
};
-struct WW67_ATRD // fuer die 6/7-Version
+struct WW67_ATRD // fuer die 6/7-Version
{
- sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials
+ sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials
// of annotation author
- SVBT16 ibst; // index into GrpXstAtnOwners
- SVBT16 ak; // not used
- SVBT16 grfbmc; // not used
- SVBT32 ITagBkmk; // when not -1, this tag identifies the
+ SVBT16 ibst; // index into GrpXstAtnOwners
+ SVBT16 ak; // not used
+ SVBT16 grfbmc; // not used
+ SVBT32 ITagBkmk; // when not -1, this tag identifies the
// annotation bookmark that locates the
// range of CPs in the main document which
// this annotation references.
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 8df80add18f3..fa99b3a2811a 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index a491109c0b7d..b70f816a0949 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -2,7 +2,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
@@ -32,11 +32,11 @@
namespace ww
{
- enum eField
+ enum eField
{
eNONE = 0,
eUNKNOWN = 1,
- ePOSSIBLEBOOKMARK = 2,
+ ePOSSIBLEBOOKMARK = 2,
eREF = 3,
eXE = 4,
eFOOTREF = 5,
@@ -131,9 +131,9 @@ namespace ww
eGREETINGLINE = 94,
eSHAPE = 95
};
-
+
/** Find the English Field Name from a winword index
-
+
See OpenOffice.org issue 12831
(http://www.openoffice.org/issues/show_bug.cgi?id=12831) and MS
Knowledge Base article 268717
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index e089a15e1436..ff71be2369e5 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx
index 10fd8bedae45..8506fff9d07a 100644
--- a/sw/source/filter/ww8/needed_cast.hxx
+++ b/sw/source/filter/ww8/needed_cast.hxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@ namespace ww
template<typename Ret, typename Param> Ret needed_cast(Param in)
{
/*
- Massage a single argument and a ret value into two arguments to allow
+ Massage a single argument and a ret value into two arguments to allow
a determination if the dest type is the same as the sourct type
*/
return checking_cast(in, Ret());
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 0776a5db231d..ba53111c3e83 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2672,7 +2672,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
{
if( m_rExport.bOutPageDescs )
{
-
+
OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" );
if ( !m_rExport.GetCurItemSet() )
return;
@@ -3201,15 +3201,15 @@ static OString WriteHex(OString sString)
}
void lcl_AppendSP( OStringBuffer& rBuffer,
- const char cName[],
- const ::rtl::OUString& rValue,
+ const char cName[],
+ const ::rtl::OUString& rValue,
const RtfExport& rExport )
{
rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{"
rBuffer.append( OOO_STRING_SVTOOLS_RTF_SN " " );//" \sn "
- rBuffer.append( cName ); //"PropName"
+ rBuffer.append( cName ); //"PropName"
rBuffer.append( "}{" OOO_STRING_SVTOOLS_RTF_SV " " );
-// "}{ \sv "
+// "}{ \sv "
rBuffer.append( rExport.OutString( rValue, rExport.eCurrentEncoding ) );
rBuffer.append( "}}" );
}
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index ca837d9d97e4..d9696139fa6e 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -363,7 +363,7 @@ void RtfExport::DoFormText(const SwInputField* pFld )
if( sStatus.getLength() )
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNSTAT );
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT "0" );
-
+
if( sName.getLength() )
m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" );
if( sHelp.getLength() )
@@ -548,7 +548,7 @@ void RtfExport::ExportDocument_Impl()
if( pDoc->GetPageDescCnt() )
{
//JP 06.04.99: Bug 64361 - Seeking the first SwFmtPageDesc. If
- // no set, the default is valid
+ // no set, the default is valid
const SwFmtPageDesc* pSttPgDsc = 0;
{
const SwNode& rSttNd = *pDoc->GetNodes()[
@@ -622,7 +622,7 @@ void RtfExport::ExportDocument_Impl()
// All sections are unlocked by default
Strm() << OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED;
OutLong(1);
- OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers
+ OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers
// following title page are correctly added - i13107
if( pSttPgDsc )
{
@@ -647,24 +647,24 @@ void RtfExport::ExportDocument_Impl()
switch( rFtnInfo.eNum )
{
- case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break;
- case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break;
+ case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break;
+ case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break;
// case FTNNUM_CHAPTER:
- default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break;
+ default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break;
}
Strm() << pOut;
switch( rFtnInfo.aFmt.GetNumberingType() )
{
case SVX_NUM_CHARS_LOWER_LETTER:
- case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break;
+ case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break;
case SVX_NUM_CHARS_UPPER_LETTER:
- case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break;
- case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break;
- case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break;
- case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break;
+ case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break;
+ case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break;
+ case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break;
+ case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break;
// case SVX_NUM_ARABIC:
- default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break;
+ default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break;
}
Strm() << pOut;
@@ -678,14 +678,14 @@ void RtfExport::ExportDocument_Impl()
switch( rEndNoteInfo.aFmt.GetNumberingType() )
{
case SVX_NUM_CHARS_LOWER_LETTER:
- case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break;
+ case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break;
case SVX_NUM_CHARS_UPPER_LETTER:
- case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break;
- case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break;
- case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break;
- case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break;
+ case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break;
+ case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break;
+ case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break;
+ case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break;
// case SVX_NUM_ARABIC:
- default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break;
+ default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break;
}
Strm() << pOut;
}
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index cdb75421951d..f2a97c8b5e12 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -475,7 +475,7 @@ sal_Int32 RtfSdrExport::StartShape()
for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++)
lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second );
-
+
lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding));
lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 6147964e4d2f..93e62b9c3dff 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx
index 3d1a3c2bceea..d2a998cf7e14 100644
--- a/sw/source/filter/ww8/staticassert.hxx
+++ b/sw/source/filter/ww8/staticassert.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 517c412117a8..928c1408e144 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@ namespace
const sal_Char **GetStiNames() throw()
{
- static const sal_Char *stiName[] =
+ static const sal_Char *stiName[] =
{
"Normal",
"Heading 1",
@@ -201,9 +201,9 @@ namespace ww
return stiUser;
else
{
- static sti aMapping[] =
+ static sti aMapping[] =
{
- stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6,
+ stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6,
stiToc5, stiToc4, stiToc3, stiToc2, stiToc1, stiIndex7,
stiIndex6, stiIndex5, stiIndex4, stiIndex3, stiIndex2,
stiIndex1, stiLnn, stiIndexHeading, stiFooter, stiHeader,
diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx
index 78b27197676f..fe3141900e75 100644
--- a/sw/source/filter/ww8/tracer.cxx
+++ b/sw/source/filter/ww8/tracer.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx
index df6d7c497108..1d885866a923 100644
--- a/sw/source/filter/ww8/tracer.hxx
+++ b/sw/source/filter/ww8/tracer.hxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ namespace sw
Tracer(const SfxMedium &rMedium);
MSFilterTracer *GetTrace() const { return mpTrace; }
void EnterEnvironment(Environment eContext);
- void EnterEnvironment(Environment eContext,
+ void EnterEnvironment(Environment eContext,
const rtl::OUString &rDetails);
void Log(Problem eProblem);
void LeaveEnvironment(Environment eContext);
diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx
index 652baec7bfc1..af9df2069201 100644
--- a/sw/source/filter/ww8/types.hxx
+++ b/sw/source/filter/ww8/types.hxx
@@ -2,7 +2,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
@@ -45,14 +45,14 @@ namespace ww
inline bool IsSevenMinus(WordVersion eVer) { return eVer <= eWW7; }
inline bool IsEightPlus(WordVersion eVer) { return eVer >= eWW8; }
- /** For custom wrapping
+ /** For custom wrapping
When you edit the wrap points of a contour in word, word uses a relative
scale of 0 to 21600 where 21600 is apparently 100% of the graphic width
*/
const int nWrap100Percent = 21600;
}
-
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/typessw.hxx b/sw/source/filter/ww8/typessw.hxx
index 7d12833d49fe..0c35a3b00377 100644
--- a/sw/source/filter/ww8/typessw.hxx
+++ b/sw/source/filter/ww8/typessw.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 8b7dbb8bc669..31c1d6be25ed 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -2,7 +2,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
@@ -32,7 +32,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <doc.hxx>
-# include "writerhelper.hxx"
+# include "writerhelper.hxx"
# include <msfilter.hxx>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 0e5edf1bb182..3cdd0c4d69e1 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index d37b2f07ac77..89f7d4b51504 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -2,7 +2,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
@@ -57,7 +57,7 @@
# include <fmtfsize.hxx> //SwFmtFrmSize
# include <swrect.hxx> //SwRect
# include <fmthdft.hxx> //SwFmtHeader/SwFmtFooter
-# include <frmatr.hxx> //GetLRSpace...
+# include <frmatr.hxx> //GetLRSpace...
# include <ndtxt.hxx> //SwTxtNode
# include <breakit.hxx> //pBreakIt
@@ -997,7 +997,7 @@ namespace sw
}
++nI;
}
-
+
if (bForceNatNum)
bForceJapanese = true;
diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx
index e52d29940d83..b267ba302b48 100644
--- a/sw/source/filter/ww8/writerwordglue.hxx
+++ b/sw/source/filter/ww8/writerwordglue.hxx
@@ -2,7 +2,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
@@ -141,7 +141,7 @@ namespace sw
bool HasHeader() const { return mbHasHeader; }
bool HasFooter() const { return mbHasFooter; }
- /** Is the top of the page the same in both objects
+ /** Is the top of the page the same in both objects
Ignoring the difference in header and footers, will the main
document text have the same top/bottom bounds in word between
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2f7220460104..2bc80af8dcd0 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -173,8 +173,8 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
// --> OD 2010-05-14 #160026#
// property "Help" does not exist and due to the no-existence an exception is thrown.
// uno::Any aTmp = xPropSet->getPropertyValue(C2U("Help"));
- try
- {
+ try
+ {
uno::Any aTmp = xPropSet->getPropertyValue(C2U("HelpText"));
// <--
const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 01bd84f1e6e1..faf6002853a6 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -602,9 +602,10 @@ const SfxPoolItem* SwWW8AttrIter::HasTextItem( USHORT nWhich ) const
{
const SfxPoolItem* pRet = 0;
const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
- xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
- if (pTxtAttrs)
+
+ if (pTxtAttrs && m_rExport.m_aCurrentCharPropStarts.size())
{
+ xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
for (USHORT i = 0; i < pTxtAttrs->Count(); ++i)
{
const SwTxtAttr* pHt = (*pTxtAttrs)[i];
@@ -1821,7 +1822,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
if ( ch == CH_TXT_ATR_FIELDSTART )
{
- SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos + 1 ) );
+ SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
@@ -1873,9 +1874,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
else if ( ch == CH_TXT_ATR_FIELDEND )
{
- SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
+ SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos - 1 ) );
::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
- OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
+ OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDEND??" );
ww::eField eFieldId = lcl_getFieldId( pFieldmark );
if ( pFieldmark->GetFieldname().equalsAscii( ODF_UNHANDLED ) )
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 8abe5c4200e9..b430366e0477 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -2,7 +2,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
@@ -234,7 +234,7 @@ void WW8AttributeOutput::NumberingLevel( BYTE /*nLevel*/,
default: nAlign = 0; break;
}
*m_rWW8Export.pTableStrm << nAlign;
-
+
// Write the rgbxchNums[9], positions of placeholders for paragraph
// numbers in the text
m_rWW8Export.pTableStrm->Write( pNumLvlPos, WW8ListManager::nMaxLevel );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 05e535cff636..f8b34bb3174f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2,7 +2,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
@@ -268,19 +268,19 @@ static void WriteDop( WW8Export& rWrt )
xDocProps = xDPS->getDocumentProperties();
DBG_ASSERT(xDocProps.is(), "DocumentProperties is null");
- rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
+ rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
}
if ((rWrt.pSepx && rWrt.pSepx->DocumentIsProtected()) ||
rDop.lKeyProtDoc != 0)
- {
+ {
rDop.fProtEnabled = 1;
}
- else
+ else
{
rDop.fProtEnabled = 0;
}
-
+
if (!xDocProps.is()) {
rDop.dttmCreated = rDop.dttmRevised = rDop.dttmLastPrint = 0x45FBAC69;
} else {
@@ -1624,7 +1624,7 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAd
ww::bytes aBytes;
SwWW8Writer::InsUInt16(aBytes, rStr.Len());
SwWW8Writer::InsAsString16(aBytes, rStr);
- if (bAddZero)
+ if (bAddZero)
SwWW8Writer::InsUInt16(aBytes, 0);
rStrm.Write(&aBytes[0], aBytes.size());
}
@@ -1712,7 +1712,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt,
if( nStt || nLen != rStr.Len() )
{
String sOut( rStr.Copy( nStt, nLen ) );
-
+
#ifdef DEBUG
::std::clog << ::rtl::OUStringToOString(sOut, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl;
#endif
@@ -1722,7 +1722,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt,
else
SwWW8Writer::WriteString8(Strm(), sOut, false, eChrSet);
}
- else
+ else
{
#ifdef DEBUG
::std::clog << ::rtl::OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl;
@@ -1734,9 +1734,9 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt,
SwWW8Writer::WriteString8(Strm(), rStr, false, eChrSet);
}
}
-
+
#ifdef DEBUG
- ::std::clog << "</OutSwString>" << ::std::endl;
+ ::std::clog << "</OutSwString>" << ::std::endl;
#endif
}
@@ -1746,7 +1746,7 @@ void WW8Export::WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo
WriteChar('\007');
else
WriteChar( '\015' );
-
+
pPiece->SetParaBreak();
}
@@ -1878,12 +1878,12 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT
if ( nDepth > 0 )
{
- /* Cell */
+ /* Cell */
m_rWW8Export.InsUInt16( NS_sprm::LN_PFInTable );
m_rWW8Export.pO->Insert( (BYTE)0x1, m_rWW8Export.pO->Count() );
m_rWW8Export.InsUInt16( NS_sprm::LN_PTableDepth );
m_rWW8Export.InsUInt32( nDepth );
-
+
if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() )
{
m_rWW8Export.InsUInt16( NS_sprm::LN_PCell );
@@ -1965,15 +1965,15 @@ static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan)
void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
- const SwTableLine * pTabLine = pTabBox->GetUpper();
+ const SwTableLine * pTabLine = pTabBox->GetUpper();
const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes();
-
+
sal_uInt8 nBoxes = rTblBoxes.Count();
for ( sal_uInt8 n = 0; n < nBoxes; n++ )
{
const SwTableBox * pTabBox1 = rTblBoxes[n];
const SwFrmFmt * pFrmFmt = pTabBox1->GetFrmFmt();
-
+
if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrmFmt ) )
{
m_rWW8Export.InsUInt16( NS_sprm::LN_TTextFlow );
@@ -1987,7 +1987,7 @@ void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
- const SwTableLine * pTabLine = pTabBox->GetUpper();
+ const SwTableLine * pTabLine = pTabBox->GetUpper();
const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
/*
@@ -1995,7 +1995,7 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
feature equivalent to this, Word stores 1 for fCantSplit if the row
cannot be split, we set true if we can split it. An example is #i4569#
*/
-
+
const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit();
BYTE nCantSplit = (!rSplittable.GetValue()) ? 1 : 0;
if ( m_rWW8Export.bWrtWW8 )
@@ -2015,7 +2015,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable
{
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
-
+
if ( m_rWW8Export.bWrtWW8 )
{
if ( m_rWW8Export.TrueFrameDirection(*pFrmFmt) == FRMDIR_HORI_RIGHT_TOP )
@@ -2029,7 +2029,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable
void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
- const SwTableLine * pTabLine = pTabBox->GetUpper();
+ const SwTableLine * pTabLine = pTabBox->GetUpper();
const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
// Zeilenhoehe ausgeben sprmTDyaRowHeight
@@ -2051,21 +2051,21 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab
m_rWW8Export.pO->Insert( 189, m_rWW8Export.pO->Count() );
m_rWW8Export.InsUInt16( (USHORT)nHeight );
}
-
+
}
void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
-
+
const SwFrmFmt *pFmt = pTable->GetFrmFmt();
OSL_ENSURE(pFmt,"Impossible");
if (!pFmt)
return;
-
+
const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
-
+
if (
(text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() ||
text::RelOrientation::FRAME == rHori.GetRelationOrient())
@@ -2095,11 +2095,11 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
{
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
const SwTableFmt * pTableFmt = dynamic_cast<const SwTableFmt *>(pTable->GetRegisteredIn());
-
+
if (pTableFmt != NULL)
{
const SvxULSpaceItem & rUL = pTableFmt->GetULSpace();
-
+
if (rUL.GetUpper() > 0)
{
sal_uInt8 nPadding = 2;
@@ -2123,13 +2123,13 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaFromTextBottom);
m_rWW8Export.InsUInt16(rUL.GetLower());
}
- }
+ }
}
void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
-
+
if ( pTable->GetRowsToRepeat() > pTableTextNodeInfoInner->getRow() )
{
if( m_rWW8Export.bWrtWW8 )
@@ -2139,11 +2139,11 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
m_rWW8Export.pO->Insert( 1, m_rWW8Export.pO->Count() );
}
- ww8::TableBoxVectorPtr pTableBoxes =
+ ww8::TableBoxVectorPtr pTableBoxes =
pTableTextNodeInfoInner->getTableBoxesOfRow();
// number of cell written
sal_uInt32 nBoxes = pTableBoxes->size();
-
+
// sprm header
m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable );
sal_uInt16 nSprmSize = 2 + (nBoxes + 1) * 2 + nBoxes * 20;
@@ -2152,7 +2152,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
// number of boxes
m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes), m_rWW8Export.pO->Count() );
- /* cellxs */
+ /* cellxs */
/*
ALWAYS relative when text::HoriOrientation::NONE (nPageSize + ( nPageSize / 10 )) < nTblSz,
in that case the cell width's and table width's are not real. The table
@@ -2167,9 +2167,9 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
-
+
sal_uInt16 nTblOffset = 0;
-
+
if (
(text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() ||
text::RelOrientation::FRAME == rHori.GetRelationOrient())
@@ -2192,61 +2192,61 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
break;
}
}
-
+
m_rWW8Export.InsUInt16( nTblOffset );
-
+
ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner );
- for ( ww8::GridCols::const_iterator it = pGridCols->begin(),
+ for ( ww8::GridCols::const_iterator it = pGridCols->begin(),
end = pGridCols->end(); it != end; ++it )
{
m_rWW8Export.InsUInt16( static_cast<USHORT>( *it ) + nTblOffset );
}
-
+
/* TCs */
ww8::RowSpansPtr pRowSpans = pTableTextNodeInfoInner->getRowSpansOfRow();
ww8::RowSpans::const_iterator aItRowSpans = pRowSpans->begin();
ww8::TableBoxVector::const_iterator aIt;
ww8::TableBoxVector::const_iterator aItEnd = pTableBoxes->end();
-
+
#ifdef DEBUG
size_t nRowSpans = pRowSpans->size();
size_t nTableBoxes = pTableBoxes->size();
(void) nRowSpans;
(void) nTableBoxes;
#endif
-
+
for( aIt = pTableBoxes->begin(); aIt != aItEnd; ++aIt, ++aItRowSpans)
{
#ifdef DEBUG
sal_uInt16 npOCount = m_rWW8Export.pO->Count();
#endif
-
+
const SwTableBox * pTabBox1 = *aIt;
const SwFrmFmt * pBoxFmt = NULL;
if (pTabBox1 != NULL)
pBoxFmt = pTabBox1->GetFrmFmt();
-
+
if ( m_rWW8Export.bWrtWW8 )
{
- sal_uInt16 nFlags =
+ sal_uInt16 nFlags =
lcl_TCFlags(pTabBox1, *aItRowSpans);
m_rWW8Export.InsUInt16( nFlags );
}
-
+
static BYTE aNullBytes[] = { 0x0, 0x0 };
-
+
m_rWW8Export.pO->Insert( aNullBytes, 2, m_rWW8Export.pO->Count() ); // dummy
if (pBoxFmt != NULL)
{
const SvxBoxItem & rBoxItem = pBoxFmt->GetBox();
-
+
m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte
}
else
m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte
-
+
#ifdef DEBUG
- ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>"
+ ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>"
<< ::std::endl;
#endif
}
@@ -2256,7 +2256,7 @@ ww8::GridColsPtr AttributeOutputBase::GetGridCols( ww8::WW8TableNodeInfoInner::P
{
return pTableTextNodeInfoInner->getGridColsOfRow(*this);
}
-
+
void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner, sal_uInt32& rPageSize, bool& rRelBoxSize )
{
sal_uInt32 nPageSize = 0;
@@ -2310,9 +2310,9 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
const SvxLRSpaceItem &rLR = pFmt->GetLRSpace();
nPageSize -= (rLR.GetLeft() + rLR.GetRight());
}
-
+
}
-
+
OSL_ENSURE(nWidthPercent, "Impossible");
if (nWidthPercent)
{
@@ -2337,7 +2337,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
BOX_LINE_TOP, BOX_LINE_LEFT,
BOX_LINE_BOTTOM, BOX_LINE_RIGHT
};
-
+
for ( int i = 0; i < 4; ++i )
{
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, 0xD634 );
@@ -2346,7 +2346,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
m_rWW8Export.pO->Insert( BYTE(1), m_rWW8Export.pO->Count() );
m_rWW8Export.pO->Insert( BYTE(1 << i), m_rWW8Export.pO->Count() );
m_rWW8Export.pO->Insert( BYTE(3), m_rWW8Export.pO->Count() );
-
+
SwWW8Writer::InsUInt16( *m_rWW8Export.pO,
pFrmFmt->GetBox().GetDistance( aBorders[i] ) );
}
@@ -2364,17 +2364,17 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
else
m_rWW8Export.pO->Insert( (BYTE)191, m_rWW8Export.pO->Count() );
m_rWW8Export.pO->Insert( (BYTE)(nBoxes * 2), m_rWW8Export.pO->Count() ); // Len
-
+
for ( sal_uInt8 n = 0; n < nBoxes; n++ )
{
const SwTableBox * pBox1 = rTabBoxes[n];
const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt();
const SfxPoolItem * pI = NULL;
Color aColor;
-
+
if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) )
{
- aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
+ aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
}
else
aColor = COL_AUTO;
@@ -2390,32 +2390,32 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
sal_uInt8 nBoxes0 = rTabBoxes.Count();
if (nBoxes0 > 21)
nBoxes0 = 21;
-
+
for (sal_uInt32 m = 0; m < 2; m++)
{
m_rWW8Export.InsUInt16( aSprmIds[m] );
- m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10),
+ m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10),
m_rWW8Export.pO->Count() );
-
+
for ( sal_uInt8 n = 0; n < nBoxes0; n++ )
{
const SwTableBox * pBox1 = rTabBoxes[n];
const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt();
const SfxPoolItem * pI = NULL;
Color aColor;
-
- if ( SFX_ITEM_ON ==
+
+ if ( SFX_ITEM_ON ==
pFrmFmt->GetAttrSet().
GetItemState( RES_BACKGROUND, false, &pI ) )
{
- aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
+ aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor();
}
else
aColor = COL_AUTO;
-
+
WW8SHDLong aSHD;
aSHD.setCvFore( 0xFF000000 );
-
+
sal_uInt32 nBgColor = aColor.GetColor();
if ( nBgColor == COL_AUTO )
aSHD.setCvBack( 0xFF000000 );
@@ -2423,8 +2423,8 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
aSHD.setCvBack( wwUtility::RGBToBGR( nBgColor ) );
aSHD.Write( m_rWW8Export );
- }
- }
+ }
+ }
}
}
@@ -2522,16 +2522,16 @@ void MSWordExportBase::WriteText()
SwNode * pCurrentNode = &pCurPam->GetPoint()->nNode.GetNode();
const SwNode * pNextNode = mpTableInfo->getNextNode(pCurrentNode);
-
+
if (pNextNode != NULL)
pCurPam->GetPoint()->nNode = SwNodeIndex(*pNextNode);
else
pCurPam->GetPoint()->nNode++;
-
+
ULONG nPos = pCurPam->GetPoint()->nNode.GetIndex();
::SetProgressState( nPos, pCurPam->GetDoc()->GetDocShell() );
}
-
+
#ifdef DEBUG
::std::clog << "</WriteText>" << ::std::endl;
#endif
@@ -2720,13 +2720,13 @@ void WW8Export::WriteFkpPlcUsw()
// Reclaim stored FIB data from document.
::ww8::WW8FibData * pFibData = dynamic_cast<ww8::WW8FibData *>
(pDoc->getExternalData(::sw::FIB).get());
-
+
if ( pFibData )
// <--
{
- pFib->fReadOnlyRecommended =
+ pFib->fReadOnlyRecommended =
pFibData->getReadOnlyRecommended() ? 1 : 0;
- pFib->fWriteReservation =
+ pFib->fWriteReservation =
pFibData->getWriteReservation() ? 1 : 0;
}
@@ -2868,7 +2868,7 @@ namespace
rCtx.Encode(in, nBS, in, nBS);
rOut.Write(in, nBS);
}
- }
+ }
}
void MSWordExportBase::ExportDocument( bool bWriteAll )
@@ -3073,12 +3073,12 @@ void WW8Export::ExportDocument_Impl()
StoreDoc1();
if ( bEncrypt )
- {
+ {
// Generate random number with a seed of time as salt.
TimeValue aTime;
osl_getSystemTime( &aTime );
rtlRandomPool aRandomPool = rtl_random_createPool ();
- rtl_random_addBytes ( aRandomPool, &aTime, 8 );
+ rtl_random_addBytes ( aRandomPool, &aTime, 8 );
sal_uInt8 aDocId[ 16 ] = {0};
rtl_random_getBytes( aRandomPool, aDocId, 16 );
@@ -3098,11 +3098,11 @@ void WW8Export::ExportDocument_Impl()
pDataStrmTemp = &xDataStrm;
if ( pDataStrmTemp && pDataStrmTemp != pStrmTemp)
- EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp);
+ EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp);
EncryptRC4(aCtx, *pTableStrm, *pTableStrmTemp);
- // Write Unencrypted Header 52 bytes to the start of the table stream
+ // Write Unencrypted Header 52 bytes to the start of the table stream
// EncryptionVersionInfo (4 bytes): A Version structure where Version.vMajor MUST be 0x0001, and Version.vMinor MUST be 0x0001.
pTableStrmTemp->Seek( 0 );
sal_uInt32 nEncType = 0x10001;
@@ -3114,19 +3114,19 @@ void WW8Export::ExportDocument_Impl()
pTableStrmTemp->Write( aDocId, 16 );
pTableStrmTemp->Write( pSaltData, 16 );
- pTableStrmTemp->Write( pSaltDigest, 16 );
+ pTableStrmTemp->Write( pSaltDigest, 16 );
EncryptRC4(aCtx, GetWriter().Strm(), *pStrmTemp);
- // Write Unencrypted Fib 68 bytes to the start of the workdocument stream
+ // Write Unencrypted Fib 68 bytes to the start of the workdocument stream
pFib->fEncrypted = 1; // fEncrypted indicates the document is encrypted.
pFib->fObfuscated = 0; // Must be 0 for RC4.
pFib->nHash = 0x34; // encrypt header bytes count of table stream.
pFib->nKey = 0; // lkey2 must be 0 for RC4.
- pStrmTemp->Seek( 0 );
- pFib->WriteHeader( *pStrmTemp );
- }
+ pStrmTemp->Seek( 0 );
+ pFib->WriteHeader( *pStrmTemp );
+ }
if (pUsedNumTbl) // all used NumRules
{
@@ -3320,7 +3320,7 @@ ULONG SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed,
MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam )
: aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0),
- pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
+ pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0),
mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
pStyles( NULL ),
@@ -3554,13 +3554,19 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aArr1 ), aArr1 );
- sal_uInt8 aFldHeader[] =
+ struct FFDataHeader
{
- 0xFF, 0xFF, 0xFF, 0xFF, // Unicode Marker...
- 0, 0, 0, 0,// 0, 0, 0, 0
+ sal_uInt32 version;
+ sal_uInt16 bits;
+ sal_uInt16 cch;
+ sal_uInt16 hps;
+ FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {}
};
- aFldHeader[4] |= (type & 0x03);
+
+ FFDataHeader aFldHeader;
+ aFldHeader.bits |= (type & 0x03);
+
sal_Int32 ffres = 0; // rFieldmark.GetFFRes();
if ( pAsCheckbox && pAsCheckbox->IsChecked() )
ffres = 1;
@@ -3572,12 +3578,12 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
else
ffres = 0;
}
- aFldHeader[4] |= ( (ffres<<2) & 0x7C );
+ aFldHeader.bits |= ( (ffres<<2) & 0x7C );
std::vector< ::rtl::OUString > aListItems;
if (type==2)
{
- aFldHeader[5] |= 0x80; // ffhaslistbox
+ aFldHeader.bits |= 0x8000; // ffhaslistbox
const ::sw::mark::IFieldmark::parameter_map_t* const pParameters = rFieldmark.GetParameters();
::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY));
if(pListEntries != pParameters->end())
@@ -3598,16 +3604,16 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
const sal_uInt8 aFldData[] =
{
- 0x44,0, // the start of "next" data
+ 0x44,0, // the start of "next" data
0,0,0,0,0,0,0,0,0,0, // PIC-Structure! /10
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16
0,0,0,0, // / /4
};
- sal_uInt32 slen = sizeof(sal_uInt32)
+ sal_uInt32 slen = sizeof(sal_uInt32)
+ sizeof(aFldData)
- + sizeof( aFldHeader )
+ + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps )
+ 2*ffname.getLength() + 4
+ 2*ffdeftext.getLength() + 4
+ 2*ffformat.getLength() + 4
@@ -3615,8 +3621,10 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+ 2*ffstattext.getLength() + 4
+ 2*ffentrymcr.getLength() + 4
+ 2*ffexitmcr.getLength() + 4;
+ if ( type )
+ slen += 2; // wDef
if ( type==2 ) {
- slen += 2; // for 0xFF, 0xFF
+ slen += 2; // sttb ( fExtend )
slen += 4; // for num of list items
const int items = aListItems.size();
for( int i = 0; i < items; i++ ) {
@@ -3631,17 +3639,14 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
pDataStrm->Write( aFldData, len );
- len = sizeof( aFldHeader );
- OSL_ENSURE( len == 8, "SwWW8Writer::WriteFormData(..) - wrong aFldHeader length" );
-
- pDataStrm->Write( aFldHeader, len );
+ *pDataStrm << aFldHeader.version << aFldHeader.bits << aFldHeader.cch << aFldHeader.hps;
SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
- if ( type == 0 )
- SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
- else
- pDataStrm->WriteNumber( (sal_uInt16)0 );
+ SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
+ if ( type )
+ *pDataStrm << sal_uInt16(0);
+
SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffformat ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffhelptext ), true );
@@ -3674,7 +3679,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
#endif
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren
-
+
sal_uInt32 nShadowsBefore = pNodeInfoInner->getShadowsBefore();
if (nShadowsBefore > 0)
{
@@ -3687,14 +3692,14 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
for (sal_uInt32 n = 0; n < nShadowsBefore; ++n)
{
m_rWW8Export.WriteCR(pTmpNodeInfoInner);
-
- m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2,
+
+ m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2,
m_rWW8Export.pO->Count() ); // Style #
TableInfoCell(pTmpNodeInfoInner);
m_rWW8Export.pPapPlc->AppendFkpEntry
( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(),
m_rWW8Export.pO->GetData() );
-
+
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren
}
}
@@ -3705,33 +3710,33 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
::std::clog << "<endOfCell/>" << ::std::endl;
#endif
m_rWW8Export.WriteCR(pNodeInfoInner);
-
+
m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style #
TableInfoCell(pNodeInfoInner);
m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(),
m_rWW8Export.pO->GetData() );
-
+
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren
}
-
+
sal_uInt32 nShadowsAfter = pNodeInfoInner->getShadowsAfter();
if (nShadowsAfter > 0)
{
ww8::WW8TableNodeInfoInner::Pointer_t
pTmpNodeInfoInner(new ww8::WW8TableNodeInfoInner(NULL));
-
+
pTmpNodeInfoInner->setDepth(pNodeInfoInner->getDepth());
pTmpNodeInfoInner->setEndOfCell(true);
for (sal_uInt32 n = 0; n < nShadowsAfter; ++n)
{
m_rWW8Export.WriteCR(pTmpNodeInfoInner);
-
+
m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style #
TableInfoCell(pTmpNodeInfoInner);
m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(),
m_rWW8Export.pO->GetData() );
-
+
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren
}
}
@@ -3742,13 +3747,13 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
::std::clog << "<endOfLine/>" << ::std::endl;
#endif
TableRowEnd(pNodeInfoInner->getDepth());
-
+
ShortToSVBT16(0, nStyle);
m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style #
TableInfoRow(pNodeInfoInner);
m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(),
m_rWW8Export.pO->GetData() );
-
+
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren
}
#ifdef DEBUG
@@ -3759,7 +3764,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
void MSWordExportBase::OutputStartNode( const SwStartNode & rNode)
{
- ww8::WW8TableNodeInfo::Pointer_t pNodeInfo =
+ ww8::WW8TableNodeInfo::Pointer_t pNodeInfo =
mpTableInfo->getTableNodeInfo( &rNode );
if (pNodeInfo.get() != NULL)
@@ -3767,14 +3772,14 @@ void MSWordExportBase::OutputStartNode( const SwStartNode & rNode)
#ifdef DEBUG
::std::clog << pNodeInfo->toString() << ::std::endl;
#endif
-
+
const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners();
ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aIt(aInners.rbegin());
ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aEnd(aInners.rend());
while (aIt != aEnd)
{
ww8::WW8TableNodeInfoInner::Pointer_t pInner = aIt->second;
-
+
AttrOutput().TableNodeInfoInner(pInner);
aIt++;
}
@@ -3793,13 +3798,13 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode )
#endif
ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = mpTableInfo->getTableNodeInfo( &rNode );
-
+
if (pNodeInfo.get() != NULL)
{
#ifdef DEBUG
::std::clog << pNodeInfo->toString() << ::std::endl;
#endif
-
+
const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners();
ww8::WW8TableNodeInfo::Inners_t::const_iterator aIt(aInners.begin());
ww8::WW8TableNodeInfo::Inners_t::const_iterator aEnd(aInners.end());
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 7160d691cdf2..4af4bb137a9d 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -544,7 +544,7 @@ public:
BYTE bHasHdr : 1;
BYTE bHasFtr : 1;
BYTE bSubstituteBullets : 1; // true: SubstituteBullet() gets called
-
+
bool mbExportModeRTF;
SwDoc *pDoc;
@@ -1405,7 +1405,7 @@ public:
bool IsTxtAttr(xub_StrLen nSwPos);
- void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+ void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( xub_StrLen nSwPos );
virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
@@ -1466,7 +1466,7 @@ public:
bool IsDropCap( int nSwPos );
bool RequiresImplicitBookmark();
- void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+ void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( xub_StrLen nSwPos, bool bRuby = false );
virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index bee910ffb4d7..bd18e5f4a0c4 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 3553d320a1c0..5300b852468e 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -2,7 +2,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
@@ -70,7 +70,7 @@ public:
/// Output text.
virtual void RunText( const String& rText, rtl_TextEncoding eCharSet );
-
+
/// Output text (without markup).
virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
@@ -397,13 +397,13 @@ protected:
/// Sfx item RES_FRAMEDIR
virtual void FormatFrameDirection( const SvxFrameDirectionItem& );
-
+
/// Write the expanded field
virtual void WriteExpand( const SwField* pFld );
-
+
virtual void RefField ( const SwField& rFld, const String& rRef );
virtual void HiddenField( const SwField& rFld );
- virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd );
+ virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd );
virtual void PostitField( const SwField* pFld );
virtual bool DropdownField( const SwField* pFld );
@@ -445,7 +445,7 @@ public:
protected:
/// Output the bold etc. attributes
void OutputWW8Attribute( BYTE nId, bool bVal );
-
+
/// Output the bold etc. attributes, the Complex Text Layout version
void OutputWW8AttributeCTL( BYTE nId, bool bVal );
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 3dc151feb782..6755ac255a0a 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -2,7 +2,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
@@ -257,16 +257,16 @@ bool WW8GlossaryFib::IsGlossaryFib()
}
UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */,
- SvStream & /* rStrm */,
+ SvStream & /* rStrm */,
const WW8Fib &rFib)
{
UINT32 nGlossaryFibOffset = 0;
- if ( rFib.fDot ) // its a template
+ if ( rFib.fDot ) // its a template
{
if ( rFib.pnNext )
nGlossaryFibOffset = ( rFib.pnNext * 512 );
}
- return nGlossaryFibOffset;
+ return nGlossaryFibOffset;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index c2d0a6ca64c5..af8b9ade088c 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 9597ec2b7dc5..2a1e7a11f4e4 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index c3b970e4613c..21523f4dc792 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index dc5c440ff57b..44bb9c246341 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7fe474c8fda4..76c6ae1b2caf 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -395,7 +395,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
&& maShapeRecords.Current()->nRecLen )
{
UINT32 nBytesLeft = maShapeRecords.Current()->nRecLen;
- UINT32 nUDData;
+ UINT32 nUDData;
UINT16 nPID;
while( 5 < nBytesLeft )
{
@@ -604,10 +604,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
aSet.Put( SdrTextRightDistItem( nTextRight ) );
aSet.Put( SdrTextUpperDistItem( nTextTop ) );
aSet.Put( SdrTextLowerDistItem( nTextBottom ) );
- pImpRec->nDxTextLeft = nTextLeft;
- pImpRec->nDyTextTop = nTextTop;
- pImpRec->nDxTextRight = nTextRight;
- pImpRec->nDyTextBottom = nTextBottom;
+ pImpRec->nDxTextLeft = nTextLeft;
+ pImpRec->nDyTextTop = nTextTop;
+ pImpRec->nDxTextRight = nTextRight;
+ pImpRec->nDyTextBottom = nTextBottom;
// --> SJ 2009-03-06 : taking the correct default (which is mso_anchorTop)
MSO_Anchor eTextAnchor =
@@ -701,19 +701,19 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
double fExtraTextRotation = 0.0;
if ( mnFix16Angle && !( GetPropertyValue( DFF_Prop_FitTextToShape ) & 4 ) )
- { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false
+ { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false
fExtraTextRotation = -mnFix16Angle;
}
- if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text
- { // remains unchanged, so we have to take back the flipping here
- fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped.
+ if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text
+ { // remains unchanged, so we have to take back the flipping here
+ fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped.
}
fExtraTextRotation += nTextRotationAngle;
if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) )
{
fExtraTextRotation /= 100.0;
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
- const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) );
+ const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) );
com::sun::star::beans::PropertyValue aPropVal;
aPropVal.Name = sTextRotateAngle;
aPropVal.Value <<= fExtraTextRotation;
@@ -756,7 +756,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
pImpRec->bDrawHell = FALSE;
if (GetPropertyValue(DFF_Prop_fPrint) & 0x02)
pImpRec->bHidden = TRUE;
- pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 );
+ pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 );
if ( nTextId )
{
@@ -3001,7 +3001,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
aRes.nAktCp = rTxtPos; // Akt. Cp-Pos
bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText;
- if ( bNewSection ) // neue Section
+ if ( bNewSection ) // neue Section
{
OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
// PageDesc erzeugen und fuellen
@@ -4845,8 +4845,8 @@ public:
outlineeq(BYTE nNum) : mnNum(nNum) {}
bool operator()(const SwTxtFmtColl *pTest) const
{
- //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei
- return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei
+ //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei
+ return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei
}
};
@@ -4884,7 +4884,7 @@ void SwWW8ImplReader::SetOutLineStyles()
for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
// <--
{
- //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei,
+ //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei,
//nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel();
if ((*aIter)->IsAssignedToListLevelOfOutlineStyle())
nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
@@ -4958,7 +4958,7 @@ void SwWW8ImplReader::SetOutLineStyles()
//if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei
// (*aIter)->SetOutlineLevel(NO_NUMBERING);
if((*aIter)->IsAssignedToListLevelOfOutlineStyle())
- (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end
+ (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end
else
break;
@@ -5030,7 +5030,7 @@ void SwWW8ImplReader::SetOutLineStyles()
aOutlineRule.Set(nToLevel, rRule);
// Set my outline level
//((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei
- ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei
+ ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei
// If there are more styles on this level ignore them
nFlagsStyleOutlLevel |= nAktFlags;
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 588bc97a0b9f..a4b663254176 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1613,7 +1613,7 @@ void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt);
void SetStyleIndent(SwWW8StyInf &rStyleInfo, const SwNumFmt &rFmt);
// --> OD 2010-05-06 #i103711#
// --> OD 2010-05-11 #i105414#
-void SyncIndentWithList( SvxLRSpaceItem &rLR,
+void SyncIndentWithList( SvxLRSpaceItem &rLR,
const SwNumFmt &rFmt,
const bool bFirstLineOfStSet,
const bool bLeftIndentSet );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6a21e524b18d..d5a73b9ac209 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2,7 +2,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
@@ -833,7 +833,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen )
{
nSwNumLevel = *pData - 1;
if (!bNoAttrImport)
- //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei
+ //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei
((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei
// Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt
// werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt
@@ -860,7 +860,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen )
void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen ) // Sprm 12
{
{
- SwWW8StyInf * pStyInf = GetStyle(nAktColl);
+ SwWW8StyInf * pStyInf = GetStyle(nAktColl);
if( !pAktColl || nLen <= 0 // nur bei Styledef
|| (pStyInf && !pStyInf->bColl) // CharFmt -> ignorieren
|| ( nIniFlags & WW8FL_NO_OUTLINE ) ){
@@ -2399,7 +2399,7 @@ void WW8TabDesc::CalcDefaults()
}
} */
- if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) ||
+ if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) ||
(nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used
eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned
@@ -2572,7 +2572,7 @@ void WW8TabDesc::CreateSwTable()
nLeft = GetMinLeft();
else
{
- if (nPreferredWidth)
+ if (nPreferredWidth)
{
nLeft = pIo->maSectionManager.GetTextAreaWidth();
nLeft = nLeft - nPreferredWidth - nOrgDxaLeft;
@@ -3602,25 +3602,25 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
bool lcl_PamContainsFly(SwPaM & rPam)
{
- bool bResult = false;
+ bool bResult = false;
SwNodeRange aRg( rPam.Start()->nNode, rPam.End()->nNode );
SwDoc * pDoc = rPam.GetDoc();
-
- sal_uInt16 n = 0;
+
+ sal_uInt16 n = 0;
SwSpzFrmFmts * pSpzFmts = pDoc->GetSpzFrmFmts();
- sal_uInt16 nCount = pSpzFmts->Count();
+ sal_uInt16 nCount = pSpzFmts->Count();
while (!bResult && n < nCount)
{
SwFrmFmt* pFly = (*pSpzFmts)[n];
const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
-
+
switch (pAnchor->GetAnchorId())
{
case FLY_AT_PARA:
case FLY_AT_CHAR:
{
const SwPosition* pAPos = pAnchor->GetCntntAnchor();
-
+
if (pAPos != NULL &&
aRg.aStart <= pAPos->nNode &&
pAPos->nNode <= aRg.aEnd)
@@ -3632,10 +3632,10 @@ bool lcl_PamContainsFly(SwPaM & rPam)
default:
break;
}
-
+
++n;
}
-
+
return bResult;
}
@@ -3920,28 +3920,17 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
void WW8RStyle::Set1StyleDefaults()
{
+ // see #i25247#, #i25561#, #i48064#, #i92341# for default font
if (!bCJKFontChanged) // Style no CJK Font? set the default
- pIo->SetNewFontAttr(ftcStandardChpCJKStsh, true, RES_CHRATR_CJK_FONT);
-
- // see i25247
- const WW8_FFN* pF = pIo->pFonts->GetFont(3);
- if (pF)
- {
- rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(pF->chs);
- if ((ftcStandardChpCTLStsh == 0) && (eEnc == RTL_TEXTENCODING_MS_1255))
- ftcStandardChpCTLStsh = 3;
- }
-
- if (ftcStandardChpCJKStsh == 0)
- ftcStandardChpCJKStsh = 2;
+ pIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT);
if (!bCTLFontChanged) // Style no CTL Font? set the default
- pIo->SetNewFontAttr(ftcStandardChpCTLStsh, true, RES_CHRATR_CTL_FONT);
+ pIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT);
//#88976# western 2nd to make western charset conversion the default
if (!bFontChanged) // Style has no Font? set the default,
{
- pIo->SetNewFontAttr(ftcStandardChpStsh, true, RES_CHRATR_FONT);
+ pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
/* removed by a patch from cmc for #i52786#
if (pIo->bVer67)
SetStyleCharSet(pIo->pCollA[pIo->nAktColl]);
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 01753f3d9371..0886fe2d1bcd 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 18754f06ce4c..ce066fc5bb96 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2,7 +2,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
@@ -2222,6 +2222,8 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
nChecked = true;
break;
case 25: //undefined, Undefined checkboxes are treated as unchecked
+ //but it appear that both visually and the value are picked up from the default in that case
+ break;
case 0: //unchecked
nChecked = false;
break;
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 72db69dd31c8..72a4980e7b1b 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index d8295b17bbfa..bb1a210a35d9 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2,7 +2,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
@@ -343,7 +343,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
if( !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 )
|| pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) )
return 0;
-#endif
+#endif
//JP 16.11.98: ToUpper darf auf keinen Fall gemacht werden, weil der
//Bookmark- name ein Hyperlink-Ziel sein kann!
@@ -875,7 +875,7 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw()
return msMarkCode;
}
-void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
+void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
{
msBookmarkName=bookmarkName;
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index ce7d03aa3259..5f4ffd46312e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2,7 +2,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
@@ -2730,15 +2730,15 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
pAktColl->SetFmtAttr(rAttr);
}
else if (pAktItemSet)
- {
+ {
pAktItemSet->Put(rAttr);
}
else if (rAttr.Which() == RES_FLTR_REDLINE)
- {
+ {
mpRedlineStack->open(*pPaM->GetPoint(), rAttr);
}
else
- {
+ {
pCtrlStck->NewAttr(*pPaM->GetPoint(), rAttr);
// --> OD 2010-05-06 #i103711#
if ( bFirstLineOfStSet )
@@ -3569,7 +3569,7 @@ bool SwWW8ImplReader::GetFontParams( USHORT nFCode, FontFamily& reFamily,
USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich)
{
USHORT nResult = 0;
-
+
switch (nCharSet) {
case RTL_TEXTENCODING_MS_932:
nResult = RES_CHRATR_CJK_FONT;
@@ -3579,7 +3579,7 @@ USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich)
nResult = nWhich;
break;
}
-
+
return nResult;
}
@@ -3608,7 +3608,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums,
{
eSrcCharSet = RTL_TEXTENCODING_DONTKNOW;
}
-
+
maFontSrcCJKCharSets.push(eSrcCharSet);
}
else
@@ -3621,7 +3621,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums,
{
eSrcCharSet = RTL_TEXTENCODING_DONTKNOW;
}
-
+
maFontSrcCharSets.push(eSrcCharSet);
}
}
@@ -3631,7 +3631,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums,
CharSet eDstCharSet = eSrcCharSet;
SvxFontItem aFont( eFamily, aName, aEmptyStr, ePitch, eDstCharSet, nWhich);
-
+
nWhich = CorrectResIdForCharset(eSrcCharSet, nWhich);
if( bSetEnums )
@@ -3690,18 +3690,18 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen )
{ // (siehe sprmCSymbol) gesetzte Font !
switch( nId )
{
- // case 0x4a51: //font to bias towards all else being equal ?
case 113:
- case 0x4a5E:
+ case 0x4A51: //"Other" font, override with BiDi if it exists
+ case 0x4A5E: //BiDi Font
nId = RES_CHRATR_CTL_FONT;
break;
case 93:
case 111:
- case 0x4a4f:
+ case 0x4A4f:
nId = RES_CHRATR_FONT;
break;
case 112:
- case 0x4a50:
+ case 0x4A50:
nId = RES_CHRATR_CJK_FONT;
break;
default:
@@ -3713,7 +3713,7 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen )
pCtrlStck->SetAttr( *pPaM->GetPoint(), nId );
if (nId == RES_CHRATR_CJK_FONT)
ResetCJKCharSetVars();
- else
+ else
ResetCharSetVars();
}
else
@@ -4047,7 +4047,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
case 0x845E:
aLR.SetTxtLeft( nPara );
if (pAktColl)
- {
+ {
pCollA[nAktColl].bListReleventIndentSet = true;
}
// --> OD 2010-05-11 #i105414#
@@ -4084,7 +4084,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
aLR.SetTxtFirstLineOfst(nPara);
if (pAktColl)
- {
+ {
pCollA[nAktColl].bListReleventIndentSet = true;
}
// --> OD 2010-05-06 #i103711#
@@ -5916,8 +5916,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x085B, 0}, //"sprmCFDiacColor"
{0x085C, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFBoldBi"
{0x085D, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFItalicBi"
- {0x4A5E, &SwWW8ImplReader::Read_FontCode},
- {0x485F, &SwWW8ImplReader::Read_Language}, // "sprmCLidBi"
+ {0x4A5E, &SwWW8ImplReader::Read_FontCode}, //"sprmCFtcBi"
+ {0x485F, &SwWW8ImplReader::Read_Language}, //"sprmCLidBi"
//0x4A60, ? ? ?, //"sprmCIcoBi",
{0x4A61, &SwWW8ImplReader::Read_FontSize}, //"sprmCHpsBi"
{0xCA62, 0}, //"sprmCDispFldRMark"
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ff16c58cbc21..f781e017ea71 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2,7 +2,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
@@ -3446,7 +3446,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt,
pStrm(pSt), nArrMax(256), nSprmSiz(0)
{
pPLCF = rFib.lcbPlcfsed
- ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
+ ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp)
: 0;
@@ -3506,13 +3506,13 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p)
pStrm->Seek( nPo );
// read len
- if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but...
+ if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but...
{
BYTE nSiz(0);
*pStrm >> nSiz;
nSprmSiz = nSiz;
}
- else
+ else
*pStrm >> nSprmSiz;
if( nSprmSiz > nArrMax )
@@ -5182,7 +5182,7 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const
nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn;
break;
case MAN_TXBX_HDFT:
- nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn +
+ nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn +
ccpTxbx;
break;
}
@@ -5572,14 +5572,14 @@ WW8Fib::WW8Fib(SvStream& rSt, BYTE nWantedVersion, UINT32 nOffset)
rSt.Seek( 0x372 ); // fcSttbListNames
rSt >> fcSttbListNames;
rSt >> lcbSttbListNames;
-
+
if (cfclcb > 93)
{
rSt.Seek( 0x382 ); // MagicTables
rSt >> fcPlcfTch;
rSt >> lcbPlcfTch;
}
-
+
if (cfclcb > 113)
{
rSt.Seek( 0x41A ); // new ATRD
@@ -5640,7 +5640,7 @@ WW8Fib::WW8Fib(BYTE nVer)
nProduct = 0xc02d;
}
- // --> #i90932#
+ // --> #i90932#
lid = 0x409; // LANGUAGE_ENGLISH_US
LanguageType nLang = Application::GetSettings().GetLanguage();
@@ -5663,7 +5663,7 @@ WW8Fib::WW8Fib(BYTE nVer)
fFarEast = false;
break;
};
- // <-- #i90932#
+ // <-- #i90932#
Locale aTempLocale;
SvxLanguageToLocale( aTempLocale, lid );
@@ -5677,7 +5677,7 @@ sal_Unicode WW8Fib::getNumDecimalSep() const
}
bool WW8Fib::WriteHeader(SvStream& rStrm)
-{
+{
bool bVer8 = 8 == nVersion;
size_t nUnencryptedHdr = bVer8 ? 0x44 : 0x24;
@@ -5696,22 +5696,22 @@ bool WW8Fib::WriteHeader(SvStream& rStrm)
Set_UInt16( pData, pnNext );
UINT16 nBits16 = 0;
- if( fDot ) nBits16 |= 0x0001;
- if( fGlsy) nBits16 |= 0x0002;
- if( fComplex ) nBits16 |= 0x0004;
- if( fHasPic ) nBits16 |= 0x0008;
+ if( fDot ) nBits16 |= 0x0001;
+ if( fGlsy) nBits16 |= 0x0002;
+ if( fComplex ) nBits16 |= 0x0004;
+ if( fHasPic ) nBits16 |= 0x0008;
nBits16 |= (0xf0 & ( cQuickSaves << 4 ));
- if( fEncrypted ) nBits16 |= 0x0100;
- if( fWhichTblStm ) nBits16 |= 0x0200;
+ if( fEncrypted ) nBits16 |= 0x0100;
+ if( fWhichTblStm ) nBits16 |= 0x0200;
- if (fReadOnlyRecommended)
+ if (fReadOnlyRecommended)
nBits16 |= 0x0400;
- if (fWriteReservation)
+ if (fWriteReservation)
nBits16 |= 0x0800;
- if( fExtChar ) nBits16 |= 0x1000;
+ if( fExtChar ) nBits16 |= 0x1000;
if( fFarEast ) nBits16 |= 0x4000; // #i90932#
- if( fObfuscated ) nBits16 |= 0x8000;
+ if( fObfuscated ) nBits16 |= 0x8000;
Set_UInt16( pData, nBits16 );
Set_UInt16( pData, nFibBack );
@@ -5722,11 +5722,11 @@ bool WW8Fib::WriteHeader(SvStream& rStrm)
BYTE nBits8 = 0;
if( bVer8 )
{
- if( fMac ) nBits8 |= 0x0001;
- if( fEmptySpecial ) nBits8 |= 0x0002;
- if( fLoadOverridePage ) nBits8 |= 0x0004;
- if( fFuturesavedUndo ) nBits8 |= 0x0008;
- if( fWord97Saved ) nBits8 |= 0x0010;
+ if( fMac ) nBits8 |= 0x0001;
+ if( fEmptySpecial ) nBits8 |= 0x0002;
+ if( fLoadOverridePage ) nBits8 |= 0x0004;
+ if( fFuturesavedUndo ) nBits8 |= 0x0008;
+ if( fWord97Saved ) nBits8 |= 0x0010;
if( fWord2000Saved ) nBits8 |= 0x0020;
}
// unter Ver67 these are only reserved
@@ -5776,7 +5776,7 @@ bool WW8Fib::Write(SvStream& rStrm)
ULONG nPos = rStrm.Tell();
cbMac = rStrm.Seek( STREAM_SEEK_TO_END );
- rStrm.Seek( nPos );
+ rStrm.Seek( nPos );
// 2 Longs uebergehen, da unwichtiger Quatsch
pData += 2 * sizeof( INT32);
@@ -6004,7 +6004,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs)
WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
: rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0),
- ftcStandardChpStsh(0), ftcStandardChpCJKStsh(0), ftcStandardChpCTLStsh(0)
+ ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
{
nStyleStart = rFib.fcStshf;
nStyleLen = rFib.lcbStshf;
@@ -6049,17 +6049,22 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
rSt >> nVerBuiltInNamesWhenSaved;
if( 14 > nRead ) break;
- rSt >> ftcStandardChpStsh;
+ rSt >> ftcAsci;
if( 16 > nRead ) break;
- rSt >> ftcStandardChpCJKStsh;
+ rSt >> ftcFE;
if ( 18 > nRead ) break;
- rSt >> ftcStandardChpCTLStsh;
+ rSt >> ftcOther;
+
+ ftcBi = ftcOther;
+
+ if ( 20 > nRead ) break;
+ rSt >> ftcBi;
// ggfs. den Rest ueberlesen
- if( 18 < nRead )
- rSt.SeekRel( nRead-18 );
+ if( 20 < nRead )
+ rSt.SeekRel( nRead-20 );
}
while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
// und kann vorzeitig per "break" verlassen werden.
@@ -6907,44 +6912,44 @@ UINT32 WW8Dop::GetCompatabilityOptions() const
// i#78591#
void WW8Dop::SetCompatabilityOptions2(UINT32 a32Bit)
{
- fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 );
- fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ;
- fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ;
- fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ;
- fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ;
- fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ;
- fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ;
- fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ;
- fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ;
- fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ;
- fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ;
- fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ;
- fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ;
- fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ;
- fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ;
- fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ;
- fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ;
- fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ;
- fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ;
- fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ;
- fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ;
- fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ;
- fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ;
- fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ;
- fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ;
- fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ;
- fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ;
- fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ;
- fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ;
- fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ;
- fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ;
- fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ;
+ fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 );
+ fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ;
+ fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ;
+ fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ;
+ fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ;
+ fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ;
+ fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ;
+ fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ;
+ fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ;
+ fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ;
+ fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ;
+ fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ;
+ fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ;
+ fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ;
+ fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ;
+ fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ;
+ fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ;
+ fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ;
+ fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ;
+ fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ;
+ fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ;
+ fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ;
+ fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ;
+ fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ;
+ fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ;
+ fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ;
+ fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ;
+ fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ;
+ fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ;
+ fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ;
+ fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ;
+ fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ;
}
UINT32 WW8Dop::GetCompatabilityOptions2() const
{
UINT32 a32Bit = 0;
- if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001;
+ if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001;
if (fCompatabilityOptions_Unknown2_2) a32Bit |= 0x00000002;
if (fDontUseHTMLAutoSpacing) a32Bit |= 0x00000004;
if (fCompatabilityOptions_Unknown2_4) a32Bit |= 0x00000008;
@@ -6958,13 +6963,13 @@ UINT32 WW8Dop::GetCompatabilityOptions2() const
if (fCompatabilityOptions_Unknown2_12) a32Bit |= 0x00000800;
if (fCompatabilityOptions_Unknown2_13) a32Bit |= 0x00001000;
//#i42909# set thai "line breaking rules" compatibility option
- // pflin, wonder whether bUseThaiLineBreakingRules is correct
+ // pflin, wonder whether bUseThaiLineBreakingRules is correct
// when importing word document.
if (bUseThaiLineBreakingRules) a32Bit |= 0x00002000;
- else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000;
+ else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000;
if (fCompatabilityOptions_Unknown2_15) a32Bit |= 0x00004000;
if (fCompatabilityOptions_Unknown2_16) a32Bit |= 0x00008000;
- if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000;
+ if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000;
if (fCompatabilityOptions_Unknown2_18) a32Bit |= 0x00020000;
if (fCompatabilityOptions_Unknown2_19) a32Bit |= 0x00040000;
if (fCompatabilityOptions_Unknown2_20) a32Bit |= 0x00080000;
@@ -7176,7 +7181,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
a16Bit |= 0x2000;
}
Set_UInt16(pData, a16Bit);
-
+
pData += 48;
a16Bit = 0x0080;
Set_UInt16(pData, a16Bit);
@@ -7206,7 +7211,7 @@ void WW8DopTypography::ReadFromMem(BYTE *&pData)
if (cchFollowingPunct >= 0 && cchFollowingPunct < nMaxFollowing)
rgxchFPunct[cchFollowingPunct]=0;
- else
+ else
rgxchFPunct[nMaxFollowing - 1]=0;
if (cchLeadingPunct >= 0 && cchLeadingPunct < nMaxLeading)
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index f032dc40ef1e..7e29e0aefa18 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -2,7 +2,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
@@ -129,7 +129,7 @@ private:
enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2};
public:
//7- ids are very different to 8+ ones
- wwSprmParser(ww::WordVersion eVersion);
+ wwSprmParser(ww::WordVersion eVersion);
/// Return the SPRM id at the beginning of this byte sequence
sal_uInt16 GetSprmId(const sal_uInt8* pSp) const;
@@ -157,7 +157,7 @@ class WW8PLCFspecial;
struct WW8PLCFxDesc;
class WW8PLCFx_PCD;
-String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc,
+String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc,
bool bAtEndSeekRel1 = true);
/**
@@ -220,20 +220,20 @@ public:
long nStruct, long nStartPos = -1 );
~WW8PLCFspecial() { delete[] pPLCF_PosArray; }
long GetIdx() const { return nIdx; }
- void SetIdx( long nI ) { nIdx = nI; }
+ void SetIdx( long nI ) { nIdx = nI; }
long GetIMax() const { return nIMax; }
bool SeekPos(long nPos); // geht ueber FC- bzw. CP-Wert
// bzw. naechste groesseren Wert
bool SeekPosExact(long nPos);
- INT32 Where() const
+ INT32 Where() const
{ return ( nIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nIdx]; }
bool Get(WW8_CP& rStart, void*& rpValue) const;
bool GetData(long nIdx, WW8_CP& rPos, void*& rpValue) const;
- const void* GetData( long nInIdx ) const
+ const void* GetData( long nInIdx ) const
{
- return ( nInIdx >= nIMax ) ? 0
- : (const void*)&pPLCF_Contents[nInIdx * nStru];
+ return ( nInIdx >= nIMax ) ? 0
+ : (const void*)&pPLCF_Contents[nInIdx * nStru];
}
INT32 GetPos( long nInIdx ) const
{ return ( nInIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nInIdx]; }
@@ -262,7 +262,7 @@ public:
void SetSprms( const BYTE* pSprms_, long nLen_ );
const BYTE* FindSprm(USHORT nId);
const BYTE* operator ++( int );
- const BYTE* GetSprms() const
+ const BYTE* GetSprms() const
{ return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; }
const BYTE* GetAktParams() const { return pAktParams; }
USHORT GetAktId() const { return nAktId; }
@@ -292,13 +292,13 @@ private:
void MakeFailedPLCF();
public:
- WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct,
+ WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct,
WW8_CP nStartPos = -1 );
/*
folgender Ctor generiert ggfs. einen PLC aus nPN und ncpN
*/
- WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct,
+ WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct,
WW8_CP nStartPos, INT32 nPN, INT32 ncpN );
~WW8PLCF(){ delete[] pPLCF_PosArray; }
@@ -310,10 +310,10 @@ public:
bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const;
WW8PLCF& operator ++( int ) { if( nIdx < nIMax ) nIdx++; return *this; }
- const void* GetData( INT32 nInIdx ) const
+ const void* GetData( INT32 nInIdx ) const
{
- return ( nInIdx >= nIMax ) ? 0 :
- (const void*)&pPLCF_Contents[nInIdx * nStru];
+ return ( nInIdx >= nIMax ) ? 0 :
+ (const void*)&pPLCF_Contents[nInIdx * nStru];
}
};
@@ -348,11 +348,11 @@ public:
bool SeekPos(long nPos);
INT32 Where() const;
bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const;
- WW8PLCFpcd_Iter& operator ++( int )
- {
- if( nIdx < rPLCF.nIMax )
- nIdx++;
- return *this;
+ WW8PLCFpcd_Iter& operator ++( int )
+ {
+ if( nIdx < rPLCF.nIMax )
+ nIdx++;
+ return *this;
}
};
@@ -377,7 +377,7 @@ private:
WW8PLCFx(const WW8PLCFx&);
WW8PLCFx& operator=(const WW8PLCFx&);
public:
- WW8PLCFx(ww::WordVersion eVersion, bool bSprm)
+ WW8PLCFx(ww::WordVersion eVersion, bool bSprm)
: meVer(eVersion), bIsSprm(bSprm), bDirty(false) {}
virtual ~WW8PLCFx() {}
bool IsSprm() const { return bIsSprm; }
@@ -437,7 +437,7 @@ private:
WW8PLCFx_PCD(const WW8PLCFx_PCD&);
WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&);
public:
- WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
+ WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
WW8_CP nStartCp, bool bVer67P);
virtual ~WW8PLCFx_PCD();
virtual ULONG GetIMax() const;
@@ -449,7 +449,7 @@ public:
virtual WW8PLCFx& operator ++( int );
WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos );
WW8_FC AktPieceStartCp2Fc( WW8_CP nCp );
- void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
+ void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
const WW8ScannerBase *pSBase);
WW8PLCFpcd_Iter* GetPLCFIter() { return pPcdI; }
void SetClipStart(WW8_CP nIn) { nClipStart = nIn; }
@@ -477,49 +477,49 @@ public:
public:
WW8_FC mnFC;
- sal_uInt8* mpData;
+ sal_uInt8* mpData;
sal_uInt16 mnLen;
sal_uInt16 mnIStd; // only for Fkp.Papx (actualy Style-Nr)
bool mbMustDelete;
- explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0),
+ explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0),
mnIStd(0), mbMustDelete(false) {}
Entry(const Entry &rEntry);
~Entry();
bool operator<(const Entry& rEntry) const;
Entry& operator=(const Entry& rEntry);
};
-
+
sal_uInt8 maRawData[512];
std::vector<Entry> maEntries;
long nItemSize; // entweder 1 Byte oder ein komplettes BX
// Offset in Stream where last read of 52 bytes took place
- long nFilePos;
+ long nFilePos;
sal_uInt8 mnIdx; // Pos-Merker
ePLCFT ePLCF;
sal_uInt8 mnIMax; // Anzahl der Eintraege
-
+
wwSprmParser maSprmParser;
public:
- WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm,
- SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl,
+ WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm,
+ SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl,
WW8_FC nStartFc = -1);
void Reset(WW8_FC nPos);
long GetFilePos() const { return nFilePos; }
sal_uInt8 GetIdx() const { return mnIdx; }
bool SetIdx(sal_uInt8 nI);
bool SeekPos(WW8_FC nFc);
- WW8_FC Where() const
- {
- return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX;
+ WW8_FC Where() const
+ {
+ return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX;
}
- WW8Fkp& operator ++( int )
- {
+ WW8Fkp& operator ++( int )
+ {
if (mnIdx < mnIMax)
mnIdx++;
- return *this;
+ return *this;
}
BYTE* Get( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ) const;
sal_uInt16 GetIstd() const { return maEntries[mnIdx].mnIStd; }
@@ -601,7 +601,7 @@ private:
WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&);
WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&);
public:
- WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
+ WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
const WW8ScannerBase& rBase, ePLCFT ePl );
virtual ~WW8PLCFx_Cp_FKP();
void ResetAttrStartEnd();
@@ -633,7 +633,7 @@ private:
WW8PLCFx_SEPX(const WW8PLCFx_SEPX&);
WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&);
public:
- WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
+ WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
WW8_CP nStartCp );
virtual ~WW8PLCFx_SEPX();
virtual ULONG GetIdx() const;
@@ -662,7 +662,7 @@ private:
WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&);
WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&);
public:
- WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
+ WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0);
virtual ~WW8PLCFx_SubDoc();
virtual ULONG GetIdx() const;
@@ -683,7 +683,7 @@ public:
long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; }
};
-/// Iterator for footnotes and endnotes
+/// Iterator for fields
class WW8PLCFx_FLD : public WW8PLCFx
{
private:
@@ -718,7 +718,7 @@ private:
long nIMax; // Number of Booknotes
USHORT nIsEnd;
int nBookmarkId; // counter incremented by GetUniqueBookmarkName.
-
+
//No copying
WW8PLCFx_Book(const WW8PLCFx_Book&);
WW8PLCFx_Book& operator=(const WW8PLCFx_Book&);
@@ -835,7 +835,7 @@ private:
//drawboxes we want the true offsets
WW8PLCFxDesc aD[MAN_ANZ_PLCF];
- WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd,
+ WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd,
*pPcdA, *pAnd;
WW8PLCFspecial *pFdoa, *pTxbx, *pTxbxBkd,*pMagicTables, *pSubdocs;
BYTE* pExtendedAtrds;
@@ -854,7 +854,7 @@ private:
void AdvNoSprm(short nIdx, bool bStart);
USHORT GetId(const WW8PLCFxDesc* p ) const;
public:
- WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
+ WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
bool bDoingDrawTextBox = false);
~WW8PLCFMan();
@@ -881,11 +881,11 @@ public:
const BYTE* HasCharSprm( USHORT nId ) const;
bool HasCharSprm(USHORT nId, std::vector<const BYTE *> &rResult) const;
- WW8PLCFx_Cp_FKP* GetChpPLCF() const
+ WW8PLCFx_Cp_FKP* GetChpPLCF() const
{ return (WW8PLCFx_Cp_FKP*)pChp->pPLCFx; }
- WW8PLCFx_Cp_FKP* GetPapPLCF() const
+ WW8PLCFx_Cp_FKP* GetPapPLCF() const
{ return (WW8PLCFx_Cp_FKP*)pPap->pPLCFx; }
- WW8PLCFx_SEPX* GetSepPLCF() const
+ WW8PLCFx_SEPX* GetSepPLCF() const
{ return (WW8PLCFx_SEPX*)pSep->pPLCFx; }
WW8PLCFxDesc* GetPap() const { return pPap; }
bool TransferOpenSprms(std::stack<USHORT> &rStack);
@@ -911,7 +911,7 @@ struct WW8PLCFxSaveAll
class WW8ScannerBase
{
-friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion,
+friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion,
WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase );
friend WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream*, SvStream*, SvStream*,
const WW8ScannerBase&, ePLCFT );
@@ -969,10 +969,10 @@ public:
//given that we never write fastsaved files you can use it, otherwise
//I will beat you with a stick
WW8_CP WW8Fc2Cp(WW8_FC nFcPos) const ;
- WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0,
+ WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0,
WW8_CP* pNextPieceCp = 0, bool* pTestFlag = 0) const;
- xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp,
+ xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp,
long nTotalLen, rtl_TextEncoding eEnc ) const;
};
@@ -1418,7 +1418,7 @@ public:
// 0x422 - 0x4D4 == ignore
WW8_FC fcHplxsdr; //bizarrely, word xp seems to require this set to shows dates from AtrdExtra
- UINT32 lcbHplxsdr;
+ UINT32 lcbHplxsdr;
/*
General-Varaiblen, die fuer Ver67 und Ver8 verwendet werden,
@@ -1429,7 +1429,7 @@ public:
INT32 cpnBteChp;
INT32 cpnBtePap;
/*
- The actual nFib, moved here because some readers assumed
+ The actual nFib, moved here because some readers assumed
they couldn't read any format with nFib > some constant
*/
UINT16 nFib_actual; // 0x05bc #i56856#
@@ -1464,11 +1464,13 @@ protected:
UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there?
UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames
// ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpStsh;
+ UINT16 ftcAsci;
// CJK ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpCJKStsh;
+ UINT16 ftcFE;
+ // CTL/Other ftc used by StandardChpStsh for this document
+ UINT16 ftcOther;
// CTL ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpCTLStsh;
+ UINT16 ftcBi;
//No copying
WW8Style(const WW8Style&);
@@ -1495,12 +1497,12 @@ public:
typedef BYTE HdFtFlags;
namespace nsHdFtFlags
{
- const HdFtFlags WW8_HEADER_EVEN = 0x01;
- const HdFtFlags WW8_HEADER_ODD = 0x02;
- const HdFtFlags WW8_FOOTER_EVEN = 0x04;
- const HdFtFlags WW8_FOOTER_ODD = 0x08;
- const HdFtFlags WW8_HEADER_FIRST = 0x10;
- const HdFtFlags WW8_FOOTER_FIRST = 0x20;
+ const HdFtFlags WW8_HEADER_EVEN = 0x01;
+ const HdFtFlags WW8_HEADER_ODD = 0x02;
+ const HdFtFlags WW8_FOOTER_EVEN = 0x04;
+ const HdFtFlags WW8_FOOTER_ODD = 0x08;
+ const HdFtFlags WW8_HEADER_FIRST = 0x10;
+ const HdFtFlags WW8_FOOTER_FIRST = 0x20;
}
/// Document Properties
@@ -1626,26 +1628,26 @@ public:
UINT32 fTransparentMetafiles :1; // see above
UINT32 fShowBreaksInFrames :1; // see above
UINT32 fSwapBordersFacingPgs :1; // see above
- UINT32 fCompatabilityOptions_Unknown1_13 :1; // #i78591#
- UINT32 fExpShRtn :1; // #i78591# and #i56856#
- UINT32 fCompatabilityOptions_Unknown1_15 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_16 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_13 :1; // #i78591#
+ UINT32 fExpShRtn :1; // #i78591# and #i56856#
+ UINT32 fCompatabilityOptions_Unknown1_15 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_16 :1; // #i78591#
UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top
// of page like MacWord 5.x
UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points
UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer
UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text
- UINT32 fCompatabilityOptions_Unknown1_21 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_21 :1; // #i78591#
UINT32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x
- UINT32 fCompatabilityOptions_Unknown1_23 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_24 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_25 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_26 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_27 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_28 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_29 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_30 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown1_31 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_23 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_24 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_25 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_26 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_27 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_28 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_29 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_30 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown1_31 :1; // #i78591#
UINT32 fUsePrinterMetrics : 1; //The magic option
// hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft!
@@ -1685,38 +1687,38 @@ public:
INT16 hpsZoonFontPag;
INT16 dywDispPag;
- UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591#
UINT32 fDontUseHTMLAutoSpacing:1;
- UINT32 fCompatabilityOptions_Unknown2_4 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_5 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_6 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_7 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_8 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_9 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_10 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_11 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_12 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_13 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_14 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_15 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_16 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_17 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_18 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_19 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_20 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_21 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_22 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_23 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_24 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_25 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_26 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_27 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_28 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_29 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_30 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_31 :1; // #i78591#
- UINT32 fCompatabilityOptions_Unknown2_32 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_4 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_5 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_6 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_7 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_8 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_9 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_10 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_11 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_12 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_13 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_14 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_15 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_16 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_17 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_18 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_19 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_20 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_21 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_22 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_23 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_24 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_25 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_26 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_27 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_28 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_29 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_30 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_31 :1; // #i78591#
+ UINT32 fCompatabilityOptions_Unknown2_32 :1; // #i78591#
UINT16 fUnknown3:15;
UINT16 fUseBackGroundInAllmodes:1;
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 5d943b80a759..a17853521072 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx
index 374d70593d87..15cb576faebf 100644
--- a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx
+++ b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx
@@ -2,7 +2,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
@@ -39,6 +39,6 @@ enum ForbiddenCharactersEnum
SW_FORBIDDEN_CHARACTER_MAX
};
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 8862af145f90..01e2ff6e401e 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -2,7 +2,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
@@ -102,7 +102,7 @@ SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange )
class XTextRangeOrNodeIndexPosition
{
Reference<XTextRange> xRange;
- SwNodeIndex* pIndex; /// pIndex will point to the *previous* node
+ SwNodeIndex* pIndex; /// pIndex will point to the *previous* node
public:
XTextRangeOrNodeIndexPosition();
@@ -131,7 +131,7 @@ XTextRangeOrNodeIndexPosition::~XTextRangeOrNodeIndexPosition()
void XTextRangeOrNodeIndexPosition::Set( Reference<XTextRange> & rRange )
{
- xRange = rRange->getStart(); // set bookmark
+ xRange = rRange->getStart(); // set bookmark
if (NULL != pIndex)
{
delete pIndex;
@@ -145,7 +145,7 @@ void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex& rIndex )
delete pIndex;
pIndex = new SwNodeIndex(rIndex);
- (*pIndex)-- ; // previous node!!!
+ (*pIndex)-- ; // previous node!!!
xRange = NULL;
}
@@ -186,7 +186,7 @@ void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos)
else
{
rPos.nNode = *pIndex;
- rPos.nNode++; // pIndex points to previous index !!!
+ rPos.nNode++; // pIndex points to previous index !!!
rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 );
}
}
@@ -218,9 +218,9 @@ public:
RedlineType_t eType;
// info fields:
- OUString sAuthor; /// change author string
- OUString sComment; /// change comment string
- util::DateTime aDateTime; /// change DateTime
+ OUString sAuthor; /// change author string
+ OUString sComment; /// change comment string
+ util::DateTime aDateTime; /// change DateTime
sal_Bool bMergeLastParagraph; /// the SwRedline::IsDelLastPara flag
// each position can may be either empty, an XTextRange, or an SwNodeIndex
@@ -558,7 +558,7 @@ void XMLRedlineImportHelper::SetCursor(
}
void XMLRedlineImportHelper::AdjustStartNodeCursor(
- const OUString& rId, /// ID used in RedlineAdd() call
+ const OUString& rId, /// ID used in RedlineAdd() call
sal_Bool /*bStart*/,
Reference<XTextRange> & /*rRange*/)
{
@@ -709,13 +709,13 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline(
// 2) util::DateTime -> DateTime
DateTime aDT;
- aDT.SetYear( pRedlineInfo->aDateTime.Year );
- aDT.SetMonth( pRedlineInfo->aDateTime.Month );
- aDT.SetDay( pRedlineInfo->aDateTime.Day );
- aDT.SetHour( pRedlineInfo->aDateTime.Hours );
- aDT.SetMin( pRedlineInfo->aDateTime.Minutes );
- aDT.SetSec( pRedlineInfo->aDateTime.Seconds );
- aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds );
+ aDT.SetYear( pRedlineInfo->aDateTime.Year );
+ aDT.SetMonth( pRedlineInfo->aDateTime.Month );
+ aDT.SetDay( pRedlineInfo->aDateTime.Day );
+ aDT.SetHour( pRedlineInfo->aDateTime.Hours );
+ aDT.SetMin( pRedlineInfo->aDateTime.Minutes );
+ aDT.SetSec( pRedlineInfo->aDateTime.Seconds );
+ aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds );
// 3) recursively convert next redline
// ( check presence and sanity of hierarchical redline info )
@@ -731,8 +731,8 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline(
SwRedlineData* pData = new SwRedlineData(pRedlineInfo->eType,
nAuthorId, aDT,
pRedlineInfo->sComment,
- pNext, // next data (if available)
- NULL); // no extra data
+ pNext, // next data (if available)
+ NULL); // no extra data
return pData;
}
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index f6da99528225..e8e0f1267d8e 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -2,7 +2,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
@@ -76,56 +76,56 @@ class XMLRedlineImportHelper
public:
XMLRedlineImportHelper(
- sal_Bool bIgnoreRedlines, /// ignore redlines mode
+ sal_Bool bIgnoreRedlines, /// ignore redlines mode
- // property sets of model + import info for saving + restoring the
+ // property sets of model + import info for saving + restoring the
// redline mode
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rModel,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> & rImportInfoSet );
+ ::com::sun::star::beans::XPropertySet> & rImportInfoSet );
virtual ~XMLRedlineImportHelper();
/// create a redline object
/// (The redline will be inserted into the document after both start
/// and end cursor has been set.)
- void Add(
- const ::rtl::OUString& rType, /// redline type (insert, del,... )
- const ::rtl::OUString& rId, /// use to identify this redline
- const ::rtl::OUString& rAuthor, /// name of the author
- const ::rtl::OUString& rComment, /// redline comment
+ void Add(
+ const ::rtl::OUString& rType, /// redline type (insert, del,... )
+ const ::rtl::OUString& rId, /// use to identify this redline
+ const ::rtl::OUString& rAuthor, /// name of the author
+ const ::rtl::OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
sal_Bool bMergeLastParagraph); /// merge last paragraph?
/// create a text section for the redline, and return an
/// XText/XTextCursor that may be used to write into it.
- ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> CreateRedlineTextSection(
- ::com::sun::star::uno::Reference< /// needed to get the document
+ ::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> xOldCursor,
- const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
+ const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
/// Set start or end position for a redline in the text body.
/// Accepts XTextRange objects.
void SetCursor(
- const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
- sal_Bool bStart, /// start or end Range
- ::com::sun::star::uno::Reference< /// the actual XTextRange
+ const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
+ sal_Bool bStart, /// start or end Range
+ ::com::sun::star::uno::Reference< /// the actual XTextRange
::com::sun::star::text::XTextRange> & rRange,
/// text range is (from an XML view) outside of a paragraph
/// (i.e. before a table)
- sal_Bool bIsOusideOfParagraph);
+ sal_Bool bIsOusideOfParagraph);
/**
* Adjust the start (end) position for a redline that begins in a
- * start node. It takes the cursor positions _inside_ the redlined
+ * start node. It takes the cursor positions _inside_ the redlined
* element (e.g. section or table).
*
* We will do sanity checking of the given text range: It will
* only be considered valid if it points to the next text node
* after the position given in a previous SetCursor */
void AdjustStartNodeCursor(
- const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
+ const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
sal_Bool bStart,
/// XTextRange _inside_ a table/section
::com::sun::star::uno::Reference<
@@ -138,7 +138,7 @@ public:
void SetRecordChanges( sal_Bool bRecordChanges );
/// set redline protection key
- void SetProtectionKey(
+ void SetProtectionKey(
const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
private:
@@ -148,8 +148,8 @@ private:
void InsertIntoDocument(RedlineInfo* pRedline);
SwRedlineData* ConvertRedline(
- RedlineInfo* pRedline, /// RedlineInfo to be converted
- SwDoc* pDoc); /// document needed for Author-ID conversion
+ RedlineInfo* pRedline, /// RedlineInfo to be converted
+ SwDoc* pDoc); /// document needed for Author-ID conversion
/** save the redline mode (if rPropertySet is non-null) */
void SaveRedlineMode(
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 180973470216..ff073100ef27 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -2,7 +2,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
@@ -274,7 +274,7 @@ sal_Int32 ReadThroughComponent(
aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
DBG_ERROR( aError.GetBuffer() );
#endif
-
+
return ERR_SWG_READ_ERROR;
}
catch( packages::zip::ZipIOException& r)
@@ -445,10 +445,10 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
for ( USHORT n = 1; n < rColls.Count(); ++n )
{
SwTxtFmtColl* pColl = rColls[ n ];
- //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei
+ //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei
if ( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
- // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true;
+ // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true;
aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei
}
@@ -851,7 +851,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
}
}
- rDoc.acquire(); // prevent deletion
+ rDoc.acquire(); // prevent deletion
sal_uInt32 nRet = 0;
// save redline mode into import info property set
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 4a6db2d80be0..9a264742b498 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -2,7 +2,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
@@ -204,34 +204,34 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
pStatusBarItem->GetValue() >>= xStatusIndicator;
}
-// try
-// {
-// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel());
-// if (xModel.is())
-// {
-// uno::Sequence< beans::PropertyValue > xMediaDescr
-// uno::Reference<frame::XController> xController(
-// xModel->getCurrentController());
-// if( xController.is())
-// {
-// uno::Reference<frame::XFrame> xFrame( xController->getFrame());
-// if( xFrame.is())
-// {
-// uno::Reference<task::XStatusIndicatorFactory> xFactory(
-// xFrame, uno::UNO_QUERY );
-// if( xFactory.is())
-// {
-// xStatusIndicator =
-// xFactory->createStatusIndicator();
-// }
-// }
-// }
-// }
-// }
-// catch( const RuntimeException& )
-// {
-// xStatusIndicator = 0;
-// }
+// try
+// {
+// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel());
+// if (xModel.is())
+// {
+// uno::Sequence< beans::PropertyValue > xMediaDescr
+// uno::Reference<frame::XController> xController(
+// xModel->getCurrentController());
+// if( xController.is())
+// {
+// uno::Reference<frame::XFrame> xFrame( xController->getFrame());
+// if( xFrame.is())
+// {
+// uno::Reference<task::XStatusIndicatorFactory> xFactory(
+// xFrame, uno::UNO_QUERY );
+// if( xFactory.is())
+// {
+// xStatusIndicator =
+// xFactory->createStatusIndicator();
+// }
+// }
+// }
+// }
+// }
+// catch( const RuntimeException& )
+// {
+// xStatusIndicator = 0;
+// }
// set progress range and start status indicator
sal_Int32 nProgressRange(1000000);
@@ -472,8 +472,8 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
!(bOrganizerMode || bBlock || bErr) )
{
-// DBG_ASSERT( !pDoc->GetDocStat().bModified,
-// "doc stat is modified!" );
+// DBG_ASSERT( !pDoc->GetDocStat().bModified,
+// "doc stat is modified!" );
OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") );
try
{
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index a622d59a362d..f2e1020b3199 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -2,7 +2,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
@@ -72,18 +72,18 @@ private:
/// the component we export
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent> & xComponent,
- const sal_Char* pStreamName, /// the stream name
+ const sal_Char* pStreamName, /// the stream name
/// service factory for pServiceName
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory> & rFactory,
- const sal_Char* pServiceName, /// service name of the component
+ const sal_Char* pServiceName, /// service name of the component
/// the argument (XInitialization)
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any> & rArguments,
/// output descriptor
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue> & rMediaDesc,
- sal_Bool bPlainStream ); /// neither compress nor encrypt
+ sal_Bool bPlainStream ); /// neither compress nor encrypt
/// write a single output stream
/// (to be called either directly or by WriteThroughComponent(...))
@@ -102,6 +102,6 @@ private:
};
-#endif // _WRTXML_HXX
+#endif // _WRTXML_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 807159040be4..06dcfe133b94 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -2,7 +2,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
@@ -71,13 +71,13 @@ enum SvXMLTokenMapAttrs
static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
- { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
- { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE },
- { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW },
- { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION },
- { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT },
- { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
+ { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
+ { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE },
+ { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW },
+ { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION },
+ { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT },
+ { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER },
XML_TOKEN_MAP_END
};
@@ -228,7 +228,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
{
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue );
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) );
+ // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) );
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
}
diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx
index b0795a9d0869..e6506e2a4453 100644
--- a/sw/source/filter/xml/xmlbrshe.hxx
+++ b/sw/source/filter/xml/xmlbrshe.hxx
@@ -2,7 +2,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
@@ -38,21 +38,21 @@ class SwXMLExport;
class SwXMLBrushItemExport
{
- SwXMLExport& rExport;
+ SwXMLExport& rExport;
protected:
-
+
SwXMLExport& GetExport() { return rExport; }
public:
SwXMLBrushItemExport( SwXMLExport& rExport );
~SwXMLBrushItemExport();
-
+
// core API
void exportXML( const SvxBrushItem& rItem );
};
-#endif // _XMLBRSHE_HXX
+#endif // _XMLBRSHE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index fb0f54f21bf3..af1ec4b2ddc4 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -2,7 +2,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
@@ -42,8 +42,8 @@ class SwXMLBrushItemImportContext : public SvXMLImportContext
{
private:
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream;
- SvxBrushItem *pItem;
-
+ SvxBrushItem *pItem;
+
void ProcessAttrs(
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
@@ -59,7 +59,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
- const SvxBrushItem& rItem );
+ const SvxBrushItem& rItem );
SwXMLBrushItemImportContext(
SvXMLImport& rImport,
@@ -68,7 +68,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
- sal_uInt16 nWhich );
+ sal_uInt16 nWhich );
virtual ~SwXMLBrushItemImportContext();
@@ -83,6 +83,6 @@ public:
};
-#endif // _XMLBRSHI_HXX
+#endif // _XMLBRSHI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 31555e592204..c81731fea397 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -2,7 +2,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
@@ -129,7 +129,7 @@ void SwXMLExport::SetCurPaM( SwPaM& rPaM, sal_Bool bWhole, sal_Bool bTabOnly )
SwXMLExport::SwXMLExport(
const uno::Reference< lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nExportFlags)
-: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ),
+: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ),
#ifdef XML_CORE_API
pCurPaM( 0 ),
pOrigPaM( &rPaM ),
@@ -160,7 +160,7 @@ SwXMLExport::SwXMLExport(
const Reference< XGraphicObjectResolver > & rEmbeddedGrfObjs,
sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly,
sal_Bool bShowProg )
-: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs,
+: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs,
SW_MOD()->GetMetric( rPaM.GetDoc()->get(IDocumentSettingAccess::HTML_MODE) ) ),
pCurPaM( 0 ),
pOrigPaM( &rPaM ),
@@ -292,7 +292,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
SfxObjectShell* pObjSh = pDoc->GetDocShell();
if( pObjSh )
- pObjSh->UpdateDocInfoForSave(); // update information
+ pObjSh->UpdateDocInfoForSave(); // update information
}
if( bShowProgress )
{
@@ -321,7 +321,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
nRef += pDoc->GetCharFmts()->Count() - 1;
nRef += pDoc->GetFrmFmts()->Count() - 1;
nRef += pDoc->GetTxtFmtColls()->Count() - 1;
-// nRef += pDoc->GetPageDescCnt();
+// nRef += pDoc->GetPageDescCnt();
nRef *= 2; // for the above styles, xmloff will increment by 2!
// #i93174#: count all paragraphs for the progress bar
nRef += aDocStat.nAllPara; // 1: only content, no autostyle
@@ -444,7 +444,7 @@ __EXPORT SwXMLExport::~SwXMLExport()
void SwXMLExport::_ExportFontDecls()
{
- GetFontAutoStylePool(); // make sure the pool is created
+ GetFontAutoStylePool(); // make sure the pool is created
SvXMLExport::_ExportFontDecls();
}
@@ -814,8 +814,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance(
{
// #110680#
//return (cppu::OWeakObject*)new SwXMLExport(
- // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
- // EXPORT_FONTDECLS );
+ // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
+ // EXPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLExport( rSMgr,
EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
EXPORT_FONTDECLS|EXPORT_OASIS );
@@ -841,8 +841,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance(
{
// #110680#
//return (cppu::OWeakObject*)new SwXMLExport(
- // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
- // EXPORT_FONTDECLS );
+ // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
+ // EXPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLExport(
rSMgr,
EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
@@ -978,7 +978,7 @@ void SwXMLExport::ExportCurPaM( sal_Bool bExportWholePaM )
else if( pNd == &pDoc->GetNodes().GetEndOfContent() )
break;
- pCurPaM->GetPoint()->nNode++; // next node
+ pCurPaM->GetPoint()->nNode++; // next node
sal_uInt32 nPos = pCurPaM->GetPoint()->nNode.GetIndex();
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 7b081378236a..e613d6db5aa3 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -2,7 +2,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
@@ -57,24 +57,24 @@ class SwXMLExport : public SvXMLExport
friend class SwXMLExpContext;
#ifdef XML_CORE_API
- SwPaM *pCurPaM; // the current PaM
- SwPaM *pOrigPaM; // the original PaM
+ SwPaM *pCurPaM; // the current PaM
+ SwPaM *pOrigPaM; // the original PaM
#endif
- SvXMLUnitConverter *pTwipUnitConv;
+ SvXMLUnitConverter *pTwipUnitConv;
- SvXMLExportItemMapper *pTableItemMapper;
- SwXMLTableLinesCache_Impl *pTableLines;
+ SvXMLExportItemMapper *pTableItemMapper;
+ SwXMLTableLinesCache_Impl *pTableLines;
- SvXMLItemMapEntriesRef xTableItemMap;
- SvXMLItemMapEntriesRef xTableRowItemMap;
- SvXMLItemMapEntriesRef xTableCellItemMap;
+ SvXMLItemMapEntriesRef xTableItemMap;
+ SvXMLItemMapEntriesRef xTableRowItemMap;
+ SvXMLItemMapEntriesRef xTableCellItemMap;
UniReference < XMLPropertySetMapper > xParaPropMapper;
- sal_Bool bExportWholeDoc : 1;// export whole document?
- sal_Bool bBlock : 1; // export text block?
- sal_Bool bExportFirstTableOnly : 1;
- sal_Bool bShowProgress : 1;
+ sal_Bool bExportWholeDoc : 1;// export whole document?
+ sal_Bool bBlock : 1; // export text block?
+ sal_Bool bExportFirstTableOnly : 1;
+ sal_Bool bShowProgress : 1;
sal_Bool bSavedShowChanges : 1;
void _InitItemExport();
@@ -187,6 +187,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const
}
-#endif // _XMLEXP_HXX
+#endif // _XMLEXP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 048c6996847e..4f295026ae6f 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -2,7 +2,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
@@ -508,23 +508,23 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
/**
xml -> MemberId
- border-padding ALL_BORDER_PADDING
- border-padding-before LEFT_BORDER_PADDING
- border-padding-after RIGHT_BORDER_PADDING
- border-padding-start TOP_BORDER_PADDING
- border-padding-end BOTTOM_BORDER_PADDING
-
- border ALL_BORDER
- border-before LEFT_BORDER
- border-after RIGHT_BORDER
- border-start TOP_BORDER
- border-end BOTTOM_BORDER
-
- border-line-width ALL_BORDER_LINE_WIDTH
- border-line-width-before LEFT_BORDER_LINE_WIDTH
- border-line-width-after RIGHT_BORDER_LINE_WIDTH
- border-line-width-start TOP_BORDER_LINE_WIDTH
- border-line-width-end BOTTOM_BORDER_LINE_WIDTH
+ border-padding ALL_BORDER_PADDING
+ border-padding-before LEFT_BORDER_PADDING
+ border-padding-after RIGHT_BORDER_PADDING
+ border-padding-start TOP_BORDER_PADDING
+ border-padding-end BOTTOM_BORDER_PADDING
+
+ border ALL_BORDER
+ border-before LEFT_BORDER
+ border-after RIGHT_BORDER
+ border-start TOP_BORDER
+ border-end BOTTOM_BORDER
+
+ border-line-width ALL_BORDER_LINE_WIDTH
+ border-line-width-before LEFT_BORDER_LINE_WIDTH
+ border-line-width-after RIGHT_BORDER_LINE_WIDTH
+ border-line-width-start TOP_BORDER_LINE_WIDTH
+ border-line-width-end BOTTOM_BORDER_LINE_WIDTH
*/
const SvxBorderLine* pLeft = pBox->GetLeft();
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index 108d8a50f0bf..e622a6c1763b 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -2,7 +2,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
@@ -33,12 +33,12 @@
#include <tools/ref.hxx>
#include "xmlitmap.hxx"
-#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items
-#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from
+#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items
+#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from
// parent item sets
-#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element
+#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element
// even if its empty
-#define XML_EXPORT_FLAG_IGN_WS 0x0008
+#define XML_EXPORT_FLAG_IGN_WS 0x0008
namespace rtl { class OUString; }
class SvXMLUnitConverter;
@@ -123,7 +123,7 @@ public:
inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
- static sal_Bool QueryXMLValue( const SfxPoolItem& rItem,
+ static sal_Bool QueryXMLValue( const SfxPoolItem& rItem,
::rtl::OUString& rValue, sal_uInt16 nMemberId,
const SvXMLUnitConverter& rUnitConverter );
};
@@ -134,6 +134,6 @@ SvXMLExportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
mrMapEntries = rMapEntries;
}
-#endif // _XMLITMPR_HXX
+#endif // _XMLITMPR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 3e89060e642b..ff83864c8569 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -2,7 +2,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
@@ -109,7 +109,7 @@ inline sal_Bool SwXMLConditionParser_Impl::SkipWS()
inline sal_Bool SwXMLConditionParser_Impl::MatchChar( sal_Unicode c )
{
sal_Bool bRet = sal_False;
- if( nPos < nLength && c == sInput[nPos] )
+ if( nPos < nLength && c == sInput[nPos] )
{
nPos++;
bRet = sal_True;
@@ -286,7 +286,7 @@ SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5, 2 )
class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
{
- SwXMLConditions_Impl *pConditions;
+ SwXMLConditions_Impl *pConditions;
protected:
@@ -450,16 +450,16 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext
{
- OUString sMasterPageName;
- SfxItemSet *pItemSet;
+ OUString sMasterPageName;
+ SfxItemSet *pItemSet;
SwXMLTextStyleContext_Impl *pTextStyle;
SvXMLStylesContext &rStyles;
- OUString sDataStyleName;
+ OUString sDataStyleName;
- sal_Bool bHasMasterPageName : 1;
- sal_Bool bPageDescConnected : 1;
- sal_Bool bDataStyleIsResolved;
+ sal_Bool bHasMasterPageName : 1;
+ sal_Bool bPageDescConnected : 1;
+ sal_Bool bDataStyleIsResolved;
SvXMLImportContext *CreateItemSetContext(
sal_uInt16 nPrefix,
@@ -524,7 +524,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey,
if (rValue.getLength() > 0)
{
sDataStyleName = rValue;
- bDataStyleIsResolved = sal_False; // needs to be resolved
+ bDataStyleIsResolved = sal_False; // needs to be resolved
}
}
else
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index e815ca96e784..a18c43e320bd 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index ea9ec6b3d404..c86306cfa82e 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 3f34c6ae6d03..a42cfa8092aa 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -2,7 +2,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
@@ -116,14 +116,14 @@ enum SwXMLDocTokens
static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
- { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
- { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
- { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT },
- { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
+ { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
+ { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
+ { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
+ { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
+ { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT },
+ { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
{ XML_NAMESPACE_XFORMS, XML_MODEL, XML_TOK_DOC_XFORMS },
XML_TOKEN_MAP_END
};
@@ -240,10 +240,10 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
sal_True );
break;
-// case XML_TOK_DOC_USESTYLES:
-// pContext = GetSwImport().CreateUseStylesContext( rLocalName,
-// xAttrList );
-// break;
+// case XML_TOK_DOC_USESTYLES:
+// pContext = GetSwImport().CreateUseStylesContext( rLocalName,
+// xAttrList );
+// break;
case XML_TOK_DOC_MASTERSTYLES:
pContext = GetSwImport().CreateMasterStylesContext( rLocalName,
xAttrList );
@@ -449,7 +449,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
SwXMLImport::SwXMLImport(
const uno::Reference< lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nImportFlags)
-: SvXMLImport( xServiceFactory, nImportFlags ),
+: SvXMLImport( xServiceFactory, nImportFlags ),
pSttNdIdx( 0 ),
pTableItemMapper( 0 ),
pDocElemTokenMap( 0 ),
@@ -482,7 +482,7 @@ SwXMLImport::SwXMLImport(
const uno::Reference< frame::XModel > & rModel,
const uno::Reference< document::XGraphicObjectResolver > & rEGO,
SvStorage *pPkg )
-: SvXMLImport( xServiceFactory, rModel, rEGO ),
+: SvXMLImport( xServiceFactory, rModel, rEGO ),
bLoadDoc( bLDoc ),
bInsert( bInsertMode ),
nStyleFamilyMask( nStyleFamMask ),
@@ -568,7 +568,7 @@ OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rT
if( !xCrsrTunnel.is() )
return 0;
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>(
- sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
+ sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
return pTxtCrsr;
}
@@ -921,10 +921,10 @@ void SwXMLImport::endDocument( void )
if( pNextNd->CanJoinPrev(/* &pPos->nNode*/ ) &&
*pSttNdIdx != pPos->nNode )
{
-// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode();
-// pPos->nContent.Assign( pPrevNd, 0 );
-// pPaM->SetMark(); pPaM->DeleteMark();
-// pPrevNd->JoinNext();
+// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode();
+// pPos->nContent.Assign( pPrevNd, 0 );
+// pPaM->SetMark(); pPaM->DeleteMark();
+// pPrevNd->JoinNext();
pNextNd->JoinPrev();
}
}
@@ -1604,8 +1604,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(
{
// #110680#
//return (cppu::OWeakObject*)new SwXMLImport(
- // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
- // IMPORT_FONTDECLS );
+ // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
+ // IMPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLImport(
rSMgr,
IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
@@ -1632,11 +1632,11 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(
{
// #110680#
//return (cppu::OWeakObject*)new SwXMLImport(
- // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
- // IMPORT_FONTDECLS );
+ // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
+ // IMPORT_FONTDECLS );
return (cppu::OWeakObject*)new SwXMLImport(
rSMgr,
- IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
+ IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
IMPORT_FONTDECLS );
}
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 013df52e6b07..65ac50e127fb 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -2,7 +2,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
@@ -55,48 +55,48 @@ namespace SwImport {
class SwXMLImport: public SvXMLImport
{
- SwNodeIndex *pSttNdIdx;
-
- SvXMLUnitConverter *pTwipUnitConv;
- SvXMLImportItemMapper *pTableItemMapper;// paragraph item import
- SvXMLTokenMap *pDocElemTokenMap;
- SvXMLTokenMap *pTableElemTokenMap;
- SvXMLTokenMap *pTableCellAttrTokenMap;
- SvXMLGraphicHelper *pGraphicResolver;
- SvXMLEmbeddedObjectHelper *pEmbeddedResolver;
-
- SvXMLItemMapEntriesRef xTableItemMap;
- SvXMLItemMapEntriesRef xTableColItemMap;
- SvXMLItemMapEntriesRef xTableRowItemMap;
- SvXMLItemMapEntriesRef xTableCellItemMap;
- SvStorageRef xPackage;
+ SwNodeIndex *pSttNdIdx;
+
+ SvXMLUnitConverter *pTwipUnitConv;
+ SvXMLImportItemMapper *pTableItemMapper;// paragraph item import
+ SvXMLTokenMap *pDocElemTokenMap;
+ SvXMLTokenMap *pTableElemTokenMap;
+ SvXMLTokenMap *pTableCellAttrTokenMap;
+ SvXMLGraphicHelper *pGraphicResolver;
+ SvXMLEmbeddedObjectHelper *pEmbeddedResolver;
+
+ SvXMLItemMapEntriesRef xTableItemMap;
+ SvXMLItemMapEntriesRef xTableColItemMap;
+ SvXMLItemMapEntriesRef xTableRowItemMap;
+ SvXMLItemMapEntriesRef xTableCellItemMap;
+ SvStorageRef xPackage;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
xLateInitSettings;
- sal_uInt16 nStyleFamilyMask;// Mask of styles to load
- sal_Bool bLoadDoc : 1; // Load doc or styles only
- sal_Bool bInsert : 1; // Insert mode. If styles are
+ sal_uInt16 nStyleFamilyMask;// Mask of styles to load
+ sal_Bool bLoadDoc : 1; // Load doc or styles only
+ sal_Bool bInsert : 1; // Insert mode. If styles are
// loaded only sal_False means that
// existing styles will be
// overwritten.
- sal_Bool bBlock : 1; // Load text block
- sal_Bool bAutoStylesValid : 1;
- sal_Bool bShowProgress : 1;
- sal_Bool bOrganizerMode : 1;
+ sal_Bool bBlock : 1; // Load text block
+ sal_Bool bAutoStylesValid : 1;
+ sal_Bool bShowProgress : 1;
+ sal_Bool bOrganizerMode : 1;
sal_Bool bInititedXForms : 1;
- sal_Bool bPreserveRedlineMode;
+ sal_Bool bPreserveRedlineMode;
- void _InitItemImport();
- void _FinitItemImport();
- void UpdateTxtCollConditions( SwDoc *pDoc );
+ void _InitItemImport();
+ void _FinitItemImport();
+ void UpdateTxtCollConditions( SwDoc *pDoc );
- void setTextInsertMode(
+ void setTextInsertMode(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & rInsertPos );
- void setStyleInsertMode( sal_uInt16 nFamilies,
+ void setStyleInsertMode( sal_uInt16 nFamilies,
sal_Bool bOverwrite );
- void setBlockMode();
- void setOrganizerMode();
+ void setBlockMode();
+ void setOrganizerMode();
protected:
@@ -121,12 +121,12 @@ public:
#ifdef XML_CORE_API
// #110680#
- SwXMLImport(
+ SwXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- SwDoc& rDoc,
- const SwPaM& rPaM,
+ SwDoc& rDoc,
+ const SwPaM& rPaM,
sal_Bool bLoadDoc,
- sal_Bool bInsertMode,
+ sal_Bool bInsertMode,
sal_uInt16 nStyleFamMask,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > &,
@@ -152,8 +152,8 @@ public:
::rtl::OUString SAL_CALL getImplementationName()
throw( ::com::sun::star::uno::RuntimeException );
- void InsertStyles( sal_Bool bAuto );
- void FinishStyles();
+ void InsertStyles( sal_Bool bAuto );
+ void FinishStyles();
// namespace office
@@ -225,10 +225,10 @@ inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const
inline void SwXMLImport::SetProgressValue( sal_Int32 nValue )
{
- if ( bShowProgress )
- GetProgressBarHelper()->SetValue(nValue);
+ if ( bShowProgress )
+ GetProgressBarHelper()->SetValue(nValue);
}
-#endif // _XMLIMP_HXX
+#endif // _XMLIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index f3eac88edfdf..05ee1e1cdfc6 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -2,7 +2,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
@@ -124,9 +124,9 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) )
{
-// bPut = pNewItem->importXML( rValue,
-// pEntry->nMemberId & MID_SW_FLAG_MASK,
-// rUnitConverter );
+// bPut = pNewItem->importXML( rValue,
+// pEntry->nMemberId & MID_SW_FLAG_MASK,
+// rUnitConverter );
bPut = PutXMLValue( *pNewItem, rValue,
static_cast<sal_uInt16>( pEntry->nMemberId & MID_SW_FLAG_MASK ),
rUnitConverter );
@@ -528,7 +528,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
DEF_LINE_WIDTH_0,
DEF_LINE_WIDTH_4 ) )
return sal_False;
-
+
// #i61946: accept line style even it's not part of our "normal" set of line styles
sal_uInt16 nWidth = 0;
@@ -641,7 +641,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
switch( nMemberId )
{
case MID_BACK_COLOR:
- if( IsXMLToken( rValue, XML_TRANSPARENT ) )
+ if( IsXMLToken( rValue, XML_TRANSPARENT ) )
{
pBrush->GetColor().SetTransparency(0xff);
bOk = sal_True;
@@ -663,7 +663,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
if( GPOS_NONE == eOldGraphicPos &&
GPOS_NONE != pBrush->GetGraphicPos() )
pBrush->SetGraphicPos( GPOS_TILED );
- bOk = sal_True ;
+ bOk = sal_True ;
}
break;
@@ -794,7 +794,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
{
SfxBoolItem* pSplit = PTR_CAST(SfxBoolItem, &rItem);
DBG_ASSERT( pSplit != NULL, "Wrong Which-ID" );
-
+
if( IsXMLToken( rValue, XML_AUTO ) ||
IsXMLToken( rValue, XML_TRUE ) )
{
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 0734dbbf67bc..1c4a8e45f680 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -2,7 +2,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
@@ -108,6 +108,6 @@ SvXMLImportItemMapper::getMapEntries() const
}
-#endif // _XMLIMPIT_HXX
+#endif // _XMLIMPIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index ff5dc27764d1..2d1c8ee5675d 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 1922f2238b39..a384253ddeb3 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -2,7 +2,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
@@ -44,9 +44,9 @@ struct SvXMLItemMapEntry;
class SvXMLItemSetContext : public SvXMLImportContext
{
protected:
- SfxItemSet &rItemSet;
- const SvXMLImportItemMapper &rIMapper;
- const SvXMLUnitConverter &rUnitConv;
+ SfxItemSet &rItemSet;
+ const SvXMLImportItemMapper &rIMapper;
+ const SvXMLUnitConverter &rUnitConv;
public:
@@ -77,6 +77,6 @@ public:
};
-#endif // _XMLITEM_HXX
+#endif // _XMLITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 48efcc45b3d3..c69da83f7ba1 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index ace9205e322c..dab53a3bfc33 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx
index 5bc92baa071c..d50c96aa9e6e 100644
--- a/sw/source/filter/xml/xmlitemm.cxx
+++ b/sw/source/filter/xml/xmlitemm.cxx
@@ -2,7 +2,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
@@ -55,13 +55,13 @@ SvXMLItemMapEntry aXMLTableItemMap[] =
// RES_FILL_ORDER
// not required
// RES_FRM_SIZE
- M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ),
- M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ),
+ M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ),
+ M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ),
// RES_PAPER_BIN
// not required
// TODO: RES_LR_SPACE
- M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ),
- M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ),
+ M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ),
+ M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ),
// RES_UL_SPACE
MAP_ENTRY( FO, MARGIN_TOP, RES_UL_SPACE, MID_UP_MARGIN ),
MAP_ENTRY( FO, MARGIN_BOTTOM, RES_UL_SPACE, MID_LO_MARGIN ),
@@ -131,7 +131,7 @@ SvXMLItemMapEntry aXMLTableItemMap[] =
SvXMLItemMapEntry aXMLTableColItemMap[] =
{
- M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ),
+ M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ),
MAP_ENTRY( STYLE, REL_COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_COL_WIDTH ),
M_END
};
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 11c925cec7bf..cdea43cfb211 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -2,7 +2,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
@@ -319,23 +319,23 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
const struct SvXMLEnumMapEntry psXML_BrushRepeat[] =
{
- { XML_BACKGROUND_REPEAT, GPOS_TILED },
- { XML_BACKGROUND_NO_REPEAT, GPOS_MM },
- { XML_BACKGROUND_STRETCH, GPOS_AREA },
+ { XML_BACKGROUND_REPEAT, GPOS_TILED },
+ { XML_BACKGROUND_NO_REPEAT, GPOS_MM },
+ { XML_BACKGROUND_STRETCH, GPOS_AREA },
{ XML_TOKEN_INVALID, 0 }
};
const struct SvXMLEnumMapEntry psXML_BrushHoriPos[] =
{
- { XML_LEFT, GPOS_LM },
- { XML_RIGHT, GPOS_RM },
+ { XML_LEFT, GPOS_LM },
+ { XML_RIGHT, GPOS_RM },
{ XML_TOKEN_INVALID, 0 }
};
const struct SvXMLEnumMapEntry psXML_BrushVertPos[] =
{
- { XML_TOP, GPOS_MT },
- { XML_BOTTOM, GPOS_MB },
+ { XML_TOP, GPOS_MT },
+ { XML_BOTTOM, GPOS_MB },
{ XML_TOKEN_INVALID, 0 }
};
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index 76683e0046d4..f897f9915d8b 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 978805643080..c423355aeafa 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -2,7 +2,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
@@ -33,34 +33,34 @@
#include <tools/ref.hxx>
#include <xmloff/xmltoken.hxx>
-namespace rtl { class OUString; }
+namespace rtl { class OUString; }
-#define MID_SW_FLAG_MASK 0x0000ffff
+#define MID_SW_FLAG_MASK 0x0000ffff
// this flags are used in the item mapper for import and export
-#define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000
-#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000
-#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000
-#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000
-#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export
-#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export
-#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000
-#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000
-#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export
+#define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000
+#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000
+#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000
+#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000
+#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export
+#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export
+#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000
+#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000
+#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export
// ---
struct SvXMLItemMapEntry
{
- sal_uInt16 nNameSpace; // declares the Namespace in wich this item
+ sal_uInt16 nNameSpace; // declares the Namespace in wich this item
// exists
enum ::xmloff::token::XMLTokenEnum eLocalName;
- // the local name for the item inside
+ // the local name for the item inside
// the Namespace (as an XMLTokenEnum)
- sal_uInt16 nWhichId; // the WichId to identify the item
+ sal_uInt16 nWhichId; // the WichId to identify the item
// in the pool
- sal_uInt32 nMemberId; // the memberid specifies wich part
+ sal_uInt32 nMemberId; // the memberid specifies wich part
// of the item should be imported or
// exported with this Namespace
// and localName
@@ -94,6 +94,6 @@ SV_DECL_REF( SvXMLItemMapEntries )
SV_IMPL_REF( SvXMLItemMapEntries )
-#endif // _XMLITMAP_HXX
+#endif // _XMLITMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx
index c0edce67c1bf..5cedf38dc8f1 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -2,7 +2,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
@@ -62,12 +62,12 @@ SvXMLItemMapEntries::~SvXMLItemMapEntries()
delete mpImpl;
}
-SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace,
+SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace,
const OUString& rString,
SvXMLItemMapEntry* pStartAt /* = NULL */ ) const
{
- SvXMLItemMapEntry* pMap =
- (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ?
+ SvXMLItemMapEntry* pMap =
+ (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ?
&(pStartAt[1]) : mpImpl->mpEntries;
while( pMap && (pMap->eLocalName != XML_TOKEN_INVALID) )
{
@@ -87,7 +87,7 @@ SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( UINT16 nIndex ) const
UINT16 SvXMLItemMapEntries::getCount() const
{
- return mpImpl->mnCount;
+ return mpImpl->mnCount;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 62b5e3bff91e..a0f23c4d46f5 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -2,7 +2,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
@@ -100,13 +100,13 @@ enum SvXMLTokenMapAttrs
/*
static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
{
- { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE },
- { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE },
- { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE },
- { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA },
- { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE },
- { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD },
- { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR },
+ { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE },
+ { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE },
+ { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE },
+ { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA },
+ { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE },
+ { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD },
+ { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR },
XML_TOKEN_MAP_END
};
*/
diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx
index cc9d683a2818..8fe25c7cf726 100644
--- a/sw/source/filter/xml/xmlscript.cxx
+++ b/sw/source/filter/xml/xmlscript.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 04b458eabfc5..bd3b8662f20b 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -2,7 +2,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
@@ -77,8 +77,8 @@ using table::XCell;
class SwXMLTableColumn_Impl : public SwWriteTableCol
{
- OUString sStyleName;
- sal_uInt32 nRelWidth;
+ OUString sStyleName;
+ sal_uInt32 nRelWidth;
public:
@@ -117,9 +117,9 @@ IMPL_CONTAINER_SORT( SwXMLTableColumnsSortByWidth_Impl, SwXMLTableColumn_Impl,
class SwXMLTableLines_Impl
{
- SwXMLTableColumns_Impl aCols;
- const SwTableLines *pLines;
- sal_uInt32 nWidth;
+ SwXMLTableColumns_Impl aCols;
+ const SwTableLines *pLines;
+ sal_uInt32 nWidth;
public:
@@ -385,10 +385,10 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
// order is: -/-/-/num,
// -/-/box/-, --/-/box/num,
- // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num,
- // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num,
- // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-,
- // vert/brush/box/num
+ // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num,
+ // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num,
+ // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-,
+ // vert/brush/box/num
sal_uInt32 nCount2 = Count();
sal_Bool bInsert = sal_True;
sal_uInt32 i;
@@ -605,7 +605,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
const SwXMLTableColumns_Impl& rCols = pLines->GetColumns();
sal_uInt16 nCPos = 0U;
sal_uInt16 nColumns = rCols.Count();
- for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ )
+ for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ )
{
SwXMLTableColumn_Impl *pColumn = rCols[nColumn];
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index ec2db6ae38d5..86bbe4ab701e 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2,7 +2,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
@@ -114,12 +114,12 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,
XML_TOK_TABLE_HEADER_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS,
XML_TOK_TABLE_HEADER_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
{ XML_NAMESPACE_OFFICE, XML_DDE_SOURCE,
XML_TOK_OFFICE_DDE_SOURCE },
@@ -128,7 +128,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
// supported in Writer (they are Calc-only features), so we
// support column groups by simply using the <table:table-columns>
// token for column groups, too.
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS },
XML_TOKEN_MAP_END
};
@@ -175,17 +175,17 @@ class SwXMLTableCell_Impl
OUString mXmlId;
- OUString sFormula; // cell formula; valid if length > 0
- double dValue; // formula value
+ OUString sFormula; // cell formula; valid if length > 0
+ double dValue; // formula value
- SvXMLImportContextRef xSubTable;
+ SvXMLImportContextRef xSubTable;
const SwStartNode *pStartNode;
sal_uInt32 nRowSpan;
sal_uInt32 nColSpan;
sal_Bool bProtected : 1;
- sal_Bool bHasValue; // determines whether dValue attribute is valid
+ sal_Bool bHasValue; // determines whether dValue attribute is valid
sal_Bool mbCovered;
sal_Bool mbTextValue;
@@ -403,19 +403,19 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext
OUString sSaveParaDefault;
OUString mXmlId;
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef xMyTable;
double fValue;
sal_Bool bHasValue;
sal_Bool bHasTextValue;
sal_Bool bProtect;
- sal_uInt32 nRowSpan;
- sal_uInt32 nColSpan;
- sal_uInt32 nColRepeat;
+ sal_uInt32 nRowSpan;
+ sal_uInt32 nColSpan;
+ sal_uInt32 nColRepeat;
- sal_Bool bHasTextContent : 1;
- sal_Bool bHasTableContent : 1;
+ sal_Bool bHasTextContent : 1;
+ sal_Bool bHasTableContent : 1;
SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
@@ -724,7 +724,7 @@ void SwXMLTableCellContext_Impl::EndElement()
class SwXMLTableColContext_Impl : public SvXMLImportContext
{
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef xMyTable;
SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
@@ -811,7 +811,7 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl()
class SwXMLTableColsContext_Impl : public SvXMLImportContext
{
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef xMyTable;
sal_Bool bHeader;
SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
@@ -872,9 +872,9 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext(
class SwXMLTableRowContext_Impl : public SvXMLImportContext
{
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef xMyTable;
- sal_uInt32 nRowRepeat;
+ sal_uInt32 nRowRepeat;
SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
@@ -994,7 +994,7 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext(
class SwXMLTableRowsContext_Impl : public SvXMLImportContext
{
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef xMyTable;
sal_Bool bHeader;
@@ -1076,11 +1076,11 @@ public:
virtual void StartElement(
const Reference<xml::sax::XAttributeList> & xAttrList);
- OUString& GetConnectionName() { return sConnectionName; }
- OUString& GetDDEApplication() { return sDDEApplication; }
- OUString& GetDDEItem() { return sDDEItem; }
- OUString& GetDDETopic() { return sDDETopic; }
- sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
+ OUString& GetConnectionName() { return sConnectionName; }
+ OUString& GetDDEApplication() { return sDDEApplication; }
+ OUString& GetDDEItem() { return sDDEItem; }
+ OUString& GetDDETopic() { return sDDETopic; }
+ sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
};
TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext );
@@ -1155,10 +1155,10 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
{
sPrefixStr = String('_');
}
-// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii())
-// {
-// sPrefixStr.Insert('_', 0);
-// }
+// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii())
+// {
+// sPrefixStr.Insert('_', 0);
+// }
// else: name is OK.
// increase count until we find a name that is not yet taken
@@ -2542,8 +2542,8 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
sal_Int32 nExtraAbs =
nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L;
- sal_Bool bMin = sal_False; // Do all columns get the mininum width?
- sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus
+ sal_Bool bMin = sal_False; // Do all columns get the mininum width?
+ sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus
// some extra space?
if( nAbsForRelWidth <= nMinAbs )
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 7d7296b2ef19..4f991d9bb629 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -2,7 +2,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
@@ -63,14 +63,14 @@ namespace com { namespace sun { namespace star {
class SwXMLTableContext : public XMLTextTableContext
{
- ::rtl::OUString aStyleName;
- ::rtl::OUString aDfltCellStyleName;
+ ::rtl::OUString aStyleName;
+ ::rtl::OUString aDfltCellStyleName;
/// NB: this contains the xml:id only if this table is a subtable!
::rtl::OUString mXmlId;
- SvUShorts aColumnWidths;
- SvBools aColumnRelWidths;
- SvStringsDtor *pColumnDefaultCellStyleNames;
+ SvUShorts aColumnWidths;
+ SvBools aColumnRelWidths;
+ SvStringsDtor *pColumnDefaultCellStyleNames;
::com::sun::star::uno::Reference <
::com::sun::star::text::XTextCursor > xOldCursor;
@@ -79,12 +79,12 @@ class SwXMLTableContext : public XMLTextTableContext
SwXMLTableRows_Impl *pRows;
- SwTableNode *pTableNode;
- SwTableBox *pBox1;
- const SwStartNode *pSttNd1;
+ SwTableNode *pTableNode;
+ SwTableBox *pBox1;
+ const SwStartNode *pSttNd1;
- SwTableBoxFmt *pBoxFmt;
- SwTableLineFmt *pLineFmt;
+ SwTableBoxFmt *pBoxFmt;
+ SwTableLineFmt *pLineFmt;
// hash map of shared format, indexed by the (XML) style name,
// the column width, and protection flag
@@ -92,18 +92,18 @@ class SwXMLTableContext : public XMLTextTableContext
TableBoxIndexHasher> map_BoxFmt;
map_BoxFmt* pSharedBoxFormats;
- SvXMLImportContextRef xParentTable; // if table is a sub table
+ SvXMLImportContextRef xParentTable; // if table is a sub table
- SwXMLDDETableContext_Impl *pDDESource;
+ SwXMLDDETableContext_Impl *pDDESource;
- sal_Bool bFirstSection : 1;
- sal_Bool bRelWidth : 1;
+ sal_Bool bFirstSection : 1;
+ sal_Bool bRelWidth : 1;
sal_Bool bHasSubTables : 1;
USHORT nHeaderRows;
- sal_uInt32 nCurRow;
- sal_uInt32 nCurCol;
- sal_Int32 nWidth;
+ sal_uInt32 nCurRow;
+ sal_uInt32 nCurCol;
+ sal_Int32 nWidth;
SwTableBox *NewTableBox( const SwStartNode *pStNd,
SwTableLine *pUpper );
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index d95471801959..aa9524b15821 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -2,7 +2,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
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index b6d2b0698757..9765dfc6255a 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode(
SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt();
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
- return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode();
+ return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode();
}
void SwXMLTextParagraphExport::exportStyleContent(
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 37045870d389..9b9ecfd2aa9a 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ class SwNoTxtNode;
namespace com { namespace sun { namespace star { namespace style {
class XStyle; } } } }
-class SwXMLTextParagraphExport : public XMLTextParagraphExport
+class SwXMLTextParagraphExport : public XMLTextParagraphExport
{
const ::rtl::OUString sTextTable;
const ::rtl::OUString sEmbeddedObjectProtocol;
@@ -50,7 +50,7 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
const SvGlobalName aIFrameClassId;
const SvGlobalName aOutplaceClassId;
- SwNoTxtNode *GetNoTxtNode(
+ SwNoTxtNode *GetNoTxtNode(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet ) const;
@@ -86,6 +86,6 @@ public:
};
-#endif // _XMLTEXTE_HXX
+#endif // _XMLTEXTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8d3a0341100a..161e659b813b 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -2,7 +2,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
@@ -88,16 +88,16 @@ using namespace xml::sax;
struct XMLServiceMapEntry_Impl
{
const sal_Char *sFilterService;
- sal_Int32 nFilterServiceLen;
+ sal_Int32 nFilterServiceLen;
- sal_uInt32 n1;
- sal_uInt16 n2, n3;
- sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11;
+ sal_uInt32 n1;
+ sal_uInt16 n2, n3;
+ sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11;
};
#define SERVICE_MAP_ENTRY( app, s ) \
{ XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1, \
- SO3_##s##_CLASSID }
+ SO3_##s##_CLASSID }
const XMLServiceMapEntry_Impl aServiceMap[] =
{
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 2107746cffed..b3752c4efc87 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -2,7 +2,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
@@ -104,20 +104,20 @@ public:
// redlining helper methods
// (here is the real implementation)
virtual void RedlineAdd(
- const ::rtl::OUString& rType, /// redline type (insert, del,... )
- const ::rtl::OUString& rId, /// use to identify this redline
- const ::rtl::OUString& rAuthor, /// name of the author
- const ::rtl::OUString& rComment, /// redline comment
- const ::com::sun::star::util::DateTime& rDateTime, /// date+time
+ const ::rtl::OUString& rType, /// redline type (insert, del,... )
+ const ::rtl::OUString& rId, /// use to identify this redline
+ const ::rtl::OUString& rAuthor, /// name of the author
+ const ::rtl::OUString& rComment, /// redline comment
+ const ::com::sun::star::util::DateTime& rDateTime, /// date+time
sal_Bool bMergeLastPara); /// merge last paragraph
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
- ::com::sun::star::uno::Reference< /// needed to get the document
+ ::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> & rOldCursor,
- const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
+ const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
- const ::rtl::OUString& rId, /// ID used to RedlineAdd() call
- sal_Bool bStart, /// start or end Cursor
+ const ::rtl::OUString& rId, /// ID used to RedlineAdd() call
+ sal_Bool bStart, /// start or end Cursor
sal_Bool bIsOutsideOfParagraph);
virtual void RedlineAdjustStartNodeCursor(
sal_Bool bStart);
@@ -127,6 +127,6 @@ public:
const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
};
-#endif // _XMLTEXTI_HXX
+#endif // _XMLTEXTI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4831b71b82b2..0d20e7379ce5 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -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
@@ -58,13 +58,13 @@ String STR_PAGE_COUNT_MACRO
// folder in default_images. This list is now only used for special toolboxes that are
// used in floating windows.
-#define IMAGELIST_AND_COUNT \
- IdList = { \
- FN_FORMULA_CALC ;\
- FN_FORMULA_CANCEL ;\
- FN_FORMULA_APPLY ;\
- }; \
- IdCount = { \
+#define IMAGELIST_AND_COUNT \
+ IdList = { \
+ FN_FORMULA_CALC ;\
+ FN_FORMULA_CANCEL ;\
+ FN_FORMULA_APPLY ;\
+ }; \
+ IdCount = { \
3; \
};
@@ -172,12 +172,12 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
};
- ImageList 1 // == BMP_COLOR_NORMAL + 1
+ ImageList 1 // == BMP_COLOR_NORMAL + 1
{
Prefix = "sf";
STYLE_IMAGE_LISTEF
};
- ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
+ ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
{
Prefix = "sfh";
STYLE_IMAGE_LISTEF
@@ -478,7 +478,7 @@ String STR_FDLG_OUTLINE_LEVEL
String STR_FDLG_STYLE
{
- Text [ en-US ] = "Style: ";
+ Text [ en-US ] = "Style: ";
};
String STR_PAGEOFFSET
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index bf00c939a948..9c016b42d75a 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -2,7 +2,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
@@ -83,9 +83,9 @@
#include "envelp.hrc"
#include "envimg.hxx"
-#define ENV_NEWDOC RET_OK
-#define ENV_INSERT RET_USER
-#define ENV_CANCEL SHRT_MAX
+#define ENV_NEWDOC RET_OK
+#define ENV_INSERT RET_USER
+#define ENV_CANCEL SHRT_MAX
// Function used for labels and envelopes in applab.cxx and appenv.cxx
@@ -142,7 +142,7 @@ String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText
}
rSh.InsertLineBreak();
}
- rSh.DelLeft(); // Again remove last linebreak
+ rSh.DelLeft(); // Again remove last linebreak
return sRet;
}
@@ -160,15 +160,15 @@ void SwModule::InsertEnv( SfxRequest& rReq )
{
static USHORT nTitleNo = 0;
- SwDocShell *pMyDocSh;
- SfxViewFrame *pFrame;
+ SwDocShell *pMyDocSh;
+ SfxViewFrame *pFrame;
SwView *pNewView;
- SwWrtShell *pOldSh,
+ SwWrtShell *pOldSh,
*pSh;
// Get current shell
pMyDocSh = (SwDocShell*) SfxObjectShell::Current();
- pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
+ pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
// Create new document (don't show!)
SfxObjectShellRef xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
@@ -510,7 +510,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
rReq.Done();
}
- else //Abbruch
+ else //Abbruch
{
rReq.Ignore();
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index c73421f1e90c..4676f13bcdb6 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@
#include <srcview.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h> // Funktion-Ids
#include <initui.hxx>
#include <uitool.hxx>
#include <swmodule.hxx>
@@ -85,7 +85,7 @@
#include <cfgitems.hxx>
#include <prtopt.hxx>
#include <modcfg.hxx>
-#include <globals.h> // globale Konstanten z.B.
+#include <globals.h> // globale Konstanten z.B.
#include <app.hrc>
#include <fontcfg.hxx>
#include <barcfg.hxx>
@@ -257,7 +257,7 @@ SwView* lcl_LoadDoc(SwView* pView, const String& rURL)
return pNewView;
}
/*--------------------------------------------------------------------
- Beschreibung: Felddialog starten
+ Beschreibung: Felddialog starten
--------------------------------------------------------------------*/
void NewXForms( SfxRequest& rReq ); // implementation: below
@@ -267,10 +267,10 @@ namespace
class SwMailMergeWizardExecutor : public salhelper::SimpleReferenceObject
{
- SwView* m_pView; // never owner
+ SwView* m_pView; // never owner
SwView* m_pView2Close; // never owner
- SwMailMergeConfigItem* m_pMMConfig; // sometimes owner
- AbstractMailMergeWizard* m_pWizard; // always owner
+ SwMailMergeConfigItem* m_pMMConfig; // sometimes owner
+ AbstractMailMergeWizard* m_pWizard; // always owner
DECL_LINK( EndDialogHdl, AbstractMailMergeWizard* );
DECL_LINK( DestroyDialogHdl, AbstractMailMergeWizard* );
@@ -726,7 +726,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
else if(rHint.ISA(SfxItemSetHint))
{
- if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME))
+ if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME))
{
::GetGlossaries()->UpdateGlosPath( sal_False );
SwGlossaryList* pList = ::GetGlossaryList();
@@ -858,7 +858,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
}
-SwDBConfig* SwModule::GetDBConfig()
+SwDBConfig* SwModule::GetDBConfig()
{
if(!pDBConfig)
pDBConfig = new SwDBConfig;
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index dfc364e1dcaa..9bc1b97667d9 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -2,7 +2,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
@@ -112,10 +112,10 @@ const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
}
- const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
+ const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
OSL_ENSURE( pFmt, "Fly not inserted" );
- rSh.UnSelectFrm(); //Frame was selected automatically
+ rSh.UnSelectFrm(); //Frame was selected automatically
rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
@@ -151,10 +151,10 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem,
aSet.Put(SwFmtVertOrient(rItem.lUpper + nRow * rItem.lVDist,
text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
}
- const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
+ const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True, &rFmt ); // Insert Fly
OSL_ENSURE( pFmt, "Fly not inserted" );
- rSh.UnSelectFrm(); //Frame was selected automatically
+ rSh.UnSelectFrm(); //Frame was selected automatically
rSh.SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
@@ -237,7 +237,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
SwWrtShell *pSh = pNewView->GetWrtShellPtr();
OSL_ENSURE( pSh, "missing WrtShell" );
- { // block for locks the dispatcher!!
+ { // block for locks the dispatcher!!
SwWait aWait( (SwDocShell&)*xDocSh, sal_True );
@@ -246,7 +246,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
pSh->DoUndo( sal_False );
pSh->StartAllAction();
- pSh->SetNewDoc(); // Avoid performance problems
+ pSh->SetNewDoc(); // Avoid performance problems
SwPageDesc aDesc = pSh->GetPageDesc( 0 );
SwFrmFmt& rFmt = aDesc.GetMaster();
@@ -268,7 +268,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
aDesc.ChgFooterShare(sal_False);
- aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Seitennumerierung
+ aDesc.SetUseOn(nsUseOnPage::PD_ALL); // Seitennumerierung
// Einstellen der Seitengroesse
rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
@@ -297,7 +297,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
pSh->ChgPageDesc( 0, aDesc );
// Rahmen einfuegen
- SwFldMgr* pFldMgr = new SwFldMgr;
+ SwFldMgr* pFldMgr = new SwFldMgr;
pFldMgr->SetEvalExpFlds(sal_False);
//fix(24446): Damit der Text der Ettiketten nicht im unbedruckbaren
@@ -319,17 +319,17 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
// Rahmenvorlage vorbereiten
SwFrmFmt* pFmt = pSh->GetFrmFmtFromPool( RES_POOLFRM_LABEL );
- SwFmtFrmSize aFrmSize( ATT_FIX_SIZE,
+ SwFmtFrmSize aFrmSize( ATT_FIX_SIZE,
rItem.lHDist - (rItem.lHDist-rItem.lWidth),
rItem.lVDist - (rItem.lVDist-rItem.lHeight));
pFmt->SetFmtAttr(aFrmSize);
- SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth),
+ SvxLRSpaceItem aFrmLRSpace( 0, (sal_uInt16)(rItem.lHDist - rItem.lWidth),
0, 0,
RES_LR_SPACE);
pFmt->SetFmtAttr(aFrmLRSpace);
- SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight),
+ SvxULSpaceItem aFrmULSpace( 0, (sal_uInt16)(rItem.lVDist - rItem.lHeight),
RES_UL_SPACE);
pFmt->SetFmtAttr(aFrmULSpace);
@@ -365,10 +365,10 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
pSh->Pop( bInFly );
if( bInFly )
- pSh->EndDoc(sal_True); // select all content
+ pSh->EndDoc(sal_True); // select all content
// in the fly
else
- pSh->SetMark(); // set only the mark
+ pSh->SetMark(); // set only the mark
SwSectionData aSect(CONTENT_SECTION,
String::CreateFromAscii(MASTER_LABEL));
@@ -384,9 +384,9 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
sLinkName += String::CreateFromAscii(MASTER_LABEL);
aSect.SetLinkFileName(sLinkName);
aSect.SetProtectFlag(true);
- pSh->Insert(aDotStr); // Dummytext zum Zuweisen der Section
+ pSh->Insert(aDotStr); // Dummytext zum Zuweisen der Section
pSh->SttDoc();
- pSh->EndDoc(sal_True); // Alles im Rahmen selektieren
+ pSh->EndDoc(sal_True); // Alles im Rahmen selektieren
pSh->InsertSection(aSect);
}
pSh->Pop( sal_False );
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 2a3299498c7a..61d77c354d54 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <hintids.hxx>
-#include <cmdid.h> // Funktion-Ids
+#include <cmdid.h> // Funktion-Ids
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -58,8 +58,8 @@
#include <wrtsh.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <uitool.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
-#include <fldbas.hxx> //fuer UpdateFields
+#include <initui.hxx> // fuer ::GetGlossaries()
+#include <fldbas.hxx> //fuer UpdateFields
#include <wview.hxx>
#include <cfgitems.hxx>
#include <prtopt.hxx>
@@ -73,7 +73,7 @@
#include <editeng/unolingu.hxx>
#include <globals.hrc>
-#include <globals.h> // globale Konstanten z.B.
+#include <globals.h> // globale Konstanten z.B.
#include <svl/slstitm.hxx>
#include "swabstdlg.hxx"
#include <swwrtshitem.hxx>
@@ -83,7 +83,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-SfxItemSet* SwModule::CreateItemSet( USHORT nId )
+SfxItemSet* SwModule::CreateItemSet( USHORT nId )
{
BOOL bTextDialog = (nId == SID_SW_EDITOPTIONS) ? TRUE : FALSE;
@@ -109,25 +109,25 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId )
/********************************************************************/
/* Options/Edit */
/********************************************************************/
- SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM,
- SID_PRINTPREVIEW, SID_PRINTPREVIEW,
- SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS,
- FN_PARAM_PRINTER, FN_PARAM_STDFONTS,
- FN_PARAM_WRTSHELL, FN_PARAM_WRTSHELL,
- FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
- SID_ATTR_METRIC, SID_ATTR_METRIC,
+ SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM,
+ SID_PRINTPREVIEW, SID_PRINTPREVIEW,
+ SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS,
+ FN_PARAM_PRINTER, FN_PARAM_STDFONTS,
+ FN_PARAM_WRTSHELL, FN_PARAM_WRTSHELL,
+ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
+ SID_ATTR_METRIC, SID_ATTR_METRIC,
SID_ATTR_APPLYCHARUNIT, SID_ATTR_APPLYCHARUNIT,
- SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP,
- RES_BACKGROUND, RES_BACKGROUND,
- SID_HTML_MODE, SID_HTML_MODE,
- FN_PARAM_SHADOWCURSOR, FN_PARAM_SHADOWCURSOR,
+ SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP,
+ RES_BACKGROUND, RES_BACKGROUND,
+ SID_HTML_MODE, SID_HTML_MODE,
+ FN_PARAM_SHADOWCURSOR, FN_PARAM_SHADOWCURSOR,
FN_PARAM_CRSR_IN_PROTECTED, FN_PARAM_CRSR_IN_PROTECTED,
FN_HSCROLL_METRIC, FN_VSCROLL_METRIC,
SID_ATTR_LANGUAGE, SID_ATTR_LANGUAGE,
SID_ATTR_CHAR_CJK_LANGUAGE, SID_ATTR_CHAR_CJK_LANGUAGE,
SID_ATTR_CHAR_CTL_LANGUAGE, SID_ATTR_CHAR_CTL_LANGUAGE,
#if OSL_DEBUG_LEVEL > 1
- FN_PARAM_SWTEST, FN_PARAM_SWTEST,
+ FN_PARAM_SWTEST, FN_PARAM_SWTEST,
#endif
0);
@@ -281,7 +281,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
if(!aViewOpt.IsViewMetaChars())
{
- if( (!aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab) ||
+ if( (!aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab) ||
(!aViewOpt.IsBlank( TRUE ) && pDocDispItem->bSpace) ||
(!aViewOpt.IsParagraph( TRUE ) && pDocDispItem->bParagraphEnd) ||
(!aViewOpt.IsLineBreak( TRUE ) && pDocDispItem->bManualBreak) )
@@ -404,7 +404,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
//--------------------------------------------------------------------------
- // Writer Drucker Zusatzeinstellungen auswerten
+ // Writer Drucker Zusatzeinstellungen auswerten
//----------------------------------------------------------------------------
if( SFX_ITEM_SET == rSet.GetItemState(
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index a7083b41cb14..5bfd6ea179ee 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -2,7 +2,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
@@ -68,18 +68,18 @@
#include <swwait.hxx>
#include <swprtopt.hxx>
#include <frmatr.hxx>
-#include <view.hxx> // fuer die aktuelle Sicht
+#include <view.hxx> // fuer die aktuelle Sicht
#include <edtwin.hxx>
#include <PostItMgr.hxx>
-#include <wrtsh.hxx> // Verbindung zur Core
-#include <docsh.hxx> // Dokumenterzeugung
+#include <wrtsh.hxx> // Verbindung zur Core
+#include <docsh.hxx> // Dokumenterzeugung
#include <basesh.hxx>
#include <viewopt.hxx>
#include <wdocsh.hxx>
#include <swmodule.hxx>
#include <globdoc.hxx>
#include <usrpref.hxx>
-#include <shellio.hxx> // I/O
+#include <shellio.hxx> // I/O
#include <docstyle.hxx>
#include <doc.hxx>
#include <docstat.hxx>
@@ -98,7 +98,7 @@
#include <fldbas.hxx>
#include <docary.hxx>
// <--
-#include <swerror.h> // Fehlermeldungen
+#include <swerror.h> // Fehlermeldungen
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
@@ -321,7 +321,7 @@ BOOL SwDocShell::Save()
pView->GetEditWin().StopQuickHelp();
SwWait aWait( *this, TRUE );
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -448,7 +448,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
}
}
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -551,7 +551,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
WriterRef xWriter;
SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
if( !xWriter.Is() )
- { // Filter not available
+ { // Filter not available
InfoBox( 0,
SW_RESSTR(STR_DLLNOTFOUND) ).Execute();
return FALSE;
@@ -624,7 +624,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
SwDocStat aDocStat( pDoc->GetDocStat() );;
pDoc->UpdateDocStat( aDocStat );
// <--
- CalcLayoutForOLEObjects(); // format for OLE objets
+ CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
// reset compatibility flag <DoNotCaptureDrawObjsOnPage>, if possible
if ( pWrtShell && pDoc &&
@@ -761,7 +761,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
SwWriter aWrt( rMedium, *pWrtShell, TRUE );
nErrno = aWrt.Write( xWriter, &aFileName );
//JP 16.05.97: falls der SFX uns die View waehrend des speicherns
- // entzieht
+ // entzieht
if( pWrtShell )
{
pWrtShell->Pop(FALSE);
@@ -795,7 +795,7 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium )
}
/*--------------------------------------------------------------------
- Beschreibung: Haende weg
+ Beschreibung: Haende weg
--------------------------------------------------------------------*/
@@ -859,7 +859,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
if ( rSetup.GetPrinterName().Len() && ASPECT_THUMBNAIL != nAspect )
{
pOrig = const_cast<JobSetup*>(pDoc->getJobsetup());
- if( pOrig ) // dann kopieren wir uns den
+ if( pOrig ) // dann kopieren wir uns den
pOrig = new JobSetup( *pOrig );
pDoc->setJobsetup( rSetup );
}
@@ -993,7 +993,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
void SwDocShell::GetState(SfxItemSet& rSet)
{
SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ USHORT nWhich = aIter.FirstWhich();
while (nWhich)
{
@@ -1005,7 +1005,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
if ( !bDisable )
{
SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this);
- while (pTmpFrm) // Preview suchen
+ while (pTmpFrm) // Preview suchen
{
if ( PTR_CAST(SwView, pTmpFrm->GetViewShell()) &&
((SwView*)pTmpFrm->GetViewShell())->GetWrtShell().getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE))
@@ -1097,15 +1097,15 @@ void SwDocShell::GetState(SfxItemSet& rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: OLE-Hdls
+ Beschreibung: OLE-Hdls
--------------------------------------------------------------------*/
IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
{
// vom Doc wird der Status mitgegeben (siehe doc.cxx)
- // Bit 0: -> alter Zustand
- // Bit 1: -> neuer Zustand
+ // Bit 0: -> alter Zustand
+ // Bit 1: -> neuer Zustand
long nStatus = (long)p;
if( IsEnableSetModified() )
SetModified( (nStatus & 2) ? TRUE : FALSE );
@@ -1113,11 +1113,11 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
}
/*--------------------------------------------------------------------
- Beschreibung: Pool returnen Hier weil virtuelll
+ Beschreibung: Pool returnen Hier weil virtuelll
--------------------------------------------------------------------*/
-SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool()
+SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool()
{
return mxBasePool.get();
}
@@ -1261,7 +1261,7 @@ static const char* pEventNames[] =
"OnLayoutFinished"
};
-Sequence< OUString > SwDocShell::GetEventNames()
+Sequence< OUString > SwDocShell::GetEventNames()
{
Sequence< OUString > aRet = SfxObjectShell::GetEventNames();
sal_Int32 nLen = aRet.getLength();
@@ -1297,13 +1297,13 @@ bool SwDocShell::IsChangeRecording() const
return (pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
}
-
+
bool SwDocShell::HasChangeRecordProtection() const
{
return pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
}
-
+
void SwDocShell::SetChangeRecording( bool bActivate )
{
USHORT nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0;
@@ -1311,13 +1311,13 @@ void SwDocShell::SetChangeRecording( bool bActivate )
pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn);
}
-
+
bool SwDocShell::SetProtectionPassword( const String &rNewPassword )
{
const SfxAllItemSet aSet( GetPool() );
const SfxItemSet* pArgs = &aSet;
const SfxPoolItem* pItem = NULL;
-
+
IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess();
Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword();
if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem )
@@ -1325,12 +1325,12 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword )
return false;
bool bRes = false;
-
+
if (rNewPassword.Len())
{
// when password protection is applied change tracking must always be active
SetChangeRecording( true );
-
+
Sequence< sal_Int8 > aNewPasswd;
SvPasswordHelper::GetHashPassword( aNewPasswd, rNewPassword );
pIDRA->SetRedlinePassword( aNewPasswd );
@@ -1345,7 +1345,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword )
return bRes;
}
-
+
bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash )
{
bool bRes = false;
@@ -1353,7 +1353,7 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
const SfxAllItemSet aSet( GetPool() );
const SfxItemSet* pArgs = &aSet;
const SfxPoolItem* pItem = NULL;
-
+
IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess();
Sequence< sal_Int8 > aPasswdHash( pIDRA->GetRedlinePassword() );
if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem )
@@ -1363,8 +1363,8 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
bRes = true;
return bRes;
-}
-
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 4531e1bfc1d4..3047c3dea74a 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -74,8 +74,8 @@
#include <swunodef.hxx>
#include <fmtcol.hxx>
#include <swevent.hxx>
-#include <view.hxx> // fuer die aktuelle Sicht
-#include <docsh.hxx> // Dokumenterzeugung
+#include <view.hxx> // fuer die aktuelle Sicht
+#include <docsh.hxx> // Dokumenterzeugung
#include <wrtsh.hxx>
#include <fldbas.hxx>
#include <viewopt.hxx>
@@ -122,7 +122,7 @@
#include "dialog.hrc"
#include "swabstdlg.hxx"
-#include <ndtxt.hxx> //#outline level,add by zhaojianwei
+#include <ndtxt.hxx> //#outline level,add by zhaojianwei
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::lang;
@@ -133,7 +133,7 @@ using namespace ::sfx2;
extern BOOL FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
/*--------------------------------------------------------------------
- Beschreibung: DocInfo kreieren (virtuell)
+ Beschreibung: DocInfo kreieren (virtuell)
--------------------------------------------------------------------*/
SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
@@ -166,7 +166,7 @@ void SwDocShell::DoFlushDocInfo()
bool bUnlockView(true);
if ( pWrtShell ) {
bUnlockView = !pWrtShell->IsViewLocked();
- pWrtShell->LockView( TRUE ); // lock visible section
+ pWrtShell->LockView( TRUE ); // lock visible section
pWrtShell->StartAllAction();
}
@@ -240,7 +240,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( pWrtShell )
{
bUnlockView = !pWrtShell->IsViewLocked();
- pWrtShell->LockView( TRUE ); //lock visible section
+ pWrtShell->LockView( TRUE ); //lock visible section
pWrtShell->StartAllAction();
}
switch( nAction )
@@ -283,7 +283,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
/*--------------------------------------------------------------------
- Beschreibung: Benachrichtigung Doc schliessen
+ Beschreibung: Benachrichtigung Doc schliessen
--------------------------------------------------------------------*/
USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
@@ -307,17 +307,17 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
}
/*--------------------------------------------------------------------
- Beschreibung: Organizer
+ Beschreibung: Organizer
--------------------------------------------------------------------*/
BOOL SwDocShell::Insert( SfxObjectShell &rSource,
- USHORT nSourceIdx1, // SourcePool: oberste Inhaltsebene (Vorlagen/Makros)
- USHORT nSourceIdx2, // Index in den Inhalt
- USHORT nSourceIdx3, // Index in die Inhaltsebene
- USHORT &rIdx1, // und das gleiche fuer den DestinationPool
- USHORT &rIdx2, // ""
- USHORT &rIdx3, // ""
- USHORT &rRemovedIdx ) // falls doppelte geloescht werden, Pos zurueck
+ USHORT nSourceIdx1, // SourcePool: oberste Inhaltsebene (Vorlagen/Makros)
+ USHORT nSourceIdx2, // Index in den Inhalt
+ USHORT nSourceIdx3, // Index in die Inhaltsebene
+ USHORT &rIdx1, // und das gleiche fuer den DestinationPool
+ USHORT &rIdx2, // ""
+ USHORT &rIdx3, // ""
+ USHORT &rRemovedIdx ) // falls doppelte geloescht werden, Pos zurueck
{
// --> OD 2005-05-10 #i48949# - actions aren't undoable. Thus, allow no undo
// actions
@@ -337,7 +337,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
SwDocStyleSheetPool* pMyPool =
(SwDocStyleSheetPool*)GetStyleSheetPool();
- // wir koennen nicht in uns selbst hin und her moven
+ // wir koennen nicht in uns selbst hin und her moven
if( pHisPool == pMyPool )
return FALSE;
@@ -413,7 +413,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
pMyPool->SetSearchMask( SFX_STYLE_FAMILY_ALL, nMySrchMask );
- if( xNewSheet->IsUserDefined() || xNewSheet->IsUsed() )
+ if( xNewSheet->IsUserDefined() || xNewSheet->IsUsed() )
{
// Benutzte und Benutzer-definierte Vorlagen werden angezeigt.
// Dshalb muss hier der Index der neuen Vorlage im Pool
@@ -446,14 +446,14 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
while (pTestSheet)
{
if (pTestSheet->GetFamily() == eOldFamily &&
- pTestSheet->HasParentSupport() &&
+ pTestSheet->HasParentSupport() &&
pTestSheet->GetParent() == rOldName)
{
pTestSheet->SetParent(rOldName); // Verknuepfung neu aufbauen
}
if (pTestSheet->GetFamily() == eOldFamily &&
- pTestSheet->HasFollowSupport() &&
+ pTestSheet->HasFollowSupport() &&
pTestSheet->GetFollow() == rOldName)
{
pTestSheet->SetFollow(rOldName); // Verknuepfung neu aufbauen
@@ -527,10 +527,10 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource,
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlagen Remove
+ Beschreibung: Vorlagen Remove
--------------------------------------------------------------------*/
-BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
+BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
USHORT nIdx2,
USHORT nIdx3)
{
@@ -540,7 +540,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
{
SwDocStyleSheetPool* pMyPool = (SwDocStyleSheetPool*)GetStyleSheetPool();
- pMyPool->First(); // vorm Zugriff Pool aktualisieren!!
+ pMyPool->First(); // vorm Zugriff Pool aktualisieren!!
SfxStyleSheetBase* pMySheet = (*pMyPool)[nIdx2];
String aName( pMySheet->GetName() );
@@ -564,14 +564,14 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
while (pTestSheet)
{
if (pTestSheet->GetFamily() == eFamily &&
- pTestSheet->HasParentSupport() &&
+ pTestSheet->HasParentSupport() &&
pTestSheet->GetParent() == aName)
{
pTestSheet->SetParent( aEmptyStr ); // Verknuepfung aufloesen
}
if (pTestSheet->GetFamily() == eFamily &&
- pTestSheet->HasFollowSupport() &&
+ pTestSheet->HasFollowSupport() &&
pTestSheet->GetFollow() == aName)
{
pTestSheet->SetFollow( aEmptyStr ); // Verknuepfung aufloesen
@@ -584,7 +584,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // siehe Insert
bRet = TRUE;
}
else
- bRet = SfxObjectShell::Remove( nIdx1,
+ bRet = SfxObjectShell::Remove( nIdx1,
nIdx2,
nIdx3 );
@@ -678,7 +678,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell );
BOOL bCurrent = IS_TYPE( SwPagePreView, pViewShell );
- while( pTmpFrm ) // search PreView
+ while( pTmpFrm ) // search PreView
{
if( IS_TYPE( SwView, pTmpFrm->GetViewShell()) )
bOnly = FALSE;
@@ -699,7 +699,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
bSet = !bCurrent;
USHORT nSlotId = 0;
- if( bSet && !bFound ) // Keine gefunden, daher neue Preview anlegen
+ if( bSet && !bFound ) // Keine gefunden, daher neue Preview anlegen
{
//Keine neue anlegen fuer BrowseView!
if( !GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) )
@@ -711,7 +711,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
if( nSlotId )
{
//JP 23.8.2001: Bug 91360 - PagePreView in the WebDocShell
- // is found under Id ViewShell2.
+ // is found under Id ViewShell2.
if( ISA(SwWebDocShell) && SID_VIEWSHELL1 == nSlotId )
nSlotId = SID_VIEWSHELL2;
@@ -919,7 +919,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
SvxMacro aMac(aEmptyStr, aEmptyStr, STARBASIC);
pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this);
pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this);
- pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this);
+ pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this);
pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_DEACTIVATEDOC ), aMac, this);
ReloadFromHtml(aTempFile.GetURL(), pSrcView);
nSlot = 0;
@@ -1106,7 +1106,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
break;
case SID_BROWSER_MODE:
- case FN_PRINT_LAYOUT: //Fuer Web, genau umgekehrt zum BrowserMode
+ case FN_PRINT_LAYOUT: //Fuer Web, genau umgekehrt zum BrowserMode
{
int eState = STATE_TOGGLE;
BOOL bSet = sal_True;
@@ -1134,16 +1134,16 @@ void SwDocShell::Execute(SfxRequest& rReq)
SID_HTML_MODE,
SID_RULER_PROTECT,
SID_AUTOSPELL_CHECK,
- FN_RULER, /*20211*/
+ FN_RULER, /*20211*/
FN_VIEW_GRAPHIC, /*20213*/
- FN_VIEW_BOUNDS, /**/
+ FN_VIEW_BOUNDS, /**/
FN_VIEW_FIELDS, /*20215*/
FN_VLINEAL, /*20216*/
FN_VSCROLLBAR, /*20217*/
FN_HSCROLLBAR, /*20218*/
FN_VIEW_META_CHARS, /**/
- FN_VIEW_MARKS, /**/
- FN_VIEW_FIELDNAME, /**/
+ FN_VIEW_MARKS, /**/
+ FN_VIEW_FIELDNAME, /**/
FN_VIEW_TABLEGRID, /*20227*/
FN_PRINT_LAYOUT, /*20237*/
FN_QRY_MERGE, /*20364*/
@@ -1175,8 +1175,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
bDone = FALSE;
BOOL bCreateHtml = FN_NEW_HTML_DOC == nWhich;
- BOOL bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei
- sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei
+ BOOL bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei
+ sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei
String aFileName, aTemplateName;
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, FALSE, &pItem ) )
@@ -1251,7 +1251,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
uno::Reference<XFilePickerControlAccess> xCtrlAcc(xFP, UNO_QUERY);
- bool bOutline[MAXLEVEL] = {false};
+ bool bOutline[MAXLEVEL] = {false};
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
if( rOutlNds.Count() )
{
@@ -1267,16 +1267,16 @@ void SwDocShell::Execute(SfxRequest& rReq)
const USHORT nStyleCount = pDoc->GetTxtFmtColls()->Count();
Sequence<OUString> aListBoxEntries( MAXLEVEL + nStyleCount);
OUString* pEntries = aListBoxEntries.getArray();
- sal_Int32 nIdx = 0 ;
+ sal_Int32 nIdx = 0 ;
- OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) );
+ OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) );
for( USHORT i = 0; i < MAXLEVEL; ++i )
{
if( bOutline[i] )
pEntries[nIdx++] = sOutline + String::CreateFromInt32( i+1 );
}
- OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) );
+ OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) );
for(USHORT i = 0; i < nStyleCount; ++i)
{
SwTxtFmtColl &rTxtColl =
@@ -1323,11 +1323,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
OUString sPrefix = sTmpl.copy( 0L, nColonPos );
if( sPrefix.equalsAscii("Style"))
{
- aTemplateName = sTmpl.copy( 7L ); //get string behind "Style: "
+ aTemplateName = sTmpl.copy( 7L ); //get string behind "Style: "
}
else if( sPrefix.equalsAscii("Outline"))
{
- nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve ";
+ nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve ";
bCreateByOutlineLevel = true;
}
@@ -1505,14 +1505,14 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
{
if (nVersion == SOFFICE_FILEFORMAT_60)
{
- *pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
- *pClipFormat = SOT_FORMATSTR_ID_STARWRITER_60;
+ *pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
+ *pClipFormat = SOT_FORMATSTR_ID_STARWRITER_60;
*pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
}
else if (nVersion == SOFFICE_FILEFORMAT_8)
{
- *pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
- *pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8;
+ *pClassName = SvGlobalName( SO3_SW_CLASSID_60 );
+ *pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8;
*pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
}
// #FIXME check with new Event handling
@@ -1596,8 +1596,8 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
// geladen wurde.
SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
//#59620# HasBasic() zeigt an, dass es schon einen BasicManager an der DocShell
- // gibt. Der wurde im HTML-Import immer angelegt, wenn Macros im Quelltext
- // vorhanden sind.
+ // gibt. Der wurde im HTML-Import immer angelegt, wenn Macros im Quelltext
+ // vorhanden sind.
if( pHtmlOptions && pHtmlOptions->IsStarBasic() && HasBasic())
{
BasicManager *pBasicMan = GetBasicManager();
@@ -1648,7 +1648,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
const String& rMedname = GetMedium()->GetName();
// fix #51032#: Die HTML-Vorlage muss noch gesetzt werden
- SetHTMLTemplate( *GetDoc() ); //Styles aus HTML.vor
+ SetHTMLTemplate( *GetDoc() ); //Styles aus HTML.vor
SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView()
: SfxViewShell::Current();
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx
index 3e082122aae7..1fb22eeccedf 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 33e97d92904a..a3d72763bc56 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -2,7 +2,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
@@ -121,13 +121,13 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
sal_Bool bHTMLTemplSet = sal_False;
if( bRet )
{
- AddLink(); // pDoc / pIo ggf. anlegen
+ AddLink(); // pDoc / pIo ggf. anlegen
sal_Bool bWeb = ISA( SwWebDocShell );
if ( bWeb )
bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );//Styles aus HTML.vor
else if( ISA( SwGlobalDocShell ) )
- GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument
+ GetDoc()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); // Globaldokument
if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
@@ -358,7 +358,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor mit SfxCreateMode ?????
+ Beschreibung: Ctor mit SfxCreateMode ?????
--------------------------------------------------------------------*/
@@ -415,7 +415,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Beschreibung: Dtor
--------------------------------------------------------------------*/
@@ -478,7 +478,7 @@ void SwDocShell::AddLink()
}
else
pDoc->acquire();
- pDoc->SetDocShell( this ); // am Doc den DocShell-Pointer setzen
+ pDoc->SetDocShell( this ); // am Doc den DocShell-Pointer setzen
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
((SwXTextDocument*)xDoc.get())->Reactivate(this);
@@ -489,7 +489,7 @@ void SwDocShell::AddLink()
}
/*--------------------------------------------------------------------
- Beschreibung: neue FontList erzeugen Aenderung Drucker
+ Beschreibung: neue FontList erzeugen Aenderung Drucker
--------------------------------------------------------------------*/
@@ -667,9 +667,9 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
if( pDoc )
RemoveLink();
- AddLink(); // Link setzen und Daten updaten !!
+ AddLink(); // Link setzen und Daten updaten !!
- do { // middle check loop
+ do { // middle check loop
sal_uInt32 nErr = ERR_SWG_READ_ERROR;
String aStreamName;
aStreamName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("styles.xml"));
@@ -718,7 +718,7 @@ void SwDocShell::SubInitNew()
sal_Bool bWeb = ISA(SwWebDocShell);
- sal_uInt16 nRange[] = {
+ sal_uInt16 nRange[] = {
RES_PARATR_ADJUST, RES_PARATR_ADJUST,
RES_CHRATR_COLOR, RES_CHRATR_COLOR,
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 842e79829def..4f0f7c25ff68 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@
#include "docstyle.hxx"
#include "uiitems.hxx"
#include "fmtcol.hxx"
-#include "frmmgr.hxx" //SwFrmValid
+#include "frmmgr.hxx" //SwFrmValid
#include "swevent.hxx"
#include "edtwin.hxx"
#include "unochart.hxx"
@@ -83,7 +83,7 @@
#include <list.hxx>
-#include <paratr.hxx> //#outline level,add by zhaojianwei
+#include <paratr.hxx> //#outline level,add by zhaojianwei
using namespace ::com::sun::star;
@@ -95,7 +95,7 @@ using namespace ::com::sun::star;
void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
{
SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ USHORT nWhich = aIter.FirstWhich();
USHORT nActualFamily = USHRT_MAX;
SwWrtShell* pShell = pSh ? pSh : GetWrtShell();
@@ -170,12 +170,12 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
{
const int nSelection = pShell->GetFrmType(0,TRUE);
if(pShell->GetCurTOX())
- nMask = SWSTYLEBIT_IDX ;
- else if(nSelection & FRMTYPE_HEADER ||
- nSelection & FRMTYPE_FOOTER ||
- nSelection & FRMTYPE_TABLE ||
- nSelection & FRMTYPE_FLY_ANY ||
- nSelection & FRMTYPE_FOOTNOTE ||
+ nMask = SWSTYLEBIT_IDX ;
+ else if(nSelection & FRMTYPE_HEADER ||
+ nSelection & FRMTYPE_FOOTER ||
+ nSelection & FRMTYPE_TABLE ||
+ nSelection & FRMTYPE_FLY_ANY ||
+ nSelection & FRMTYPE_FOOTNOTE ||
nSelection & FRMTYPE_FTNPAGE)
nMask = SWSTYLEBIT_EXTRA;
else
@@ -265,14 +265,14 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
/*--------------------------------------------------------------------
- Beschreibung: StyleSheet-Requeste auswerten
+ Beschreibung: StyleSheet-Requeste auswerten
--------------------------------------------------------------------*/
void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
{
- USHORT nSlot = rReq.GetSlot();
- USHORT nRet = 0xffff;
+ USHORT nSlot = rReq.GetSlot();
+ USHORT nRet = 0xffff;
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
@@ -506,7 +506,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
}
/*--------------------------------------------------------------------
- Beschreibung: Edit
+ Beschreibung: Edit
--------------------------------------------------------------------*/
@@ -738,7 +738,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
delete pDlg;
pDoc->SetModified();
- if( !bModified ) // Bug 57028
+ if( !bModified ) // Bug 57028
pDoc->SetUndoNoResetModified();
GetWrtShell()->EndAllAction();
@@ -799,7 +799,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
mxBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *xTmp.get() ) );
pDoc->SetModified();
- if( !bModified ) // Bug 57028
+ if( !bModified ) // Bug 57028
pDoc->SetUndoNoResetModified();
GetWrtShell()->EndAllAction();
}
@@ -808,7 +808,7 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
}
/*--------------------------------------------------------------------
- Beschreibung: Delete
+ Beschreibung: Delete
--------------------------------------------------------------------*/
@@ -830,7 +830,7 @@ USHORT SwDocShell::Delete(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage anwenden
+ Beschreibung: Vorlage anwenden
--------------------------------------------------------------------*/
@@ -901,7 +901,7 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily,
}
/*--------------------------------------------------------------------
- Beschreibung: Giesskanne starten
+ Beschreibung: Giesskanne starten
--------------------------------------------------------------------*/
@@ -960,7 +960,7 @@ USHORT SwDocShell::DoWaterCan(const String &rName, USHORT nFamily)
}
/*--------------------------------------------------------------------
- Beschreibung: Vorlage Updaten
+ Beschreibung: Vorlage Updaten
--------------------------------------------------------------------*/
@@ -1053,7 +1053,7 @@ USHORT SwDocShell::UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell*
}
/*--------------------------------------------------------------------
- Beschreibung: NewByExample
+ Beschreibung: NewByExample
--------------------------------------------------------------------*/
@@ -1066,7 +1066,7 @@ USHORT SwDocShell::MakeByExample( const String &rName, USHORT nFamily,
if(!pStyle)
{
// JP 07.07.95: behalte die akt. Maske vom PI bei, dadurch werden
- // neue sofort in den sichtbaren Bereich einsortiert
+ // neue sofort in den sichtbaren Bereich einsortiert
if( SFXSTYLEBIT_ALL == nMask || SFXSTYLEBIT_USED == nMask )
nMask = SFXSTYLEBIT_USERDEF;
else
@@ -1214,7 +1214,7 @@ void SwDocShell::LoadStyles( SfxObjectShell& rSource )
--------------------------------------------------*/
void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument )
{
-/* [Beschreibung]
+/* [Beschreibung]
Diese Methode wird vom SFx gerufen, wenn aus einer Dokument-Vorlage
Styles nachgeladen werden sollen. Bestehende Styles soll dabei
@@ -1229,8 +1229,8 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocu
if( rSource.ISA( SwDocShell ))
{
//JP 28.05.99: damit die Kopf-/Fusszeilen nicht den fixen Inhalt
- // der Vorlage erhalten, einmal alle FixFelder der
- // Source aktualisieren
+ // der Vorlage erhalten, einmal alle FixFelder der
+ // Source aktualisieren
if(!bPreserveCurrentDocument)
((SwDocShell&)rSource).pDoc->SetFixFields(false, NULL);
if( pWrtShell )
@@ -1256,7 +1256,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocu
}
-void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell* pActShell )
+void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell* pActShell )
{
Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, FALSE, bColumn, pActShell);
}
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 922a819310b7..95ce69ec43f8 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2,7 +2,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
@@ -71,11 +71,11 @@
// MD 06.02.95: Die Formatnamen in der Liste aller Namen haben als
// erstes Zeichen die Familie:
-#define cCHAR (sal_Unicode)'c'
-#define cPARA (sal_Unicode)'p'
-#define cFRAME (sal_Unicode)'f'
-#define cPAGE (sal_Unicode)'g'
-#define cNUMRULE (sal_Unicode)'n'
+#define cCHAR (sal_Unicode)'c'
+#define cPARA (sal_Unicode)'p'
+#define cFRAME (sal_Unicode)'f'
+#define cPAGE (sal_Unicode)'g'
+#define cNUMRULE (sal_Unicode)'n'
// Dieses Zeichen wird bei der Herausgabe der Namen wieder entfernt und
// die Familie wird neu generiert.
@@ -119,16 +119,16 @@ SwImplShellAction::~SwImplShellAction()
}
/*--------------------------------------------------------------------
- Beschreibung: SwCharFormate finden/anlegen
+ Beschreibung: SwCharFormate finden/anlegen
evtl. Style fuellen
--------------------------------------------------------------------*/
-SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
+SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
BOOL bCreate = TRUE )
{
- SwCharFmt* pFmt = 0;
+ SwCharFmt* pFmt = 0;
if( rName.Len() )
{
pFmt = rDoc.FindCharFmtByName( rName );
@@ -140,7 +140,7 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
}
if( !pFmt && bCreate )
- { // Pool abklappern
+ { // Pool abklappern
const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
if(nId != USHRT_MAX)
pFmt = rDoc.GetCharFmtFromPool(nId);
@@ -165,22 +165,22 @@ SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
/*--------------------------------------------------------------------
- Beschreibung: ParaFormate finden/erzeugen
+ Beschreibung: ParaFormate finden/erzeugen
Style fuellen
--------------------------------------------------------------------*/
-SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc,
+SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
BOOL bCreate = TRUE )
{
- SwTxtFmtColl* pColl = 0;
+ SwTxtFmtColl* pColl = 0;
if( rName.Len() )
{
pColl = rDoc.FindTxtFmtCollByName( rName );
if( !pColl && bCreate )
- { // Pool abklappern
+ { // Pool abklappern
const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(nId != USHRT_MAX)
pColl = rDoc.GetTxtCollFromPool(nId);
@@ -208,11 +208,11 @@ SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc,
/*--------------------------------------------------------------------
- Beschreibung: Rahmenformate
+ Beschreibung: Rahmenformate
--------------------------------------------------------------------*/
-SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
+SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
BOOL bCreate = TRUE )
@@ -222,7 +222,7 @@ SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
{
pFmt = rDoc.FindFrmFmtByName( rName );
if( !pFmt && bCreate )
- { // Pool abklappern
+ { // Pool abklappern
const USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT);
if(nId != USHRT_MAX)
pFmt = rDoc.GetFrmFmtFromPool(nId);
@@ -246,12 +246,12 @@ SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
}
/*--------------------------------------------------------------------
- Beschreibung: Seitendescriptoren
+ Beschreibung: Seitendescriptoren
--------------------------------------------------------------------*/
-const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc,
- const String& rName,
+const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc,
+ const String& rName,
SwDocStyleSheet* pStyle = 0,
BOOL bCreate = TRUE )
{
@@ -284,8 +284,8 @@ const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc,
return pDesc;
}
-const SwNumRule* lcl_FindNumRule( SwDoc& rDoc,
- const String& rName,
+const SwNumRule* lcl_FindNumRule( SwDoc& rDoc,
+ const String& rName,
SwDocStyleSheet* pStyle = 0,
BOOL bCreate = TRUE )
{
@@ -324,11 +324,11 @@ USHORT lcl_FindName( const SwPoolFmtList& rLst, SfxStyleFamily eFam,
String sSrch( ' ' );
switch( eFam )
{
- case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break;
- case SFX_STYLE_FAMILY_PARA: sSrch = cPARA; break;
- case SFX_STYLE_FAMILY_FRAME: sSrch = cFRAME; break;
- case SFX_STYLE_FAMILY_PAGE: sSrch = cPAGE; break;
- case SFX_STYLE_FAMILY_PSEUDO: sSrch = cNUMRULE; break;
+ case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break;
+ case SFX_STYLE_FAMILY_PARA: sSrch = cPARA; break;
+ case SFX_STYLE_FAMILY_FRAME: sSrch = cFRAME; break;
+ case SFX_STYLE_FAMILY_PAGE: sSrch = cPAGE; break;
+ case SFX_STYLE_FAMILY_PSEUDO: sSrch = cNUMRULE; break;
default:; //prevent warning
}
sSrch += rName;
@@ -360,7 +360,7 @@ BOOL FindPhyStyle( SwDoc& rDoc, const String& rName, SfxStyleFamily eFam )
/*--------------------------------------------------------------------
- Beschreibung: Einfuegen von Strings in die Liste der Vorlagen
+ Beschreibung: Einfuegen von Strings in die Liste der Vorlagen
--------------------------------------------------------------------*/
@@ -380,7 +380,7 @@ void SwPoolFmtList::Append( char cChar, const String& rStr )
}
/*--------------------------------------------------------------------
- Beschreibung: Liste kompletti loeschen
+ Beschreibung: Liste kompletti loeschen
--------------------------------------------------------------------*/
@@ -394,10 +394,10 @@ void SwPoolFmtList::Erase()
greift auf die Core-Engine zu
--------------------------------------------------------------------*/
-SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
- const String& rName,
+SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
+ const String& rName,
SwDocStyleSheetPool& _rPool,
- SfxStyleFamily eFam,
+ SfxStyleFamily eFam,
USHORT _nMask) :
SfxStyleSheetBase( rName, _rPool, eFam, _nMask ),
@@ -409,24 +409,24 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
rDoc(rDocument),
aCoreSet(GetPool().GetPool(),
- RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
+ RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
RES_PARATR_BEGIN, RES_PARATR_END - 1,
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1,
- RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
- RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
- SID_ATTR_PAGE, SID_ATTR_PAGE_EXT1,
+ RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
+ RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+ SID_ATTR_PAGE, SID_ATTR_PAGE_EXT1,
SID_ATTR_PAGE_HEADERSET,SID_ATTR_PAGE_FOOTERSET,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
- FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
- SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
+ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL,
SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM,
SID_SWREGISTER_MODE, SID_SWREGISTER_MODE,
SID_SWREGISTER_COLLECTION, SID_SWREGISTER_COLLECTION,
- FN_COND_COLL, FN_COND_COLL,
- SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE,
- SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
- SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR,
- SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
+ FN_COND_COLL, FN_COND_COLL,
+ SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE,
+ SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
+ SID_PARA_BACKGRND_DESTINATION, SID_ATTR_BRUSH_CHAR,
+ SID_ATTR_NUMBERING_RULE, SID_ATTR_NUMBERING_RULE,
0),
bPhysical(FALSE)
{
@@ -453,7 +453,7 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
}
/*--------------------------------------------------------------------
- Beschreibung: Zuruecksetzen
+ Beschreibung: Zuruecksetzen
--------------------------------------------------------------------*/
@@ -466,7 +466,7 @@ void SwDocStyleSheet::Reset()
}
/*--------------------------------------------------------------------
- Beschreibung: virtuelle Methoden
+ Beschreibung: virtuelle Methoden
--------------------------------------------------------------------*/
@@ -501,7 +501,7 @@ const String& SwDocStyleSheet::GetParent() const
}
String sTmp;
- if( !pFmt ) // noch nicht vorhanden, also dflt. Parent
+ if( !pFmt ) // noch nicht vorhanden, also dflt. Parent
{
USHORT i = SwStyleNameMapper::GetPoolIdFromUIName( aName, eGetType );
i = ::GetPoolParent( i );
@@ -521,7 +521,7 @@ const String& SwDocStyleSheet::GetParent() const
}
/*--------------------------------------------------------------------
- Beschreibung: Nachfolger
+ Beschreibung: Nachfolger
--------------------------------------------------------------------*/
@@ -536,7 +536,7 @@ const String& SwDocStyleSheet::GetFollow() const
}
/*--------------------------------------------------------------------
- Beschreibung: Welche Verkettung ist moeglich
+ Beschreibung: Welche Verkettung ist moeglich
--------------------------------------------------------------------*/
@@ -556,7 +556,7 @@ BOOL SwDocStyleSheet::HasFollowSupport() const
}
/*--------------------------------------------------------------------
- Beschreibung: Parent ?
+ Beschreibung: Parent ?
--------------------------------------------------------------------*/
@@ -588,7 +588,7 @@ BOOL SwDocStyleSheet::HasClearParentSupport() const
}
/*--------------------------------------------------------------------
- Beschreibung: textuelle Beschreibung ermitteln
+ Beschreibung: textuelle Beschreibung ermitteln
--------------------------------------------------------------------*/
String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
@@ -763,7 +763,7 @@ String SwDocStyleSheet::GetDescription()
}
/*--------------------------------------------------------------------
- Beschreibung: Namen setzen
+ Beschreibung: Namen setzen
--------------------------------------------------------------------*/
@@ -888,7 +888,7 @@ BOOL SwDocStyleSheet::SetName( const String& rStr)
}
/*--------------------------------------------------------------------
- Beschreibung: Ableitungshirachie
+ Beschreibung: Ableitungshirachie
--------------------------------------------------------------------*/
@@ -943,7 +943,7 @@ BOOL SwDocStyleSheet::SetParent( const String& rStr)
}
/*--------------------------------------------------------------------
- Beschreibung: Nachfolger detzen
+ Beschreibung: Nachfolger detzen
--------------------------------------------------------------------*/
@@ -1000,7 +1000,7 @@ BOOL SwDocStyleSheet::SetFollow( const String& rStr)
}
/*--------------------------------------------------------------------
- Beschreibung: ueber Name und Family, Mask den ItemSet rausholen
+ Beschreibung: ueber Name und Family, Mask den ItemSet rausholen
--------------------------------------------------------------------*/
SfxItemSet& SwDocStyleSheet::GetItemSet()
@@ -1024,7 +1024,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet()
{
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
aBoxInfo.SetTable( FALSE );
- aBoxInfo.SetDist( TRUE); // Abstandsfeld immer anzeigen
+ aBoxInfo.SetDist( TRUE); // Abstandsfeld immer anzeigen
aBoxInfo.SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen
aBoxInfo.SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen
// Einzelne Linien koennen nur in Tabellen DontCare-Status haben
@@ -1187,7 +1187,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
else
pCColl->DeleteAssignmentToListLevelOfOutlineStyle();
-
+
SwTxtFmtColl* pFindFmt;
@@ -1339,7 +1339,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
const SfxPoolItem* pItem = aIter.GetCurItem();
while( TRUE )
{
- if( IsInvalidItem( pItem ) ) // Clearen
+ if( IsInvalidItem( pItem ) ) // Clearen
{
// use method <SwDoc::ResetAttrAtFormat(..)> in order to
// create an Undo object for the attribute reset.
@@ -1365,7 +1365,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
delete pNewDsc;
}
else
- rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten
+ rDoc.ChgFmt(*pFmt, aSet); // alles gesetzten Putten
}
else
{
@@ -1526,7 +1526,7 @@ void lcl_DeleteInfoStyles( USHORT nFamily, SvPtrarr& rArr, SwDoc& rDoc )
}
/*--------------------------------------------------------------------
- Beschreibung: Das Format ermitteln
+ Beschreibung: Das Format ermitteln
--------------------------------------------------------------------*/
BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
@@ -1715,7 +1715,7 @@ BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
}
/*--------------------------------------------------------------------
- Beschreibung: Neues Format in der Core anlegen
+ Beschreibung: Neues Format in der Core anlegen
--------------------------------------------------------------------*/
@@ -1827,18 +1827,18 @@ void SwDocStyleSheet::PresetNameAndFamily(const String& rName)
{
switch( rName.GetChar(0) )
{
- case cPARA: nFamily = SFX_STYLE_FAMILY_PARA; break;
- case cFRAME: nFamily = SFX_STYLE_FAMILY_FRAME; break;
- case cPAGE: nFamily = SFX_STYLE_FAMILY_PAGE; break;
- case cNUMRULE: nFamily = SFX_STYLE_FAMILY_PSEUDO; break;
- default: nFamily = SFX_STYLE_FAMILY_CHAR; break;
+ case cPARA: nFamily = SFX_STYLE_FAMILY_PARA; break;
+ case cFRAME: nFamily = SFX_STYLE_FAMILY_FRAME; break;
+ case cPAGE: nFamily = SFX_STYLE_FAMILY_PAGE; break;
+ case cNUMRULE: nFamily = SFX_STYLE_FAMILY_PSEUDO; break;
+ default: nFamily = SFX_STYLE_FAMILY_CHAR; break;
}
aName = rName;
aName.Erase( 0, 1 );
}
/*--------------------------------------------------------------------
- Beschreibung: Ist das Format physikalisch schon vorhanden
+ Beschreibung: Ist das Format physikalisch schon vorhanden
--------------------------------------------------------------------*/
@@ -1849,9 +1849,9 @@ void SwDocStyleSheet::SetPhysical(BOOL bPhys)
if(!bPhys)
{
pCharFmt = 0;
- pColl = 0;
+ pColl = 0;
pFrmFmt = 0;
- pDesc = 0;
+ pDesc = 0;
}
}
@@ -1876,10 +1876,10 @@ BOOL SwDocStyleSheet::IsUsed() const
const SwModify* pMod;
switch( nFamily )
{
- case SFX_STYLE_FAMILY_CHAR : pMod = pCharFmt; break;
- case SFX_STYLE_FAMILY_PARA : pMod = pColl; break;
- case SFX_STYLE_FAMILY_FRAME: pMod = pFrmFmt; break;
- case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break;
+ case SFX_STYLE_FAMILY_CHAR : pMod = pCharFmt; break;
+ case SFX_STYLE_FAMILY_PARA : pMod = pColl; break;
+ case SFX_STYLE_FAMILY_FRAME: pMod = pFrmFmt; break;
+ case SFX_STYLE_FAMILY_PAGE : pMod = pDesc; break;
case SFX_STYLE_FAMILY_PSEUDO:
return pNumRule ? rDoc.IsUsed( *pNumRule ) : FALSE;
@@ -1988,7 +1988,7 @@ static String sTemplateHelpFile = String::CreateFromAscii("swrhlppi.hlp");
// weil sich der SFX so anstellt mit der HilfeId:
if( USHRT_MAX == nId )
- nId = 0; // entsp. keine Hilfe anzeigen
+ nId = 0; // entsp. keine Hilfe anzeigen
return nId;
}
@@ -2002,9 +2002,9 @@ void SwDocStyleSheet::SetHelpId( const String& r, ULONG nId )
SwFmt* pTmpFmt = 0;
switch( nFamily )
{
- case SFX_STYLE_FAMILY_CHAR : pTmpFmt = pCharFmt; break;
- case SFX_STYLE_FAMILY_PARA : pTmpFmt = pColl; break;
- case SFX_STYLE_FAMILY_FRAME: pTmpFmt = pFrmFmt; break;
+ case SFX_STYLE_FAMILY_CHAR : pTmpFmt = pCharFmt; break;
+ case SFX_STYLE_FAMILY_PARA : pTmpFmt = pColl; break;
+ case SFX_STYLE_FAMILY_FRAME: pTmpFmt = pFrmFmt; break;
case SFX_STYLE_FAMILY_PAGE :
((SwPageDesc*)pDesc)->SetPoolHelpId( nHId );
((SwPageDesc*)pDesc)->SetPoolHlpFileId( nFileId );
@@ -2027,7 +2027,7 @@ void SwDocStyleSheet::SetHelpId( const String& r, ULONG nId )
}
/*--------------------------------------------------------------------
- Beschreibung: Methoden fuer den DocStyleSheetPool
+ Beschreibung: Methoden fuer den DocStyleSheetPool
--------------------------------------------------------------------*/
SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, BOOL bOrg )
@@ -2052,9 +2052,9 @@ void SAL_CALL SwDocStyleSheetPool::release( ) throw ()
comphelper::OWeakTypeObject::release();
}
-SfxStyleSheetBase& SwDocStyleSheetPool::Make(
- const String& rName,
- SfxStyleFamily eFam,
+SfxStyleSheetBase& SwDocStyleSheetPool::Make(
+ const String& rName,
+ SfxStyleFamily eFam,
USHORT _nMask,
USHORT /*nPos*/ )
{
@@ -2077,7 +2077,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOr
}
-SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &,
+SfxStyleSheetBase* SwDocStyleSheetPool::Create( const String &,
SfxStyleFamily, USHORT )
{
OSL_ENSURE( !this, "Create im SW-Stylesheet-Pool geht nicht" );
@@ -2563,18 +2563,18 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
BOOL bWeiter = TRUE;
switch( nId )
{
- case RES_POOLCOLL_SENDADRESS: // --> ADDRESS
- case RES_POOLCOLL_TABLE_HDLN: // --> TH
- case RES_POOLCOLL_TABLE: // --> TD
- case RES_POOLCOLL_TEXT: // --> P
- case RES_POOLCOLL_HEADLINE_BASE:// --> H
- case RES_POOLCOLL_HEADLINE1: // --> H1
- case RES_POOLCOLL_HEADLINE2: // --> H2
- case RES_POOLCOLL_HEADLINE3: // --> H3
- case RES_POOLCOLL_HEADLINE4: // --> H4
- case RES_POOLCOLL_HEADLINE5: // --> H5
- case RES_POOLCOLL_HEADLINE6: // --> H6
- case RES_POOLCOLL_STANDARD: // --> P
+ case RES_POOLCOLL_SENDADRESS: // --> ADDRESS
+ case RES_POOLCOLL_TABLE_HDLN: // --> TH
+ case RES_POOLCOLL_TABLE: // --> TD
+ case RES_POOLCOLL_TEXT: // --> P
+ case RES_POOLCOLL_HEADLINE_BASE:// --> H
+ case RES_POOLCOLL_HEADLINE1: // --> H1
+ case RES_POOLCOLL_HEADLINE2: // --> H2
+ case RES_POOLCOLL_HEADLINE3: // --> H3
+ case RES_POOLCOLL_HEADLINE4: // --> H4
+ case RES_POOLCOLL_HEADLINE5: // --> H5
+ case RES_POOLCOLL_HEADLINE6: // --> H6
+ case RES_POOLCOLL_STANDARD: // --> P
case RES_POOLCOLL_FOOTNOTE:
case RES_POOLCOLL_ENDNOTE:
bWeiter = FALSE;
@@ -2630,18 +2630,18 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
{
// dann auch die, die wir mappen:
static USHORT aPoolIds[] = {
- RES_POOLCOLL_SENDADRESS, // --> ADDRESS
- RES_POOLCOLL_TABLE_HDLN, // --> TH
- RES_POOLCOLL_TABLE, // --> TD
- RES_POOLCOLL_STANDARD, // --> P
- RES_POOLCOLL_TEXT, // --> P
- RES_POOLCOLL_HEADLINE_BASE, // --> H
- RES_POOLCOLL_HEADLINE1, // --> H1
- RES_POOLCOLL_HEADLINE2, // --> H2
- RES_POOLCOLL_HEADLINE3, // --> H3
- RES_POOLCOLL_HEADLINE4, // --> H4
- RES_POOLCOLL_HEADLINE5, // --> H5
- RES_POOLCOLL_HEADLINE6, // --> H6
+ RES_POOLCOLL_SENDADRESS, // --> ADDRESS
+ RES_POOLCOLL_TABLE_HDLN, // --> TH
+ RES_POOLCOLL_TABLE, // --> TD
+ RES_POOLCOLL_STANDARD, // --> P
+ RES_POOLCOLL_TEXT, // --> P
+ RES_POOLCOLL_HEADLINE_BASE, // --> H
+ RES_POOLCOLL_HEADLINE1, // --> H1
+ RES_POOLCOLL_HEADLINE2, // --> H2
+ RES_POOLCOLL_HEADLINE3, // --> H3
+ RES_POOLCOLL_HEADLINE4, // --> H4
+ RES_POOLCOLL_HEADLINE5, // --> H5
+ RES_POOLCOLL_HEADLINE6, // --> H6
RES_POOLCOLL_FOOTNOTE,
RES_POOLCOLL_ENDNOTE,
0
@@ -2797,7 +2797,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find( const UniString& rName )
}
void SwStyleSheetIterator::AppendStyleList(const SvStringsDtor& rList,
- BOOL bTestUsed,
+ BOOL bTestUsed,
USHORT nSection, char cType )
{
if( bTestUsed )
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 760ee7fa7982..822bf54dc83f 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -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
@@ -30,11 +30,11 @@
#include "globals.hrc"
#include "app.hrc"
#include "swerror.h"
-#include "comcore.hrc" // MS: Warum gibst auf der Core-Seite
- // jetzt Resourcen
+#include "comcore.hrc" // MS: Warum gibst auf der Core-Seite
+ // jetzt Resourcen
/*--------------------------------------------------------------------
- Beschreibung: Strings
+ Beschreibung: Strings
--------------------------------------------------------------------*/
String STR_COMCORE_READERROR
@@ -46,7 +46,7 @@ String STR_COMCORE_CANT_SHOW
Text [ en-US ] = "Graphic cannot be displayed." ;
};
/*--------------------------------------------------------------------
- Beschreibung: Boxes
+ Beschreibung: Boxes
--------------------------------------------------------------------*/
InfoBox ERR_CLPBRD_WRITE
{
@@ -58,8 +58,8 @@ InfoBox ERR_CLPBRD_READ
};
-#define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE))
-#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE))
+#define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE))
+#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE))
Resource RID_SW_ERRHDL
{
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index c8d5c995cfda..8af33aca1c10 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -2,7 +2,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
@@ -129,7 +129,7 @@ void EndProgress( SwDocShell *pDocShell )
pProgressContainer->Remove( i );
delete pProgress->pProgress;
delete pProgress;
- //#112337# it may happen that the container has been removed
+ //#112337# it may happen that the container has been removed
//while rescheduling
if ( pProgressContainer && !pProgressContainer->Count() )
delete pProgressContainer, pProgressContainer = 0;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 82954e440683..c0334101bfd2 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -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
@@ -440,7 +440,7 @@
};\
MenuItem\
{\
- Identifier = FN_HIDE_NOTE_AUTHOR ;\
+ Identifier = FN_HIDE_NOTE_AUTHOR ;\
HelpID = FN_HIDE_NOTE_AUTHOR ;\
Text [ en-US ] = "Hide ~author" ;\
};\
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 0ff247a4bbf1..2c58a9dea182 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 770052f0c6d3..7cb6513f3fcc 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
#include <cppuhelper/weak.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx> // helper for implementations
#include <svx/dataaccessdescriptor.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
@@ -119,7 +119,7 @@ void lcl_SetUIPrefs(const SwViewOption* pPref, SwView* pView, ViewShell* pSh )
pView->GetPostItMgr()->PrepareView(true);
}
-SwWrtShell* GetActiveWrtShell()
+SwWrtShell* GetActiveWrtShell()
{
SwView *pActive = ::GetActiveView();
if( pActive )
@@ -150,7 +150,7 @@ SwView* SwModule::GetNextView(SwView* pView)
}
/*------------------------------------------------------------------------
- Beschreibung: Neuer Master fuer die Einstellungen wird gesetzt;
+ Beschreibung: Neuer Master fuer die Einstellungen wird gesetzt;
dieser wirkt sich auf die aktuelle Sicht und alle
folgenden aus.
------------------------------------------------------------------------*/
@@ -361,7 +361,7 @@ SwNavigationConfig* SwModule::GetNavigationConfig()
return pNavigationConfig;
}
-SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
+SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
{
if(bWeb && !pWebPrtOpt)
{
@@ -375,7 +375,7 @@ SwPrintOptions* SwModule::GetPrtOptions(sal_Bool bWeb)
return bWeb ? pWebPrtOpt : pPrtOpt;
}
-SwChapterNumRules* SwModule::GetChapterNumRules()
+SwChapterNumRules* SwModule::GetChapterNumRules()
{
if(!pChapterNumRules)
pChapterNumRules = new SwChapterNumRules;
@@ -453,9 +453,9 @@ void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet,
if( COL_TRANSPARENT == rAttr.nColor )
{
static const ColorData aColArr[] = {
- COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK,
- COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK,
- COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK };
+ COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK,
+ COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK,
+ COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK };
aCol.SetColor( aColArr[ nAuthor % (SAL_N_ELEMENTS(aColArr)) ] );
}
@@ -555,7 +555,7 @@ const Color &SwModule::GetRedlineMarkColor()
return pModuleConfig->GetMarkAlignColor();
}
-const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb)
+const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb)
{
return GetUsrPref( bWeb );
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index dc6e304847b8..5ba0b1ba0122 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <svx/insctrl.hxx>
#include <svx/selctrl.hxx>
#include <svx/linectrl.hxx>
-#include <svx/tbxctl.hxx> //z-Zt falscher includeschutz!
+#include <svx/tbxctl.hxx> //z-Zt falscher includeschutz!
#include <svx/fillctrl.hxx>
#include <svx/tbcontrl.hxx>
#include <svx/verttexttbxctrl.hxx>
@@ -139,7 +139,7 @@
#include <app.hrc>
#include <svx/xmlsecctrl.hxx>
ResMgr *pSwResMgr = 0;
-sal_Bool bNoInterrupt = sal_False;
+sal_Bool bNoInterrupt = sal_False;
#include <sfx2/app.hxx>
@@ -199,10 +199,10 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
pStdFontConfig = new SwStdFontConfig;
- pAuthorNames = new SvStringsDtor(5, 1); // Alle Redlining-Autoren
+ pAuthorNames = new SvStringsDtor(5, 1); // Alle Redlining-Autoren
//JP 18.10.96: SvxAutocorrect gegen die SwAutocorrect austauschen
- SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get();
+ SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get();
if( pACfg )
{
const SvxAutoCorrect* pOld = pACfg->GetAutoCorrect();
@@ -273,7 +273,7 @@ void SwDLL::RegisterFactories()
if ( SvtModuleOptions().IsWriter() )
SwView::RegisterFactory ( 2 );
- SwWebView::RegisterFactory ( 5 );
+ SwWebView::RegisterFactory ( 5 );
if ( SvtModuleOptions().IsWriter() )
{
@@ -437,14 +437,14 @@ void SwDLL::RegisterControls()
|*
\************************************************************************/
-void SwModule::InitAttrPool()
+void SwModule::InitAttrPool()
{
OSL_ENSURE(!pAttrPool, "Pool already exists!");
pAttrPool = new SwAttrPool(0);
SetPool(pAttrPool);
}
-void SwModule::RemoveAttrPool()
+void SwModule::RemoveAttrPool()
{
SetPool(0);
SfxItemPool::Free(pAttrPool);
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx
index 86a12833817b..c77ee6655a60 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index 42901f93f206..81f36bbedf85 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -2,7 +2,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
@@ -81,7 +81,7 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt)
if(rEvt.GetCharCode())
{
String sKey = rEvt.GetCharCode();
- if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
+ if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
bCallParent = FALSE;
}
if(bCallParent)
@@ -121,8 +121,8 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
{
if(aReturnActionLink.IsSet())
aReturnActionLink.Call(this);
- }
- else
+ }
+ else
Edit::KeyInput(rEvt);
}
diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx
index 3b4302db1a23..9005eb3fbc76 100644
--- a/sw/source/ui/cctrl/popbox.cxx
+++ b/sw/source/ui/cctrl/popbox.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx
index a93bbbbdd113..908007f732aa 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/ui/cctrl/swlbox.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 4b8d8f218d01..933d67f7a34e 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -2,7 +2,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
@@ -80,7 +80,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, ClickHdl, void *, EMPTYARG )
IMPL_LINK_INLINE_END( SwBreakDlg, ClickHdl, void *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Handler fuer Aendern Seitenummer
+ Beschreibung: Handler fuer Aendern Seitenummer
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
@@ -92,7 +92,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
/*------------------------------------------------------------------------
- Beschreibung: Durch Aendern der Seitennummer wird die Checkbox gecheckt.
+ Beschreibung: Durch Aendern der Seitennummer wird die Checkbox gecheckt.
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
@@ -103,7 +103,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
IMPL_LINK_INLINE_END( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Ok-Handler;
+ Beschreibung: Ok-Handler;
prueft, ob die Seitenummer nPage eine legale Seitennummer
ist (linke Seiten mit geraden Nummern etc. bei einer Seitenvorlage
mit wechselnden Seiten)
@@ -206,7 +206,7 @@ void SwBreakDlg::CheckEnable()
BOOL bEnable = TRUE;
if ( bHtmlMode )
{
- aColumnBtn .Enable(FALSE);
+ aColumnBtn .Enable(FALSE);
aPageCollBox.Enable(FALSE);
bEnable = FALSE;
}
@@ -230,7 +230,7 @@ void SwBreakDlg::CheckEnable()
if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos )
bEnable = FALSE;
}
- aPageNumBox .Enable(bEnable);
+ aPageNumBox .Enable(bEnable);
aPageNumEdit.Enable(bEnable);
}
diff --git a/sw/source/ui/chrdlg/break.hrc b/sw/source/ui/chrdlg/break.hrc
index 7667a4a9f3b6..c1da83565e9c 100644
--- a/sw/source/ui/chrdlg/break.hrc
+++ b/sw/source/ui/chrdlg/break.hrc
@@ -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
@@ -25,17 +25,17 @@
*
************************************************************************/
-#define RB_PAGE 1
-#define RB_LINE 2
-#define RB_COL 3
-#define FT_COLL 4
-#define LB_COLL 5
+#define RB_PAGE 1
+#define RB_LINE 2
+#define RB_COL 3
+#define FT_COLL 4
+#define LB_COLL 5
#define FL_BREAK 6
-#define CB_PAGENUM 7
-#define ED_PAGENUM 8
+#define CB_PAGENUM 7
+#define ED_PAGENUM 8
-#define BT_OK 100
-#define BT_CANCEL 101
+#define BT_OK 100
+#define BT_CANCEL 101
#define BT_HELP 102
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 57a74e16cfeb..b725078bd224 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -2,7 +2,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
@@ -119,34 +119,34 @@ rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex )
CommandStruct SwCondCollItem::aCmds[] =
{
- { PARA_IN_TABLEHEAD, 0 },
- { PARA_IN_TABLEBODY, 0 },
- { PARA_IN_FRAME, 0 },
- { PARA_IN_SECTION, 0 },
- { PARA_IN_FOOTENOTE, 0 },
- { PARA_IN_ENDNOTE, 0 },
- { PARA_IN_HEADER, 0 },
- { PARA_IN_FOOTER, 0 },
- { PARA_IN_OUTLINE, 0 },
- { PARA_IN_OUTLINE, 1 },
- { PARA_IN_OUTLINE, 2 },
- { PARA_IN_OUTLINE, 3 },
- { PARA_IN_OUTLINE, 4 },
- { PARA_IN_OUTLINE, 5 },
- { PARA_IN_OUTLINE, 6 },
- { PARA_IN_OUTLINE, 7 },
- { PARA_IN_OUTLINE, 8 },
- { PARA_IN_OUTLINE, 9 },
- { PARA_IN_LIST, 0 },
- { PARA_IN_LIST, 1 },
- { PARA_IN_LIST, 2 },
- { PARA_IN_LIST, 3 },
- { PARA_IN_LIST, 4 },
- { PARA_IN_LIST, 5 },
- { PARA_IN_LIST, 6 },
- { PARA_IN_LIST, 7 },
- { PARA_IN_LIST, 8 },
- { PARA_IN_LIST, 9 }
+ { PARA_IN_TABLEHEAD, 0 },
+ { PARA_IN_TABLEBODY, 0 },
+ { PARA_IN_FRAME, 0 },
+ { PARA_IN_SECTION, 0 },
+ { PARA_IN_FOOTENOTE, 0 },
+ { PARA_IN_ENDNOTE, 0 },
+ { PARA_IN_HEADER, 0 },
+ { PARA_IN_FOOTER, 0 },
+ { PARA_IN_OUTLINE, 0 },
+ { PARA_IN_OUTLINE, 1 },
+ { PARA_IN_OUTLINE, 2 },
+ { PARA_IN_OUTLINE, 3 },
+ { PARA_IN_OUTLINE, 4 },
+ { PARA_IN_OUTLINE, 5 },
+ { PARA_IN_OUTLINE, 6 },
+ { PARA_IN_OUTLINE, 7 },
+ { PARA_IN_OUTLINE, 8 },
+ { PARA_IN_OUTLINE, 9 },
+ { PARA_IN_LIST, 0 },
+ { PARA_IN_LIST, 1 },
+ { PARA_IN_LIST, 2 },
+ { PARA_IN_LIST, 3 },
+ { PARA_IN_LIST, 4 },
+ { PARA_IN_LIST, 5 },
+ { PARA_IN_LIST, 6 },
+ { PARA_IN_LIST, 7 },
+ { PARA_IN_LIST, 8 },
+ { PARA_IN_LIST, 9 }
};
@@ -186,7 +186,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const
return bReturn;
}
-const String& SwCondCollItem::GetStyle(USHORT nPos) const
+const String& SwCondCollItem::GetStyle(USHORT nPos) const
{
return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr;
}
diff --git a/sw/source/ui/chrdlg/ccoll.hrc b/sw/source/ui/chrdlg/ccoll.hrc
index f3d21092273a..9bab79775143 100644
--- a/sw/source/ui/chrdlg/ccoll.hrc
+++ b/sw/source/ui/chrdlg/ccoll.hrc
@@ -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
@@ -30,18 +30,18 @@
// #define ******************************************************************
-#define CB_CONDITION 1
+#define CB_CONDITION 1
#define FL_CONDITION 2
-#define FT_CONTEXT 3
-#define FT_USED 4
+#define FT_CONTEXT 3
+#define FT_USED 4
#define TB_CONDCOLLS 5
-#define FT_STYLE 6
-#define LB_STYLE 7
-#define LB_FILTER 8
-#define PB_REMOVE 9
-#define PB_ASSIGN 10
+#define FT_STYLE 6
+#define LB_STYLE 7
+#define LB_FILTER 8
+#define PB_REMOVE 9
+#define PB_ASSIGN 10
#define STR_REGIONS 11
-#define STR_NOTEMPL 12
+#define STR_NOTEMPL 12
// ********************************************************************** EOF
diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src
index f8195b466fde..14afc8bb69ee 100644
--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -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
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 26f69fd1a724..a719191afbda 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@
#include <uitool.hxx>
#include <fmtinfmt.hxx>
#include <macassgn.hxx>
-#include <chrdlg.hxx> // der Dialog
+#include <chrdlg.hxx> // der Dialog
#include <swmodule.hxx>
#include <poolfmt.hxx>
@@ -117,7 +117,7 @@ SwCharDlg::~SwCharDlg()
}
/*--------------------------------------------------------------------
- Beschreibung: FontList setzen
+ Beschreibung: FontList setzen
--------------------------------------------------------------------*/
void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
@@ -156,26 +156,26 @@ void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
}
}
-SwCharURLPage::SwCharURLPage( Window* pParent,
+SwCharURLPage::SwCharURLPage( Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, SW_RES( TP_CHAR_URL ), rCoreSet ),
aURLFL ( this, SW_RES(FL_URL)),
aURLFT( this, SW_RES(FT_URL )),
- aURLED( this, SW_RES(ED_URL )),
- aTextFT( this, SW_RES(FT_TEXT )),
- aTextED( this, SW_RES(ED_TEXT )),
- aNameFT( this, SW_RES(FT_NAME )),
- aNameED( this, SW_RES(ED_NAME)),
- aTargetFrmFT( this, SW_RES(FT_TARGET )),
- aTargetFrmLB( this, SW_RES(LB_TARGET )),
+ aURLED( this, SW_RES(ED_URL )),
+ aTextFT( this, SW_RES(FT_TEXT )),
+ aTextED( this, SW_RES(ED_TEXT )),
+ aNameFT( this, SW_RES(FT_NAME )),
+ aNameED( this, SW_RES(ED_NAME)),
+ aTargetFrmFT( this, SW_RES(FT_TARGET )),
+ aTargetFrmLB( this, SW_RES(LB_TARGET )),
aURLPB( this, SW_RES(PB_URL )),
aEventPB( this, SW_RES(PB_EVENT )),
aStyleFL( this, SW_RES(FL_STYLE )),
- aVisitedFT( this, SW_RES(FT_VISITED )),
- aVisitedLB( this, SW_RES(LB_VISITED )),
- aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)),
- aNotVisitedLB( this, SW_RES(LB_NOT_VISITED)),
+ aVisitedFT( this, SW_RES(FT_VISITED )),
+ aVisitedLB( this, SW_RES(LB_VISITED )),
+ aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)),
+ aNotVisitedLB( this, SW_RES(LB_NOT_VISITED)),
pINetItem(0),
bModified(FALSE)
@@ -199,7 +199,7 @@ SwCharURLPage::SwCharURLPage( Window* pParent,
}
}
- aURLPB.SetClickHdl (LINK( this, SwCharURLPage, InsertFileHdl));
+ aURLPB.SetClickHdl (LINK( this, SwCharURLPage, InsertFileHdl));
aEventPB.SetClickHdl(LINK( this, SwCharURLPage, EventHdl ));
SwView *pView = ::GetActiveView();
@@ -275,7 +275,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
if(sURL.getLength())
{
sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
- // #i100683# file URLs should be normalized in the UI
+ // #i100683# file URLs should be normalized in the UI
static const sal_Char* pFile = "file:";
sal_Int32 nLength = ((sal_Int32)sizeof(pFile)-1);
if( sURL.copy(0, nLength ).equalsAsciiL( pFile, nLength ))
@@ -318,7 +318,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
return bModified;
}
-SfxTabPage* SwCharURLPage::Create( Window* pParent,
+SfxTabPage* SwCharURLPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwCharURLPage( pParent, rAttrSet ) );
diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc
index 48a661bfebec..625a016a0694 100644
--- a/sw/source/ui/chrdlg/chardlg.hrc
+++ b/sw/source/ui/chrdlg/chardlg.hrc
@@ -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
@@ -68,7 +68,7 @@
#define FONTTYPE_FT 46
#define FL_URL 50
-#define FT_URL 51
+#define FT_URL 51
#define ED_URL 52
#define FL_STYLE 53
#define FT_VISITED 55
@@ -78,9 +78,9 @@
#define PB_EVENT 59
#define PB_URL 60
#define LB_TARGET 61
-#define FT_TARGET 62
+#define FT_TARGET 62
#define FT_TEXT 63
#define ED_TEXT 64
#define FT_NAME 65
-#define ED_NAME 66
+#define ED_NAME 66
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index 8340b4f60669..e6a6a827297f 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -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
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index 297668f6093a..27e897e29e00 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -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
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 137b9019aac0..5f47ec0f87c1 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -2,7 +2,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
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
//using namespace i18n; !using this namespace leads to mysterious conflicts with ScriptType::...!
-// so don't use this instead of the following defines!
+// so don't use this instead of the following defines!
#define I18N ::com::sun::star::i18n
#define I18N_SCRIPTTYPE ::com::sun::star::i18n::ScriptType
@@ -90,40 +90,40 @@ static USHORT __FAR_DATA aPageRg[] = {
class SwDropCapsPict : public Control
{
- String maText;
- String maScriptText;
- Color maBackColor;
- Color maTextLineColor;
- BYTE mnLines;
- long mnTotLineH;
- long mnLineH;
- long mnTextH;
- USHORT mnDistance;
+ String maText;
+ String maScriptText;
+ Color maBackColor;
+ Color maTextLineColor;
+ BYTE mnLines;
+ long mnTotLineH;
+ long mnLineH;
+ long mnTextH;
+ USHORT mnDistance;
sal_Int32 mnLeading;
- Printer* mpPrinter;
- BOOL mbDelPrinter;
- SvULongs maTextWidth;
- SvXub_StrLens maScriptChg;
- SvUShorts maScriptType;
- SvxFont maFont;
- SvxFont maCJKFont;
- SvxFont maCTLFont;
- Size maTextSize;
- Reference< I18N::XBreakIterator > xBreak;
-
- virtual void Paint(const Rectangle &rRect);
- void CheckScript( void );
- Size CalcTextSize( void );
- inline void InitPrinter( void );
- void _InitPrinter( void );
- void GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich );
+ Printer* mpPrinter;
+ BOOL mbDelPrinter;
+ SvULongs maTextWidth;
+ SvXub_StrLens maScriptChg;
+ SvUShorts maScriptType;
+ SvxFont maFont;
+ SvxFont maCJKFont;
+ SvxFont maCTLFont;
+ Size maTextSize;
+ Reference< I18N::XBreakIterator > xBreak;
+
+ virtual void Paint(const Rectangle &rRect);
+ void CheckScript( void );
+ Size CalcTextSize( void );
+ inline void InitPrinter( void );
+ void _InitPrinter( void );
+ void GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich );
public:
SwDropCapsPict(Window *pParent, const ResId &rResId) :
Control(pParent, rResId), mpPrinter( NULL ), mbDelPrinter( FALSE ) {}
~SwDropCapsPict();
- void UpdatePaintSettings( void ); // also invalidates control!
+ void UpdatePaintSettings( void ); // also invalidates control!
inline void SetText( const String& rT );
inline void SetLines( BYTE nL );
@@ -327,7 +327,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
SetFillColor( maBackColor );
if(((SwDropCapsPage*)GetParent())->aDropCapsBox.IsChecked())
{
- Size aTextSize( maTextSize );
+ Size aTextSize( maTextSize );
aTextSize.Width() += nDistW;
DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
@@ -343,12 +343,12 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
Point aPt(rPt);
InitPrinter();
- Font aOldFont = mpPrinter->GetFont();
- USHORT nScript;
- USHORT nIdx = 0;
- xub_StrLen nStart = 0;
- xub_StrLen nEnd;
- USHORT nCnt = maScriptChg.Count();
+ Font aOldFont = mpPrinter->GetFont();
+ USHORT nScript;
+ USHORT nIdx = 0;
+ xub_StrLen nStart = 0;
+ xub_StrLen nEnd;
+ USHORT nCnt = maScriptChg.Count();
if( nCnt )
{
@@ -362,7 +362,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
}
do
{
- SvxFont& rFnt = (nScript==I18N_SCRIPTTYPE::ASIAN) ? maCJKFont : ((nScript==I18N_SCRIPTTYPE::COMPLEX) ? maCTLFont : maFont);
+ SvxFont& rFnt = (nScript==I18N_SCRIPTTYPE::ASIAN) ? maCJKFont : ((nScript==I18N_SCRIPTTYPE::COMPLEX) ? maCTLFont : maFont);
mpPrinter->SetFont( rFnt );
rFnt.DrawPrev( this, mpPrinter, aPt, maText, nStart, nEnd - nStart );
@@ -433,11 +433,11 @@ Size SwDropCapsPict::CalcTextSize( void )
{
InitPrinter();
- USHORT nScript;
- USHORT nIdx = 0;
- xub_StrLen nStart = 0;
- xub_StrLen nEnd;
- USHORT nCnt = maScriptChg.Count();
+ USHORT nScript;
+ USHORT nIdx = 0;
+ xub_StrLen nStart = 0;
+ xub_StrLen nEnd;
+ USHORT nCnt = maScriptChg.Count();
if( nCnt )
{
nEnd = maScriptChg[ nIdx ];
@@ -448,18 +448,18 @@ Size SwDropCapsPict::CalcTextSize( void )
nEnd = maText.Len();
nScript = I18N_SCRIPTTYPE::LATIN;
}
- long nTxtWidth = 0;
- long nCJKHeight = 0;
- long nCTLHeight = 0;
- long nHeight = 0;
- long nAscent = 0;
- long nCJKAscent = 0;
- long nCTLAscent = 0;
+ long nTxtWidth = 0;
+ long nCJKHeight = 0;
+ long nCTLHeight = 0;
+ long nHeight = 0;
+ long nAscent = 0;
+ long nCJKAscent = 0;
+ long nCTLAscent = 0;
do
{
- SvxFont& rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont :
+ SvxFont& rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont :
( ( nScript == I18N_SCRIPTTYPE::COMPLEX )? maCTLFont : maFont );
- ULONG nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width();
+ ULONG nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width();
if( nIdx < maTextWidth.Count() )
maTextWidth[ nIdx++ ] = nWidth;
@@ -505,7 +505,7 @@ Size SwDropCapsPict::CalcTextSize( void )
void SwDropCapsPict::_InitPrinter()
{
- SfxViewShell* pSh = SfxViewShell::Current();
+ SfxViewShell* pSh = SfxViewShell::Current();
if ( pSh )
mpPrinter = pSh->GetPrinter();
@@ -536,7 +536,7 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, SW_RES(TP_DROPCAPS), rSet),
aDropCapsBox (this, SW_RES(CB_SWITCH )),
- aWholeWordCB (this, SW_RES(CB_WORD )),
+ aWholeWordCB (this, SW_RES(CB_WORD )),
aSwitchText (this, SW_RES(FT_DROPCAPS )),
aDropCapsField(this, SW_RES(FLD_DROPCAPS)),
aLinesText (this, SW_RES(TXT_LINES )),
@@ -661,7 +661,7 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet)
}
// Preview
- pPict->SetValues( aTextEdit.GetText(),
+ pPict->SetValues( aTextEdit.GetText(),
BYTE( aLinesField.GetValue() ),
USHORT( aDistanceField.Denormalize( aDistanceField.GetValue( FUNIT_TWIP ) ) ) );
@@ -688,8 +688,8 @@ IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG )
aDistanceField.Enable( bChecked );
aTemplateText .Enable( bChecked );
aTemplateBox .Enable( bChecked );
- aTextEdit .Enable( bChecked && !bFormat );
- aTextText .Enable( bChecked && !bFormat );
+ aTextEdit .Enable( bChecked && !bFormat );
+ aTextText .Enable( bChecked && !bFormat );
if ( bChecked )
{
@@ -759,7 +759,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
if (bSetText)
aTextEdit.SetText(sPreview);
}
- else if (pEdit == &aTextEdit) // Ggf. Anzahl setzen
+ else if (pEdit == &aTextEdit) // Ggf. Anzahl setzen
{
USHORT nTmp = aTextEdit.GetText().Len();
aDropCapsField.SetValue(Max((USHORT)1, nTmp));
diff --git a/sw/source/ui/chrdlg/drpcps.hrc b/sw/source/ui/chrdlg/drpcps.hrc
index d1b432edbba7..4c6cf06ceb88 100644
--- a/sw/source/ui/chrdlg/drpcps.hrc
+++ b/sw/source/ui/chrdlg/drpcps.hrc
@@ -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
@@ -44,7 +44,7 @@
#define FL_SETTINGS 12
#define CB_SWITCH 13
#define FL_CONTENT 15
-#define CB_WORD 16
+#define CB_WORD 16
#endif
diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src
index d18fad43026e..473deefe2e1a 100644
--- a/sw/source/ui/chrdlg/drpcps.src
+++ b/sw/source/ui/chrdlg/drpcps.src
@@ -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
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 36f9ef1b8351..4f4423ff1d3d 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -2,7 +2,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
@@ -61,15 +61,15 @@ static USHORT __FAR_DATA aPageRg[] = {
SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
const SfxItemSet& rAttr ) :
SfxTabPage(pParent, SW_RES(TP_NUMPARA), rAttr),
- aOutlineStartFL ( this, SW_RES( FL_OUTLINE_START )),
- aOutlineLvFT ( this, SW_RES( FT_OUTLINE_LEVEL )),
- aOutlineLvLB ( this, SW_RES( LB_OUTLINE_LEVEL )),
+ aOutlineStartFL ( this, SW_RES( FL_OUTLINE_START )),
+ aOutlineLvFT ( this, SW_RES( FT_OUTLINE_LEVEL )),
+ aOutlineLvLB ( this, SW_RES( LB_OUTLINE_LEVEL )),
aNumberStyleFT ( this, SW_RES( FT_NUMBER_STYLE ) ),
aNumberStyleLB ( this, SW_RES( LB_NUMBER_STYLE ) ),
aNewStartFL ( this, SW_RES( FL_NEW_START ) ),
- aNewStartCB ( this, SW_RES( CB_NEW_START ) ),
+ aNewStartCB ( this, SW_RES( CB_NEW_START ) ),
aNewStartNumberCB ( this, SW_RES( CB_NUMBER_NEW_START ) ),
- aNewStartNF ( this, SW_RES( NF_NEW_START ) ),
+ aNewStartNF ( this, SW_RES( NF_NEW_START ) ),
aCountParaFL ( this, SW_RES( FL_COUNT_PARA ) ),
aCountParaCB ( this, SW_RES( CB_COUNT_PARA ) ),
aRestartParaCountCB ( this, SW_RES( CB_RESTART_PARACOUNT ) ),
@@ -110,18 +110,18 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage()
{
}
-SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent,
+SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent,
const SfxItemSet& rSet )
{
return new SwParagraphNumTabPage(pParent, rSet);
}
-USHORT* SwParagraphNumTabPage::GetRanges()
+USHORT* SwParagraphNumTabPage::GetRanges()
{
return aPageRg;
}
-BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
+BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
{
if( aOutlineLvLB.GetSelectEntryPos() != aOutlineLvLB.GetSavedValue())
{
@@ -134,7 +134,7 @@ BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
bModified = TRUE;
}
- if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue())
+ if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue())
{
String aStyle;
if(aNumberStyleLB.GetSelectEntryPos())
@@ -172,7 +172,7 @@ BOOL SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
return bModified;
}
-void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
+void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
{
BOOL bHasNumberStyle = FALSE;
@@ -224,7 +224,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
bCurNumrule = TRUE;
const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(FN_NUMBER_NEWSTART);
aNewStartCB.SetState(
- rStart.GetValue() ?
+ rStart.GetValue() ?
STATE_CHECK : STATE_NOCHECK );
aNewStartCB.EnableTriState(FALSE);
}
diff --git a/sw/source/ui/chrdlg/numpara.hrc b/sw/source/ui/chrdlg/numpara.hrc
index 536dc8d935dd..4b5e2834db70 100644
--- a/sw/source/ui/chrdlg/numpara.hrc
+++ b/sw/source/ui/chrdlg/numpara.hrc
@@ -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
@@ -41,9 +41,9 @@
#define CB_RESTART_PARACOUNT 9
#define FT_RESTART_NO 10
#define NF_RESTART_PARA 11
-#define FL_OUTLINE_START 12
-#define LB_OUTLINE_LEVEL 13
-#define FT_OUTLINE_LEVEL 14
+#define FL_OUTLINE_START 12
+#define LB_OUTLINE_LEVEL 13
+#define FT_OUTLINE_LEVEL 14
// **********************************************************************
#endif
diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src
index eb14f0bbfd10..df83af40ce58 100644
--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -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
diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc
index e8e48dfaa956..a1b243ec1a60 100644
--- a/sw/source/ui/chrdlg/paradlg.hrc
+++ b/sw/source/ui/chrdlg/paradlg.hrc
@@ -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
diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src
index 1384e4ae8fa3..636e29f9678b 100644
--- a/sw/source/ui/chrdlg/paradlg.src
+++ b/sw/source/ui/chrdlg/paradlg.src
@@ -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
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 9ba0feff4c3c..f91a439146ca 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -2,7 +2,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
@@ -99,18 +99,18 @@ SwParaDlg::SwParaDlg(Window *pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
+ AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) );
+ AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) );
SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
if (!bDrawParaDlg && (!bHtmlMode || pHtmlOpt->IsPrintLayoutExtension()))
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
+ AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
}
else
@@ -121,7 +121,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
+ AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
}
else
RemoveTabPage(TP_PARA_ASIAN);
@@ -134,7 +134,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+ AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
}
if (!bDrawParaDlg)
@@ -145,7 +145,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
RemoveTabPage(TP_NUMPARA);
if(!bHtmlMode || (nHtmlMode & HTMLMODE_FULL_STYLES))
{
- AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, SwDropCapsPage::GetRanges);
+ AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create, SwDropCapsPage::GetRanges);
}
else
{
diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src
index 8c6cee69d440..c626278748d5 100644
--- a/sw/source/ui/chrdlg/swbreak.src
+++ b/sw/source/ui/chrdlg/swbreak.src
@@ -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
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index b41974d1fcf0..a74bcf51a93d 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -2,7 +2,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
@@ -65,7 +65,7 @@ static USHORT __FAR_DATA aPageRg[] = {
// Warning! This table is indicated directly in code (0, 1, ...)
static long nTabs[] =
- { 2, // Number of Tabs
+ { 2, // Number of Tabs
0, 100
};
@@ -74,16 +74,16 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet),
aConditionFL( this, SW_RES( FL_CONDITION )),
aConditionCB( this, SW_RES( CB_CONDITION ) ),
- aContextFT ( this, SW_RES( FT_CONTEXT ) ),
- aUsedFT ( this, SW_RES( FT_USED ) ),
- aTbLinks( this, SW_RES( TB_CONDCOLLS ) ),
- aStyleFT ( this, SW_RES( FT_STYLE ) ),
- aStyleLB ( this, SW_RES( LB_STYLE ) ),
- aFilterLB ( this, SW_RES( LB_FILTER ) ),
- aRemovePB ( this, SW_RES( PB_REMOVE ) ),
- aAssignPB ( this, SW_RES( PB_ASSIGN ) ),
- sNoTmpl ( SW_RES( STR_NOTEMPL ) ),
- aStrArr ( SW_RES( STR_REGIONS ) ),
+ aContextFT ( this, SW_RES( FT_CONTEXT ) ),
+ aUsedFT ( this, SW_RES( FT_USED ) ),
+ aTbLinks( this, SW_RES( TB_CONDCOLLS ) ),
+ aStyleFT ( this, SW_RES( FT_STYLE ) ),
+ aStyleLB ( this, SW_RES( LB_STYLE ) ),
+ aFilterLB ( this, SW_RES( LB_FILTER ) ),
+ aRemovePB ( this, SW_RES( PB_REMOVE ) ),
+ aAssignPB ( this, SW_RES( PB_ASSIGN ) ),
+ sNoTmpl ( SW_RES( STR_NOTEMPL ) ),
+ aStrArr ( SW_RES( STR_REGIONS ) ),
rSh(::GetActiveView()->GetWrtShell()),
pCmds( SwCondCollItem::GetCmds() ),
pFmt(0),
@@ -94,19 +94,19 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
SetExchangeSupport();
// Install handlers
- aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl));
+ aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl));
aTbLinks.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
aStyleLB.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
- aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
- aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
- aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
- aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
- aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
+ aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
+ aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
+ aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
+ aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
+ aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
aTbLinks.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
aTbLinks.SetSelectionMode( SINGLE_SELECTION );
aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT );
- aTbLinks.Resize(); // OS: Hack fuer richtige Selektion
+ aTbLinks.Resize(); // OS: Hack fuer richtige Selektion
aTbLinks.SetSpaceBetweenEntries( 0 );
aTbLinks.SetHelpId(HID_COND_COLL_TABLIST);
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index c42720e1618c..f0efccfdf707 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx
index 2ed843925e53..8c8ef2276744 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/ui/config/barcfg.cxx
@@ -2,7 +2,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
@@ -42,11 +42,11 @@ using namespace utl;
using rtl::OUString;
using namespace com::sun::star::uno;
-#define SEL_TYPE_TABLE_TEXT 0
+#define SEL_TYPE_TABLE_TEXT 0
#define SEL_TYPE_LIST_TEXT 1
#define SEL_TYPE_TABLE_LIST 2
#define SEL_TYPE_BEZIER 3
-#define SEL_TYPE_GRAPHIC 4
+#define SEL_TYPE_GRAPHIC 4
SwToolbarConfigItem::SwToolbarConfigItem( BOOL bWeb ) :
ConfigItem(bWeb ? C2U("Office.WriterWeb/ObjectBar") : C2U("Office.Writer/ObjectBar"),
@@ -113,8 +113,8 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames()
"Selection/Table", // SEL_TYPE_TABLE_TEXT
"Selection/NumberedList", // SEL_TYPE_LIST_TEXT
"Selection/NumberedList_InTable", // SEL_TYPE_TABLE_LIST
- "Selection/BezierObject", // SEL_TYPE_BEZIER
- "Selection/Graphic" //SEL_TYPE_GRAPHIC
+ "Selection/BezierObject", // SEL_TYPE_BEZIER
+ "Selection/Graphic" //SEL_TYPE_GRAPHIC
};
const int nCount = 5;
Sequence<OUString> aNames(nCount);
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 2470f379c1e9..ed5353015ff6 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@
#include "numrule.hxx"
#include "caption.hxx"
-#define VERSION_01 1
+#define VERSION_01 1
#define CAPTION_VERSION VERSION_01
InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
@@ -84,7 +84,7 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt )
BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const
{
return (eObjType == rOpt.eObjType &&
- aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt
+ aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt
// werden koennen, auf nichts weiteres vergleichen
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 12d33d626c13..9afbcbb0745b 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -2,7 +2,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
@@ -52,14 +52,14 @@ SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) :
SfxPoolItem(_nWhich),
aIndexBackgrndCol(COL_GRAY)
{
- bParagraphEnd =
- bTab =
- bSpace =
- bNonbreakingSpace =
- bSoftHyphen =
+ bParagraphEnd =
+ bTab =
+ bSpace =
+ bNonbreakingSpace =
+ bSoftHyphen =
bFldHiddenText =
bCharHiddenText =
- bManualBreak =
+ bManualBreak =
bShowHiddenPara = FALSE;
};
@@ -76,18 +76,18 @@ SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ):
SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) :
SfxPoolItem( _nWhich )
{
- bParagraphEnd = rVOpt.IsParagraph(TRUE);
- bTab = rVOpt.IsTab(TRUE);
- bSpace = rVOpt.IsBlank(TRUE);
- bNonbreakingSpace = rVOpt.IsHardBlank();
- bSoftHyphen = rVOpt.IsSoftHyph();
+ bParagraphEnd = rVOpt.IsParagraph(TRUE);
+ bTab = rVOpt.IsTab(TRUE);
+ bSpace = rVOpt.IsBlank(TRUE);
+ bNonbreakingSpace = rVOpt.IsHardBlank();
+ bSoftHyphen = rVOpt.IsSoftHyph();
bCharHiddenText = rVOpt.IsShowHiddenChar(TRUE);
bFldHiddenText = rVOpt.IsShowHiddenField();
- bManualBreak = rVOpt.IsLineBreak(TRUE);
+ bManualBreak = rVOpt.IsLineBreak(TRUE);
bShowHiddenPara = rVOpt.IsShowHiddenPara();
}
-SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const
{
return new SwDocDisplayItem( *this );
}
@@ -98,40 +98,40 @@ int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const
const SwDocDisplayItem& rItem = (SwDocDisplayItem&)rAttr;
- return ( bParagraphEnd == rItem.bParagraphEnd &&
- bTab == rItem.bTab &&
- bSpace == rItem.bSpace &&
- bNonbreakingSpace == rItem.bNonbreakingSpace &&
- bSoftHyphen == rItem.bSoftHyphen &&
+ return ( bParagraphEnd == rItem.bParagraphEnd &&
+ bTab == rItem.bTab &&
+ bSpace == rItem.bSpace &&
+ bNonbreakingSpace == rItem.bNonbreakingSpace &&
+ bSoftHyphen == rItem.bSoftHyphen &&
bCharHiddenText == rItem.bCharHiddenText &&
bFldHiddenText == rItem.bFldHiddenText &&
- bManualBreak == rItem.bManualBreak &&
+ bManualBreak == rItem.bManualBreak &&
bShowHiddenPara == rItem.bShowHiddenPara );
}
void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
{
- bParagraphEnd = rDocDisplayItem.bParagraphEnd ;
- bTab = rDocDisplayItem.bTab ;
- bSpace = rDocDisplayItem.bSpace ;
- bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ;
- bSoftHyphen = rDocDisplayItem.bSoftHyphen ;
+ bParagraphEnd = rDocDisplayItem.bParagraphEnd ;
+ bTab = rDocDisplayItem.bTab ;
+ bSpace = rDocDisplayItem.bSpace ;
+ bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ;
+ bSoftHyphen = rDocDisplayItem.bSoftHyphen ;
bCharHiddenText = rDocDisplayItem.bCharHiddenText ;
bFldHiddenText = rDocDisplayItem.bFldHiddenText ;
- bManualBreak = rDocDisplayItem.bManualBreak ;
+ bManualBreak = rDocDisplayItem.bManualBreak ;
bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ;
}
void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
{
- rVOpt.SetParagraph (bParagraphEnd );
- rVOpt.SetTab (bTab );
- rVOpt.SetBlank (bSpace );
- rVOpt.SetHardBlank (bNonbreakingSpace );
- rVOpt.SetSoftHyph (bSoftHyphen );
+ rVOpt.SetParagraph (bParagraphEnd );
+ rVOpt.SetTab (bTab );
+ rVOpt.SetBlank (bSpace );
+ rVOpt.SetHardBlank (bNonbreakingSpace );
+ rVOpt.SetSoftHyph (bSoftHyphen );
rVOpt.SetShowHiddenChar(bCharHiddenText );
rVOpt.SetShowHiddenField(bFldHiddenText );
- rVOpt.SetLineBreak (bManualBreak );
+ rVOpt.SetLineBreak (bManualBreak );
rVOpt.SetShowHiddenPara(bShowHiddenPara );
}
@@ -142,16 +142,16 @@ SwElemItem::SwElemItem( USHORT _nWhich ) :
bVertScrollbar =
bAnyRuler =
bHorzRuler =
- bVertRuler =
+ bVertRuler =
bVertRulerRight=
- bCrosshair =
- bHandles =
- bBigHandles =
+ bCrosshair =
+ bHandles =
+ bBigHandles =
bSmoothScroll =
- bTable =
- bGraphic =
- bDrawing =
- bFieldName =
+ bTable =
+ bGraphic =
+ bDrawing =
+ bFieldName =
bNotes = FALSE;
}
@@ -164,21 +164,21 @@ SwElemItem::SwElemItem( const SwElemItem& rElemItem ):
SwElemItem::SwElemItem(const SwViewOption& rVOpt, USHORT _nWhich) :
SfxPoolItem( _nWhich )
{
- bHorzScrollbar = rVOpt.IsViewHScrollBar();
- bVertScrollbar = rVOpt.IsViewVScrollBar();
+ bHorzScrollbar = rVOpt.IsViewHScrollBar();
+ bVertScrollbar = rVOpt.IsViewVScrollBar();
bAnyRuler = rVOpt.IsViewAnyRuler();
bHorzRuler = rVOpt.IsViewHRuler(TRUE);
bVertRuler = rVOpt.IsViewVRuler(TRUE);
bVertRulerRight = rVOpt.IsVRulerRight();
- bCrosshair = rVOpt.IsCrossHair();
- bHandles = rVOpt.IsSolidMarkHdl();
+ bCrosshair = rVOpt.IsCrossHair();
+ bHandles = rVOpt.IsSolidMarkHdl();
bBigHandles = rVOpt.IsBigMarkHdl();
- bSmoothScroll = rVOpt.IsSmoothScroll();
- bTable = rVOpt.IsTable();
- bGraphic = rVOpt.IsGraphic();
- bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
- bFieldName = rVOpt.IsFldName();
- bNotes = rVOpt.IsPostIts();
+ bSmoothScroll = rVOpt.IsSmoothScroll();
+ bTable = rVOpt.IsTable();
+ bGraphic = rVOpt.IsGraphic();
+ bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
+ bFieldName = rVOpt.IsFldName();
+ bNotes = rVOpt.IsPostIts();
}
@@ -193,15 +193,15 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const
const SwElemItem& rItem = (SwElemItem&)rAttr;
- return ( bHorzScrollbar == rItem.bHorzScrollbar &&
- bVertScrollbar == rItem.bVertScrollbar &&
+ return ( bHorzScrollbar == rItem.bHorzScrollbar &&
+ bVertScrollbar == rItem.bVertScrollbar &&
bAnyRuler == rItem.bAnyRuler &&
bHorzRuler == rItem.bHorzRuler &&
- bVertRuler == rItem.bVertRuler &&
+ bVertRuler == rItem.bVertRuler &&
bVertRulerRight == rItem.bVertRulerRight&&
- bCrosshair == rItem.bCrosshair &&
- bHandles == rItem.bHandles &&
- bBigHandles == rItem.bBigHandles &&
+ bCrosshair == rItem.bCrosshair &&
+ bHandles == rItem.bHandles &&
+ bBigHandles == rItem.bBigHandles &&
bSmoothScroll == rItem.bSmoothScroll &&
bTable == rItem.bTable &&
bGraphic == rItem.bGraphic &&
@@ -212,16 +212,16 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const
void SwElemItem::operator=( const SwElemItem& rElemItem)
{
- bHorzScrollbar = rElemItem. bHorzScrollbar ;
- bVertScrollbar = rElemItem. bVertScrollbar ;
+ bHorzScrollbar = rElemItem. bHorzScrollbar ;
+ bVertScrollbar = rElemItem. bVertScrollbar ;
bAnyRuler = rElemItem. bAnyRuler;
bHorzRuler = rElemItem. bHorzRuler ;
- bVertRuler = rElemItem. bVertRuler ;
+ bVertRuler = rElemItem. bVertRuler ;
bVertRulerRight = rElemItem. bVertRulerRight ;
- bCrosshair = rElemItem. bCrosshair ;
- bHandles = rElemItem. bHandles ;
- bBigHandles = rElemItem. bBigHandles ;
- bSmoothScroll = rElemItem. bSmoothScroll ;
+ bCrosshair = rElemItem. bCrosshair ;
+ bHandles = rElemItem. bHandles ;
+ bBigHandles = rElemItem. bBigHandles ;
+ bSmoothScroll = rElemItem. bSmoothScroll ;
bTable = rElemItem.bTable ;
bGraphic = rElemItem.bGraphic ;
bDrawing = rElemItem.bDrawing ;
@@ -237,16 +237,16 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
rVOpt.SetViewHRuler(bHorzRuler );
rVOpt.SetViewVRuler(bVertRuler );
rVOpt.SetVRulerRight(bVertRulerRight );
- rVOpt.SetCrossHair(bCrosshair );
- rVOpt.SetSolidMarkHdl(bHandles );
+ rVOpt.SetCrossHair(bCrosshair );
+ rVOpt.SetSolidMarkHdl(bHandles );
rVOpt.SetBigMarkHdl(bBigHandles );
rVOpt.SetSmoothScroll(bSmoothScroll);
- rVOpt.SetTable (bTable );
- rVOpt.SetGraphic (bGraphic );
- rVOpt.SetDraw (bDrawing );
- rVOpt.SetControl (bDrawing );
- rVOpt.SetFldName (bFieldName );
- rVOpt.SetPostIts (bNotes );
+ rVOpt.SetTable (bTable );
+ rVOpt.SetGraphic (bGraphic );
+ rVOpt.SetDraw (bDrawing );
+ rVOpt.SetControl (bDrawing );
+ rVOpt.SetFldName (bFieldName );
+ rVOpt.SetPostIts (bNotes );
}
/*--------------------------------------------------------------------
@@ -322,7 +322,7 @@ SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const
int SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const
{
- return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() &&
+ return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() &&
GetMode() == ((SwShadowCursorItem&)rCmp).GetMode();
}
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
index 197e6482d7a1..e5a6ef2f9aaa 100644
--- a/sw/source/ui/config/config.hrc
+++ b/sw/source/ui/config/config.hrc
@@ -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
@@ -32,30 +32,30 @@
// Dialoge fuer die Konfiguration
// Strings fuer die Konfiguration
-#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0)
-#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1)
-#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2)
-#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3)
-#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4)
-#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5)
-#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6)
-#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7)
-#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8)
-#define DLG_TBSEL (RC_CONFIG_BEGIN + 9)
-#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10)
-#define DLG_CONFIG (RC_CONFIG_BEGIN + 11)
-#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12)
+#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0)
+#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1)
+#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2)
+#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3)
+#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4)
+#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5)
+#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6)
+#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7)
+#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8)
+#define DLG_TBSEL (RC_CONFIG_BEGIN + 9)
+#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10)
+#define DLG_CONFIG (RC_CONFIG_BEGIN + 11)
+#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12)
-#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13)
-#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14)
-#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15)
-#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16)
-#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17)
+#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13)
+#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14)
+#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15)
+#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16)
+#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17)
#define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19)
#define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20)
-#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25)
+#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25)
#define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26)
#define CONFIG_ACT_END STR_ARR_METRIC
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx
index bc80f4862ede..c49f4574843d 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/ui/config/dbconfig.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 6b42b0e8d110..989477af1185 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -2,7 +2,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
@@ -144,7 +144,7 @@ SwStdFontConfig::SwStdFontConfig() :
}
}
-void SwStdFontConfig::Commit()
+void SwStdFontConfig::Commit()
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues(aNames.getLength());
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 688a79e6aecc..0fbcfff5342d 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/config/mailconfigpage.hrc b/sw/source/ui/config/mailconfigpage.hrc
index a7115878ccf5..0a52c9428715 100644
--- a/sw/source/ui/config/mailconfigpage.hrc
+++ b/sw/source/ui/config/mailconfigpage.hrc
@@ -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
diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src
index 1ad1378222c0..f76f01ccaba1 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -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
@@ -392,7 +392,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
};
Edit ED_INPASSWORD
{
- Pos = MAP_APPFONT ( 78 , 165 ) ;
+ Pos = MAP_APPFONT ( 78 , 165 ) ;
Size = MAP_APPFONT ( 115 , 12 ) ;
Border = TRUE;
PassWord = TRUE;
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index 4bce04870d93..bb84277ea18c 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -2,7 +2,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
@@ -54,7 +54,7 @@ using namespace utl;
using rtl::OUString;
using namespace com::sun::star::uno;
-#define GLOB_NAME_CALC 0
+#define GLOB_NAME_CALC 0
#define GLOB_NAME_IMPRESS 1
#define GLOB_NAME_DRAW 2
#define GLOB_NAME_MATH 3
@@ -169,9 +169,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI)
switch (c)
{
- case 'n': sReturn += '\n'; break;
- case 't': sReturn += '\t'; break;
- case '\\': sReturn += '\\'; break;
+ case 'n': sReturn += '\n'; break;
+ case 't': sReturn += '\t'; break;
+ case '\\': sReturn += '\\'; break;
case 'x':
{
@@ -219,9 +219,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI)
switch (c)
{
- case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break;
- case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break;
- case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break;
+ case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break;
+ case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break;
+ case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break;
default:
if( c <= 0x1f || c >= 0x7f )
@@ -246,14 +246,14 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames()
aNames.realloc(nCount);
static const char* aPropNames[] =
{
- "TextDisplay/Insert/Attribute", // 0
- "TextDisplay/Insert/Color", // 1
- "TextDisplay/Delete/Attribute", // 2
- "TextDisplay/Delete/Color", // 3
+ "TextDisplay/Insert/Attribute", // 0
+ "TextDisplay/Insert/Color", // 1
+ "TextDisplay/Delete/Attribute", // 2
+ "TextDisplay/Delete/Color", // 3
"TextDisplay/ChangedAttribute/Attribute", // 4
- "TextDisplay/ChangedAttribute/Color", // 5
- "LinesChanged/Mark", // 6
- "LinesChanged/Color" // 7
+ "TextDisplay/ChangedAttribute/Color", // 5
+ "LinesChanged/Mark", // 6
+ "LinesChanged/Color" // 7
};
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -288,7 +288,7 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
sal_Int32 nRet = 0;
switch(rAttr.nItemId)
{
- case SID_ATTR_CHAR_WEIGHT: nRet = 1; break;
+ case SID_ATTR_CHAR_WEIGHT: nRet = 1; break;
case SID_ATTR_CHAR_POSTURE: nRet = 2; break;
case SID_ATTR_CHAR_UNDERLINE: nRet = UNDERLINE_SINGLE == rAttr.nAttr ? 3 : 4; break;
case SID_ATTR_CHAR_STRIKEOUT: nRet = 3; break;
@@ -322,12 +322,12 @@ void SwRevisionConfig::Commit()
switch(nProp)
{
case 0 : nVal = lcl_ConvertAttrToCfg(aInsertAttr); break;
- case 1 : nVal = aInsertAttr.nColor ; break;
+ case 1 : nVal = aInsertAttr.nColor ; break;
case 2 : nVal = lcl_ConvertAttrToCfg(aDeletedAttr); break;
case 3 : nVal = aDeletedAttr.nColor ; break;
case 4 : nVal = lcl_ConvertAttrToCfg(aFormatAttr); break;
- case 5 : nVal = aFormatAttr.nColor ; break;
- case 6 : nVal = nMarkAlign ; break;
+ case 5 : nVal = aFormatAttr.nColor ; break;
+ case 6 : nVal = nMarkAlign ; break;
case 7 : nVal = aMarkColor.GetColor(); break;
}
pValues[nProp] <<= nVal;
@@ -340,7 +340,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet
rAttr.nItemId = rAttr.nAttr = 0;
switch(nVal)
{
- case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break;
+ case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break;
case 2: rAttr.nItemId = SID_ATTR_CHAR_POSTURE; rAttr.nAttr = ITALIC_NORMAL ; break;
case 3: if(bDelete)
{
@@ -358,7 +358,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet
case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_GEMEINE ; break;
case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_KAPITAELCHEN ; break;
case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_TITEL ; break;
- case 9: rAttr.nItemId = SID_ATTR_BRUSH; break;
+ case 9: rAttr.nItemId = SID_ATTR_BRUSH; break;
}
}
void SwRevisionConfig::Load()
@@ -378,11 +378,11 @@ void SwRevisionConfig::Load()
switch(nProp)
{
case 0 : lcl_ConvertCfgToAttr(nVal, aInsertAttr); break;
- case 1 : aInsertAttr.nColor = nVal; break;
+ case 1 : aInsertAttr.nColor = nVal; break;
case 2 : lcl_ConvertCfgToAttr(nVal, aDeletedAttr, sal_True); break;
- case 3 : aDeletedAttr.nColor = nVal; break;
+ case 3 : aDeletedAttr.nColor = nVal; break;
case 4 : lcl_ConvertCfgToAttr(nVal, aFormatAttr); break;
- case 5 : aFormatAttr.nColor = nVal; break;
+ case 5 : aFormatAttr.nColor = nVal; break;
case 6 : nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break;
case 7 : aMarkColor.SetColor(nVal); break;
}
@@ -487,7 +487,7 @@ enum InsertConfigProp
INS_PROP_CAP_OBJECT_OLEMISC_POSITION, //91
INS_PROP_CAP_OBJECT_OLEMISC_CHARACTERSTYLE, //92
INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES //93
-};
+};
const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
{
static Sequence<OUString> aNames;
@@ -590,7 +590,7 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
"Caption/OfficeObject/OLEMisc/Settings/Position", //91
"Caption/OfficeObject/OLEMisc/Settings/CharacterStyle", //92
"Caption/OfficeObject/OLEMisc/Settings/ApplyAttributes" //93
- };
+ };
const int nCount = INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES + 1;
const int nWebCount = INS_PROP_TABLE_BORDER + 1;
aNames.realloc(nCount);
@@ -616,7 +616,7 @@ SwInsertConfig::SwInsertConfig(sal_Bool bWeb) :
aInsTblOpts(0,0),
bIsWeb(bWeb)
{
- aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID);
+ aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID);
aGlobalNames[GLOB_NAME_IMPRESS] = SvGlobalName(SO3_SIMPRESS_CLASSID);
aGlobalNames[GLOB_NAME_DRAW ] = SvGlobalName(SO3_SDRAW_CLASSID);
aGlobalNames[GLOB_NAME_MATH ] = SvGlobalName(SO3_SM_CLASSID);
@@ -708,7 +708,7 @@ void SwInsertConfig::Commit()
}
break;//"Table/Split",
case INS_PROP_CAP_AUTOMATIC: pValues[nProp].setValue(&bInsWithCaption, rType);break;//"Caption/Automatic",
- case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST:
+ case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST:
pValues[nProp] <<= bCaptionOrderNumberingFirst;
break;//"Caption/CaptionOrderNumberingFirst"
@@ -867,7 +867,7 @@ void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_I
break;//CaptionText",
case 5:
{
- OUString sTemp;
+ OUString sTemp;
if(pValues[nProp] >>= sTemp)
rOpt.SetSeparator(sTemp);
}
@@ -1137,14 +1137,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames()
static Sequence<OUString> aNames(nCount);
static const char* aPropNames[] =
{
- "Shift/Row", // 0
- "Shift/Column", // 1
- "Insert/Row", // 2
- "Insert/Column", // 3
- "Change/Effect", // 4
- "Input/NumberRecognition", // 5
+ "Shift/Row", // 0
+ "Shift/Column", // 1
+ "Insert/Row", // 2
+ "Insert/Column", // 3
+ "Change/Effect", // 4
+ "Input/NumberRecognition", // 5
"Input/NumberFormatRecognition",// 6
- "Input/Alignment" // 7
+ "Input/Alignment" // 7
};
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -1204,12 +1204,12 @@ void SwTableConfig::Load()
sal_Int32 nTemp = 0;
switch(nProp)
{
- case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row",
+ case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row",
case 1 : pValues[nProp] >>= nTemp; nTblVMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Column",
case 2 : pValues[nProp] >>= nTemp; nTblHInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Row",
case 3 : pValues[nProp] >>= nTemp; nTblVInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Column",
case 4 : pValues[nProp] >>= nTemp; eTblChgMode = (TblChgMode)nTemp; break; //"Change/Effect",
- case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition",
+ case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition",
case 6 : bInsTblChangeNumFormat = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberFormatRecognition",
case 7 : bInsTblAlignNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/Alignment"
}
@@ -1246,15 +1246,15 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
aNames.realloc(nCount);
static const char* aPropNames[] =
{
- "Statistics/WordNumber/Delimiter", // 0
- "DefaultFont/Document", // 1
- "Index/ShowPreview", // 2
- "Misc/GraphicToGalleryAsLink", // 3
- "Numbering/Graphic/KeepRatio", // 4
+ "Statistics/WordNumber/Delimiter", // 0
+ "DefaultFont/Document", // 1
+ "Index/ShowPreview", // 2
+ "Misc/GraphicToGalleryAsLink", // 3
+ "Numbering/Graphic/KeepRatio", // 4
"FormLetter/PrintOutput/SinglePrintJobs", // 5
- "FormLetter/MailingOutput/Format", // 6
+ "FormLetter/MailingOutput/Format", // 6
"FormLetter/FileOutput/FileName/FromDatabaseField", // 7
- "FormLetter/FileOutput/Path", // 8
+ "FormLetter/FileOutput/Path", // 8
"FormLetter/FileOutput/FileName/FromManualSetting", // 9
"FormLetter/FileOutput/FileName/Generation",//10
"FormLetter/PrintOutput/AskForMerge" //11
@@ -1284,14 +1284,14 @@ void SwMiscConfig::Commit()
SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, sal_False));
break;
case 1 : pValues[nProp].setValue(&bDefaultFontsInCurrDocOnly, rType); break;
- case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break;
- case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break;
- case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break;
- case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break;
- case 6 : pValues[nProp] <<= nMailingFormats; break;
+ case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break;
+ case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break;
+ case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break;
+ case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break;
+ case 6 : pValues[nProp] <<= nMailingFormats; break;
case 7 : pValues[nProp] <<= OUString(sNameFromColumn); break;
- case 8 : pValues[nProp] <<= OUString(sMailingPath); break;
- case 9 : pValues[nProp] <<= OUString(sMailName); break;
+ case 8 : pValues[nProp] <<= OUString(sMailingPath); break;
+ case 9 : pValues[nProp] <<= OUString(sMailName); break;
case 10: pValues[nProp].setValue(&bIsNameFromColumn, rType);break;
case 11: pValues[nProp] <<= bAskForMailMergeInPrint; break;
}
@@ -1322,10 +1322,10 @@ void SwMiscConfig::Load()
case 3 : bGrfToGalleryAsLnk = *(sal_Bool*)pValues[nProp].getValue(); break;
case 4 : bNumAlignSize = *(sal_Bool*)pValues[nProp].getValue(); break;
case 5 : bSinglePrintJob = *(sal_Bool*)pValues[nProp].getValue(); break;
- case 6 : pValues[nProp] >>= nMailingFormats; ; break;
+ case 6 : pValues[nProp] >>= nMailingFormats; ; break;
case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break;
- case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break;
- case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break;
+ case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break;
+ case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break;
case 10: bIsNameFromColumn = *(sal_Bool*)pValues[nProp].getValue(); break;
case 11: pValues[nProp] >>= bAskForMailMergeInPrint; break;
}
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index dc79305a2586..ad15ef4b43b5 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -2,7 +2,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
@@ -57,30 +57,30 @@ using namespace ::com::sun::star::uno;
using ::rtl::OUString;
using namespace ::std;
-#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) )
-#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME
-#define USER_ENTRY ASCII_STR( "_user" )
-#define BUTTON_BORDER 2
+#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) )
+#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME
+#define USER_ENTRY ASCII_STR( "_user" )
+#define BUTTON_BORDER 2
// struct CompatibilityItem ----------------------------------------------
struct CompatibilityItem
{
- String m_sName;
- String m_sModule;
- bool m_bUsePrtMetrics;
- bool m_bAddSpacing;
- bool m_bAddSpacingAtPages;
- bool m_bUseOurTabStops;
- bool m_bNoExtLeading;
- bool m_bUseLineSpacing;
- bool m_bAddTableSpacing;
- bool m_bUseObjPos;
- bool m_bUseOurTextWrapping;
- bool m_bConsiderWrappingStyle;
+ String m_sName;
+ String m_sModule;
+ bool m_bUsePrtMetrics;
+ bool m_bAddSpacing;
+ bool m_bAddSpacingAtPages;
+ bool m_bUseOurTabStops;
+ bool m_bNoExtLeading;
+ bool m_bUseLineSpacing;
+ bool m_bAddTableSpacing;
+ bool m_bUseObjPos;
+ bool m_bUseOurTextWrapping;
+ bool m_bConsiderWrappingStyle;
bool m_bExpandWordSpace;
- bool m_bIsDefault;
- bool m_bIsUser;
+ bool m_bIsDefault;
+ bool m_bIsUser;
CompatibilityItem( const String& _rName, const String& _rModule,
bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages,
@@ -89,21 +89,21 @@ struct CompatibilityItem
bool _bConsiderWrappingStyle, bool _bExpandWordSpace,
bool _bIsDefault, bool _bIsUser ) :
- m_sName ( _rName ),
- m_sModule ( _rModule ),
- m_bUsePrtMetrics ( _bUsePrtMetrics ),
- m_bAddSpacing ( _bAddSpacing ),
- m_bAddSpacingAtPages ( _bAddSpacingAtPages ),
- m_bUseOurTabStops ( _bUseOurTabStops ),
- m_bNoExtLeading ( _bNoExtLeading ),
- m_bUseLineSpacing ( _bUseLineSpacing ),
- m_bAddTableSpacing ( _bAddTableSpacing ),
- m_bUseObjPos ( _bUseObjPos ),
- m_bUseOurTextWrapping ( _bUseOurTextWrapping ),
+ m_sName ( _rName ),
+ m_sModule ( _rModule ),
+ m_bUsePrtMetrics ( _bUsePrtMetrics ),
+ m_bAddSpacing ( _bAddSpacing ),
+ m_bAddSpacingAtPages ( _bAddSpacingAtPages ),
+ m_bUseOurTabStops ( _bUseOurTabStops ),
+ m_bNoExtLeading ( _bNoExtLeading ),
+ m_bUseLineSpacing ( _bUseLineSpacing ),
+ m_bAddTableSpacing ( _bAddTableSpacing ),
+ m_bUseObjPos ( _bUseObjPos ),
+ m_bUseOurTextWrapping ( _bUseOurTextWrapping ),
m_bConsiderWrappingStyle( _bConsiderWrappingStyle ),
m_bExpandWordSpace ( _bExpandWordSpace ),
- m_bIsDefault ( _bIsDefault ),
- m_bIsUser ( _bIsUser ) {}
+ m_bIsDefault ( _bIsDefault ),
+ m_bIsUser ( _bIsUser ) {}
};
#include <vector>
@@ -112,7 +112,7 @@ struct SwCompatibilityOptPage_Impl
{
typedef vector< CompatibilityItem > SwCompatibilityItemList;
- SwCompatibilityItemList m_aList;
+ SwCompatibilityItemList m_aList;
};
// class SwCompatibilityOptPage ------------------------------------------
@@ -121,18 +121,18 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe
SfxTabPage( pParent, SW_RES( TP_OPTCOMPATIBILITY_PAGE ), rSet ),
- m_aMainFL ( this, SW_RES( FL_MAIN ) ),
- m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ),
- m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ),
- m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ),
- m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ),
- m_aResetPB ( this, SW_RES( PB_RESET ) ),
- m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ),
- m_sUserEntry ( SW_RES( STR_USERENTRY ) ),
- m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ),
- m_pWrtShell ( NULL ),
- m_pImpl ( new SwCompatibilityOptPage_Impl ),
- m_nSavedOptions ( 0 )
+ m_aMainFL ( this, SW_RES( FL_MAIN ) ),
+ m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ),
+ m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ),
+ m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ),
+ m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ),
+ m_aResetPB ( this, SW_RES( PB_RESET ) ),
+ m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ),
+ m_sUserEntry ( SW_RES( STR_USERENTRY ) ),
+ m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ),
+ m_pWrtShell ( NULL ),
+ m_pImpl ( new SwCompatibilityOptPage_Impl ),
+ m_nSavedOptions ( 0 )
{
// init options strings with local resource ids -> so do it before FreeResource()
@@ -424,7 +424,7 @@ IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG )
switch ( eOption )
{
case COPT_USE_PRINTERDEVICE : pItem->m_bUsePrtMetrics = bChecked; break;
- case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break;
+ case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break;
case COPT_ADD_SPACING_AT_PAGES : pItem->m_bAddSpacingAtPages = bChecked; break;
case COPT_USE_OUR_TABSTOPS : pItem->m_bUseOurTabStops = bChecked; break;
case COPT_NO_EXTLEADING : pItem->m_bNoExtLeading = bChecked; break;
@@ -498,7 +498,7 @@ void SwCompatibilityOptPage::WriteOptions()
pItem->m_bExpandWordSpace );
}
-SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
return new SwCompatibilityOptPage( pParent, rAttrSet );
}
diff --git a/sw/source/ui/config/optcomp.hrc b/sw/source/ui/config/optcomp.hrc
index 4219724a9106..f378ff739386 100644
--- a/sw/source/ui/config/optcomp.hrc
+++ b/sw/source/ui/config/optcomp.hrc
@@ -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
@@ -27,29 +27,29 @@
// the controls
-#define FL_MAIN 10
-#define FT_FORMATTING 11
-#define LB_FORMATTING 12
-#define FT_OPTIONS 13
-#define LB_OPTIONS 14
-#define PB_RESET 15
-#define PB_DEFAULT 16
+#define FL_MAIN 10
+#define FT_FORMATTING 11
+#define LB_FORMATTING 12
+#define FT_OPTIONS 13
+#define LB_OPTIONS 14
+#define PB_RESET 15
+#define PB_DEFAULT 16
// the option strings
-#define STR_USERENTRY 10
-#define STR_QRYBOX_USEASDEFAULT 11
+#define STR_USERENTRY 10
+#define STR_QRYBOX_USEASDEFAULT 11
-#define STR_COMP_OPTIONS_START 100
-#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0)
-#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1)
-#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2)
-#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3)
-#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4)
-#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5)
-#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6)
-#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7)
-#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8)
+#define STR_COMP_OPTIONS_START 100
+#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0)
+#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1)
+#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2)
+#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3)
+#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4)
+#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5)
+#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6)
+#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7)
+#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8)
#define STR_CONSIDER_WRAPPINGSTYLE (STR_COMP_OPTIONS_START + 9)
#define STR_EXPAND_WORDSPACE (STR_COMP_OPTIONS_START + 10)
#define STR_COMP_OPTIONS_END (STR_EXPAND_WORDSPACE + 1)
diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src
index 927eadc183a1..3682b49477d3 100644
--- a/sw/source/ui/config/optcomp.src
+++ b/sw/source/ui/config/optcomp.src
@@ -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
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 4162b656d7e5..31f2e7041f5b 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -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
@@ -30,7 +30,7 @@
#define FL_NOPRINT 2
#define FL_WINDOW 3
-#define CB_GRF 1
+#define CB_GRF 1
#define CB_TBL 2
#define CB_DRWFAST 3
#define CB_FIELD 4
@@ -42,7 +42,7 @@
#define CB_FLD_HIDDEN 10
#define CB_BREAK 11
#define CB_ANY_RULER 12
-#define CB_CROSS 14
+#define CB_CROSS 14
#define CB_HSCROLL 15
#define CB_VSCROLL 16
#define CB_HRULER 17
@@ -57,29 +57,29 @@
#define FT_METRIC 28
//test tab page
-#define CB_TEST1 25
-#define CB_TEST2 26
-#define CB_TEST3 27
-#define CB_TEST4 28
-#define CB_TEST5 29
-#define CB_TEST6 30
-#define CB_TEST7 31
-#define CB_TEST8 32
-#define CB_TEST9 33
-#define CB_TEST10 34
+#define CB_TEST1 25
+#define CB_TEST2 26
+#define CB_TEST3 27
+#define CB_TEST4 28
+#define CB_TEST5 29
+#define CB_TEST6 30
+#define CB_TEST7 31
+#define CB_TEST8 32
+#define CB_TEST9 33
+#define CB_TEST10 34
#define FL_TEST 35
#define CB_FLD_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben
#define CB_SMOOTH_SCROLL 37
-#define BT_OK 38
-#define BT_CANCEL 39
-#define BT_MORE 40
-#define BT_GRID 41
-#define MF_HFRAME 42
-#define MF_VFRAME 43
+#define BT_OK 38
+#define BT_CANCEL 39
+#define BT_MORE 40
+#define BT_GRID 41
+#define MF_HFRAME 42
+#define MF_VFRAME 43
-#define CB_INDEX 44
+#define CB_INDEX 44
#define LB_COLOR 50
#define WIN_COLOR 52
@@ -89,12 +89,12 @@
#define BT_DELETE 57
#define BT_DEFAULT 58
#define CB_HANDLE 59
-#define CB_SECT_BOUNDS 60
+#define CB_SECT_BOUNDS 60
#define CB_CHAR_HIDDEN 61
// Print-Extra-Page
#define CB_PGRF 61
//#define CB_PTAB 62 merged with CB_PGRF in printerpullpages
-//#define CB_PDRAW 63 removed in printerpullpages
+//#define CB_PDRAW 63 removed in printerpullpages
#define CB_LEFTP 64
#define CB_RIGHTP 65
//#define CB_REVERSE 66 removed in printerpullpages
@@ -107,7 +107,7 @@
#define FL_3 73
#define FL_4 74
#define FT_FAX 76
-#define CB_BACKGROUND 79
+#define CB_BACKGROUND 79
#define RB_NO 80
#define RB_ONLY 81
@@ -126,7 +126,7 @@
// Tabpage Grundschriften
-#define FT_STANDARD 90
+#define FT_STANDARD 90
#define LB_STANDARD 91
#define FT_TITLE 92
#define LB_TITLE 93
@@ -161,31 +161,31 @@
#define FL_TABLE_INSERT 108
#define CB_NUMFMT_FORMATTING 109
#define FL_MOVE 110
-#define FT_ROWMOVE 111
-#define MF_ROWMOVE 112
-#define FT_COLMOVE 113
-#define MF_COLMOVE 114
+#define FT_ROWMOVE 111
+#define MF_ROWMOVE 112
+#define FT_COLMOVE 113
+#define MF_COLMOVE 114
#define FT_INSERT 115
#define FT_ROWINSERT 116
#define MF_ROWINSERT 117
#define FT_COLINSERT 118
#define MF_COLINSERT 119
#define FT_HANDLING 120
-#define RB_FIX 121
-#define RB_FIXPROP 122
-#define RB_VAR 123
-#define FT_FIX 124
-#define FT_FIXPROP 125
-#define FT_VAR 126
+#define RB_FIX 121
+#define RB_FIXPROP 122
+#define RB_VAR 123
+#define FT_FIX 124
+#define FT_FIXPROP 125
+#define FT_VAR 126
#define FT_MOVE 128
#define FL_COLOR 130
-#define FT_SGML 131
-#define LB_SGML 132
+#define FT_SGML 131
+#define LB_SGML 132
#define FT_COMMENT 133
#define LB_COMMENT 134
-#define FT_KEYWD 135
-#define LB_KEYWD 136
+#define FT_KEYWD 135
+#define LB_KEYWD 136
#define FT_UNKNOWN 137
#define LB_UNKNOWN 138
#define FL_TABLE_SEPARATOR 139
@@ -194,12 +194,12 @@
#define FL_SHDWCRSFLAG 1
#define CB_SHDWCRSONOFF 2
#define FL_SHDWCRSMODE 3
-#define FT_SHDWCRSFILLMODE 4
+#define FT_SHDWCRSFILLMODE 4
#define RB_SHDWCRSFILLMARGIN 5
#define RB_SHDWCRSFILLINDENT 6
#define RB_SHDWCRSFILLTAB 7
#define RB_SHDWCRSFILLSPACE 8
-#define CB_ALLOW_IN_PROT 12
+#define CB_ALLOW_IN_PROT 12
#define FL_CRSR_OPT 13
#define FL_SEPARATOR_SHDW 14
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 97f903557bda..a2573ed3c1f2 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -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
@@ -38,7 +38,7 @@
/**************************************************************************/
/* */
-/* TabPage Ansicht/Inhalt */
+/* TabPage Ansicht/Inhalt */
/* */
/**************************************************************************/
TabPage TP_CONTENT_OPT
@@ -220,7 +220,7 @@ TabPage TP_OPTPRINT_PAGE
TabStop = TRUE ;
Group = TRUE ;
};
-/*
+/*
removed, tables now always get printed
CheckBox CB_PTAB
{
@@ -229,7 +229,7 @@ TabPage TP_OPTPRINT_PAGE
Text [ en-US ] = "~Tables" ;
};
*/
-/*
+/*
functionally merged with CB_PGRF (pictures and graphics)
CheckBox CB_PDRAW
{
@@ -801,7 +801,7 @@ TabPage TP_OPTTABLE_PAGE
};
/**************************************************************************/
/* */
-/* TabPage ShadowCursor */
+/* TabPage ShadowCursor */
/* */
/**************************************************************************/
TabPage TP_OPTSHDWCRSR
@@ -965,7 +965,7 @@ StringArray STR_PRINTOPTUI
< "Specifies whether to always print text in black."; >;
< "Pages"; >;
< "Print ~automatically inserted blank pages"; >;
- < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >;
+ < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >;
< "~Use only paper tray from printer preferences"; >;
< "For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer."; >;
< "Print"; >;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3de0abb8b5cf..899ad9c419ed 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -2,7 +2,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
@@ -96,9 +96,9 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ),
aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ),
- pWrtShell ( NULL ),
+ pWrtShell ( NULL ),
bHTMLMode ( FALSE ),
- nLastTab ( 0 ),
+ nLastTab ( 0 ),
nOldLinkMode( MANUAL )
{
@@ -134,7 +134,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
aTabFT.Hide();
aTabMF.Hide();
}
-
+
SvtCJKOptions aCJKOptions;
if(!aCJKOptions.IsAsianTypographyEnabled())
{
@@ -147,7 +147,7 @@ SwLoadOptPage::~SwLoadOptPage()
{
}
-SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent,
+SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return new SwLoadOptPage(pParent, rAttrSet );
@@ -214,7 +214,7 @@ BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag ));
bRet = TRUE;
}
-
+
sal_Bool bIsSquaredPageModeFlag = aUseSquaredPageMode.IsChecked();
if ( bIsSquaredPageModeFlag != aUseSquaredPageMode.GetSavedValue() )
{
@@ -256,9 +256,9 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet)
switch (nOldLinkMode)
{
- case NEVER: aNeverRB.Check(); break;
- case MANUAL: aRequestRB.Check(); break;
- case AUTOMATIC: aAlwaysRB.Check(); break;
+ case NEVER: aNeverRB.Check(); break;
+ case MANUAL: aRequestRB.Check(); break;
+ case AUTOMATIC: aAlwaysRB.Check(); break;
}
aAutoUpdateFields.SaveValue();
@@ -291,7 +291,7 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet)
{
bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON);
}
-
+
//default page mode loading
if(pWrtShell)
{
@@ -359,7 +359,7 @@ SwCaptionPreview::SwCaptionPreview( Window* pParent, const ResId& rResId )
{
maDrawPos = Point( 4, 6 );
- Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
+ Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
SetBackground( aBack );
SetFillColor( aBack.GetColor() );
SetLineColor( aBack.GetColor() );
@@ -388,47 +388,47 @@ void SwCaptionPreview::Paint( const Rectangle& rRect )
SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, SW_RES(TP_OPTCAPTION_PAGE), rSet),
- aCheckFT (this, SW_RES(FT_OBJECTS )),
- aCheckLB (this, SW_RES(CLB_OBJECTS )),
+ aCheckFT (this, SW_RES(FT_OBJECTS )),
+ aCheckLB (this, SW_RES(CLB_OBJECTS )),
aFtCaptionOrder(this, SW_RES( FT_ORDER )),
aLbCaptionOrder(this, SW_RES( LB_ORDER )),
aPreview (this, SW_RES(WIN_PREVIEW )),
- aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )),
- aCategoryText (this, SW_RES(TXT_CATEGORY )),
- aCategoryBox (this, SW_RES(BOX_CATEGORY )),
- aFormatText (this, SW_RES(TXT_FORMAT )),
- aFormatBox (this, SW_RES(BOX_FORMAT )),
+ aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )),
+ aCategoryText (this, SW_RES(TXT_CATEGORY )),
+ aCategoryBox (this, SW_RES(BOX_CATEGORY )),
+ aFormatText (this, SW_RES(TXT_FORMAT )),
+ aFormatBox (this, SW_RES(BOX_FORMAT )),
aNumberingSeparatorFT(this, SW_RES(FT_NUM_SEP )),
aNumberingSeparatorED(this, SW_RES(ED_NUM_SEP )),
- aTextText (this, SW_RES(TXT_TEXT )),
- aTextEdit (this, SW_RES(EDT_TEXT )),
- aPosText (this, SW_RES(TXT_POS )),
- aPosBox (this, SW_RES(BOX_POS )),
- aNumCaptFL (this, SW_RES(FL_NUMCAPT )),
- aFtLevel (this, SW_RES(FT_LEVEL )),
- aLbLevel (this, SW_RES(LB_LEVEL )),
- aFtDelim (this, SW_RES(FT_SEPARATOR )),
- aEdDelim (this, SW_RES(ED_SEPARATOR )),
- aCategoryFL (this, SW_RES(FL_CATEGORY )),
- aCharStyleFT (this, SW_RES(FT_CHARSTYLE )),
- aCharStyleLB (this, SW_RES(LB_CHARSTYLE )),
- aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)),
-
- sSWTable (SW_RES(STR_TABLE )),
- sSWFrame (SW_RES(STR_FRAME )),
- sSWGraphic (SW_RES(STR_GRAPHIC )),
- sOLE (SW_RES(STR_OLE )),
-
- sBegin (SW_RESSTR(STR_BEGINNING )),
- sEnd (SW_RESSTR(STR_END )),
- sAbove (SW_RESSTR(STR_ABOVE )),
- sBelow (SW_RESSTR(STR_CP_BELOW )),
+ aTextText (this, SW_RES(TXT_TEXT )),
+ aTextEdit (this, SW_RES(EDT_TEXT )),
+ aPosText (this, SW_RES(TXT_POS )),
+ aPosBox (this, SW_RES(BOX_POS )),
+ aNumCaptFL (this, SW_RES(FL_NUMCAPT )),
+ aFtLevel (this, SW_RES(FT_LEVEL )),
+ aLbLevel (this, SW_RES(LB_LEVEL )),
+ aFtDelim (this, SW_RES(FT_SEPARATOR )),
+ aEdDelim (this, SW_RES(ED_SEPARATOR )),
+ aCategoryFL (this, SW_RES(FL_CATEGORY )),
+ aCharStyleFT (this, SW_RES(FT_CHARSTYLE )),
+ aCharStyleLB (this, SW_RES(LB_CHARSTYLE )),
+ aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)),
+
+ sSWTable (SW_RES(STR_TABLE )),
+ sSWFrame (SW_RES(STR_FRAME )),
+ sSWGraphic (SW_RES(STR_GRAPHIC )),
+ sOLE (SW_RES(STR_OLE )),
+
+ sBegin (SW_RESSTR(STR_BEGINNING )),
+ sEnd (SW_RESSTR(STR_END )),
+ sAbove (SW_RESSTR(STR_ABOVE )),
+ sBelow (SW_RESSTR(STR_CP_BELOW )),
sNone (SW_RESSTR( STR_CATEGORY_NONE )),
- pMgr (new SwFldMgr()),
+ pMgr (new SwFldMgr()),
bHTMLMode(FALSE)
{
- Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
+ Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
aPreview.SetBackground( aBack );
SwStyleNameMapper::FillUIName( RES_POOLCOLL_LABEL_ABB, sIllustration );
@@ -471,7 +471,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
aLbLevel.InsertEntry(String::CreateFromInt32(i + 1));
sal_Unicode nLvl = MAXLEVEL;
- String sDelim( String::CreateFromAscii( ": " ) );
+ String sDelim( String::CreateFromAscii( ": " ) );
if (pSh)
{
@@ -494,11 +494,11 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl );
aCategoryBox.SetModifyHdl( aLk );
aNumberingSeparatorED.SetModifyHdl( aLk );
- aTextEdit .SetModifyHdl( aLk );
+ aTextEdit .SetModifyHdl( aLk );
aLk = LINK(this, SwCaptionOptPage, SelectHdl);
aCategoryBox.SetSelectHdl( aLk );
- aFormatBox .SetSelectHdl( aLk );
+ aFormatBox .SetSelectHdl( aLk );
aLbCaptionOrder.SetSelectHdl( LINK(this, SwCaptionOptPage, OrderHdl));
@@ -513,7 +513,7 @@ SwCaptionOptPage::~SwCaptionOptPage()
delete pMgr;
}
-SfxTabPage* SwCaptionOptPage::Create( Window* pParent,
+SfxTabPage* SwCaptionOptPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return new SwCaptionOptPage(pParent, rAttrSet );
@@ -524,7 +524,7 @@ BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& )
BOOL bRet = FALSE;
SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
- SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen
+ SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen
SvLBoxEntry* pEntry = aCheckLB.First();
@@ -739,8 +739,8 @@ IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG )
break;
}
aPosBox.SelectEntryPos(pOpt->GetPos());
- aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP &&
- pOpt->GetObjType() != OLE_CAP &&
+ aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP &&
+ pOpt->GetObjType() != OLE_CAP &&
aPosText.IsEnabled() );
aPosBox.SelectEntryPos(pOpt->GetPos());
diff --git a/sw/source/ui/config/optload.hrc b/sw/source/ui/config/optload.hrc
index 201c83d2af51..12b7a3c3f6df 100644
--- a/sw/source/ui/config/optload.hrc
+++ b/sw/source/ui/config/optload.hrc
@@ -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
@@ -27,57 +27,57 @@
// SwLoadOptPage --------------------------------
-#define FL_UPDATE 10
-#define FT_LINK 11
-#define RB_ALWAYS 12
-#define RB_REQUEST 13
-#define RB_NEVER 14
-#define FT_FIELD 15
-#define CB_AUTO_UPDATE_FIELDS 16
-#define CB_AUTO_UPDATE_CHARTS 17
-#define FL_SETTINGS 18
-#define LB_METRIC 19
-#define FT_METRIC 20
-#define FT_TAB 21
-#define MF_TAB 22
+#define FL_UPDATE 10
+#define FT_LINK 11
+#define RB_ALWAYS 12
+#define RB_REQUEST 13
+#define RB_NEVER 14
+#define FT_FIELD 15
+#define CB_AUTO_UPDATE_FIELDS 16
+#define CB_AUTO_UPDATE_CHARTS 17
+#define FL_SETTINGS 18
+#define LB_METRIC 19
+#define FT_METRIC 20
+#define FT_TAB 21
+#define MF_TAB 22
#define CB_USE_SQUARE_PAGE_MODE 23
-#define CB_USE_CHAR_UNIT 24
+#define CB_USE_CHAR_UNIT 24
// SwCaptionOptPage -----------------------------
-#define FT_OBJECTS 10
-#define CLB_OBJECTS 11
-#define FL_SETTINGS_2 12
-#define TXT_CATEGORY 13
-#define BOX_CATEGORY 14
-#define TXT_FORMAT 15
-#define BOX_FORMAT 16
-#define TXT_TEXT 17
-#define EDT_TEXT 18
-#define TXT_POS 19
-#define BOX_POS 20
-#define FL_NUMCAPT 21
-#define FT_LEVEL 22
-#define LB_LEVEL 23
-#define FT_SEPARATOR 24
-#define ED_SEPARATOR 25
-#define FL_CATEGORY 26
-#define FT_CHARSTYLE 27
-#define LB_CHARSTYLE 28
-#define CB_APPLYBORDER 29
-#define WIN_PREVIEW 30
+#define FT_OBJECTS 10
+#define CLB_OBJECTS 11
+#define FL_SETTINGS_2 12
+#define TXT_CATEGORY 13
+#define BOX_CATEGORY 14
+#define TXT_FORMAT 15
+#define BOX_FORMAT 16
+#define TXT_TEXT 17
+#define EDT_TEXT 18
+#define TXT_POS 19
+#define BOX_POS 20
+#define FL_NUMCAPT 21
+#define FT_LEVEL 22
+#define LB_LEVEL 23
+#define FT_SEPARATOR 24
+#define ED_SEPARATOR 25
+#define FL_CATEGORY 26
+#define FT_CHARSTYLE 27
+#define LB_CHARSTYLE 28
+#define CB_APPLYBORDER 29
+#define WIN_PREVIEW 30
#define STR_CATEGORY_NONE 31
#define LB_ORDER 32
#define FT_ORDER 33
#define FT_NUM_SEP 34
#define ED_NUM_SEP 35
-#define STR_TABLE 10
-#define STR_FRAME 11
-#define STR_GRAPHIC 12
-#define STR_OLE 13
-#define STR_BEGINNING 14
-#define STR_END 15
-#define STR_ABOVE 16
-#define STR_CP_BELOW 17
+#define STR_TABLE 10
+#define STR_FRAME 11
+#define STR_GRAPHIC 12
+#define STR_OLE 13
+#define STR_BEGINNING 14
+#define STR_END 15
+#define STR_ABOVE 16
+#define STR_CP_BELOW 17
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index c53234b02d5a..a20d578f4729 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -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
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 56cd16c526ce..7979a4975f2d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2,7 +2,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
@@ -88,27 +88,27 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ),
aLineFL ( this, SW_RES( FL_LINE ) ),
- aCrossCB ( this, SW_RES( CB_CROSS ) ),
- aSolidHandleCB( this, SW_RES( CB_HANDLE ) ),
- aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ),
+ aCrossCB ( this, SW_RES( CB_CROSS ) ),
+ aSolidHandleCB( this, SW_RES( CB_HANDLE ) ),
+ aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ),
aWindowFL ( this, SW_RES( FL_WINDOW ) ),
- aHScrollBox ( this, SW_RES( CB_HSCROLL ) ),
- aVScrollBox ( this, SW_RES( CB_VSCROLL ) ),
+ aHScrollBox ( this, SW_RES( CB_HSCROLL ) ),
+ aVScrollBox ( this, SW_RES( CB_VSCROLL ) ),
aAnyRulerCB ( this, SW_RES( CB_ANY_RULER ) ),
aHRulerCBox ( this, SW_RES( CB_HRULER ) ),
aHMetric ( this, SW_RES( LB_HMETRIC ) ),
- aVRulerCBox ( this, SW_RES( CB_VRULER ) ),
+ aVRulerCBox ( this, SW_RES( CB_VRULER ) ),
aVRulerRightCBox( this, SW_RES( CB_VRULER_RIGHT ) ),
aVMetric ( this, SW_RES( LB_VMETRIC ) ),
aSmoothCBox ( this, SW_RES( CB_SMOOTH_SCROLL ) ),
aDispFL ( this, SW_RES( FL_DISP ) ),
- aGrfCB ( this, SW_RES( CB_GRF ) ),
- aTblCB ( this, SW_RES( CB_TBL ) ),
- aDrwCB ( this, SW_RES( CB_DRWFAST ) ),
- aFldNameCB ( this, SW_RES( CB_FIELD ) ),
- aPostItCB ( this, SW_RES( CB_POSTIT ) ),
+ aGrfCB ( this, SW_RES( CB_GRF ) ),
+ aTblCB ( this, SW_RES( CB_TBL ) ),
+ aDrwCB ( this, SW_RES( CB_DRWFAST ) ),
+ aFldNameCB ( this, SW_RES( CB_FIELD ) ),
+ aPostItCB ( this, SW_RES( CB_POSTIT ) ),
aSettingsFL ( this, SW_RES( FL_SETTINGS ) ),
aMetricFT ( this, SW_RES( FT_METRIC ) ),
@@ -177,7 +177,7 @@ SwContentOptPage::~SwContentOptPage()
{
}
-SfxTabPage* SwContentOptPage::Create( Window* pParent,
+SfxTabPage* SwContentOptPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwContentOptPage(pParent, rAttrSet);
@@ -313,11 +313,11 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet),
aFL1 (this, SW_RES(FL_1)),
aGrfCB (this, SW_RES(CB_PGRF)),
-// aTabCB (this, SW_RES(CB_PTAB)),
-// aDrawCB (this, SW_RES(CB_PDRAW)),
+// aTabCB (this, SW_RES(CB_PTAB)),
+// aDrawCB (this, SW_RES(CB_PDRAW)),
aCtrlFldCB (this, SW_RES(CB_CTRLFLD)),
aBackgroundCB (this, SW_RES(CB_BACKGROUND)),
- aBlackFontCB (this, SW_RES(CB_BLACK_FONT)),
+ aBlackFontCB (this, SW_RES(CB_BLACK_FONT)),
aPrintHiddenTextCB(this, SW_RES(CB_HIDDEN_TEXT)),
aPrintTextPlaceholderCB(this, SW_RES(CB_TEXT_PLACEHOLDER)),
aSeparatorLFL (this, SW_RES(FL_SEP_PRT_LEFT )),
@@ -349,14 +349,14 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
aGrfCB.SetClickHdl( aLk );
aRightPageCB.SetClickHdl( aLk );
aLeftPageCB.SetClickHdl( aLk );
-// aTabCB.SetClickHdl( aLk );
-// aDrawCB.SetClickHdl( aLk );
+// aTabCB.SetClickHdl( aLk );
+// aDrawCB.SetClickHdl( aLk );
aCtrlFldCB.SetClickHdl( aLk );
aBackgroundCB.SetClickHdl( aLk );
aBlackFontCB.SetClickHdl( aLk );
aPrintHiddenTextCB.SetClickHdl( aLk );
aPrintTextPlaceholderCB.SetClickHdl( aLk );
-// aReverseCB.SetClickHdl( aLk );
+// aReverseCB.SetClickHdl( aLk );
aProspectCB.SetClickHdl( aLk );
aProspectCB_RTL.SetClickHdl( aLk );
aPaperFromSetupCB.SetClickHdl( aLk );
@@ -365,28 +365,28 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
aEndRB.SetClickHdl( aLk );
aOnlyRB.SetClickHdl( aLk );
aNoRB.SetClickHdl( aLk );
-// aSingleJobsCB.SetClickHdl( aLk );
+// aSingleJobsCB.SetClickHdl( aLk );
aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem )
&& ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
{
-// aDrawCB .Hide();
+// aDrawCB .Hide();
aLeftPageCB .Hide();
aRightPageCB .Hide();
aPrintHiddenTextCB.Hide();
aPrintTextPlaceholderCB.Hide();
-// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel());
+// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel());
aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel());
Point aPt( aRightPageCB.GetPosPixel() );
aPt.setX(aPt.getX() + 15); // indent
aProspectCB_RTL.SetPosPixel(aPt);
-// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel());
+// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel());
// aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel());
-// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
-// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
-
+// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
+// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
+
// hide aPrintEmptyPagesCB and move everything below up accordingly
long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY();
aPrintEmptyPagesCB.Hide();
@@ -423,21 +423,21 @@ void SwAddPrinterTabPage::SetPreview(BOOL bPrev)
}
}
-SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent,
+SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwAddPrinterTabPage( pParent, rAttrSet ) );
}
-BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
+BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
{
if ( bAttrModified )
{
SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
- aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked();
- aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
+ aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked();
+ aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
aAddPrinterAttr.bPrintDraw = aGrfCB.IsChecked(); // UI merged with aGrfCB in CWS printerpullgpages /*aDrawCB.IsChecked()*/;
- aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked();
+ aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked();
aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked();
aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked();
aAddPrinterAttr.bPrintHiddenText = aPrintHiddenTextCB.IsChecked();
@@ -452,7 +452,7 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
aAddPrinterAttr.bPrintEmptyPages = aPrintEmptyPagesCB.IsChecked();
aAddPrinterAttr.bPrintSingleJobs = TRUE; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
- if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
+ if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_NONE;
if (aOnlyRB.IsChecked()) aAddPrinterAttr.nPrintPostIts =
POSTITS_ONLY;
@@ -468,30 +468,30 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
return bAttrModified;
}
-void SwAddPrinterTabPage::Reset( const SfxItemSet& )
+void SwAddPrinterTabPage::Reset( const SfxItemSet& )
{
- const SfxItemSet& rSet = GetItemSet();
- const SwAddPrinterItem* pAddPrinterAttr = 0;
+ const SfxItemSet& rSet = GetItemSet();
+ const SwAddPrinterItem* pAddPrinterAttr = 0;
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , FALSE,
(const SfxPoolItem**)&pAddPrinterAttr ))
{
- aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw );
-// aTabCB.Check( pAddPrinterAttr->bPrintTable);
+ aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw );
+// aTabCB.Check( pAddPrinterAttr->bPrintTable);
// aDrawCB.Check( pAddPrinterAttr->bPrintDraw);
- aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl);
+ aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl);
aBackgroundCB.Check( pAddPrinterAttr->bPrintPageBackground);
- aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont);
+ aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont);
aPrintHiddenTextCB.Check( pAddPrinterAttr->bPrintHiddenText);
aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder);
aLeftPageCB.Check( pAddPrinterAttr->bPrintLeftPages);
aRightPageCB.Check( pAddPrinterAttr->bPrintRightPages);
-// aReverseCB.Check( pAddPrinterAttr->bPrintReverse);
+// aReverseCB.Check( pAddPrinterAttr->bPrintReverse);
aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup);
aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages);
aProspectCB.Check( pAddPrinterAttr->bPrintProspect);
aProspectCB_RTL.Check( pAddPrinterAttr->bPrintProspectRTL);
-// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs);
+// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs);
aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ;
aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ;
@@ -511,7 +511,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& )
aProspectCB_RTL.Enable( FALSE );
}
-void SwAddPrinterTabPage::Init()
+void SwAddPrinterTabPage::Init()
{
}
@@ -634,8 +634,8 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
aStandardPB.SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl));
aStandardBox.SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
aListBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl);
aStandardBox.SetLoseFocusHdl( aFocusLink );
aTitleBox .SetLoseFocusHdl( aFocusLink );
@@ -659,7 +659,7 @@ SwStdFontTabPage::~SwStdFontTabPage()
delete pPrt;
}
-SfxTabPage* SwStdFontTabPage::Create( Window* pParent,
+SfxTabPage* SwStdFontTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return new SwStdFontTabPage(pParent, rAttrSet);
@@ -699,16 +699,16 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& )
BOOL bNotDocOnly = !aDocOnlyCB.IsChecked();
SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly);
- String sStandard = aStandardBox.GetText();
- String sTitle = aTitleBox .GetText();
- String sList = aListBox .GetText();
- String sLabel = aLabelBox .GetText();
- String sIdx = aIdxBox .GetText();
- String sStandardBak = aStandardBox.GetSavedValue();
- String sTitleBak = aTitleBox .GetSavedValue();
- String sListBak = aListBox .GetSavedValue();
- String sLabelBak = aLabelBox .GetSavedValue();
- String sIdxBak = aIdxBox .GetSavedValue();
+ String sStandard = aStandardBox.GetText();
+ String sTitle = aTitleBox .GetText();
+ String sList = aListBox .GetText();
+ String sLabel = aLabelBox .GetText();
+ String sIdx = aIdxBox .GetText();
+ String sStandardBak = aStandardBox.GetSavedValue();
+ String sTitleBak = aTitleBox .GetSavedValue();
+ String sListBak = aListBox .GetSavedValue();
+ String sLabelBak = aLabelBox .GetSavedValue();
+ String sIdxBak = aIdxBox .GetSavedValue();
bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText();
bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText();
@@ -1199,7 +1199,7 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage()
{
}
-SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent,
+SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return new SwTableOptionsTabPage(pParent, rAttrSet );
@@ -1312,9 +1312,9 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
switch(pModOpt->GetTblMode())
{
- case TBLFIX_CHGABS: aFixRB.Check(); break;
- case TBLFIX_CHGPROP: aFixPropRB.Check(); break;
- case TBLVAR_CHGABS: aVarRB.Check(); break;
+ case TBLFIX_CHGABS: aFixRB.Check(); break;
+ case TBLFIX_CHGPROP: aFixPropRB.Check(); break;
+ case TBLVAR_CHGABS: aVarRB.Check(); break;
}
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem))
@@ -1412,7 +1412,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem )
&& ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
{
- aTabCB .Hide();
+ aTabCB .Hide();
aCharHiddenCB.Hide();
aFldHiddenCB .Hide();
aFldHiddenParaCB.Hide();
@@ -1439,7 +1439,7 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage()
{
}
-SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SwShdwCrsrOptionsTabPage( pParent, rSet );
}
@@ -1549,17 +1549,17 @@ struct CharAttr
// Editieren entspricht Einfuegen-Attributen
static CharAttr __FAR_DATA aRedlineAttr[] =
{
- { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED },
- { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD },
- { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL },
- { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE },
- { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE },
- { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE },
- { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN },
- { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE },
- { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN },
- { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL },
- { SID_ATTR_BRUSH, 0 }
+ { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED },
+ { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD },
+ { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL },
+ { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE },
+ { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE },
+ { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE },
+ { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN },
+ { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE },
+ { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN },
+ { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL },
+ { SID_ATTR_BRUSH, 0 }
};
// Items from aRedlineAttr relevant for InsertAttr: strikethrough is
// not used
@@ -1660,23 +1660,23 @@ void SwMarkPreview::Paint(const Rectangle &/*rRect*/)
switch (nMarkPos)
{
- case 1: // left
+ case 1: // left
aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
break;
- case 2: // right
+ case 2: // right
aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
break;
- case 3: // outside
+ case 3: // outside
break;
- case 4: // inside
+ case 4: // inside
aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top()));
aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top()));
break;
- case 0: // none
+ case 0: // none
default:
return;
}
@@ -1696,8 +1696,8 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect)
Rectangle aTextLine = rRect;
aTextLine.SetSize(Size(aTextLine.GetWidth(), 2));
- aTextLine.Left() += nLTxtBorder;
- aTextLine.Right() -= nRTxtBorder;
+ aTextLine.Left() += nLTxtBorder;
+ aTextLine.Right() -= nRTxtBorder;
aTextLine.Move(0, nTTxtBorder);
sal_Int32 nStep;
@@ -1774,14 +1774,14 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aChangedFL ( this, SW_RES( FL_LC )),
- aMarkPosFT ( this, SW_RES( FT_MARKPOS )),
- aMarkPosLB ( this, SW_RES( LB_MARKPOS )),
- aMarkColorFT ( this, SW_RES( FT_LC_COL )),
- aMarkColorLB ( this, SW_RES( LB_LC_COL )),
- aMarkPreviewWN ( this, SW_RES( WIN_MARK )),
+ aMarkPosFT ( this, SW_RES( FT_MARKPOS )),
+ aMarkPosLB ( this, SW_RES( LB_MARKPOS )),
+ aMarkColorFT ( this, SW_RES( FT_LC_COL )),
+ aMarkColorLB ( this, SW_RES( LB_LC_COL )),
+ aMarkPreviewWN ( this, SW_RES( WIN_MARK )),
sAuthor ( SW_RES( STR_AUTHOR )),
- sNone ( SW_RES( STR_NOTHING ))
+ sNone ( SW_RES( STR_NOTHING ))
{
FreeResource();
@@ -1799,7 +1799,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aChangedLB.RemoveEntry(5);
aDeletedLB.RemoveEntry(4);
aDeletedLB.RemoveEntry(3);
-
+
Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl);
aInsertLB.SetSelectHdl( aLk );
aDeletedLB.SetSelectHdl( aLk );
@@ -2044,14 +2044,14 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& )
aInsertLB.SelectEntryPos(0);
aDeletedLB.SelectEntryPos(0);
aChangedLB.SelectEntryPos(0);
-
+
lcl_FillRedlineAttrListBox(aInsertLB, rInsertAttr, aInsertAttrMap,
sizeof(aInsertAttrMap) / sizeof(USHORT));
lcl_FillRedlineAttrListBox(aDeletedLB, rDeletedAttr, aDeletedAttrMap,
sizeof(aDeletedAttrMap) / sizeof(USHORT));
lcl_FillRedlineAttrListBox(aChangedLB, rChangedAttr, aChangedAttrMap,
sizeof(aChangedAttrMap) / sizeof(USHORT));
-
+
USHORT nPos = 0;
switch (pOpt->GetMarkAlignMode())
{
@@ -2095,8 +2095,8 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
pPrev = &aChangedPreviewWN;
}
- SvxFont& rFont = pPrev->GetFont();
- SvxFont& rCJKFont = pPrev->GetCJKFont();
+ SvxFont& rFont = pPrev->GetFont();
+ SvxFont& rCJKFont = pPrev->GetCJKFont();
rFont.SetWeight(WEIGHT_NORMAL);
rCJKFont.SetWeight(WEIGHT_NORMAL);
@@ -2109,7 +2109,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
rFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
rCJKFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
- USHORT nPos = pColorLB->GetSelectEntryPos();
+ USHORT nPos = pColorLB->GetSelectEntryPos();
switch( nPos )
{
@@ -2132,7 +2132,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB )
if( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos = 0;
- CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos );
+ CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos );
//switch off preview background color
pPrev->ResetColor();
switch (pAttr->nItemId)
@@ -2202,13 +2202,13 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB )
pPrev = &aChangedPreviewWN;
}
- SvxFont& rFont = pPrev->GetFont();
- SvxFont& rCJKFont = pPrev->GetCJKFont();
- USHORT nPos = pLB->GetSelectEntryPos();
+ SvxFont& rFont = pPrev->GetFont();
+ SvxFont& rCJKFont = pPrev->GetCJKFont();
+ USHORT nPos = pLB->GetSelectEntryPos();
if( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos = 0;
- CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos );
+ CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos );
if( pAttr->nItemId == SID_ATTR_BRUSH )
{
@@ -2259,20 +2259,20 @@ IMPL_LINK( SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox *, EMPTYARG )
void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
{
- const AllSettings& rAllSettings = Application::GetSettings();
- LanguageType eLangType = rAllSettings.GetUILanguage();
- Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() );
- SvxFont& rFont = rExampleWin.GetFont();
- SvxFont& rCJKFont = rExampleWin.GetCJKFont();
- SvxFont& rCTLFont = rExampleWin.GetCTLFont();
+ const AllSettings& rAllSettings = Application::GetSettings();
+ LanguageType eLangType = rAllSettings.GetUILanguage();
+ Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() );
+ SvxFont& rFont = rExampleWin.GetFont();
+ SvxFont& rCJKFont = rExampleWin.GetCJKFont();
+ SvxFont& rCTLFont = rExampleWin.GetCTLFont();
- Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType,
+ Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType,
DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) );
- Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType,
+ Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType,
DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) );
- Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType,
+ Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType,
DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) );
- const Size aDefSize( 0, 12 );
+ const Size aDefSize( 0, 12 );
aFont.SetSize( aDefSize );
aCJKFont.SetSize( aDefSize );
aCTLFont.SetSize( aDefSize );
@@ -2289,7 +2289,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
rCJKFont = aCJKFont;
rCTLFont = aCTLFont;
- const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 );
+ const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 );
rFont.SetSize( aNewSize );
rCJKFont.SetSize( aNewSize );
@@ -2297,7 +2297,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
rExampleWin.UseResourceText();
- Wallpaper aWall( aBackCol );
+ Wallpaper aWall( aBackCol );
rExampleWin.SetBackground( aWall );
rExampleWin.Invalidate();
}
@@ -2316,30 +2316,30 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
const SfxItemSet& rCoreSet) :
SfxTabPage( pParent, WB_HIDE, rCoreSet),
aTestFL ( this, WB_GROUP ),
- aTest1CBox ( this, 0 ),
- aTest2CBox ( this, 0 ),
- aTest3CBox ( this, 0 ),
- aTest4CBox ( this, 0 ),
- aTest5CBox ( this, 0 ),
- aTest6CBox ( this, 0 ),
- aTest7CBox ( this, 0 ),
- aTest8CBox ( this, 0 ),
- aTest9CBox ( this, 0 ),
- aTest10CBox ( this, 0 ),
+ aTest1CBox ( this, 0 ),
+ aTest2CBox ( this, 0 ),
+ aTest3CBox ( this, 0 ),
+ aTest4CBox ( this, 0 ),
+ aTest5CBox ( this, 0 ),
+ aTest6CBox ( this, 0 ),
+ aTest7CBox ( this, 0 ),
+ aTest8CBox ( this, 0 ),
+ aTest9CBox ( this, 0 ),
+ aTest10CBox ( this, 0 ),
bAttrModified( FALSE )
{
- lcl_SetPosSize(*this, Point(0,0), Size(260 , 135));
+ lcl_SetPosSize(*this, Point(0,0), Size(260 , 135));
lcl_SetPosSize(aTestFL, Point(6,2), Size(209,8));
- lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10));
- lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10));
- lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10));
- lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10));
- lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10));
- lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10));
- lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10));
- lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10));
- lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10));
- lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10));
+ lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10));
+ lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10));
+ lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10));
+ lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10));
+ lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10));
+ lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10));
+ lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10));
+ lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10));
+ lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10));
+ lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10));
aTestFL.SetText( String(ByteString("Einstellungen nur f\xFCr Testzwecke" ), RTL_TEXTENCODING_MS_1252));
aTest1CBox .SetText( C2S("unused"));
@@ -2367,13 +2367,13 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
}
-SfxTabPage* SwTestTabPage::Create( Window* pParent,
+SfxTabPage* SwTestTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwTestTabPage( pParent, rAttrSet ) );
}
-BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet )
+BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet )
{
if ( bAttrModified )
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index e3581484d66b..55a2f058e334 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -2,7 +2,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
@@ -51,15 +51,15 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "Content/Graphic", // 0
- "Content/Table", // 1
- "Content/Control", // 2
- "Content/Background", // 3
- "Content/PrintBlack", // 4
- "Content/Note", // 5
+ "Content/Graphic", // 0
+ "Content/Table", // 1
+ "Content/Control", // 2
+ "Content/Background", // 3
+ "Content/PrintBlack", // 4
+ "Content/Note", // 5
"Page/Reversed", // 6
"Page/Brochure", // 7
- "Page/BrochureRightToLeft", // 8
+ "Page/BrochureRightToLeft", // 8
"Output/SinglePrintJob", // 9
"Output/Fax", // 10
"Papertray/FromPrinterSetup", // 11
@@ -103,11 +103,11 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
{
switch(nProp)
{
- case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break;
- case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break;
- case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break;
+ case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break;
+ case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break;
+ case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break;
case 3: bPrintPageBackground= *(sal_Bool*)pValues[nProp].getValue(); break;
- case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break;
+ case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break;
case 5:
{
sal_Int32 nTmp = 0;
@@ -146,7 +146,7 @@ SwPrintOptions::~SwPrintOptions()
void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
-void SwPrintOptions::Commit()
+void SwPrintOptions::Commit()
{
Sequence<OUString> aNames = GetPropertyNames();
@@ -160,10 +160,10 @@ void SwPrintOptions::Commit()
switch(nProp)
{
case 0: bVal = bPrintGraphic; pValues[nProp].setValue(&bVal, rType);break;
- case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break;
- case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break;
+ case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break;
+ case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break;
case 3: bVal = bPrintPageBackground; pValues[nProp].setValue(&bVal, rType); break;
- case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break;
+ case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break;
case 5: pValues[nProp] <<= (sal_Int32)nPrintPostIts ; break;
case 6: bVal = bPrintReverse ; pValues[nProp].setValue(&bVal, rType); break;
case 7: bVal = bPrintProspect ; pValues[nProp].setValue(&bVal, rType); break;
diff --git a/sw/source/ui/config/redlopt.hrc b/sw/source/ui/config/redlopt.hrc
index 877f23d75c4c..f77f84b664d7 100644
--- a/sw/source/ui/config/redlopt.hrc
+++ b/sw/source/ui/config/redlopt.hrc
@@ -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
diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src
index 4d6816dcec23..2d5da1977213 100644
--- a/sw/source/ui/config/redlopt.src
+++ b/sw/source/ui/config/redlopt.src
@@ -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
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 4986d1f1b745..a1695c1b7daa 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@
#include <tools/resid.hxx>
#include <fmtornt.hxx>
-#include <swtypes.hxx> // Leerstring
+#include <swtypes.hxx> // Leerstring
#include <wrtsh.hxx>
#include <uinums.hxx>
#include <poolfmt.hxx>
@@ -57,12 +57,12 @@
using namespace ::com::sun::star;
-#define VERSION_30B ((USHORT)250)
-#define VERSION_31B ((USHORT)326)
-#define VERSION_40A ((USHORT)364)
+#define VERSION_30B ((USHORT)250)
+#define VERSION_31B ((USHORT)326)
+#define VERSION_40A ((USHORT)364)
#define VERSION_50A ((USHORT)373)
#define VERSION_53A ((USHORT)596)
-#define ACT_NUM_VERSION VERSION_53A
+#define ACT_NUM_VERSION VERSION_53A
#define NUMRULE_FILENAME "numrule.cfg"
#define CHAPTER_FILENAME "chapter.cfg"
@@ -73,8 +73,8 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* )
// SwNumRulesWithName ----------------------------------------------------
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Speichern einer Regel
- Parameter: rCopy -- die zu speichernde Regel
+ Beschreibung: Speichern einer Regel
+ Parameter: rCopy -- die zu speichernde Regel
nIdx -- Position, an der die Regel zu speichern ist.
Eine alte Regel an dieser Position wird ueberschrieben.
------------------------------------------------------------------------*/
@@ -151,7 +151,7 @@ BOOL SwBaseNumRules::Store(SvStream &rStream)
int SwBaseNumRules::Load(SvStream &rStream)
{
- int rc = 0;
+ int rc = 0;
rStream >> nVersion;
@@ -346,47 +346,47 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
BOOL bFlag;
String sStr;
- rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
+ rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
if( VERSION_53A > nVersion )
{
- rStream >> cChar; aFmt.SetBulletChar( cChar );
+ rStream >> cChar; aFmt.SetBulletChar( cChar );
}
else
{
- rStream >> nUS; aFmt.SetBulletChar( nUS );
+ rStream >> nUS; aFmt.SetBulletChar( nUS );
}
- rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
+ rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
if( VERSION_30B == nVersion )
{
long nL;
- rStream >> cChar; aFmt.SetStart( (USHORT)cChar );
+ rStream >> cChar; aFmt.SetStart( (USHORT)cChar );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
- rStream >> nL; aFmt.SetLSpace( lNumIndent );
- rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
+ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
+ rStream >> nL; aFmt.SetLSpace( lNumIndent );
+ rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
}
- else // alter StartWert war ein Byte
+ else // alter StartWert war ein Byte
{
- rStream >> nUS; aFmt.SetStart( nUS );
+ rStream >> nUS; aFmt.SetStart( nUS );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
- rStream >> nUS; aFmt.SetAbsLSpace( nUS );
- rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
- rStream >> nUS; aFmt.SetCharTextDistance( nUS );
- rStream >> nShort; aFmt.SetLSpace( nShort );
+ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
+ rStream >> nUS; aFmt.SetAbsLSpace( nUS );
+ rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
+ rStream >> nUS; aFmt.SetCharTextDistance( nUS );
+ rStream >> nShort; aFmt.SetLSpace( nShort );
rStream >> bFlag;
}
- USHORT nFamily;
+ USHORT nFamily;
USHORT nCharSet;
short nWidth;
short nHeight;
@@ -573,7 +573,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
else
pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
- if( !pFmt->GetDepends() ) // Attribute setzen
+ if( !pFmt->GetDepends() ) // Attribute setzen
for( USHORT n = aItems.Count(); n; )
pFmt->SetFmtAttr( *aItems[ --n ] );
}
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 5dec6029969a..c54d9c6ade69 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -2,7 +2,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
@@ -93,11 +93,11 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "Display/GraphicObject", // 0
- "Display/Table", // 1
- "Display/DrawingControl", // 2
- "Display/FieldCode", // 3
- "Display/Note", // 4
+ "Display/GraphicObject", // 0
+ "Display/Table", // 1
+ "Display/DrawingControl", // 2
+ "Display/FieldCode", // 3
+ "Display/Note", // 4
"Display/PreventTips", // 5
"NonprintingCharacter/MetaCharacters", // 6
"NonprintingCharacter/ParagraphEnd", // 7
@@ -155,11 +155,11 @@ void SwContentViewConfig::Commit()
sal_Bool bVal = FALSE;
switch(nProp)
{
- case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject",
- case 1: bVal = rParent.IsTable(); break;// "Display/Table",
- case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl",
- case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode",
- case 4: bVal = rParent.IsPostIts(); break;// "Display/Note",
+ case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject",
+ case 1: bVal = rParent.IsTable(); break;// "Display/Table",
+ case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl",
+ case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode",
+ case 4: bVal = rParent.IsPostIts(); break;// "Display/Note",
case 5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips"
case 6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
case 7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
@@ -196,11 +196,11 @@ void SwContentViewConfig::Load()
sal_Bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
switch(nProp)
{
- case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject",
- case 1: rParent.SetTable(bSet); break;// "Display/Table",
- case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl",
- case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode",
- case 4: rParent.SetPostIts(bSet); break;// "Display/Note",
+ case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject",
+ case 1: rParent.SetTable(bSet); break;// "Display/Table",
+ case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl",
+ case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode",
+ case 4: rParent.SetPostIts(bSet); break;// "Display/Note",
case 5: rParent.SetPreventTips(bSet); break;// "Display/PreventTips",
case 6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
case 7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
@@ -412,13 +412,13 @@ Sequence<OUString> SwGridConfig::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "Option/SnapToGrid", // 0
- "Option/VisibleGrid", // 1
- "Option/Synchronize", // 2
- "Resolution/XAxis", // 3
- "Resolution/YAxis", // 4
- "Subdivision/XAxis", // 5
- "Subdivision/YAxis" // 6
+ "Option/SnapToGrid", // 0
+ "Option/VisibleGrid", // 1
+ "Option/Synchronize", // 2
+ "Resolution/XAxis", // 3
+ "Resolution/YAxis", // 4
+ "Subdivision/XAxis", // 5
+ "Subdivision/YAxis" // 6
};
const int nCount = 7;
Sequence<OUString> aNames(nCount);
@@ -454,7 +454,7 @@ void SwGridConfig::Commit()
sal_Bool bSet;
switch(nProp)
{
- case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid",
+ case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid",
case 1: bSet = rParent.IsGridVisible(); break;//"Option/VisibleGrid",
case 2: bSet = rParent.IsSynchronize(); break;// "Option/Synchronize",
case 3: pValues[nProp] <<= (sal_Int32)TWIP_TO_MM100(rParent.GetSnapSize().Width()); break;// "Resolution/XAxis",
@@ -487,7 +487,7 @@ void SwGridConfig::Load()
pValues[nProp] >>= nSet;
switch(nProp)
{
- case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid",
+ case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid",
case 1: rParent.SetGridVisible(bSet); break;//"Option/VisibleGrid",
case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize",
case 3: aSnap.Width() = MM100_TO_TWIP(nSet); break;// "Resolution/XAxis",
@@ -507,8 +507,8 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "DirectCursor/UseDirectCursor", // 0
- "DirectCursor/Insert", // 1
+ "DirectCursor/UseDirectCursor", // 0
+ "DirectCursor/Insert", // 1
"Option/ProtectedArea" // 2
};
const int nCount = 3;
@@ -542,8 +542,8 @@ void SwCursorConfig::Commit()
sal_Bool bSet;
switch(nProp)
{
- case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor",
- case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert",
+ case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor",
+ case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert",
case 2: bSet = rParent.IsCursorInProtectedArea(); break;// "Option/ProtectedArea"
}
if(nProp != 1 )
@@ -573,7 +573,7 @@ void SwCursorConfig::Load()
pValues[nProp] >>= nSet;
switch(nProp)
{
- case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor",
+ case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor",
case 1: rParent.SetShdwCrsrFillMode((BYTE)nSet); break;// "DirectCursor/Insert",
case 2: rParent.SetCursorInProtectedArea(bSet); break;// "Option/ProtectedArea"
}
@@ -606,7 +606,7 @@ void SwWebColorConfig::Commit()
{
switch(nProp)
{
- case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color",
+ case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color",
}
}
PutProperties(aPropNames, aValues);
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 239ec1a9cdc3..3ac5d135bc78 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@
#include <editeng/acorrcfg.hxx>
#if OSL_DEBUG_LEVEL > 1
-BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading
+BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading
#endif
Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY);
Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY);
@@ -80,21 +80,21 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm
#define LINEBREAK_SIZE 12, 8
#define TAB_SIZE 12, 6
-#define MIN_BLANKWIDTH 40
-#define MIN_BLANKHEIGHT 40
-#define MIN_TABWIDTH 120
-#define MIN_TABHEIGHT 200
+#define MIN_BLANKWIDTH 40
+#define MIN_BLANKHEIGHT 40
+#define MIN_TABWIDTH 120
+#define MIN_TABHEIGHT 200
static const char __FAR_DATA aPostItStr[] = " ";
BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
{
- return nCoreOptions == rOpt.nCoreOptions
+ return nCoreOptions == rOpt.nCoreOptions
&& nCore2Options == rOpt.nCore2Options
- && aSnapSize == rOpt.aSnapSize
+ && aSnapSize == rOpt.aSnapSize
&& mnViewLayoutColumns == rOpt.mnViewLayoutColumns
- && nDivisionX == rOpt.GetDivisionX()
- && nDivisionY == rOpt.GetDivisionY()
+ && nDivisionX == rOpt.GetDivisionX()
+ && nDivisionY == rOpt.GetDivisionY()
&& nPagePrevRow == rOpt.GetPagePrevRow()
&& nPagePrevCol == rOpt.GetPagePrevCol()
&& aRetoucheColor == rOpt.GetRetoucheColor()
@@ -160,7 +160,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo
USHORT nPix = GetPixelTwips() * 2;
if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix )
nPix = 0;
- const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix );
+ const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix );
const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix );
const SwRect aRect( aTopLeft, aBotRight );
DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() );
@@ -193,16 +193,16 @@ SwViewOption::SwViewOption() :
nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
VIEWOPT_1_REF |
VIEWOPT_1_GRAPHIC |
- VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL |
+ VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL |
VIEWOPT_1_PAGEBACK |
VIEWOPT_1_SOLIDMARKHDL | VIEWOPT_1_POSTITS;
nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER;
if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
- aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2"
+ aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2"
else
- aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm
+ aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm
nDivisionX = nDivisionY = 1;
bSelectionInReadonly = SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly();
@@ -223,23 +223,23 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
// #114856# Formular view
bFormView = rVOpt.bFormView;
nZoom = rVOpt.nZoom ;
- aSnapSize = rVOpt.aSnapSize ;
+ aSnapSize = rVOpt.aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
- nDivisionX = rVOpt.nDivisionX ;
- nDivisionY = rVOpt.nDivisionY ;
- nPagePrevRow = rVOpt.nPagePrevRow;
- nPagePrevCol = rVOpt.nPagePrevCol;
+ nDivisionX = rVOpt.nDivisionX ;
+ nDivisionY = rVOpt.nDivisionY ;
+ nPagePrevRow = rVOpt.nPagePrevRow;
+ nPagePrevCol = rVOpt.nPagePrevCol;
bIsPagePreview = rVOpt.bIsPagePreview;
- eZoom = rVOpt.eZoom ;
- nTblDest = rVOpt.nTblDest ;
- nUIOptions = rVOpt.nUIOptions ;
- nCoreOptions = rVOpt.nCoreOptions ;
- nCore2Options = rVOpt.nCore2Options ;
- aRetoucheColor = rVOpt.GetRetoucheColor();
- sSymbolFont = rVOpt.sSymbolFont;
+ eZoom = rVOpt.eZoom ;
+ nTblDest = rVOpt.nTblDest ;
+ nUIOptions = rVOpt.nUIOptions ;
+ nCoreOptions = rVOpt.nCoreOptions ;
+ nCore2Options = rVOpt.nCore2Options ;
+ aRetoucheColor = rVOpt.GetRetoucheColor();
+ sSymbolFont = rVOpt.sSymbolFont;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
bStarOneSetting = rVOpt.bStarOneSetting;
- bBookview = rVOpt.bBookview;
+ bBookview = rVOpt.bBookview;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
bIdle = rVOpt.bIdle;
@@ -262,24 +262,24 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
{
// #114856# Formular view
bFormView = rVOpt.bFormView ;
- nZoom = rVOpt.nZoom ;
- aSnapSize = rVOpt.aSnapSize ;
+ nZoom = rVOpt.nZoom ;
+ aSnapSize = rVOpt.aSnapSize ;
mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ;
- nDivisionX = rVOpt.nDivisionX ;
- nDivisionY = rVOpt.nDivisionY ;
- nPagePrevRow = rVOpt.nPagePrevRow;
- nPagePrevCol = rVOpt.nPagePrevCol;
+ nDivisionX = rVOpt.nDivisionX ;
+ nDivisionY = rVOpt.nDivisionY ;
+ nPagePrevRow = rVOpt.nPagePrevRow;
+ nPagePrevCol = rVOpt.nPagePrevCol;
bIsPagePreview = rVOpt.bIsPagePreview;
- eZoom = rVOpt.eZoom ;
- nTblDest = rVOpt.nTblDest ;
- nUIOptions = rVOpt.nUIOptions ;
- nCoreOptions = rVOpt.nCoreOptions;
- nCore2Options = rVOpt.nCore2Options;
- aRetoucheColor = rVOpt.GetRetoucheColor();
- sSymbolFont = rVOpt.sSymbolFont;
+ eZoom = rVOpt.eZoom ;
+ nTblDest = rVOpt.nTblDest ;
+ nUIOptions = rVOpt.nUIOptions ;
+ nCoreOptions = rVOpt.nCoreOptions;
+ nCore2Options = rVOpt.nCore2Options;
+ aRetoucheColor = rVOpt.GetRetoucheColor();
+ sSymbolFont = rVOpt.sSymbolFont;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
bStarOneSetting = rVOpt.bStarOneSetting;
- bBookview = rVOpt.bBookview;
+ bBookview = rVOpt.bBookview;
mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
bIdle = rVOpt.bIdle;
@@ -318,13 +318,13 @@ BOOL SwViewOption::IsAutoCompleteWords() const
}
AuthorCharAttr::AuthorCharAttr() :
- nItemId (SID_ATTR_CHAR_UNDERLINE),
- nAttr (UNDERLINE_SINGLE),
- nColor (COL_TRANSPARENT)
+ nItemId (SID_ATTR_CHAR_UNDERLINE),
+ nAttr (UNDERLINE_SINGLE),
+ nColor (COL_TRANSPARENT)
{
}
-USHORT GetHtmlMode(const SwDocShell* pShell)
+USHORT GetHtmlMode(const SwDocShell* pShell)
{
USHORT nRet = 0;
if(!pShell || PTR_CAST(SwWebDocShell, pShell))
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 18c2c2f234df..fbe08ef44d2f 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/addresslistdialog.hrc b/sw/source/ui/dbui/addresslistdialog.hrc
index 821ddd81b4f0..4715507951f2 100644
--- a/sw/source/ui/dbui/addresslistdialog.hrc
+++ b/sw/source/ui/dbui/addresslistdialog.hrc
@@ -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
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index bf84b16a8157..ab7e993975bb 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src
index 38a82e65ea76..64fcaf7806ef 100644
--- a/sw/source/ui/dbui/addresslistdialog.src
+++ b/sw/source/ui/dbui/addresslistdialog.src
@@ -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
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 30c648f9455e..2ec78179d29f 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hrc b/sw/source/ui/dbui/createaddresslistdialog.hrc
index d843acbcf63f..90554fae05e2 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hrc
+++ b/sw/source/ui/dbui/createaddresslistdialog.hrc
@@ -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
@@ -60,5 +60,5 @@
#define ST_ADD_BUTTON 4
#define PB_FIND 5
-
-#endif
+
+#endif
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 6c9b64546a05..caf1baf4451a 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src
index b43a373cd047..c1c0c1c74849 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.src
+++ b/sw/source/ui/dbui/createaddresslistdialog.src
@@ -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
@@ -30,7 +30,7 @@
#include <helpid.h>
/*-- 13.04.2004 13:58:13---------------------------------------------------
-
+
-----------------------------------------------------------------------*/
ModalDialog DLG_MM_CREATEADDRESSLIST
{
@@ -165,7 +165,7 @@ ModalDialog DLG_MM_CREATEADDRESSLIST
};
/*-- 13.04.2004 13:58:13---------------------------------------------------
-
+
-----------------------------------------------------------------------*/
ModelessDialog DLG_MM_FIND_ENTRY
{
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 06a8c074fa79..6d8f3b06a823 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hrc b/sw/source/ui/dbui/customizeaddresslistdialog.hrc
index 8e04f81a07b3..af09b30c5906 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hrc
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hrc
@@ -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
@@ -45,5 +45,5 @@
#define ST_RENAME_TITLE 3
#define ST_ADD_BUTTON 4
-
-#endif
+
+#endif
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index a8c10a42e958..a7a535da277d 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src
index 21e32ecb89c4..05892d90ecb5 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.src
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.src
@@ -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
@@ -30,7 +30,7 @@
#include <helpid.h>
/*-- 13.04.2004 13:58:13---------------------------------------------------
-
+
-----------------------------------------------------------------------*/
ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
{
@@ -109,7 +109,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
};
};
/*-- 13.04.2004 13:58:13---------------------------------------------------
-
+
-----------------------------------------------------------------------*/
ModalDialog DLG_MM_ADD_RENAME_ENTRY
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 068da50c985f..c6ac31da3e68 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -2,7 +2,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
@@ -125,8 +125,8 @@ using namespace ::com::sun::star::beans;
// tblafmt.hxx
SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* )
-const char cDBFldStart = '<';
-const char cDBFldEnd = '>';
+const char cDBFldStart = '<';
+const char cDBFldEnd = '>';
// Hilfsstruktur fuers einfuegen von Datenbankspalten als Felder oder Text
struct _DB_Column
@@ -185,9 +185,9 @@ SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr )
/* */
-#define DBCOLUMN_CONFIG_VERSION1 1
-#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1
-#define DBCOLUMN_MAXDATA 5
+#define DBCOLUMN_CONFIG_VERSION1 1
+#define DBCOLUMN_CONFIG_VERSION DBCOLUMN_CONFIG_VERSION1
+#define DBCOLUMN_MAXDATA 5
struct _DB_ColumnConfigData
{
@@ -455,7 +455,7 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
delete pTblSet;
delete pRep;
-// delete pConfig;
+// delete pConfig;
delete pTAutoFmt;
}
@@ -619,13 +619,13 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
aFld += cDBFldEnd;
if( aStr.Len() )
{
- if( nPos ) // ein Space davor
+ if( nPos ) // ein Space davor
{
sal_Unicode c = aStr.GetChar( nPos-1 );
if( '\n' != c && '\r' != c )
aFld.Insert( ' ', 0 );
}
- if( nPos < aStr.Len() ) // ein Space dahinter
+ if( nPos < aStr.Len() ) // ein Space dahinter
{
sal_Unicode c = aStr.GetChar( nPos );
if( '\n' != c && '\r' != c )
@@ -1017,7 +1017,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
Reference <XNameAccess> xCols = xColsSupp->getColumns();
do{ // middle checked loop!!
- if( bAsTable ) // Daten als Tabelle einfuegen
+ if( bAsTable ) // Daten als Tabelle einfuegen
{
rSh.DoUndo( FALSE );
@@ -1137,7 +1137,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
if( xColumn.is() )
{
double fVal = xColumn->getDouble();
- if( xColumn->wasNull() )
+ if( xColumn->wasNull() )
aTblSet.ClearItem( RES_BOXATR_VALUE );
else
{
@@ -1215,7 +1215,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
rSh.SetAutoUpdateCells( bIsAutoUpdateCells );
}
- else // Daten als Felder/Text einfuegen
+ else // Daten als Felder/Text einfuegen
{
_DB_Columns aColArr;
if( SplitTextToColArr( aEdDbText.GetText(), aColArr, aRbAsField.IsChecked() ) )
@@ -1347,7 +1347,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
Any aType = xColumnProps->getPropertyValue(C2U("Type"));
sal_Int32 eDataType = 0;
aType >>= eDataType;
- if( DataType::DATE == eDataType || DataType::TIME == eDataType ||
+ if( DataType::DATE == eDataType || DataType::TIME == eDataType ||
DataType::TIMESTAMP == eDataType)
{
@@ -1806,7 +1806,7 @@ void SwInsertDBColAutoPilot::Load()
pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt,
pInsDBColumn->eUsrNumFmtLng );
-// pInsDBColumn->nDBNumFmt
+// pInsDBColumn->nDBNumFmt
pNewData->aDBColumns.Insert(pInsDBColumn);
}
diff --git a/sw/source/ui/dbui/dbinsdlg.hrc b/sw/source/ui/dbui/dbinsdlg.hrc
index fd2bdcf3d776..4bc8164f8ea7 100644
--- a/sw/source/ui/dbui/dbinsdlg.hrc
+++ b/sw/source/ui/dbui/dbinsdlg.hrc
@@ -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
@@ -29,45 +29,45 @@
#define _DBINSDLG_HRC
-#define FT_INSERT_DATA 1
-#define RB_AS_TABLE 2
-#define RB_AS_FIELD 3
-#define RB_AS_TEXT 4
-#define BT_OK 5
-#define BT_CANCEL 6
-#define BT_HELP 7
+#define FT_INSERT_DATA 1
+#define RB_AS_TABLE 2
+#define RB_AS_FIELD 3
+#define RB_AS_TEXT 4
+#define BT_OK 5
+#define BT_CANCEL 6
+#define BT_HELP 7
#define FL_HEAD 8
-#define FT_DB_COLUMN 10
+#define FT_DB_COLUMN 10
#define FL_FORMAT 11
-#define RB_DBFMT_FROM_DB 12
-#define RB_DBFMT_FROM_USR 13
-#define LB_DBFMT_FROM_USR 14
+#define RB_DBFMT_FROM_DB 12
+#define RB_DBFMT_FROM_USR 13
+#define LB_DBFMT_FROM_USR 14
/* ------------- Page Text/Field ------------------ */
-#define LB_TXT_DB_COLUMN 15
+#define LB_TXT_DB_COLUMN 15
#define IB_DBCOL_TOEDIT 16
#define ED_DB_TEXT 17
-#define FT_DB_PARA_COLL 18
-#define LB_DB_PARA_COLL 19
+#define FT_DB_PARA_COLL 18
+#define LB_DB_PARA_COLL 19
/* ------------- Page Table -------------------- */
-#define LB_TBL_DB_COLUMN 20
+#define LB_TBL_DB_COLUMN 20
#define IB_DBCOL_ALL_TO 21
#define IB_DBCOL_ONE_TO 22
#define IB_DBCOL_ONE_FROM 23
#define IB_DBCOL_ALL_FROM 24
-#define FT_TABLE_COL 25
-#define LB_TABLE_COL 26
+#define FT_TABLE_COL 25
+#define LB_TABLE_COL 26
#define FL_BOTTOM 27
-#define CB_TABLE_HEADON 28
-#define RB_HEADL_COLNMS 29
-#define RB_HEADL_EMPTY 30
-#define PB_TBL_FORMAT 31
-#define PB_TBL_AUTOFMT 32
+#define CB_TABLE_HEADON 28
+#define RB_HEADL_COLNMS 29
+#define RB_HEADL_EMPTY 30
+#define PB_TBL_FORMAT 31
+#define PB_TBL_AUTOFMT 32
-#define STR_NOTEMPL 33
+#define STR_NOTEMPL 33
#endif
diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src
index 28e045a3a235..d08305dde17e 100644
--- a/sw/source/ui/dbui/dbinsdlg.src
+++ b/sw/source/ui/dbui/dbinsdlg.src
@@ -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
@@ -248,7 +248,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
{
Pos = MAP_APPFONT ( 137 , 31 ) ;
Size = MAP_APPFONT ( 75 , 8 ) ;
-
+
Text [ en-US ] = "Tab~le column(s)" ;
};
ListBox LB_TABLE_COL
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index eb9321926c25..e28ae1dd5f36 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -2,7 +2,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
@@ -155,8 +155,8 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ui::dialogs;
-#define DB_SEP_SPACE 0
-#define DB_SEP_TAB 1
+#define DB_SEP_SPACE 0
+#define DB_SEP_TAB 1
#define DB_SEP_RETURN 2
#define DB_SEP_NEWLINE 3
@@ -479,7 +479,7 @@ BOOL SwNewDBMgr::Merge(SwWrtShell* pSh)
return TRUE;
}
-void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh )
+void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh )
{
if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
{
@@ -513,7 +513,7 @@ void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh )
}
}
-String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator)
+String lcl_FindColumn(const String& sFormatStr,USHORT &nUsedPos, BYTE &nSeparator)
{
String sReturn;
USHORT nLen = sFormatStr.Len();
@@ -557,7 +557,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
const char cSpace = ' ';
const char cTab = '\t';
USHORT nUsedPos = 0;
- BYTE nSeparator;
+ BYTE nSeparator;
String sColumn = lcl_FindColumn(sFormatStr, nUsedPos, nSeparator);
while( sColumn.Len() )
{
@@ -569,7 +569,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
if(xColumnProp.is())
{
SwDBFormatData aDBFormat;
- String sInsert = GetDBField( xColumnProp, aDBFormat);
+ String sInsert = GetDBField( xColumnProp, aDBFormat);
if( DB_SEP_SPACE == nSeparator )
sInsert += cSpace;
else if( DB_SEP_TAB == nSeparator)
@@ -609,7 +609,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
sStr += '\t';
}
pSh->SwEditShell::Insert2(sStr);
- pSh->SwFEShell::SplitNode(); // Zeilenvorschub
+ pSh->SwFEShell::SplitNode(); // Zeilenvorschub
}
}
}
@@ -758,7 +758,7 @@ SwNewDBMgr::~SwNewDBMgr()
}
/*--------------------------------------------------------------------
- Beschreibung: Serienbriefe als einzelne Dokumente speichern
+ Beschreibung: Serienbriefe als einzelne Dokumente speichern
--------------------------------------------------------------------*/
String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageDesc, ULONG nDocNo )
{
@@ -981,7 +981,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
SwDBFormatData aDBFormat;
aDBFormat.xFormatter = pImpl->pMergeData->xFormatter;
aDBFormat.aNullDate = pImpl->pMergeData->aNullDate;
- sAddress = GetDBField( xColumnProp, aDBFormat);
+ sAddress = GetDBField( xColumnProp, aDBFormat);
if (!sAddress.Len())
sAddress = '_';
sPath += sAddress;
@@ -1017,7 +1017,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
{
INetURLObject aTempFileURL(aTempFile->GetURL());
aPrtMonDlg.aPrinter.SetText( aTempFileURL.GetBase() );
- String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief
+ String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief
sStat += ' ';
sStat += String::CreateFromInt32( nDocNo );
aPrtMonDlg.aPrintInfo.SetText(sStat);
@@ -1233,9 +1233,9 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
nEndRow = pImpl->pMergeData ? pImpl->pMergeData->xResultSet->getRow() : 0;
} while( !bCancel &&
(bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord()));
-
+
aPrtMonDlg.Show( FALSE );
-
+
// save the single output document
if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile)
{
@@ -1281,18 +1281,18 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
aVal >>= _sVal;
}
#endif
- // printing should be done synchronously otherwise the document
+ // printing should be done synchronously otherwise the document
// might already become invalid during the process
uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions );
const sal_Int32 nOpts = aOptions.getLength();
aOptions.realloc( nOpts + 1 );
aOptions[ nOpts ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
aOptions[ nOpts ].Value <<= sal_True ;
-// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) );
+// aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) );
// // #i52629# aynchronous printing should only be done in silent mode - otherwise
// // the printer dialog does not come up
// aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, rMergeDescriptor.bPrintAsync ));
- // move print options
+ // move print options
const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray();
for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption)
{
@@ -1311,11 +1311,11 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
// const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig();
// if (pModOpt->IsSinglePrintJob())
// {
-// }
+// }
// else
// {
pTargetView->ExecPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync );
-// }
+// }
}
xTargetDocShell->DoClose();
}
@@ -1591,7 +1591,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const String& rData
uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
const String& rTableOrQuery,
- BYTE eTableOrQuery)
+ BYTE eTableOrQuery)
{
Reference< sdbcx::XColumnsSupplier> xRet;
try
@@ -1710,7 +1710,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
}
// releases the merge data source table or query after merge is completed
-void SwNewDBMgr::EndMerge()
+void SwNewDBMgr::EndMerge()
{
OSL_ENSURE(bInMerge, "merge is not active");
bInMerge = FALSE;
@@ -1900,9 +1900,9 @@ BOOL SwNewDBMgr::ExistsNextRecord() const
return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB;
}
-sal_uInt32 SwNewDBMgr::GetSelectedRecordId()
+sal_uInt32 SwNewDBMgr::GetSelectedRecordId()
{
- sal_uInt32 nRet = 0;
+ sal_uInt32 nRet = 0;
OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is())
return FALSE;
@@ -2034,7 +2034,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId(
if(pFound && pFound->xResultSet.is())
{
try
- { //if a selection array is set the current row at the result set may not be set yet
+ { //if a selection array is set the current row at the result set may not be set yet
if(pFound->aSelection.getLength())
{
sal_Int32 nSelIndex = pFound->nSelectionIndex;
@@ -2054,7 +2054,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId(
// close all data sources - after fields were updated
-void SwNewDBMgr::CloseAll(BOOL bIncludingMerge)
+void SwNewDBMgr::CloseAll(BOOL bIncludingMerge)
{
//the only thing done here is to reset the selection index
//all connections stay open
@@ -2162,7 +2162,7 @@ SwDSParam* SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, BOOL
return pFound;
}
-const SwDBData& SwNewDBMgr::GetAddressDBName()
+const SwDBData& SwNewDBMgr::GetAddressDBName()
{
return SW_MOD()->GetDBConfig()->GetAddressSource();
}
@@ -2374,7 +2374,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
}
-void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
+void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
const Sequence<PropertyValue>& rProperties,
BOOL bWithDataSourceBrowser)
{
@@ -2389,8 +2389,8 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
ODataAccessDescriptor aDescriptor(rProperties);
sDataSource = aDescriptor.getDataSource();
- aDescriptor[daCommand] >>= sDataTableOrQuery;
- aDescriptor[daCommandType] >>= nCmdType;
+ aDescriptor[daCommand] >>= sDataTableOrQuery;
+ aDescriptor[daCommandType] >>= nCmdType;
if ( aDescriptor.has(daSelection) )
aDescriptor[daSelection] >>= aSelection;
@@ -2472,7 +2472,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
pWorkDoc->SetNewDBMgr( this );
SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor );
- aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter();
+ aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter();
aMergeDesc.bCreateSingleFile= true;
MergeNew(aMergeDesc);
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 3b477725ae07..cf83bcba429c 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hrc b/sw/source/ui/dbui/dbtablepreviewdialog.hrc
index 645cbe92ab74..a260f9fa98dd 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hrc
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hrc
@@ -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
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index 3c4b790e8fd4..c100e377e3c2 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <vcl/button.hxx>
#include <com/sun/star/uno/Sequence.h>
-namespace com{ namespace sun{ namespace star{
+namespace com{ namespace sun{ namespace star{
namespace beans{ struct PropertyValue; }
namespace frame{ class XFrame; }
}}}
@@ -45,11 +45,11 @@ class SwDBTablePreviewDialog : public SfxModalDialog
OKButton m_aOK;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
-public:
+public:
SwDBTablePreviewDialog(Window* pParent,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues );
~SwDBTablePreviewDialog();
-
+
};
#endif
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.src b/sw/source/ui/dbui/dbtablepreviewdialog.src
index a52290db80fb..3ad385ebbd09 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.src
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.src
@@ -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
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 4cf314bf3111..a717f8454c56 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -2,7 +2,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
@@ -193,12 +193,12 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
SwWrtShell* pSh,
const String& rDefDBName, const BOOL bShowCol):
- SvTreeListBox (pParent, rResId),
+ SvTreeListBox (pParent, rResId),
aImageList (SW_RES(ILIST_DB_DLG )),
aImageListHC (SW_RES(ILIST_DB_DLG_HC )),
- sDefDBName (rDefDBName),
+ sDefDBName (rDefDBName),
bInitialized (FALSE),
- bShowColumns (bShowCol),
+ bShowColumns (bShowCol),
pImpl(new SwDBTreeList_Impl(pSh))
{
SetHelpId(HID_DB_SELECTION_TLB);
@@ -276,7 +276,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol)
while (pEntry)
{
pEntry = (SvLBoxEntry*)GetRootLevelParent( pEntry );
- Collapse(pEntry); // zuklappen
+ Collapse(pEntry); // zuklappen
SvLBoxEntry* pChild;
while ((pChild = FirstChild(pEntry)) != 0L)
@@ -287,7 +287,7 @@ void SwDBTreeList::ShowColumns(BOOL bShowCol)
if (sDBName.Len())
{
- Select(sDBName, sTableName, sColumnName); // force RequestingChilds
+ Select(sDBName, sTableName, sColumnName); // force RequestingChilds
}
SetUpdateMode(TRUE);
}
@@ -297,7 +297,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
{
if (!pParent->HasChilds())
{
- if (GetParent(pParent)) // column names
+ if (GetParent(pParent)) // column names
{
try
{
@@ -433,7 +433,7 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData )
if (GetParent(pRight) && GetParent(GetParent(pRight)))
return COMPARE_GREATER; // don't sort column names
- return DefaultCompare(pData); // Sonst Basisklasse rufen
+ return DefaultCompare(pData); // Sonst Basisklasse rufen
}
String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* pbIsTable)
@@ -459,7 +459,7 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, BOOL* p
}
/*------------------------------------------------------------------------
- Beschreibung: Format: Datenbank.Tabelle
+ Beschreibung: Format: Datenbank.Tabelle
------------------------------------------------------------------------*/
void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName)
{
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx
index 45ddaa496613..e4faad79b069 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/ui/dbui/dbui.cxx
@@ -2,7 +2,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
@@ -37,14 +37,14 @@
#include "dbui.hxx"
PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType )
-: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ),
- aDocName (this, SW_RES( FT_DOCNAME )),
- aPrinting (this, SW_RES(
- eType == MONITOR_TYPE_MAIL ?
+: ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ),
+ aDocName (this, SW_RES( FT_DOCNAME )),
+ aPrinting (this, SW_RES(
+ eType == MONITOR_TYPE_MAIL ?
FT_SENDING : eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )),
- aPrinter (this, SW_RES( FT_PRINTER )),
- aPrintInfo (this, SW_RES( FT_PRINTINFO )),
- aCancel (this, SW_RES( PB_CANCELPRNMON ))
+ aPrinter (this, SW_RES( FT_PRINTER )),
+ aPrintInfo (this, SW_RES( FT_PRINTINFO )),
+ aCancel (this, SW_RES( PB_CANCELPRNMON ))
{
switch (eType)
{
@@ -58,14 +58,14 @@ PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType )
void lcl_ResizeControl( Window* pWin, long nDiff )
{
Size aSize( pWin->GetSizePixel() );
- aSize.Width() += nDiff;
- pWin->SetSizePixel( aSize );
-}
+ aSize.Width() += nDiff;
+ pWin->SetSizePixel( aSize );
+}
void lcl_RePosControl( Window* pWin, long nDiff )
{
Point aPos( pWin->GetPosPixel() );
- aPos.X() += nDiff;
- pWin->SetPosPixel( aPos );
+ aPos.X() += nDiff;
+ pWin->SetPosPixel( aPos );
}
void PrintMonitor::ResizeControls()
@@ -80,29 +80,29 @@ void PrintMonitor::ResizeControls()
long nDiff = nPrinterTextWidth - aPrinterSize.Width();
if( nDiff > 2 * aDlgSize.Width() )
{
- aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() );
+ aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() );
nDiff = 2 * aDlgSize.Width();
}
aDlgSize.Width() += nDiff;
SetSizePixel(aDlgSize);
- lcl_ResizeControl( &aPrinter, nDiff );
+ lcl_ResizeControl( &aPrinter, nDiff );
nDiff /= 2;
- lcl_RePosControl( &aDocName, nDiff );
- lcl_RePosControl( &aPrinting, nDiff );
+ lcl_RePosControl( &aDocName, nDiff );
+ lcl_RePosControl( &aPrinting, nDiff );
lcl_RePosControl( &aPrintInfo, nDiff );
- lcl_RePosControl( &aCancel, nDiff );
+ lcl_RePosControl( &aCancel, nDiff );
}
}
// Progress Indicator for Creation of personalized Mail Merge documents:
CreateMonitor::CreateMonitor( Window *pParent )
-: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ),
- m_aStatus (this, SW_RES( FT_STATUS )),
- m_aProgress (this, SW_RES( FT_PROGRESS )),
- m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )),
- m_aCounting (this, SW_RES( FT_COUNTING )),
- m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )),
+: ModelessDialog( pParent, SW_RES(DLG_MM_CREATIONMONITOR) ),
+ m_aStatus (this, SW_RES( FT_STATUS )),
+ m_aProgress (this, SW_RES( FT_PROGRESS )),
+ m_aCreateDocuments (this, SW_RES( FT_CREATEDOCUMENTS )),
+ m_aCounting (this, SW_RES( FT_COUNTING )),
+ m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )),
m_sCountingPattern(),
m_sVariable_Total( String::CreateFromAscii("%Y") ),
m_sVariable_Position( String::CreateFromAscii("%X") ),
@@ -117,7 +117,7 @@ CreateMonitor::CreateMonitor( Window *pParent )
void CreateMonitor::UpdateCountingText()
{
- String sText(m_sCountingPattern);
+ String sText(m_sCountingPattern);
sText.SearchAndReplaceAll( m_sVariable_Total, String::CreateFromInt32( m_nTotalCount ) );
sText.SearchAndReplaceAll( m_sVariable_Position, String::CreateFromInt32( m_nCurrentPosition ) );
m_aCounting.SetText(sText);
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 92c087677db5..ce6b29706418 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -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
@@ -210,9 +210,9 @@ ModelessDialog DLG_MM_CREATIONMONITOR
_HEIGHT = 52 ;
MOVEABLE = TRUE ;
APP = FALSE ;
-
+
Text [ en-US ] = "Mail Merge" ;
-
+
FixedText FT_STATUS
{
HIDE = FALSE ;
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index ef073f6ebabf..d2c9e28fbf9a 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -2,7 +2,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
@@ -41,30 +41,30 @@ typedef std::list< ::rtl::Reference<IMailDispatcherListener> > MailDispatcherLis
namespace /* private */
{
- /* Generic event notifier for started,
- stopped, and idle events which are
+ /* Generic event notifier for started,
+ stopped, and idle events which are
very similary */
class GenericEventNotifier
{
public:
// pointer to virtual function typedef
typedef void (IMailDispatcherListener::*GenericNotificationFunc_t)(::rtl::Reference<MailDispatcher>);
-
+
GenericEventNotifier(
- GenericNotificationFunc_t notification_function,
+ GenericNotificationFunc_t notification_function,
::rtl::Reference<MailDispatcher> mail_dispatcher) :
notification_function_(notification_function),
mail_dispatcher_(mail_dispatcher)
{}
-
+
void operator() (::rtl::Reference<IMailDispatcherListener> listener) const
{ (listener.get()->*notification_function_)(mail_dispatcher_); }
-
+
private:
GenericNotificationFunc_t notification_function_;
::rtl::Reference<MailDispatcher> mail_dispatcher_;
};
-
+
class MailDeliveryNotifier
{
public:
@@ -72,77 +72,77 @@ namespace /* private */
mail_dispatcher_(xMailDispatcher),
message_(message)
{}
-
+
void operator() (::rtl::Reference<IMailDispatcherListener> listener) const
- { listener->mailDelivered(mail_dispatcher_, message_); }
-
+ { listener->mailDelivered(mail_dispatcher_, message_); }
+
private:
::rtl::Reference<MailDispatcher> mail_dispatcher_;
uno::Reference<mail::XMailMessage> message_;
};
-
+
class MailDeliveryErrorNotifier
{
public:
MailDeliveryErrorNotifier(
::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference<mail::XMailMessage> message,
- const ::rtl::OUString& error_message) :
+ uno::Reference<mail::XMailMessage> message,
+ const ::rtl::OUString& error_message) :
mail_dispatcher_(xMailDispatcher),
message_(message),
error_message_(error_message)
{}
-
+
void operator() (::rtl::Reference<IMailDispatcherListener> listener) const
{ listener->mailDeliveryError(mail_dispatcher_, message_, error_message_); }
-
+
private:
::rtl::Reference<MailDispatcher> mail_dispatcher_;
uno::Reference<mail::XMailMessage> message_;
::rtl::OUString error_message_;
};
-
+
} // namespace private
-
+
MailDispatcher::MailDispatcher(uno::Reference<mail::XSmtpService> mailserver) :
mailserver_ (mailserver),
- run_(false),
+ run_(false),
shutdown_requested_(false)
-{
+{
wakening_call_.reset();
mail_dispatcher_active_.reset();
-
- if (!create())
- throw uno::RuntimeException();
-
- // wait until the mail dispatcher thread is really alive
- // and has aquired a reference to this instance of the
- // class
- mail_dispatcher_active_.wait();
+
+ if (!create())
+ throw uno::RuntimeException();
+
+ // wait until the mail dispatcher thread is really alive
+ // and has aquired a reference to this instance of the
+ // class
+ mail_dispatcher_active_.wait();
}
MailDispatcher::~MailDispatcher()
-{
+{
}
void MailDispatcher::enqueueMailMessage(uno::Reference<mail::XMailMessage> message)
-{
- ::osl::MutexGuard thread_status_guard(thread_status_mutex_);
+{
+ ::osl::MutexGuard thread_status_guard(thread_status_mutex_);
::osl::MutexGuard message_container_guard(message_container_mutex_);
-
+
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
- messages_.push_back(message);
+
+ messages_.push_back(message);
if (run_)
- wakening_call_.set();
+ wakening_call_.set();
}
uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage()
-{
+{
::osl::MutexGuard guard(message_container_mutex_);
uno::Reference<mail::XMailMessage> message;
if(!messages_.empty())
- {
+ {
message = messages_.front();
messages_.pop_front();
}
@@ -150,51 +150,51 @@ uno::Reference<mail::XMailMessage> MailDispatcher::dequeueMailMessage()
}
void MailDispatcher::start()
-{
- OSL_PRECOND(!isStarted(), "MailDispatcher is already started!");
-
- ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
-
+{
+ OSL_PRECOND(!isStarted(), "MailDispatcher is already started!");
+
+ ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
+
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
+
if (!shutdown_requested_)
{
run_ = true;
wakening_call_.set();
thread_status_guard.clear();
-
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this));
- }
+
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::started, this));
+ }
}
void MailDispatcher::stop()
{
- OSL_PRECOND(isStarted(), "MailDispatcher not started!");
-
- ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
-
+ OSL_PRECOND(isStarted(), "MailDispatcher not started!");
+
+ ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
+
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
+
if (!shutdown_requested_)
{
run_ = false;
wakening_call_.reset();
thread_status_guard.clear();
-
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this));
+
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::stopped, this));
}
}
void MailDispatcher::shutdown()
-{
- ::osl::MutexGuard thread_status_guard(thread_status_mutex_);
-
+{
+ ::osl::MutexGuard thread_status_guard(thread_status_mutex_);
+
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
+
shutdown_requested_ = true;
- wakening_call_.set();
+ wakening_call_.set();
}
bool MailDispatcher::isStarted() const
@@ -205,7 +205,7 @@ bool MailDispatcher::isStarted() const
void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener)
{
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
+
::osl::MutexGuard guard(listener_container_mutex_);
listeners_.push_back(listener);
}
@@ -213,7 +213,7 @@ void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> liste
void MailDispatcher::removeListener(::rtl::Reference<IMailDispatcherListener> listener)
{
OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down already");
-
+
::osl::MutexGuard guard(listener_container_mutex_);
listeners_.remove(listener);
}
@@ -228,67 +228,67 @@ void MailDispatcher::sendMailMessageNotifyListener(uno::Reference<mail::XMailMes
{
try
{
- mailserver_->sendMailMessage(message);
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message));
+ mailserver_->sendMailMessage(message);
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryNotifier(this, message));
}
catch (mail::MailException& ex)
- {
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message));
+ {
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message));
}
catch (uno::RuntimeException& ex)
- {
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message));
+ {
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), MailDeliveryErrorNotifier(this, message, ex.Message));
}
}
void MailDispatcher::run()
-{
+{
// aquire a self reference in order to avoid race
// conditions. The last client of this class must
- // call shutdown before releasing his last reference
+ // call shutdown before releasing his last reference
// to this class in order to shutdown this thread
// which will release his (the very last reference
- // to the class and so force their destruction
- m_xSelfReference = this;
-
+ // to the class and so force their destruction
+ m_xSelfReference = this;
+
// signal that the mail dispatcher thread is now alive
mail_dispatcher_active_.set();
-
+
for(;;)
- {
+ {
wakening_call_.wait();
-
- ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
+
+ ::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
if (shutdown_requested_)
break;
-
+
::osl::ClearableMutexGuard message_container_guard(message_container_mutex_);
-
+
if (messages_.size())
- {
- thread_status_guard.clear();
+ {
+ thread_status_guard.clear();
uno::Reference<mail::XMailMessage> message = messages_.front();
messages_.pop_front();
message_container_guard.clear();
sendMailMessageNotifyListener(message);
}
- else // idle - put ourself to sleep
+ else // idle - put ourself to sleep
{
wakening_call_.reset();
message_container_guard.clear();
thread_status_guard.clear();
- MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
- std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this));
- }
+ MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
+ std::for_each(listeners_cloned.begin(), listeners_cloned.end(), GenericEventNotifier(&IMailDispatcherListener::idle, this));
+ }
} // end for SSH ALI
}
-void MailDispatcher::onTerminated()
+void MailDispatcher::onTerminated()
{
- //keep the reference until the end of onTerminated() because of the call order in the
+ //keep the reference until the end of onTerminated() because of the call order in the
//_threadFunc() from osl/thread.hxx
m_xSelfReference = 0;
}
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 35013652c83b..c384c51956ac 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/ui/dbui/mailmergechildwindow.hrc
index 9b5931522975..edba002b0d3f 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.hrc
+++ b/sw/source/ui/dbui/mailmergechildwindow.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index 3caf5b1a7607..187f50b5848c 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -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
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 16332e3825f2..6aa9f1241c0a 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 4b2d7103f524..a9192ebdd60e 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mailmergewizard.hrc b/sw/source/ui/dbui/mailmergewizard.hrc
index f6b00013b2fe..02a2c08130a7 100644
--- a/sw/source/ui/dbui/mailmergewizard.hrc
+++ b/sw/source/ui/dbui/mailmergewizard.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
index d3da4d7c9945..ad7d57480092 100644
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ b/sw/source/ui/dbui/mailmergewizard.src
@@ -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
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index d4c0a01edda0..2c7fed8c045b 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -2,7 +2,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
@@ -210,7 +210,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress)
m_aSettingsWIN.AddAddress(aBlocks[nAddress]);
m_aSettingsWIN.SelectAddress(0);
- m_aSettingsWIN.Invalidate(); // #i40408
+ m_aSettingsWIN.Invalidate(); // #i40408
rConfig.SetCountrySettings(pDlg->IsIncludeCountry(), pDlg->GetCountry());
InsertDataHdl_Impl(0);
}
@@ -492,7 +492,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton
m_aPreview.SelectAddress(nSelect);
}
m_aDeletePB.Enable( m_aAddressBlocks.getLength() > 1);
- }
+ }
delete pDlg;
return 0;
}
@@ -513,7 +513,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
if(rEvt.GetCharCode())
{
String sKey = rEvt.GetCharCode();
- if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
+ if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
bCallParent = FALSE;
}
if(bCallParent)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc
index 8dbae66b94e6..99887597a253 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hrc
+++ b/sw/source/ui/dbui/mmaddressblockpage.hrc
@@ -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
@@ -66,12 +66,12 @@
#define IB_INSERTFIELD 42
#define IB_REMOVEFIELD 43
#define FT_DRAG 48
-#define ED_DRAG 49
+#define ED_DRAG 49
#define IB_UP 50
#define IB_LEFT 51
#define IB_RIGHT 52
#define IB_DOWN 53
-#define FT_FIELD 54
+#define FT_FIELD 54
#define CB_FIELD 55
#define ST_SALUTATION 56
#define ST_PUNCTUATION 57
@@ -85,7 +85,7 @@
#define ST_INSERTSALUTATIONFIELD 65
#define ST_REMOVESALUTATIONFIELD 66
#define ST_DRAGSALUTATION 67
-#define ST_TITLE_EDIT 68
+#define ST_TITLE_EDIT 68
#define FI_MATCHING 70
@@ -93,7 +93,7 @@
#define ST_SALUTATIONPREVIEW 72
#define ST_SALUTATIONMATCHING 73
#define ST_SALUTATIONELEMENT 74
-#define CB_HIDE_EMPTY_PARA 75
+#define CB_HIDE_EMPTY_PARA 75
#define FI_FIRST 76
#define FL_FIRST 77
#define FL_SECOND 78
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index b5e90d7fc4f2..b6c0d0d8cd3a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -2,7 +2,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
@@ -50,9 +50,9 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
FixedInfo m_aAddressListFI;
PushButton m_aAddressListPB;
FixedInfo m_aCurrentAddressFI;
-
+
FixedLine m_aFirstFL;
-
+
FixedInfo m_aSecondFI;
FixedInfo m_aSettingsFI;
CheckBox m_aAddressCB;
@@ -67,7 +67,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
FixedInfo m_aMatchFieldsFI;
PushButton m_aAssignPB;
-
+
FixedLine m_aThirdFL;
FixedInfo m_aFourthFI;
@@ -91,14 +91,14 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
DECL_LINK(InsertDataHdl_Impl, ImageButton*);
DECL_LINK(AddressBlockSelectHdl_Impl, SwAddressPreview*);
DECL_LINK(HideParagraphsHdl_Impl, CheckBox*);
-
+
void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective);
-
+
virtual void ActivatePage();
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
-public:
+public:
SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent);
~SwMailMergeAddressBlockPage();
@@ -112,19 +112,19 @@ class SwSelectAddressBlockDialog : public SfxModalDialog
PushButton m_aNewPB;
PushButton m_aCustomizePB;
PushButton m_aDeletePB;
-
+
FixedInfo m_aSettingsFI;
RadioButton m_aNeverRB;
RadioButton m_aAlwaysRB;
RadioButton m_aDependentRB;
Edit m_aCountryED;
-
+
FixedLine m_aSeparatorFL;
-
+
OKButton m_aOK;
CancelButton m_aCancel;
HelpButton m_aHelp;
-
+
com::sun::star::uno::Sequence< ::rtl::OUString> m_aAddressBlocks;
SwMailMergeConfigItem& m_rConfig;
@@ -145,16 +145,16 @@ public:
void SetSettings(sal_Bool bIsCountry, ::rtl::OUString sCountry);
sal_Bool IsIncludeCountry() const {return !m_aNeverRB.IsChecked();}
::rtl::OUString GetCountry() const;
-};
+};
class SwCustomizeAddressBlockDialog;
class DDListBox : public SvTreeListBox
{
SwCustomizeAddressBlockDialog* m_pParentDialog;
-public:
+public:
DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId);
~DDListBox();
-
+
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
};
@@ -167,19 +167,19 @@ class AddressMultiLineEdit : public MultiLineEdit, public SfxListener
{
Link m_aSelectionLink;
SwCustomizeAddressBlockDialog* m_pParentDialog;
-
+
using Window::Notify;
using MultiLineEdit::SetText;
protected:
long PreNotify( NotifyEvent& rNEvt );
-public:
+public:
AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId& rResId);
~AddressMultiLineEdit();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
+
void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;}
void SetText( const String& rStr );
@@ -194,22 +194,22 @@ public:
bool HasCurrentItem();
String GetCurrentItem();
void SelectCurrentItem();
-};
+};
// Dialog is used to create custom address blocks as well as custom greeting lines
class SwRestrictedComboBox : public ComboBox
-{
+{
String sForbiddenChars;
protected:
virtual void KeyInput( const KeyEvent& );
- virtual void Modify();
-public:
+ virtual void Modify();
+public:
SwRestrictedComboBox(Window* pParent, const ResId& rResId):
ComboBox( pParent, rResId ){}
-
- ~SwRestrictedComboBox();
-
+
+ ~SwRestrictedComboBox();
+
void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;}
};
@@ -224,8 +224,8 @@ public:
ADDRESSBLOCK_EDIT,
GREETING_FEMALE,
GREETING_MALE
- };
-private:
+ };
+private:
FixedText m_aAddressElementsFT;
DDListBox m_aAddressElementsLB;
@@ -271,7 +271,7 @@ private:
bool HasItem_Impl(sal_Int32 nUserData);
sal_Int32 GetSelectedItem_Impl();
void UpdateImageButtons_Impl();
- void MoveFocus( Window* pMember, bool bNext );
+ void MoveFocus( Window* pMember, bool bNext );
public:
SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType);
@@ -279,19 +279,19 @@ public:
void SetAddress(const ::rtl::OUString& rAddress);
::rtl::OUString GetAddress();
-};
+};
class SwAssignFieldsControl;
class SwAssignFieldsDialog : public SfxModalDialog
{
FixedInfo m_aMatchingFI;
SwAssignFieldsControl* m_pFieldsControl;
-
+
FixedInfo m_aPreviewFI;
SwAddressPreview m_aPreviewWIN;
-
+
FixedLine m_aSeparatorFL;
-
+
OKButton m_aOK;
CancelButton m_aCancel;
HelpButton m_aHelp;
@@ -300,18 +300,18 @@ class SwAssignFieldsDialog : public SfxModalDialog
::rtl::OUString m_rPreviewString;
SwMailMergeConfigItem& m_rConfigItem;
-
+
::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments();
DECL_LINK(OkHdl_Impl, PushButton*);
DECL_LINK(AssignmentModifyHdl_Impl, void*);
public:
- SwAssignFieldsDialog(Window* pParent,
- SwMailMergeConfigItem& rConfigItem,
+ SwAssignFieldsDialog(Window* pParent,
+ SwMailMergeConfigItem& rConfigItem,
const ::rtl::OUString& rPreview,
bool bIsAddressBlock);
~SwAssignFieldsDialog();
-};
+};
#endif
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index 238d1cfa1260..7052b27f2512 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -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
@@ -78,12 +78,12 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
Hide = TRUE;
Text[ en-US ] = "Current address list: %1";
};
- FixedLine FL_FIRST
+ FixedLine FL_FIRST
{
Pos = MAP_APPFONT ( 6 , 55 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
};
- FixedText FI_SECOND
+ FixedText FI_SECOND
{
Pos = MAP_APPFONT ( 6 , 66 ) ;
Size = MAP_APPFONT ( 10 , 8 ) ;
@@ -138,7 +138,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
Size = MAP_APPFONT ( 60 , 14 ) ;
Text[ en-US ] = "Match ~Fields...";
};
- FixedLine FL_THIRD
+ FixedLine FL_THIRD
{
Pos = MAP_APPFONT ( 6 , 169 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -149,19 +149,19 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
Size = MAP_APPFONT ( 10 , 8 ) ;
Text[ en-US ] = "4.";
};
- FixedText FI_PREVIEW
+ FixedText FI_PREVIEW
{
Pos = MAP_APPFONT ( 16 , 180 ) ;
Size = MAP_APPFONT ( 228 , 8 ) ;
Text[ en-US ] = "Check if the address data matches correctly.";
};
- Window WIN_PREVIEW
+ Window WIN_PREVIEW
{
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 191 ) ;
Size = MAP_APPFONT ( 176 , 46 ) ;
};
- FixedText FI_DOCINDEX
+ FixedText FI_DOCINDEX
{
Pos = MAP_APPFONT ( 111 , 239 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
@@ -302,8 +302,8 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
HelpID = HID_MM_CUSTOMIZEADDRESSBLOCK;
Size = MAP_APPFONT ( 320 , 176 ) ;
Moveable = TRUE ;
-
- WORKAROUND
+
+ WORKAROUND
String ST_TITLE_EDIT
{
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 2b9f64f61b50..331215ea72ba 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 2f519ea069f7..a01650832d1b 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmdocselectpage.hrc b/sw/source/ui/dbui/mmdocselectpage.hrc
index f3c5698214ff..d2ebb3ae84cc 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hrc
+++ b/sw/source/ui/dbui/mmdocselectpage.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 76ced703a4ac..a24df215194b 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -2,7 +2,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
@@ -44,12 +44,12 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage
RadioButton m_aLoadDocRB;
RadioButton m_aLoadTemplateRB;
RadioButton m_aRecentDocRB;
-
+
PushButton m_aBrowseDocPB;
PushButton m_aBrowseTemplatePB;
-
+
ListBox m_aRecentDocLB;
-
+
String m_sLoadFileName;
String m_sLoadTemplateName;
@@ -57,10 +57,10 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage
DECL_LINK(DocSelectHdl, RadioButton*);
DECL_LINK(FileSelectHdl, PushButton*);
-
+
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
-public:
+public:
SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent);
~SwMailMergeDocSelectPage();
diff --git a/sw/source/ui/dbui/mmdocselectpage.src b/sw/source/ui/dbui/mmdocselectpage.src
index 9bc2077c6619..ace679af4f97 100644
--- a/sw/source/ui/dbui/mmdocselectpage.src
+++ b/sw/source/ui/dbui/mmdocselectpage.src
@@ -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
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index cb691460ed97..c8cd2d8cd79b 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmgreetingspage.hrc b/sw/source/ui/dbui/mmgreetingspage.hrc
index 422d04983e49..508c247f9775 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hrc
+++ b/sw/source/ui/dbui/mmgreetingspage.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index d0376ca72649..687f4afdf236 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -2,7 +2,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
@@ -39,12 +39,12 @@
class SwMailMergeWizard;
-class SwGreetingsHandler
+class SwGreetingsHandler
{
friend class SwMailBodyDialog;
friend class SwMailMergeGreetingsPage;
CheckBox* m_pGreetingLineCB;
-
+
CheckBox* m_pPersonalizedCB;
FixedText* m_pFemaleFT;
@@ -60,30 +60,30 @@ class SwGreetingsHandler
ListBox* m_pFemaleColumnLB;
FixedText* m_pFemaleFieldFT;
ComboBox* m_pFemaleFieldCB;
-
+
FixedText* m_pNeutralFT;
ComboBox* m_pNeutralCB;
bool m_bIsTabPage;
SwMailMergeWizard* m_pWizard;
-
+
DECL_LINK(IndividualHdl_Impl, CheckBox*);
DECL_LINK(GreetingHdl_Impl, PushButton*);
-
+
void Contains(sal_Bool bContainsGreeting);
virtual void UpdatePreview();
-};
+};
-class SwMailMergeGreetingsPage : public svt::OWizardPage,
+class SwMailMergeGreetingsPage : public svt::OWizardPage,
public SwGreetingsHandler
{
SwBoldFixedInfo m_aHeaderFI;
-
+
CheckBox m_aGreetingLineCB;
-
+
CheckBox m_aPersonalizedCB;
-
+
FixedText m_aFemaleFT;
ListBox m_aFemaleLB;
PushButton m_aFemalePB;
@@ -97,19 +97,19 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage,
ListBox m_aFemaleColumnLB;
FixedText m_aFemaleFieldFT;
ComboBox m_aFemaleFieldCB;
-
+
FixedText m_aNeutralFT;
ComboBox m_aNeutralCB;
-
+
FixedInfo m_aPreviewFI;
SwAddressPreview m_aPreviewWIN;
PushButton m_aAssignPB;
FixedInfo m_aDocumentIndexFI;
ImageButton m_aPrevSetIB;
ImageButton m_aNextSetIB;
-
+
String m_sDocument;
-
+
DECL_LINK(ContainsHdl_Impl, CheckBox*);
DECL_LINK(InsertDataHdl_Impl, ImageButton*);
DECL_LINK(GreetingSelectHdl_Impl, ListBox*);
@@ -118,7 +118,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage,
virtual void UpdatePreview();
virtual void ActivatePage();
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
-public:
+public:
SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent);
~SwMailMergeGreetingsPage();
@@ -127,9 +127,9 @@ public:
class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler
{
CheckBox m_aGreetingLineCB;
-
+
CheckBox m_aPersonalizedCB;
-
+
FixedText m_aFemaleFT;
ListBox m_aFemaleLB;
PushButton m_aFemalePB;
@@ -143,10 +143,10 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler
ListBox m_aFemaleColumnLB;
FixedText m_aFemaleFieldFT;
ComboBox m_aFemaleFieldCB;
-
+
FixedText m_aNeutralFT;
ComboBox m_aNeutralCB;
-
+
FixedText m_aBodyFT;
MultiLineEdit m_aBodyMLE;
FixedLine m_aSeparatorFL;
@@ -157,7 +157,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler
DECL_LINK(ContainsHdl_Impl, CheckBox*);
DECL_LINK(OKHdl, PushButton*);
-public:
+public:
SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard);
~SwMailBodyDialog();
diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src
index a9447034d749..fff77d9240db 100644
--- a/sw/source/ui/dbui/mmgreetingspage.src
+++ b/sw/source/ui/dbui/mmgreetingspage.src
@@ -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
@@ -32,7 +32,7 @@
StringList [en-US]= \
{ \
< "< not available >" ; > ; \
- };
+ };
#define GREETINGS_BODY \
@@ -150,23 +150,23 @@ TabPage DLG_MM_GREETINGS_PAGE
};
GREETINGS_BODY
FixedText FI_PREVIEW
- {
+ {
Pos = MAP_APPFONT ( 12 , 168 ) ;
- Size = MAP_APPFONT ( 242 , 8 ) ;
+ Size = MAP_APPFONT ( 242 , 8 ) ;
Text[ en-US ] = "Preview";
- };
+ };
Window WIN_PREVIEW
- {
+ {
Pos = MAP_APPFONT ( 12 , 179 );
- Size = MAP_APPFONT ( 186 , 21 ) ;
+ Size = MAP_APPFONT ( 186 , 21 ) ;
Border = TRUE;
- };
+ };
PushButton PB_ASSIGN
- {
+ {
Pos = MAP_APPFONT ( 204 , 179 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
Text[ en-US ] = "~Match fields...";
- };
+ };
FixedText FI_DOCINDEX
{
Pos = MAP_APPFONT ( 121 , 206 ) ;
@@ -193,7 +193,7 @@ TabPage DLG_MM_GREETINGS_PAGE
};
};
-#undef TOP_OFFSET
+#undef TOP_OFFSET
#undef LEFT_OFFSET
#define TOP_OFFSET 0
@@ -207,11 +207,11 @@ ModalDialog DLG_MM_MAILBODY
Moveable = TRUE ;
Text [ en-US ] = "E-Mail Message";
CheckBox CB_GREETINGLINE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 242 , 10 ) ;
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 242 , 10 ) ;
Text[ en-US ] = "This e-mail should contain a salutation";
- };
+ };
GREETINGS_BODY
FixedText FT_BODY
{
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 2a44623325a3..0bcda18f4f53 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -2,7 +2,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
@@ -166,7 +166,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_aTopMF.SetUpHdl(aFrameHdl);
m_aTopMF.SetDownHdl(aFrameHdl);
m_aTopMF.SetLoseFocusHdl(aFrameHdl);
-
+
FieldUnit eFieldUnit = ::GetDfltMetric(sal_False);
::SetFieldUnit( m_aLeftMF, eFieldUnit );
::SetFieldUnit( m_aTopMF, eFieldUnit );
diff --git a/sw/source/ui/dbui/mmlayoutpage.hrc b/sw/source/ui/dbui/mmlayoutpage.hrc
index a54ba58fa025..10d334e62ab4 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hrc
+++ b/sw/source/ui/dbui/mmlayoutpage.hrc
@@ -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
@@ -43,6 +43,6 @@
#define WIN_EXAMPLECONTAINER 13
#define FT_ZOOM 14
#define LB_ZOOM 15
-
-#endif
-
+
+#endif
+
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index b3191f04da64..c9e24cd12830 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -2,7 +2,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
@@ -47,24 +47,24 @@ namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySe
class SwMailMergeLayoutPage : public svt::OWizardPage
{
SwBoldFixedInfo m_aHeaderFI;
-
+
FixedLine m_aPositionFL;
-
+
CheckBox m_aAlignToBodyCB;
FixedText m_aLeftFT;
MetricField m_aLeftMF;
FixedText m_aTopFT;
MetricField m_aTopMF;
-
+
FixedLine m_aGreetingLineFL;
FixedText m_aUpFT;
PushButton m_aUpPB;
FixedText m_aDownFT;
PushButton m_aDownPB;
-
+
Window m_aExampleContainerWIN;
Window m_aExampleWIN;
-
+
FixedText m_aZoomFT;
ListBox m_aZoomLB;
@@ -75,7 +75,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
SwFrmFmt* m_pAddressBlockFormat;
bool m_bIsGreetingInserted;
-
+
SwMailMergeWizard* m_pWizard;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xViewProperties;
@@ -87,21 +87,21 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
DECL_LINK(AlignToTextHdl_Impl, CheckBox*);
static SwFrmFmt* InsertAddressFrame(
- SwWrtShell& rShell,
- SwMailMergeConfigItem& rConfigItem,
- const Point& rDestination,
- bool bAlignToBody,
+ SwWrtShell& rShell,
+ SwMailMergeConfigItem& rConfigItem,
+ const Point& rDestination,
+ bool bAlignToBody,
bool bExample);
static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample);
virtual void ActivatePage();
virtual sal_Bool commitPage(::svt::WizardTypes::CommitPageReason _eReason);
-public:
+public:
SwMailMergeLayoutPage( SwMailMergeWizard* _pParent);
~SwMailMergeLayoutPage();
- static SwFrmFmt* InsertAddressAndGreeting(SwView* pView,
- SwMailMergeConfigItem& rConfigItem,
+ static SwFrmFmt* InsertAddressAndGreeting(SwView* pView,
+ SwMailMergeConfigItem& rConfigItem,
const Point& rAddressPos,
bool bAlignToBody);
};
diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src
index 8e012674719d..07582a45efdc 100644
--- a/sw/source/ui/dbui/mmlayoutpage.src
+++ b/sw/source/ui/dbui/mmlayoutpage.src
@@ -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
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index 442380f0a484..ed4d2585b077 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmmergepage.hrc b/sw/source/ui/dbui/mmmergepage.hrc
index bf9c730bf743..b7c3762c8321 100644
--- a/sw/source/ui/dbui/mmmergepage.hrc
+++ b/sw/source/ui/dbui/mmmergepage.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx
index 03a644c6fcdd..6f512c77ce73 100644
--- a/sw/source/ui/dbui/mmmergepage.hxx
+++ b/sw/source/ui/dbui/mmmergepage.hxx
@@ -2,7 +2,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
@@ -39,15 +39,15 @@ class SwMailMergeWizard;
class SwMailMergeMergePage : public svt::OWizardPage
{
SwBoldFixedInfo m_aHeaderFI;
-
+
FixedInfo m_aEditFI;
PushButton m_aEditPB;
-
+
FixedLine m_aFindFL;
FixedText m_aFineFT;
ReturnActionEdit m_aFindED;
PushButton m_aFindPB;
-
+
CheckBox m_aWholeWordsCB;
CheckBox m_aBackwardsCB;
CheckBox m_aMatchCaseCB;
@@ -58,7 +58,7 @@ class SwMailMergeMergePage : public svt::OWizardPage
DECL_LINK(FindHdl_Impl, PushButton*);
DECL_LINK(EnteredFindStringHdl_Impl, void*);
-public:
+public:
SwMailMergeMergePage( SwMailMergeWizard* _pParent);
~SwMailMergeMergePage();
diff --git a/sw/source/ui/dbui/mmmergepage.src b/sw/source/ui/dbui/mmmergepage.src
index d2f55bceb978..fd9fffc0de8e 100644
--- a/sw/source/ui/dbui/mmmergepage.src
+++ b/sw/source/ui/dbui/mmmergepage.src
@@ -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
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 5a5ba88615c3..f6d0409700a5 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -2,7 +2,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
@@ -914,7 +914,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
rConfigItem.SetPrintRange( (USHORT)nBegin, (USHORT)nEnd );
SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin);
SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1);
-
+
rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget ));
sPages += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - "));
sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget );
@@ -939,7 +939,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
aProps[0].Value <<= sal_True;
aProps[1]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
aProps[1]. Value <<= sPages;
-
+
pTargetView->ExecPrint( aProps, false, true );
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh));
diff --git a/sw/source/ui/dbui/mmoutputpage.hrc b/sw/source/ui/dbui/mmoutputpage.hrc
index f8daf2734b0c..ec64620eb0a0 100644
--- a/sw/source/ui/dbui/mmoutputpage.hrc
+++ b/sw/source/ui/dbui/mmoutputpage.hrc
@@ -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
@@ -49,7 +49,7 @@
#define PB_PRINTERSETTINGS 23
#define RB_PRINTALL 24
#define RB_PRINTCURRENT 25
-#define PB_PRINTNOW 26
+#define PB_PRINTNOW 26
#define ST_SAVESTART 27
#define ST_SAVEMERGED 28
#define ST_PRINT 29
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 6a7f9052d585..11f5daf4c6a7 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -2,7 +2,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
@@ -111,7 +111,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage
long m_nFromToFTPos;
long m_nFromToNFPos;
long m_nRBOffset;
-
+
bool m_bCancelSaving;
SwMailMergeWizard* m_pWizard;
diff --git a/sw/source/ui/dbui/mmoutputpage.src b/sw/source/ui/dbui/mmoutputpage.src
index efe84e34bfe9..29e54bbb403b 100644
--- a/sw/source/ui/dbui/mmoutputpage.src
+++ b/sw/source/ui/dbui/mmoutputpage.src
@@ -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
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 4b6df926daf7..36916aa7fa68 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hrc b/sw/source/ui/dbui/mmoutputtypepage.hrc
index 6deff71251b9..da8d34fe5814 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hrc
+++ b/sw/source/ui/dbui/mmoutputtypepage.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 236b0fd6f40a..d79aad5eff66 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage
FixedInfo m_aTypeFT;
RadioButton m_aLetterRB;
RadioButton m_aMailRB;
-
+
SwBoldFixedInfo m_aHintHeaderFI;
FixedInfo m_aHintFI;
FixedInfo m_aNoMailHintFI;
@@ -54,7 +54,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage
DECL_LINK(TypeHdl_Impl, RadioButton*);
-public:
+public:
SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent);
~SwMailMergeOutputTypePage();
diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src
index 3c776ff8fb59..a6dd74cc7a07 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.src
+++ b/sw/source/ui/dbui/mmoutputtypepage.src
@@ -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
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index da927a1ddf9c..e4ae3072c3a0 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hrc b/sw/source/ui/dbui/mmpreparemergepage.hrc
index 958df827749b..d5a89256d419 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hrc
+++ b/sw/source/ui/dbui/mmpreparemergepage.hrc
@@ -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
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx
index 73b138938305..18f8f20d7ad7 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.hxx
@@ -2,7 +2,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
@@ -48,22 +48,22 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage
PushButton m_aNextPB;
PushButton m_aLastPB;
CheckBox m_ExcludeCB;
-
+
FixedLine m_aNoteHeaderFL;
FixedInfo m_aEditFI;
PushButton m_aEditPB;
-
+
SwMailMergeWizard* m_pWizard;
-
+
DECL_LINK(EditDocumentHdl_Impl, PushButton*);
DECL_LINK(ExcludeHdl_Impl, CheckBox*);
DECL_LINK(MoveHdl_Impl, void*);
-
+
virtual void ActivatePage();
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
-public:
+public:
SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent);
~SwMailMergePrepareMergePage();
diff --git a/sw/source/ui/dbui/mmpreparemergepage.src b/sw/source/ui/dbui/mmpreparemergepage.src
index eac858b1b814..b1ecd375d45a 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.src
+++ b/sw/source/ui/dbui/mmpreparemergepage.src
@@ -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
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index e3f4f3faa224..1e31befb3dc2 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hrc b/sw/source/ui/dbui/selectdbtabledialog.hrc
index 24ed1183f97b..a5c55ff480d9 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hrc
+++ b/sw/source/ui/dbui/selectdbtabledialog.hrc
@@ -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
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index c69cae53572a..a3398936f242 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -2,7 +2,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
@@ -61,9 +61,9 @@ class SwSelectDBTableDialog : public SfxModalDialog
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
DECL_LINK(PreviewHdl, PushButton*);
-public:
-
- SwSelectDBTableDialog(Window* pParent,
+public:
+
+ SwSelectDBTableDialog(Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection
);
~SwSelectDBTableDialog();
diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src
index 271201463fef..467cb8333e68 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.src
+++ b/sw/source/ui/dbui/selectdbtabledialog.src
@@ -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
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index 351be634b75e..c27dfe3205be 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -2,7 +2,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
@@ -148,7 +148,7 @@ void SwDbtoolsClient::getFactory()
{
registerClient();
if(getDbToolsClientFactoryFunction())
- { // loading the lib succeeded
+ { // loading the lib succeeded
void* pUntypedFactory = (*getDbToolsClientFactoryFunction())();
IDataAccessToolsFactory* pDBTFactory = static_cast<IDataAccessToolsFactory*>(pUntypedFactory);
OSL_ENSURE(pDBTFactory, "SwDbtoolsClient::SwDbtoolsClient: no factory returned!");
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 86ac3c4a3f6a..0bf23a60a6da 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -2,7 +2,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
@@ -272,8 +272,8 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
m_pSpellState->m_aStartDrawingSelection = ESelection();
/*
Note: spelling in a selection only, or starting in a mid of a drawing object requires
-further changes elsewhere. (Especially if it should work in sc and sd as well.)
-The code below would only be part of the solution.
+further changes elsewhere. (Especially if it should work in sc and sd as well.)
+The code below would only be part of the solution.
(Keeping it a as a comment for the time being)
ESelection aCurSel( pOLV->GetSelection() );
ESelection aSentenceSel( pOLV->GetEditView().GetEditEngine()->SelectSentence( aCurSel ) );
@@ -331,7 +331,7 @@ The code below would only be part of the solution.
//spell inside of the Writer text
if(!pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn))
{
- // if there is a selection (within body or header/footer text)
+ // if there is a selection (within body or header/footer text)
// then spell/grammar checking should not move outside of it.
if (!m_pSpellState->m_bStartedInSelection)
{
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index ed4588fbbb37..a43317d5c7ee 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/abstract.hrc b/sw/source/ui/dialog/abstract.hrc
index c36d02ee1b1f..a42781e4544e 100644
--- a/sw/source/ui/dialog/abstract.hrc
+++ b/sw/source/ui/dialog/abstract.hrc
@@ -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
@@ -26,11 +26,11 @@
************************************************************************/
#define FL_1 1
-#define FT_PARA 2
-#define NF_PARA 3
-#define FT_LEVEL 4
-#define NF_LEVEL 5
-#define FT_DESC 6
-#define PB_OK 7
+#define FT_PARA 2
+#define NF_PARA 3
+#define FT_LEVEL 4
+#define NF_LEVEL 5
+#define FT_DESC 6
+#define PB_OK 7
#define PB_CANCEL 8
-#define PB_HELP 9
+#define PB_HELP 9
diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index 87f7bfb9174c..ab5a86394bd7 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -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
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 5117f1331a78..d7a50996c30b 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 131884d562eb..28e96386b82f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
const sal_Unicode cDialogExtraDataClose = '}';
const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{";
const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{";
-const USHORT nDialogExtraDataLen = 11; // 12345678901
+const USHORT nDialogExtraDataLen = 11; // 12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
@@ -125,12 +125,12 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
for( USHORT nCnt = 0; nCnt < nBytesRead; ++nCnt )
switch( aBuffer[ nCnt ] )
{
- case 0x0: bNullChar = TRUE; break;
- case 0xA: bLF = TRUE; break;
- case 0xD: bCR = TRUE; break;
+ case 0x0: bNullChar = TRUE; break;
+ case 0xA: bLF = TRUE; break;
+ case 0xD: bCR = TRUE; break;
case 0xC:
case 0x1A:
- case 0x9: break;
+ case 0x9: break;
default:
if( 0x20 > aBuffer[ nCnt ] )
bNoNormalChar = TRUE;
@@ -144,20 +144,20 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
{
aOpt.SetParaFlags( LINEEND_CRLF );
// have to check if of CharSet is type of ANSI
-// aOpt.SetCharSet( CHARSET_ANSI );
+// aOpt.SetCharSet( CHARSET_ANSI );
}
else
{
aOpt.SetParaFlags( LINEEND_CR );
// have to check if CharSet is type of MAC
-// aOpt.SetCharSet( CHARSET_MAC );
+// aOpt.SetCharSet( CHARSET_MAC );
}
}
else if( bLF )
{
aOpt.SetParaFlags( LINEEND_LF );
// have to check if of CharSet is type of ANSI
-// aOpt.SetCharSet( CHARSET_ANSI );
+// aOpt.SetCharSet( CHARSET_ANSI );
}
}
@@ -256,16 +256,16 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aLanguageLB.Hide();
long nY = aFontFT.GetPosPixel().Y() + 1;
- Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY;
+ Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY;
aCRLF_FT.SetPosPixel( aPos );
- aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY;
aCRLF_RB.SetPosPixel( aPos );
- aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY;
aCR_RB.SetPosPixel( aPos );
- aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY;
aLF_RB.SetPosPixel( aPos );
Size aSize = GetSizePixel();
@@ -343,9 +343,9 @@ void SwAsciiFilterDlg::SetCRLF( LineEnd eEnd )
{
switch( eEnd )
{
- case LINEEND_CR: aCR_RB.Check(); break;
- case LINEEND_CRLF: aCRLF_RB.Check(); break;
- case LINEEND_LF: aLF_RB.Check(); break;
+ case LINEEND_CR: aCR_RB.Check(); break;
+ case LINEEND_CRLF: aCRLF_RB.Check(); break;
+ case LINEEND_LF: aLF_RB.Check(); break;
}
}
@@ -380,15 +380,15 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
#ifdef UNX
eEnd = LINEEND_LF;
#else
- eEnd = LINEEND_CRLF; // ANSI
+ eEnd = LINEEND_CRLF; // ANSI
#endif
break;
- case RTL_TEXTENCODING_APPLE_ROMAN: // MAC
+ case RTL_TEXTENCODING_APPLE_ROMAN: // MAC
eEnd = LINEEND_CR;
break;
- case RTL_TEXTENCODING_IBM_850: // DOS
+ case RTL_TEXTENCODING_IBM_850: // DOS
eEnd = LINEEND_CRLF;
break;
@@ -417,7 +417,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
}
bSaveLineStatus = FALSE;
- if( eEnd != (LineEnd)-1 ) // changed?
+ if( eEnd != (LineEnd)-1 ) // changed?
{
if( eOldEnd != eEnd )
SetCRLF( eEnd );
diff --git a/sw/source/ui/dialog/ascfldlg.hrc b/sw/source/ui/dialog/ascfldlg.hrc
index b96cdc39b57a..efbafaa00be3 100644
--- a/sw/source/ui/dialog/ascfldlg.hrc
+++ b/sw/source/ui/dialog/ascfldlg.hrc
@@ -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
@@ -26,7 +26,7 @@
************************************************************************/
#define FL_1 1
-#define FT_CHARSET 2
+#define FT_CHARSET 2
#define LB_CHARSET 3
#define FT_FONT 4
#define LB_FONT 5
@@ -34,11 +34,11 @@
#define LB_LANGUAGE 7
#define FT_CRLF 8
#define RB_CRLF 9
-#define RB_CR 10
-#define RB_LF 11
-#define PB_OK 12
-#define PB_CANCEL 13
-#define PB_HELP 14
-#define STR_SYS_CHARSET 15
+#define RB_CR 10
+#define RB_LF 11
+#define PB_OK 12
+#define PB_CANCEL 13
+#define PB_HELP 14
+#define STR_SYS_CHARSET 15
diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src
index 6ef0ea42b656..f10fed8a871a 100644
--- a/sw/source/ui/dialog/ascfldlg.src
+++ b/sw/source/ui/dialog/ascfldlg.src
@@ -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
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index 26b615bff7b2..f3df744189c9 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -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
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index ed1a89739364..bd2711b5a235 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -2,7 +2,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
@@ -60,26 +60,26 @@ SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet)
SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
- SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet),
+ SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet),
- aTableLbl (this, SW_RES( FT_TABLE )),
- aGrfLbl (this, SW_RES( FT_GRF )),
- aOLELbl (this, SW_RES( FT_OLE )),
- aPageLbl (this, SW_RES( FT_PAGE )),
- aParaLbl (this, SW_RES( FT_PARA )),
- aWordLbl (this, SW_RES( FT_WORD )),
- aCharLbl (this, SW_RES( FT_CHAR )),
+ aTableLbl (this, SW_RES( FT_TABLE )),
+ aGrfLbl (this, SW_RES( FT_GRF )),
+ aOLELbl (this, SW_RES( FT_OLE )),
+ aPageLbl (this, SW_RES( FT_PAGE )),
+ aParaLbl (this, SW_RES( FT_PARA )),
+ aWordLbl (this, SW_RES( FT_WORD )),
+ aCharLbl (this, SW_RES( FT_CHAR )),
aLineLbl (this, SW_RES( FT_LINE )),
aTableNo (this, SW_RES( FT_TABLE_COUNT)),
- aGrfNo (this, SW_RES( FT_GRF_COUNT )),
- aOLENo (this, SW_RES( FT_OLE_COUNT )),
- aPageNo (this, SW_RES( FT_PAGE_COUNT )),
- aParaNo (this, SW_RES( FT_PARA_COUNT )),
- aWordNo (this, SW_RES( FT_WORD_COUNT )),
- aCharNo (this, SW_RES( FT_CHAR_COUNT )),
- aLineNo (this, SW_RES( FT_LINE_COUNT )),
- aUpdatePB (this, SW_RES( PB_PDATE ))
+ aGrfNo (this, SW_RES( FT_GRF_COUNT )),
+ aOLENo (this, SW_RES( FT_OLE_COUNT )),
+ aPageNo (this, SW_RES( FT_PAGE_COUNT )),
+ aParaNo (this, SW_RES( FT_PARA_COUNT )),
+ aWordNo (this, SW_RES( FT_WORD_COUNT )),
+ aCharNo (this, SW_RES( FT_CHAR_COUNT )),
+ aLineNo (this, SW_RES( FT_LINE_COUNT )),
+ aUpdatePB (this, SW_RES( PB_PDATE ))
{
Update();
FreeResource();
@@ -102,7 +102,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
}
/*--------------------------------------------------------------------
- Beschreibung: ItemSet fuellen bei Aenderung
+ Beschreibung: ItemSet fuellen bei Aenderung
--------------------------------------------------------------------*/
@@ -115,7 +115,7 @@ void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
{
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisieren / Setzen der Daten
+ Beschreibung: Aktualisieren / Setzen der Daten
------------------------------------------------------------------------*/
@@ -131,7 +131,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisieren der Statistik
+ Beschreibung: Aktualisieren der Statistik
------------------------------------------------------------------------*/
diff --git a/sw/source/ui/dialog/docstdlg.hrc b/sw/source/ui/dialog/docstdlg.hrc
index 5084ea58dbdb..358b2770ea8f 100644
--- a/sw/source/ui/dialog/docstdlg.hrc
+++ b/sw/source/ui/dialog/docstdlg.hrc
@@ -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
@@ -25,23 +25,23 @@
*
************************************************************************/
-#define FT_TABLE 1
-#define FT_GRF 2
-#define FT_OLE 3
-#define FT_PAGE 4
-#define FT_PARA 5
-#define FT_WORD 6
-#define FT_CHAR 9
-#define FT_TABLE_COUNT 10
-#define FT_GRF_COUNT 11
-#define FT_OLE_COUNT 12
-#define FT_PAGE_COUNT 13
-#define FT_PARA_COUNT 14
-#define FT_WORD_COUNT 15
-#define FT_CHAR_COUNT 16
+#define FT_TABLE 1
+#define FT_GRF 2
+#define FT_OLE 3
+#define FT_PAGE 4
+#define FT_PARA 5
+#define FT_WORD 6
+#define FT_CHAR 9
+#define FT_TABLE_COUNT 10
+#define FT_GRF_COUNT 11
+#define FT_OLE_COUNT 12
+#define FT_PAGE_COUNT 13
+#define FT_PARA_COUNT 14
+#define FT_WORD_COUNT 15
+#define FT_CHAR_COUNT 16
#define FT_LINE 17
#define FT_LINE_COUNT 18
#define PB_PDATE 19
-#define BT_OK 100
+#define BT_OK 100
diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src
index 4384acbe3fe9..5926321d8867 100644
--- a/sw/source/ui/dialog/docstdlg.src
+++ b/sw/source/ui/dialog/docstdlg.src
@@ -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
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 1ed842560ca6..a4fb78a555bc 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -2,7 +2,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,17 +73,17 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
switch( eType )
{
- case MACASSGN_TEXTBAUST: // Textbausteine
+ case MACASSGN_TEXTBAUST: // Textbausteine
// rPg.SetGetRangeLink( &_GetRangeHdl );
aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(),
SW_EVENT_START_INS_GLOSSARY );
- aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(),
+ aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(),
SW_EVENT_END_INS_GLOSSARY);
// damit der neue Handler aktiv wird!
// rPg.Reset( rSet );
break;
case MACASSGN_ALLFRM:
- case MACASSGN_GRAPHIC: // Grafiken
+ case MACASSGN_GRAPHIC: // Grafiken
{
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ERROR) ), String(),
SVX_EVENT_IMAGE_ERROR);
@@ -93,7 +93,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
SVX_EVENT_IMAGE_LOAD);
}
// kein break;
- case MACASSGN_FRMURL: // Frm - URL-Attribute
+ case MACASSGN_FRMURL: // Frm - URL-Attribute
{
if( !bHtmlMode &&
(MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType))
@@ -109,14 +109,14 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
}
}
// kein break;
- case MACASSGN_OLE: // OLE
+ case MACASSGN_OLE: // OLE
{
if( !bHtmlMode )
aItem.AddEvent( String( SW_RES(STR_EVENT_OBJECT_SELECT) ), String(),
SW_EVENT_OBJECT_SELECT );
}
// kein break;
- case MACASSGN_INETFMT: // INetFmt-Attribute
+ case MACASSGN_INETFMT: // INetFmt-Attribute
{
aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), String(),
SFX_EVENT_MOUSEOVER_OBJECT );
@@ -147,7 +147,7 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh,
aSet.Put( AddEvents( MACASSGN_INETFMT ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( pParent, aSet,
+ SfxAbstractDialog* pMacroDlg = pFact->CreateSfxDialog( pParent, aSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(),
SID_EVENTCONFIG );
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index 1b2e65526e80..bb7c46be72cd 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
#include <swunodef.hxx>
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc
index 8f5dcadfbafd..72c85eb080b9 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/ui/dialog/regionsw.hrc
@@ -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
@@ -89,14 +89,14 @@
#define CB_EDIT_IN_READONLY 57
/* global resources */
-#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6)
-#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7)
+#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6)
+#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7)
-#define MD_INS_REGION (RC_REGIONSW_BEGIN+8)
-#define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9)
-#define QB_CONNECT (RC_REGIONSW_BEGIN+10)
-#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
-#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
+#define MD_INS_REGION (RC_REGIONSW_BEGIN+8)
+#define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9)
+#define QB_CONNECT (RC_REGIONSW_BEGIN+10)
+#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
+#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
//ImageList elements
#define BMP_HIDE 1
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index f2af8dca3b0d..e0da42f07f84 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -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
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx
index 51f657d5df13..f6f9756a8574 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index 77132e3e68dc..7ff123857d93 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 9f3cb5a8db18..1319a7d3e453 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -2,7 +2,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
@@ -72,7 +72,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
@@ -371,7 +371,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow()
return (Window*)pDlg;
}
-void AbstractSwFldDlg_Impl::ShowPage( USHORT nId )
+void AbstractSwFldDlg_Impl::ShowPage( USHORT nId )
{
pDlg->ShowPage(nId);
}
@@ -381,14 +381,14 @@ 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 )
{
pDlg->SetAlternativeAccess( xSecond, xThird);
}
-void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept )
+void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept )
{
pDlg->AcceptAll( bAccept);
}
@@ -457,7 +457,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);
}
String AbstractJavaEditDialog_Impl::GetText()
@@ -695,8 +695,8 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(
}
VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Window *pParent,
- SwWrtShell &rSh,
- SfxRequest& rReq,
+ SwWrtShell &rSh,
+ SfxRequest& rReq,
int nResId )
{
Dialog* pDlg=NULL;
@@ -735,7 +735,7 @@ AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg ( Window *pP
return 0;
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId )
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId )
{
Dialog* pDlg=NULL;
switch ( nResId )
@@ -774,7 +774,7 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pP
}
-AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg (
+AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg (
SwView& rView,int nResId, bool bToTable )
{
SwConvertTableDlg* pDlg=NULL;
@@ -869,7 +869,7 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField
}
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;
@@ -914,7 +914,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod ()
SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw,
- const SfxItemSet& rCoreSet ,
+ const SfxItemSet& rCoreSet ,
BYTE nDialogMode,
int nResId,
const String *pCollName,
@@ -987,7 +987,7 @@ AbstarctSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg
return 0;
}
-AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
+AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
int nResId,
BOOL bSetAutoFmt,
const SwTableAutoFmt* pSelFmt )
@@ -1025,7 +1025,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa
return 0;
}
-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 )
@@ -1061,7 +1061,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg ( Window
}
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 )
@@ -1097,7 +1097,7 @@ AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* p
return 0;
}
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId )
{
SfxModalDialog* pDlg=NULL;
switch ( nResId )
@@ -1150,7 +1150,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
return 0;
}
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId,
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId,
Window* pParent, BOOL& rWithPrev ) //add for SwMergeTblDlg
{
Dialog* pDlg=NULL;
@@ -1170,11 +1170,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 )
@@ -1197,9 +1197,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 )
@@ -1217,8 +1217,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;
@@ -1278,7 +1278,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *p
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;
@@ -1296,7 +1296,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;
@@ -1404,7 +1404,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;
@@ -1444,7 +1444,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI
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,
@@ -1464,7 +1464,7 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo
return 0;
}
-AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId,
+AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId,
Window* pParent, SwWrtShell& rWrtSh ) //add for SwEditRegionDlg
{
SwEditRegionDlg* pDlg=NULL;
@@ -1481,7 +1481,7 @@ AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int n
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;
@@ -1498,7 +1498,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,
@@ -1520,7 +1520,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,
@@ -1542,7 +1542,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;
@@ -1570,7 +1570,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 )
{
@@ -1581,7 +1581,7 @@ GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc(
}
return 0;
}
-GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId )
+GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId )
{
switch ( nId )
{
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index f49e713033a7..9811b09f59fa 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -2,7 +2,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
@@ -56,24 +56,24 @@ namespace sw
class DropDownFieldDialog;
}
-#define DECL_ABSTDLG_BASE(Class,DialogClass) \
- DialogClass* pDlg; \
-public: \
- Class( DialogClass* p) \
- : pDlg(p) \
+#define DECL_ABSTDLG_BASE(Class,DialogClass) \
+ DialogClass* pDlg; \
+public: \
+ Class( DialogClass* p) \
+ : pDlg(p) \
{} \
- virtual ~Class(); \
- virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+ virtual ~Class(); \
+ virtual short Execute() ;
+// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
-#define IMPL_ABSTDLG_BASE(Class) \
-Class::~Class() \
+#define IMPL_ABSTDLG_BASE(Class) \
+Class::~Class() \
{ \
- delete pDlg; \
-} \
+ delete pDlg; \
+} \
short Class::Execute() \
{ \
- return pDlg->Execute(); \
+ return pDlg->Execute(); \
}
@@ -87,8 +87,8 @@ class AbstractSwWordCountDialog_Impl : public AbstractSwWordCountDialog
class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
{
DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg)
- virtual BYTE GetLevel() const ;
- virtual BYTE GetPara() const ;
+ virtual BYTE GetLevel() const ;
+ virtual BYTE GetPara() const ;
};
//add for SwInsertAbstractDlg end
@@ -98,7 +98,7 @@ class SfxSingleTabDialog;
class AbstractSfxDialog_Impl :public SfxAbstractDialog
{
DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual const SfxItemSet* GetOutputItemSet() const;
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
};
@@ -129,7 +129,7 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg // add for SwBreakDlg
virtual USHORT GetPageNumber();
};
-class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
+class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
{
DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg)
virtual sal_uInt16 GetSplitMode();
@@ -141,8 +141,8 @@ class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( USHORT nId );
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual void SetCurPageId( USHORT nId );
+ virtual const SfxItemSet* GetOutputItemSet() const;
virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
@@ -184,8 +184,8 @@ class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //ad
class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg
{
DECL_ABSTDLG_BASE(AbstarctSwLabDlg_Impl,SwLabDlg)
- virtual void SetCurPageId( USHORT nId );
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual void SetCurPageId( USHORT nId );
+ virtual const SfxItemSet* GetOutputItemSet() const;
virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
@@ -200,9 +200,9 @@ class AbstarctSwLabDlg_Impl : public AbstarctSwLabDlg
class AbstarctSwSelGlossaryDlg_Impl : public AbstarctSwSelGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstarctSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
- virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline
- virtual USHORT GetSelectedIdx() const; // inline
- virtual void SelectEntryPos(USHORT nIdx); // inline
+ virtual void InsertGlos(const String &rRegion, const String &rGlosName); // inline
+ virtual USHORT GetSelectedIdx() const; // inline
+ virtual void SelectEntryPos(USHORT nIdx); // inline
};
//add for SwSelGlossaryDlg end
@@ -219,19 +219,19 @@ class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
- virtual void SetCurPageId( USHORT nId );
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual void SetCurPageId( USHORT nId );
+ virtual const SfxItemSet* GetOutputItemSet() const;
virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
- virtual void Start( BOOL bShow = TRUE ); //this method from SfxTabDialog
- virtual void ShowPage( USHORT nId );// this method from SfxTabDialog
- virtual void Initialize(SfxChildWinInfo *pInfo);
- virtual void ReInitDlg();
+ virtual void Start( BOOL bShow = TRUE ); //this method from SfxTabDialog
+ virtual void ShowPage( USHORT nId );// this method from SfxTabDialog
+ virtual void Initialize(SfxChildWinInfo *pInfo);
+ virtual void ReInitDlg();
virtual void ActivateDatabasePage();
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
//add for SwFldD end
@@ -239,7 +239,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
{
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
- virtual void SetForbiddenChars( const String& rSet );
+ virtual void SetForbiddenChars( const String& rSet );
virtual void SetAlternativeAccess(
STAR_REFERENCE( container::XNameAccess ) & xSecond,
STAR_REFERENCE( container::XNameAccess ) & xThird );
@@ -249,7 +249,7 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
{
DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
- virtual void AcceptAll( BOOL bAccept );
+ virtual void AcceptAll( BOOL bAccept );
};
//add for SwModalRedlineAcceptDlg end
@@ -258,8 +258,8 @@ class SwGlossaryDlg;
class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
{
DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg)
- virtual String GetCurrGrpName() const;
- virtual String GetCurrShortName() const;
+ virtual String GetCurrGrpName() const;
+ virtual String GetCurrShortName() const;
};
//for SwGlossaryDlg end
@@ -293,9 +293,9 @@ class SwInsertGrfRulerDlg;
class AbstractInsertGrfRulerDlg_Impl : public AbstractInsertGrfRulerDlg
{
DECL_ABSTDLG_BASE(AbstractInsertGrfRulerDlg_Impl,SwInsertGrfRulerDlg)
- virtual String GetGraphicName();
- virtual BOOL IsSimpleLine();
- virtual BOOL HasImages() const ;
+ virtual String GetGraphicName();
+ virtual BOOL IsSimpleLine();
+ virtual BOOL HasImages() const ;
};
//for SwInsertGrfRulerDlg end
@@ -304,7 +304,7 @@ class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
{
DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg)
- virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol,
+ virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol,
SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
SwTableAutoFmt *& prTAFmt );
};
@@ -328,8 +328,8 @@ class SwMailMergeDlg;
class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
- virtual USHORT GetMergeType() ;
- virtual const ::rtl::OUString& GetSaveFilter() const;
+ virtual USHORT GetMergeType() ;
+ virtual const ::rtl::OUString& GetSaveFilter() const;
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
};
@@ -356,11 +356,11 @@ class SwMultiTOXTabDialog;
class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
{
DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog)
- virtual SwForm* GetForm(CurTOXType eType);
- virtual CurTOXType GetCurrentTOXType() const ;
- virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes);
+ virtual SwForm* GetForm(CurTOXType eType);
+ virtual CurTOXType GetCurrentTOXType() const ;
+ virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes);
//from SfxTabDialog
- virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual const SfxItemSet* GetOutputItemSet() const;
};
//for SwMultiTOXTabDialog end
@@ -387,7 +387,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg)
virtual void ReInitDlg(SwWrtShell& rWrtShell);
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
//for SwIndexMarkFloatDlg end
@@ -397,7 +397,7 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
{
DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg)
virtual void ReInitDlg(SwWrtShell& rWrtShell);
- virtual Window * GetWindow(); //this method is added for return a Window type pointer
+ virtual Window * GetWindow(); //this method is added for return a Window type pointer
};
//for SwAuthMarkFloatDlg end
@@ -412,7 +412,7 @@ public:
AbstractMailMergeWizard_Impl( SwMailMergeWizard* p )
: pDlg(p)
{}
- virtual ~AbstractMailMergeWizard_Impl();
+ virtual ~AbstractMailMergeWizard_Impl();
virtual void StartExecuteModal( const Link& rEndDialogHdl );
virtual long GetResult();
@@ -428,18 +428,18 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
{
public:
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+ virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
);
virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window* pParent);
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg( Window* pParent,int nResId );
- virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
+ virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream, int nResId ); //add for SwAsciiFilterDlg
virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
- virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg
- virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg
+ virtual AbstractSwBreakDlg * CreateSwBreakDlg ( Window *pParent, SwWrtShell &rSh,int nResId ); // add for SwBreakDlg
+ virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ); //add for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg
const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE);
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView, int nResId, bool bToTable ); //add for SwConvertTableDlg
@@ -466,9 +466,9 @@ public:
const String *pCollName = 0,
BOOL bDraw = FALSE,
UINT16 nDefPage = 0);
-
+
virtual AbstarctSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ); //add for SwSelGlossaryDlg
- virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg
+ virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for SwTableHeightDlg SwSortDlg
virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); //add for SwSplitTblDlg
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
@@ -482,104 +482,104 @@ public:
virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg
virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
+ virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
STAR_REFERENCE( container::XNamed ) & xNamed,
STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId );
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ); //add for SwModalRedlineAcceptDlg
- virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
+ virtual VclAbstractDialog* CreateSwVclDialog( int nResId,
Window* pParent, BOOL& rWithPrev ); //add for SwMergeTblDlg
- virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
+ virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId,
SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bNewFrm = TRUE,
- USHORT nResType = DLG_FRM_STD,
- BOOL bFmt = FALSE,
- UINT16 nDefPage = 0,
- const String* pFmtStr = 0); //add for SwFrmDlg
- virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+ BOOL bNewFrm = TRUE,
+ USHORT nResType = DLG_FRM_STD,
+ BOOL bFmt = FALSE,
+ UINT16 nDefPage = 0,
+ const String* pFmtStr = 0); //add for SwFrmDlg
+ virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
Window* pParent,
SfxStyleSheetBase& rBase,
USHORT nRegion,
- BOOL bColumn = FALSE,
- SwWrtShell* pActShell = 0,
- BOOL bNew = FALSE ); //add for SwTemplateDlg
- virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
- SfxViewFrame* pViewFrame,
- SwGlossaryHdl* pGlosHdl,
+ BOOL bColumn = FALSE,
+ SwWrtShell* pActShell = 0,
+ BOOL bNew = FALSE ); //add for SwTemplateDlg
+ virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId,
+ SfxViewFrame* pViewFrame,
+ SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
- virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
+ virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
Window *pParent, SwWrtShell &rSh,
SwField* pField, BOOL bNextButton = FALSE ); //add for SwFldInputDlg
- virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
+ virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE); //add for SwInsFootNoteDlg
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
- virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
+ virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, BOOL bCol = FALSE ); //add for SwInsRowColDlg, SwLineNumberingDlg
- virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
+ virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId,
Window * pParent ); //add for SwInsertGrfRulerDlg
- virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId,
+ virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId,
SwView& rView ); //add for SwInsTableDlg
- virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
+ virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
Window* pParent, SwWrtShell* pWrtSh ); //add for SwJavaEditDialog
- virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
+ virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell& rSh,
const String& rSourceName,
const String& rTblName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); //add for SwMailMergeDlg
- virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId,
+ virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg( int nResId,
Window* pParent ); //add for SwMailMergeCreateFromDlg
- virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId,
+ virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg( int nResId,
Window* pParent ); //add for SwMailMergeFieldConnectionsDlg
- virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
+ virtual VclAbstractDialog* CreateMultiTOXMarkDlg( int nResId,
Window* pParent, SwTOXMgr &rTOXMgr ); //add for SwMultiTOXMarkDlg
- virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
+ virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId,
Window* pParent,
const SfxItemSet* pSwItemSet,
SwWrtShell &); //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
- virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId,
+ virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX,
BOOL bGlobal = FALSE); //add for SwMultiTOXTabDialog
- virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId,
+ virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId,
Window* pParent, SwWrtShell& rWrtSh ); //add for SwEditRegionDlg
- virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId,
+ virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId,
Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); //add for SwInsertSectionTabDialog
- virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
- virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
+ virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( int nResId,
SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg
- virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId,
+ virtual VclAbstractDialog * CreateIndexMarkModalDlg( int nResId,
Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); //add for SwIndexMarkModalDlg
virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
//add for static func in SwGlossaryDlg
- virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId );
- virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId );
+ virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId );
+ virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId );
// For TabPage
- virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
+ virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
- virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
+ virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
};
struct SwDialogsResMgr
{
- static ResMgr* GetResMgr();
+ static ResMgr* GetResMgr();
};
#endif
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 0c2bdd4c3a56..a60e1f7dfcd3 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/swwrtshitem.cxx b/sw/source/ui/dialog/swwrtshitem.cxx
index 9934daa98057..6975975c3ce3 100644
--- a/sw/source/ui/dialog/swwrtshitem.cxx
+++ b/sw/source/ui/dialog/swwrtshitem.cxx
@@ -2,7 +2,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
@@ -35,13 +35,13 @@ SwWrtShellItem::SwWrtShellItem( USHORT _nWhich, SwWrtShell* pSh )
{
}
-SwWrtShellItem::SwWrtShellItem( const SwWrtShellItem& rItem) :
+SwWrtShellItem::SwWrtShellItem( const SwWrtShellItem& rItem) :
SfxPoolItem( rItem.Which() ),
pWrtSh( rItem.pWrtSh )
{
}
-int SwWrtShellItem::operator==( const SfxPoolItem& rItem) const
+int SwWrtShellItem::operator==( const SfxPoolItem& rItem) const
{
return ((SwWrtShellItem&)rItem).pWrtSh == pWrtSh;
}
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 0b820b3b1c1c..3505d4a46e74 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -2,7 +2,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
@@ -55,13 +55,13 @@
#include <IMark.hxx>
#include <section.hxx>
#include <docary.hxx>
-#include <doc.hxx> // fuers SwSectionFmt-Array
+#include <doc.hxx> // fuers SwSectionFmt-Array
#include <basesh.hxx>
#include <wdocsh.hxx>
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
#include <swunodef.hxx>
@@ -143,7 +143,7 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pA
ppMark != pMarkAccess->getMarksEnd();
ppMark++)
{
- const ::sw::mark::IMark* pBkmk = ppMark->get();
+ const ::sw::mark::IMark* pBkmk = ppMark->get();
if( pBkmk->IsExpanded() )
rSubRegions.InsertEntry( pBkmk->GetName() );
}
@@ -257,7 +257,7 @@ void SectRepr::SetFile( const String& rFile )
sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeperator );
sNewFile += sfx2::cTokenSeperator;
- sNewFile += sSub;
+ sNewFile += sSub;
}
m_SectionData.SetLinkFileName( sNewFile );
@@ -368,7 +368,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aProtectFL ( this, SW_RES( FL_PROTECT ) ),
aProtectCB ( this, SW_RES( CB_PROTECT ) ),
- aPasswdCB ( this, SW_RES( CB_PASSWD ) ),
+ aPasswdCB ( this, SW_RES( CB_PASSWD ) ),
aPasswdPB ( this, SW_RES( PB_PASSWD ) ),
aHideFL ( this, SW_RES( FL_HIDE ) ),
@@ -382,8 +382,8 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aOK ( this, SW_RES( PB_OK ) ),
aCancel ( this, SW_RES( PB_CANCEL ) ),
- aOptionsPB ( this, SW_RES( PB_OPTIONS ) ),
- aDismiss ( this, SW_RES( CB_DISMISS ) ),
+ aOptionsPB ( this, SW_RES( PB_OPTIONS ) ),
+ aDismiss ( this, SW_RES( CB_DISMISS ) ),
aHelp ( this, SW_RES( PB_HELP ) ),
aImageIL ( SW_RES(IL_BITMAPS)),
@@ -399,21 +399,21 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() );
- aTree.SetSelectHdl ( LINK( this, SwEditRegionDlg, GetFirstEntryHdl));
- aTree.SetDeselectHdl ( LINK( this, SwEditRegionDlg, DeselectHdl));
- aCurName.SetModifyHdl ( LINK( this, SwEditRegionDlg, NameEditHdl));
+ aTree.SetSelectHdl ( LINK( this, SwEditRegionDlg, GetFirstEntryHdl));
+ aTree.SetDeselectHdl ( LINK( this, SwEditRegionDlg, DeselectHdl));
+ aCurName.SetModifyHdl ( LINK( this, SwEditRegionDlg, NameEditHdl));
aConditionED.SetModifyHdl( LINK( this, SwEditRegionDlg, ConditionEditHdl));
- aOK.SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl));
- aPasswdCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl));
+ aOK.SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl));
+ aPasswdCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl));
aPasswdPB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl));
- aHideCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeHideHdl));
+ aHideCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeHideHdl));
// #114856# edit in readonly sections
aEditInReadonlyCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeEditInReadonlyHdl));
aOptionsPB.Show();
- aOptionsPB.SetClickHdl ( LINK( this, SwEditRegionDlg, OptionsHdl));
- aProtectCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeProtectHdl));
- aDismiss.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl));
+ aOptionsPB.SetClickHdl ( LINK( this, SwEditRegionDlg, OptionsHdl));
+ aProtectCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeProtectHdl));
+ aDismiss.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl));
aFileCB.SetClickHdl ( LINK( this, SwEditRegionDlg, UseFileHdl ));
aFilePB.SetClickHdl ( LINK( this, SwEditRegionDlg, FileSearchHdl ));
aFileNameED.SetModifyHdl( LINK( this, SwEditRegionDlg, FileNameHdl ));
@@ -430,14 +430,14 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
{
aConditionFT .Hide();
aConditionED .Hide();
- aPasswdCB .Hide();
- aHideCB .Hide();
+ aPasswdCB .Hide();
+ aHideCB .Hide();
aDDECB .Hide();
aDDECommandFT .Hide();
}
- aDDECB.SetClickHdl ( LINK( this, SwEditRegionDlg, DDEHdl ));
+ aDDECB.SetClickHdl ( LINK( this, SwEditRegionDlg, DDEHdl ));
pCurrSect = rSh.GetCurrSection();
RecurseList( 0, 0 );
@@ -614,7 +614,7 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName)
}
/*---------------------------------------------------------------------
- Beschreibung: Selektierte Eintrag in der TreeListBox wird im
+ Beschreibung: Selektierte Eintrag in der TreeListBox wird im
Edit-Fenster angezeigt
Bei Multiselektion werden einige Controls disabled
---------------------------------------------------------------------*/
@@ -622,12 +622,12 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
{
bDontCheckPasswd = sal_True;
SvLBoxEntry* pEntry=pBox->FirstSelected();
- aHideCB .Enable(TRUE);
+ aHideCB .Enable(TRUE);
// #114856# edit in readonly sections
aEditInReadonlyCB.Enable(TRUE);
aProtectCB .Enable(TRUE);
- aFileCB .Enable(TRUE);
+ aFileCB .Enable(TRUE);
UNO_NMSPC::Sequence <sal_Int8> aCurPasswd;
if( 1 < pBox->GetSelectionCount() )
{
@@ -648,9 +648,9 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
bool bHidden = true;
bool bProtect = true;
String sCondition;
- BOOL bFirst = TRUE;
- BOOL bFileValid = TRUE;
- BOOL bFile = TRUE;
+ BOOL bFirst = TRUE;
+ BOOL bFileValid = TRUE;
+ BOOL bFile = TRUE;
BOOL bPasswdValid = TRUE;
while( pEntry )
@@ -702,20 +702,20 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
aConditionED.SetText(sCondition);
else
{
-// aConditionED.SetText(aEmptyStr);
+// aConditionED.SetText(aEmptyStr);
aConditionFT.Enable(FALSE);
aConditionED.Enable(FALSE);
}
aFilePB.Enable(FALSE);
- aFileNameFT .Enable(FALSE);
- aFileNameED .Enable(FALSE);
+ aFileNameFT .Enable(FALSE);
+ aFileNameED .Enable(FALSE);
aSubRegionFT.Enable(FALSE);
aSubRegionED.Enable(FALSE);
// aNameFT .Enable(FALSE);
- aCurName .Enable(FALSE);
- aOptionsPB .Enable(FALSE);
- aDDECB .Enable(FALSE);
+ aCurName .Enable(FALSE);
+ aOptionsPB .Enable(FALSE);
+ aDDECB .Enable(FALSE);
aDDECommandFT .Enable(FALSE);
BOOL bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK;
aPasswdCB.Enable(bPasswdEnabled);
@@ -734,8 +734,8 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
else if (pEntry )
{
// aNameFT .Enable(TRUE);
- aCurName .Enable(TRUE);
- aOptionsPB .Enable(TRUE);
+ aCurName .Enable(TRUE);
+ aOptionsPB .Enable(TRUE);
SectRepr* pRepr=(SectRepr*) pEntry->GetUserData();
SwSectionData const& rData( pRepr->GetSectionData() );
aConditionED.SetText(rData.GetCondition());
@@ -792,8 +792,8 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
{
if( !pBox->GetSelectionCount() )
{
- aHideCB .Enable(FALSE);
- aProtectCB .Enable(FALSE);
+ aHideCB .Enable(FALSE);
+ aProtectCB .Enable(FALSE);
// #114856# edit in readonly sections
aEditInReadonlyCB.Enable(FALSE);
@@ -801,15 +801,15 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
aPasswdCB .Enable(FALSE);
aConditionFT .Enable(FALSE);
aConditionED.Enable(FALSE);
- aFileCB .Enable(FALSE);
- aFilePB .Enable(FALSE);
+ aFileCB .Enable(FALSE);
+ aFilePB .Enable(FALSE);
aFileNameFT .Enable(FALSE);
aFileNameED .Enable(FALSE);
aSubRegionFT .Enable(FALSE);
aSubRegionED .Enable(FALSE);
// aNameFT .Enable(FALSE);
- aCurName .Enable(FALSE);
- aDDECB .Enable(FALSE);
+ aCurName .Enable(FALSE);
+ aDDECB .Enable(FALSE);
aDDECommandFT .Enable(FALSE);
UseFileHdl(&aFileCB);
@@ -819,7 +819,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Im OkHdl werden die veraenderten Einstellungen
+ Beschreibung: Im OkHdl werden die veraenderten Einstellungen
uebernommen und aufgehobene Bereiche geloescht
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
@@ -827,10 +827,10 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
// JP 13.03.96:
// temp. Array weil sich waehrend des aendern eines Bereiches die
// Position innerhalb des "Core-Arrays" verschieben kann:
- // - bei gelinkten Bereichen, wenn sie weitere SubBereiche haben oder
- // neu erhalten.
+ // - bei gelinkten Bereichen, wenn sie weitere SubBereiche haben oder
+ // neu erhalten.
// JP 30.05.97: StartUndo darf natuerlich auch erst nach dem Kopieren
- // der Formate erfolgen (ClearRedo!)
+ // der Formate erfolgen (ClearRedo!)
const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections();
SwSectionFmts aOrigArray( 0, 5 );
@@ -893,7 +893,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
aOrigArray.Remove( 0, aOrigArray.Count() );
//JP 21.05.97: EndDialog muss vor Ende der EndAction gerufen werden,
- // sonst kann es ScrollFehler geben.
+ // sonst kann es ScrollFehler geben.
EndDialog(RET_OK);
rSh.EndUndo();
@@ -1032,18 +1032,18 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
{
aConditionFT. Enable(FALSE);
aConditionED. Enable(FALSE);
- aDismiss. Enable(FALSE);
- aCurName. Enable(FALSE);
- aProtectCB. Enable(FALSE);
- aPasswdCB. Enable(FALSE);
- aHideCB. Enable(FALSE);
+ aDismiss. Enable(FALSE);
+ aCurName. Enable(FALSE);
+ aProtectCB. Enable(FALSE);
+ aPasswdCB. Enable(FALSE);
+ aHideCB. Enable(FALSE);
// #114856# edit in readonly sections
aEditInReadonlyCB.Enable(FALSE);
aEditInReadonlyCB.SetState(STATE_NOCHECK);
aProtectCB. SetState(STATE_NOCHECK);
- aPasswdCB. Check(FALSE);
- aHideCB. SetState(STATE_NOCHECK);
- aFileCB. Check(FALSE);
+ aPasswdCB. Check(FALSE);
+ aHideCB. SetState(STATE_NOCHECK);
+ aFileCB. Check(FALSE);
// otherwise the focus would be on HelpButton
aOK.GrabFocus();
UseFileHdl(&aFileCB);
@@ -1239,7 +1239,7 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG )
}
/*---------------------------------------------------------------------
- Beschreibung: Uebernahme des Dateinamen oder
+ Beschreibung: Uebernahme des Dateinamen oder
des verknuepften Bereichs
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
@@ -1394,7 +1394,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Aktueller Bereichsname wird sofort beim editieren
+ Beschreibung: Aktueller Bereichsname wird sofort beim editieren
in die TreeListBox eingetragen, mit leerem String
kein Ok()
---------------------------------------------------------------------*/
@@ -1406,7 +1406,7 @@ IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG )
OSL_ENSURE(pEntry,"no entry found");
if (pEntry)
{
- String aName = aCurName.GetText();
+ String aName = aCurName.GetText();
aTree.SetEntryText(pEntry,aName);
SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
pRepr->GetSectionData().SetSectionName(aName);
@@ -1470,8 +1470,8 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
{
if( !bSubRegionsFilled && pEvent && pEvent->GetId() == VCLEVENT_DROPDOWN_PRE_OPEN )
{
- //if necessary fill the names bookmarks/sections/tables now
-
+ //if necessary fill the names bookmarks/sections/tables now
+
rtl::OUString sFileName = aFileNameED.GetText();
if(sFileName.getLength())
{
@@ -1486,11 +1486,11 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
SfxMedium aMedium( sFileName, STREAM_STD_READ );
sFileName = aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
::lcl_ReadSections( aMedium, aSubRegionED );
- }
+ }
else
lcl_FillSubRegionList( rSh, aSubRegionED, 0 );
bSubRegionsFilled = true;
- }
+ }
return 0;
}
@@ -1501,7 +1501,7 @@ Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContras
}
/*--------------------------------------------------------------------
- Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen
+ Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen
--------------------------------------------------------------------*/
static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
{
@@ -1534,7 +1534,7 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
AddTabPage(TP_INSERT_SECTION, SwInsertSectionTabPage::Create, 0);
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
AddTabPage(TP_SECTION_FTNENDNOTES, SwSectionFtnEndTabPage::Create, 0);
AddTabPage(TP_SECTION_INDENTS, SwSectionIndentTabPage::Create, 0);
@@ -1583,7 +1583,7 @@ void SwInsertSectionTabDialog::SetSectionData(SwSectionData const& rSect)
m_pSectionData.reset( new SwSectionData(rSect) );
}
-short SwInsertSectionTabDialog::Ok()
+short SwInsertSectionTabDialog::Ok()
{
short nRet = SfxTabDialog::Ok();
OSL_ENSURE(m_pSectionData.get(),
@@ -1657,7 +1657,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
{
FreeResource();
- aProtectCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl));
+ aProtectCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl));
aPasswdCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
aPasswdPB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
aHideCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeHideHdl));
@@ -1665,8 +1665,8 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
aEditInReadonlyCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeEditInReadonlyHdl));
aFileCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, UseFileHdl ));
aFilePB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, FileSearchHdl ));
- aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl));
- aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl ));
+ aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl));
+ aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(&aProtectCB);
aSubRegionED.EnableAutocomplete( sal_True, sal_True );
}
@@ -1676,14 +1676,14 @@ SwInsertSectionTabPage::~SwInsertSectionTabPage()
delete m_pDocInserter;
}
-void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
+void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
{
m_pWrtSh = &rSh;
BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell());
if(bWeb)
{
- aHideCB .Hide();
+ aHideCB .Hide();
aConditionED .Hide();
aConditionFT .Hide();
aDDECB .Hide();
@@ -1778,7 +1778,7 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet& )
{
}
-SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
+SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwInsertSectionTabPage(pParent, rAttrSet);
@@ -1838,7 +1838,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
IMPL_LINK_INLINE_START( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG )
{
- String aName=aCurName.GetText();
+ String aName=aCurName.GetText();
GetTabDialog()->GetOKButton().Enable(aName.Len() && aCurName.GetEntryPos( aName ) == USHRT_MAX);
return 0;
}
@@ -1863,7 +1863,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
aDDECB.Enable(bFile);
if( bFile )
{
-// aFileNameED.SetText( aFileName );
+// aFileNameED.SetText( aFileName );
aFileNameED.GrabFocus();
aProtectCB.Check( TRUE );
}
@@ -1871,7 +1871,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
{
aDDECB.Check(FALSE);
DDEHdl(&aDDECB);
-// aFileNameED.SetText(aEmptyStr);
+// aFileNameED.SetText(aEmptyStr);
}
return 0;
}
@@ -1940,14 +1940,14 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
// --------------------------------------------------------------
// Numerierungsformat Umsetzung:
-// ListBox - Format - Enum-Wert
-// 0 - A, B, C, ... - 0
-// 1 - a, b, c, ... - 1
-// 2 - I, II, III, ... - 2
-// 3 - i, ii, iii, ... - 3
-// 4 - 1, 2, 3, ... - 4
-// 5 - A, .., AA, .., - 9
-// 6 - a, .., aa, .., - 10
+// ListBox - Format - Enum-Wert
+// 0 - A, B, C, ... - 0
+// 1 - a, b, c, ... - 1
+// 2 - I, II, III, ... - 2
+// 3 - i, ii, iii, ... - 3
+// 4 - 1, 2, 3, ... - 4
+// 5 - A, .., AA, .., - 9
+// 6 - a, .., aa, .., - 10
inline USHORT GetNumPos( USHORT n )
{
@@ -1973,8 +1973,8 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
aFtnPrefixFT ( this, SW_RES( FT_FTN_PREFIX )),
aFtnPrefixED ( this, SW_RES( ED_FTN_PREFIX )),
aFtnNumViewBox ( this, SW_RES( LB_FTN_NUMVIEW ), INSERT_NUM_EXTENDED_TYPES),
- aFtnSuffixFT ( this, SW_RES( FT_FTN_SUFFIX )),
- aFtnSuffixED ( this, SW_RES( ED_FTN_SUFFIX )),
+ aFtnSuffixFT ( this, SW_RES( FT_FTN_SUFFIX )),
+ aFtnSuffixED ( this, SW_RES( ED_FTN_SUFFIX )),
aEndFL ( this, SW_RES( FL_END ) ),
aEndNtAtTextEndCB ( this, SW_RES( CB_END_AT_TXTEND )),
@@ -1987,8 +1987,8 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
aEndPrefixFT ( this, SW_RES( FT_END_PREFIX )),
aEndPrefixED ( this, SW_RES( ED_END_PREFIX )),
aEndNumViewBox ( this, SW_RES( LB_END_NUMVIEW ), INSERT_NUM_EXTENDED_TYPES),
- aEndSuffixFT ( this, SW_RES( FT_END_SUFFIX )),
- aEndSuffixED ( this, SW_RES( ED_END_SUFFIX ))
+ aEndSuffixFT ( this, SW_RES( FT_END_SUFFIX )),
+ aEndSuffixED ( this, SW_RES( ED_END_SUFFIX ))
{
FreeResource();
@@ -2144,7 +2144,7 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet )
RES_END_AT_TXTEND, FALSE ));
}
-SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
+SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwSectionFtnEndTabPage(pParent, rAttrSet);
@@ -2214,7 +2214,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
FreeResource();
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
AddTabPage(TP_SECTION_FTNENDNOTES, SwSectionFtnEndTabPage::Create, 0);
AddTabPage(TP_SECTION_INDENTS, SwSectionIndentTabPage::Create, 0);
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 4a98a4e19294..808e16985948 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dialog/wordcountdialog.hrc b/sw/source/ui/dialog/wordcountdialog.hrc
index af6f3a79c76c..f8b64c86a09d 100644
--- a/sw/source/ui/dialog/wordcountdialog.hrc
+++ b/sw/source/ui/dialog/wordcountdialog.hrc
@@ -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
diff --git a/sw/source/ui/dialog/wordcountdialog.src b/sw/source/ui/dialog/wordcountdialog.src
index 4b10206d3e76..f73cac24062f 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -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
@@ -69,7 +69,7 @@ ModalDialog DLG_WORDCOUNT
FixedText FT_CURRENTCHARACTEREXCLUDINGSPACES
{
Pos = MAP_APPFONT ( 12 , 38 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = "Characters excluding spaces:";
};
FixedText FI_CURRENTCHARACTEREXCLUDINGSPACES
@@ -111,7 +111,7 @@ ModalDialog DLG_WORDCOUNT
FixedText FT_DOCCHARACTEREXCLUDINGSPACES
{
Pos = MAP_APPFONT ( 12 , 87 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = "Characters excluding spaces:";
};
FixedText FI_DOCCHARACTEREXCLUDINGSPACES
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index f92ea43681d8..2afd19c92bd4 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -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
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 5f1e3795cdc6..ba5de0746ecf 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -2,7 +2,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
@@ -55,9 +55,9 @@
#include <gloshdl.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <expfld.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
+#include <initui.hxx> // fuer ::GetGlossaries()
#include <gloslst.hxx>
#include <swdtflvr.hxx>
#include <docsh.hxx>
@@ -92,7 +92,7 @@ SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr )
SV_IMPL_REF( SwDocShell )
/*------------------------------------------------------------------------
- Beschreibung: Dialog fuer Bearbeiten Vorlagen
+ Beschreibung: Dialog fuer Bearbeiten Vorlagen
------------------------------------------------------------------------*/
void SwGlossaryHdl::GlossaryDlg()
{
@@ -121,7 +121,7 @@ void SwGlossaryHdl::GlossaryDlg()
}
/*------------------------------------------------------------------------
- Beschreibung: Setzen der aktuellen Gruppe; falls aus dem Dialog
+ Beschreibung: Setzen der aktuellen Gruppe; falls aus dem Dialog
gerufen, wird die Gruppe temp. erzeugt fuer einen
schnelleren Zugriff
------------------------------------------------------------------------*/
@@ -158,11 +158,11 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, BOOL bApi, BOOL bAlwaysCreat
sGroup.GetToken(0, GLOS_DELIM) == sCurBase)
bPathEqual = TRUE;
}
-// const String aMac_Tmp(pCurGrp->GetName());
+// const String aMac_Tmp(pCurGrp->GetName());
// Beim Pfadwechsel kann man sich auf den Namen nicht verlassen
if(!bAlwaysCreateNew &&
bPathEqual
-// aMac_Tmp == sGroup
+// aMac_Tmp == sGroup
)
return;
}
@@ -291,7 +291,7 @@ BOOL SwGlossaryHdl::DelGroup(const String &rGrpName)
}
/*------------------------------------------------------------------------
- Beschreibung: Anzahl Textbausteine erfragen
+ Beschreibung: Anzahl Textbausteine erfragen
------------------------------------------------------------------------*/
USHORT SwGlossaryHdl::GetGlossaryCnt()
{
@@ -304,14 +304,14 @@ String SwGlossaryHdl::GetGlossaryName( USHORT nId )
return pCurGrp->GetLongName( nId );
}
-String SwGlossaryHdl::GetGlossaryShortName(USHORT nId)
+String SwGlossaryHdl::GetGlossaryShortName(USHORT nId)
{
OSL_ENSURE(nId < GetGlossaryCnt(), "Textbausteinarray ueberindiziert.");
return pCurGrp->GetShortName( nId );
}
/*------------------------------------------------------------------------
- Beschreibung: Kurzname erfragen
+ Beschreibung: Kurzname erfragen
------------------------------------------------------------------------*/
String SwGlossaryHdl::GetGlossaryShortName(const String &rName)
{
@@ -330,7 +330,7 @@ String SwGlossaryHdl::GetGlossaryShortName(const String &rName)
}
/*------------------------------------------------------------------------
- Beschreibung: Kuerzel fuer Textbaustein bereits verwendet?
+ Beschreibung: Kuerzel fuer Textbaustein bereits verwendet?
------------------------------------------------------------------------*/
BOOL SwGlossaryHdl::HasShortName(const String& rShortName) const
{
@@ -362,7 +362,7 @@ BOOL SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
}
/*------------------------------------------------------------------------
- Beschreibung: Erzeugen eines Textbausteines
+ Beschreibung: Erzeugen eines Textbausteines
------------------------------------------------------------------------*/
BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName,
BOOL bCreateGroup, BOOL bNoAttr)
@@ -397,7 +397,7 @@ BOOL SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName,
return BOOL( nSuccess != (USHORT) -1 );
}
/*------------------------------------------------------------------------
- Beschreibung: Loeschen eines Textbausteines
+ Beschreibung: Loeschen eines Textbausteines
------------------------------------------------------------------------*/
BOOL SwGlossaryHdl::DelGlossary(const String &rShortName)
{
@@ -463,7 +463,7 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
String aShortName( rShortName );
BOOL bCancel = FALSE;
// search for text block
- //#b6633427# - don't prefer current group depending on configuration setting
+ //#b6633427# - don't prefer current group depending on configuration setting
const SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get();
USHORT nFound = !pCfg->IsSearchInAllCategories() ? pGlossary->GetIndex( aShortName ) : -1;
// if not found then search in all groups
@@ -642,7 +642,7 @@ BOOL SwGlossaryHdl::InsertGlossary(const String &rName)
}
/*------------------------------------------------------------------------
- Beschreibung: Macro setzen / erfragen
+ Beschreibung: Macro setzen / erfragen
------------------------------------------------------------------------*/
void SwGlossaryHdl::SetMacros(const String& rShortName,
const SvxMacro* pStart,
@@ -695,7 +695,7 @@ void SwGlossaryHdl::GetMacros( const String &rShortName,
/*------------------------------------------------------------------------
- Beschreibung: ctor, dtor
+ Beschreibung: ctor, dtor
------------------------------------------------------------------------*/
SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh)
: rStatGlossaries( *::GetGlossaries() ),
@@ -713,7 +713,7 @@ SwGlossaryHdl::~SwGlossaryHdl()
}
/*------------------------------------------------------------------------
- Beschreibung: Umbenennen eines Textbausteines
+ Beschreibung: Umbenennen eines Textbausteines
------------------------------------------------------------------------*/
BOOL SwGlossaryHdl::Rename(const String& rOldShort, const String& rNewShortName,
const String& rNewName )
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index dbfb25f6103b..ba011eccd10a 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/dochdl/selglos.hrc b/sw/source/ui/dochdl/selglos.hrc
index 175ee09abe1b..f42c5f263370 100644
--- a/sw/source/ui/dochdl/selglos.hrc
+++ b/sw/source/ui/dochdl/selglos.hrc
@@ -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
@@ -24,8 +24,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_HELP 102
-#define LB_GLOS 1
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_HELP 102
+#define LB_GLOS 1
#define FL_GLOS 2
diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src
index 1464b77bd7fc..81162518c1eb 100644
--- a/sw/source/ui/dochdl/selglos.src
+++ b/sw/source/ui/dochdl/selglos.src
@@ -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
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b69102196b18..f9812969c7a7 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -102,8 +102,8 @@
#include <view.hxx>
#include <docsh.hxx>
#include <wdocsh.hxx>
-#include <fldbas.hxx> //DDE
-#include <swundo.hxx> // fuer Undo-Ids
+#include <fldbas.hxx> //DDE
+#include <swundo.hxx> // fuer Undo-Ids
#include <pam.hxx>
#include <ndole.hxx>
#include <swwait.hxx>
@@ -144,14 +144,14 @@ extern BOOL bDDINetAttr;
extern BOOL bExecuteDrag;
-#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
+#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
-#define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001
+#define SWTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001
#define SWTRANSFER_OBJECTTYPE_HTML 0x00000002
-#define SWTRANSFER_OBJECTTYPE_RTF 0x00000004
-#define SWTRANSFER_OBJECTTYPE_STRING 0x00000008
-#define SWTRANSFER_OBJECTTYPE_SWOLE 0x00000010
-#define SWTRANSFER_OBJECTTYPE_DDE 0x00000020
+#define SWTRANSFER_OBJECTTYPE_RTF 0x00000004
+#define SWTRANSFER_OBJECTTYPE_STRING 0x00000008
+#define SWTRANSFER_OBJECTTYPE_SWOLE 0x00000010
+#define SWTRANSFER_OBJECTTYPE_DDE 0x00000020
#define SWTRANSFER_GRAPHIC_INSERTED 0x00000040
@@ -162,7 +162,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::datatransfer;
using namespace nsTransferBufferType;
-#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
+#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
//---------------------------------------------
// this struct conforms to the Microsoft
@@ -284,7 +284,7 @@ SwTransferable::~SwTransferable()
delete pClpDocFac;
//JP 22.04.95: erst schliessen, dann kann die Ref. auch gecleared werden,
- // so das die DocShell auch tatsaechlich geloescht wird!
+ // so das die DocShell auch tatsaechlich geloescht wird!
if( aDocShellRef.Is() )
{
SfxObjectShell * pObj = aDocShellRef;
@@ -398,7 +398,7 @@ void SwTransferable::RemoveDDELinkFormat( const Window& rWin )
sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
{
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
// we can only fullfil the request if
// 1) we have data for this format
@@ -434,7 +434,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) );
- pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
+ pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
pWrtShell->Copy( pTmpDoc );
// es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
@@ -475,7 +475,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
}
}
- sal_Bool bOK = sal_False;
+ sal_Bool bOK = sal_False;
if( TRNSFR_OLE == eBufferType )
{
//TODO/MBA: testing - is this the "single OLE object" case?!
@@ -582,7 +582,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
break;
case SOT_FORMATSTR_ID_EMBED_SOURCE:
-// default:
+// default:
if( !aDocShellRef.Is() )
{
SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
@@ -737,7 +737,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
SwWriter aWrt( *xStream, *pDoc );
if( !IsError( aWrt.Write( xWrt )) )
{
- *xStream << '\0'; // terminate with a zero
+ *xStream << '\0'; // terminate with a zero
xStream->Commit();
bRet = sal_True;
}
@@ -841,7 +841,7 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut )
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
pTmpDoc->SetRefForDocShell( boost::addressof(aDocShellRef) );
- pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
+ pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
pWrtShell->Copy( pTmpDoc );
{
@@ -1020,7 +1020,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
SwPaM aPam( *pCNd );
pCDoc->SetRefForDocShell( boost::addressof(aDocShellRef) );
- pCDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
+ pCDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
pCDoc->InsertGlossary( rGlossary, rStr, aPam, 0 );
@@ -1067,7 +1067,7 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh,
bool bIsPaste = ( GetSwTransferable( rData ) != NULL );
// if it's not our own data, we need to have a closer look:
- if( ! bIsPaste )
+ if( ! bIsPaste )
{
// determine the proper paste action, and return true if we find one
uno::Reference<XTransferable> xTransferable( rData.GetXTransferable() );
@@ -1086,7 +1086,7 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh,
USHORT nAction = SotExchange::GetExchangeAction(
rData.GetDataFlavorExVector(),
nDestination,
- nSourceOptions, /* ?? */
+ nSourceOptions, /* ?? */
EXCHG_IN_ACTION_DEFAULT, /* ?? */
nFormat, nEventAction, 0,
lcl_getTransferPointer ( xTransferable ) );
@@ -1156,7 +1156,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
int nRet = 0;
bool bCallAutoCaption = false;
-
+
if( pPt )
{
// external Drop
@@ -1194,7 +1194,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
// - nicht bei Tabellen-Selektion
// - nicht bei ReRead einer Grafik/DDEDaten
// - nicht bei D&D, fuer die richtige Selektion wurde im
- // Drop-Handler gesorgt
+ // Drop-Handler gesorgt
BOOL bDelSel = FALSE;
switch( nDestination )
{
@@ -1229,7 +1229,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
nRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction,
bPasteSelection );
}
- else if( !pPt && pTunneledTrans &&
+ else if( !pPt && pTunneledTrans &&
EXCHG_OUT_ACTION_INSERT_PRIVATE == nAction )
{
// then internal paste
@@ -1555,15 +1555,15 @@ USHORT SwTransferable::GetSotDestination( const SwWrtShell& rSh,
else
nRet = EXCHG_DEST_DOC_TEXTFRAME;
break;
- case OBJCNT_OLE: nRet = EXCHG_DEST_DOC_OLEOBJ; break;
+ case OBJCNT_OLE: nRet = EXCHG_DEST_DOC_OLEOBJ; break;
- case OBJCNT_CONTROL: /* no Action avail */
- case OBJCNT_SIMPLE: nRet = EXCHG_DEST_DOC_DRAWOBJ; break;
- case OBJCNT_URLBUTTON: nRet = EXCHG_DEST_DOC_URLBUTTON; break;
- case OBJCNT_GROUPOBJ: nRet = EXCHG_DEST_DOC_GROUPOBJ; break;
+ case OBJCNT_CONTROL: /* no Action avail */
+ case OBJCNT_SIMPLE: nRet = EXCHG_DEST_DOC_DRAWOBJ; break;
+ case OBJCNT_URLBUTTON: nRet = EXCHG_DEST_DOC_URLBUTTON; break;
+ case OBJCNT_GROUPOBJ: nRet = EXCHG_DEST_DOC_GROUPOBJ; break;
// was mmchen wir bei Mehrfachselektion???
-// case OBJCNT_DONTCARE:
+// case OBJCNT_DONTCARE:
default:
{
/*
@@ -2031,7 +2031,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
{
OSL_ENSURE( !&rWrtShell, "DDE Data not found." );
return 0;
- } //sinnvollen Fehler melden!!
+ } //sinnvollen Fehler melden!!
rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
xStrm->ReadCString( aApp, eEncoding );
@@ -2113,7 +2113,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
String aExpand;
if( rData.GetString( FORMAT_STRING, aExpand ))
{
- do { // middle checked loop
+ do { // middle checked loop
// Wenn die Daten von einer Tabellenkalkulation kommen
// fuegen wir eine DDE-Tabelle ein
@@ -2154,7 +2154,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
aSect.SetProtectFlag(true);
rWrtShell.InsertSection( aSect );
- pDDETyp = 0; // FeldTypen wieder entfernen
+ pDDETyp = 0; // FeldTypen wieder entfernen
}
else
{
@@ -2166,7 +2166,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
} while( FALSE );
}
else
- pDDETyp = 0; // FeldTypen wieder entfernen
+ pDDETyp = 0; // FeldTypen wieder entfernen
if( !pDDETyp && !bDoublePaste )
{
@@ -2223,7 +2223,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR:
if( 0 != ( nRet = rData.GetINetBookmark( nFmt, aBkmk ) ))
{
-/* if( SW_PASTESDR_SETATTR != nAction )
+/* if( SW_PASTESDR_SETATTR != nAction )
{
INetURLObject aURL( aBkmk.GetURL() );
bCheckForGrf = INET_PROT_FILE == aURL.GetProtocol();
@@ -2569,14 +2569,14 @@ int SwTransferable::_PasteDBData( TransferableDataHelper& rData,
}
else if( nWh )
{
- SfxUsrAnyItem* pConnectionItem = 0;
- SfxUsrAnyItem* pCursorItem = 0;
- SfxUsrAnyItem* pColumnItem = 0;
- SfxUsrAnyItem* pSourceItem = 0;
- SfxUsrAnyItem* pCommandItem = 0;
+ SfxUsrAnyItem* pConnectionItem = 0;
+ SfxUsrAnyItem* pCursorItem = 0;
+ SfxUsrAnyItem* pColumnItem = 0;
+ SfxUsrAnyItem* pSourceItem = 0;
+ SfxUsrAnyItem* pCommandItem = 0;
SfxUsrAnyItem* pCommandTypeItem = 0;
- SfxUsrAnyItem* pColumnNameItem = 0;
- SfxUsrAnyItem* pSelectionItem = 0;
+ SfxUsrAnyItem* pColumnNameItem = 0;
+ SfxUsrAnyItem* pSelectionItem = 0;
BOOL bDataAvailable = TRUE;
ODataAccessDescriptor aDesc;
@@ -2742,7 +2742,7 @@ int SwTransferable::PasteFormat( SwWrtShell& rSh,
nAction = SotExchange::GetExchangeAction(
rData.GetDataFlavorExVector(),
nDestination,
- nSourceOptions, /* ?? */
+ nSourceOptions, /* ?? */
EXCHG_IN_ACTION_DEFAULT, /* ?? */
nFormat, nEventAction, nFormat,
lcl_getTransferPointer ( xTransferable ) );
@@ -2874,7 +2874,7 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
SvxClipboardFmtItem & rToFill )
{
USHORT nDest = SwTransferable::GetSotDestination( rSh );
-
+
SwTransferable *pClipboard = GetSwTransferable( rData );
if( pClipboard )
{
@@ -3086,7 +3086,7 @@ void SwTransferable::StartDrag( Window* pWin, const Point& rPos )
void SwTransferable::DragFinished( sal_Int8 nAction )
{
//Und noch die letzten Nacharbeiten damit alle Stati stimmen.
- if( DND_ACTION_MOVE == nAction )
+ if( DND_ACTION_MOVE == nAction )
{
if( bCleanUp )
{
@@ -3123,14 +3123,14 @@ void SwTransferable::DragFinished( sal_Int8 nAction )
pWrtShell->HideCrsr();
else
pWrtShell->ShowCrsr();
-//!! else if( DND_ACTION_NONE != nAction )
-//!! pWrtShell->ShowCrsr();
-//!! else
-//!! {
-//!! //Muss wohl sein weil gescrollt wurde und ?...?
-//!! pWrtShell->StartAction();
-//!! pWrtShell->EndAction();
-//!! }
+//!! else if( DND_ACTION_NONE != nAction )
+//!! pWrtShell->ShowCrsr();
+//!! else
+//!! {
+//!! //Muss wohl sein weil gescrollt wurde und ?...?
+//!! pWrtShell->StartAction();
+//!! pWrtShell->EndAction();
+//!! }
((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( bOldIdle );
}
@@ -3211,7 +3211,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
BOOL bMove, BOOL bIsXSelection )
{
- int cWord = 0;
+ int cWord = 0;
BOOL bInWrd = FALSE;
BOOL bEndWrd = FALSE;
BOOL bSttWrd = FALSE;
@@ -3330,7 +3330,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
rSh.GoNextCrsr();
}
- bInWrd = rSh.IsInWrd();
+ bInWrd = rSh.IsInWrd();
bEndWrd = rSh.IsEndWrd();
bSttWrd = !bEndWrd && rSh.IsSttWrd();
bSttPara= rSh.IsSttPara();
@@ -3527,7 +3527,7 @@ sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw(
SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper& rData )
{
SwTransferable* pSwTransferable = NULL;
-
+
uno::Reference<XUnoTunnel> xTunnel( rData.GetTransferable(), UNO_QUERY );
if ( xTunnel.is() )
{
@@ -3535,9 +3535,9 @@ SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper&
if ( nHandle )
pSwTransferable = (SwTransferable*) (sal_IntPtr) nHandle;
}
-
+
return pSwTransferable;
-
+
}
SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
@@ -3686,9 +3686,9 @@ BOOL SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
void SwTrnsfrDdeLink::Disconnect( BOOL bRemoveDataAdvise )
{
//JP 29.01.96 Bug 24432:
- // kein DataChanged mehr entgegen nehmen, wenn man
- // sich schon im Disconnet befindet!
- // (DTOR vom Bookmark verschickt einen DataChanged!)
+ // kein DataChanged mehr entgegen nehmen, wenn man
+ // sich schon im Disconnet befindet!
+ // (DTOR vom Bookmark verschickt einen DataChanged!)
BOOL bOldDisconnect = bInDisconnect;
bInDisconnect = TRUE;
@@ -3739,11 +3739,11 @@ BOOL SwTrnsfrDdeLink::FindDocShell()
SfxObjectShell* pTmpSh = SfxObjectShell::GetFirst( &aType );
while( pTmpSh )
{
- if( pTmpSh == pDocShell ) // die wollen wir haben
+ if( pTmpSh == pDocShell ) // die wollen wir haben
{
if( pDocShell->GetDoc() )
return TRUE;
- break; // das Doc ist nicht mehr vorhanden, also raus!
+ break; // das Doc ist nicht mehr vorhanden, also raus!
}
pTmpSh = SfxObjectShell::GetNext( *pTmpSh, &aType );
}
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index a9e3b86f25fb..93fb75b31a8e 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -92,12 +92,12 @@
// distance between Anchor Y and initial note position
#define POSTIT_INITIAL_ANCHOR_DISTANCE 20
//distance between two postits
-#define POSTIT_SPACE_BETWEEN 8
-#define POSTIT_MINIMUMSIZE_WITH_META 60
-#define POSTIT_SCROLL_SIDEBAR_HEIGHT 20
+#define POSTIT_SPACE_BETWEEN 8
+#define POSTIT_MINIMUMSIZE_WITH_META 60
+#define POSTIT_SCROLL_SIDEBAR_HEIGHT 20
// if we layout more often we stop, this should never happen
-#define MAX_LOOP_COUNT 50
+#define MAX_LOOP_COUNT 50
using namespace sw::sidebarwindows;
@@ -278,7 +278,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
}
- else if ( rHint.IsA(TYPE(SfxSimpleHint) ) )
+ else if ( rHint.IsA(TYPE(SfxSimpleHint) ) )
{
sal_uInt32 nId = ((SfxSimpleHint&)rHint).GetId();
switch ( nId )
@@ -631,9 +631,9 @@ void SwPostItMgr::LayoutPostIts()
if (mPages[n]->mList->size()>0)
{
std::list<SwSidebarWin*> aVisiblePostItList;
- unsigned long lNeededHeight = 0;
- long mlPageBorder = 0;
- long mlPageEnd = 0;
+ unsigned long lNeededHeight = 0;
+ long mlPageBorder = 0;
+ long mlPageEnd = 0;
for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
{
@@ -884,7 +884,7 @@ void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
if ((*i)->bShow)
{
bool bBottom = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y()+pPostIt->VirtualSize().Height())).Y() <= (mPages[aPage-1]->mPageRect.Bottom()-aSidebarheight);
- bool bTop = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y())).Y() >= (mPages[aPage-1]->mPageRect.Top()+aSidebarheight);
+ bool bTop = mpEditWin->PixelToLogic(Point(0,pPostIt->VirtualPos().Y())).Y() >= (mPages[aPage-1]->mPageRect.Top()+aSidebarheight);
if ( bBottom && bTop)
{
pPostIt->ShowNote();
@@ -1000,19 +1000,19 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
// - if we have space left, we always move the current one up,
// otherwise the next one down
// - first all notes are resized
- // - then the real layout starts
+ // - then the real layout starts
/*************************************************************/
//rBorder is the page rect
- const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder);
- long lTopBorder = rBorder.Top() + 5;
- long lBottomBorder = rBorder.Bottom() - 5;
- const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ;
- long lSpaceUsed = 0;
- long lTranslatePos = 0;
- int loop = 0;
- bool bDone = false;
- bool bScrollbars = false;
+ const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder);
+ long lTopBorder = rBorder.Top() + 5;
+ long lBottomBorder = rBorder.Bottom() - 5;
+ const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ;
+ long lSpaceUsed = 0;
+ long lTranslatePos = 0;
+ int loop = 0;
+ bool bDone = false;
+ bool bScrollbars = false;
// do all neccessary resizings
if (lVisibleHeight < lNeededHeight)
@@ -1159,7 +1159,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
{
(*i)->TranslateTopPosition(lTranslatePos+GetSpaceBetween());
}
- lTranslatePos = lBottomBorder - ((*i)->VirtualPos().Y()+ (*i)->VirtualSize().Height());
+ lTranslatePos = lBottomBorder - ((*i)->VirtualPos().Y()+ (*i)->VirtualSize().Height());
if (lTranslatePos<0)
{
(*i)->TranslateTopPosition(lTranslatePos);
@@ -1311,7 +1311,7 @@ void SwPostItMgr::Hide( const String& rAuthor )
{
if ( (*i)->pPostIt && ((*i)->pPostIt->GetAuthor() == rAuthor) )
{
- (*i)->bShow = false;
+ (*i)->bShow = false;
(*i)->pPostIt->HideNote();
}
}
@@ -1628,13 +1628,13 @@ void SwPostItMgr::CorrectPositions()
// yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
// --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
- const long aAnchorX = pFirstPostIt->Anchor()
+ const long aAnchorX = pFirstPostIt->Anchor()
? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X()
: 0;
- const long aAnchorY = pFirstPostIt->Anchor()
+ const long aAnchorY = pFirstPostIt->Anchor()
? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1
: 0;
- // <--
+ // <--
if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
{
long aAnchorPosX = 0;
@@ -1645,7 +1645,7 @@ void SwPostItMgr::CorrectPositions()
{
// --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
if ( (*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Anchor() )
- // <--
+ // <--
{
aAnchorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X()
@@ -1697,9 +1697,9 @@ Color SwPostItMgr::GetColorDark(sal_uInt16 aAuthorIndex)
if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
static const Color aArrayNormal[] = {
- COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL,
- COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL,
- COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL };
+ COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL,
+ COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL,
+ COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL };
return Color( aArrayNormal[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayNormal))]);
}
@@ -1712,9 +1712,9 @@ Color SwPostItMgr::GetColorLight(sal_uInt16 aAuthorIndex)
if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
static const Color aArrayLight[] = {
- COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT,
- COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT,
- COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT };
+ COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT,
+ COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT,
+ COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT };
return Color( aArrayLight[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayLight))]);
}
@@ -1727,9 +1727,9 @@ Color SwPostItMgr::GetColorAnchor(sal_uInt16 aAuthorIndex)
if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{
static const Color aArrayAnchor[] = {
- COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK,
- COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK,
- COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK };
+ COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK,
+ COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK,
+ COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK };
return Color( aArrayAnchor[ aAuthorIndex % (SAL_N_ELEMENTS(aArrayAnchor))]);
}
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index fc5b0b66b6fb..d380b00d945c 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -360,7 +360,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
const Size aSize = GetSizePixel();
aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 );
}
-
+
//!! call different Execute function to get rid of the new thesaurus sub menu
//!! pointer created in the call to Popup.
//!! Otherwise we would have a memory leak (see also #i107205#)
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index 2755ebf3f929..6bdf2cf2fe60 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -54,14 +54,14 @@ class SidebarTxtControl : public Control
bool mbMouseOver;
protected:
- virtual void Paint( const Rectangle& rRect);
+ virtual void Paint( const Rectangle& rRect);
virtual void KeyInput( const KeyEvent& rKeyEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void LoseFocus();
- virtual void RequestHelp(const HelpEvent &rEvt);
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void LoseFocus();
+ virtual void RequestHelp(const HelpEvent &rEvt);
virtual XubString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index bc85ddb80e5c..72a9da587e6b 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -574,8 +574,8 @@ void SwSidebarWin::SetPosAndSize()
SwSidebarWin* pWin = GetTopReplyNote();
// --> OD 2010-06-03 #i111964#
if ( pWin && pWin->Anchor() )
- // <--
- {
+ // <--
+ {
pWin->Anchor()->SetAnchorState(AS_END);
}
}
@@ -1139,8 +1139,8 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
SwSidebarWin* pWin = GetTopReplyNote();
// --> OD 2010-06-03 #i111964#
if ( pWin && pWin->Anchor() )
- // <--
- {
+ // <--
+ {
pWin->Anchor()->SetAnchorState(AS_END);
}
mpAnchor->setLineSolid(true);
@@ -1176,7 +1176,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
// <--
{
if ( pTopWinSelf != mrMgr.GetActiveSidebarWin() )
- {
+ {
pTopWinSelf->Anchor()->setLineSolid(false);
}
pTopWinSelf->Anchor()->SetAnchorState(AS_ALL);
@@ -1185,7 +1185,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
mpAnchor->setLineSolid(false);
}
if ( mpShadow )
- {
+ {
mpShadow->SetShadowState(SS_NORMAL);
}
break;
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index 688a4e3ae50c..ede176b8ac5a 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -2,7 +2,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
@@ -226,7 +226,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
if ( aRect.IsInside(aPos) )
{
rSh.StartAllAction();
-//!! sal_Int8 nRet = DND_ACTION_NONE/*pOLV->ExecuteDrop( rEvt )*/;
+//!! sal_Int8 nRet = DND_ACTION_NONE/*pOLV->ExecuteDrop( rEvt )*/;
rSh.EndAllAction();
return nRet;
}
@@ -247,7 +247,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
GetDataFlavorExVector(),
m_nDropDestination,
rEvt.mnAction,
-//!! rEvt.GetSourceOptions(),
+//!! rEvt.GetSourceOptions(),
nUserOpt, m_nDropFormat, nEventAction, 0,
&rEvt.maDropEvent.Transferable );
@@ -320,11 +320,11 @@ USHORT SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj )
else
nDropDestination = EXCHG_DEST_DOC_TEXTFRAME;
break;
- case OBJCNT_OLE: nDropDestination = EXCHG_DEST_DOC_OLEOBJ; break;
- case OBJCNT_CONTROL: /* no Action avail */
- case OBJCNT_SIMPLE: nDropDestination = EXCHG_DEST_DOC_DRAWOBJ; break;
- case OBJCNT_URLBUTTON: nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break;
- case OBJCNT_GROUPOBJ: nDropDestination = EXCHG_DEST_DOC_GROUPOBJ; break;
+ case OBJCNT_OLE: nDropDestination = EXCHG_DEST_DOC_OLEOBJ; break;
+ case OBJCNT_CONTROL: /* no Action avail */
+ case OBJCNT_SIMPLE: nDropDestination = EXCHG_DEST_DOC_DRAWOBJ; break;
+ case OBJCNT_URLBUTTON: nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break;
+ case OBJCNT_GROUPOBJ: nDropDestination = EXCHG_DEST_DOC_GROUPOBJ; break;
default: OSL_ENSURE( !this, "new ObjectType?" );
}
@@ -404,7 +404,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
GetDataFlavorExVector(),
m_nDropDestination,
rEvt.mnAction,
-//!! rEvt.GetSourceOptions(),
+//!! rEvt.GetSourceOptions(),
nUserOpt, m_nDropFormat, nEventAction );
if( EXCHG_INOUT_ACTION_NONE != m_nDropAction )
@@ -434,7 +434,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
else if( rEvt.mbDefault )
{
// JP 13.08.98: internes Drag&Drop: bei gleichem Doc ein Move
- // ansonten ein Copy - Task 54974
+ // ansonten ein Copy - Task 54974
nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
? DND_ACTION_MOVE
: DND_ACTION_COPY;
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 1282d02a44c8..b16bb6af6181 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -193,10 +193,10 @@ class SwAnchorMarker
bool bTopRightHandle;
// <--
public:
- SwAnchorMarker( SdrHdl* pH )
+ SwAnchorMarker( SdrHdl* pH )
: pHdl( pH )
, aHdlPos( pH->GetPos() )
- , aLastPos( pH->GetPos() )
+ , aLastPos( pH->GetPos() )
// --> OD 2010-09-16 #i114522#
, bTopRightHandle( pH->GetKind() == HDL_ANCHOR_TR )
// <--
@@ -206,8 +206,8 @@ public:
void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
const Point& GetPos() { return pHdl->GetPos(); }
const Point& GetHdlPos() { return aHdlPos; }
- void ChgHdl( SdrHdl* pNew )
- {
+ void ChgHdl( SdrHdl* pNew )
+ {
pHdl = pNew;
// --> OD 2010-09-16 #i114522#
if ( pHdl )
@@ -228,9 +228,9 @@ public:
else
{
aHitTestPos += Point( 1, 1 );
- }
+ }
aHitTestPos = rOut.PixelToLogic( aHitTestPos );
-
+
return aHitTestPos;
}
// <--
@@ -1755,9 +1755,17 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KEY_DELETE:
- if (rSh.IsInFrontOfLabel() &&
- rSh.NumOrNoNum(FALSE))
- eKeyState = KS_NumOrNoNum;
+ if ( !rSh.HasReadonlySel() )
+ {
+ if (rSh.IsInFrontOfLabel() &&
+ rSh.NumOrNoNum(FALSE))
+ eKeyState = KS_NumOrNoNum;
+ }
+ else
+ {
+ InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute();
+ eKeyState = KS_Ende;
+ }
break;
case KEY_DELETE | KEY_MOD2:
@@ -1921,6 +1929,11 @@ KEYINPUT_CHECKTABLE_INSDEL:
// <--
}
}
+ else
+ {
+ InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute();
+ eKeyState = KS_Ende;
+ }
break;
case KEY_RIGHT:
@@ -2361,7 +2374,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
ChgToEnEmDash | SetINetAttr |
Autocorrect ) &&
!rSh.HasReadonlySel() )
- /* {
+ /* {
pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd |
ChgFractionSymbol | ChgOrdinalNumber |
ChgToEnEmDash | SetINetAttr |
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index a78fc7d113f4..aa9d890db311 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -2,7 +2,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
@@ -82,18 +82,18 @@
// <--
/*--------------------------------------------------------------------
- Beschreibung: KeyEvents
+ Beschreibung: KeyEvents
--------------------------------------------------------------------*/
static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, BOOL bBalloon )
{
USHORT nResId = 0;
switch( rRedl.GetType() )
{
- case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break;
- case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break;
- case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break;
- case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break;
- case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break;
+ case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break;
+ case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break;
+ case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break;
+ case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break;
+ case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break;
}
if( nResId )
@@ -333,7 +333,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
*/
break;
}
- case RES_INPUTFLD: // BubbleHelp, da der Hinweis ggf ziemlich lang sein kann
+ case RES_INPUTFLD: // BubbleHelp, da der Hinweis ggf ziemlich lang sein kann
bBalloon = TRUE;
/* no break */
case RES_JUMPEDITFLD:
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 8af8e702aeb4..d3cfde45abcb 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@
/*--------------------------------------------------------------------
- Beschreibung: Core-Notify
+ Beschreibung: Core-Notify
--------------------------------------------------------------------*/
@@ -65,7 +65,7 @@ void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
}
/*--------------------------------------------------------------------
- Beschreibung: Docmdi - verschiebbar
+ Beschreibung: Docmdi - verschiebbar
--------------------------------------------------------------------*/
@@ -79,7 +79,7 @@ BOOL IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
}
/*--------------------------------------------------------------------
- Beschreibung: Notify fuer Groessen-Aenderung
+ Beschreibung: Notify fuer Groessen-Aenderung
--------------------------------------------------------------------*/
@@ -97,7 +97,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize)
}
/*--------------------------------------------------------------------
- Beschreibung: Notify fuer Seitenzahl-Update
+ Beschreibung: Notify fuer Seitenzahl-Update
--------------------------------------------------------------------*/
@@ -112,10 +112,10 @@ void PageNumNotify( ViewShell* pVwSh, USHORT nPhyNum, USHORT nVirtNum,
}
/******************************************************************************
- * Methode : void FrameNotify( DocMDIBase *pWin, FlyMode eMode )
- * Beschreibung:
- * Erstellt : OK 08.02.94 13:49
- * Aenderung :
+ * Methode : void FrameNotify( DocMDIBase *pWin, FlyMode eMode )
+ * Beschreibung:
+ * Erstellt : OK 08.02.94 13:49
+ * Aenderung :
******************************************************************************/
@@ -127,7 +127,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
}
/*--------------------------------------------------------------------
- Beschreibung: Notify fuer Seitenzahl-Update
+ Beschreibung: Notify fuer Seitenzahl-Update
--------------------------------------------------------------------*/
BOOL SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode)
{
@@ -197,7 +197,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
pSh->LockPaint();
bUnlockPaint = TRUE;
ViewShell::DeleteReplacementBitmaps();
- GetView().InvalidateBorder(); //Scrollbarbreiten
+ GetView().InvalidateBorder(); //Scrollbarbreiten
}
break;
@@ -207,7 +207,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
case DATACHANGED_FONTSUBSTITUTION:
pSh->LockPaint();
bUnlockPaint = TRUE;
- GetView().GetDocShell()->UpdateFontList(); //z.B. Druckerwechsel
+ GetView().GetDocShell()->UpdateFontList(); //z.B. Druckerwechsel
break;
}
pSh->LockView( bViewWasLocked );
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index b76994b6fb74..2a30f0b7cfe2 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -2,7 +2,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
@@ -220,16 +220,16 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
bReloadFrame );
EnableItem( MN_READONLY_RELOAD, !bReloadFrame);
- Check( MN_READONLY_EDITDOC, SID_EDITDOC, rDis );
+ Check( MN_READONLY_EDITDOC, SID_EDITDOC, rDis );
Check( MN_READONLY_SELECTION_MODE, FN_READONLY_SELECTION_MODE, rDis );
Check( MN_READONLY_SOURCEVIEW, SID_SOURCEVIEW, rDis );
- Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis );
- Check( MN_READONLY_BROWSE_FORWARD, SID_BROWSE_FORWARD, rDis );
+ Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis );
+ Check( MN_READONLY_BROWSE_FORWARD, SID_BROWSE_FORWARD, rDis );
#ifdef WNT
- Check( MN_READONLY_PLUGINOFF, SID_PLUGINS_ACTIVE, rDis );
+ Check( MN_READONLY_PLUGINOFF, SID_PLUGINS_ACTIVE, rDis );
#endif
- Check( MN_READONLY_OPENURL, SID_OPENDOC, rDis );
- Check( MN_READONLY_OPENURLNEW, SID_OPENDOC, rDis );
+ Check( MN_READONLY_OPENURL, SID_OPENDOC, rDis );
+ Check( MN_READONLY_OPENURLNEW, SID_OPENDOC, rDis );
SfxPoolItem* pState;
@@ -308,19 +308,19 @@ void SwReadOnlyPopup::Execute( Window* pWin, USHORT nId )
{
case SID_WIN_FULLSCREEN : nExecId = SID_WIN_FULLSCREEN; break;
case MN_READONLY_OPENURL: nFilter = URLLOAD_NOFILTER; break;
- case MN_READONLY_OPENURLNEW: nFilter = URLLOAD_NEWVIEW; break;
+ case MN_READONLY_OPENURLNEW: nFilter = URLLOAD_NEWVIEW; break;
case MN_READONLY_COPY: nExecId = SID_COPY; break;
- case MN_READONLY_EDITDOC: nExecId = SID_EDITDOC; break;
+ case MN_READONLY_EDITDOC: nExecId = SID_EDITDOC; break;
case MN_READONLY_SELECTION_MODE: nExecId = FN_READONLY_SELECTION_MODE; break;
case MN_READONLY_RELOAD:
case MN_READONLY_RELOAD_FRAME:
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(SID_RELOAD);
break;
- case MN_READONLY_BROWSE_BACKWARD: nExecId = SID_BROWSE_BACKWARD;break;
- case MN_READONLY_BROWSE_FORWARD: nExecId = SID_BROWSE_FORWARD; break;
- case MN_READONLY_SOURCEVIEW: nExecId = SID_SOURCEVIEW; break;
+ case MN_READONLY_BROWSE_BACKWARD: nExecId = SID_BROWSE_BACKWARD;break;
+ case MN_READONLY_BROWSE_FORWARD: nExecId = SID_BROWSE_FORWARD; break;
+ case MN_READONLY_SOURCEVIEW: nExecId = SID_SOURCEVIEW; break;
case MN_READONLY_SAVEGRAPHIC:
case MN_READONLY_SAVEBACKGROUND:
{
@@ -352,9 +352,9 @@ void SwReadOnlyPopup::Execute( Window* pWin, USHORT nId )
rSh.ResetModified();
break;
}
- case MN_READONLY_GRAPHICOFF: nExecId = FN_VIEW_GRAPHIC; break;
+ case MN_READONLY_GRAPHICOFF: nExecId = FN_VIEW_GRAPHIC; break;
#ifdef WNT
- case MN_READONLY_PLUGINOFF: nExecId = SID_PLUGINS_ACTIVE; break;
+ case MN_READONLY_PLUGINOFF: nExecId = SID_PLUGINS_ACTIVE; break;
#endif
case MN_READONLY_TOGALLERYLINK:
SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( TRUE );
@@ -389,8 +389,8 @@ static void lcl_GetPreferedExtension( String &rExt, const Graphic &rGrf )
case GFX_LINK_TYPE_NATIVE_TIF: pExt = "tif"; break;
case GFX_LINK_TYPE_NATIVE_WMF: pExt = "wmf"; break;
case GFX_LINK_TYPE_NATIVE_MET: pExt = "met"; break;
- case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
- case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
+ case GFX_LINK_TYPE_NATIVE_PCT: pExt = "pct"; break;
+ case GFX_LINK_TYPE_NATIVE_JPG: pExt = "jpg"; break;
default:; //prevent warning
}
rExt.AssignAscii( pExt );
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 56f5ba74386c..557b88d8cec0 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -2,7 +2,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
@@ -45,14 +45,14 @@ class SwReadOnlyPopup : public PopupMenu
const SvxBrushItem *pItem;
const Point &rDocPos;
Graphic aGraphic;
- String sURL,
+ String sURL,
sTargetFrameName,
sDescription,
sGrfName;
- List aThemeList;
- BOOL bGrfToGalleryAsLnk;
- ImageMap* pImageMap;
- INetImage* pTargetURL;
+ List aThemeList;
+ BOOL bGrfToGalleryAsLnk;
+ ImageMap* pImageMap;
+ INetImage* pTargetURL;
void Check( USHORT nMID, USHORT nSID, SfxDispatcher &rDis );
String SaveGraphic( USHORT nId );
@@ -62,7 +62,7 @@ class SwReadOnlyPopup : public PopupMenu
public:
SwReadOnlyPopup( const Point &rDPos, SwView &rV );
~SwReadOnlyPopup();
-
+
void Execute( Window* pWin, const Point &rPPos );
void Execute( Window* pWin, USHORT nId );
};
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index aa81a30be484..eba8d45198a8 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -2,7 +2,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
@@ -80,21 +80,21 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
{
const sal_Unicode cOpenBracket = '<';
const sal_Unicode cCloseBracket= '>';
- const sal_Unicode cSlash = '/';
+ const sal_Unicode cSlash = '/';
const sal_Unicode cExclamation = '!';
- const sal_Unicode cMinus = '-';
- const sal_Unicode cSpace = ' ';
- const sal_Unicode cTab = 0x09;
+ const sal_Unicode cMinus = '-';
+ const sal_Unicode cSpace = ' ';
+ const sal_Unicode cTab = 0x09;
const sal_Unicode cLF = 0x0a;
const sal_Unicode cCR = 0x0d;
const USHORT nStrLen = rSource.Len();
- USHORT nInsert = 0; // Anzahl der eingefuegten Portions
- USHORT nActPos = 0; //Position, an der '<' gefunden wurde
- USHORT nOffset = 0; //Offset von nActPos zur '<'
- USHORT nPortStart = USHRT_MAX; // fuer die TextPortion
- USHORT nPortEnd = 0; //
+ USHORT nInsert = 0; // Anzahl der eingefuegten Portions
+ USHORT nActPos = 0; //Position, an der '<' gefunden wurde
+ USHORT nOffset = 0; //Offset von nActPos zur '<'
+ USHORT nPortStart = USHRT_MAX; // fuer die TextPortion
+ USHORT nPortEnd = 0; //
SwTextPortion aText;
while(nActPos < nStrLen)
{
@@ -142,9 +142,9 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
while(++nSrchPos < nStrLen - 1)
{
sal_Unicode cNext = rSource.GetChar(nSrchPos);
- if( cNext == cSpace ||
- cNext == cTab ||
- cNext == cLF ||
+ if( cNext == cSpace ||
+ cNext == cTab ||
+ cNext == cLF ||
cNext == cCR)
break;
else if(cNext == cCloseBracket)
@@ -318,8 +318,8 @@ void SwSrcEditWindow::Resize()
aScrollPos = Point(aOutSz.Width() - nScrollStd, 0);
pVScrollbar->SetPosSizePixel( aScrollPos, aScrollSz);
- aOutSz.Width() -= nScrollStd;
- aOutSz.Height() -= nScrollStd;
+ aOutSz.Width() -= nScrollStd;
+ aOutSz.Height() -= nScrollStd;
pOutWin->SetOutputSizePixel(aOutSz);
InitScrollBars();
@@ -541,7 +541,7 @@ void SwSrcEditWindow::CreateTextEngine()
SfxBindings& rBind = GetSrcView()->GetViewFrame()->GetBindings();
rBind.Invalidate( SID_TABLE_CELL );
-// rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
+// rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
}
/*--------------------------------------------------------------------
@@ -678,7 +678,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
// SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
// => gute Gelegenheit, Textbreite zu ermitteln!
long nPrevTextWidth = nCurTextWidth;
- nCurTextWidth = pTextEngine->CalcTextWidth() + 25; // kleine Toleranz
+ nCurTextWidth = pTextEngine->CalcTextWidth() + 25; // kleine Toleranz
if ( nCurTextWidth != nPrevTextWidth )
SetScrollBarRanges();
bHighlighting = FALSE;
@@ -743,7 +743,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
return;
SwTextPortion& rLast = aPortionList[nCount-1];
- if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoeben
+ if ( rLast.nStart > rLast.nEnd ) // Nur bis Bug von MD behoeben
{
nCount--;
aPortionList.Remove( nCount);
@@ -770,7 +770,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
USHORT nLine = aPortionList[0].nLine;
OSL_ENSURE( r.nLine == nLine, "doch mehrere Zeilen ?" );
#endif
- if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben
+ if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben
continue;
if ( r.nStart > nLastEnd )
@@ -788,7 +788,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
for ( USHORT i = 0; i < aPortionList.Count(); i++ )
{
SwTextPortion& r = aPortionList[i];
- if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben
+ if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben
continue;
if(r.eType != svtools::HTMLSGML &&
r.eType != svtools::HTMLCOMMENT &&
@@ -879,8 +879,8 @@ void SwSrcEditWindow::GetFocus()
/*void SwSrcEditWindow::LoseFocus()
{
Window::LoseFocus();
-// pOutWin->LoseFocus();
-// rView.LostFocus();
+// pOutWin->LoseFocus();
+// rView.LostFocus();
} */
/* -----------------------------29.08.2002 13:21------------------------------
@@ -1069,7 +1069,7 @@ void SwSrcEditWindow::SetFont()
}
const SvxFontListItem* pFontListItem =
(const SvxFontListItem* )pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST );
- const FontList* pList = pFontListItem->GetFontList();
+ const FontList* pList = pFontListItem->GetFontList();
FontInfo aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
const Font& rFont = GetTextEngine()->GetFont();
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src
index 20cbcebff32a..94cc2d40e654 100644
--- a/sw/source/ui/envelp/envelp.src
+++ b/sw/source/ui/envelp/envelp.src
@@ -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
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index e59868232826..26389566ddf1 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -2,7 +2,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
@@ -81,29 +81,29 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_ENV_FMT), rSet),
aAddrFL (this, SW_RES( FL_ADDRESSEE )),
- aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )),
- aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )),
- aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )),
- aAddrTopText (this, SW_RES( TXT_ADDR_TOP )),
- aAddrTopField (this, SW_RES( FLD_ADDR_TOP )),
- aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )),
- aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )),
+ aAddrPosInfo (this, SW_RES( TXT_ADDR_POS )),
+ aAddrLeftText (this, SW_RES( TXT_ADDR_LEFT )),
+ aAddrLeftField (this, SW_RES( FLD_ADDR_LEFT )),
+ aAddrTopText (this, SW_RES( TXT_ADDR_TOP )),
+ aAddrTopField (this, SW_RES( FLD_ADDR_TOP )),
+ aAddrFormatInfo (this, SW_RES( TXT_ADDR_FORMAT )),
+ aAddrEditButton (this, SW_RES( BTN_ADDR_EDIT )),
aSendFL (this, SW_RES( FL_SENDER )),
- aSendPosInfo (this, SW_RES( TXT_SEND_POS )),
- aSendLeftText (this, SW_RES( TXT_SEND_LEFT )),
- aSendLeftField (this, SW_RES( FLD_SEND_LEFT )),
- aSendTopText (this, SW_RES( TXT_SEND_TOP )),
- aSendTopField (this, SW_RES( FLD_SEND_TOP )),
- aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )),
- aSendEditButton (this, SW_RES( BTN_SEND_EDIT )),
+ aSendPosInfo (this, SW_RES( TXT_SEND_POS )),
+ aSendLeftText (this, SW_RES( TXT_SEND_LEFT )),
+ aSendLeftField (this, SW_RES( FLD_SEND_LEFT )),
+ aSendTopText (this, SW_RES( TXT_SEND_TOP )),
+ aSendTopField (this, SW_RES( FLD_SEND_TOP )),
+ aSendFormatInfo (this, SW_RES( TXT_SEND_FORMAT )),
+ aSendEditButton (this, SW_RES( BTN_SEND_EDIT )),
aSizeFL (this, SW_RES( FL_SIZE )),
- aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )),
- aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )),
- aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )),
- aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )),
- aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )),
- aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )),
- aPreview (this, SW_RES( WIN_PREVIEW ))
+ aSizeFormatText (this, SW_RES( TXT_SIZE_FORMAT )),
+ aSizeFormatBox (this, SW_RES( BOX_SIZE_FORMAT )),
+ aSizeWidthText (this, SW_RES( TXT_SIZE_WIDTH )),
+ aSizeWidthField (this, SW_RES( FLD_SIZE_WIDTH )),
+ aSizeHeightText (this, SW_RES( TXT_SIZE_HEIGHT )),
+ aSizeHeightField (this, SW_RES( FLD_SIZE_HEIGHT )),
+ aPreview (this, SW_RES( WIN_PREVIEW ))
{
FreeResource();
diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc
index 2517d50207c9..d2d7011caa83 100644
--- a/sw/source/ui/envelp/envfmt.hrc
+++ b/sw/source/ui/envelp/envfmt.hrc
@@ -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
@@ -33,32 +33,32 @@
// Lokale Resourcen *********************************************************
#define FL_ADDRESSEE 11
-#define TXT_ADDR_POS 12
-#define TXT_ADDR_LEFT 13
-#define FLD_ADDR_LEFT 14
-#define TXT_ADDR_TOP 15
-#define FLD_ADDR_TOP 16
-#define TXT_ADDR_FORMAT 17
-#define BTN_ADDR_EDIT 18
+#define TXT_ADDR_POS 12
+#define TXT_ADDR_LEFT 13
+#define FLD_ADDR_LEFT 14
+#define TXT_ADDR_TOP 15
+#define FLD_ADDR_TOP 16
+#define TXT_ADDR_FORMAT 17
+#define BTN_ADDR_EDIT 18
#define FL_SENDER 21
-#define TXT_SEND_POS 22
-#define TXT_SEND_LEFT 23
-#define FLD_SEND_LEFT 24
-#define TXT_SEND_TOP 25
-#define FLD_SEND_TOP 26
-#define TXT_SEND_FORMAT 27
-#define BTN_SEND_EDIT 28
+#define TXT_SEND_POS 22
+#define TXT_SEND_LEFT 23
+#define FLD_SEND_LEFT 24
+#define TXT_SEND_TOP 25
+#define FLD_SEND_TOP 26
+#define TXT_SEND_FORMAT 27
+#define BTN_SEND_EDIT 28
#define FL_SIZE 31
-#define TXT_SIZE_FORMAT 32
-#define BOX_SIZE_FORMAT 33
-#define TXT_SIZE_WIDTH 34
-#define FLD_SIZE_WIDTH 35
-#define TXT_SIZE_HEIGHT 36
-#define FLD_SIZE_HEIGHT 37
-
-#define WIN_PREVIEW 41
+#define TXT_SIZE_FORMAT 32
+#define BOX_SIZE_FORMAT 33
+#define TXT_SIZE_WIDTH 34
+#define FLD_SIZE_WIDTH 35
+#define TXT_SIZE_HEIGHT 36
+#define FLD_SIZE_HEIGHT 37
+
+#define WIN_PREVIEW 41
#define MID_CHAR 1
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 71159e904b05..96fb9a68e8fe 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -2,7 +2,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
@@ -48,20 +48,20 @@ class SwEnvFmtPage : public SfxTabPage
{
FixedLine aAddrFL;
- FixedInfo aAddrPosInfo;
+ FixedInfo aAddrPosInfo;
FixedText aAddrLeftText;
MetricField aAddrLeftField;
FixedText aAddrTopText;
MetricField aAddrTopField;
- FixedInfo aAddrFormatInfo;
+ FixedInfo aAddrFormatInfo;
MenuButton aAddrEditButton;
FixedLine aSendFL;
- FixedInfo aSendPosInfo;
+ FixedInfo aSendPosInfo;
FixedText aSendLeftText;
MetricField aSendLeftField;
FixedText aSendTopText;
MetricField aSendTopField;
- FixedInfo aSendFormatInfo;
+ FixedInfo aSendFormatInfo;
MenuButton aSendEditButton;
FixedLine aSizeFL;
FixedText aSizeFormatText;
@@ -83,10 +83,10 @@ class SwEnvFmtPage : public SfxTabPage
void SetMinMax();
- SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender);
-
+ SfxItemSet *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender);
+
using Window::GetParent;
- SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
+ SwEnvDlg *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index d87223fee066..57132b77543c 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -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
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index a4cdf03f6f0b..a0a06419a181 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -2,7 +2,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
@@ -251,7 +251,7 @@ SwEnvCfgItem::~SwEnvCfgItem()
{
}
-void SwEnvCfgItem::Commit()
+void SwEnvCfgItem::Commit()
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues(aNames.getLength());
@@ -286,19 +286,19 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "Inscription/Addressee", // 0
- "Inscription/Sender", // 1
- "Inscription/UseSender", // 2
- "Format/AddresseeFromLeft", // 3
- "Format/AddresseeFromTop", // 4
- "Format/SenderFromLeft", // 5
- "Format/SenderFromTop", // 6
- "Format/Width", // 7
- "Format/Height", // 8
- "Print/Alignment", // 9
- "Print/FromAbove", // 10
- "Print/Right", // 11
- "Print/Down" // 12
+ "Inscription/Addressee", // 0
+ "Inscription/Sender", // 1
+ "Inscription/UseSender", // 2
+ "Format/AddresseeFromLeft", // 3
+ "Format/AddresseeFromTop", // 4
+ "Format/SenderFromLeft", // 5
+ "Format/SenderFromTop", // 6
+ "Format/Width", // 7
+ "Format/Height", // 8
+ "Print/Alignment", // 9
+ "Print/FromAbove", // 10
+ "Print/Right", // 11
+ "Print/Down" // 12
};
const int nCount = 13;
Sequence<OUString> aNames(nCount);
diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc
index ac83f2c9c0bd..1974387e5e91 100644
--- a/sw/source/ui/envelp/envlop.hrc
+++ b/sw/source/ui/envelp/envlop.hrc
@@ -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
@@ -44,8 +44,8 @@
#define BOX_SEND 10
#define EDT_SEND 11
#define WIN_PREVIEW 12
-#define ST_INSERT 13
-#define ST_CHANGE 14
+#define ST_INSERT 13
+#define ST_CHANGE 14
// Globale Resourcen ********************************************************
#define STR_DOC_TITLE (RC_ENVLOP_BEGIN)
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index 951d1eb10ccc..9c9107935353 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -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
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 36fe09debedf..6c5bac1af551 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ void SwEnvPreview::Paint(const Rectangle &)
Color aBack = rSettings.GetWindowColor( );
Color aFront = SwViewOption::GetFontColor();
- Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2,
+ Color aMedium = Color( ( aBack.GetRed() + aFront.GetRed() ) / 2,
( aBack.GetGreen() + aFront.GetGreen() ) / 2,
( aBack.GetBlue() + aFront.GetBlue() ) / 2
);
@@ -160,7 +160,7 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC)));
GetOKButton().SetHelpId(HID_ENVELOP_PRINT);
- GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
if (GetUserButton())
{
GetUserButton()->SetText(bInsert ? sInsert : sChange);
@@ -230,10 +230,10 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) :
pSh = GetParent()->pSh;
// Install handlers
- aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl ));
- aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl ));
- aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl ));
- aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl ));
+ aDatabaseLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl ));
+ aTableLB .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl ));
+ aInsertBT .SetClickHdl (LINK(this, SwEnvPage, FieldHdl ));
+ aSenderBox .SetClickHdl (LINK(this, SwEnvPage, SenderHdl ));
aPreview.SetBorderStyle( WINDOW_BORDER_MONO );
SwDBData aData = pSh->GetDBData();
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 68d72c129afc..58544cc07435 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index 64d90dfdf93f..32e5e623bc94 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -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
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index e309aa02c4c7..2d2de052860a 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index f409614f7965..e38f7ca505f9 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -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
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc
index 6c4770c5c10f..c74d9fbe51b5 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/ui/envelp/label.hrc
@@ -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
@@ -51,68 +51,68 @@
#define FT_DBFIELD 17
#define LB_DBFIELD 18
#define BTN_INSERT 19
-#define BTN_SYNC 20
+#define BTN_SYNC 20
-#define RB_FROM_AUTO_TEXT 1
-#define RB_FROM_EDIT 2
-#define LB_AUTO_TEXT 3
+#define RB_FROM_AUTO_TEXT 1
+#define RB_FROM_EDIT 2
+#define LB_AUTO_TEXT 3
#define FT_AUTO_TEXT_GROUP 4
#define LB_AUTO_TEXT_GROUP 5
-#define ED_TEXT 6
+#define ED_TEXT 6
#define FL_CONTENT 7
-#define WIN_EXAMPLE 8
-#define ST_VISCARD_GROUP 10
+#define WIN_EXAMPLE 8
+#define ST_VISCARD_GROUP 10
#define FL_DATA 30
-#define FT_NAME 31
-#define ED_FIRSTNAME 32
-#define ED_NAME 33
-#define ED_SHORTCUT 34
-#define FT_STREET 35
-#define ED_STREET 36
-#define FT_ZIPCITY 37
-#define ED_ZIP 38
-#define ED_CITY 39
-#define FT_COUNTRYSTATE 40
-#define ED_COUNTRY 41
-#define FT_TITLEPROF 42
-#define ED_PROFESSION 43
-#define ED_TITLE 44
-
-#define ED_PHONE 46
-#define ED_MOBILE 47
-
-#define ED_FAX 49
-#define FT_WWWMAIL 50
-#define ED_WWW 51
-#define ED_MAIL 52
-#define ED_STATE 53
-#define FT_COMP 54
-#define ED_COMP 55
+#define FT_NAME 31
+#define ED_FIRSTNAME 32
+#define ED_NAME 33
+#define ED_SHORTCUT 34
+#define FT_STREET 35
+#define ED_STREET 36
+#define FT_ZIPCITY 37
+#define ED_ZIP 38
+#define ED_CITY 39
+#define FT_COUNTRYSTATE 40
+#define ED_COUNTRY 41
+#define FT_TITLEPROF 42
+#define ED_PROFESSION 43
+#define ED_TITLE 44
+
+#define ED_PHONE 46
+#define ED_MOBILE 47
+
+#define ED_FAX 49
+#define FT_WWWMAIL 50
+#define ED_WWW 51
+#define ED_MAIL 52
+#define ED_STATE 53
+#define FT_COMP 54
+#define ED_COMP 55
#define FT_COMP_EXT 56
#define ED_COMP_EXT 57
-#define FT_SLOGAN 58
-#define ED_SLOGAN 59
+#define FT_SLOGAN 58
+#define ED_SLOGAN 59
#define FT_POSITION 60
#define ED_POSITION 61
-#define ST_BUSINESSCARDDLG 62
+#define ST_BUSINESSCARDDLG 62
#define ST_FIRSTPAGE_LAB 63
#define ST_FIRSTPAGE_BC 64
-#define FT_NAME_2 65
-#define ED_FIRSTNAME_2 66
-#define ED_NAME_2 67
-#define ED_SHORTCUT_2 68
+#define FT_NAME_2 65
+#define ED_FIRSTNAME_2 66
+#define ED_NAME_2 67
+#define ED_SHORTCUT_2 68
-#define FT_PHONE_MOBILE 70
-//#define FT_PHONE 71
-//#define FT_MOBILE 72
-#define FT_FAX 73
+#define FT_PHONE_MOBILE 70
+//#define FT_PHONE 71
+//#define FT_MOBILE 72
+#define FT_FAX 73
// Globale Resourcen ********************************************************
-#define STR_DOC_TITLE (RC_LABEL_BEGIN)
-#define STR_CUSTOM (RC_LABEL_BEGIN + 1)
+#define STR_DOC_TITLE (RC_LABEL_BEGIN)
+#define STR_CUSTOM (RC_LABEL_BEGIN + 1)
// Ueberlaufpruefung ********************************************************
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index 13081f7604a6..2d3d9c319bbb 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -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
@@ -30,7 +30,7 @@
#include "globals.hrc"
#include "helpid.h"
// ----- defined strings -----------------------------------------------------
-#define LABEL_STRING \
+#define LABEL_STRING \
Text [ en-US ] = "Labels" ; \
#define BUSINESS_CARD_STRING \
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 8cbf3bc650ed..bdc0ca159b25 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -2,7 +2,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
@@ -126,7 +126,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC)));
GetOKButton().SetHelpId(HID_LABEL_INSERT);
- GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage ::Create, 0, sal_False, 0);
AddTabPage(TP_VISITING_CARDS, SwVisitingCardPage::Create, 0);
@@ -278,7 +278,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
aAddrBox .SetClickHdl (LINK(this, SwLabPage, AddrHdl ));
aDatabaseLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
aTableLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
- aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl ));
+ aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl ));
aContButton .SetClickHdl (LINK(this, SwLabPage, PageHdl ));
aSheetButton .SetClickHdl (LINK(this, SwLabPage, PageHdl ));
aMakeBox .SetSelectHdl(LINK(this, SwLabPage, MakeHdl ));
@@ -418,7 +418,7 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG )
GetParent()->ReplaceGroup( aMake );
aItem.aLstMake = aMake;
- const sal_Bool bCont = aContButton.IsChecked();
+ const sal_Bool bCont = aContButton.IsChecked();
const sal_uInt16 nCount = GetParent()->Recs().Count();
sal_uInt16 nLstType = 0;
@@ -474,8 +474,8 @@ void SwLabPage::DisplayFormat()
FieldUnit aMetric = ::GetDfltMetric(FALSE);
SetMetric(aField, aMetric);
aField.SetDecimalDigits(2);
- aField.SetMin (0);
- aField.SetMax (LONG_MAX);
+ aField.SetMin (0);
+ aField.SetMax (LONG_MAX);
SwLabRec* pRec = GetSelectedEntryPos();
aItem.aLstType = pRec->aType;
@@ -577,8 +577,8 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
String aWriting( aItem.aWriting );
- aAddrBox .Check ( aItem.bAddr );
- aWritingEdit.SetText ( aWriting.ConvertLineEnd() );
+ aAddrBox .Check ( aItem.bAddr );
+ aWritingEdit.SetText ( aWriting.ConvertLineEnd() );
const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().Count();
for (sal_uInt16 i = 0; i < nCount; ++i)
@@ -589,7 +589,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
}
- aMakeBox .SelectEntry( aItem.aMake );
+ aMakeBox .SelectEntry( aItem.aMake );
//save the current type
String sType(aItem.aType);
aMakeBox.GetSelectHdl().Call( &aMakeBox );
@@ -636,11 +636,11 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_VISITING_CARDS), rSet),
- aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )),
- aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )),
- aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )),
+ aAutoTextLB(this, SW_RES( LB_AUTO_TEXT )),
+ aAutoTextGroupFT(this, SW_RES( FT_AUTO_TEXT_GROUP )),
+ aAutoTextGroupLB(this, SW_RES( LB_AUTO_TEXT_GROUP )),
aContentFL(this, SW_RES( FL_CONTENT )),
- aExampleWIN(this, SW_RES( WIN_EXAMPLE )),
+ aExampleWIN(this, SW_RES( WIN_EXAMPLE )),
sVisCardGroup(SW_RES(ST_VISCARD_GROUP)),
pExampleFrame(0)
{
@@ -844,24 +844,24 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
- aItem.aPrivFirstName = aFirstNameED .GetText();
- aItem.aPrivName = aNameED .GetText( );
- aItem.aPrivShortCut = aShortCutED .GetText( );
- aItem.aPrivFirstName2 = aFirstName2ED .GetText();
- aItem.aPrivName2 = aName2ED .GetText( );
+ aItem.aPrivFirstName = aFirstNameED .GetText();
+ aItem.aPrivName = aNameED .GetText( );
+ aItem.aPrivShortCut = aShortCutED .GetText( );
+ aItem.aPrivFirstName2 = aFirstName2ED .GetText();
+ aItem.aPrivName2 = aName2ED .GetText( );
aItem.aPrivShortCut2 = aShortCut2ED .GetText( );
- aItem.aPrivStreet = aStreetED .GetText( );
- aItem.aPrivZip = aZipED .GetText( );
- aItem.aPrivCity = aCityED .GetText( );
- aItem.aPrivCountry = aCountryED .GetText( );
- aItem.aPrivState = aStateED .GetText( );
- aItem.aPrivTitle = aTitleED .GetText( );
- aItem.aPrivProfession= aProfessionED.GetText( );
- aItem.aPrivPhone = aPhoneED .GetText( );
- aItem.aPrivMobile = aMobilePhoneED.GetText( );
- aItem.aPrivFax = aFaxED .GetText( );
- aItem.aPrivWWW = aHomePageED .GetText( );
- aItem.aPrivMail = aMailED .GetText( );
+ aItem.aPrivStreet = aStreetED .GetText( );
+ aItem.aPrivZip = aZipED .GetText( );
+ aItem.aPrivCity = aCityED .GetText( );
+ aItem.aPrivCountry = aCountryED .GetText( );
+ aItem.aPrivState = aStateED .GetText( );
+ aItem.aPrivTitle = aTitleED .GetText( );
+ aItem.aPrivProfession= aProfessionED.GetText( );
+ aItem.aPrivPhone = aPhoneED .GetText( );
+ aItem.aPrivMobile = aMobilePhoneED.GetText( );
+ aItem.aPrivFax = aFaxED .GetText( );
+ aItem.aPrivWWW = aHomePageED .GetText( );
+ aItem.aPrivMail = aMailED .GetText( );
rSet.Put(aItem);
return sal_True;
@@ -893,30 +893,30 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) :
SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet),
aDataFL (this, SW_RES( FL_DATA )),
- aCompanyFT (this, SW_RES( FT_COMP )),
- aCompanyED (this, SW_RES( ED_COMP )),
- aCompanyExtFT (this, SW_RES( FT_COMP_EXT )),
- aCompanyExtED (this, SW_RES( ED_COMP_EXT )),
- aSloganFT (this, SW_RES( FT_SLOGAN )),
- aSloganED (this, SW_RES( ED_SLOGAN )),
- aStreetFT (this, SW_RES( FT_STREET )),
- aStreetED (this, SW_RES( ED_STREET )),
- aZipCityFT (this, SW_RES( FT_ZIPCITY )),
- aZipED (this, SW_RES( ED_ZIP )),
- aCityED (this, SW_RES( ED_CITY )),
- aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )),
- aCountryED (this, SW_RES( ED_COUNTRY )),
- aStateED (this, SW_RES( ED_STATE )),
- aPositionFT (this, SW_RES( FT_POSITION )),
- aPositionED (this, SW_RES( ED_POSITION )),
- aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )),
- aPhoneED (this, SW_RES( ED_PHONE )),
- aMobilePhoneED (this, SW_RES( ED_MOBILE )),
- aFaxFT (this, SW_RES( FT_FAX )),
- aFaxED (this, SW_RES( ED_FAX )),
- aWWWMailFT (this, SW_RES( FT_WWWMAIL )),
- aHomePageED (this, SW_RES( ED_WWW )),
- aMailED (this, SW_RES( ED_MAIL ))
+ aCompanyFT (this, SW_RES( FT_COMP )),
+ aCompanyED (this, SW_RES( ED_COMP )),
+ aCompanyExtFT (this, SW_RES( FT_COMP_EXT )),
+ aCompanyExtED (this, SW_RES( ED_COMP_EXT )),
+ aSloganFT (this, SW_RES( FT_SLOGAN )),
+ aSloganED (this, SW_RES( ED_SLOGAN )),
+ aStreetFT (this, SW_RES( FT_STREET )),
+ aStreetED (this, SW_RES( ED_STREET )),
+ aZipCityFT (this, SW_RES( FT_ZIPCITY )),
+ aZipED (this, SW_RES( ED_ZIP )),
+ aCityED (this, SW_RES( ED_CITY )),
+ aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )),
+ aCountryED (this, SW_RES( ED_COUNTRY )),
+ aStateED (this, SW_RES( ED_STATE )),
+ aPositionFT (this, SW_RES( FT_POSITION )),
+ aPositionED (this, SW_RES( ED_POSITION )),
+ aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )),
+ aPhoneED (this, SW_RES( ED_PHONE )),
+ aMobilePhoneED (this, SW_RES( ED_MOBILE )),
+ aFaxFT (this, SW_RES( FT_FAX )),
+ aFaxED (this, SW_RES( ED_FAX )),
+ aWWWMailFT (this, SW_RES( FT_WWWMAIL )),
+ aHomePageED (this, SW_RES( ED_WWW )),
+ aMailED (this, SW_RES( ED_MAIL ))
{
FreeResource();
SetExchangeSupport();
@@ -948,20 +948,20 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
- aItem.aCompCompany = aCompanyED .GetText();
+ aItem.aCompCompany = aCompanyED .GetText();
aItem.aCompCompanyExt= aCompanyExtED .GetText();
- aItem.aCompSlogan = aSloganED .GetText();
- aItem.aCompStreet = aStreetED .GetText();
- aItem.aCompZip = aZipED .GetText();
- aItem.aCompCity = aCityED .GetText();
- aItem.aCompCountry = aCountryED .GetText();
- aItem.aCompState = aStateED .GetText();
- aItem.aCompPosition = aPositionED .GetText();
- aItem.aCompPhone = aPhoneED .GetText();
- aItem.aCompMobile = aMobilePhoneED .GetText();
- aItem.aCompFax = aFaxED .GetText();
- aItem.aCompWWW = aHomePageED .GetText();
- aItem.aCompMail = aMailED .GetText();
+ aItem.aCompSlogan = aSloganED .GetText();
+ aItem.aCompStreet = aStreetED .GetText();
+ aItem.aCompZip = aZipED .GetText();
+ aItem.aCompCity = aCityED .GetText();
+ aItem.aCompCountry = aCountryED .GetText();
+ aItem.aCompState = aStateED .GetText();
+ aItem.aCompPosition = aPositionED .GetText();
+ aItem.aCompPhone = aPhoneED .GetText();
+ aItem.aCompMobile = aMobilePhoneED .GetText();
+ aItem.aCompFax = aFaxED .GetText();
+ aItem.aCompWWW = aHomePageED .GetText();
+ aItem.aCompMail = aMailED .GetText();
rSet.Put(aItem);
return sal_True;
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 4b2dba3ef7b6..e2afb7cfbcda 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@ SwLabelConfig::~SwLabelConfig()
{
}
-void SwLabelConfig::Commit()
+void SwLabelConfig::Commit()
{
// the config item is not writable yet
}
@@ -116,11 +116,11 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur
return pNewRec;
}
-Sequence<PropertyValue> lcl_CreateProperties(
+Sequence<PropertyValue> lcl_CreateProperties(
Sequence<OUString>& rPropNames, const SwLabRec& rRec)
{
const OUString* pNames = rPropNames.getConstArray();
- Sequence<PropertyValue> aRet(rPropNames.getLength());
+ Sequence<PropertyValue> aRet(rPropNames.getLength());
PropertyValue* pValues = aRet.getArray();
OUString sColon(C2U(";"));
@@ -150,7 +150,7 @@ Sequence<PropertyValue> lcl_CreateProperties(
return aRet;
}
-void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr)
+void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr)
{
OUString sManufacturer(wrapConfigurationElementName(rManufacturer));
const Sequence<OUString> aLabels = GetNodeNames(sManufacturer);
@@ -162,13 +162,13 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab
sPrefix += pLabels[nLabel];
sPrefix += C2U("/");
Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix);
- Sequence<Any> aValues = GetProperties(aPropNames);
+ Sequence<Any> aValues = GetProperties(aPropNames);
SwLabRec* pNewRec = lcl_CreateSwLabRec(aValues, rManufacturer);
rLabArr.C40_INSERT( SwLabRec, pNewRec, rLabArr.Count() );
}
}
-sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
+sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
{
const OUString* pNode = aNodeNames.getConstArray();
sal_Bool bFound = sal_False;
@@ -191,7 +191,7 @@ sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rt
Sequence<OUString> aProperties(1);
aProperties.getArray()[0] = sPrefix;
aProperties.getArray()[0] += C2U("Name");
- Sequence<Any> aValues = GetProperties(aProperties);
+ Sequence<Any> aValues = GetProperties(aProperties);
const Any* pValues = aValues.getConstArray();
if(pValues[0].hasValue())
{
@@ -214,8 +214,8 @@ sal_Bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
return sal_False;
}
-void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
- const rtl::OUString& rType, const SwLabRec& rRec)
+void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
+ const rtl::OUString& rType, const SwLabRec& rRec)
{
const OUString* pNode = aNodeNames.getConstArray();
sal_Bool bFound = sal_False;
@@ -250,7 +250,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
Sequence<OUString> aProperties(1);
aProperties.getArray()[0] = sPrefix;
aProperties.getArray()[0] += C2U("Name");
- Sequence<Any> aValues = GetProperties(aProperties);
+ Sequence<Any> aValues = GetProperties(aProperties);
const Any* pValues = aValues.getConstArray();
if(pValues[0].hasValue())
{
@@ -281,7 +281,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
sPrefix += sFoundNode;
sPrefix += C2U("/");
Sequence<OUString> aPropNames = lcl_CreatePropertyNames(sPrefix);
- Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec);
+ Sequence<PropertyValue> aPropValues = lcl_CreateProperties(aPropNames, rRec);
SetSetProperties(wrapConfigurationElementName(rManufacturer), aPropValues);
}
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 88744e583f77..e935cf786ed5 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 4937037a3056..23b0bc60ec61 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
Font aFont = GetFont();
aFont.SetTransparent(TRUE);
- aFont.SetWeight (WEIGHT_NORMAL);
+ aFont.SetWeight (WEIGHT_NORMAL);
SetFont(aFont);
const Size aSz(GetOutputSizePixel());
@@ -90,9 +90,9 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
lHDistWidth = GetTextWidth(aHDistStr );
lVDistWidth = GetTextWidth(aVDistStr );
lHeightWidth = GetTextWidth(aHeightStr);
- lLeftWidth = GetTextWidth(aLeftStr );
+ lLeftWidth = GetTextWidth(aLeftStr );
lUpperWidth = GetTextWidth(aUpperStr );
- lColsWidth = GetTextWidth(aColsStr );
+ lColsWidth = GetTextWidth(aColsStr );
lXHeight = GetTextHeight();
lXWidth = GetTextWidth('X');
@@ -150,8 +150,8 @@ void SwLabPreview::Paint(const Rectangle &)
long lX0 = (lOutWPix - lOutlineW) / 2;
long lY0 = (lOutHPix - lOutlineH) / 2;
- long lX1 = ROUND(lX0 + f * aItem.lLeft );
- long lY1 = ROUND(lY0 + f * aItem.lUpper);
+ long lX1 = ROUND(lX0 + f * aItem.lLeft );
+ long lY1 = ROUND(lY0 + f * aItem.lUpper);
long lX2 = ROUND(lX0 + f * (aItem.lLeft + aItem.lWidth ));
long lY2 = ROUND(lY0 + f * (aItem.lUpper + aItem.lHeight));
long lX3 = ROUND(lX0 + f * (aItem.lLeft + aItem.lHDist ));
@@ -344,20 +344,20 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) :
aVDistField .SetModifyHdl( aLk );
aWidthField .SetModifyHdl( aLk );
aHeightField.SetModifyHdl( aLk );
- aLeftField .SetModifyHdl( aLk );
+ aLeftField .SetModifyHdl( aLk );
aUpperField .SetModifyHdl( aLk );
- aColsField .SetModifyHdl( aLk );
- aRowsField .SetModifyHdl( aLk );
+ aColsField .SetModifyHdl( aLk );
+ aRowsField .SetModifyHdl( aLk );
aLk = LINK(this, SwLabFmtPage, LoseFocusHdl);
aHDistField .SetLoseFocusHdl( aLk );
aVDistField .SetLoseFocusHdl( aLk );
aWidthField .SetLoseFocusHdl( aLk );
aHeightField.SetLoseFocusHdl( aLk );
- aLeftField .SetLoseFocusHdl( aLk );
+ aLeftField .SetLoseFocusHdl( aLk );
aUpperField .SetLoseFocusHdl( aLk );
- aColsField .SetLoseFocusHdl( aLk );
- aRowsField .SetLoseFocusHdl( aLk );
+ aColsField .SetLoseFocusHdl( aLk );
+ aRowsField .SetLoseFocusHdl( aLk );
aSavePB.SetClickHdl( LINK (this, SwLabFmtPage, SaveHdl));
// Set timer
@@ -410,7 +410,7 @@ void SwLabFmtPage::ChangeMinMax()
lHDist = static_cast< long >(GETFLDVAL(aHDistField)),
lVDist = static_cast< long >(GETFLDVAL(aVDistField));
- long nMinSize = 10; // 0,1cm
+ long nMinSize = 10; // 0,1cm
aHDistField .SetMin(nMinSize, FUNIT_CM);
aVDistField .SetMin(nMinSize, FUNIT_CM);
@@ -424,11 +424,11 @@ void SwLabFmtPage::ChangeMinMax()
aWidthField .SetMax((long) 100 * (lHDist), FUNIT_TWIP);
aHeightField.SetMax((long) 100 * (lVDist), FUNIT_TWIP);
- aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP);
+ aLeftField .SetMax((long) 100 * (lMax - (long) aColsField.GetValue() * GETFLDVAL(aHDistField)), FUNIT_TWIP);
aUpperField .SetMax((long) 100 * (lMax - (long) aRowsField.GetValue() * GETFLDVAL(aVDistField)), FUNIT_TWIP);
- aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist));
- aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist));
+ aColsField .SetMax((lMax - lLeft ) / Max(1L, lHDist));
+ aRowsField .SetMax((lMax - lUpper) / Max(1L, lVDist));
// First und Last
@@ -444,20 +444,20 @@ void SwLabFmtPage::ChangeMinMax()
aWidthField .SetLast (aWidthField .GetMax());
aHeightField.SetLast (aHeightField.GetMax());
- aLeftField .SetLast (aLeftField .GetMax());
+ aLeftField .SetLast (aLeftField .GetMax());
aUpperField .SetLast (aUpperField .GetMax());
- aColsField .SetLast (aColsField .GetMax());
- aRowsField .SetLast (aRowsField .GetMax());
+ aColsField .SetLast (aColsField .GetMax());
+ aRowsField .SetLast (aRowsField .GetMax());
aHDistField .Reformat();
aVDistField .Reformat();
aWidthField .Reformat();
aHeightField.Reformat();
- aLeftField .Reformat();
+ aLeftField .Reformat();
aUpperField .Reformat();
- aColsField .Reformat();
- aRowsField .Reformat();
+ aColsField .Reformat();
+ aRowsField .Reformat();
}
SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet)
@@ -492,8 +492,8 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
rItem.lHeight = rRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField));
rItem.lLeft = rRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField ));
rItem.lUpper = rRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField ));
- rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue();
- rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue();
+ rItem.nCols = rRec.nCols = (USHORT) aColsField.GetValue();
+ rItem.nRows = rRec.nRows = (USHORT) aRowsField.GetValue();
}
}
@@ -514,7 +514,7 @@ void SwLabFmtPage::Reset(const SfxItemSet& )
aVDistField .SetMax(100 * aItem.lVDist , FUNIT_TWIP);
aWidthField .SetMax(100 * aItem.lWidth , FUNIT_TWIP);
aHeightField.SetMax(100 * aItem.lHeight, FUNIT_TWIP);
- aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP);
+ aLeftField .SetMax(100 * aItem.lLeft , FUNIT_TWIP);
aUpperField .SetMax(100 * aItem.lUpper , FUNIT_TWIP);
SETFLDVAL(aHDistField , aItem.lHDist );
@@ -527,8 +527,8 @@ void SwLabFmtPage::Reset(const SfxItemSet& )
aColsField.SetMax(aItem.nCols);
aRowsField.SetMax(aItem.nRows);
- aColsField .SetValue(aItem.nCols);
- aRowsField .SetValue(aItem.nRows);
+ aColsField .SetValue(aItem.nCols);
+ aRowsField .SetValue(aItem.nRows);
aMakeFI.SetText(aItem.aMake);
aTypeFI.SetText(aItem.aType);
PreviewHdl(0);
@@ -543,8 +543,8 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG )
aRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField));
aRec.lLeft = static_cast< long >(GETFLDVAL(aLeftField ));
aRec.lUpper = static_cast< long >(GETFLDVAL(aUpperField ));
- aRec.nCols = (USHORT) aColsField.GetValue();
- aRec.nRows = (USHORT) aRowsField.GetValue();
+ aRec.nCols = (USHORT) aColsField.GetValue();
+ aRec.nRows = (USHORT) aRowsField.GetValue();
aRec.bCont = aItem.bCont;
SwSaveLabelDlg* pSaveDlg = new SwSaveLabelDlg(this, aRec);
pSaveDlg->SetLabel(aItem.aLstMake, aItem.aLstType);
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index bf47c0c9ccd4..399b9062b63c 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -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
@@ -50,9 +50,9 @@
#define TXT_ROWS 16
#define FLD_ROWS 17
#define FL_NONAME 18
-#define PB_SAVE 19
+#define PB_SAVE 19
#define FI_MAKE 20
-#define FI_TYPE 21
+#define FI_TYPE 21
#define FL_OPTIONS 1
#define FT_MAKE 2
@@ -62,7 +62,7 @@
#define PB_OK 6
#define PB_CANCEL 7
#define PB_HELP 8
-#define MB_QUERY 9
+#define MB_QUERY 9
// Globale Resourcen ********************************************************
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 5d24909b5376..d4f9a1b577f8 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -2,7 +2,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
@@ -86,31 +86,31 @@ public:
class SwLabFmtPage : public SfxTabPage
{
- FixedInfo aMakeFI;
- FixedInfo aTypeFI;
+ FixedInfo aMakeFI;
+ FixedInfo aTypeFI;
SwLabPreview aPreview;
- FixedText aHDistText;
- MetricField aHDistField;
- FixedText aVDistText;
- MetricField aVDistField;
- FixedText aWidthText;
- MetricField aWidthField;
- FixedText aHeightText;
- MetricField aHeightField;
- FixedText aLeftText;
- MetricField aLeftField;
- FixedText aUpperText;
- MetricField aUpperField;
- FixedText aColsText;
+ FixedText aHDistText;
+ MetricField aHDistField;
+ FixedText aVDistText;
+ MetricField aVDistField;
+ FixedText aWidthText;
+ MetricField aWidthField;
+ FixedText aHeightText;
+ MetricField aHeightField;
+ FixedText aLeftText;
+ MetricField aLeftField;
+ FixedText aUpperText;
+ MetricField aUpperField;
+ FixedText aColsText;
NumericField aColsField;
- FixedText aRowsText;
+ FixedText aRowsText;
NumericField aRowsField;
- PushButton aSavePB;
+ PushButton aSavePB;
Timer aPreviewTimer;
BOOL bModified;
- SwLabItem aItem;
+ SwLabItem aItem;
SwLabFmtPage(Window* pParent, const SfxItemSet& rSet);
~SwLabFmtPage();
@@ -144,20 +144,20 @@ public:
class SwSaveLabelDlg : public ModalDialog
{
FixedLine aOptionsFL;
- FixedText aMakeFT;
- ComboBox aMakeCB;
- FixedText aTypeFT;
- Edit aTypeED;
+ FixedText aMakeFT;
+ ComboBox aMakeCB;
+ FixedText aTypeFT;
+ Edit aTypeED;
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOKPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
- QueryBox aQueryMB;
+ QueryBox aQueryMB;
- sal_Bool bSuccess;
- SwLabFmtPage* pLabPage;
- SwLabRec& rLabRec;
+ sal_Bool bSuccess;
+ SwLabFmtPage* pLabPage;
+ SwLabRec& rLabRec;
DECL_LINK(OkHdl, OKButton*);
DECL_LINK(ModifyHdl, Edit*);
@@ -165,7 +165,7 @@ class SwSaveLabelDlg : public ModalDialog
public:
SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec);
- void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType)
+ void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType)
{
aMakeCB.SetText(String(rMake));
aTypeED.SetText(String(rType));
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 2ad95e2b65a9..49b5e5515488 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -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
@@ -213,7 +213,7 @@ TabPage TP_LAB_FMT
Minimum = 1 ;
First = 1 ;
};
- PushButton PB_SAVE
+ PushButton PB_SAVE
{
Pos = MAP_APPFONT ( 50 , 148 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 9a6e45e0e208..1f6b9a7b9e1c 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -2,7 +2,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
@@ -58,9 +58,9 @@ SwLabItem::SwLabItem() :
{
bAddr = bCont = bSynchron = FALSE;
bPage = TRUE;
- lHDist =
- lVDist =
- lWidth =
+ lHDist =
+ lVDist =
+ lWidth =
lHeight = 5669; // 10 cm
}
@@ -72,31 +72,31 @@ SwLabItem::SwLabItem(const SwLabItem& rItem) :
SwLabItem& SwLabItem::operator =(const SwLabItem& rItem)
{
- bAddr = rItem.bAddr;
+ bAddr = rItem.bAddr;
aWriting = rItem.aWriting;
- bCont = rItem.bCont;
+ bCont = rItem.bCont;
sDBName = rItem.sDBName;
aLstMake = rItem.aLstMake;
aLstType = rItem.aLstType;
- aMake = rItem.aMake;
- aType = rItem.aType;
- bPage = rItem.bPage;
+ aMake = rItem.aMake;
+ aType = rItem.aType;
+ bPage = rItem.bPage;
bSynchron = rItem.bSynchron;
- aBin = rItem.aBin;
- nCol = rItem.nCol;
- nRow = rItem.nRow;
- lHDist = rItem.lHDist;
- lVDist = rItem.lVDist;
- lWidth = rItem.lWidth;
+ aBin = rItem.aBin;
+ nCol = rItem.nCol;
+ nRow = rItem.nRow;
+ lHDist = rItem.lHDist;
+ lVDist = rItem.lVDist;
+ lWidth = rItem.lWidth;
lHeight = rItem.lHeight;
- lLeft = rItem.lLeft;
- lUpper = rItem.lUpper;
- nCols = rItem.nCols;
- nRows = rItem.nRows;
- aPrivFirstName = rItem.aPrivFirstName;
+ lLeft = rItem.lLeft;
+ lUpper = rItem.lUpper;
+ nCols = rItem.nCols;
+ nRows = rItem.nRows;
+ aPrivFirstName = rItem.aPrivFirstName;
aPrivName = rItem.aPrivName;
aPrivShortCut = rItem.aPrivShortCut;
- aPrivFirstName2 = rItem.aPrivFirstName2;
+ aPrivFirstName2 = rItem.aPrivFirstName2;
aPrivName2 = rItem.aPrivName2;
aPrivShortCut2 = rItem.aPrivShortCut2;
aPrivStreet = rItem.aPrivStreet;
@@ -134,31 +134,31 @@ int SwLabItem::operator ==(const SfxPoolItem& rItem) const
{
const SwLabItem& rLab = (const SwLabItem&) rItem;
- return bAddr == rLab.bAddr &&
- bCont == rLab.bCont &&
- bPage == rLab.bPage &&
+ return bAddr == rLab.bAddr &&
+ bCont == rLab.bCont &&
+ bPage == rLab.bPage &&
bSynchron == rLab.bSynchron &&
- aBin == rLab.aBin &&
- nCol == rLab.nCol &&
- nRow == rLab.nRow &&
- lHDist == rLab.lHDist &&
- lVDist == rLab.lVDist &&
- lWidth == rLab.lWidth &&
- lHeight == rLab.lHeight &&
- lLeft == rLab.lLeft &&
- lUpper == rLab.lUpper &&
- nCols == rLab.nCols &&
- nRows == rLab.nRows &&
+ aBin == rLab.aBin &&
+ nCol == rLab.nCol &&
+ nRow == rLab.nRow &&
+ lHDist == rLab.lHDist &&
+ lVDist == rLab.lVDist &&
+ lWidth == rLab.lWidth &&
+ lHeight == rLab.lHeight &&
+ lLeft == rLab.lLeft &&
+ lUpper == rLab.lUpper &&
+ nCols == rLab.nCols &&
+ nRows == rLab.nRows &&
aWriting == rLab.aWriting&&
- aMake == rLab.aMake &&
- aType == rLab.aType &&
- aLstMake == rLab.aLstMake&&
- aLstType == rLab.aLstType&&
+ aMake == rLab.aMake &&
+ aType == rLab.aType &&
+ aLstMake == rLab.aLstMake&&
+ aLstType == rLab.aLstType&&
sDBName == rLab.sDBName &&
- aPrivFirstName == rLab.aPrivFirstName&&
+ aPrivFirstName == rLab.aPrivFirstName&&
aPrivName == rLab.aPrivName&&
aPrivShortCut == rLab.aPrivShortCut&&
- aPrivFirstName2 == rLab.aPrivFirstName2&&
+ aPrivFirstName2 == rLab.aPrivFirstName2&&
aPrivName2 == rLab.aPrivName2&&
aPrivShortCut2 == rLab.aPrivShortCut2&&
aPrivStreet == rLab.aPrivStreet&&
@@ -200,61 +200,61 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
{
static const char* aLabelPropNames[] =
{
- "Medium/Continous", // 0
- "Medium/Brand", // 1
- "Medium/Type", // 2
- "Format/Column", // 3
- "Format/Row", // 4
+ "Medium/Continous", // 0
+ "Medium/Brand", // 1
+ "Medium/Type", // 2
+ "Format/Column", // 3
+ "Format/Row", // 4
"Format/HorizontalDistance",// 5
- "Format/VerticalDistance", // 6
- "Format/Width", // 7
- "Format/Height", // 8
- "Format/LeftMargin", // 9
- "Format/TopMargin", //10
- "Option/Synchronize", //11
- "Option/Page", //12
- "Option/Column", //13
- "Option/Row", //14
- "Inscription/UseAddress", //15
- "Inscription/Address", //16
- "Inscription/Database" //17
+ "Format/VerticalDistance", // 6
+ "Format/Width", // 7
+ "Format/Height", // 8
+ "Format/LeftMargin", // 9
+ "Format/TopMargin", //10
+ "Option/Synchronize", //11
+ "Option/Page", //12
+ "Option/Column", //13
+ "Option/Row", //14
+ "Inscription/UseAddress", //15
+ "Inscription/Address", //16
+ "Inscription/Database" //17
};
static const char* aBusinessPropNames[] =
{
- "PrivateAddress/FirstName", // 0
- "PrivateAddress/Name", // 1
- "PrivateAddress/ShortCut", // 2
- "PrivateAddress/SecondFirstName", // 3
- "PrivateAddress/SecondName", // 4
- "PrivateAddress/SecondShortCut", // 5
- "PrivateAddress/Street", // 6
- "PrivateAddress/Zip", // 7
- "PrivateAddress/City", // 8
- "PrivateAddress/Country", // 9
- "PrivateAddress/State", // 10
- "PrivateAddress/Title", // 11
- "PrivateAddress/Profession", // 12
- "PrivateAddress/Phone", // 13
- "PrivateAddress/Mobile", // 14
- "PrivateAddress/Fax", // 15
- "PrivateAddress/WebAddress", // 16
- "PrivateAddress/Email", // 17
- "BusinessAddress/Company", // 18
- "BusinessAddress/CompanyExt", // 19
- "BusinessAddress/Slogan", // 20
- "BusinessAddress/Street", // 21
- "BusinessAddress/Zip", // 22
- "BusinessAddress/City", // 23
- "BusinessAddress/Country", // 24
- "BusinessAddress/State", // 25
- "BusinessAddress/Position", // 26
- "BusinessAddress/Phone", // 27
- "BusinessAddress/Mobile", // 28
- "BusinessAddress/Fax", // 29
- "BusinessAddress/WebAddress", // 30
- "BusinessAddress/Email", // 31
- "AutoText/Group", // 32
- "AutoText/Block" // 33
+ "PrivateAddress/FirstName", // 0
+ "PrivateAddress/Name", // 1
+ "PrivateAddress/ShortCut", // 2
+ "PrivateAddress/SecondFirstName", // 3
+ "PrivateAddress/SecondName", // 4
+ "PrivateAddress/SecondShortCut", // 5
+ "PrivateAddress/Street", // 6
+ "PrivateAddress/Zip", // 7
+ "PrivateAddress/City", // 8
+ "PrivateAddress/Country", // 9
+ "PrivateAddress/State", // 10
+ "PrivateAddress/Title", // 11
+ "PrivateAddress/Profession", // 12
+ "PrivateAddress/Phone", // 13
+ "PrivateAddress/Mobile", // 14
+ "PrivateAddress/Fax", // 15
+ "PrivateAddress/WebAddress", // 16
+ "PrivateAddress/Email", // 17
+ "BusinessAddress/Company", // 18
+ "BusinessAddress/CompanyExt", // 19
+ "BusinessAddress/Slogan", // 20
+ "BusinessAddress/Street", // 21
+ "BusinessAddress/Zip", // 22
+ "BusinessAddress/City", // 23
+ "BusinessAddress/Country", // 24
+ "BusinessAddress/State", // 25
+ "BusinessAddress/Position", // 26
+ "BusinessAddress/Phone", // 27
+ "BusinessAddress/Mobile", // 28
+ "BusinessAddress/Fax", // 29
+ "BusinessAddress/WebAddress", // 30
+ "BusinessAddress/Email", // 31
+ "AutoText/Group", // 32
+ "AutoText/Block" // 33
};
const int nBusinessCount = bIsLabel ? 0 : 34;
const int nLabelCount = bIsLabel ? 18 : 15;
@@ -293,10 +293,10 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
switch(nProperty)
{
case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous",
- case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand",
- case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type",
- case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column",
- case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row",
+ case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand",
+ case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type",
+ case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column",
+ case 4: pValues[nProp] >>= aItem.nRows; break;// "Format/Row",
case 5:
pValues[nProp] >>= aItem.lHDist;
aItem.lHDist = MM100_TO_TWIP(aItem.lHDist);
@@ -323,44 +323,44 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
break;// "Format/TopMargin",
case 11: aItem.bSynchron = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Synchronize",
case 12: aItem.bPage = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Page",
- case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column",
- case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row"
- case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress",
- case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address",
- case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database"
- case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
- case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name",
- case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
- case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
- case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
- case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
- case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street",
- case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip",
- case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City",
- case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country",
- case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State",
- case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title",
- case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
- case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
- case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
- case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax",
- case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
- case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email",
- case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company",
- case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
- case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
- case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street",
- case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip",
- case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City",
- case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country",
- case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State",
- case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position",
- case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone",
- case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
- case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax",
- case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
- case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email",
- case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group"
+ case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column",
+ case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row"
+ case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress",
+ case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address",
+ case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database"
+ case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
+ case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name",
+ case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
+ case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
+ case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
+ case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
+ case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street",
+ case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip",
+ case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City",
+ case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country",
+ case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State",
+ case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title",
+ case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
+ case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
+ case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
+ case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax",
+ case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
+ case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email",
+ case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company",
+ case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
+ case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
+ case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street",
+ case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip",
+ case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City",
+ case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country",
+ case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State",
+ case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position",
+ case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone",
+ case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
+ case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax",
+ case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
+ case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email",
+ case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group"
case 51: pValues[nProp] >>= aItem.sGlossaryBlockName; break;// "AutoText/Block"
}
}
@@ -393,7 +393,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
-void SwLabCfgItem::Commit()
+void SwLabCfgItem::Commit()
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues(aNames.getLength());
@@ -408,56 +408,56 @@ void SwLabCfgItem::Commit()
switch(nProperty)
{
case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continous",
- case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand",
- case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type",
- case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column",
- case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row",
+ case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand",
+ case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type",
+ case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column",
+ case 4: pValues[nProp] <<= aItem.nRows; break;// "Format/Row",
case 5: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHDist));break;// "Format/HorizontalDistance",
case 6: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lVDist));break;// "Format/VerticalDistance",
- case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width",
- case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height",
- case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin",
- case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin",
+ case 7: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lWidth)); break;// "Format/Width",
+ case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height",
+ case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin",
+ case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin",
case 11: pValues[nProp].setValue(&aItem.bSynchron, rType); break;// "Option/Synchronize",
case 12: pValues[nProp].setValue(&aItem.bPage, rType); break;// "Option/Page",
- case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column",
- case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row"
- case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress",
- case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address",
- case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database"
- case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
- case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name",
- case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
- case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
- case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
- case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
- case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street",
- case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip",
- case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City",
- case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country",
- case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State",
- case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title",
- case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
- case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
- case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
- case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax",
- case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
- case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email",
- case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company",
- case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
- case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
- case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street",
- case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip",
- case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City",
- case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country",
- case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State",
- case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position",
- case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone",
- case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
- case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax",
- case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
- case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email",
- case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group"
+ case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column",
+ case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row"
+ case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress",
+ case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address",
+ case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database"
+ case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
+ case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name",
+ case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
+ case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
+ case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
+ case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
+ case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street",
+ case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip",
+ case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City",
+ case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country",
+ case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State",
+ case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title",
+ case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
+ case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
+ case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
+ case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax",
+ case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
+ case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email",
+ case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company",
+ case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
+ case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
+ case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street",
+ case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip",
+ case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City",
+ case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country",
+ case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State",
+ case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position",
+ case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone",
+ case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
+ case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax",
+ case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
+ case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email",
+ case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group"
case 51: pValues[nProp] <<= aItem.sGlossaryBlockName; break;// "AutoText/Block"
}
}
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx
index 603ec3f88e97..f0a2b6b425d3 100644
--- a/sw/source/ui/envelp/labimp.hxx
+++ b/sw/source/ui/envelp/labimp.hxx
@@ -2,7 +2,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
@@ -84,7 +84,7 @@
#include <label.hxx>
#include <labimg.hxx>
-#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
+#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
#define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
class SwNewDBMgr;
@@ -97,17 +97,17 @@ public:
void SetFromItem( const SwLabItem& rItem );
void FillItem( SwLabItem& rItem ) const;
- String aMake;
- String aType;
- long lHDist;
- long lVDist;
- long lWidth;
- long lHeight;
- long lLeft;
- long lUpper;
- sal_Int32 nCols;
- sal_Int32 nRows;
- sal_Bool bCont;
+ String aMake;
+ String aType;
+ long lHDist;
+ long lVDist;
+ long lWidth;
+ long lHeight;
+ long lLeft;
+ long lUpper;
+ sal_Int32 nCols;
+ sal_Int32 nRows;
+ sal_Bool bCont;
};
/* --------------------------------------------------
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 7dce45446dec..3e7b756c3539 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -2,7 +2,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
@@ -53,14 +53,14 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
pPrinter( 0 ),
aPageButton (this, SW_RES(BTN_PAGE )),
aSingleButton (this, SW_RES(BTN_SINGLE )),
- aColText (this, SW_RES(TXT_COL )),
- aColField (this, SW_RES(FLD_COL )),
- aRowText (this, SW_RES(TXT_ROW )),
- aRowField (this, SW_RES(FLD_ROW )),
- aSynchronCB (this, SW_RES(CB_SYNCHRON)),
+ aColText (this, SW_RES(TXT_COL )),
+ aColField (this, SW_RES(FLD_COL )),
+ aRowText (this, SW_RES(TXT_ROW )),
+ aRowField (this, SW_RES(FLD_ROW )),
+ aSynchronCB (this, SW_RES(CB_SYNCHRON)),
aFLDontKnow (this, SW_RES(FL_DONTKNOW)),
aPrinterInfo (this, SW_RES(INF_PRINTER)),
- aPrtSetup (this, SW_RES(BTN_PRTSETUP)),
+ aPrtSetup (this, SW_RES(BTN_PRTSETUP)),
aFLPrinter (this, SW_RES(FL_PRINTER ))
{
@@ -144,8 +144,8 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
void SwLabPrtPage::FillItem(SwLabItem& rItem)
{
rItem.bPage = aPageButton.IsChecked();
- rItem.nCol = (USHORT) aColField.GetValue();
- rItem.nRow = (USHORT) aRowField.GetValue();
+ rItem.nCol = (USHORT) aColField.GetValue();
+ rItem.nRow = (USHORT) aRowField.GetValue();
rItem.bSynchron = aSynchronCB.IsChecked() && aSynchronCB.IsEnabled();
}
@@ -164,8 +164,8 @@ void SwLabPrtPage::Reset(const SfxItemSet& )
SwLabItem aItem;
GetParent()->GetLabItem(aItem);
- aColField.SetValue (aItem.nCol);
- aRowField.SetValue (aItem.nRow);
+ aColField.SetValue (aItem.nCol);
+ aRowField.SetValue (aItem.nRow);
if (aItem.bPage)
{
diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc
index 31cb373dc817..6e3a19154706 100644
--- a/sw/source/ui/envelp/labprt.hrc
+++ b/sw/source/ui/envelp/labprt.hrc
@@ -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
@@ -42,7 +42,7 @@
#define BTN_PRTSETUP 8
#define FL_PRINTER 9
#define FL_DONTKNOW 10
-#define CB_SYNCHRON 11
+#define CB_SYNCHRON 11
// Ueberlaufpruefung ********************************************************
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 5cb0be6cbb47..1dd96b78ae79 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ class SwLabItem;
class SwLabPrtPage : public SfxTabPage
{
- Printer* pPrinter; //Fuer die Schachteinstellug - leider.
+ Printer* pPrinter; //Fuer die Schachteinstellug - leider.
RadioButton aPageButton;
RadioButton aSingleButton;
@@ -50,7 +50,7 @@ class SwLabPrtPage : public SfxTabPage
NumericField aColField;
FixedText aRowText;
NumericField aRowField;
- CheckBox aSynchronCB;
+ CheckBox aSynchronCB;
FixedLine aFLDontKnow;
FixedInfo aPrinterInfo;
diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src
index 4095b3af3750..7d663f9ccb7c 100644
--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -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
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 0fa5c4d8981a..517b0a326df3 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -2,7 +2,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
@@ -156,20 +156,20 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
pBeamerWin (new Window(this, SW_RES(WIN_BEAMER))),
aAllRB (this, SW_RES(RB_ALL)),
- aMarkedRB (this, SW_RES(RB_MARKED)),
- aFromRB (this, SW_RES(RB_FROM)),
- aFromNF (this, SW_RES(NF_FROM)),
- aBisFT (this, SW_RES(FT_BIS)),
- aToNF (this, SW_RES(NF_TO)),
+ aMarkedRB (this, SW_RES(RB_MARKED)),
+ aFromRB (this, SW_RES(RB_FROM)),
+ aFromNF (this, SW_RES(NF_FROM)),
+ aBisFT (this, SW_RES(FT_BIS)),
+ aToNF (this, SW_RES(NF_TO)),
aRecordFL (this, SW_RES(FL_RECORD)),
aSeparatorFL (this, SW_RES(FL_SEPARATOR)),
aPrinterRB (this, SW_RES(RB_PRINTER)),
- aMailingRB (this, SW_RES(RB_MAILING)),
- aFileRB (this, SW_RES(RB_FILE)),
+ aMailingRB (this, SW_RES(RB_MAILING)),
+ aFileRB (this, SW_RES(RB_FILE)),
- aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)),
+ aSingleJobsCB (this, SW_RES(CB_SINGLE_JOBS)),
aSaveMergedDocumentFL(this, SW_RES( FL_SAVE_MERGED_DOCUMENT)),
aSaveSingleDocRB(this, SW_RES( RB_SAVE_SINGLE_DOC )),
@@ -180,34 +180,34 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aColumnLB (this, SW_RES(LB_COLUMN)),
aPathFT (this, SW_RES(FT_PATH)),
- aPathED (this, SW_RES(ED_PATH)),
- aPathPB (this, SW_RES(PB_PATH)),
+ aPathED (this, SW_RES(ED_PATH)),
+ aPathPB (this, SW_RES(PB_PATH)),
aFilterFT (this, SW_RES(FT_FILTER)),
aFilterLB (this, SW_RES(LB_FILTER)),
- aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)),
- aSubjectFT (this, SW_RES(FT_SUBJECT)),
- aSubjectED (this, SW_RES(ED_SUBJECT)),
- aFormatFT (this, SW_RES(FT_FORMAT)),
- aAttachFT (this, SW_RES(FT_ATTACH)),
- aAttachED (this, SW_RES(ED_ATTACH)),
- aAttachPB (this, SW_RES(PB_ATTACH)),
- aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)),
- aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)),
+ aAddressFldLB (this, SW_RES(LB_ADDRESSFLD)),
+ aSubjectFT (this, SW_RES(FT_SUBJECT)),
+ aSubjectED (this, SW_RES(ED_SUBJECT)),
+ aFormatFT (this, SW_RES(FT_FORMAT)),
+ aAttachFT (this, SW_RES(FT_ATTACH)),
+ aAttachED (this, SW_RES(ED_ATTACH)),
+ aAttachPB (this, SW_RES(PB_ATTACH)),
+ aFormatHtmlCB (this, SW_RES(CB_FORMAT_HTML)),
+ aFormatRtfCB (this, SW_RES(CB_FORMAT_RTF)),
aFormatSwCB (this, SW_RES(CB_FORMAT_SW)),
aDestFL (this, SW_RES(FL_DEST)),
aBottomSeparatorFL(this, SW_RES(FL_BOTTOM_SEPARATOR)),
- aOkBTN (this, SW_RES(BTN_OK)),
- aCancelBTN (this, SW_RES(BTN_CANCEL)),
- aHelpBTN (this, SW_RES(BTN_HELP)),
+ aOkBTN (this, SW_RES(BTN_OK)),
+ aCancelBTN (this, SW_RES(BTN_CANCEL)),
+ aHelpBTN (this, SW_RES(BTN_HELP)),
pImpl (new SwMailMergeDlg_Impl),
rSh (rShell),
- rDBName (rSourceName),
- rTableName (rTblName),
+ rDBName (rSourceName),
+ rTableName (rTblName),
nMergeType (DBMGR_MERGE_MAILING),
m_aDialogSize( GetSizePixel() )
{
diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc
index 0bc31c20e7eb..5f3ef3778e59 100644
--- a/sw/source/ui/envelp/mailmrge.hrc
+++ b/sw/source/ui/envelp/mailmrge.hrc
@@ -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
@@ -33,33 +33,33 @@
// Elemente -----------------------------------------------------------------
#define FL_RECORD 1
-#define RB_ALL 2
-#define RB_MARKED 3
-#define RB_FROM 4
-#define NF_FROM 5
-#define FT_BIS 6
-#define NF_TO 7
-#define BTN_OK 8
-#define BTN_CANCEL 9
-#define BTN_HELP 10
-#define RB_PRINTER 11
-#define RB_MAILING 12
-#define FT_ADDRESS 13
-#define LB_ADDRESSFLD 14
-#define FT_SUBJECT 15
-#define ED_SUBJECT 16
+#define RB_ALL 2
+#define RB_MARKED 3
+#define RB_FROM 4
+#define NF_FROM 5
+#define FT_BIS 6
+#define NF_TO 7
+#define BTN_OK 8
+#define BTN_CANCEL 9
+#define BTN_HELP 10
+#define RB_PRINTER 11
+#define RB_MAILING 12
+#define FT_ADDRESS 13
+#define LB_ADDRESSFLD 14
+#define FT_SUBJECT 15
+#define ED_SUBJECT 16
#define FL_DEST 17
-#define CB_SINGLE_JOBS 18
-#define FT_FORMAT 19
-#define CB_FORMAT_SW 20
-#define CB_FORMAT_HTML 21
-#define CB_FORMAT_RTF 22
-#define RB_FILE 23
-#define FT_PATH 24
-#define ED_PATH 25
-#define PB_PATH 26
-#define LB_COLUMN 30
-#define FT_ATTACH 32
+#define CB_SINGLE_JOBS 18
+#define FT_FORMAT 19
+#define CB_FORMAT_SW 20
+#define CB_FORMAT_HTML 21
+#define CB_FORMAT_RTF 22
+#define RB_FILE 23
+#define FT_PATH 24
+#define ED_PATH 25
+#define PB_PATH 26
+#define LB_COLUMN 30
+#define FT_ATTACH 32
#define ED_ATTACH 33
#define PB_ATTACH 34
#define WIN_BEAMER 35
@@ -70,7 +70,7 @@
#define RB_SAVE_INDIVIDUAL 40
#define RB_GENERATE_FROM_DATABASE 41
#define FT_COLUMN 42
-#define FT_FILTER 43
+#define FT_FILTER 43
#define LB_FILTER 44
#define FL_CREATEFROM 1
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
index 81291c3da94a..146fd02d0938 100644
--- a/sw/source/ui/envelp/mailmrge.src
+++ b/sw/source/ui/envelp/mailmrge.src
@@ -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
@@ -30,7 +30,7 @@
#include "helpid.h"
#define _MAIL_MERGE_STRING_ \
- Text [ en-US ] = "Mail Merge" ; \
+ Text [ en-US ] = "Mail Merge" ; \
ModalDialog DLG_MAILMERGE
{
@@ -135,14 +135,14 @@ ModalDialog DLG_MAILMERGE
Size = MAP_APPFONT ( 156 , 8 ) ;
Text [ en-US ] = "Save merged document" ;
};
- RadioButton RB_SAVE_SINGLE_DOC
+ RadioButton RB_SAVE_SINGLE_DOC
{
Pos = MAP_APPFONT ( 150, 139 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "S~ave as single document";
};
- RadioButton RB_SAVE_INDIVIDUAL
+ RadioButton RB_SAVE_INDIVIDUAL
{
Pos = MAP_APPFONT ( 150, 152 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -300,7 +300,7 @@ ModalDialog DLG_MAILMERGE
Size = MAP_APPFONT ( 162 , 8 ) ;
Text [ en-US ] = "Output" ;
};
- FixedLine FL_BOTTOM_SEPARATOR
+ FixedLine FL_BOTTOM_SEPARATOR
{
Pos = MAP_APPFONT ( 0, 232 ) ;
Size = MAP_APPFONT ( 312 , 8 ) ;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index c5d7c150d9ee..b8e9fe348e0b 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -2,7 +2,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
@@ -33,32 +33,32 @@ class SwLabPage : public SfxTabPage
{
SwNewDBMgr* pNewDBMgr;
String sActDBName;
- SwLabItem aItem;
+ SwLabItem aItem;
- FixedText aWritingText;
- CheckBox aAddrBox;
+ FixedText aWritingText;
+ CheckBox aAddrBox;
MultiLineEdit aWritingEdit;
- FixedText aDatabaseFT;
- ListBox aDatabaseLB;
- FixedText aTableFT;
- ListBox aTableLB;
+ FixedText aDatabaseFT;
+ ListBox aDatabaseLB;
+ FixedText aTableFT;
+ ListBox aTableLB;
ImageButton aInsertBT;
- FixedText aDBFieldFT;
- ListBox aDBFieldLB;
-// PushButton aDatabaseButton;
+ FixedText aDBFieldFT;
+ ListBox aDBFieldLB;
+// PushButton aDatabaseButton;
FixedLine aWritingFL;
RadioButton aContButton;
RadioButton aSheetButton;
- FixedText aMakeText;
- ListBox aMakeBox;
- FixedText aTypeText;
- ListBox aTypeBox;
+ FixedText aMakeText;
+ ListBox aMakeBox;
+ FixedText aTypeText;
+ ListBox aTypeBox;
ListBox aHiddenSortTypeBox;
FixedInfo aFormatInfo;
FixedLine aFormatFL;
- sal_Bool m_bLabel;
+ sal_Bool m_bLabel;
SwLabPage(Window* pParent, const SfxItemSet& rSet);
~SwLabPage();
@@ -71,7 +71,7 @@ class SwLabPage : public SfxTabPage
DECL_LINK( MakeHdl, ListBox * );
DECL_LINK( TypeHdl, ListBox * );
- void DisplayFormat ();
+ void DisplayFormat ();
SwLabRec* GetSelectedEntryPos();
using TabPage::ActivatePage;
@@ -90,7 +90,7 @@ public:
SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
- void SetToBusinessCard();
+ void SetToBusinessCard();
void InitDatabaseBox();
inline void SetNewDBMgr(SwNewDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; }
@@ -103,33 +103,33 @@ public:
class SwOneExampleFrame;
class SwVisitingCardPage : public SfxTabPage
{
- SvTreeListBox aAutoTextLB;
- FixedText aAutoTextGroupFT;
- ListBox aAutoTextGroupLB;
+ SvTreeListBox aAutoTextLB;
+ FixedText aAutoTextGroupFT;
+ ListBox aAutoTextGroupLB;
FixedLine aContentFL;
- Window aExampleWIN;
+ Window aExampleWIN;
- String sVisCardGroup;
- String sTempURL;
+ String sVisCardGroup;
+ String sTempURL;
- SwLabItem aLabItem;
+ SwLabItem aLabItem;
- SwOneExampleFrame* pExampleFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText;
+ SwOneExampleFrame* pExampleFrame;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText;
DECL_LINK( AutoTextSelectHdl, void* );
DECL_LINK( FrameControlInitializedHdl, void* );
- void InitFrameControl();
- void UpdateFields();
-
- void ClearUserData();
+ void InitFrameControl();
+ void UpdateFields();
+ void ClearUserData();
+
using SfxTabPage::SetUserData;
- void SetUserData( sal_uInt32 nCnt,
+ void SetUserData( sal_uInt32 nCnt,
const rtl::OUString* pNames,
const rtl::OUString* pValues );
@@ -155,35 +155,35 @@ class SwPrivateDataPage : public SfxTabPage
{
FixedLine aDataFL;
- FixedText aNameFT;
- Edit aFirstNameED;
- Edit aNameED;
- Edit aShortCutED;
-
- FixedText aName2FT;
- Edit aFirstName2ED;
- Edit aName2ED;
- Edit aShortCut2ED;
-
- FixedText aStreetFT;
- Edit aStreetED;
- FixedText aZipCityFT;
- Edit aZipED;
- Edit aCityED;
- FixedText aCountryStateFT;
- Edit aCountryED;
- Edit aStateED;
- FixedText aTitleProfessionFT;
- Edit aTitleED;
- Edit aProfessionED;
- FixedText aPhoneFT;
- Edit aPhoneED;
- Edit aMobilePhoneED;
- FixedText aFaxFT;
- Edit aFaxED;
- FixedText aWWWMailFT;
- Edit aHomePageED;
- Edit aMailED;
+ FixedText aNameFT;
+ Edit aFirstNameED;
+ Edit aNameED;
+ Edit aShortCutED;
+
+ FixedText aName2FT;
+ Edit aFirstName2ED;
+ Edit aName2ED;
+ Edit aShortCut2ED;
+
+ FixedText aStreetFT;
+ Edit aStreetED;
+ FixedText aZipCityFT;
+ Edit aZipED;
+ Edit aCityED;
+ FixedText aCountryStateFT;
+ Edit aCountryED;
+ Edit aStateED;
+ FixedText aTitleProfessionFT;
+ Edit aTitleED;
+ Edit aProfessionED;
+ FixedText aPhoneFT;
+ Edit aPhoneED;
+ Edit aMobilePhoneED;
+ FixedText aFaxFT;
+ Edit aFaxED;
+ FixedText aWWWMailFT;
+ Edit aHomePageED;
+ Edit aMailED;
SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet);
~SwPrivateDataPage();
@@ -206,34 +206,34 @@ public:
class SwBusinessDataPage : public SfxTabPage
{
FixedLine aDataFL;
- FixedText aCompanyFT;
- Edit aCompanyED;
- FixedText aCompanyExtFT;
- Edit aCompanyExtED;
- FixedText aSloganFT;
- Edit aSloganED;
-
- FixedText aStreetFT;
- Edit aStreetED;
- FixedText aZipCityFT;
- Edit aZipED;
- Edit aCityED;
- FixedText aCountryStateFT;
- Edit aCountryED;
- Edit aStateED;
-
- FixedText aPositionFT;
- Edit aPositionED;
-
- FixedText aPhoneFT;
- Edit aPhoneED;
- Edit aMobilePhoneED;
- FixedText aFaxFT;
- Edit aFaxED;
-
- FixedText aWWWMailFT;
- Edit aHomePageED;
- Edit aMailED;
+ FixedText aCompanyFT;
+ Edit aCompanyED;
+ FixedText aCompanyExtFT;
+ Edit aCompanyExtED;
+ FixedText aSloganFT;
+ Edit aSloganED;
+
+ FixedText aStreetFT;
+ Edit aStreetED;
+ FixedText aZipCityFT;
+ Edit aZipED;
+ Edit aCityED;
+ FixedText aCountryStateFT;
+ Edit aCountryED;
+ Edit aStateED;
+
+ FixedText aPositionFT;
+ Edit aPositionED;
+
+ FixedText aPhoneFT;
+ Edit aPhoneED;
+ Edit aMobilePhoneED;
+ FixedText aFaxFT;
+ Edit aFaxED;
+
+ FixedText aWWWMailFT;
+ Edit aHomePageED;
+ Edit aMailED;
SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet);
~SwBusinessDataPage();
diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx
index c0e7d2965943..9af664364515 100644
--- a/sw/source/ui/envelp/syncbtn.cxx
+++ b/sw/source/ui/envelp/syncbtn.cxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings,
SfxChildWindow* pChild,
Window *pParent) :
SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_SYNC_BTN)),
- aSyncBtn (this, SW_RES(BTN_SYNC ))
+ aSyncBtn (this, SW_RES(BTN_SYNC ))
{
FreeResource();
aSyncBtn.SetClickHdl(LINK(this, SwSyncBtnDlg, BtnHdl));
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 8385b40fb402..3a985673171f 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.hrc b/sw/source/ui/fldui/DropDownFieldDialog.hrc
index dc63ae58e5ac..2d3f1955e06b 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.hrc
+++ b/sw/source/ui/fldui/DropDownFieldDialog.hrc
@@ -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
@@ -26,7 +26,7 @@
************************************************************************/
#ifndef _SW_DROPDOWNFIELDDIALOG_HRC
#define _SW_DROPDOWNFIELDDIALOG_HRC
-#define FL_ITEMS 1
+#define FL_ITEMS 1
#define LB_LISTITEMS 2
#define PB_OK 3
#define PB_CANCEL 4
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src
index 407ee199a8ef..25f6c4ac153f 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.src
+++ b/sw/source/ui/fldui/DropDownFieldDialog.src
@@ -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
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index 5a82ea186877..ee96c1e6c106 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index bbd209c119f9..94c6288034fc 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
class SwFldRefTreeListBox : public SvTreeListBox
{
protected:
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
public:
SwFldRefTreeListBox(Window* pParent, const ResId& rResId);
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 1ad46a156ce8..a4d78cace991 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -2,7 +2,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
@@ -74,18 +74,18 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), SW_RES(DLG_CHANGE_DB)),
aDBListFL (this, SW_RES(FL_DBLIST )),
- aUsedDBFT (this, SW_RES(FT_USEDDB )),
- aAvailDBFT (this, SW_RES(FT_AVAILDB )),
- aUsedDBTLB (this, SW_RES(TLB_USEDDB )),
+ aUsedDBFT (this, SW_RES(FT_USEDDB )),
+ aAvailDBFT (this, SW_RES(FT_AVAILDB )),
+ aUsedDBTLB (this, SW_RES(TLB_USEDDB )),
aAvailDBTLB (this, SW_RES(TLB_AVAILDB ), 0),
aAddDBPB (this, SW_RES(PB_ADDDB)),
aDescFT (this, SW_RES(FT_DESC )),
- aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )),
- aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )),
- aOKBT (this, SW_RES(BT_OK )),
- aCancelBT (this, SW_RES(BT_CANCEL )),
- aHelpBT (this, SW_RES(BT_HELP )),
-// aChangeBT (this, SW_RES(BT_CHANGEDB )),
+ aDocDBTextFT(this, SW_RES(FT_DOCDBTEXT )),
+ aDocDBNameFT(this, SW_RES(FT_DOCDBNAME )),
+ aOKBT (this, SW_RES(BT_OK )),
+ aCancelBT (this, SW_RES(BT_CANCEL )),
+ aHelpBT (this, SW_RES(BT_HELP )),
+// aChangeBT (this, SW_RES(BT_CHANGEDB )),
aImageList (SW_RES(ILIST_DB_DLG )),
aImageListHC (SW_RES(ILIST_DB_DLG_HC )),
@@ -228,7 +228,7 @@ __EXPORT SwChangeDBDlg::~SwChangeDBDlg()
}
/*--------------------------------------------------------------------
- Beschreibung: Schliessen
+ Beschreibung: Schliessen
--------------------------------------------------------------------*/
void __EXPORT SwChangeDBDlg::Apply()
{
diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc
index f5d54aa3ad42..e121a97fcbd1 100644
--- a/sw/source/ui/fldui/changedb.hrc
+++ b/sw/source/ui/fldui/changedb.hrc
@@ -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
@@ -31,16 +31,16 @@
// Elemente -----------------------------------------------------------------
#define FT_DESC 1
-#define FT_DOCDBTEXT 2
-#define FT_DOCDBNAME 3
-#define BT_CHANGEDB 4
-#define FT_USEDDB 5
-#define FT_AVAILDB 6
-#define TLB_USEDDB 7
-#define TLB_AVAILDB 8
+#define FT_DOCDBTEXT 2
+#define FT_DOCDBNAME 3
+#define BT_CHANGEDB 4
+#define FT_USEDDB 5
+#define FT_AVAILDB 6
+#define TLB_USEDDB 7
+#define TLB_AVAILDB 8
#define FL_DBLIST 9
-#define BT_OK 10
-#define BT_CANCEL 11
+#define BT_OK 10
+#define BT_CANCEL 11
#define BT_HELP 12
#define PB_ADDDB 13
diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src
index babf0b5bba13..a461a1d7ac19 100644
--- a/sw/source/ui/fldui/changedb.src
+++ b/sw/source/ui/fldui/changedb.src
@@ -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
@@ -34,7 +34,7 @@ ModalDialog DLG_CHANGE_DB
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 286 , 175 ) ;
-
+
Text [ en-US ] = "Exchange Databases" ;
Moveable = TRUE ;
FixedLine FL_DBLIST
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 143f9f225f37..9fdfc3c159b8 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -2,7 +2,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
@@ -47,25 +47,25 @@
#include <dbconfig.hxx>
#include <dbmgr.hxx>
-#define USER_DATA_VERSION_1 "1"
+#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) :
SwFldPage( pParent, SW_RES( TP_FLD_DB ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_DBTYPE)),
- aTypeLB (this, SW_RES(LB_DBTYPE)),
+ aTypeFT (this, SW_RES(FT_DBTYPE)),
+ aTypeLB (this, SW_RES(LB_DBTYPE)),
aSelectionFT(this, SW_RES(FT_DBSELECTION)),
aDatabaseTLB(this, SW_RES(TLB_DBLIST), 0, aEmptyStr, FALSE),
aAddDBFT(this, SW_RES(FT_ADDDB)),
aAddDBPB(this, SW_RES(PB_ADDDB)),
aConditionFT(this, SW_RES(FT_DBCONDITION)),
aConditionED(this, SW_RES(ED_DBCONDITION)),
- aValueFT (this, SW_RES(FT_DBSETNUMBER)),
- aValueED (this, SW_RES(ED_DBSETNUMBER)),
- aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)),
+ aValueFT (this, SW_RES(FT_DBSETNUMBER)),
+ aValueED (this, SW_RES(ED_DBSETNUMBER)),
+ aDBFormatRB (this, SW_RES(RB_DBOWNFORMAT)),
aNewFormatRB(this, SW_RES(RB_DBFORMAT)),
aNumFormatLB(this, SW_RES(LB_DBNUMFORMAT)),
- aFormatLB (this, SW_RES(LB_DBFORMAT)),
+ aFormatLB (this, SW_RES(LB_DBFORMAT)),
aFormatFL (this, SW_RES(FL_DBFORMAT)),
aFormatVertFL (this, SW_RES(FL_DBFORMAT_VERT))
{
@@ -90,7 +90,7 @@ __EXPORT SwFldDBPage::~SwFldDBPage()
--------------------------------------------------------------------*/
void __EXPORT SwFldDBPage::Reset(const SfxItemSet&)
{
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
aTypeLB.SetUpdateMode(FALSE);
USHORT nOldPos = aTypeLB.GetSelectEntryPos();
@@ -206,7 +206,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& )
if (!aData.sDataSource.getLength())
aData = pSh->GetDBData();
- if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl
+ if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
String aVal(aValueED.GetText());
@@ -260,7 +260,7 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& )
return FALSE;
}
-SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent,
+SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldDBPage( pParent, rAttrSet ) );
@@ -319,7 +319,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
aNumFormatLB.Show();
aFormatLB.Hide();
- if (pBox) // Typ wurde vom User geaendert
+ if (pBox) // Typ wurde vom User geaendert
aDBFormatRB.Check();
if (IsFldEdit())
@@ -494,7 +494,7 @@ IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG )
return 0;
}
-void SwFldDBPage::FillUserData()
+void SwFldDBPage::FillUserData()
{
String sData( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 59cb0b741487..59f23fc649d0 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -2,7 +2,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
@@ -45,31 +45,31 @@
class SwFldDBPage : public SwFldPage
{
- FixedText aTypeFT;
- ListBox aTypeLB;
- FixedText aSelectionFT;
- SwDBTreeList aDatabaseTLB;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ FixedText aSelectionFT;
+ SwDBTreeList aDatabaseTLB;
FixedText aAddDBFT;
PushButton aAddDBPB;
-
- FixedText aConditionFT;
- ConditionEdit aConditionED;
- FixedText aValueFT;
- Edit aValueED;
- RadioButton aDBFormatRB;
- RadioButton aNewFormatRB;
- NumFormatListBox aNumFormatLB;
- ListBox aFormatLB;
+
+ FixedText aConditionFT;
+ ConditionEdit aConditionED;
+ FixedText aValueFT;
+ Edit aValueED;
+ RadioButton aDBFormatRB;
+ RadioButton aNewFormatRB;
+ NumFormatListBox aNumFormatLB;
+ ListBox aFormatLB;
FixedLine aFormatFL;
FixedLine aFormatVertFL;
- String sOldDBName;
- String sOldTableName;
- String sOldColumnName;
- ULONG nOldFormat;
- USHORT nOldSubType;
- Link aOldNumSelectHdl;
+ String sOldDBName;
+ String sOldTableName;
+ String sOldColumnName;
+ ULONG nOldFormat;
+ USHORT nOldSubType;
+ Link aOldNumSelectHdl;
DECL_LINK( TypeHdl, ListBox* );
DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0);
@@ -77,12 +77,12 @@ class SwFldDBPage : public SwFldPage
DECL_LINK( ModifyHdl, Edit *pED = 0 );
DECL_LINK( AddDBHdl, PushButton* );
- void CheckInsert();
+ void CheckInsert();
using SwFldPage::SetWrtShell;
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldDBPage(Window* pParent, const SfxItemSet& rSet);
@@ -94,9 +94,9 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
void ActivateMailMergeAddress();
-
+
void SetWrtShell(SwWrtShell& rSh);
};
diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index ce9f3dd8a09a..e7bc8b99f944 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -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
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 95acf983bc5d..ec80dc058431 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -2,7 +2,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
@@ -66,13 +66,13 @@ using namespace com::sun::star;
SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
SwFldPage( pWindow, SW_RES( TP_FLD_DOKINF ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_DOKINFTYPE)),
- aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)),
+ aTypeFT (this, SW_RES(FT_DOKINFTYPE)),
+ aTypeTLB (this, SW_RES(TLB_DOKINFTYPE)),
aSelectionFT(this, SW_RES(FT_DOKINFSELECTION)),
aSelectionLB(this, SW_RES(LB_DOKINFSELECTION)),
- aFormatFT (this, SW_RES(FT_DOKINFFORMAT)),
- aFormatLB (this, SW_RES(LB_DOKINFFORMAT)),
- aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)),
+ aFormatFT (this, SW_RES(FT_DOKINFFORMAT)),
+ aFormatLB (this, SW_RES(LB_DOKINFFORMAT)),
+ aFixedCB (this, SW_RES(CB_DOKINFFIXEDCONTENT)),
pSelEntry (0),
aInfoStr (SW_RES(STR_DOKINF_INFO))
@@ -101,7 +101,7 @@ __EXPORT SwFldDokInfPage::~SwFldDokInfPage()
void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& )
{
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
// TypeListBox initialisieren
aTypeTLB.SetUpdateMode(FALSE);
@@ -262,7 +262,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
aFormatFT.Enable(FALSE);
if( nSubType == DI_CUSTOM )
{
- //find out which type the custom field has - for a start set to DATE format
+ //find out which type the custom field has - for a start set to DATE format
::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry);
try
{
@@ -283,7 +283,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
}
catch( const uno::Exception& )
{
- }
+ }
}
else
return 0;
@@ -356,7 +356,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
if (nNewType == NUMBERFORMAT_DATE)
nFormat = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eLang);
else if (nNewType == NUMBERFORMAT_TIME)
- nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang);
+ nFormat = pFormatter->GetFormatIndex( NF_TIME_HHMM, eLang);
}
}
aFormatLB.SetDefFormat(nFormat);
@@ -386,7 +386,7 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType)
EnableInsert(nSubType != USHRT_MAX);
- if (nSubType == USHRT_MAX) // Info-Text
+ if (nSubType == USHRT_MAX) // Info-Text
nSubType = DI_SUBTYPE_BEGIN;
aSelectionLB.Clear();
@@ -470,7 +470,7 @@ BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& )
return FALSE;
}
-SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent,
+SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldDokInfPage( pParent, rAttrSet ) );
@@ -481,7 +481,7 @@ USHORT SwFldDokInfPage::GetGroup()
return GRP_REG;
}
-void SwFldDokInfPage::FillUserData()
+void SwFldDokInfPage::FillUserData()
{
String sData( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index ead747e26774..d10ebc0844f3 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -2,7 +2,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
@@ -40,34 +40,34 @@
namespace com{namespace sun{ namespace star{ namespace beans{
class XPropertySet;
-}}}}
+}}}}
class SwFldDokInfPage : public SwFldPage
{
- FixedText aTypeFT;
- SvTreeListBox aTypeTLB;
- FixedText aSelectionFT;
- ListBox aSelectionLB;
- FixedText aFormatFT;
- NumFormatListBox aFormatLB;
- CheckBox aFixedCB;
-
- SvLBoxEntry* pSelEntry;
+ FixedText aTypeFT;
+ SvTreeListBox aTypeTLB;
+ FixedText aSelectionFT;
+ ListBox aSelectionLB;
+ FixedText aFormatFT;
+ NumFormatListBox aFormatLB;
+ CheckBox aFixedCB;
+
+ SvLBoxEntry* pSelEntry;
com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet;
- String aInfoStr;
+ String aInfoStr;
- USHORT nOldSel;
- ULONG nOldFormat;
+ USHORT nOldSel;
+ ULONG nOldFormat;
::rtl::OUString m_sOldCustomFieldName;
DECL_LINK( TypeHdl, ListBox* pLB = 0 );
DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
- USHORT FillSelectionLB(USHORT nSubTypeId);
+ USHORT FillSelectionLB(USHORT nSubTypeId);
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet);
@@ -79,7 +79,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
};
diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src
index 8a3e86c4548b..9f65b88fa313 100644
--- a/sw/source/ui/fldui/flddinf.src
+++ b/sw/source/ui/fldui/flddinf.src
@@ -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
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 1796eca2ddbc..7e6c64c4af20 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -2,7 +2,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
@@ -54,24 +54,24 @@
SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
SwFldPage( pWindow, SW_RES( TP_FLD_DOK ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_DOKTYPE)),
- aTypeLB (this, SW_RES(LB_DOKTYPE)),
- aSelectionFT (this, SW_RES(FT_DOKSELECTION)),
- aSelectionLB (this, SW_RES(LB_DOKSELECTION)),
- aValueFT (this, SW_RES(FT_DOKVALUE)),
- aValueED (this, SW_RES(ED_DOKVALUE)),
- aLevelED (this, SW_RES(ED_DOKLEVEL)),
+ aTypeFT (this, SW_RES(FT_DOKTYPE)),
+ aTypeLB (this, SW_RES(LB_DOKTYPE)),
+ aSelectionFT (this, SW_RES(FT_DOKSELECTION)),
+ aSelectionLB (this, SW_RES(LB_DOKSELECTION)),
+ aValueFT (this, SW_RES(FT_DOKVALUE)),
+ aValueED (this, SW_RES(ED_DOKVALUE)),
+ aLevelED (this, SW_RES(ED_DOKLEVEL)),
aDateOffsetED (this, SW_RES(ED_DOKDATEOFF)),
- aFormatFT (this, SW_RES(FT_DOKFORMAT)),
- aFormatLB (this, SW_RES(LB_DOKFORMAT)),
- aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)),
- aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)),
+ aFormatFT (this, SW_RES(FT_DOKFORMAT)),
+ aFormatLB (this, SW_RES(LB_DOKFORMAT)),
+ aNumFormatLB (this, SW_RES(LB_DOKNUMFORMAT)),
+ aFixedCB (this, SW_RES(CB_DOKFIXEDCONTENT)),
- sDateOffset (SW_RES(STR_DOKDATEOFF)),
- sTimeOffset (SW_RES(STR_DOKTIMEOFF)),
- aRootOpened (SW_RES(BMP_DOKROOT_OPENED)),
- aRootClosed (SW_RES(BMP_DOKROOT_CLOSED))
+ sDateOffset (SW_RES(STR_DOKDATEOFF)),
+ sTimeOffset (SW_RES(STR_DOKTIMEOFF)),
+ aRootOpened (SW_RES(BMP_DOKROOT_OPENED)),
+ aRootClosed (SW_RES(BMP_DOKROOT_CLOSED))
{
FreeResource();
@@ -93,7 +93,7 @@ __EXPORT SwFldDokPage::~SwFldDokPage()
void __EXPORT SwFldDokPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
// TypeListBox initialisieren
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
@@ -320,7 +320,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
nFmtType = NUMBERFORMAT_DATE;
aValueFT.SetText(sDateOffset);
- aDateOffsetED.SetFirst(-31); // Ein Monat
+ aDateOffsetED.SetFirst(-31); // Ein Monat
aDateOffsetED.SetLast(31);
if (IsFldEdit())
@@ -332,7 +332,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
nFmtType = NUMBERFORMAT_TIME;
aValueFT.SetText(sTimeOffset);
- aDateOffsetED.SetFirst(-1440); // Ein Tag
+ aDateOffsetED.SetFirst(-1440); // Ein Tag
aDateOffsetED.SetLast(1440);
if (IsFldEdit())
@@ -647,7 +647,7 @@ BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& )
return FALSE;
}
-SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent,
+SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldDokPage( pParent, rAttrSet ) );
@@ -658,7 +658,7 @@ USHORT SwFldDokPage::GetGroup()
return GRP_DOC;
}
-void SwFldDokPage::FillUserData()
+void SwFldDokPage::FillUserData()
{
String sData( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 32031c14c247..9c87780c6607 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -2,7 +2,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
@@ -41,36 +41,36 @@
class SwFldDokPage : public SwFldPage
{
- FixedText aTypeFT;
- ListBox aTypeLB;
- FixedText aSelectionFT;
- ListBox aSelectionLB;
- FixedText aValueFT;
- Edit aValueED;
- NumericField aLevelED;
- NumericField aDateOffsetED;
- FixedText aFormatFT;
- ListBox aFormatLB;
- NumFormatListBox aNumFormatLB;
- CheckBox aFixedCB;
-
- String sDateOffset;
- String sTimeOffset;
- Bitmap aRootOpened;
- Bitmap aRootClosed;
-
- USHORT nOldSel;
- ULONG nOldFormat;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ FixedText aSelectionFT;
+ ListBox aSelectionLB;
+ FixedText aValueFT;
+ Edit aValueED;
+ NumericField aLevelED;
+ NumericField aDateOffsetED;
+ FixedText aFormatFT;
+ ListBox aFormatLB;
+ NumFormatListBox aNumFormatLB;
+ CheckBox aFixedCB;
+
+ String sDateOffset;
+ String sTimeOffset;
+ Bitmap aRootOpened;
+ Bitmap aRootClosed;
+
+ USHORT nOldSel;
+ ULONG nOldFormat;
DECL_LINK( TypeHdl, ListBox* pLB = 0 );
DECL_LINK( FormatHdl, ListBox* pLB = 0 );
DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
- void AddSubType(USHORT nTypeId);
- USHORT FillFormatLB(USHORT nTypeId);
+ void AddSubType(USHORT nTypeId);
+ USHORT FillFormatLB(USHORT nTypeId);
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldDokPage(Window* pWindow, const SfxItemSet& rSet);
@@ -82,7 +82,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
};
diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src
index f566ab716362..6a60f8b53fe1 100644
--- a/sw/source/ui/fldui/flddok.src
+++ b/sw/source/ui/fldui/flddok.src
@@ -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
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 0b24c5327642..5e697ec1716f 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -2,7 +2,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
@@ -68,8 +68,8 @@ namespace swui
SwFldEditDlg::SwFldEditDlg(SwView& rVw) :
SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0, 0),
- pSh (rVw.GetWrtShellPtr()),
- aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)),
+ pSh (rVw.GetWrtShellPtr()),
+ aPrevBT (this, SW_RES(BTN_FLDEDT_PREV)),
aNextBT (this, SW_RES(BTN_FLDEDT_NEXT)),
aAddressBT (this, SW_RES(PB_FLDEDT_ADDRESS))
{
@@ -330,30 +330,30 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG )
switch(pCurFld->GetSubType())
{
- case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break;
- case EU_NAME: nEditPos = LASTNAME_EDIT; break;
- case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break;
- case EU_COMPANY: nEditPos = COMPANY_EDIT; break;
- case EU_STREET: nEditPos = STREET_EDIT; break;
- case EU_TITLE: nEditPos = TITLE_EDIT; break;
- case EU_POSITION: nEditPos = POSITION_EDIT; break;
- case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break;
- case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break;
- case EU_FAX: nEditPos = FAX_EDIT; break;
- case EU_EMAIL: nEditPos = EMAIL_EDIT; break;
- case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break;
- case EU_ZIP: nEditPos = PLZ_EDIT; break;
- case EU_CITY: nEditPos = CITY_EDIT; break;
- case EU_STATE: nEditPos = STATE_EDIT; break;
-
- default: nEditPos = UNKNOWN_EDIT; break;
+ case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break;
+ case EU_NAME: nEditPos = LASTNAME_EDIT; break;
+ case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break;
+ case EU_COMPANY: nEditPos = COMPANY_EDIT; break;
+ case EU_STREET: nEditPos = STREET_EDIT; break;
+ case EU_TITLE: nEditPos = TITLE_EDIT; break;
+ case EU_POSITION: nEditPos = POSITION_EDIT; break;
+ case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break;
+ case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break;
+ case EU_FAX: nEditPos = FAX_EDIT; break;
+ case EU_EMAIL: nEditPos = EMAIL_EDIT; break;
+ case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break;
+ case EU_ZIP: nEditPos = PLZ_EDIT; break;
+ case EU_CITY: nEditPos = CITY_EDIT; break;
+ case EU_STATE: nEditPos = STATE_EDIT; break;
+
+ default: nEditPos = UNKNOWN_EDIT; break;
}
aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos));
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet,
+ SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aSet,
pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_ADDR );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 21751cdabc90..f88727c2e93d 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -2,7 +2,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
@@ -59,20 +59,20 @@ using rtl::OUString;
SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_FUNCTYPE)),
- aTypeLB (this, SW_RES(LB_FUNCTYPE)),
+ aTypeFT (this, SW_RES(FT_FUNCTYPE)),
+ aTypeLB (this, SW_RES(LB_FUNCTYPE)),
aSelectionFT(this, SW_RES(FT_FUNCSELECTION)),
aSelectionLB(this, SW_RES(LB_FUNCSELECTION)),
- aFormatFT (this, SW_RES(FT_FUNCFORMAT)),
- aFormatLB (this, SW_RES(LB_FUNCFORMAT)),
- aNameFT (this, SW_RES(FT_FUNCNAME)),
- aNameED (this, SW_RES(ED_FUNCNAME)),
- aValueFT (this, SW_RES(FT_FUNCVALUE)),
- aValueED (this, SW_RES(ED_FUNCVALUE)),
- aCond1FT (this, SW_RES(FT_FUNCCOND1)),
- aCond1ED (this, SW_RES(ED_FUNCCOND1)),
- aCond2FT (this, SW_RES(FT_FUNCCOND2)),
- aCond2ED (this, SW_RES(ED_FUNCCOND2)),
+ aFormatFT (this, SW_RES(FT_FUNCFORMAT)),
+ aFormatLB (this, SW_RES(LB_FUNCFORMAT)),
+ aNameFT (this, SW_RES(FT_FUNCNAME)),
+ aNameED (this, SW_RES(ED_FUNCNAME)),
+ aValueFT (this, SW_RES(FT_FUNCVALUE)),
+ aValueED (this, SW_RES(ED_FUNCVALUE)),
+ aCond1FT (this, SW_RES(FT_FUNCCOND1)),
+ aCond1ED (this, SW_RES(ED_FUNCCOND1)),
+ aCond2FT (this, SW_RES(FT_FUNCCOND2)),
+ aCond2ED (this, SW_RES(ED_FUNCCOND2)),
aMacroBT (this, SW_RES(BT_FUNCMACRO)),
aListItemFT( this, SW_RES( FT_LISTITEM )),
aListItemED( this, SW_RES( ED_LISTITEM )),
@@ -98,7 +98,7 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
aCond1ED.ShowBrackets(FALSE);
aCond2ED.ShowBrackets(FALSE);
-// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell();
+// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell();
}
SwFldFuncPage::~SwFldFuncPage()
@@ -108,7 +108,7 @@ SwFldFuncPage::~SwFldFuncPage()
void SwFldFuncPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
aTypeLB.SetUpdateMode(FALSE);
aTypeLB.Clear();
@@ -144,12 +144,12 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
// alte Pos selektieren
RestorePos(&aTypeLB);
- aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
- aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl));
- aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl));
- aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl));
- aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
- aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl));
+ aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
+ aTypeLB.SetSelectHdl (LINK(this, SwFldFuncPage, TypeHdl));
+ aSelectionLB.SetSelectHdl (LINK(this, SwFldFuncPage, SelectHdl));
+ aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertMacroHdl));
+ aFormatLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
+ aMacroBT.SetClickHdl (LINK(this, SwFldFuncPage, MacroHdl));
Link aListModifyLk( LINK(this, SwFldFuncPage, ListModifyHdl));
aListAddPB.SetClickHdl(aListModifyLk);
aListRemovePB.SetClickHdl(aListModifyLk);
@@ -608,7 +608,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& )
InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
}
- ModifyHdl(); // Insert ggf enablen/disablen
+ ModifyHdl(); // Insert ggf enablen/disablen
return FALSE;
}
@@ -638,7 +638,7 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro)
return rMacro;
}
-SfxTabPage* SwFldFuncPage::Create( Window* pParent,
+SfxTabPage* SwFldFuncPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldFuncPage( pParent, rAttrSet ) );
@@ -649,7 +649,7 @@ USHORT SwFldFuncPage::GetGroup()
return GRP_FKT;
}
-void SwFldFuncPage::FillUserData()
+void SwFldFuncPage::FillUserData()
{
String sData( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index eafe7365da9e..32f9c3d60ce3 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -2,7 +2,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
@@ -44,21 +44,21 @@
class SwFldFuncPage : public SwFldPage
{
- FixedText aTypeFT;
- ListBox aTypeLB;
- FixedText aSelectionFT;
- ListBox aSelectionLB;
- FixedText aFormatFT;
- ListBox aFormatLB;
- FixedText aNameFT;
- ConditionEdit aNameED;
- FixedText aValueFT;
- Edit aValueED;
- FixedText aCond1FT;
- ConditionEdit aCond1ED;
- FixedText aCond2FT;
- ConditionEdit aCond2ED;
- PushButton aMacroBT;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ FixedText aSelectionFT;
+ ListBox aSelectionLB;
+ FixedText aFormatFT;
+ ListBox aFormatLB;
+ FixedText aNameFT;
+ ConditionEdit aNameED;
+ FixedText aValueFT;
+ Edit aValueED;
+ FixedText aCond1FT;
+ ConditionEdit aCond1ED;
+ FixedText aCond2FT;
+ ConditionEdit aCond2ED;
+ PushButton aMacroBT;
//controls of "Input list"
FixedText aListItemFT;
@@ -72,10 +72,10 @@ class SwFldFuncPage : public SwFldPage
FixedText aListNameFT;
Edit aListNameED;
- String sOldValueFT;
- String sOldNameFT;
+ String sOldValueFT;
+ String sOldNameFT;
- ULONG nOldFormat;
+ ULONG nOldFormat;
bool bDropDownLBChanged;
DECL_LINK( TypeHdl, ListBox* pLB = 0 );
@@ -88,11 +88,11 @@ class SwFldFuncPage : public SwFldPage
// Macro auswhlen
DECL_LINK( MacroHdl, Button * );
- void UpdateSubType();
- String TurnMacroString(const String &rMacro);
+ void UpdateSubType();
+ String TurnMacroString(const String &rMacro);
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldFuncPage(Window* pParent, const SfxItemSet& rSet);
@@ -104,7 +104,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
};
diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src
index 312299fac02d..ca67c448fb3f 100644
--- a/sw/source/ui/fldui/fldfunc.src
+++ b/sw/source/ui/fldui/fldfunc.src
@@ -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
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index a04d14433773..7ad1e8a40c88 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -2,7 +2,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
@@ -60,9 +60,9 @@
#include <svl/zformat.hxx>
#include <vcl/mnemonic.hxx>
#include <view.hxx>
-#include <wrtsh.hxx> // Actives Fenster
-#include <doc.hxx> // Actives Fenster
-#include <docsh.hxx> // Actives Fenster
+#include <wrtsh.hxx> // Actives Fenster
+#include <doc.hxx> // Actives Fenster
+#include <docsh.hxx> // Actives Fenster
#include <swmodule.hxx>
#include <charatr.hxx>
#include <fmtinfmt.hxx>
@@ -101,44 +101,44 @@ using namespace nsSwDocInfoSubType;
--------------------------------------------------------------------*/
enum
{
- GRP_DOC_BEGIN = 0,
- GRP_DOC_END = GRP_DOC_BEGIN + 11,
+ GRP_DOC_BEGIN = 0,
+ GRP_DOC_END = GRP_DOC_BEGIN + 11,
- GRP_FKT_BEGIN = GRP_DOC_END,
+ GRP_FKT_BEGIN = GRP_DOC_END,
GRP_FKT_END = GRP_FKT_BEGIN + 8,
- GRP_REF_BEGIN = GRP_FKT_END,
- GRP_REF_END = GRP_REF_BEGIN + 2,
+ GRP_REF_BEGIN = GRP_FKT_END,
+ GRP_REF_END = GRP_REF_BEGIN + 2,
- GRP_REG_BEGIN = GRP_REF_END,
+ GRP_REG_BEGIN = GRP_REF_END,
GRP_REG_END = GRP_REG_BEGIN + 1,
- GRP_DB_BEGIN = GRP_REG_END,
- GRP_DB_END = GRP_DB_BEGIN + 5,
+ GRP_DB_BEGIN = GRP_REG_END,
+ GRP_DB_END = GRP_DB_BEGIN + 5,
- GRP_VAR_BEGIN = GRP_DB_END,
- GRP_VAR_END = GRP_VAR_BEGIN + 9
+ GRP_VAR_BEGIN = GRP_DB_END,
+ GRP_VAR_END = GRP_VAR_BEGIN + 9
};
enum
{
- GRP_WEB_DOC_BEGIN = 0,
- GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9,
+ GRP_WEB_DOC_BEGIN = 0,
+ GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9,
- GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2,
- GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer!
+ GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2,
+ GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer!
- GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer!
- GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0,
+ GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer!
+ GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0,
- GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2,
+ GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2,
GRP_WEB_REG_END = GRP_WEB_REG_BEGIN + 1,
- GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer!
- GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0,
+ GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer!
+ GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0,
- GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5,
- GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1
+ GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5,
+ GRP_WEB_VAR_END = GRP_WEB_VAR_BEGIN + 1
};
/*--------------------------------------------------------------------
@@ -174,9 +174,9 @@ static const USHORT __FAR_DATA aDBFmt[] =
nsSwExtendedSubType::SUB_OWN_FMT
};
-static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT);
-static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT);
-static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT);
+static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT);
+static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT);
+static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT);
/*--------------------------------------------------------------------
Beschreibung: Feldtypen und Subtypes
@@ -185,11 +185,11 @@ struct SwFldPack
{
USHORT nTypeId;
- USHORT nSubTypeStart;
+ USHORT nSubTypeStart;
USHORT nSubTypeEnd;
- ULONG nFmtBegin;
- ULONG nFmtEnd;
+ ULONG nFmtBegin;
+ ULONG nFmtEnd;
};
/*--------------------------------------------------------------------
@@ -198,54 +198,54 @@ struct SwFldPack
static const SwFldPack __FAR_DATA aSwFlds[] =
{
// Dokument
- { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 },
- { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END },
- { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 },
- { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 },
- { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
- { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
- { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
- { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
- { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 },
-
- { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END },
- { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
+ { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 },
+ { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END },
+ { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 },
+ { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 },
+ { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
+ { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
+ { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
+ { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
+ { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 },
+
+ { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END },
+ { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
// Funktion
- { TYP_CONDTXTFLD, 0, 0, 0, 0 },
- { TYP_DROPDOWN, 0, 0, 0, 0 },
- { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
- { TYP_MACROFLD, 0, 0, 0, 0 },
- { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END },
- { TYP_COMBINED_CHARS, 0, 0, 0, 0 },
- { TYP_HIDDENTXTFLD, 0, 0, 0, 0 },
- { TYP_HIDDENPARAFLD, 0, 0, 0, 0 },
+ { TYP_CONDTXTFLD, 0, 0, 0, 0 },
+ { TYP_DROPDOWN, 0, 0, 0, 0 },
+ { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
+ { TYP_MACROFLD, 0, 0, 0, 0 },
+ { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END },
+ { TYP_COMBINED_CHARS, 0, 0, 0, 0 },
+ { TYP_HIDDENTXTFLD, 0, 0, 0, 0 },
+ { TYP_HIDDENPARAFLD, 0, 0, 0, 0 },
// Referenzen
- { TYP_SETREFFLD, 0, 0, 0, 0 },
- { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END },
+ { TYP_SETREFFLD, 0, 0, 0, 0 },
+ { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END },
// Ablage
- { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END },
+ { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END },
// Datenbank
- { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END },
- { TYP_DBNEXTSETFLD, 0, 0, 0, 0 },
- { TYP_DBNUMSETFLD, 0, 0, 0, 0 },
- { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
- { TYP_DBNAMEFLD, 0, 0, 0, 0 },
+ { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END },
+ { TYP_DBNEXTSETFLD, 0, 0, 0, 0 },
+ { TYP_DBNUMSETFLD, 0, 0, 0, 0 },
+ { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
+ { TYP_DBNAMEFLD, 0, 0, 0, 0 },
// Variablen
- { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END },
-
- { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
- { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END },
- { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
- { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
- { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
- { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 },
- { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
- { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END }
+ { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END },
+
+ { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
+ { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END },
+ { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
+ { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
+ { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
+ { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 },
+ { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
+ { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END }
};
/*--------------------------------------------------------------------
@@ -261,7 +261,7 @@ static SwWrtShell* lcl_GetShell()
return 0;
}
-inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); }
+inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); }
/*--------------------------------------------------------------------
Beschreibung: FieldManager regelt das Einfuegen und Updaten
@@ -367,9 +367,9 @@ SwField* SwFldMgr::GetCurFld()
//
const USHORT nTypeId = pCurFld->GetTypeId();
- nCurFmt = pCurFld->GetFormat();
- aCurPar1 = pCurFld->GetPar1();
- aCurPar2 = pCurFld->GetPar2();
+ nCurFmt = pCurFld->GetFormat();
+ aCurPar1 = pCurFld->GetPar1();
+ aCurPar2 = pCurFld->GetPar2();
switch( nTypeId )
{
@@ -393,21 +393,21 @@ const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) cons
{
static SwFldGroupRgn __READONLY_DATA aRanges[] =
{
- { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END },
- { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END },
- { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END },
- { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END },
- { /* DB */ GRP_DB_BEGIN, GRP_DB_END },
- { /* User */ GRP_VAR_BEGIN, GRP_VAR_END }
+ { /* Dokument */ GRP_DOC_BEGIN, GRP_DOC_END },
+ { /* Funktionen */ GRP_FKT_BEGIN, GRP_FKT_END },
+ { /* Referenzen */ GRP_REF_BEGIN, GRP_REF_END },
+ { /* Ablage */ GRP_REG_BEGIN, GRP_REG_END },
+ { /* DB */ GRP_DB_BEGIN, GRP_DB_END },
+ { /* User */ GRP_VAR_BEGIN, GRP_VAR_END }
};
static SwFldGroupRgn __READONLY_DATA aWebRanges[] =
{
- { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END },
- { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END },
- { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END },
- { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END },
- { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END },
- { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END }
+ { /* Dokument */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END },
+ { /* Funktionen */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END },
+ { /* Referenzen */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END },
+ { /* Ablage */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END },
+ { /* DB */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END },
+ { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END }
};
if (bHtmlMode)
@@ -489,10 +489,10 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId)
{
switch( nTypeId )
{
- case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break;
- case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break;
- case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break;
- case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break;
+ case TYP_FIXDATEFLD: nTypeId = TYP_DATEFLD; break;
+ case TYP_FIXTIMEFLD: nTypeId = TYP_TIMEFLD; break;
+ case TYP_SETINPFLD: nTypeId = TYP_SETFLD; break;
+ case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break;
}
for(USHORT i = 0; i < GetPackCount(); i++)
@@ -634,14 +634,14 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co
return 2;
if (nTypeId == TYP_FILENAMEFLD)
- nEnd -= 2; // Kein Bereich oder Vorlage
+ nEnd -= 2; // Kein Bereich oder Vorlage
switch(nStart)
{
case FMT_GETVAR_BEGIN:
- case FMT_SETVAR_BEGIN: return VF_COUNT;
- case FMT_USERVAR_BEGIN: return VF_USR_COUNT;
- case FMT_DBFLD_BEGIN: return VF_DB_COUNT;
+ case FMT_SETVAR_BEGIN: return VF_COUNT;
+ case FMT_USERVAR_BEGIN: return VF_USR_COUNT;
+ case FMT_DBFLD_BEGIN: return VF_DB_COUNT;
case FMT_NUM_BEGIN:
{
USHORT nCount = (USHORT)(nEnd - nStart);
@@ -670,7 +670,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co
}
/*--------------------------------------------------------------------
- Beschreibung: FormatString zu einem Typ ermitteln
+ Beschreibung: FormatString zu einem Typ ermitteln
--------------------------------------------------------------------*/
@@ -689,7 +689,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const
nStart = aSwFlds[nPos].nFmtBegin;
if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId)
- nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren
+ nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren
if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd)
aRet = SW_RESSTR((USHORT)(nStart + nFormatId));
@@ -721,7 +721,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const
}
/*--------------------------------------------------------------------
- Beschreibung: FormatId aus Pseudo-ID ermitteln
+ Beschreibung: FormatId aus Pseudo-ID ermitteln
--------------------------------------------------------------------*/
USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
@@ -733,9 +733,9 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
case TYP_DOCINFOFLD:
switch( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId )
{
- case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break;
- case FMT_REG_TIME: nId = DI_SUB_TIME; break;
- case FMT_REG_DATE: nId = DI_SUB_DATE; break;
+ case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break;
+ case FMT_REG_TIME: nId = DI_SUB_TIME; break;
+ case FMT_REG_DATE: nId = DI_SUB_DATE; break;
}
break;
@@ -754,15 +754,15 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
{
switch( nBegin + nFormatId )
{
- case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break;
- case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break;
- case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break;
- case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break;
- case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break;
- case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break;
- case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break;
- case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
- case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+ case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break;
+ case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break;
+ case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break;
+ case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break;
+ case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break;
+ case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break;
+ case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break;
+ case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
+ case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
}
}
else if(xNumberingInfo.is())
@@ -981,13 +981,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
break;
}
case TYP_DOCSTATFLD:
- { SwDocStatFieldType* pTyp =
+ { SwDocStatFieldType* pTyp =
(SwDocStatFieldType*)pCurShell->GetFldType(0, RES_DOCSTATFLD);
pFld = new SwDocStatField(pTyp, nSubType, nFormatId);
break;
}
case TYP_AUTHORFLD:
- { SwAuthorFieldType* pTyp =
+ { SwAuthorFieldType* pTyp =
(SwAuthorFieldType*)pCurShell->GetFldType(0, RES_AUTHORFLD);
pFld = new SwAuthorField(pTyp, nFormatId);
break;
@@ -1030,7 +1030,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
case TYP_DDEFLD:
{
//JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ // Namen haben! Wird hier noch nicht beachtet.
String sCmd( rData.sPar2 );
USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
@@ -1190,7 +1190,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
pCurShell->GetFldType(0, RES_DBSETNUMBERFLD);
pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId);
bExp = TRUE;
- break;
+ break;
}
}
break;
@@ -1336,7 +1336,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
pCurShell->EndAllAction();
return TRUE;
-/* // In der Tabelle Tabellenformeln einfuegen
+/* // In der Tabelle Tabellenformeln einfuegen
SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType(
0, RES_TABLEFLD);
pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId);
@@ -1377,7 +1377,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
}
break;
default:
- { OSL_ENSURE(!this, "wrong field type");
+ { OSL_ENSURE(!this, "wrong field type");
return FALSE;
}
}
@@ -1429,7 +1429,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
OSL_ENSURE(pCurFld, "no field at CursorPos");
bool bDelete = false;
- SwField *pTmpFld; // mb: fixed memory leak
+ SwField *pTmpFld; // mb: fixed memory leak
if (NULL != _pTmpFld)
{
pTmpFld = _pTmpFld;
@@ -1460,7 +1460,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
case TYP_DDEFLD:
{
//JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ // Namen haben! Wird hier noch nicht beachtet.
USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
break;
@@ -1542,7 +1542,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
}
break;
case TYP_AUTHORITY :
- {
+ {
//#i99069# changes to a bibliography field should change the field type
SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld);
SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType);
@@ -1555,10 +1555,10 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
pType->UpdateFlds();
pSh->SetModified();
}
-
- if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) ==
- pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) )
- bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated
+
+ if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) ==
+ pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) )
+ bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated
bSetPar2 = FALSE;
}
break;
@@ -1618,7 +1618,7 @@ USHORT SwFldMgr::GetCurrLanguage() const
void SwFieldType::_GetFldName()
{
- static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN;
+ static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN;
static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = {
FLD_DATE_STD,
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index a64b1fcebfcf..e65e3887453a 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -2,7 +2,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
@@ -71,7 +71,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
m_bRefresh (FALSE),
m_bFirstHTMLInit (TRUE)
{
-// FreeResource();
+// FreeResource();
}
SwFldPage::~SwFldPage()
@@ -153,7 +153,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
SwView* pView = GetActiveView();
SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr();
- if (!IsFldEdit()) // Neues Feld einfuegen
+ if (!IsFldEdit()) // Neues Feld einfuegen
{
SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage );
//#i26566# provide parent for SwWrtShell::StartInputFldDlg
@@ -197,7 +197,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
}
}
- else // Feld aendern
+ else // Feld aendern
{
SwField *const pTmpFld = m_pCurFld->CopyField();
@@ -249,7 +249,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
{
if( pFmtFld->GetFld() == m_pCurFld)
{
- pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen
+ pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen
pTmpFld->ChgTyp(pTyp);
break;
}
@@ -272,7 +272,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
{
// User- oder SetField ?
if (m_aMgr.GetFldType(RES_USERFLD, sPar1) == 0 &&
- !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD
+ !(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD
{
SwSetExpField* pFld = (SwSetExpField*)pTmpFld;
pFld->SetPromptText(sPar2);
@@ -353,7 +353,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
pDlg->InsertHdl();
if (pBtn)
- pBtn->GrabFocus(); // Wegen InputField-Dlg
+ pBtn->GrabFocus(); // Wegen InputField-Dlg
}
else
{
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index f5adda90169f..afcf9ce7bdd8 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -2,7 +2,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
@@ -64,17 +64,17 @@ protected:
DECL_LINK( InsertHdl, Button *pBtn = 0 );
DECL_LINK( NumFormatHdl, ListBox *pBtn = 0 );
- void Init();
- void SavePos( const ListBox* pLst1,
+ void Init();
+ void SavePos( const ListBox* pLst1,
const ListBox* pLst2 = 0,
const ListBox* pLst3 = 0);
- void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0,
+ void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0,
ListBox* pLst3 = 0 );
- void EnableInsert(BOOL bEnable = TRUE);
+ void EnableInsert(BOOL bEnable = TRUE);
inline BOOL IsFldEdit() const { return m_bFldEdit; }
// Feld einfuegen
- BOOL InsertFld( USHORT nTypeId,
+ BOOL InsertFld( USHORT nTypeId,
USHORT nSubType,
const String& rPar1,
const String& rPar2,
@@ -85,18 +85,18 @@ protected:
using SfxTabPage::ActivatePage;
public:
- SwFldPage( Window *pParent,
+ SwFldPage( Window *pParent,
const ResId &rId,
const SfxItemSet &rAttrSet );
virtual ~SwFldPage();
- virtual void ActivatePage();
+ virtual void ActivatePage();
inline SwFldMgr& GetFldMgr() { return m_aMgr; }
void SetWrtShell( SwWrtShell* m_pWrtShell );
- void EditNewField( BOOL bOnlyActivate = FALSE );
- virtual USHORT GetGroup() = 0;
+ void EditNewField( BOOL bOnlyActivate = FALSE );
+ virtual USHORT GetGroup() = 0;
};
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 3fc46e8b41cc..7240f986193b 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -2,7 +2,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
@@ -56,16 +56,16 @@
// sw/inc/expfld.hxx
SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
-#define REFFLDFLAG 0x4000
-#define REFFLDFLAG_BOOKMARK 0x4800
-#define REFFLDFLAG_FOOTNOTE 0x5000
-#define REFFLDFLAG_ENDNOTE 0x6000
+#define REFFLDFLAG 0x4000
+#define REFFLDFLAG_BOOKMARK 0x4800
+#define REFFLDFLAG_FOOTNOTE 0x5000
+#define REFFLDFLAG_ENDNOTE 0x6000
// --> OD 2007-11-09 #i83479#
#define REFFLDFLAG_HEADING 0x7100
#define REFFLDFLAG_NUMITEM 0x7200
// <--
-USHORT nFldDlgFmtSel = 0;
+USHORT nFldDlgFmtSel = 0;
#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
@@ -78,22 +78,22 @@ USHORT nFldDlgFmtSel = 0;
SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
SwFldPage( pParent, SW_RES( TP_FLD_REF ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_REFTYPE)),
- aTypeLB (this, SW_RES(LB_REFTYPE)),
- aSelectionFT (this, SW_RES(FT_REFSELECTION)),
- aSelectionLB (this, SW_RES(LB_REFSELECTION)),
+ aTypeFT (this, SW_RES(FT_REFTYPE)),
+ aTypeLB (this, SW_RES(LB_REFTYPE)),
+ aSelectionFT (this, SW_RES(FT_REFSELECTION)),
+ aSelectionLB (this, SW_RES(LB_REFSELECTION)),
// --> OD 2007-11-21 #i83479#
aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ),
// <--
- aFormatFT (this, SW_RES(FT_REFFORMAT)),
- aFormatLB (this, SW_RES(LB_REFFORMAT)),
- aNameFT (this, SW_RES(FT_REFNAME)),
- aNameED (this, SW_RES(ED_REFNAME)),
- aValueFT (this, SW_RES(FT_REFVALUE)),
- aValueED (this, SW_RES(ED_REFVALUE)),
-
- sBookmarkTxt (SW_RES(STR_REFBOOKMARK)),
- sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)),
+ aFormatFT (this, SW_RES(FT_REFFORMAT)),
+ aFormatLB (this, SW_RES(LB_REFFORMAT)),
+ aNameFT (this, SW_RES(FT_REFNAME)),
+ aNameED (this, SW_RES(ED_REFNAME)),
+ aValueFT (this, SW_RES(FT_REFVALUE)),
+ aValueED (this, SW_RES(ED_REFVALUE)),
+
+ sBookmarkTxt (SW_RES(STR_REFBOOKMARK)),
+ sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)),
sEndnoteTxt (SW_RES(STR_REFENDNOTE)),
// --> OD 2007-11-09 #i83479#
sHeadingTxt (SW_RES(STR_REFHEADING)),
@@ -194,7 +194,7 @@ void SwFldRefPage::Reset(const SfxItemSet& )
}
SetSelectionSel(LISTBOX_ENTRY_NOTFOUND);
SetTypeSel(LISTBOX_ENTRY_NOTFOUND);
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
// TypeListBox initialisieren
aTypeLB.SetUpdateMode(FALSE);
@@ -370,7 +370,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
break;
}
- if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke
+ if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke
{
USHORT nPos = aTypeLB.InsertEntry(sName);
aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag));
@@ -869,7 +869,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
{
SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName);
- if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt
+ if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt
{
aSelectionLB.InsertEntry(aName);
aSelectionLB.Enable();
@@ -888,13 +888,13 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
{
pSh = ::GetActiveWrtShell();
}
- if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
+ if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
{
aName = aNameED.GetText();
nTypeId = TYP_GETREFFLD;
nSubType = REF_BOOKMARK;
}
- else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten
+ else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten
{
SwSeqFldList aArr;
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
@@ -915,7 +915,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
else if (IsFldEdit())
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
}
- else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten
+ else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten
{
SwSeqFldList aArr;
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
@@ -1023,7 +1023,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
}
- ModifyHdl(); // Insert ggf enablen/disablen
+ ModifyHdl(); // Insert ggf enablen/disablen
return FALSE;
}
@@ -1032,7 +1032,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
Beschreibung:
--------------------------------------------------------------------*/
-SfxTabPage* SwFldRefPage::Create( Window* pParent,
+SfxTabPage* SwFldRefPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldRefPage( pParent, rAttrSet ) );
@@ -1050,7 +1050,7 @@ USHORT SwFldRefPage::GetGroup()
/* -----------------12.01.99 10:09-------------------
*
* --------------------------------------------------*/
-void SwFldRefPage::FillUserData()
+void SwFldRefPage::FillUserData()
{
String sData( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index b1daeaf3684f..7550ca110b93 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -2,7 +2,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
@@ -45,19 +45,19 @@ class SwTxtNode;
class SwFldRefPage : public SwFldPage
{
- FixedText aTypeFT;
- ListBox aTypeLB;
- FixedText aSelectionFT;
- ListBox aSelectionLB;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ FixedText aSelectionFT;
+ ListBox aSelectionLB;
// --> OD 2007-11-21 #i83479#
SwFldRefTreeListBox aSelectionToolTipLB;
// <--
- FixedText aFormatFT;
- ListBox aFormatLB;
- FixedText aNameFT;
- Edit aNameED;
- FixedText aValueFT;
- Edit aValueED;
+ FixedText aFormatFT;
+ ListBox aFormatLB;
+ FixedText aNameFT;
+ Edit aNameED;
+ FixedText aValueFT;
+ Edit aValueED;
const String sBookmarkTxt;
const String sFootnoteTxt;
const String sEndnoteTxt;
@@ -79,8 +79,8 @@ class SwFldRefPage : public SwFldPage
DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
DECL_LINK( ModifyHdl, Edit *pEd = 0 );
- void UpdateSubType();
- USHORT FillFormatLB(USHORT nTypeId);
+ void UpdateSubType();
+ USHORT FillFormatLB(USHORT nTypeId);
// --> OD 2007-12-05 #i83479#
void SaveSelectedTxtNode();
@@ -89,7 +89,7 @@ class SwFldRefPage : public SwFldPage
// <--
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldRefPage(Window* pParent, const SfxItemSet& rSet);
@@ -101,7 +101,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
};
diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 847c9358db69..8abf02e980c6 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -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
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 595aada6d195..db2e9b674a50 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -2,7 +2,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
@@ -67,7 +67,7 @@
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Beschreibung: Der Traeger des Dialoges
--------------------------------------------------------------------*/
@@ -84,11 +84,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT)));
GetOKButton().SetHelpId(HID_FIELD_INSERT);
- GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE)));
GetCancelButton().SetHelpId(HID_FIELD_CLOSE);
- GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
FreeResource();
@@ -216,10 +216,10 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG )
{
if (GetOKButton().IsEnabled())
{
- SfxTabPage* pPage = GetTabPage(GetCurPageId());
+ SfxTabPage* pPage = GetTabPage(GetCurPageId());
pPage->FillItemSet(*(SfxItemSet*)0);
- GetOKButton().GrabFocus(); // Wegen InputField-Dlg
+ GetOKButton().GrabFocus(); // Wegen InputField-Dlg
}
return 0;
@@ -271,7 +271,7 @@ void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate )
SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId);
if ( pPage )
- pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren
+ pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren
}
/*--------------------------------------------------------------------
diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc
index c90ece9fe4c7..dcec8a7512b5 100644
--- a/sw/source/ui/fldui/fldtdlg.hrc
+++ b/sw/source/ui/fldui/fldtdlg.hrc
@@ -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
@@ -28,104 +28,104 @@
#ifndef _FLDTDLG_HRC
#define _FLDTDLG_HRC
-#define RC_FLDTDLG_BEGIN 0
+#define RC_FLDTDLG_BEGIN 0
// Datenbankfeld-TabPage:
-#define RC_TP_DB_START (RC_FLDTDLG_BEGIN)
-#define FT_DBTYPE (RC_TP_DB_START + 1)
-#define LB_DBTYPE (RC_TP_DB_START + 2)
+#define RC_TP_DB_START (RC_FLDTDLG_BEGIN)
+#define FT_DBTYPE (RC_TP_DB_START + 1)
+#define LB_DBTYPE (RC_TP_DB_START + 2)
#define FL_DBFORMAT (RC_TP_DB_START + 3)
-#define FT_DBSELECTION (RC_TP_DB_START + 4)
-#define TLB_DBLIST (RC_TP_DB_START + 5)
-#define FT_DBCONDITION (RC_TP_DB_START + 6)
-#define FT_DBSETNUMBER (RC_TP_DB_START + 7)
-#define ED_DBCONDITION (RC_TP_DB_START + 8)
-#define ED_DBSETNUMBER (RC_TP_DB_START + 9)
-#define LB_DBFORMAT (RC_TP_DB_START + 10)
-#define LB_DBNUMFORMAT (RC_TP_DB_START + 11)
-#define RB_DBFORMAT (RC_TP_DB_START + 12)
-#define RB_DBOWNFORMAT (RC_TP_DB_START + 13)
-#define RC_TP_DB_END (RC_TP_DB_START + 14)
+#define FT_DBSELECTION (RC_TP_DB_START + 4)
+#define TLB_DBLIST (RC_TP_DB_START + 5)
+#define FT_DBCONDITION (RC_TP_DB_START + 6)
+#define FT_DBSETNUMBER (RC_TP_DB_START + 7)
+#define ED_DBCONDITION (RC_TP_DB_START + 8)
+#define ED_DBSETNUMBER (RC_TP_DB_START + 9)
+#define LB_DBFORMAT (RC_TP_DB_START + 10)
+#define LB_DBNUMFORMAT (RC_TP_DB_START + 11)
+#define RB_DBFORMAT (RC_TP_DB_START + 12)
+#define RB_DBOWNFORMAT (RC_TP_DB_START + 13)
+#define RC_TP_DB_END (RC_TP_DB_START + 14)
#define FL_DBFORMAT_VERT (RC_TP_DB_START + 15)
#define FT_ADDDB (RC_TP_DB_START + 16)
#define PB_ADDDB (RC_TP_DB_START + 17)
// Dokumentinfo-TabPage:
-#define RC_TP_DOCINF_START (RC_TP_DB_END)
-#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1)
-#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2)
+#define RC_TP_DOCINF_START (RC_TP_DB_END)
+#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1)
+#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2)
#define FT_DOKINFSELECTION (RC_TP_DOCINF_START + 3)
-#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4)
-#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5)
-#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6)
-#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7)
-#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8)
-#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9)
-#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10)
-#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11)
+#define LB_DOKINFSELECTION (RC_TP_DOCINF_START + 4)
+#define FT_DOKINFFORMAT (RC_TP_DOCINF_START + 5)
+#define LB_DOKINFFORMAT (RC_TP_DOCINF_START + 6)
+#define CB_DOKINFFIXEDCONTENT (RC_TP_DOCINF_START + 7)
+#define BMP_DOKINFROOT_OPENED (RC_TP_DOCINF_START + 8)
+#define BMP_DOKINFROOT_CLOSED (RC_TP_DOCINF_START + 9)
+#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10)
+#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11)
// Variablen-TabPage:
-#define RC_TP_VAR_START (RC_TP_DOCINF_END)
-#define FT_VARTYPE (RC_TP_VAR_START + 1)
-#define LB_VARTYPE (RC_TP_VAR_START + 2)
-#define FT_VARSELECTION (RC_TP_VAR_START + 3)
-#define LB_VARSELECTION (RC_TP_VAR_START + 4)
-#define FT_VARNAME (RC_TP_VAR_START + 5)
-#define ED_VARNAME (RC_TP_VAR_START + 6)
-#define FT_VARVALUE (RC_TP_VAR_START + 7)
-#define ED_VARVALUE (RC_TP_VAR_START + 8)
-#define FT_VARFORMAT (RC_TP_VAR_START + 9)
-#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10)
-#define LB_VARFORMAT (RC_TP_VAR_START + 11)
+#define RC_TP_VAR_START (RC_TP_DOCINF_END)
+#define FT_VARTYPE (RC_TP_VAR_START + 1)
+#define LB_VARTYPE (RC_TP_VAR_START + 2)
+#define FT_VARSELECTION (RC_TP_VAR_START + 3)
+#define LB_VARSELECTION (RC_TP_VAR_START + 4)
+#define FT_VARNAME (RC_TP_VAR_START + 5)
+#define ED_VARNAME (RC_TP_VAR_START + 6)
+#define FT_VARVALUE (RC_TP_VAR_START + 7)
+#define ED_VARVALUE (RC_TP_VAR_START + 8)
+#define FT_VARFORMAT (RC_TP_VAR_START + 9)
+#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10)
+#define LB_VARFORMAT (RC_TP_VAR_START + 11)
#define FT_VARCHAPTERHEADER (RC_TP_VAR_START + 12)
#define FT_VARCHAPTERLEVEL (RC_TP_VAR_START + 13)
#define LB_VARCHAPTERLEVEL (RC_TP_VAR_START + 14)
-#define CB_VARINVISIBLE (RC_TP_VAR_START + 15)
-#define FT_VARSEPARATOR (RC_TP_VAR_START + 16)
-#define ED_VARSEPARATOR (RC_TP_VAR_START + 17)
-#define TBX_VARNEWDEL (RC_TP_VAR_START + 18)
-#define BT_VARAPPLY (RC_TP_VAR_START + 19)
-#define BT_VARDELETE (RC_TP_VAR_START + 20)
-#define RC_TP_VAR_END (RC_TP_VAR_START + 21)
+#define CB_VARINVISIBLE (RC_TP_VAR_START + 15)
+#define FT_VARSEPARATOR (RC_TP_VAR_START + 16)
+#define ED_VARSEPARATOR (RC_TP_VAR_START + 17)
+#define TBX_VARNEWDEL (RC_TP_VAR_START + 18)
+#define BT_VARAPPLY (RC_TP_VAR_START + 19)
+#define BT_VARDELETE (RC_TP_VAR_START + 20)
+#define RC_TP_VAR_END (RC_TP_VAR_START + 21)
// Dokument-TabPage:
-#define RC_TP_DOC_START (RC_TP_VAR_END)
-#define FT_DOKTYPE (RC_TP_DOC_START + 1)
-#define LB_DOKTYPE (RC_TP_DOC_START + 2)
-#define FT_DOKSELECTION (RC_TP_DOC_START + 3)
-#define LB_DOKSELECTION (RC_TP_DOC_START + 4)
-#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5)
-#define LB_DOKFORMAT (RC_TP_DOC_START + 6)
-#define FT_DOKFORMAT (RC_TP_DOC_START + 7)
-#define FT_DOKVALUE (RC_TP_DOC_START + 8)
-#define ED_DOKVALUE (RC_TP_DOC_START + 9)
-#define ED_DOKLEVEL (RC_TP_DOC_START + 10)
-#define ED_DOKDATEOFF (RC_TP_DOC_START + 11)
-#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12)
-#define STR_DOKDATEOFF (RC_TP_DOC_START + 13)
-#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14)
-#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15)
-#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16)
-#define RC_TP_DOC_END (RC_TP_DOC_START + 17)
+#define RC_TP_DOC_START (RC_TP_VAR_END)
+#define FT_DOKTYPE (RC_TP_DOC_START + 1)
+#define LB_DOKTYPE (RC_TP_DOC_START + 2)
+#define FT_DOKSELECTION (RC_TP_DOC_START + 3)
+#define LB_DOKSELECTION (RC_TP_DOC_START + 4)
+#define LB_DOKNUMFORMAT (RC_TP_DOC_START + 5)
+#define LB_DOKFORMAT (RC_TP_DOC_START + 6)
+#define FT_DOKFORMAT (RC_TP_DOC_START + 7)
+#define FT_DOKVALUE (RC_TP_DOC_START + 8)
+#define ED_DOKVALUE (RC_TP_DOC_START + 9)
+#define ED_DOKLEVEL (RC_TP_DOC_START + 10)
+#define ED_DOKDATEOFF (RC_TP_DOC_START + 11)
+#define CB_DOKFIXEDCONTENT (RC_TP_DOC_START + 12)
+#define STR_DOKDATEOFF (RC_TP_DOC_START + 13)
+#define STR_DOKTIMEOFF (RC_TP_DOC_START + 14)
+#define BMP_DOKROOT_OPENED (RC_TP_DOC_START + 15)
+#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16)
+#define RC_TP_DOC_END (RC_TP_DOC_START + 17)
// Funktion-TabPage:
-#define RC_TP_FUNC_START (RC_TP_DOC_END)
-#define FT_FUNCTYPE (RC_TP_FUNC_START + 1)
-#define LB_FUNCTYPE (RC_TP_FUNC_START + 2)
-#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3)
-#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4)
-#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5)
-#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6)
-#define FT_FUNCNAME (RC_TP_FUNC_START + 7)
-#define ED_FUNCNAME (RC_TP_FUNC_START + 8)
-#define FT_FUNCVALUE (RC_TP_FUNC_START + 9)
-#define ED_FUNCVALUE (RC_TP_FUNC_START + 10)
-#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11)
-#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12)
-#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13)
-#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14)
-#define BT_FUNCMACRO (RC_TP_FUNC_START + 15)
-#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16)
+#define RC_TP_FUNC_START (RC_TP_DOC_END)
+#define FT_FUNCTYPE (RC_TP_FUNC_START + 1)
+#define LB_FUNCTYPE (RC_TP_FUNC_START + 2)
+#define LB_FUNCSELECTION (RC_TP_FUNC_START + 3)
+#define FT_FUNCSELECTION (RC_TP_FUNC_START + 4)
+#define FT_FUNCFORMAT (RC_TP_FUNC_START + 5)
+#define LB_FUNCFORMAT (RC_TP_FUNC_START + 6)
+#define FT_FUNCNAME (RC_TP_FUNC_START + 7)
+#define ED_FUNCNAME (RC_TP_FUNC_START + 8)
+#define FT_FUNCVALUE (RC_TP_FUNC_START + 9)
+#define ED_FUNCVALUE (RC_TP_FUNC_START + 10)
+#define FT_FUNCCOND1 (RC_TP_FUNC_START + 11)
+#define ED_FUNCCOND1 (RC_TP_FUNC_START + 12)
+#define FT_FUNCCOND2 (RC_TP_FUNC_START + 13)
+#define ED_FUNCCOND2 (RC_TP_FUNC_START + 14)
+#define BT_FUNCMACRO (RC_TP_FUNC_START + 15)
+#define RC_TP_FUNC_END (RC_TP_FUNC_START + 16)
#define FT_LISTITEM (RC_TP_FUNC_START + 17)
#define ED_LISTITEM (RC_TP_FUNC_START + 18)
#define PB_LISTADD (RC_TP_FUNC_START + 19)
@@ -138,10 +138,10 @@
#define ED_LISTNAME (RC_TP_FUNC_START + 26)
// Referenz-TabPage:
-#define RC_TP_REF_START (RC_TP_FUNC_END)
-#define FT_REFTYPE (RC_TP_REF_START + 1)
-#define LB_REFTYPE (RC_TP_REF_START + 2)
-#define FT_REFSELECTION (RC_TP_REF_START + 3)
+#define RC_TP_REF_START (RC_TP_FUNC_END)
+#define FT_REFTYPE (RC_TP_REF_START + 1)
+#define LB_REFTYPE (RC_TP_REF_START + 2)
+#define FT_REFSELECTION (RC_TP_REF_START + 3)
#define LB_REFSELECTION (RC_TP_REF_START + 4)
#define LB_REFSELECTION_TOOLTIP (RC_TP_REF_START + 5)
#define LB_REFFORMAT (RC_TP_REF_START + 6)
@@ -157,11 +157,11 @@
#define STR_REFNUMITEM (RC_TP_REF_START + 16)
#define RC_TP_REF_END (RC_TP_REF_START + 17)
-#define RC_TP_END (RC_TP_REF_END)
+#define RC_TP_END (RC_TP_REF_END)
// Strings ------------------------------------------------------------------
-#define STR_FLD_INSERT (RC_TP_END + 1)
-#define STR_FLD_CLOSE (RC_TP_END + 2)
+#define STR_FLD_INSERT (RC_TP_END + 1)
+#define STR_FLD_CLOSE (RC_TP_END + 2)
#endif
diff --git a/sw/source/ui/fldui/fldtdlg.src b/sw/source/ui/fldui/fldtdlg.src
index 3034146466e3..c83c0b0e9e88 100644
--- a/sw/source/ui/fldui/fldtdlg.src
+++ b/sw/source/ui/fldui/fldtdlg.src
@@ -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
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index 7fb6a2e730c8..142e45077382 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -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
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index abe971fab699..5d5f09d16d14 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -2,7 +2,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
@@ -55,26 +55,26 @@
#define USER_DATA_VERSION USER_DATA_VERSION_1
SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) :
- SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ),
- aTypeFT (this, SW_RES(FT_VARTYPE)),
- aTypeLB (this, SW_RES(LB_VARTYPE)),
- aSelectionFT (this, SW_RES(FT_VARSELECTION)),
- aSelectionLB (this, SW_RES(LB_VARSELECTION)),
- aNameFT (this, SW_RES(FT_VARNAME)),
- aNameED (this, SW_RES(ED_VARNAME)),
- aValueFT (this, SW_RES(FT_VARVALUE)),
- aValueED (this, SW_RES(ED_VARVALUE)),
- aFormatFT (this, SW_RES(FT_VARFORMAT)),
- aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)),
- aFormatLB (this, SW_RES(LB_VARFORMAT)),
+ SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ),
+ aTypeFT (this, SW_RES(FT_VARTYPE)),
+ aTypeLB (this, SW_RES(LB_VARTYPE)),
+ aSelectionFT (this, SW_RES(FT_VARSELECTION)),
+ aSelectionLB (this, SW_RES(LB_VARSELECTION)),
+ aNameFT (this, SW_RES(FT_VARNAME)),
+ aNameED (this, SW_RES(ED_VARNAME)),
+ aValueFT (this, SW_RES(FT_VARVALUE)),
+ aValueED (this, SW_RES(ED_VARVALUE)),
+ aFormatFT (this, SW_RES(FT_VARFORMAT)),
+ aNumFormatLB (this, SW_RES(LB_VARNUMFORMAT)),
+ aFormatLB (this, SW_RES(LB_VARFORMAT)),
aChapterHeaderFT(this, SW_RES(FT_VARCHAPTERHEADER)),
- aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)),
- aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)),
- aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)),
- aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)),
- aSeparatorED (this, SW_RES(ED_VARSEPARATOR)),
- aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)),
- bInit (TRUE)
+ aChapterLevelFT (this, SW_RES(FT_VARCHAPTERLEVEL)),
+ aChapterLevelLB (this, SW_RES(LB_VARCHAPTERLEVEL)),
+ aInvisibleCB (this, SW_RES(CB_VARINVISIBLE)),
+ aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)),
+ aSeparatorED (this, SW_RES(ED_VARSEPARATOR)),
+ aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)),
+ bInit (TRUE)
{
FreeResource();
@@ -105,7 +105,7 @@ void SwFldVarPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // Allgemeine initialisierung
aTypeLB.SetUpdateMode(FALSE);
aTypeLB.Clear();
@@ -147,17 +147,17 @@ void SwFldVarPage::Reset(const SfxItemSet& )
// alte Pos selektieren
RestorePos(&aTypeLB);
- aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
- aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl));
- aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl));
- aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
- aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
- aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
- aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl));
- aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl));
- aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl));
- aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl));
- aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl));
+ aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
+ aTypeLB.SetSelectHdl (LINK(this, SwFldVarPage, TypeHdl));
+ aSelectionLB.SetSelectHdl (LINK(this, SwFldVarPage, SubTypeHdl));
+ aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
+ aFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
+ aNumFormatLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
+ aNameED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl));
+ aValueED.SetModifyHdl (LINK(this, SwFldVarPage, ModifyHdl));
+ aNewDelTBX.SetClickHdl (LINK(this, SwFldVarPage, TBClickHdl));
+ aChapterLevelLB.SetSelectHdl (LINK(this, SwFldVarPage, ChapterHdl));
+ aSeparatorED.SetModifyHdl (LINK(this, SwFldVarPage, SeparatorHdl));
if( !IsRefresh() )
{
@@ -218,7 +218,7 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG )
}
aValueED.SetDropEnable(FALSE);
- UpdateSubType(); // Auswahl-Listboxen initialisieren
+ UpdateSubType(); // Auswahl-Listboxen initialisieren
}
bInit = FALSE;
@@ -269,7 +269,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
{
if (!IsFldEdit())
{
- if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus
+ if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus
{
aNameED.SetText(pType->GetName());
@@ -280,7 +280,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
}
else
aValueED.SetText(pType->GetContent());
-// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat()));
+// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat()));
}
}
else
@@ -288,7 +288,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
}
else
{
- if (pBox) // Nur bei Interaktion mit Maus
+ if (pBox) // Nur bei Interaktion mit Maus
{
aNameED.SetText(aEmptyStr);
aValueED.SetText(aEmptyStr);
@@ -315,7 +315,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aNumFormatLB.SelectEntryPos(0);
}
// gibt es ein entprechendes SetField
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
{
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -414,7 +414,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
USHORT nInpType = 0;
nInpType = static_cast< USHORT >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD);
- if (nInpType) // SETEXPFLD
+ if (nInpType) // SETEXPFLD
{
// gibt es ein entprechendes SetField
SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*)
@@ -422,7 +422,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
if(pSetTyp)
{
- if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell?
+ if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell?
{
aNumFormatLB.Clear();
@@ -434,7 +434,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
if (IsFldEdit() && (!pBox || bInit) )
aValueED.SetText(((SwSetExpField*)GetCurField())->GetPromptText());
}
- else // USERFLD
+ else // USERFLD
bFormat = bNumFmt = FALSE;
}
break;
@@ -442,7 +442,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
case TYP_DDEFLD:
aValueFT.SetText(SW_RESSTR(STR_DDE_CMD));
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
{
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -454,7 +454,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aNameED.SetText(pType->GetName());
//JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet
+ // Namen haben! Wird hier noch nicht beachtet
String sCmd( pType->GetCmd() );
USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' );
sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos );
@@ -489,7 +489,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aValueED.SetText( ((SwSetExpField*)GetCurField())->
GetFormula() );
- if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus
+ if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus
aNameED.SetText( aSelectionLB.GetSelectEntry() );
if( pFldTyp )
@@ -511,12 +511,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
bValue = FALSE;
aValueFT.SetText( SW_RESSTR( STR_OFFSET ));
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
aNameED.SetText(aEmptyStr);
if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
- bValue = TRUE; // SubType OFF - kennt keinen Offset
+ bValue = TRUE; // SubType OFF - kennt keinen Offset
if (IsFldEdit())
aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset()));
}
@@ -559,7 +559,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aChapterLevelLB.Show(bChapterLevel);
aInvisibleCB.Enable(bInvisible);
- ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update
+ ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update
aNumFormatLB.SetUpdateMode(TRUE);
aFormatLB.SetUpdateMode(TRUE);
@@ -685,7 +685,7 @@ void SwFldVarPage::UpdateSubType()
if (!aSelectionLB.GetSelectEntryCount())
{
aSelectionLB.SelectEntryPos(0);
- pLB = &aSelectionLB; // Alle Controls neu initialisieren
+ pLB = &aSelectionLB; // Alle Controls neu initialisieren
}
}
@@ -850,7 +850,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
nLen = sName.Len();
Selection aSel(aNameED.GetSelection());
aNameED.SetText( sName );
- aNameED.SetSelection( aSel ); // Cursorpos restaurieren
+ aNameED.SetSelection( aSel ); // Cursorpos restaurieren
}
break;
}
@@ -888,7 +888,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
bDelete = !pSh->IsUsed( *pType );
pType = GetFldMgr().GetFldType(RES_SETEXPFLD, sName);
- if (!pType) // Kein Namenskonflikt mit Variablen
+ if (!pType) // Kein Namenskonflikt mit Variablen
{
// Benutzerfelder duerfen auch ohne Inhalt eingefuegt werden!
// Bug #56845
@@ -1002,9 +1002,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
switch (nTypeId)
{
- case TYP_USERFLD: nId = RES_USERFLD; break;
- case TYP_DDEFLD: nId = RES_DDEFLD; break;
- case TYP_SETFLD: nId = RES_SETEXPFLD;break;
+ case TYP_USERFLD: nId = RES_USERFLD; break;
+ case TYP_DDEFLD: nId = RES_DDEFLD; break;
+ case TYP_SETFLD: nId = RES_SETEXPFLD;break;
}
pType = GetFldMgr().GetFldType(nId, sName);
@@ -1012,7 +1012,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
if (nFormat != LISTBOX_ENTRY_NOTFOUND)
nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat);
- if (pType) // Aendern
+ if (pType) // Aendern
{
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
@@ -1054,7 +1054,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
pSh->EndAllAction();
}
}
- else // Neu
+ else // Neu
{
if(nTypeId == TYP_USERFLD)
{
@@ -1080,19 +1080,19 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
if (nFormat != LISTBOX_ENTRY_NOTFOUND)
{
//JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ // Namen haben! Wird hier noch nicht beachtet.
USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
SwDDEFieldType aType(sName, sValue, (USHORT)nFormat);
aSelectionLB.InsertEntry(sName);
aSelectionLB.SelectEntry(sName);
- GetFldMgr().InsertFldType(aType); // DDE-Feld Neu
+ GetFldMgr().InsertFldType(aType); // DDE-Feld Neu
}
}
}
if (IsFldEdit())
- GetFldMgr().GetCurFld(); // FieldManager Updaten
+ GetFldMgr().GetCurFld(); // FieldManager Updaten
UpdateSubType();
}
@@ -1215,7 +1215,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
}
case TYP_SEQFLD:
{
- // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen
+ // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen
nSubType = aChapterLevelLB.GetSelectEntryPos();
if (nSubType == 0)
nSubType = 0x7f;
@@ -1253,7 +1253,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
return FALSE;
}
-SfxTabPage* SwFldVarPage::Create( Window* pParent,
+SfxTabPage* SwFldVarPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
{
return ( new SwFldVarPage( pParent, rAttrSet ) );
@@ -1265,8 +1265,8 @@ USHORT SwFldVarPage::GetGroup()
}
SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) :
- ListBox (pDialog, rResId),
- pDlg (pDialog),
+ ListBox (pDialog, rResId),
+ pDlg (pDialog),
bCallAddSelection(FALSE)
{
}
@@ -1281,20 +1281,20 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
const KeyCode aKeyCode = pKEvt->GetKeyCode();
const USHORT nModifier = aKeyCode.GetModifier();
if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
-// bAddSel = TRUE;
+// bAddSel = TRUE;
bCallAddSelection = TRUE;
}
if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
{
const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
- if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl
+ if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl
//bAddSel = TRUE;
bCallAddSelection = TRUE;
}
-// if (bAddSel)
-// pDlg->AddSelection(this);
+// if (bAddSel)
+// pDlg->AddSelection(this);
return nHandled;
}
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 5f671402372e..e08187cf8bf8 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -2,7 +2,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
@@ -44,47 +44,47 @@ class SwFldVarPage;
class SelectionListBox : public ListBox
{
- SwFldVarPage* pDlg;
- BOOL bCallAddSelection;
+ SwFldVarPage* pDlg;
+ BOOL bCallAddSelection;
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual long PreNotify( NotifyEvent& rNEvt );
public:
SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId );
- // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten
- BOOL IsCallAddSelection() const {return bCallAddSelection;}
- void ResetCallAddSelection() {bCallAddSelection = FALSE;}
+ // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten
+ BOOL IsCallAddSelection() const {return bCallAddSelection;}
+ void ResetCallAddSelection() {bCallAddSelection = FALSE;}
};
class SwFldVarPage : public SwFldPage
{
friend class SelectionListBox;
- FixedText aTypeFT;
- ListBox aTypeLB;
- FixedText aSelectionFT;
- SelectionListBox aSelectionLB;
- FixedText aNameFT;
- Edit aNameED;
- FixedText aValueFT;
- ConditionEdit aValueED;
- FixedText aFormatFT;
- NumFormatListBox aNumFormatLB;
- ListBox aFormatLB;
- FixedText aChapterHeaderFT;
- FixedText aChapterLevelFT;
- ListBox aChapterLevelLB;
- CheckBox aInvisibleCB;
- FixedText aSeparatorFT;
- Edit aSeparatorED;
- ToolBox aNewDelTBX;
-
- String sOldValueFT;
- String sOldNameFT;
-
- ULONG nOldFormat;
- BOOL bInit;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ FixedText aSelectionFT;
+ SelectionListBox aSelectionLB;
+ FixedText aNameFT;
+ Edit aNameED;
+ FixedText aValueFT;
+ ConditionEdit aValueED;
+ FixedText aFormatFT;
+ NumFormatListBox aNumFormatLB;
+ ListBox aFormatLB;
+ FixedText aChapterHeaderFT;
+ FixedText aChapterLevelFT;
+ ListBox aChapterLevelLB;
+ CheckBox aInvisibleCB;
+ FixedText aSeparatorFT;
+ Edit aSeparatorED;
+ ToolBox aNewDelTBX;
+
+ String sOldValueFT;
+ String sOldNameFT;
+
+ ULONG nOldFormat;
+ BOOL bInit;
DECL_LINK( TypeHdl, ListBox* pLB = 0 );
DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
@@ -93,11 +93,11 @@ class SwFldVarPage : public SwFldPage
DECL_LINK( ChapterHdl, ListBox *pLB = 0);
DECL_LINK( SeparatorHdl, Edit *pED = 0 );
- void UpdateSubType();
- USHORT FillFormatLB(USHORT nTypeId);
+ void UpdateSubType();
+ USHORT FillFormatLB(USHORT nTypeId);
protected:
- virtual USHORT GetGroup();
+ virtual USHORT GetGroup();
public:
SwFldVarPage(Window* pParent, const SfxItemSet& rSet);
@@ -109,7 +109,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- virtual void FillUserData();
+ virtual void FillUserData();
};
diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src
index 7405a2956849..eda28b7fb40d 100644
--- a/sw/source/ui/fldui/fldvar.src
+++ b/sw/source/ui/fldui/fldvar.src
@@ -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
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx
index b8d3a53f7351..abe6b8686e8c 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/ui/fldui/fldwrap.cxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) :
IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG )
{
- GetWindow()->Activate(); // Dialog aktualisieren
+ GetWindow()->Activate(); // Dialog aktualisieren
return 0;
}
@@ -78,7 +78,7 @@ BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *)
if (m_pDocSh != GetOldDocShell())
{
m_aUpdateTimer.Stop();
- bRet = TRUE; // Sofortiges Update
+ bRet = TRUE; // Sofortiges Update
}
else
m_aUpdateTimer.Start();
@@ -100,7 +100,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId,
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
+
AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
pDlgInterface = pDlg;
@@ -116,7 +116,7 @@ BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
{
BOOL bRet;
- if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
+ if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
{
pDlgInterface->ReInitDlg();
}
@@ -147,11 +147,11 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId,
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
+
AbstractSwFldDlg* pDlg = pFact->CreateSwFldDlg(pB, this, _pParent, DLG_FLD_INSERT );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- pDlgInterface = pDlg;
-
+ pDlgInterface = pDlg;
+
pWindow = pDlg->GetWindow();
pDlg->ActivateDatabasePage();
pDlg->Start();
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index ca7422ecac44..ed62263b221e 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -2,7 +2,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
@@ -58,7 +58,7 @@
SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
SwField* pField, BOOL bNextButton ) :
- SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)),
+ SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)),
rSh( rS ),
pInpFld(0),
@@ -66,12 +66,12 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
pUsrType(0),
aLabelED (this, SW_RES(ED_LABEL )),
- aEditED (this, SW_RES(ED_EDIT )),
+ aEditED (this, SW_RES(ED_EDIT )),
aEditFL (this, SW_RES(FL_EDIT )),
aOKBT (this, SW_RES(BT_OK )),
- aCancelBT (this, SW_RES(BT_CANCEL )),
- aNextBT (this, SW_RES(PB_NEXT )),
+ aCancelBT (this, SW_RES(BT_CANCEL )),
+ aNextBT (this, SW_RES(PB_NEXT )),
aHelpBT (this, SW_RES(PB_HELP ))
{
// Font fuers Edit umschalten
@@ -95,7 +95,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
// Auswertung hier
String aStr;
if( RES_INPUTFLD == pField->GetTyp()->Which() )
- { // Es ist eine Eingabefeld
+ { // Es ist eine Eingabefeld
//
pInpFld = (SwInputField*)pField;
aLabelED.SetText( pInpFld->GetPar2() );
@@ -130,7 +130,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
}
// JP 31.3.00: Inputfields in readonly regions must be allowed to
- // input any content. - 74639
+ // input any content. - 74639
BOOL bEnable = !rSh.IsCrsrReadonly();
/*!rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel()*/;
aOKBT.Enable( bEnable );
@@ -153,7 +153,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
}
/*--------------------------------------------------------------------
- Beschreibung: Schliessen
+ Beschreibung: Schliessen
--------------------------------------------------------------------*/
void SwFldInputDlg::Apply()
diff --git a/sw/source/ui/fldui/inpdlg.hrc b/sw/source/ui/fldui/inpdlg.hrc
index bbd04c092010..8a7a3eea9073 100644
--- a/sw/source/ui/fldui/inpdlg.hrc
+++ b/sw/source/ui/fldui/inpdlg.hrc
@@ -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
@@ -24,11 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define FT_LABEL 1
-#define ED_EDIT 3
+#define FT_LABEL 1
+#define ED_EDIT 3
#define FL_EDIT 4
-#define BT_OK 5
-#define BT_CANCEL 6
-#define ED_LABEL 7
-#define PB_NEXT 8
-#define PB_HELP 9
+#define BT_OK 5
+#define BT_CANCEL 6
+#define ED_LABEL 7
+#define PB_NEXT 8
+#define PB_HELP 9
diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src
index 8b60525dfe5c..f615b68f4899 100644
--- a/sw/source/ui/fldui/inpdlg.src
+++ b/sw/source/ui/fldui/inpdlg.src
@@ -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
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index f9fa94907cd3..c5f1876a9428 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -2,7 +2,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
@@ -67,20 +67,20 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
SvxStandardDialog(pParent, SW_RES(DLG_JAVAEDIT)),
- aTypeFT ( this, SW_RES( FT_TYPE ) ),
- aTypeED ( this, SW_RES( ED_TYPE ) ),
- aUrlRB ( this, SW_RES( RB_URL ) ),
+ aTypeFT ( this, SW_RES( FT_TYPE ) ),
+ aTypeED ( this, SW_RES( ED_TYPE ) ),
+ aUrlRB ( this, SW_RES( RB_URL ) ),
aEditRB ( this, SW_RES( RB_EDIT ) ),
aUrlPB ( this, SW_RES( PB_URL ) ),
- aUrlED ( this, SW_RES( ED_URL ) ),
- aEditED ( this, SW_RES( ED_EDIT ) ),
+ aUrlED ( this, SW_RES( ED_URL ) ),
+ aEditED ( this, SW_RES( ED_EDIT ) ),
aPostItFL ( this, SW_RES( FL_POSTIT ) ),
aOKBtn ( this, SW_RES( BTN_POST_OK ) ),
- aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ),
- aPrevBtn ( this, SW_RES( BTN_PREV ) ),
- aNextBtn ( this, SW_RES( BTN_NEXT ) ),
- aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ),
+ aCancelBtn ( this, SW_RES( BTN_POST_CANCEL ) ),
+ aPrevBtn ( this, SW_RES( BTN_PREV ) ),
+ aNextBtn ( this, SW_RES( BTN_NEXT ) ),
+ aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ),
bNew(TRUE),
bIsUrl(FALSE),
diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc
index d7448936d4cb..7c996e832e0b 100644
--- a/sw/source/ui/fldui/javaedit.hrc
+++ b/sw/source/ui/fldui/javaedit.hrc
@@ -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
@@ -29,22 +29,22 @@
// defines ------------------------------------------------------------------
-#define FT_TYPE 10
-#define ED_TYPE 11
-#define RB_EDIT 12
-#define ED_EDIT 13
+#define FT_TYPE 10
+#define ED_TYPE 11
+#define RB_EDIT 12
+#define ED_EDIT 13
#define FL_POSTIT 14
-#define BTN_PREV 15
-#define BTN_NEXT 16
-#define STR_JAVA_EDIT 17
-#define STR_JAVA_INSERT 18
-#define RB_URL 19
-#define ED_URL 20
-#define PB_URL 21
+#define BTN_PREV 15
+#define BTN_NEXT 16
+#define STR_JAVA_EDIT 17
+#define STR_JAVA_INSERT 18
+#define RB_URL 19
+#define ED_URL 20
+#define PB_URL 21
-#define BTN_POST_OK 30
-#define BTN_POST_CANCEL 31
-#define BTN_POST_HELP 32
+#define BTN_POST_OK 30
+#define BTN_POST_CANCEL 31
+#define BTN_POST_HELP 32
#endif
diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src
index 45dbf468e7ae..ffeb2b84e899 100644
--- a/sw/source/ui/fldui/javaedit.src
+++ b/sw/source/ui/fldui/javaedit.src
@@ -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
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index 0e84693a8b17..5395a1101847 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@
#include <comphelper/processfactory.hxx>
#include <fldmgr.hxx>
#include <dbmgr.hxx>
-#include <wrtsh.hxx> // Actives Fenster
+#include <wrtsh.hxx> // Actives Fenster
#include <view.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src
index 63067902178f..2f68cbdc56ba 100644
--- a/sw/source/ui/fmtui/fmtui.src
+++ b/sw/source/ui/fmtui/fmtui.src
@@ -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
@@ -35,21 +35,21 @@ String STR_TEMPLATE_WILDCARD
{
TEXT = "*.vor" ;
};
- //String STR_NONAME //!! VB
+ //String STR_NONAME //!! VB
//{
- // TEXT = "Unbenannt ";
- // TEXT [English] = "Noname ";
- // TEXT [norwegian] = "Noname ";
- // TEXT [italian] = "Senza nome";
- // TEXT [portuguese_brazilian] = "Semnome ";
- // TEXT [portuguese] = "Semnome ";
- // TEXT [finnish] = "Nimetn ";
- // TEXT [danish] = "Intet navn";
- // TEXT [french] = "Sansnom ";
- // TEXT [swedish] = "Namnls";
- // TEXT [dutch] = "Naamloos";
- // TEXT [spanish] = "Sin nombre ";
- // TEXT [english_us] = "Noname ";
+ // TEXT = "Unbenannt ";
+ // TEXT [English] = "Noname ";
+ // TEXT [norwegian] = "Noname ";
+ // TEXT [italian] = "Senza nome";
+ // TEXT [portuguese_brazilian] = "Semnome ";
+ // TEXT [portuguese] = "Semnome ";
+ // TEXT [finnish] = "Nimetn ";
+ // TEXT [danish] = "Intet navn";
+ // TEXT [french] = "Sansnom ";
+ // TEXT [swedish] = "Namnls";
+ // TEXT [dutch] = "Naamloos";
+ // TEXT [spanish] = "Sin nombre ";
+ // TEXT [english_us] = "Noname ";
//};
String STR_OVERWRITE
{
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 7d787d5d8700..266d8cf3a01d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -2,7 +2,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
@@ -51,24 +51,24 @@
#include <fmtclds.hxx>
#include <swtypes.hxx>
#include <swmodule.hxx>
-#include <errhdl.hxx> // fuer Create-Methoden
+#include <errhdl.hxx> // fuer Create-Methoden
#include <wrtsh.hxx>
#include <view.hxx>
#include <wdocsh.hxx>
#include <viewopt.hxx>
#include <pgfnote.hxx>
#include <pggrid.hxx>
-#include <tmpdlg.hxx> // der Dialog
-#include <column.hxx> // Spalten
-#include <drpcps.hxx> // Initialen
-#include <frmpage.hxx> // Rahmen
-#include <wrap.hxx> // Rahmen
-#include <frmmgr.hxx> // Rahmen
-#include <ccoll.hxx> // CondColl
+#include <tmpdlg.hxx> // der Dialog
+#include <column.hxx> // Spalten
+#include <drpcps.hxx> // Initialen
+#include <frmpage.hxx> // Rahmen
+#include <wrap.hxx> // Rahmen
+#include <frmmgr.hxx> // Rahmen
+#include <ccoll.hxx> // CondColl
#include <swuiccoll.hxx>
-#include <docstyle.hxx> //
-#include <fmtcol.hxx> //
-#include <macassgn.hxx> //
+#include <docstyle.hxx> //
+#include <fmtcol.hxx> //
+#include <macassgn.hxx> //
#include <poolfmt.hxx>
#include <uitool.hxx>
#include <shellres.hxx>
@@ -91,16 +91,16 @@
extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell();
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Beschreibung: Der Traeger des Dialoges
--------------------------------------------------------------------*/
-SwTemplateDlg::SwTemplateDlg(Window* pParent,
+SwTemplateDlg::SwTemplateDlg(Window* pParent,
SfxStyleSheetBase& rBase,
- USHORT nRegion,
- BOOL bColumn,
- SwWrtShell* pActShell,
- BOOL bNew ) :
- SfxStyleDialog( pParent,
+ USHORT nRegion,
+ BOOL bColumn,
+ SwWrtShell* pActShell,
+ BOOL bNew ) :
+ SfxStyleDialog( pParent,
SW_RES(DLG_TEMPLATE_BASE + nRegion),
rBase,
FALSE,
@@ -150,19 +150,19 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
+ AddTabPage( TP_PARA_STD, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) );
+ AddTabPage( TP_PARA_ALIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
+ AddTabPage( TP_PARA_EXT, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
+ AddTabPage( TP_PARA_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");
@@ -183,12 +183,12 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");
- AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+ AddTabPage( TP_TABULATOR, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
AddTabPage(TP_NUMPARA, SwParagraphNumTabPage::Create,
SwParagraphNumTabPage::GetRanges);
- AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create,
+ AddTabPage(TP_DROPCAPS, SwDropCapsPage::Create,
SwDropCapsPage::GetRanges );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
@@ -233,11 +233,11 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
// Rahmenvorlagen
case SFX_STYLE_FAMILY_FRAME:
{
- AddTabPage(TP_FRM_STD, SwFrmPage::Create,
+ AddTabPage(TP_FRM_STD, SwFrmPage::Create,
SwFrmPage::GetRanges );
- AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create,
+ AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create,
SwFrmAddPage::GetRanges );
- AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create,
+ AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create,
SwWrapTabPage::GetRanges );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
@@ -246,13 +246,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- AddTabPage(TP_COLUMN, SwColumnPage::Create,
+ AddTabPage(TP_COLUMN, SwColumnPage::Create,
SwColumnPage::GetRanges );
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
// Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
+/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
GetItemSet().Get(RES_FRM_SIZE));
if( !aSize.GetWidth() )
{
@@ -268,10 +268,10 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
- AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
+ AddTabPage(TP_HEADER_PAGE, String(SW_RES(STR_PAGE_HEADER)),
SvxHeaderPage::Create,
SvxHeaderPage::GetRanges );
- AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
+ AddTabPage(TP_FOOTER_PAGE, String(SW_RES(STR_PAGE_FOOTER)),
SvxFooterPage::Create,
SvxFooterPage::GetRanges );
if(bColumn)
@@ -279,7 +279,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
+ AddTabPage(TP_PAGE_STD, String(SW_RES(STR_PAGE_STD)),
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
FALSE,
@@ -288,12 +288,12 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
- AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
+ AddTabPage(TP_BORDER, String(SW_RES(STR_PAGE_BORDER)),
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
- AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
+ AddTabPage(TP_COLUMN, String(SW_RES(STR_PAGE_COLUMN)),
SwColumnPage::Create,
SwColumnPage::GetRanges );
- AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
+ AddTabPage(TP_FOOTNOTE_PAGE, String(SW_RES(STR_PAGE_FOOTNOTE)),
SwFootNotePage::Create,
SwFootNotePage::GetRanges );
AddTabPage(TP_TEXTGRID_PAGE, String(SW_RES(STR_PAGE_TEXTGRID)),
@@ -318,11 +318,11 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
AddTabPage( RID_SVXPAGE_NUM_POSITION );
-/* const SfxPoolItem* pItem;
+/* const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState(
FN_PARAM_ACT_NUMBER, FALSE, &pItem ))
{
-// pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue();
+// pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue();
}
*/
}
@@ -576,7 +576,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
rCharFmtLB.Clear();
rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
- ::FillCharStyleListBox(rCharFmtLB, pDocShell);
+ ::FillCharStyleListBox(rCharFmtLB, pDocShell);
List aList;
for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++)
{
diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src
index da2479717373..3d9e8df617a9 100644
--- a/sw/source/ui/fmtui/tmpdlg.src
+++ b/sw/source/ui/fmtui/tmpdlg.src
@@ -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
@@ -177,16 +177,16 @@ TabDialog DLG_TEMPLATE_4
{
OutputSize = TRUE ;
SVLook = TRUE ;
- // Text[norwegian_wrong] = "Sidetyper";
- // Text[italian_wrong] = "Stili pagina";
- // Text[portuguese_brazilian_wrong] = "Estilos da Pgina ";
- // Text[portuguese_wrong] = "Estilos da Pgina ";
- // Text[finnish_wrong] = "Sivutyylit";
- // Text[danish_wrong] = "Sidelayout";
- // Text[french_wrong] = "Styles de page";
- // Text[swedish_wrong] = "Sidformat";
- // Text[dutch_wrong] = "Pagina-opmaakprofielen";
- // Text[spanish_wrong] = "Estilos de pgina";
+ // Text[norwegian_wrong] = "Sidetyper";
+ // Text[italian_wrong] = "Stili pagina";
+ // Text[portuguese_brazilian_wrong] = "Estilos da Pgina ";
+ // Text[portuguese_wrong] = "Estilos da Pgina ";
+ // Text[finnish_wrong] = "Sivutyylit";
+ // Text[danish_wrong] = "Sidelayout";
+ // Text[french_wrong] = "Styles de page";
+ // Text[swedish_wrong] = "Sidformat";
+ // Text[dutch_wrong] = "Pagina-opmaakprofielen";
+ // Text[spanish_wrong] = "Estilos de pgina";
Text [ en-US ] = "Page Style" ;
Moveable = TRUE ;
TabControl 1
@@ -273,16 +273,16 @@ TabDialog DLG_TEMPLATE_3
{
OutputSize = TRUE ;
SVLook = TRUE ;
- // Text[norwegian_wrong] = "Rammemaler";
- // Text[italian_wrong] = "Stili cornice";
- // Text[portuguese_brazilian_wrong] = "Estilos de Moldura";
- // Text[portuguese_wrong] = "Estilos de Moldura";
- // Text[finnish_wrong] = "Kehystyylit";
- // Text[danish_wrong] = "Rammelayout";
- // Text[french_wrong] = "Styles d'encadrement";
- // Text[swedish_wrong] = "Ramformat";
- // Text[dutch_wrong] = "Kaderopmaakprofielen";
- // Text[spanish_wrong] = "Estilos de marco";
+ // Text[norwegian_wrong] = "Rammemaler";
+ // Text[italian_wrong] = "Stili cornice";
+ // Text[portuguese_brazilian_wrong] = "Estilos de Moldura";
+ // Text[portuguese_wrong] = "Estilos de Moldura";
+ // Text[finnish_wrong] = "Kehystyylit";
+ // Text[danish_wrong] = "Rammelayout";
+ // Text[french_wrong] = "Styles d'encadrement";
+ // Text[swedish_wrong] = "Ramformat";
+ // Text[dutch_wrong] = "Kaderopmaakprofielen";
+ // Text[spanish_wrong] = "Estilos de marco";
Text [ en-US ] = "Frame Style" ;
Moveable = TRUE ;
TabControl 1
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 7b419132736c..f9636aad1112 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -2,7 +2,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
@@ -495,7 +495,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg,
Rectangle aRect;
aRect.Right() = rOrg.X() + GetSize().Width() - nR;
aRect.Left() = rOrg.X() + nL;
- aRect.Top() = rOrg.Y() + GetTop()
+ aRect.Top() = rOrg.Y() + GetTop()
+ GetHdHeight() + GetHdDist();
aRect.Bottom()= rOrg.Y() + GetSize().Height() - GetBottom()
- GetFtHeight() - GetFtDist();
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx
index a13083735773..6ea6307e9461 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/ui/frmdlg/colmgr.cxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@
// PRIVATE METHODES ------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
+ Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
------------------------------------------------------------------------*/
void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
{
@@ -56,7 +56,7 @@ void FitToActualSize(SwFmtCol& rCol, USHORT nWidth)
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Setzen Spaltenanzahl und Gutterwidth
+ Beschreibung: Setzen Spaltenanzahl und Gutterwidth
------------------------------------------------------------------------*/
void SwColMgr::SetCount(USHORT nCount, USHORT nGutterWidth)
{
@@ -94,7 +94,7 @@ void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos )
}
/*------------------------------------------------------------------------
- Beschreibung: Hoehe Trennlinie
+ Beschreibung: Hoehe Trennlinie
------------------------------------------------------------------------*/
short SwColMgr::GetLineHeightPercent() const
{
@@ -108,7 +108,7 @@ void SwColMgr::SetLineHeightPercent(short nPercent)
}
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite
+ Beschreibung: Spaltenbreite
------------------------------------------------------------------------*/
USHORT SwColMgr::GetColWidth(USHORT nIdx) const
{
@@ -124,7 +124,7 @@ void SwColMgr::SetColWidth(USHORT nIdx, USHORT nWd)
}
/*--------------------------------------------------------------------
- Beschreibung: Groesse neu setzen
+ Beschreibung: Groesse neu setzen
--------------------------------------------------------------------*/
void SwColMgr::SetActualWidth(USHORT nW)
{
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 47c4e6a177bb..87069fca0477 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -2,7 +2,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
@@ -99,9 +99,9 @@ inline BOOL IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect )
SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
SfxModalDialog(pParent, SW_RES(DLG_COLUMN)),
- aOK(this, SW_RES(PB_OK)),
- aCancel(this, SW_RES(PB_CANCEL)),
- aHelp(this, SW_RES(PB_HELP)),
+ aOK(this, SW_RES(PB_OK)),
+ aCancel(this, SW_RES(PB_CANCEL)),
+ aHelp(this, SW_RES(PB_HELP)),
aApplyToFT(this, SW_RES(FT_APPLY_TO)),
aApplyToLB(this, SW_RES(LB_APPLY_TO)),
rWrtShell(rSh),
@@ -243,15 +243,15 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
case LISTBOX_SELECTION :
pSet = pSelectionSet;
break;
- case LISTBOX_SECTION :
+ case LISTBOX_SECTION :
pSet = pSectionSet;
bSectionChanged = TRUE;
break;
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
bSelSectionChanged = TRUE;
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
pSet = pPageSet;
bPageChanged = TRUE;
break;
@@ -273,12 +273,12 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
if( pSelectionSet )
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
break;
- case LISTBOX_SECTION :
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTION :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
nWidth = nPageWidth;
pSet = pPageSet;
pSet->Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth, nWidth));
@@ -307,15 +307,15 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
case LISTBOX_SELECTION :
pSet = pSelectionSet;
break;
- case LISTBOX_SECTION :
+ case LISTBOX_SECTION :
pSet = pSectionSet;
bSectionChanged = TRUE;
break;
- case LISTBOX_SECTIONS :
+ case LISTBOX_SECTIONS :
pSet = pSectionSet;
bSelSectionChanged = TRUE;
break;
- case LISTBOX_PAGE :
+ case LISTBOX_PAGE :
pSet = pPageSet;
bPageChanged = TRUE;
break;
@@ -420,7 +420,7 @@ void SwColumnPage::ResetColWidth()
}
/*--------------------------------------------------------------------
- Beschreibung: Jetzt als TabPage
+ Beschreibung: Jetzt als TabPage
--------------------------------------------------------------------*/
SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
@@ -567,7 +567,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
delete pColMgr;
pColMgr = new SwColMgr(rSet);
- nCols = pColMgr->GetCount() ;
+ nCols = pColMgr->GetCount() ;
aCLNrEdt.SetMax(Max((USHORT)aCLNrEdt.GetMax(), (USHORT)nCols));
aCLNrEdt.SetLast(Max(nCols,(USHORT)aCLNrEdt.GetMax()));
@@ -606,7 +606,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage erzeugen
+ Beschreibung: TabPage erzeugen
--------------------------------------------------------------------*/
SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
{
@@ -614,7 +614,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
{
@@ -646,7 +646,7 @@ BOOL SwColumnPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: ColumnManager updaten
+ Beschreibung: ColumnManager updaten
--------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
{
@@ -736,7 +736,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
}
/*------------------------------------------------------------------------
- Beschreibung: Initialisierung
+ Beschreibung: Initialisierung
------------------------------------------------------------------------*/
void SwColumnPage::Init()
{
@@ -766,7 +766,7 @@ void SwColumnPage::Init()
nColWidth[i] = nColumnWidthSum;
}
SwColLineAdj eAdj = pColMgr->GetAdjust();
- if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE!
+ if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE!
{
eAdj = COLADJ_TOP;
//ohne Adjust auch kein Linientyp
@@ -797,7 +797,7 @@ void SwColumnPage::Init()
}
/*------------------------------------------------------------------------
- Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden
+ Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden
die Controls fuer die Bearbeitung der Spalten entsprechend
der Spaltenzahl en- oder disabled.
Falls es mehr als nVisCols (= 3) Spalten gibt, werden
@@ -809,8 +809,8 @@ void SwColumnPage::Init()
void SwColumnPage::UpdateCols()
{
BOOL bEnableBtns= FALSE;
- BOOL bEnable12 = FALSE;
- BOOL bEnable3 = FALSE;
+ BOOL bEnable12 = FALSE;
+ BOOL bEnable3 = FALSE;
const BOOL bEdit = !aAutoWidthBox.IsChecked();
if ( nCols > nVisCols )
{
@@ -869,7 +869,7 @@ void SwColumnPage::SetLabels( USHORT nVis )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl
+ Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl
gerufen wird.
Eine Aenderung der Spaltenzahl ueberschreibt eventuelle
Breiteneinstellungen des Benutzers; alle Spalten sind
@@ -902,7 +902,7 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
}
/*------------------------------------------------------------------------
- Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite
+ Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite
oder des Spaltenabstandes.
Diese Aenderungen wirken sich erst zeitversetzt aus.
Durch eine Aenderung der Spaltenbreite wird die automatische
@@ -989,7 +989,7 @@ IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
+ Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
Ist die Box gecheckt, koennen keine expliziten Werte
fuer die Spaltenbreite eingegeben werden.
------------------------------------------------------------------------*/
@@ -1011,7 +1011,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
}
/*------------------------------------------------------------------------
- Beschreibung: Raufscrollen der Inhalte der Edits.
+ Beschreibung: Raufscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
{
@@ -1025,7 +1025,7 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Runterscrollen der Inhalte der Edits.
+ Beschreibung: Runterscrollen der Inhalte der Edits.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
{
@@ -1039,8 +1039,8 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
- * Timer- Handler; angetriggert durch eine Aenderung der
+ Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
+ * Timer- Handler; angetriggert durch eine Aenderung der
Spaltenbreite oder des Spaltenabstandes.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
@@ -1090,7 +1090,7 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisierung der Anzeige
+ Beschreibung: Aktualisierung der Anzeige
------------------------------------------------------------------------*/
void SwColumnPage::Update()
{
@@ -1123,7 +1123,7 @@ void SwColumnPage::Update()
}
/*--------------------------------------------------------------------
- Beschreibung: Update Bsp
+ Beschreibung: Update Bsp
--------------------------------------------------------------------*/
void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1285,7 +1285,7 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
Rectangle aRect = rUDEvt.GetRect();
- USHORT nItemId = rUDEvt.GetItemId();
+ USHORT nItemId = rUDEvt.GetItemId();
long nRectWidth = aRect.GetWidth();
long nRectHeight = aRect.GetHeight();
@@ -1313,11 +1313,11 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
nEnds[1] = nRectWidth * 9 / 10;
break;
case 3: nCols = 3;
- nEnds[0] = nRectWidth * 30 / 100;
- nStarts[1] = nEnds[0] + nStep;
- nEnds[1] = nRectWidth * 63 / 100;
- nStarts[2] = nEnds[1] + nStep;
- nEnds[2] = nRectWidth * 9 / 10;
+ nEnds[0] = nRectWidth * 30 / 100;
+ nStarts[1] = nEnds[0] + nStep;
+ nEnds[1] = nRectWidth * 63 / 100;
+ nStarts[2] = nEnds[1] + nStep;
+ nEnds[2] = nRectWidth * 9 / 10;
break;
case 4: nCols = 2;
nEnds[0] = nRectWidth * 63 / 100;
diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc
index dd8b81e0c91a..172674a6b3f6 100644
--- a/sw/source/ui/frmdlg/column.hrc
+++ b/sw/source/ui/frmdlg/column.hrc
@@ -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
@@ -24,41 +24,41 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define FT_NUMBER 1
-#define ED_NUMBER 2
-#define FT_DISTANCE 3
-#define ED_DISTANCE 4
-#define CB_AUTO_WIDTH 4
+#define FT_NUMBER 1
+#define ED_NUMBER 2
+#define FT_DISTANCE 3
+#define ED_DISTANCE 4
+#define CB_AUTO_WIDTH 4
#define FL_COLUMNS 6
-#define FT_1 20
-#define FT_2 21
-#define FT_3 22
+#define FT_1 20
+#define FT_2 21
+#define FT_3 22
-#define ED_1 25
-#define ED_2 26
-#define ED_3 27
+#define ED_1 25
+#define ED_2 26
+#define ED_3 27
-#define BTN_UP 30
-#define BTN_DOWN 31
-#define FL_LAYOUT 32
+#define BTN_UP 30
+#define BTN_DOWN 31
+#define FL_LAYOUT 32
-#define FT_STYLE 33
-#define LB_STYLE 34
-#define FT_HEIGHT 35
-#define ED_HEIGHT 36
-#define FT_POSITION 37
-#define LB_POSITION 38
-#define FL_LINETYPE 39
+#define FT_STYLE 33
+#define LB_STYLE 34
+#define FT_HEIGHT 35
+#define ED_HEIGHT 36
+#define FT_POSITION 37
+#define LB_POSITION 38
+#define FL_LINETYPE 39
-#define WN_BSP 41
+#define WN_BSP 41
-#define LB_REFERENCE 42
+#define LB_REFERENCE 42
#define CB_REGISTER 43
#define FL_REGISTER 44
-#define FT_REFERENCE 45
+#define FT_REFERENCE 45
#define ED_DIST1 46
#define ED_DIST2 47
@@ -67,21 +67,21 @@
#define FT_WIDTH 49
#define FT_DIST 50
#define VS_DEFAULTS 51
-#define IL_PRE_COLS 52
+#define IL_PRE_COLS 52
-#define FT_APPLY_TO 53
+#define FT_APPLY_TO 53
#define LB_APPLY_TO 54
-#define PB_HELP 55
+#define PB_HELP 55
#define PB_CANCEL 56
#define PB_OK 57
-#define CB_BALANCECOLS 58
+#define CB_BALANCECOLS 58
#define FL_PROPERTIES 59
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
#define FL_VERT 62
-#define LISTBOX_SELECTION 0
-#define LISTBOX_SECTION 1
-#define LISTBOX_SECTIONS 2
-#define LISTBOX_PAGE 3
-#define LISTBOX_FRAME 4
+#define LISTBOX_SELECTION 0
+#define LISTBOX_SECTION 1
+#define LISTBOX_SECTIONS 2
+#define LISTBOX_PAGE 3
+#define LISTBOX_FRAME 4
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 7f260501cbbe..449fbbf121ea 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -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
@@ -391,11 +391,11 @@ ModalDialog DLG_COLUMN
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "Selection" ; LISTBOX_SELECTION; > ;
- < "Current Section" ; LISTBOX_SECTION ; > ;
- < "Selected section" ; LISTBOX_SECTIONS ; > ;
- < "Frame" ; LISTBOX_FRAME ; > ;
- < "Page Style: " ; LISTBOX_PAGE ; > ;
+ < "Selection" ; LISTBOX_SELECTION; > ;
+ < "Current Section" ; LISTBOX_SECTION ; > ;
+ < "Selected section" ; LISTBOX_SECTIONS ; > ;
+ < "Frame" ; LISTBOX_FRAME ; > ;
+ < "Page Style: " ; LISTBOX_PAGE ; > ;
};
};
Text [ en-US ] = "Columns";
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 8bcc2912717b..c15fe954b812 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -2,7 +2,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,14 +73,14 @@ extern String* GetOldDrwCat();
class SwSequenceOptionDialog : public SvxStandardDialog
{
FixedLine aFlHeader;
- FixedText aFtLevel;
- ListBox aLbLevel;
- FixedText aFtDelim;
- Edit aEdDelim;
+ FixedText aFtLevel;
+ ListBox aLbLevel;
+ FixedText aFtDelim;
+ Edit aEdDelim;
FixedLine aFlCatAndFrame;
- FixedText aFtCharStyle;
- ListBox aLbCharStyle;
+ FixedText aFtCharStyle;
+ ListBox aLbCharStyle;
CheckBox aApplyBorderAndShadowCB;
//#i61007# order of captions
@@ -89,11 +89,11 @@ class SwSequenceOptionDialog : public SvxStandardDialog
ListBox aLbCaptionOrder;
OKButton aOKButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
+ CancelButton aCancelButton;
+ HelpButton aHelpButton;
SwView& rView;
- String aFldTypeName;
+ String aFldTypeName;
public:
SwSequenceOptionDialog( Window *pParent, SwView &rV,
@@ -157,13 +157,13 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
Link aLk = LINK( this, SwCaptionDialog, ModifyHdl );
aCategoryBox.SetModifyHdl( aLk );
- aTextEdit .SetModifyHdl( aLk );
+ aTextEdit .SetModifyHdl( aLk );
aNumberingSeparatorED.SetModifyHdl ( aLk );
- aSepEdit .SetModifyHdl( aLk );
+ aSepEdit .SetModifyHdl( aLk );
aLk = LINK(this, SwCaptionDialog, SelectHdl);
aCategoryBox.SetSelectHdl( aLk );
- aFormatBox .SetSelectHdl( aLk );
+ aFormatBox .SetSelectHdl( aLk );
aOptionButton.SetClickHdl( LINK( this, SwCaptionDialog, OptionHdl ) );
aAutoCaptionButton.SetClickHdl(LINK(this, SwCaptionDialog, CaptionHdl));
@@ -267,7 +267,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
case nsSelectionType::SEL_FRM:
case nsSelectionType::SEL_TXT:
aPosBox.InsertEntry(SW_RESSTR(STR_BEGINNING));
- aPosBox.InsertEntry(SW_RESSTR(STR_END ));
+ aPosBox.InsertEntry(SW_RESSTR(STR_END ));
break;
}
aPosBox.SelectEntryPos(1);
@@ -365,7 +365,7 @@ IMPL_LINK( SwCaptionDialog, ModifyHdl, Edit *, EMPTYARG )
IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG)
{
- SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() );
+ SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() );
SwCaptionOptDlg aDlg( this, aSet );
aDlg.Execute();
@@ -492,9 +492,9 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
aFlCaptionOrder(this, SW_RES( FL_ORDER )), //#i61007# order of captions
aFtCaptionOrder(this, SW_RES( FT_ORDER )),
aLbCaptionOrder(this, SW_RES( LB_ORDER )),
- aOKButton (this, SW_RES(BTN_OK )),
- aCancelButton (this, SW_RES(BTN_CANCEL )),
- aHelpButton (this, SW_RES(BTN_HELP )),
+ aOKButton (this, SW_RES(BTN_OK )),
+ aCancelButton (this, SW_RES(BTN_CANCEL )),
+ aHelpButton (this, SW_RES(BTN_HELP )),
rView( rV ),
aFldTypeName( rSeqFldType )
diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc
index 1487171f0c01..b85b6215a5d1 100644
--- a/sw/source/ui/frmdlg/cption.hrc
+++ b/sw/source/ui/frmdlg/cption.hrc
@@ -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
@@ -41,7 +41,7 @@
#define BOX_POS 11
#define FL_SETTINGS 12
#define BTN_HELP 13
-#define BTN_OPTION 14
+#define BTN_OPTION 14
#define FL_HEADER 15
#define FT_LEVEL 16
#define LB_LEVEL 17
@@ -66,11 +66,11 @@
#define FT_NUM_SEP 34
#define ED_NUM_SEP 35
-#define STR_BEGINNING 1
-#define STR_END 2
-#define STR_ABOVE 3
-#define STR_CP_BELOW 4
-#define STR_CATEGORY_NONE 5
+#define STR_BEGINNING 1
+#define STR_END 2
+#define STR_ABOVE 3
+#define STR_CP_BELOW 4
+#define STR_CATEGORY_NONE 5
#endif
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
index 711bf796e2a7..9440c7859f28 100644
--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -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
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index e2b5c13d1c57..2fdf235a3964 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -2,7 +2,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
@@ -56,16 +56,16 @@
#include <svx/svxdlg.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Beschreibung: Der Traeger des Dialoges
--------------------------------------------------------------------*/
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
- Window* pParent,
- const SfxItemSet& rCoreSet,
- BOOL bNewFrm,
- USHORT nResType,
+ Window* pParent,
+ const SfxItemSet& rCoreSet,
+ BOOL bNewFrm,
+ USHORT nResType,
BOOL bFormat,
- UINT16 nDefPage,
- const String* pStr) :
+ UINT16 nDefPage,
+ const String* pStr) :
SfxTabDialog(pViewFrame, pParent, SW_RES(nResType), &rCoreSet, pStr != 0),
m_bFormat(bFormat),
@@ -87,18 +87,18 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
aTmp += *pStr;
aTmp += ')';
}
- AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0);
- AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0);
- AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0);
- AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0);
+ AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0);
+ AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0);
+ AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0);
+ AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0);
if(m_nDlgType == DLG_FRM_GRF)
{
- AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 );
+ AddTabPage( TP_GRF_EXT, SwGrfExtPage::Create, 0 );
AddTabPage( RID_SVXPAGE_GRFCROP );
}
if (m_nDlgType == DLG_FRM_STD)
{
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -177,7 +177,7 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
case TP_MACRO_ASSIGN:
{
SfxAllItemSet aNewSet(*aSet.GetPool());
- aNewSet.Put( SwMacroAssignDlg::AddEvents(
+ aNewSet.Put( SwMacroAssignDlg::AddEvents(
DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) );
if ( m_pWrtShell )
rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index a9fd394c5d77..321f7726438f 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -2,7 +2,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
@@ -79,9 +79,9 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType ) :
USHORT nId = 0;
switch ( nType )
{
- case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break;
- case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break;
- case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break;
+ case FRMMGR_TYPE_TEXT: nId = RES_POOLFRM_FRAME; break;
+ case FRMMGR_TYPE_OLE: nId = RES_POOLFRM_OLE; break;
+ case FRMMGR_TYPE_GRF: nId = RES_POOLFRM_GRAPHIC; break;
}
aSet.SetParent( &pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
@@ -112,7 +112,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, const SfxItemSet &
}
/*--------------------------------------------------------------------
- Beschreibung: Initialisieren
+ Beschreibung: Initialisieren
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::UpdateAttrMgr()
{
@@ -171,7 +171,7 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
}
/*--------------------------------------------------------------------
- Beschreibung: Rahmen einfuegen
+ Beschreibung: Rahmen einfuegen
--------------------------------------------------------------------*/
BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
{
@@ -191,14 +191,14 @@ BOOL SwFlyFrmAttrMgr::InsertFlyFrm()
}
/*------------------------------------------------------------------------
- Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und
+ Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und
Groesse werden explizit angegeben.
Nicht erlaubte Werte des Aufzaehlungstypes werden
korrigiert.
------------------------------------------------------------------------*/
-void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
- const Point &rPos,
- const Size &rSize,
+void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
+ const Point &rPos,
+ const Size &rSize,
BOOL bAbs )
{
OSL_ENSURE( eAnchorType == FLY_AT_PAGE ||
@@ -218,7 +218,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
}
/*--------------------------------------------------------------------
- Beschreibung: Anker setzen
+ Beschreibung: Anker setzen
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
{
@@ -239,7 +239,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
}
/*------------------------------------------------------------------------
- Beschreibung: Setzen des Attributs fuer Spalten
+ Beschreibung: Setzen des Attributs fuer Spalten
------------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
{
@@ -247,7 +247,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
}
/*--------------------------------------------------------------------
- Beschreibung: Absolute Position setzen
+ Beschreibung: Absolute Position setzen
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
{
@@ -348,11 +348,11 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
if ( rVal.nHoriOrient != text::HoriOrientation::NONE )
nH = aBoundRect.Left();
- rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth;
+ rVal.nMaxHPos = aBoundRect.Right() - rVal.nWidth;
rVal.nMaxHeight = aBoundRect.Bottom() - nV;
- rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight;
- rVal.nMaxWidth = aBoundRect.Right() - nH;
+ rVal.nMaxVPos = aBoundRect.Bottom() - rVal.nHeight;
+ rVal.nMaxWidth = aBoundRect.Right() - nH;
}
// OD 12.11.2003 #i22341# - handle to character anchored objects vertical
// aligned at character or top of line in a special case
@@ -418,7 +418,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
? aBoundRect.Top()
: rVal.nVPos;
rVal.nMaxHeight = rVal.nMaxVPos + rVal.nHeight - nV;
- rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH;
+ rVal.nMaxWidth = rVal.nMaxHPos + rVal.nWidth - nH;
}
// OD 12.11.2003 #i22341# - special case for to character anchored objects
// vertical aligned at character or top of line.
@@ -477,10 +477,10 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
rVal.nMaxHPos = 0;
rVal.nMaxHeight = aBoundRect.Height();
- rVal.nMaxWidth = aBoundRect.Width();
+ rVal.nMaxWidth = aBoundRect.Width();
- rVal.nMaxVPos = aBoundRect.Height();
- rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight;
+ rVal.nMaxVPos = aBoundRect.Height();
+ rVal.nMinVPos = -aBoundRect.Height() + rVal.nHeight;
if (rVal.nMaxVPos < rVal.nMinVPos)
{
rVal.nMinVPos = rVal.nMaxVPos;
@@ -507,28 +507,28 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
SwTwips SwFlyFrmAttrMgr::CalcTopSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_TOP ) + rBox.CalcLineSpace(BOX_LINE_TOP);
}
SwTwips SwFlyFrmAttrMgr::CalcBottomSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_BOTTOM) + rBox.CalcLineSpace(BOX_LINE_BOTTOM);
}
SwTwips SwFlyFrmAttrMgr::CalcLeftSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_LEFT) + rBox.CalcLineSpace(BOX_LINE_LEFT);
}
SwTwips SwFlyFrmAttrMgr::CalcRightSpace()
{
const SvxShadowItem& rShadow = GetShadow();
- const SvxBoxItem& rBox = GetBox();
+ const SvxBoxItem& rBox = GetBox();
return rShadow.CalcShadowSpace(SHADOW_RIGHT) + rBox.CalcLineSpace(BOX_LINE_RIGHT);
}
@@ -569,10 +569,10 @@ void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
SwFmtVertOrient aVertOrient( GetVertOrient() );
SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
- aHoriOrient.SetPos ( rPoint.X() );
+ aHoriOrient.SetPos ( rPoint.X() );
aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
- aVertOrient.SetPos ( rPoint.Y() );
+ aVertOrient.SetPos ( rPoint.Y() );
aVertOrient.SetVertOrient( text::VertOrientation::NONE );
aSet.Put( aVertOrient );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6cc805ecae33..099e6ba366a3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2,7 +2,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
@@ -116,7 +116,7 @@ struct StringIdPair_Impl
// OD 19.09.2003 #i18732# - change order of alignments
#define LB_FRAME 0x00000001L // Textbereich des Absatzes
-#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege
+#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege
#define LB_VERT_FRAME 0x00000004L // Vertikaler Textbereich des Absatzes
#define LB_VERT_PRTAREA 0x00000008L // Vertikaler Textbereich des Absatzes + Einzuege
#define LB_REL_FRM_LEFT 0x00000010L // Linker Absatzrand
@@ -132,9 +132,9 @@ struct StringIdPair_Impl
#define LB_FLY_REL_PG_FRAME 0x00001000L // Gesamte Rahmen
#define LB_FLY_REL_PG_PRTAREA 0x00002000L // Rahmeninneres
-#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis
-#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen
-#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile
+#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis
+#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen
+#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile
// OD 10.11.2003 #i22305#
#define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame
@@ -181,7 +181,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] =
/*--------------------------------------------------------------------
Beschreibung: Seite verankert
--------------------------------------------------------------------*/
-#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
+#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
static FrmMap __FAR_DATA aHPageMap[] =
@@ -197,7 +197,7 @@ static FrmMap __FAR_DATA aHPageHtmlMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_REL_PG_FRAME}
};
-#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
+#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
static FrmMap __FAR_DATA aVPageMap[] =
{
@@ -215,7 +215,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Rahmen verankert
--------------------------------------------------------------------*/
-#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
+#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
static FrmMap __FAR_DATA aHFrameMap[] =
@@ -254,7 +254,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Absatz verankert
--------------------------------------------------------------------*/
-#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
+#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT)
@@ -266,7 +266,7 @@ static FrmMap __FAR_DATA aHParaMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PARA_REL}
};
-#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
+#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
static FrmMap __FAR_DATA aHParaHtmlMap[] =
{
@@ -300,7 +300,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] =
/*--------------------------------------------------------------------
Beschreibung: Relativ zum Zeichen verankert
--------------------------------------------------------------------*/
-#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
+#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT|LB_REL_CHAR)
@@ -312,7 +312,7 @@ static FrmMap __FAR_DATA aHCharMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_CHAR_REL}
};
-#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
+#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
static FrmMap __FAR_DATA aHCharHtmlMap[] =
{
@@ -403,10 +403,10 @@ static USHORT __FAR_DATA aPageRg[] = {
0
};
static USHORT __FAR_DATA aAddPgRg[] = {
- RES_PROTECT, RES_PROTECT,
- RES_PRINT, RES_PRINT,
- FN_SET_FRM_NAME, FN_SET_FRM_NAME,
- FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
+ RES_PROTECT, RES_PROTECT,
+ RES_PRINT, RES_PRINT,
+ FN_SET_FRM_NAME, FN_SET_FRM_NAME,
+ FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
0
};
@@ -584,7 +584,7 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
}
/*--------------------------------------------------------------------
- Beschreibung: StandardRahmenTabPage
+ Beschreibung: StandardRahmenTabPage
--------------------------------------------------------------------*/
namespace
{
@@ -596,41 +596,41 @@ namespace
}
SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet),
+ SfxTabPage (pParent, SW_RES(TP_FRM_STD), rSet),
aWidthFT (this, SW_RES(FT_WIDTH)),
- aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)),
- aWidthED (this, SW_RES(ED_WIDTH)),
- aRelWidthCB (this, SW_RES(CB_REL_WIDTH)),
- aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)),
- aHeightFT (this, SW_RES(FT_HEIGHT)),
- aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)),
- aHeightED (this, SW_RES(ED_HEIGHT)),
- aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)),
- aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)),
- aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)),
+ aWidthAutoFT (this, SW_RES(FT_WIDTH_AUTO)),
+ aWidthED (this, SW_RES(ED_WIDTH)),
+ aRelWidthCB (this, SW_RES(CB_REL_WIDTH)),
+ aAutoWidthCB (this, SW_RES(CB_AUTOWIDTH)),
+ aHeightFT (this, SW_RES(FT_HEIGHT)),
+ aHeightAutoFT (this, SW_RES(FT_HEIGHT_AUTO)),
+ aHeightED (this, SW_RES(ED_HEIGHT)),
+ aRelHeightCB (this, SW_RES(CB_REL_HEIGHT)),
+ aAutoHeightCB (this, SW_RES(CB_AUTOHEIGHT)),
+ aFixedRatioCB (this, SW_RES(CB_FIXEDRATIO)),
aRealSizeBT (this, SW_RES(BT_REALSIZE)),
aSizeFL (this, SW_RES(FL_SIZE)),
aTypeFL (this, SW_RES(FL_TYPE)),
aTypeSepFL (this, SW_RES(FL_TYPE_SEP)),
aAnchorAtPageRB (this, SW_RES(RB_ANCHOR_PAGE)),
- aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
- aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
- aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
+ aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
+ aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
+ aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
aAnchorAtFrameRB(this, SW_RES(RB_ANCHOR_FRAME)),
- aHorizontalFT (this, SW_RES(FT_HORIZONTAL)),
- aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)),
- aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)),
- aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)),
+ aHorizontalFT (this, SW_RES(FT_HORIZONTAL)),
+ aHorizontalDLB (this, SW_RES(DLB_HORIZONTAL)),
+ aAtHorzPosFT (this, SW_RES(FT_AT_HORZ_POS)),
+ aAtHorzPosED (this, SW_RES(ED_AT_HORZ_POS)),
aHoriRelationFT (this, SW_RES(FT_HORI_RELATION)),
aHoriRelationLB (this, SW_RES(LB_HORI_RELATION)),
aMirrorPagesCB (this, SW_RES(CB_MIRROR)),
- aVerticalFT (this, SW_RES(FT_VERTICAL)),
- aVerticalDLB (this, SW_RES(DLB_VERTICAL)),
- aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)),
- aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)),
+ aVerticalFT (this, SW_RES(FT_VERTICAL)),
+ aVerticalDLB (this, SW_RES(DLB_VERTICAL)),
+ aAtVertPosFT (this, SW_RES(FT_AT_VERT_POS)),
+ aAtVertPosED (this, SW_RES(ED_AT_VERT_POS)),
aVertRelationFT (this, SW_RES(FT_VERT_RELATION)),
aVertRelationLB (this, SW_RES(LB_VERT_RELATION)),
// OD 19.09.2003 #i18732# - new checkbox
@@ -668,16 +668,16 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
SetExchangeSupport();
Link aLk = LINK(this, SwFrmPage, RangeModifyHdl);
- aWidthED. SetLoseFocusHdl( aLk );
- aHeightED. SetLoseFocusHdl( aLk );
+ aWidthED. SetLoseFocusHdl( aLk );
+ aHeightED. SetLoseFocusHdl( aLk );
aAtHorzPosED.SetLoseFocusHdl( aLk );
aAtVertPosED.SetLoseFocusHdl( aLk );
// OD 25.09.2003 #i18732# - click handler for new checkbox
aFollowTextFlowCB.SetClickHdl( aLk );
aLk = LINK(this, SwFrmPage, ModifyHdl);
- aWidthED. SetModifyHdl( aLk );
- aHeightED. SetModifyHdl( aLk );
+ aWidthED. SetModifyHdl( aLk );
+ aHeightED. SetModifyHdl( aLk );
aAtHorzPosED.SetModifyHdl( aLk );
aAtVertPosED.SetModifyHdl( aLk );
@@ -705,7 +705,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Beschreibung: Dtor
--------------------------------------------------------------------*/
SwFrmPage::~SwFrmPage()
{
@@ -808,7 +808,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
aRealSizeBT.SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl));
EnableGraficMode();
}
-// else
+// else
// aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height()));
if ( nDlgType == DLG_FRM_GRF )
@@ -876,8 +876,8 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
if(nDlgType == DLG_FRM_STD &&
0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
{
- aHeightFT .Enable( FALSE );
- aHeightED .Enable( FALSE );
+ aHeightFT .Enable( FALSE );
+ aHeightED .Enable( FALSE );
aRelHeightCB.Enable( FALSE );
}
if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS))
@@ -932,7 +932,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
{
@@ -1048,7 +1048,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE);
SwFmtFrmSize aSz( rOldSize );
-/* // Folgende Zeilen nur zum debuggen:
+/* // Folgende Zeilen nur zum debuggen:
BOOL bModified = aWidthED.IsValueModified();
USHORT nOldWidth = rOldSize.GetWidth ();
USHORT nWidth = aWidthED .GetValue();
@@ -1127,7 +1127,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale und vertikale Pos initialisieren
+ Beschreibung: Horizontale und vertikale Pos initialisieren
--------------------------------------------------------------------*/
void SwFrmPage::InitPos(RndStdIds eId,
USHORT nH,
@@ -1140,7 +1140,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
USHORT nPos = aVerticalDLB.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pVMap )
{
- nOldV = pVMap[nPos].nAlign;
+ nOldV = pVMap[nPos].nAlign;
nPos = aVertRelationLB.GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -1150,7 +1150,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
nPos = aHorizontalDLB.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pHMap )
{
- nOldH = pHMap[nPos].nAlign;
+ nOldH = pHMap[nPos].nAlign;
nPos = aHoriRelationLB.GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -1187,8 +1187,8 @@ void SwFrmPage::InitPos(RndStdIds eId,
{
if(bHtmlMode)
{
- pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap;
- pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap;
+ pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap;
+ pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap;
}
else
{
@@ -1198,7 +1198,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
}
else if ( eId == FLY_AS_CHAR )
{
- pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
+ pVMap = bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
pHMap = 0;
bEnable = FALSE;
}
@@ -1209,7 +1209,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
// Horizontal
if ( nH == USHRT_MAX )
{
- nH = nOldH;
+ nH = nOldH;
nHRel = nOldHRel;
}
// OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB>
@@ -1219,7 +1219,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
// Vertikal
if ( nV == USHRT_MAX )
{
- nV = nOldV;
+ nV = nOldV;
nVRel = nOldVRel;
}
// OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB>
@@ -1286,7 +1286,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
size_t nCount = ::lcl_GetFrmMapCount(_pMap);
for (size_t i = 0; _pMap && i < nCount; ++i)
{
-// #61359# Warum nicht von links/von innen bzw. von oben?
+// #61359# Warum nicht von links/von innen bzw. von oben?
// if (!bFormat || (pMap[i].eStrId != SwFPos::FROMLEFT && pMap[i].eStrId != SwFPos::FROMTOP))
{
SvxSwFramePosString::StringId eStrId = aMirrorPagesCB.IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
@@ -1373,7 +1373,7 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
for (USHORT i = 0; i < _rLB.GetEntryCount(); i++)
{
RelationMap *pEntry = (RelationMap *)_rLB.GetEntryData(i);
- if (pEntry->nLBRelation == LB_REL_CHAR) // Default
+ if (pEntry->nLBRelation == LB_REL_CHAR) // Default
{
_rLB.SelectEntryPos(i);
break;
@@ -1576,7 +1576,7 @@ RndStdIds SwFrmPage::GetAnchor()
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1637,8 +1637,8 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT);
}
- if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
- RangeModifyHdl(&aWidthED); // Werte wieder korrigieren
+ if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ RangeModifyHdl(&aWidthED); // Werte wieder korrigieren
if (pBtn == &aRelWidthCB)
ModifyHdl(&aWidthED);
@@ -1649,7 +1649,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
{
@@ -1827,7 +1827,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
aAtVertPosFT.Enable( bEnable );
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
RangeModifyHdl( 0 );
USHORT nRel = 0;
@@ -1909,7 +1909,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale Pos
+ Beschreibung: Horizontale Pos
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
{
@@ -1937,7 +1937,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
}
}
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
RangeModifyHdl(0);
return 0;
@@ -2153,9 +2153,9 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset)
{
const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
const SwFmtVertOrient& rVert = (const SwFmtVertOrient&)rSet.Get(RES_VERT_ORIENT);
- nOldH = rHori.GetHoriOrient();
+ nOldH = rHori.GetHoriOrient();
nOldHRel = rHori.GetRelationOrient();
- nOldV = rVert.GetVertOrient(),
+ nOldV = rVert.GetVertOrient(),
nOldVRel = rVert.GetRelationOrient();
if (eAnchorId == FLY_AT_PAGE)
@@ -2194,7 +2194,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset)
}
// ggf auf Prozent umschalten
- RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%)
+ RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%)
if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff)
aFixedRatioCB.Check(TRUE);
@@ -2223,7 +2223,7 @@ USHORT* SwFrmPage::GetRanges()
void SwFrmPage::SetFormatUsed(BOOL bFmt)
{
- bFormat = bFmt;
+ bFormat = bFmt;
if(bFormat)
{
aAnchorAtPageRB.Hide();
@@ -2262,7 +2262,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
SetExchangeSupport();
aMirrorHorzBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl));
aMirrorVertBox.SetClickHdl( LINK(this, SwGrfExtPage, MirrorHdl));
- aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl));
+ aBrowseBT.SetClickHdl ( LINK(this, SwGrfExtPage, BrowseHdl));
}
SwGrfExtPage::~SwGrfExtPage()
@@ -2329,14 +2329,14 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
switch (nPos)
{
- case 1: // Auf linken bzw geraden Seiten spiegeln
+ case 1: // Auf linken bzw geraden Seiten spiegeln
aLeftPagesRB.Check();
aMirrorHorzBox.Check(TRUE);
break;
- case 2: // Auf allen Seiten spiegeln
+ case 2: // Auf allen Seiten spiegeln
aAllPagesRB.Check();
break;
- case 3: // Auf rechten bzw ungeraden Seiten spiegeln
+ case 3: // Auf rechten bzw ungeraden Seiten spiegeln
aRightPagesRB.Check();
break;
default:
@@ -2437,7 +2437,7 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal);
if ( pGrfDlg->Execute() == ERRCODE_NONE )
- { // ausgewaehlten Filter merken
+ { // ausgewaehlten Filter merken
aFilterName = pGrfDlg->GetCurrentFilter();
aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(),
INET_HEX_ESCAPE,
@@ -2561,16 +2561,16 @@ void BmpWindow::SetGraphic(const Graphic& rGrf)
}
/***************************************************************************
- Beschreibung: URL und ImageMap an Rahmen einstellen
+ Beschreibung: URL und ImageMap an Rahmen einstellen
***************************************************************************/
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
+ SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
aHyperLinkFL (this, SW_RES( FL_HYPERLINK )),
- aURLFT (this, SW_RES( FT_URL )),
- aURLED (this, SW_RES( ED_URL )),
+ aURLFT (this, SW_RES( FT_URL )),
+ aURLED (this, SW_RES( ED_URL )),
aSearchPB (this, SW_RES( PB_SEARCH )),
- aNameFT (this, SW_RES( FT_NAME )),
- aNameED (this, SW_RES( ED_NAME )),
+ aNameFT (this, SW_RES( FT_NAME )),
+ aNameED (this, SW_RES( ED_NAME )),
aFrameFT (this, SW_RES( FT_FRAME )),
aFrameCB (this, SW_RES( CB_FRAME )),
@@ -2707,7 +2707,7 @@ void lcl_Move(Window& rWin, sal_Int32 nDiff)
}
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
- SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
+ SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
aNameFT (this, SW_RES(FT_NAME)),
aNameED (this, SW_RES(ED_NAME)),
@@ -2727,7 +2727,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
aEditInReadonlyCB (this, SW_RES(CB_EDIT_IN_READONLY)),
aPrintFrameCB (this, SW_RES(CB_PRINT_FRAME)),
aTextFlowFT (this, SW_RES(FT_TEXTFLOW)),
- aTextFlowLB (this, SW_RES(LB_TEXTFLOW)),
+ aTextFlowLB (this, SW_RES(LB_TEXTFLOW)),
aExtFL (this, SW_RES(FL_EXT)),
@@ -2913,11 +2913,11 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
aProtectSizeCB.Check(rProt.IsSizeProtected());
const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet.Get(RES_EDIT_IN_READONLY);
- aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue();
+ aEditInReadonlyCB.Check(rEdit.GetValue()); aEditInReadonlyCB.SaveValue();
// drucken
const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet.Get(RES_PRINT);
- aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue();
+ aPrintFrameCB.Check(rPrt.GetValue()); aPrintFrameCB.SaveValue();
// textflow
SfxItemState eState;
@@ -3025,7 +3025,7 @@ IMPL_LINK(SwFrmAddPage, EditModifyHdl, Edit*, EMPTYARG)
return 0;
}
-void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
+void SwFrmAddPage::SetFormatUsed(BOOL bFmt)
{
bFormat = bFmt;
if(bFormat)
diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc
index 044d2fdd4e05..a1f213ee6b4c 100644
--- a/sw/source/ui/frmdlg/frmpage.hrc
+++ b/sw/source/ui/frmdlg/frmpage.hrc
@@ -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
@@ -27,7 +27,7 @@
#include <svtools/controldims.hrc>
-#define RB_ANCHOR_PAGE 1
+#define RB_ANCHOR_PAGE 1
#define RB_ANCHOR_PARA 2
#define RB_ANCHOR_AT_CHAR 3
#define RB_ANCHOR_AS_CHAR 4
@@ -48,63 +48,63 @@
#define DLB_HORIZONTAL 34
#define FT_AT_HORZ_POS 35
#define ED_AT_HORZ_POS 36
-#define FT_HORI_RELATION 1
-#define LB_HORI_RELATION 2
-#define CB_MIRROR 37
+#define FT_HORI_RELATION 1
+#define LB_HORI_RELATION 2
+#define CB_MIRROR 37
#define FT_VERTICAL 38
#define DLB_VERTICAL 39
#define FT_AT_VERT_POS 40
#define ED_AT_VERT_POS 41
-#define FT_VERT_RELATION 3
-#define LB_VERT_RELATION 4
+#define FT_VERT_RELATION 3
+#define LB_VERT_RELATION 4
#define FL_POSITION 43
-#define BT_REALSIZE 44
-#define BT_MANUAL 45
-#define CB_AUTOWIDTH 46
-#define FT_WIDTH_AUTO 47
-#define FT_HEIGHT_AUTO 48
+#define BT_REALSIZE 44
+#define BT_MANUAL 45
+#define CB_AUTOWIDTH 46
+#define FT_WIDTH_AUTO 47
+#define FT_HEIGHT_AUTO 48
// metrics
-#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
-#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT)
-#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT)
-#define SWFRMPG_COL_3 76
-#define SWFRMPG_COL_4 109
+#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
+#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT)
+#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT)
+#define SWFRMPG_COL_3 76
+#define SWFRMPG_COL_4 109
-#define SWFRMPG_ROW_CONDENSE 1
-#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
-#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE)
-#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP)
-#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
-#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_CONDENSE 1
+#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
+#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE)
+#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP)
+#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
+#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
+#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define CB_HOR 46
-#define CB_VERT 47
-//#define LB_MIRROR_PAGES 49
-//#define FT_MIRROR_PAGES 50
+#define CB_HOR 46
+#define CB_VERT 47
+//#define LB_MIRROR_PAGES 49
+//#define FT_MIRROR_PAGES 50
#define FL_MIRROR 51
-#define WN_BMP 52
+#define WN_BMP 52
#define PB_BROWSE 53
#define ED_CONNECT 54
#define FL_CONNECT 55
-#define FT_CONNECT 57
-#define FT_URL 58
-#define ED_URL 59
+#define FT_CONNECT 57
+#define FT_URL 58
+#define ED_URL 59
-#define BMP_EXAMPLE 62
+#define BMP_EXAMPLE 62
#define BMP_EXAMPLE_HC 63
#define RB_MIRROR_ALL_PAGES 64
#define RB_MIRROR_LEFT_PAGES 65
@@ -117,14 +117,14 @@
#define CB_SERVER 98
#define CB_CLIENT 99
-#define CB_REL_WIDTH 100
-#define CB_REL_HEIGHT 101
-#define CB_FIXEDRATIO 102
-#define PB_SEARCH 103
+#define CB_REL_WIDTH 100
+#define CB_REL_HEIGHT 101
+#define CB_FIXEDRATIO 102
+#define PB_SEARCH 103
-#define CB_ANCHOR_ONLY 103
+#define CB_ANCHOR_ONLY 103
-#define FT_NAME 110
+#define FT_NAME 110
#define ED_NAME 111
#define FT_ALT_NAME 112
#define ED_ALT_NAME 113
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 20a2d1702a46..5ce84d4552a5 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -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
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 5e3abb1286e4..2b58742fc055 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -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
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index d59d6778f919..b9ca694a3b47 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc
index f9eabe9bb3c5..1a4750e23493 100644
--- a/sw/source/ui/frmdlg/pattern.hrc
+++ b/sw/source/ui/frmdlg/pattern.hrc
@@ -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
@@ -25,22 +25,22 @@
*
************************************************************************/
-#define BRUSH_LBL 1
-#define BRUSH_LBOX 2
+#define BRUSH_LBL 1
+#define BRUSH_LBOX 2
-#define COLOR_LBL 3
-#define COLOR_LBOX 4
+#define COLOR_LBL 3
+#define COLOR_LBOX 4
-#define FILLIN_COLOR_LBL 5
-#define FILLIN_COLOR_LBOX 6
+#define FILLIN_COLOR_LBL 5
+#define FILLIN_COLOR_LBOX 6
-#define NO_PATTERN_BOX 7
+#define NO_PATTERN_BOX 7
-#define PATTERN_FRM 8
-#define EXAMPLE_FRM 9
-#define EXAMPLE_WIN 10
+#define PATTERN_FRM 8
+#define EXAMPLE_FRM 9
+#define EXAMPLE_WIN 10
-#define OK_BTN 11
-#define CANCEL_BTN 12
-#define RESET_BTN 13
+#define OK_BTN 11
+#define CANCEL_BTN 12
+#define RESET_BTN 13
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 58b468a8612d..9ef529790d5c 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 29cd08234e18..dee3c62e01a4 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -2,7 +2,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
@@ -91,12 +91,12 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, SW_RES(TP_FRM_WRAP), rSet),
aWrapFLC (this, SW_RES(C_WRAP_FL)),
- aNoWrapRB (this, SW_RES(RB_NO_WRAP)),
- aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)),
- aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)),
- aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)),
- aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)),
- aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)),
+ aNoWrapRB (this, SW_RES(RB_NO_WRAP)),
+ aWrapLeftRB (this, SW_RES(RB_WRAP_LEFT)),
+ aWrapRightRB (this, SW_RES(RB_WRAP_RIGHT)),
+ aWrapParallelRB (this, SW_RES(RB_WRAP_PARALLEL)),
+ aWrapThroughRB (this, SW_RES(RB_WRAP_THROUGH)),
+ aIdealWrapRB (this, SW_RES(RB_WRAP_IDEAL)),
aMarginFL (this, SW_RES(FL_MARGIN)),
aLeftMarginFT (this, SW_RES(FT_LEFT_MARGIN)),
@@ -111,9 +111,9 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
aOptionsSepFL (this, SW_RES(FL_OPTION_SEP)),
aOptionsFL (this, SW_RES(FL_OPTION)),
aWrapAnchorOnlyCB (this, SW_RES(CB_ANCHOR_ONLY)),
- aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)),
- aWrapOutlineCB (this, SW_RES(CB_OUTLINE)),
- aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)),
+ aWrapTransparentCB (this, SW_RES(CB_TRANSPARENT)),
+ aWrapOutlineCB (this, SW_RES(CB_OUTLINE)),
+ aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)),
aWrapIL (SW_RES(IL_WRAP)),
aWrapILH (SW_RES(ILH_WRAP)),
@@ -307,7 +307,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
{
@@ -412,7 +412,7 @@ BOOL SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Beschreibung: Bsp - Update
--------------------------------------------------------------------*/
void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -476,10 +476,10 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
SwTwips nTop;
SwTwips nBottom;
- nLeft = aVal.nHPos - aVal.nMinHPos;
- nRight = aVal.nMaxWidth - aVal.nWidth;
- nTop = aVal.nVPos - aVal.nMinVPos;
- nBottom = aVal.nMaxHeight - aVal.nHeight;
+ nLeft = aVal.nHPos - aVal.nMinHPos;
+ nRight = aVal.nMaxWidth - aVal.nWidth;
+ nTop = aVal.nVPos - aVal.nMinVPos;
+ nBottom = aVal.nMaxHeight - aVal.nHeight;
if (bHtmlMode && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
{
@@ -497,7 +497,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
if (aVal.nVPos <= aVal.nMaxHeight)
nTop = aVal.nMaxVPos - aVal.nHeight;
else
- nTop = nBottom = 0; // Kein Umlauf
+ nTop = nBottom = 0; // Kein Umlauf
}
else
nTop = aVal.nMaxVPos - aVal.nHeight - aVal.nVPos;
@@ -508,7 +508,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
nTop += nBottom;
}
- nBottom = nTop;
+ nBottom = nTop;
nRight = nLeft;
}
@@ -617,7 +617,7 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Beschreibung: Bereichspruefung
--------------------------------------------------------------------*/
IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
{
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index be19dbe702c2..077d8af65987 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.hrc
@@ -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
@@ -24,40 +24,40 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define RB_NO_WRAP 2
-#define RB_WRAP_LEFT 3
-#define RB_WRAP_RIGHT 4
-#define RB_WRAP_PARALLEL 5
-#define RB_WRAP_THROUGH 6
-#define RB_WRAP_IDEAL 7
-#define CB_ANCHOR_ONLY 8
-#define FT_LEFT_MARGIN 13
-#define ED_LEFT_MARGIN 14
-#define FT_RIGHT_MARGIN 15
-#define ED_RIGHT_MARGIN 16
-#define FT_TOP_MARGIN 17
-#define ED_TOP_MARGIN 18
-#define ED_BOTTOM_MARGIN 19
-#define FT_BOTTOM_MARGIN 20
+#define RB_NO_WRAP 2
+#define RB_WRAP_LEFT 3
+#define RB_WRAP_RIGHT 4
+#define RB_WRAP_PARALLEL 5
+#define RB_WRAP_THROUGH 6
+#define RB_WRAP_IDEAL 7
+#define CB_ANCHOR_ONLY 8
+#define FT_LEFT_MARGIN 13
+#define ED_LEFT_MARGIN 14
+#define FT_RIGHT_MARGIN 15
+#define ED_RIGHT_MARGIN 16
+#define FT_TOP_MARGIN 17
+#define ED_TOP_MARGIN 18
+#define ED_BOTTOM_MARGIN 19
+#define FT_BOTTOM_MARGIN 20
#define FL_MARGIN 21
-#define CB_TRANSPARENT 22
-#define CB_OUTLINE 23
+#define CB_TRANSPARENT 22
+#define CB_OUTLINE 23
#define FL_OPTION 24
-#define CB_ONLYOUTSIDE 25
+#define CB_ONLYOUTSIDE 25
#define FL_OPTION_SEP 26
#define C_WRAP_FL 31
-#define IL_WRAP 32
+#define IL_WRAP 32
#define ILH_WRAP 33
// nur fuer die ImageList
-#define IMG_BEGIN 1
-#define IMG_NONE (IMG_BEGIN)
-#define IMG_LEFT (IMG_BEGIN + 1)
+#define IMG_BEGIN 1
+#define IMG_NONE (IMG_BEGIN)
+#define IMG_LEFT (IMG_BEGIN + 1)
#define IMG_RIGHT (IMG_BEGIN + 2)
#define IMG_PARALLEL (IMG_BEGIN + 3)
#define IMG_THROUGH (IMG_BEGIN + 4)
-#define IMG_IDEAL (IMG_BEGIN + 5)
-#define IMG_KON_NONE (IMG_BEGIN + 6)
+#define IMG_IDEAL (IMG_BEGIN + 5)
+#define IMG_KON_NONE (IMG_BEGIN + 6)
#define IMG_KON_LEFT (IMG_BEGIN + 7)
#define IMG_KON_RIGHT (IMG_BEGIN + 8)
#define IMG_KON_PARALLEL (IMG_BEGIN + 9)
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index bd779308178d..6810f55e1ade 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -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
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx
index 1b92ec6d794a..a4aedcb1ec01 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/ui/globdoc/globdoc.cxx
@@ -2,7 +2,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
@@ -78,8 +78,8 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
}
else if (nVersion == SOFFICE_FILEFORMAT_8)
{
- *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
- *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_8;
+ *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
+ *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_8;
*pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
}
diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src
index 80cd202da1d3..9c8b19ac10e7 100644
--- a/sw/source/ui/globdoc/globdoc.src
+++ b/sw/source/ui/globdoc/globdoc.src
@@ -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
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx
index 293d76c7a3dc..51d58c698349 100644
--- a/sw/source/ui/inc/DropDownFieldDialog.hxx
+++ b/sw/source/ui/inc/DropDownFieldDialog.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ class SwWrtShell;
Dialog to edit drop down field selection
--------------------------------------------------------------------*/
namespace sw
-{
+{
class DropDownFieldDialog : public SvxStandardDialog
{
FixedLine aItemsFL;
@@ -56,7 +56,7 @@ class DropDownFieldDialog : public SvxStandardDialog
SwWrtShell &rSh;
SwDropDownField* pDropField;
-
+
DECL_LINK(ButtonHdl, PushButton*);
virtual void Apply();
public:
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
index 4b2af9f3238e..1ba734f68847 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
@@ -2,7 +2,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
@@ -59,12 +59,12 @@ protected:
public:
SwSpellDialogChildWindow (
- Window*pParent,
+ Window*pParent,
USHORT nId,
- SfxBindings* pBindings,
+ SfxBindings* pBindings,
SfxChildWinInfo* pInfo);
~SwSpellDialogChildWindow();
-
+
SFX_DECL_CHILDWINDOW(SwSpellDialogChildWindow);
void InvalidateSpellDialog();
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx
index 85752c0bc9ca..907cca8fac68 100644
--- a/sw/source/ui/inc/SwXFilterOptions.hxx
+++ b/sw/source/ui/inc/SwXFilterOptions.hxx
@@ -2,7 +2,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
@@ -69,7 +69,7 @@ public:
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence<
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aProps )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -78,18 +78,18 @@ public:
::com::sun::star::uno::RuntimeException);
// XExecutableDialog
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+ virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException);
// XImporter
- virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference<
+ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent >& xDoc )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
// XExporter
- virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference<
+ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent >& xDoc )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx
index adc56934d32e..00f2780d14e4 100644
--- a/sw/source/ui/inc/abstract.hxx
+++ b/sw/source/ui/inc/abstract.hxx
@@ -2,7 +2,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
@@ -43,14 +43,14 @@
class SwInsertAbstractDlg : public SfxModalDialog
{
FixedLine aFL;
- FixedText aLevelFT;
- NumericField aLevelNF;
- FixedText aParaFT;
- NumericField aParaNF;
- FixedText aDescFT;
- OKButton aOkPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ FixedText aLevelFT;
+ NumericField aLevelNF;
+ FixedText aParaFT;
+ NumericField aParaNF;
+ FixedText aDescFT;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
protected:
@@ -58,8 +58,8 @@ public:
SwInsertAbstractDlg( Window* pParent );
~SwInsertAbstractDlg();
- BYTE GetLevel() const;
- BYTE GetPara() const;
+ BYTE GetLevel() const;
+ BYTE GetPara() const;
};
#endif
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index a43d78b11b19..98bb29ff95a3 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.hxx
@@ -2,7 +2,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
@@ -32,21 +32,21 @@
#include "swdllapi.h"
/*--------------------------------------------------------------------
- Beschreibung: numerische Eingabe
+ Beschreibung: numerische Eingabe
--------------------------------------------------------------------*/
class SW_DLLPUBLIC NumEditAction: public NumericField
{
Link aActionLink;
protected:
- virtual void Action();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual void Action();
+ virtual long Notify( NotifyEvent& rNEvt );
public:
NumEditAction( Window* pParent, const ResId& rResId ) :
NumericField(pParent, rResId) {}
- void SetActionHdl( const Link& rLink ) { aActionLink = rLink;}
- const Link& GetActionHdl() const { return aActionLink; }
+ void SetActionHdl( const Link& rLink ) { aActionLink = rLink;}
+ const Link& GetActionHdl() const { return aActionLink; }
};
@@ -58,13 +58,13 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit
String sForbiddenChars;
protected:
virtual void KeyInput( const KeyEvent& );
- virtual void Modify();
+ virtual void Modify();
public:
NoSpaceEdit( Window* pParent, const ResId& rResId);
virtual ~NoSpaceEdit();
- void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;}
- const String& GetForbiddenChars(){return sForbiddenChars;}
+ void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;}
+ const String& GetForbiddenChars(){return sForbiddenChars;}
};
/* -----------------21.04.98 08:33-------------------
@@ -92,7 +92,7 @@ public:
void SetReturnActionLink(const Link& rLink)
{ aReturnActionLink = rLink;}
-};
+};
#endif
diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx
index de798ad12f5d..bfb98b0707d6 100644
--- a/sw/source/ui/inc/addrdlg.hxx
+++ b/sw/source/ui/inc/addrdlg.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/ui/inc/annotsh.hxx
index 5d6d74a7614e..8a1a0676db56 100644
--- a/sw/source/ui/inc/annotsh.hxx
+++ b/sw/source/ui/inc/annotsh.hxx
@@ -2,7 +2,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
@@ -35,40 +35,40 @@
class SwView;
class SwAnnotationShell: public SfxShell
{
- SwView& rView;
+ SwView& rView;
public:
SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL)
TYPEINFO();
SwAnnotationShell(SwView&);
- virtual ~SwAnnotationShell();
+ virtual ~SwAnnotationShell();
void StateDisableItems(SfxItemSet &);
- void Exec(SfxRequest &);
+ void Exec(SfxRequest &);
- void GetState(SfxItemSet &);
- void StateInsert(SfxItemSet &rSet);
+ void GetState(SfxItemSet &);
+ void StateInsert(SfxItemSet &rSet);
- void NoteExec(SfxRequest &);
- void GetNoteState(SfxItemSet &);
+ void NoteExec(SfxRequest &);
+ void GetNoteState(SfxItemSet &);
- void ExecLingu(SfxRequest &rReq);
- void GetLinguState(SfxItemSet &);
+ void ExecLingu(SfxRequest &rReq);
+ void GetLinguState(SfxItemSet &);
- void ExecClpbrd(SfxRequest &rReq);
- void StateClpbrd(SfxItemSet &rSet);
+ void ExecClpbrd(SfxRequest &rReq);
+ void StateClpbrd(SfxItemSet &rSet);
- void ExecTransliteration(SfxRequest &);
+ void ExecTransliteration(SfxRequest &);
- void ExecUndo(SfxRequest &rReq);
- void StateUndo(SfxItemSet &rSet);
+ void ExecUndo(SfxRequest &rReq);
+ void StateUndo(SfxItemSet &rSet);
- void StateStatusLine(SfxItemSet &rSet);
+ void StateStatusLine(SfxItemSet &rSet);
- void InsertSymbol(SfxRequest& rReq);
+ void InsertSymbol(SfxRequest& rReq);
- void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE);
+ void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE);
void StateSearch(SfxItemSet &);
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index edf7014a4e4f..0ecc117ba9b5 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -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
@@ -31,57 +31,57 @@
#include "rcid.hrc"
// Default Bitmap fuer ToolBox
-#define BMP_FEHLT (RC_APP_BEGIN + 1)
+#define BMP_FEHLT (RC_APP_BEGIN + 1)
// Document-Icon
-#define RC_DOC_ICON (RC_APP_BEGIN + 2)
+#define RC_DOC_ICON (RC_APP_BEGIN + 2)
//Soll das Clipboard fuer andere Applikationen...
-#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3)
+#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3)
-#define STR_CANTCREATE (RC_APP_BEGIN + 4)
-#define STR_CANTOPEN (RC_APP_BEGIN + 5)
+#define STR_CANTCREATE (RC_APP_BEGIN + 4)
+#define STR_CANTOPEN (RC_APP_BEGIN + 5)
// Messages
-#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6)
+#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6)
#define MSG_SAVE_HTML_QUERY ( RC_APP_BEGIN + 7)
//Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist.
-#define RID_SW_NAME ( RC_APP_BEGIN + 8)
+#define RID_SW_NAME ( RC_APP_BEGIN + 8)
#define MSG_SAVEAS_HTML_QUERY ( RC_APP_BEGIN + 9)
-#define STR_UNBENANNT (RC_APP_BEGIN + 13)
-#define STR_VERSION (RC_APP_BEGIN + 14)
-#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15)
-#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16)
+#define STR_UNBENANNT (RC_APP_BEGIN + 13)
+#define STR_VERSION (RC_APP_BEGIN + 14)
+#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15)
+#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16)
// Bitmap fuer die NumerierungsVorlagen im Organizer
-#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17)
-#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18)
+#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17)
+#define BMP_STYLES_FAMILY_NUM_HC (RC_APP_BEGIN + 18)
// Strings fuer Bereiche in der Konfiguration
-#define STR_GRP_FILE (RC_APP_BEGIN + 56)
-#define STR_GRP_EDIT (RC_APP_BEGIN + 57)
-#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58)
-#define STR_GRP_VIEW (RC_APP_BEGIN + 59)
-#define STR_GRP_INSERT (RC_APP_BEGIN + 60)
-#define STR_GRP_FORMAT (RC_APP_BEGIN + 61)
-#define STR_GRP_STYLE (RC_APP_BEGIN + 62)
-#define STR_GRP_TEXT (RC_APP_BEGIN + 63)
-#define STR_GRP_FRAME (RC_APP_BEGIN + 64)
-#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65)
-#define STR_GRP_TABLE (RC_APP_BEGIN + 66)
-#define STR_GRP_TOOLS (RC_APP_BEGIN + 67)
-#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68)
-#define STR_GRP_WINDOW (RC_APP_BEGIN + 69)
-#define STR_GRP_MISC (RC_APP_BEGIN + 70)
-#define STR_GRP_MACRO (RC_APP_BEGIN + 71)
-#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72)
-#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73)
-#define STR_PAGEOFFSET (RC_APP_BEGIN + 74)
-#define STR_PAGEBREAK (RC_APP_BEGIN + 75)
-#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76)
+#define STR_GRP_FILE (RC_APP_BEGIN + 56)
+#define STR_GRP_EDIT (RC_APP_BEGIN + 57)
+#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58)
+#define STR_GRP_VIEW (RC_APP_BEGIN + 59)
+#define STR_GRP_INSERT (RC_APP_BEGIN + 60)
+#define STR_GRP_FORMAT (RC_APP_BEGIN + 61)
+#define STR_GRP_STYLE (RC_APP_BEGIN + 62)
+#define STR_GRP_TEXT (RC_APP_BEGIN + 63)
+#define STR_GRP_FRAME (RC_APP_BEGIN + 64)
+#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65)
+#define STR_GRP_TABLE (RC_APP_BEGIN + 66)
+#define STR_GRP_TOOLS (RC_APP_BEGIN + 67)
+#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68)
+#define STR_GRP_WINDOW (RC_APP_BEGIN + 69)
+#define STR_GRP_MISC (RC_APP_BEGIN + 70)
+#define STR_GRP_MACRO (RC_APP_BEGIN + 71)
+#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72)
+#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73)
+#define STR_PAGEOFFSET (RC_APP_BEGIN + 74)
+#define STR_PAGEBREAK (RC_APP_BEGIN + 75)
+#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76)
#define STR_WESTERN_FONT (RC_APP_BEGIN + 77)
#define STR_CJK_FONT (RC_APP_BEGIN + 78)
//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79)
@@ -92,17 +92,17 @@
#define PB_MERGE_OK 2
#define PB_MERGE_CANCEL 3
#define IMG_MERGE 4
-#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89)
+#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89)
-#define STR_ENV_TITLE (RC_APP_BEGIN + 91)
-#define STR_LAB_TITLE (RC_APP_BEGIN + 92)
+#define STR_ENV_TITLE (RC_APP_BEGIN + 91)
+#define STR_LAB_TITLE (RC_APP_BEGIN + 92)
-#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93)
+#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93)
#define RID_SW_ERRHDL (RC_APP_BEGIN + 95)
#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1)
-#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2)
+#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2)
// Ids fuer die einzelnen PopUpMenues
@@ -170,8 +170,8 @@
#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
// <--
//#outline level,zhaojianwei
-#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
-#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
+#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
+#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
//<-end,zhaojianwei
#define APP_ACT_END STR_FDLG_STYLE
diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx
index 59d0ca231b07..23c929f0e659 100644
--- a/sw/source/ui/inc/ascfldlg.hxx
+++ b/sw/source/ui/inc/ascfldlg.hxx
@@ -2,7 +2,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
@@ -42,19 +42,19 @@ class SwDocShell;
class SwAsciiFilterDlg : public SfxModalDialog
{
FixedLine aFL;
- FixedText aCharSetFT;
- SvxTextEncodingBox aCharSetLB;
- FixedText aFontFT;
- ListBox aFontLB;
- FixedText aLanguageFT;
- SvxLanguageBox aLanguageLB;
- FixedText aCRLF_FT;
- RadioButton aCRLF_RB, aCR_RB, aLF_RB;
- OKButton aOkPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
- String sSystemCharSet;
- BOOL bSaveLineStatus;
+ FixedText aCharSetFT;
+ SvxTextEncodingBox aCharSetLB;
+ FixedText aFontFT;
+ ListBox aFontLB;
+ FixedText aLanguageFT;
+ SvxLanguageBox aLanguageLB;
+ FixedText aCRLF_FT;
+ RadioButton aCRLF_RB, aCR_RB, aLF_RB;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
+ String sSystemCharSet;
+ BOOL bSaveLineStatus;
DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* );
DECL_LINK( LineEndHdl, RadioButton* );
@@ -62,8 +62,8 @@ class SwAsciiFilterDlg : public SfxModalDialog
LineEnd GetCRLF() const;
public:
- // CTOR: for import - pStream is the inputstream
- // for export - pStream must be 0
+ // CTOR: for import - pStream is the inputstream
+ // for export - pStream must be 0
SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream );
virtual ~SwAsciiFilterDlg();
diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx
index 7c3a9f197362..c3221a76ee0e 100644
--- a/sw/source/ui/inc/autoedit.hxx
+++ b/sw/source/ui/inc/autoedit.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx
index cb5f06a76b47..bedf9c5d9095 100644
--- a/sw/source/ui/inc/barcfg.hxx
+++ b/sw/source/ui/inc/barcfg.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx
index b5c6fe86df68..f3c2284c650a 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/ui/inc/basesh.hxx
@@ -2,7 +2,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
@@ -56,8 +56,8 @@ class SwBaseShell: public SfxShell
static FlyMode eFrameMode;
// Bug 75078 - if in GetState the asynch call of GetGraphic returns
- // synch, the set the state directly into the itemset
- SfxItemSet* pGetStateSet;
+ // synch, the set the state directly into the itemset
+ SfxItemSet* pGetStateSet;
//Update-Timer fuer Graphic
SvUShortsSort aGrfUpdateSlots;
@@ -65,17 +65,17 @@ class SwBaseShell: public SfxShell
DECL_LINK( GraphicArrivedHdl, SwCrsrShell* );
protected:
- SwWrtShell& GetShell();
- SwWrtShell* GetShellPtr();
+ SwWrtShell& GetShell();
+ SwWrtShell* GetShellPtr();
- inline SwView& GetView() { return rView; }
- inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
- inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); }
+ inline SwView& GetView() { return rView; }
+ inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
+ inline BOOL AddGrfUpdateSlot( USHORT nSlot ){ return aGrfUpdateSlots.Insert( nSlot ); }
- DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* );
+ DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* );
- void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt );
- void InsertTable( SfxRequest& _rRequest );
+ void InsertURLButton( const String& rURL, const String& rTarget, const String& rTxt );
+ void InsertTable( SfxRequest& _rRequest );
public:
SwBaseShell(SwView &rShell);
@@ -96,8 +96,8 @@ public:
void GetState(SfxItemSet &);
void StateStyle(SfxItemSet &);
- void ExecuteGallery(SfxRequest&);
- void GetGalleryState(SfxItemSet&);
+ void ExecuteGallery(SfxRequest&);
+ void GetGalleryState(SfxItemSet&);
void ExecDlg(SfxRequest &);
@@ -105,18 +105,18 @@ public:
void ExecTxtCtrl(SfxRequest& rReq);
void GetTxtFontCtrlState(SfxItemSet& rSet);
void GetTxtCtrlState(SfxItemSet& rSet);
- void GetBorderState(SfxItemSet &rSet);
+ void GetBorderState(SfxItemSet &rSet);
void GetBckColState(SfxItemSet &rSet);
void ExecBckCol(SfxRequest& rReq);
- void SetWrapMode( USHORT nSlot );
+ void SetWrapMode( USHORT nSlot );
- void StateDisableItems(SfxItemSet &);
+ void StateDisableItems(SfxItemSet &);
- void EditRegionDialog(SfxRequest& rReq);
- void InsertRegionDialog(SfxRequest& rReq);
+ void EditRegionDialog(SfxRequest& rReq);
+ void InsertRegionDialog(SfxRequest& rReq);
- void ExecField(SfxRequest& rReq);
+ void ExecField(SfxRequest& rReq);
static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); //Mit Update!
static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; }
diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/ui/inc/beziersh.hxx
index 1fa2750c0433..2e821feee391 100644
--- a/sw/source/ui/inc/beziersh.hxx
+++ b/sw/source/ui/inc/beziersh.hxx
@@ -2,7 +2,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
@@ -38,8 +38,8 @@ public:
SwBezierShell(SwView &rView);
- void GetState(SfxItemSet &);
- void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
};
#endif
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx
index ebc22332885e..051dcd914592 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/ui/inc/bmpwin.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <vcl/window.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Extended Page fuer Grafiken
+ Beschreibung: Extended Page fuer Grafiken
--------------------------------------------------------------------*/
class BmpWindow : public Window
{
diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx
index c426aa93c071..d51fb6d009bd 100644
--- a/sw/source/ui/inc/bookctrl.hxx
+++ b/sw/source/ui/inc/bookctrl.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ class SwBookmarkControl : public SfxStatusBarControl
virtual void Command( const CommandEvent& rCEvt );
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 54492b201196..b14b2182fc78 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <vcl/button.hxx>
-#include "swlbox.hxx" // SwComboBox
+#include "swlbox.hxx" // SwComboBox
class SwWrtShell;
class SfxRequest;
@@ -44,16 +44,16 @@ class SfxRequest;
class BookmarkCombo : public SwComboBox
{
- USHORT GetFirstSelEntryPos() const;
- USHORT GetNextSelEntryPos(USHORT nPos) const;
- USHORT GetSelEntryPos(USHORT nPos) const;
+ USHORT GetFirstSelEntryPos() const;
+ USHORT GetNextSelEntryPos(USHORT nPos) const;
+ USHORT GetSelEntryPos(USHORT nPos) const;
- virtual long PreNotify(NotifyEvent& rNEvt);
+ virtual long PreNotify(NotifyEvent& rNEvt);
public:
BookmarkCombo( Window* pWin, const ResId& rResId );
- USHORT GetSelectEntryCount() const;
- USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
+ USHORT GetSelectEntryCount() const;
+ USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
static const String aForbiddenChars;
};
@@ -64,14 +64,14 @@ public:
class SwInsertBookmarkDlg: public SvxStandardDialog
{
- BookmarkCombo aBookmarkBox;
+ BookmarkCombo aBookmarkBox;
FixedLine aBookmarkFl;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- PushButton aDeleteBtn;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ PushButton aDeleteBtn;
- String sRemoveWarning;
- SwWrtShell &rSh;
+ String sRemoveWarning;
+ SwWrtShell &rSh;
SfxRequest& rReq;
DECL_LINK( ModifyHdl, BookmarkCombo * );
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx
index 1d4236a90575..1b488c0398b5 100644
--- a/sw/source/ui/inc/break.hxx
+++ b/sw/source/ui/inc/break.hxx
@@ -2,7 +2,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
@@ -42,25 +42,25 @@ class SwWrtShell;
class SwBreakDlg: public SvxStandardDialog
{
- SwWrtShell &rSh;
- RadioButton aLineBtn;
- RadioButton aColumnBtn;
- RadioButton aPageBtn;
- FixedText aPageCollText;
- ListBox aPageCollBox;
- CheckBox aPageNumBox;
- NumericField aPageNumEdit;
+ SwWrtShell &rSh;
+ RadioButton aLineBtn;
+ RadioButton aColumnBtn;
+ RadioButton aPageBtn;
+ FixedText aPageCollText;
+ ListBox aPageCollBox;
+ CheckBox aPageNumBox;
+ NumericField aPageNumEdit;
FixedLine aBreakFL;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
String aTemplate;
USHORT nKind;
USHORT nPgNum;
- BOOL bHtmlMode;
+ BOOL bHtmlMode;
DECL_LINK( ClickHdl, void * );
DECL_LINK( PageNumHdl, CheckBox * );
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx
index 119f20a4f257..c60fa6178d52 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/ui/inc/caption.hxx
@@ -2,7 +2,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
@@ -48,60 +48,60 @@ private:
// sal_Unicode cSeparator;
String sSeparator;
String sCharacterStyle;
-
+
BOOL bIgnoreSeqOpts; // wird nicht gespeichert
- BOOL bCopyAttributes; // -""-
+ BOOL bCopyAttributes; // -""-
public:
InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0);
InsCaptionOpt(const InsCaptionOpt&);
~InsCaptionOpt();
- inline BOOL& UseCaption() { return bUseCaption; }
- inline BOOL UseCaption() const { return bUseCaption; }
+ inline BOOL& UseCaption() { return bUseCaption; }
+ inline BOOL UseCaption() const { return bUseCaption; }
- inline SwCapObjType GetObjType() const { return eObjType; }
- inline void SetObjType(const SwCapObjType eType) { eObjType = eType; }
+ inline SwCapObjType GetObjType() const { return eObjType; }
+ inline void SetObjType(const SwCapObjType eType) { eObjType = eType; }
- inline const SvGlobalName& GetOleId() const { return aOleId; }
- inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; }
+ inline const SvGlobalName& GetOleId() const { return aOleId; }
+ inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; }
- inline const String& GetCategory() const { return sCategory; }
- inline void SetCategory(const String& rCat) { sCategory = rCat; }
+ inline const String& GetCategory() const { return sCategory; }
+ inline void SetCategory(const String& rCat) { sCategory = rCat; }
- inline USHORT GetNumType() const { return nNumType; }
- inline void SetNumType(const USHORT nNT) { nNumType = nNT; }
+ inline USHORT GetNumType() const { return nNumType; }
+ inline void SetNumType(const USHORT nNT) { nNumType = nNT; }
const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; }
void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;}
inline const String& GetCaption() const { return sCaption; }
- inline void SetCaption(const String& rCap) { sCaption = rCap; }
+ inline void SetCaption(const String& rCap) { sCaption = rCap; }
- inline USHORT GetPos() const { return nPos; }
- inline void SetPos(const USHORT nP) { nPos = nP; }
+ inline USHORT GetPos() const { return nPos; }
+ inline void SetPos(const USHORT nP) { nPos = nP; }
- inline USHORT GetLevel() const { return nLevel; }
- inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; }
+ inline USHORT GetLevel() const { return nLevel; }
+ inline void SetLevel(const USHORT nLvl) { nLevel = nLvl; }
-// inline sal_Unicode GetSeparator() const { return cSeparator; }
-// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; }
- inline const String& GetSeparator() const { return sSeparator; }
- inline void SetSeparator(const String& rSep) { sSeparator = rSep; }
+// inline sal_Unicode GetSeparator() const { return cSeparator; }
+// inline void SetSeparator(const sal_Unicode cSep){ cSeparator = cSep; }
+ inline const String& GetSeparator() const { return sSeparator; }
+ inline void SetSeparator(const String& rSep) { sSeparator = rSep; }
const String& GetCharacterStyle() const { return sCharacterStyle; }
- void SetCharacterStyle(const String& rStyle)
+ void SetCharacterStyle(const String& rStyle)
{ sCharacterStyle = rStyle; }
- inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; }
- inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; }
+ inline BOOL& IgnoreSeqOpts() { return bIgnoreSeqOpts; }
+ inline BOOL IgnoreSeqOpts() const { return bIgnoreSeqOpts; }
- inline BOOL& CopyAttributes() { return bCopyAttributes; }
- inline BOOL CopyAttributes() const { return bCopyAttributes; }
+ inline BOOL& CopyAttributes() { return bCopyAttributes; }
+ inline BOOL CopyAttributes() const { return bCopyAttributes; }
- BOOL operator==( const InsCaptionOpt& rOpt ) const;
- InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt );
- inline BOOL operator< ( const InsCaptionOpt & rObj ) const
+ BOOL operator==( const InsCaptionOpt& rOpt ) const;
+ InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt );
+ inline BOOL operator< ( const InsCaptionOpt & rObj ) const
{ return aOleId < rObj.aOleId; }
// friend SvStream& operator>>( SvStream& rIStream, InsCaptionOpt& rCapOpt );
// friend SvStream& operator<<( SvStream& rOStream, const InsCaptionOpt& rCapOpt );
diff --git a/sw/source/ui/inc/cfgdesc.hxx b/sw/source/ui/inc/cfgdesc.hxx
index 9de404744078..6ffab5c21cde 100644
--- a/sw/source/ui/inc/cfgdesc.hxx
+++ b/sw/source/ui/inc/cfgdesc.hxx
@@ -2,7 +2,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
@@ -42,14 +42,14 @@ protected:
~SwCfgDesc();
public:
- void SetEvent(USHORT nE); // inline
- void SetFuncText(const String &rStr); // inline
+ void SetEvent(USHORT nE); // inline
+ void SetFuncText(const String &rStr); // inline
void SetMacro(const String &rLib, const String &rMac);
BOOL IsMacro() const;
- USHORT GetEvent() const; // inline
- String GetFuncText() const; // inline
- String GetMacro() const; // inline
- String GetLib() const; // inline
+ USHORT GetEvent() const; // inline
+ String GetFuncText() const; // inline
+ String GetMacro() const; // inline
+ String GetLib() const; // inline
};
// INLINE METHODE --------------------------------------------------------
@@ -61,10 +61,10 @@ inline void SwCfgDesc::SetFuncText(const String &rStr) {
aFuncText = rStr;
}
-inline USHORT SwCfgDesc::GetEvent() const { return nEvent; }
-inline String SwCfgDesc::GetFuncText() const { return aFuncText; }
-inline String SwCfgDesc::GetMacro() const { return aFuncText; }
-inline String SwCfgDesc::GetLib() const { return aLibName; }
+inline USHORT SwCfgDesc::GetEvent() const { return nEvent; }
+inline String SwCfgDesc::GetFuncText() const { return aFuncText; }
+inline String SwCfgDesc::GetMacro() const { return aFuncText; }
+inline String SwCfgDesc::GetLib() const { return aLibName; }
#endif
diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h
index d4602a2e89e5..b8b794b7b729 100644
--- a/sw/source/ui/inc/cfgid.h
+++ b/sw/source/ui/inc/cfgid.h
@@ -2,7 +2,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
@@ -31,11 +31,11 @@
#include <sfx2/sfx.hrc>
#define CFG_STATUSBAR (SFX_ITEMTYPE_SW_BEGIN +13)
-#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16)
-#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17)
+#define CFG_SW_MENU (SFX_ITEMTYPE_SW_BEGIN +16)
+#define CFG_SW_ACCEL (SFX_ITEMTYPE_SW_BEGIN +17)
#define CFG_SWWEB_MENU (SFX_ITEMTYPE_SW_BEGIN +19)
#define CFG_SWWEB_ACCEL (SFX_ITEMTYPE_SW_BEGIN +20)
-#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25)
+#define CFG_INSERT_DBCOLUMN_ITEM (SFX_ITEMTYPE_SW_BEGIN +25)
#define CFG_SWGLOBAL_MENU (SFX_ITEMTYPE_SW_BEGIN +29)
#endif
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 8793a6d8ff00..5ce83a95fcb6 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -2,7 +2,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
@@ -49,7 +49,7 @@ class SwShdwCrsrOptionsTabPage;
class SwDocEditDialog;
SfxPrinter* GetPrt( ViewShell* );
-void SetPrt( SfxPrinter* );
+void SetPrt( SfxPrinter* );
/*--------OS 12.01.95 -----------------------------------
Item fuer Einstellungsdialog - Dokumentanzeige
@@ -82,10 +82,10 @@ public:
USHORT nWhich );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
- void operator=( const SwDocDisplayItem& );
- void FillViewOptions( SwViewOption& rVOpt) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
+ void operator=( const SwDocDisplayItem& );
+ void FillViewOptions( SwViewOption& rVOpt) const;
};
/*--------OS 12.01.95 -----------------------------------
@@ -95,22 +95,22 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
{
//view
BOOL bHorzScrollbar :1;
- BOOL bVertScrollbar :1;
+ BOOL bVertScrollbar :1;
BOOL bAnyRuler : 1;
BOOL bHorzRuler :1;
- BOOL bVertRuler :1;
+ BOOL bVertRuler :1;
BOOL bVertRulerRight:1;
BOOL bSmoothScroll :1;
//visual aids
- BOOL bCrosshair :1;
- BOOL bHandles :1;
- BOOL bBigHandles :1;
+ BOOL bCrosshair :1;
+ BOOL bHandles :1;
+ BOOL bBigHandles :1;
//display
BOOL bTable :1;
- BOOL bGraphic :1;
- BOOL bDrawing :1;
- BOOL bFieldName :1;
- BOOL bNotes :1;
+ BOOL bGraphic :1;
+ BOOL bDrawing :1;
+ BOOL bFieldName :1;
+ BOOL bNotes :1;
friend class SwContentOptPage;
@@ -123,9 +123,9 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- void operator=( const SwElemItem& );
+ void operator=( const SwElemItem& );
- void FillViewOptions( SwViewOption& rVOpt) const;
+ void FillViewOptions( SwViewOption& rVOpt) const;
};
@@ -149,7 +149,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
const rtl::OUString &GetFax() const { return sFaxName; }
- void SetFax( const String& rFax) { sFaxName = rFax; }
+ void SetFax( const String& rFax) { sFaxName = rFax; }
BOOL IsPrintProspect() const { return bPrintProspect; }
@@ -159,7 +159,7 @@ public:
BOOL IsPrintGraphic () const { return bPrintGraphic; }
BOOL IsPrintTable () const { return bPrintTable; }
BOOL IsPrintDraw () const { return bPrintDraw; }
- BOOL IsPrintControl () const { return bPrintControl; }
+ BOOL IsPrintControl () const { return bPrintControl; }
BOOL IsPrintLeftPage () const { return bPrintLeftPages; }
BOOL IsPrintRightPage() const { return bPrintRightPages; }
BOOL IsPrintReverse () const { return bPrintReverse; }
@@ -192,15 +192,15 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- void operator=( const SwShadowCursorItem& );
+ void operator=( const SwShadowCursorItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
- BYTE GetMode() const { return eMode; }
- BOOL IsOn() const { return bOn; }
+ BYTE GetMode() const { return eMode; }
+ BOOL IsOn() const { return bOn; }
- void SetMode( BYTE eM ) { eMode = eM; }
- void SetOn( BOOL bFlag ) { bOn = bFlag; }
+ void SetMode( BYTE eM ) { eMode = eM; }
+ void SetOn( BOOL bFlag ) { bOn = bFlag; }
};
#if OSL_DEBUG_LEVEL > 1
@@ -215,14 +215,14 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem
friend class SwTestTabPage;
friend class SwDocEditDialog;
- BOOL bTest1:1;
- BOOL bTest2:1;
- BOOL bTest3:1;
- BOOL bTest4:1;
- BOOL bTest5:1;
- BOOL bTest6:1;
- BOOL bTest7:1;
- BOOL bTest8:1;
+ BOOL bTest1:1;
+ BOOL bTest2:1;
+ BOOL bTest3:1;
+ BOOL bTest4:1;
+ BOOL bTest5:1;
+ BOOL bTest6:1;
+ BOOL bTest7:1;
+ BOOL bTest8:1;
BOOL bTest9:1;
BOOL bTest10:1;
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index de5c57dd9671..85f5fa0baa13 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -2,7 +2,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
@@ -49,34 +49,34 @@ struct SwDBData;
class SwChangeDBDlg: public SvxStandardDialog
{
FixedLine aDBListFL;
- FixedText aUsedDBFT;
- FixedText aAvailDBFT;
- SvTreeListBox aUsedDBTLB;
- SwDBTreeList aAvailDBTLB;
+ FixedText aUsedDBFT;
+ FixedText aAvailDBFT;
+ SvTreeListBox aUsedDBTLB;
+ SwDBTreeList aAvailDBTLB;
PushButton aAddDBPB;
- FixedInfo aDescFT;
- FixedText aDocDBTextFT;
- FixedText aDocDBNameFT;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
-// PushButton aChangeBT;
+ FixedInfo aDescFT;
+ FixedText aDocDBTextFT;
+ FixedText aDocDBNameFT;
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+// PushButton aChangeBT;
ImageList aImageList;
ImageList aImageListHC;
SwWrtShell *pSh;
- SwFldMgr *pMgr;
+ SwFldMgr *pMgr;
DECL_LINK(TreeSelectHdl, SvTreeListBox* pBox = 0);
DECL_LINK(ButtonHdl, Button* pBtn);
DECL_LINK(AddDBHdl, PushButton*);
- virtual void Apply();
- void UpdateFlds();
- void FillDBPopup();
- SvLBoxEntry* Insert(const String& rDBName);
- void ShowDBName(const SwDBData& rDBData);
+ virtual void Apply();
+ void UpdateFlds();
+ void FillDBPopup();
+ SvLBoxEntry* Insert(const String& rDBName);
+ void ShowDBName(const SwDBData& rDBData);
public:
SwChangeDBDlg(SwView& rVw);
diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx
index 4b6de648be57..668f587e60b9 100644
--- a/sw/source/ui/inc/chartins.hxx
+++ b/sw/source/ui/inc/chartins.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/ui/inc/chldwrap.hxx
index 4bd104d860c8..f034948def6f 100644
--- a/sw/source/ui/inc/chldwrap.hxx
+++ b/sw/source/ui/inc/chldwrap.hxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@ protected:
SwChildWinWrapper(Window *pParentWindow, USHORT nId);
public:
- virtual BOOL ReInitDlg(SwDocShell *pDocSh);
+ virtual BOOL ReInitDlg(SwDocShell *pDocSh);
inline SwDocShell* GetOldDocShell() { return m_pDocSh; }
inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; }
diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx
index 7f3679beacf7..5b7319607013 100644
--- a/sw/source/ui/inc/chrdlg.hxx
+++ b/sw/source/ui/inc/chrdlg.hxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@ class SwView;
class SvxMacroItem;
/*--------------------------------------------------------------------
- Beschreibung: Der Tabdialog Traeger der TabPages
+ Beschreibung: Der Tabdialog Traeger der TabPages
--------------------------------------------------------------------*/
class SwCharDlg: public SfxTabDialog
@@ -70,24 +70,24 @@ class SwCharURLPage : public SfxTabPage
{
FixedLine aURLFL;
- FixedText aURLFT;
+ FixedText aURLFT;
Edit aURLED;
- FixedText aTextFT;
+ FixedText aTextFT;
Edit aTextED;
- FixedText aNameFT;
+ FixedText aNameFT;
Edit aNameED;
- FixedText aTargetFrmFT;
- ComboBox aTargetFrmLB;
- PushButton aURLPB;
- PushButton aEventPB;
+ FixedText aTargetFrmFT;
+ ComboBox aTargetFrmLB;
+ PushButton aURLPB;
+ PushButton aEventPB;
FixedLine aStyleFL;
- FixedText aVisitedFT;
+ FixedText aVisitedFT;
ListBox aVisitedLB;
FixedText aNotVisitedFT;
ListBox aNotVisitedLB;
- SvxMacroItem* pINetItem;
- BOOL bModified;
+ SvxMacroItem* pINetItem;
+ BOOL bModified;
DECL_LINK( InsertFileHdl, PushButton * );
DECL_LINK( EventHdl, PushButton * );
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index 81eed9995b8d..c3be731cbdf8 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -2,7 +2,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
@@ -54,8 +54,8 @@
struct CurTOXType
{
- TOXTypes eType;
- USHORT nIndex; //for TOX_USER only
+ TOXTypes eType;
+ USHORT nIndex; //for TOX_USER only
BOOL operator==(const CurTOXType aCmp)
{
@@ -70,13 +70,13 @@ struct CurTOXType
class SwOLENames : public Resource
{
- ResStringArray aNamesAry;
+ ResStringArray aNamesAry;
public:
SwOLENames(const ResId& rResId) :
Resource(rResId),
aNamesAry(ResId(1,*rResId.GetResMgr())){FreeResource();}
- ResStringArray& GetNames() { return aNamesAry;}
+ ResStringArray& GetNames() { return aNamesAry;}
};
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx
index fb93c8d11ffa..ce4aac9a2fd3 100644
--- a/sw/source/ui/inc/colex.hxx
+++ b/sw/source/ui/inc/colex.hxx
@@ -2,7 +2,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
@@ -68,8 +68,8 @@ public:
class SW_DLLPUBLIC SwColExample : public SwPageExample
{
- SwColMgr* pColMgr;
-
+ SwColMgr* pColMgr;
+
using SwPageExample::UpdateExample;
protected:
diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx
index cc2ecd26bd24..6c96475a20c1 100644
--- a/sw/source/ui/inc/colmgr.hxx
+++ b/sw/source/ui/inc/colmgr.hxx
@@ -2,7 +2,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
@@ -42,47 +42,47 @@ public:
~SwColMgr();
- inline USHORT GetCount() const;
- void SetCount(USHORT nCount, USHORT nGutterWidth);
- USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const;
- void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX);
+ inline USHORT GetCount() const;
+ void SetCount(USHORT nCount, USHORT nGutterWidth);
+ USHORT GetGutterWidth(USHORT nPos = USHRT_MAX) const;
+ void SetGutterWidth(USHORT nWidth, USHORT nPos = USHRT_MAX);
- USHORT GetColWidth(USHORT nIdx) const;
- void SetColWidth(USHORT nIdx, USHORT nWidth);
+ USHORT GetColWidth(USHORT nIdx) const;
+ void SetColWidth(USHORT nIdx, USHORT nWidth);
- inline BOOL IsAutoWidth() const;
- void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0);
+ inline BOOL IsAutoWidth() const;
+ void SetAutoWidth(BOOL bOn = TRUE, USHORT lGutterWidth = 0);
- inline BOOL HasLine() const;
- inline void SetNoLine();
+ inline BOOL HasLine() const;
+ inline void SetNoLine();
- inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol);
- inline ULONG GetLineWidth() const;
+ inline void SetLineWidthAndColor(ULONG nWidth, const Color& rCol);
+ inline ULONG GetLineWidth() const;
inline const Color& GetLineColor() const;
inline SwColLineAdj GetAdjust() const;
- inline void SetAdjust(SwColLineAdj);
+ inline void SetAdjust(SwColLineAdj);
- short GetLineHeightPercent() const;
- void SetLineHeightPercent(short nPercent);
+ short GetLineHeightPercent() const;
+ void SetLineHeightPercent(short nPercent);
- inline void NoCols();
- void Update();
+ inline void NoCols();
+ void Update();
- const SwFmtCol& GetColumns() const { return aFmtCol; }
+ const SwFmtCol& GetColumns() const { return aFmtCol; }
- void SetActualWidth(USHORT nW);
- USHORT GetActualSize() const { return nWidth; }
+ void SetActualWidth(USHORT nW);
+ USHORT GetActualSize() const { return nWidth; }
private:
- SwFmtCol aFmtCol;
- USHORT nWidth;
+ SwFmtCol aFmtCol;
+ USHORT nWidth;
};
// INLINE METHODE --------------------------------------------------------
-inline USHORT SwColMgr::GetCount() const
+inline USHORT SwColMgr::GetCount() const
{
return aFmtCol.GetNumCols();
}
@@ -93,7 +93,7 @@ inline void SwColMgr::SetLineWidthAndColor(ULONG nLWidth, const Color& r
aFmtCol.SetLineColor(rCol);
}
-inline ULONG SwColMgr::GetLineWidth() const
+inline ULONG SwColMgr::GetLineWidth() const
{
return aFmtCol.GetLineWidth();
}
@@ -103,12 +103,12 @@ inline const Color& SwColMgr::GetLineColor() const
return aFmtCol.GetLineColor();
}
-inline SwColLineAdj SwColMgr::GetAdjust() const
+inline SwColLineAdj SwColMgr::GetAdjust() const
{
return aFmtCol.GetLineAdj();
}
-inline void SwColMgr::SetAdjust(SwColLineAdj eAdj)
+inline void SwColMgr::SetAdjust(SwColLineAdj eAdj)
{
aFmtCol.SetLineAdj(eAdj);
}
@@ -123,7 +123,7 @@ inline void SwColMgr::SetAutoWidth(BOOL bOn, USHORT nGutterWidth)
aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth);
}
-inline void SwColMgr::NoCols()
+inline void SwColMgr::NoCols()
{
aFmtCol.GetColumns().DeleteAndDestroy(0, aFmtCol.GetColumns().Count());
}
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 0ebdf821a42a..7f5cb000b103 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -2,7 +2,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
@@ -53,28 +53,28 @@ class SwColumnPage;
class SwColumnDlg : public SfxModalDialog
{
- OKButton aOK;
- CancelButton aCancel;
- HelpButton aHelp;
+ OKButton aOK;
+ CancelButton aCancel;
+ HelpButton aHelp;
- FixedText aApplyToFT;
- ListBox aApplyToLB;
+ FixedText aApplyToFT;
+ ListBox aApplyToLB;
- SwWrtShell& rWrtShell;
- SwColumnPage* pTabPage;
- SfxItemSet* pPageSet;
- SfxItemSet* pSectionSet;
- SfxItemSet* pSelectionSet;
- SfxItemSet* pFrameSet;
+ SwWrtShell& rWrtShell;
+ SwColumnPage* pTabPage;
+ SfxItemSet* pPageSet;
+ SfxItemSet* pSectionSet;
+ SfxItemSet* pSelectionSet;
+ SfxItemSet* pFrameSet;
- long nOldSelection;
- long nSelectionWidth;
- long nPageWidth;
+ long nOldSelection;
+ long nSelectionWidth;
+ long nPageWidth;
- BOOL bPageChanged : 1;
- BOOL bSectionChanged : 1;
- BOOL bSelSectionChanged : 1;
- BOOL bFrameChanged : 1;
+ BOOL bPageChanged : 1;
+ BOOL bSectionChanged : 1;
+ BOOL bSelSectionChanged : 1;
+ BOOL bFrameChanged : 1;
DECL_LINK(ObjectHdl, ListBox*);
@@ -84,7 +84,7 @@ public:
SwColumnDlg(Window* pParent, SwWrtShell& rSh);
virtual ~SwColumnDlg();
- SwWrtShell& GetWrtShell() { return rWrtShell; }
+ SwWrtShell& GetWrtShell() { return rWrtShell; }
};
class ColumnValueSet : public ValueSet
@@ -94,46 +94,46 @@ class ColumnValueSet : public ValueSet
ValueSet(pParent, rResId){}
~ColumnValueSet();
- virtual void UserDraw( const UserDrawEvent& rUDEvt );
+ virtual void UserDraw( const UserDrawEvent& rUDEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
/*--------------------------------------------------------------------
- Beschreibung: Spaltendialog jetzt als TabPage
+ Beschreibung: Spaltendialog jetzt als TabPage
--------------------------------------------------------------------*/
class SwColumnPage : public SfxTabPage
{
- FixedText aClNrLbl;
- NumericField aCLNrEdt;
- ColumnValueSet aDefaultVS;
- ImageList aPreColsIL;
- CheckBox aBalanceColsCB;
- FixedLine aFLGroup;
-
- ImageButton aBtnUp;
+ FixedText aClNrLbl;
+ NumericField aCLNrEdt;
+ ColumnValueSet aDefaultVS;
+ ImageList aPreColsIL;
+ CheckBox aBalanceColsCB;
+ FixedLine aFLGroup;
+
+ ImageButton aBtnUp;
FixedText aColumnFT;
- FixedText aWidthFT;
- FixedText aDistFT;
+ FixedText aWidthFT;
+ FixedText aDistFT;
FixedText aLbl1;
- PercentField aEd1;
- PercentField aDistEd1;
+ PercentField aEd1;
+ PercentField aDistEd1;
FixedText aLbl2;
- PercentField aEd2;
- PercentField aDistEd2;
+ PercentField aEd2;
+ PercentField aDistEd2;
FixedText aLbl3;
- PercentField aEd3;
- ImageButton aBtnDown;
- CheckBox aAutoWidthBox;
+ PercentField aEd3;
+ ImageButton aBtnDown;
+ CheckBox aAutoWidthBox;
- FixedLine aFLLayout;
+ FixedLine aFLLayout;
- FixedText aLineTypeLbl;
- LineListBox aLineTypeDLB;
- FixedText aLineHeightLbl;
- MetricField aLineHeightEdit;
- FixedText aLinePosLbl;
- ListBox aLinePosDLB;
- FixedLine aFLLineType;
+ FixedText aLineTypeLbl;
+ LineListBox aLineTypeDLB;
+ FixedText aLineHeightLbl;
+ MetricField aLineHeightEdit;
+ FixedText aLinePosLbl;
+ ListBox aLinePosDLB;
+ FixedLine aFLLineType;
FixedLine aVertFL;
FixedLine aPropertiesFL;
@@ -141,21 +141,21 @@ class SwColumnPage : public SfxTabPage
ListBox aTextDirectionLB;
// Example
- SwColExample aPgeExampleWN;
- SwColumnOnlyExample aFrmExampleWN;
+ SwColExample aPgeExampleWN;
+ SwColumnOnlyExample aFrmExampleWN;
SwColMgr* pColMgr;
- USHORT nFirstVis;
- USHORT nCols;
- long nColWidth[nMaxCols];
- long nColDist[nMaxCols];
- USHORT nMinWidth;
- PercentField *pModifiedField;
- BOOL bFormat;
- BOOL bFrm;
- BOOL bHtmlMode;
- BOOL bLockUpdate;
+ USHORT nFirstVis;
+ USHORT nCols;
+ long nColWidth[nMaxCols];
+ long nColDist[nMaxCols];
+ USHORT nMinWidth;
+ PercentField *pModifiedField;
+ BOOL bFormat;
+ BOOL bFrm;
+ BOOL bHtmlMode;
+ BOOL bLockUpdate;
// Handler
DECL_LINK( ColModify, NumericField * );
@@ -167,20 +167,20 @@ class SwColumnPage : public SfxTabPage
DECL_LINK( Up, Button * );
DECL_LINK( Down, Button * );
- void Apply(Button *);
+ void Apply(Button *);
DECL_LINK( UpdateColMgr, void* );
- void Update();
- void UpdateCols();
- void Init();
- void ResetColWidth();
- void SetLabels( USHORT nVis );
+ void Update();
+ void UpdateCols();
+ void Init();
+ void ResetColWidth();
+ void SetLabels( USHORT nVis );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual void ActivatePage(const SfxItemSet& rSet);
+ virtual int DeactivatePage(SfxItemSet *pSet);
SwColumnPage(Window *pParent, const SfxItemSet &rSet);
@@ -190,8 +190,8 @@ public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
static USHORT* GetRanges();
- virtual BOOL FillItemSet(SfxItemSet &rSet);
- virtual void Reset(const SfxItemSet &rSet);
+ virtual BOOL FillItemSet(SfxItemSet &rSet);
+ virtual void Reset(const SfxItemSet &rSet);
void SetFrmMode(BOOL bMod);
void SetPageWidth(long nPageWidth);
diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/ui/inc/conarc.hxx
index 720af53b9057..e1e6666e25d3 100644
--- a/sw/source/ui/inc/conarc.hxx
+++ b/sw/source/ui/inc/conarc.hxx
@@ -2,7 +2,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
@@ -45,15 +45,15 @@ public:
ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
// Mouse- & Key-Events
- virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
- virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+ virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
+ virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(const USHORT nSlotId); // Funktion aktivieren
- virtual void Deactivate();
+ virtual void Activate(const USHORT nSlotId); // Funktion aktivieren
+ virtual void Deactivate();
};
-#endif // _CONARC_HXX
+#endif // _CONARC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx
index 85c096ed2c71..36abb80ca39a 100644
--- a/sw/source/ui/inc/concustomshape.hxx
+++ b/sw/source/ui/inc/concustomshape.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ class ConstCustomShape : public SwDrawBase
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
rtl::OUString GetShapeType() const;
static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq );
@@ -69,6 +69,6 @@ class ConstCustomShape : public SwDrawBase
-#endif // _SW_CONRECT_HXX
+#endif // _SW_CONRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx
index 4cd343986171..f44514eca353 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/ui/inc/condedit.hxx
@@ -2,7 +2,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
@@ -36,16 +36,16 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper
{
BOOL bBrackets, bEnableDrop;
- SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
public:
ConditionEdit( Window* pParent, const ResId& rResId );
- inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; }
+ inline void ShowBrackets(BOOL bShow) { bBrackets = bShow; }
- inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; }
- inline BOOL IsDropEnable() const { return bEnableDrop; }
+ inline void SetDropEnable( BOOL bFlag ) { bEnableDrop = bFlag; }
+ inline BOOL IsDropEnable() const { return bEnableDrop; }
};
#endif
diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/ui/inc/conform.hxx
index 7f450e730a98..be9094af8b3c 100644
--- a/sw/source/ui/inc/conform.hxx
+++ b/sw/source/ui/inc/conform.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ public:
// Mouse- & Key-Events
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
virtual void CreateDefaultObject();
};
diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/ui/inc/conpoly.hxx
index 43244db17b2a..124b51564c30 100644
--- a/sw/source/ui/inc/conpoly.hxx
+++ b/sw/source/ui/inc/conpoly.hxx
@@ -2,7 +2,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
@@ -48,10 +48,10 @@ public:
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
};
-#endif // _CONPOLY_HXX
+#endif // _CONPOLY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/ui/inc/conrect.hxx
index 3f07874a10d0..2694f7c3df91 100644
--- a/sw/source/ui/inc/conrect.hxx
+++ b/sw/source/ui/inc/conrect.hxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ class ConstRectangle : public SwDrawBase
BOOL bCapVertical;
// #93382#
- sal_Bool mbVertical;
+ sal_Bool mbVertical;
public:
ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
@@ -52,11 +52,11 @@ class ConstRectangle : public SwDrawBase
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
};
-#endif // _SW_CONRECT_HXX
+#endif // _SW_CONRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 5abb7ec6cfb4..3230f8ecb7f4 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -2,7 +2,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
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _CONTENT_HXX
#define _CONTENT_HXX
-#include <limits.h> // USHRT_MAX
+#include <limits.h> // USHRT_MAX
#include "swcont.hxx"
#include <vcl/menu.hxx>
@@ -41,12 +41,12 @@ class SwTOXBase;
class SwRedline;
//----------------------------------------------------------------------------
-// Hilfsklassen
+// Hilfsklassen
//----------------------------------------------------------------------------
class SwPopup : public PopupMenu
{
- USHORT nCurId;
+ USHORT nCurId;
virtual void Select(){nCurId = GetCurItemId();}
public:
@@ -54,7 +54,7 @@ public:
PopupMenu(),
nCurId(USHRT_MAX){}
- USHORT GetCurId() const { return nCurId; }
+ USHORT GetCurId() const { return nCurId; }
};
@@ -62,38 +62,38 @@ public:
class SwOutlineContent : public SwContent
{
- USHORT nOutlinePos;
- BYTE nOutlineLevel;
- BOOL bIsMoveable;
+ USHORT nOutlinePos;
+ BYTE nOutlineLevel;
+ BOOL bIsMoveable;
public:
- SwOutlineContent( const SwContentType* pCnt,
+ SwOutlineContent( const SwContentType* pCnt,
const String& rName,
USHORT nArrPos,
BYTE nLevel,
BOOL bMove,
long nYPos) :
- SwContent(pCnt, rName, nYPos),
+ SwContent(pCnt, rName, nYPos),
nOutlinePos(nArrPos), nOutlineLevel(nLevel), bIsMoveable(bMove) {}
- USHORT GetPos(){return nOutlinePos;}
- BYTE GetOutlineLevel(){return nOutlineLevel;}
- BOOL IsMoveable(){return bIsMoveable;};
+ USHORT GetPos(){return nOutlinePos;}
+ BYTE GetOutlineLevel(){return nOutlineLevel;}
+ BOOL IsMoveable(){return bIsMoveable;};
};
//----------------------------------------------------------------------------
class SwRegionContent : public SwContent
{
- BYTE nRegionLevel;
+ BYTE nRegionLevel;
public:
- SwRegionContent( const SwContentType* pCnt,
+ SwRegionContent( const SwContentType* pCnt,
const String& rName,
BYTE nLevel,
long nYPos) :
SwContent(pCnt, rName, nYPos),
nRegionLevel(nLevel){}
- BYTE GetRegionLevel() const {return nRegionLevel;}
+ BYTE GetRegionLevel() const {return nRegionLevel;}
};
//----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ class SwURLFieldContent : public SwContent
const SwTxtINetFmt* pINetAttr;
public:
- SwURLFieldContent( const SwContentType* pCnt,
+ SwURLFieldContent( const SwContentType* pCnt,
const String& rName,
const String& rURL,
const SwTxtINetFmt* pAttr,
@@ -111,17 +111,17 @@ public:
: SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr )
{}
- virtual BOOL IsProtect() const;
- const String& GetURL() { return sURL; }
- const SwTxtINetFmt* GetINetAttr() { return pINetAttr; }
+ virtual BOOL IsProtect() const;
+ const String& GetURL() { return sURL; }
+ const SwTxtINetFmt* GetINetAttr() { return pINetAttr; }
};
//----------------------------------------------------------------------------
class SwPostItContent : public SwContent
{
- const SwFmtFld* pFld;
- SwRedline* pRedline;
- bool mbPostIt;
+ const SwFmtFld* pFld;
+ SwRedline* pRedline;
+ bool mbPostIt;
public:
SwPostItContent( const SwContentType* pCnt,
const String& rName,
@@ -136,24 +136,24 @@ public:
: SwContent( pCnt, rName, nYPos ), pRedline( pRed ),mbPostIt(false)
{}
- const SwFmtFld* GetPostIt() { return pFld; }
- SwRedline* GetRedline() { return pRedline; }
- virtual BOOL IsProtect() const;
- bool IsPostIt() {return mbPostIt; }
+ const SwFmtFld* GetPostIt() { return pFld; }
+ SwRedline* GetRedline() { return pRedline; }
+ virtual BOOL IsProtect() const;
+ bool IsPostIt() {return mbPostIt; }
};
//----------------------------------------------------------------------------
class SwGraphicContent : public SwContent
{
- String sLink;
+ String sLink;
public:
SwGraphicContent(const SwContentType* pCnt, const String& rName, const String& rLink, long nYPos)
: SwContent( pCnt, rName, nYPos ), sLink( rLink )
{}
virtual ~SwGraphicContent();
- const String& GetLink() const {return sLink;}
+ const String& GetLink() const {return sLink;}
};
//----------------------------------------------------------------------------
@@ -179,45 +179,45 @@ public:
class SwContentType : public SwTypeNumber
{
- SwWrtShell* pWrtShell;
- SwContentArr* pMember; // Array fuer Inhalte
- String sContentTypeName; // Name der Inhaltsform
- String sSingleContentTypeName; // Name der Inhaltsform, Singular
- String sTypeToken; // Anhaengsel fuer URL
- USHORT nMemberCount; // Inhaltsanzahl
- USHORT nContentType; // Id der Inhaltsform
- BYTE nOutlineLevel;
- BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt?
- BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden?
- BOOL bDataValid : 1; //
- BOOL bEdit: 1; // kann diese Type bearbeitet werden ?
- BOOL bDelete: 1; // kann diese Type geloescht werden ?
+ SwWrtShell* pWrtShell;
+ SwContentArr* pMember; // Array fuer Inhalte
+ String sContentTypeName; // Name der Inhaltsform
+ String sSingleContentTypeName; // Name der Inhaltsform, Singular
+ String sTypeToken; // Anhaengsel fuer URL
+ USHORT nMemberCount; // Inhaltsanzahl
+ USHORT nContentType; // Id der Inhaltsform
+ BYTE nOutlineLevel;
+ BOOL bMemberFilled : 1; // wurden die Inhalte bereits eingefuegt?
+ BOOL bIsInternalDrag:1; // koennen die Inhalte verschoben werden?
+ BOOL bDataValid : 1; //
+ BOOL bEdit: 1; // kann diese Type bearbeitet werden ?
+ BOOL bDelete: 1; // kann diese Type geloescht werden ?
protected:
- void RemoveNewline(String&);
+ void RemoveNewline(String&);
public:
SwContentType(SwWrtShell* pParent, USHORT nType, BYTE nLevel );
~SwContentType();
- void Init(BOOL* pbInvalidateWindow = 0);
- void FillMemberList(BOOL* pbLevelChanged = NULL);
- USHORT GetMemberCount() const
+ void Init(BOOL* pbInvalidateWindow = 0);
+ void FillMemberList(BOOL* pbLevelChanged = NULL);
+ USHORT GetMemberCount() const
{return nMemberCount;};
- USHORT GetType() const {return nContentType;}
- const SwContent* GetMember(USHORT nIndex);
- const String& GetName() {return sContentTypeName;}
- const String& GetSingleName() const {return sSingleContentTypeName;}
- const String& GetTypeToken() const{return sTypeToken;}
+ USHORT GetType() const {return nContentType;}
+ const SwContent* GetMember(USHORT nIndex);
+ const String& GetName() {return sContentTypeName;}
+ const String& GetSingleName() const {return sSingleContentTypeName;}
+ const String& GetTypeToken() const{return sTypeToken;}
- void SetOutlineLevel(BYTE nNew)
+ void SetOutlineLevel(BYTE nNew)
{
nOutlineLevel = nNew;
Invalidate();
}
- void Invalidate(); // nur nMemberCount wird neu gelesen
+ void Invalidate(); // nur nMemberCount wird neu gelesen
- BOOL IsEditable() const {return bEdit;}
- BOOL IsDeletable() const {return bDelete;}
+ BOOL IsEditable() const {return bEdit;}
+ BOOL IsDeletable() const {return bDelete;}
};
#endif
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 877e74799b33..ddfa451d2c5e 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -2,7 +2,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
@@ -45,62 +45,62 @@ class SwGlblDocContent;
class SfxObjectShell;
-#define EDIT_MODE_EDIT 0
-#define EDIT_MODE_UPD_IDX 1
-#define EDIT_MODE_RMV_IDX 2
-#define EDIT_UNPROTECT_TABLE 3
-#define EDIT_MODE_DELETE 4
-#define EDIT_MODE_RENAME 5
+#define EDIT_MODE_EDIT 0
+#define EDIT_MODE_UPD_IDX 1
+#define EDIT_MODE_RMV_IDX 2
+#define EDIT_UNPROTECT_TABLE 3
+#define EDIT_MODE_DELETE 4
+#define EDIT_MODE_RENAME 5
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
class SwContentTree : public SvTreeListBox
{
- ImageList aEntryImages;
- String sSpace;
- AutoTimer aUpdTimer;
+ ImageList aEntryImages;
+ String sSpace;
+ AutoTimer aUpdTimer;
- SwContentType* aActiveContentArr[CONTENT_TYPE_MAX];
- SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX];
- String aContextStrings[CONTEXT_COUNT + 1];
+ SwContentType* aActiveContentArr[CONTENT_TYPE_MAX];
+ SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX];
+ String aContextStrings[CONTEXT_COUNT + 1];
String sRemoveIdx;
String sUpdateIdx;
String sUnprotTbl;
- String sRename;
- String sReadonlyIdx;
- String sInvisible;
- String sPostItShow;
- String sPostItHide;
- String sPostItDelete;
+ String sRename;
+ String sReadonlyIdx;
+ String sInvisible;
+ String sPostItShow;
+ String sPostItHide;
+ String sPostItDelete;
- SwWrtShell* pHiddenShell; // gedropptes Doc
- SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View
- SwNavigationConfig* pConfig;
+ SwWrtShell* pHiddenShell; // gedropptes Doc
+ SwWrtShell* pActiveShell; // die aktive oder eine konst. offene View
+ SwNavigationConfig* pConfig;
std::map< void*, sal_Bool > mOutLineNodeMap;
sal_Int32 nActiveBlock;
- USHORT nHiddenBlock;
- USHORT nRootType;
- USHORT nLastSelType;
- BYTE nOutlineLevel;
-
- BOOL bIsActive :1;
- BOOL bIsConstant :1;
- BOOL bIsHidden :1;
- BOOL bDocChgdInDragging :1;
- BOOL bIsInternalDrag :1;
- BOOL bIsRoot :1;
- BOOL bIsIdleClear :1;
- BOOL bIsLastReadOnly :1;
- BOOL bIsOutlineMoveable :1;
- BOOL bViewHasChanged :1;
- BOOL bIsImageListInitialized : 1;
-
- static BOOL bIsInDrag;
-
- void FindActiveTypeAndRemoveUserData();
+ USHORT nHiddenBlock;
+ USHORT nRootType;
+ USHORT nLastSelType;
+ BYTE nOutlineLevel;
+
+ BOOL bIsActive :1;
+ BOOL bIsConstant :1;
+ BOOL bIsHidden :1;
+ BOOL bDocChgdInDragging :1;
+ BOOL bIsInternalDrag :1;
+ BOOL bIsRoot :1;
+ BOOL bIsIdleClear :1;
+ BOOL bIsLastReadOnly :1;
+ BOOL bIsOutlineMoveable :1;
+ BOOL bViewHasChanged :1;
+ BOOL bIsImageListInitialized : 1;
+
+ static BOOL bIsInDrag;
+
+ void FindActiveTypeAndRemoveUserData();
using SvLBox::ExecuteDrop;
using SvTreeListBox::EditEntry;
@@ -110,22 +110,22 @@ class SwContentTree : public SvTreeListBox
protected:
// virtual void Command( const CommandEvent& rCEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
- virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
virtual void DataChanged( const DataChangedEvent& rDCEvt );
SwNavigationPI* GetParentWindow(){return
(SwNavigationPI*)Window::GetParent();}
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual void DragFinished( sal_Int8 );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void DragFinished( sal_Int8 );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
-
+
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- sal_Bool FillTransferData( TransferDataContainer& rTransfer,
+ sal_Bool FillTransferData( TransferDataContainer& rTransfer,
sal_Int8& rDragMode );
- BOOL HasContentChanged();
+ BOOL HasContentChanged();
virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
SvLBoxEntry* );
@@ -143,10 +143,10 @@ protected:
);
virtual void MouseButtonDown( const MouseEvent& rMEvt );
- void EditEntry( SvLBoxEntry* pEntry, BYTE nMode );
-
- void GotoContent(SwContent* pCnt);
- static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;}
+ void EditEntry( SvLBoxEntry* pEntry, BYTE nMode );
+
+ void GotoContent(SwContent* pCnt);
+ static void SetInDrag(BOOL bSet) {bIsInDrag = bSet;}
virtual PopupMenu* CreateContextMenu( void );
virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
@@ -155,57 +155,57 @@ public:
SwContentTree(Window* pParent, const ResId& rResId);
~SwContentTree();
- BOOL ToggleToRoot();
- BOOL IsRoot() const {return bIsRoot;}
- USHORT GetRootType() const {return nRootType;}
- void SetRootType(USHORT nType);
- void Display( BOOL bActiveView );
- void Clear();
- void SetHiddenShell(SwWrtShell* pSh);
- void ShowHiddenShell();
- void ShowActualView();
- void SetActiveShell(SwWrtShell* pSh);
- void SetConstantShell(SwWrtShell* pSh);
-
- SwWrtShell* GetWrtShell()
+ BOOL ToggleToRoot();
+ BOOL IsRoot() const {return bIsRoot;}
+ USHORT GetRootType() const {return nRootType;}
+ void SetRootType(USHORT nType);
+ void Display( BOOL bActiveView );
+ void Clear();
+ void SetHiddenShell(SwWrtShell* pSh);
+ void ShowHiddenShell();
+ void ShowActualView();
+ void SetActiveShell(SwWrtShell* pSh);
+ void SetConstantShell(SwWrtShell* pSh);
+
+ SwWrtShell* GetWrtShell()
{return bIsActive||bIsConstant ?
pActiveShell :
pHiddenShell;}
- static BOOL IsInDrag() {return bIsInDrag;}
- BOOL IsInternalDrag() const {return bIsInternalDrag != 0;}
+ static BOOL IsInDrag() {return bIsInDrag;}
+ BOOL IsInternalDrag() const {return bIsInternalDrag != 0;}
sal_Int32 GetActiveBlock() const {return nActiveBlock;}
- BYTE GetOutlineLevel()const {return nOutlineLevel;}
- void SetOutlineLevel(BYTE nSet);
-
- BOOL Expand( SvLBoxEntry* pParent );
-
- BOOL Collapse( SvLBoxEntry* pParent );
-
- void ExecCommand(USHORT nCmd, BOOL bModifier);
-
- void ShowTree();
- void HideTree();
-
- BOOL IsConstantView() {return bIsConstant;}
- BOOL IsActiveView() {return bIsActive;}
- BOOL IsHiddenView() {return bIsHidden;}
-
- const SwWrtShell* GetActiveWrtShell() {return pActiveShell;}
- SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;}
+ BYTE GetOutlineLevel()const {return nOutlineLevel;}
+ void SetOutlineLevel(BYTE nSet);
+
+ BOOL Expand( SvLBoxEntry* pParent );
+
+ BOOL Collapse( SvLBoxEntry* pParent );
+
+ void ExecCommand(USHORT nCmd, BOOL bModifier);
+
+ void ShowTree();
+ void HideTree();
+
+ BOOL IsConstantView() {return bIsConstant;}
+ BOOL IsActiveView() {return bIsActive;}
+ BOOL IsHiddenView() {return bIsHidden;}
+
+ const SwWrtShell* GetActiveWrtShell() {return pActiveShell;}
+ SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;}
DECL_LINK( ContentDoubleClickHdl, SwContentTree * );
// DECL_LINK( PopupHdl, Menu* );
DECL_LINK( TimerUpdate, Timer * );
virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void GetFocus();
virtual void KeyInput(const KeyEvent& rKEvt);
-
- virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
+
+ virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
};
@@ -232,10 +232,10 @@ namespace sfx2 { class FileDialogHelper; }
class SwGlobalTree : public SvTreeListBox
{
private:
- AutoTimer aUpdateTimer;
- String aContextStrings[GLOBAL_CONTEXT_COUNT];
+ AutoTimer aUpdateTimer;
+ String aContextStrings[GLOBAL_CONTEXT_COUNT];
- ImageList aEntryImages;
+ ImageList aEntryImages;
SwWrtShell* pActiveShell; //
SvLBoxEntry* pEmphasisEntry; // Drag'n Drop-Emphasis
@@ -246,9 +246,9 @@ private:
SwGlblDocContent* pDocContent;
sfx2::DocumentInserter* pDocInserter;
- BOOL bIsInternalDrag :1;
- BOOL bLastEntryEmphasis :1; // Drag'n Drop
- BOOL bIsImageListInitialized : 1;
+ BOOL bIsInternalDrag :1;
+ BOOL bLastEntryEmphasis :1; // Drag'n Drop
+ BOOL bIsImageListInitialized : 1;
static const SfxObjectShell* pShowShell;
@@ -264,12 +264,12 @@ private:
protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
-
+
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
-
+
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* );
virtual BOOL NotifyMoving( SvLBoxEntry* pTarget,
@@ -283,8 +283,8 @@ protected:
ULONG& rNewChildPos
);
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual void DragFinished( sal_Int8 );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void DragFinished( sal_Int8 );
virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
SvLBoxEntry* );
virtual BOOL NotifyAcceptDrop( SvLBoxEntry* );
@@ -292,26 +292,26 @@ protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void KeyInput(const KeyEvent& rKEvt);
virtual void GetFocus();
- virtual void SelectHdl();
- virtual void DeselectHdl();
+ virtual void SelectHdl();
+ virtual void DeselectHdl();
virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
- void Clear();
+ void Clear();
- DECL_LINK( PopupHdl, Menu* );
- DECL_LINK( Timeout, Timer* );
- DECL_LINK( DoubleClickHdl, SwGlobalTree * );
+ DECL_LINK( PopupHdl, Menu* );
+ DECL_LINK( Timeout, Timer* );
+ DECL_LINK( DoubleClickHdl, SwGlobalTree * );
- BOOL IsInternalDrag() const {return bIsInternalDrag != 0;}
+ BOOL IsInternalDrag() const {return bIsInternalDrag != 0;}
SwNavigationPI* GetParentWindow()
{ return (SwNavigationPI*)Window::GetParent(); }
- void OpenDoc(const SwGlblDocContent*);
- void GotoContent(const SwGlblDocContent*);
- USHORT GetEnableFlags() const;
+ void OpenDoc(const SwGlblDocContent*);
+ void GotoContent(const SwGlblDocContent*);
+ USHORT GetEnableFlags() const;
- static const SfxObjectShell* GetShowShell() {return pShowShell;}
- static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;}
+ static const SfxObjectShell* GetShowShell() {return pShowShell;}
+ static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;}
DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*);
virtual PopupMenu* CreateContextMenu( void );
@@ -321,19 +321,19 @@ public:
SwGlobalTree(Window* pParent, const ResId& rResId);
virtual ~SwGlobalTree();
- void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox);
- void InsertRegion( const SwGlblDocContent* pCont,
+ void TbxMenuHdl(USHORT nTbxId, ToolBox* pBox);
+ void InsertRegion( const SwGlblDocContent* pCont,
const String* pFileName = 0 );
- void EditContent(const SwGlblDocContent* pCont );
-
- void ShowTree();
- void HideTree();
-
- void ExecCommand(USHORT nCmd);
+ void EditContent(const SwGlblDocContent* pCont );
+
+ void ShowTree();
+ void HideTree();
- void Display(BOOL bOnlyUpdateUserData = FALSE);
+ void ExecCommand(USHORT nCmd);
- BOOL Update(BOOL bHard);
+ void Display(BOOL bOnlyUpdateUserData = FALSE);
+
+ BOOL Update(BOOL bHard);
};
#endif
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx
index 3fc218459f68..b6b3ff07d772 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/ui/inc/convert.hxx
@@ -2,7 +2,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
@@ -42,35 +42,35 @@ struct SwInsertTableOptions;
class SwConvertTableDlg: public SfxModalDialog
{
- RadioButton aTabBtn;
- RadioButton aSemiBtn;
- RadioButton aParaBtn;
- RadioButton aOtherBtn;
- Edit aOtherEd;
- CheckBox aKeepColumn;
+ RadioButton aTabBtn;
+ RadioButton aSemiBtn;
+ RadioButton aParaBtn;
+ RadioButton aOtherBtn;
+ Edit aOtherEd;
+ CheckBox aKeepColumn;
FixedLine aDelimFL;
- CheckBox aHeaderCB;
- CheckBox aRepeatHeaderCB;
-
+ CheckBox aHeaderCB;
+ CheckBox aRepeatHeaderCB;
+
FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
FixedText aRepeatHeaderBeforeFT;
NumericField aRepeatHeaderNF;
FixedText aRepeatHeaderAfterFT;
TextControlCombo aRepeatHeaderCombo;
-
+
FixedLine aOptionsFL;
CheckBox aDontSplitCB;
- CheckBox aBorderCB;
+ CheckBox aBorderCB;
PushButton aAutoFmtBtn;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
- String sConvertTextTable;
- SwTableAutoFmt* pTAutoFmt;
- SwWrtShell* pShell;
+ String sConvertTextTable;
+ SwTableAutoFmt* pTAutoFmt;
+ SwWrtShell* pShell;
DECL_LINK( AutoFmtHdl, PushButton* );
DECL_LINK( BtnHdl, Button* );
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx
index b2a74794d7de..b6fe3e7ef901 100644
--- a/sw/source/ui/inc/cption.hxx
+++ b/sw/source/ui/inc/cption.hxx
@@ -2,7 +2,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
@@ -68,28 +68,28 @@ class SwCaptionDialog : public SvxStandardDialog
: ComboBox( pParent, rResId )
{}
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual long PreNotify( NotifyEvent& rNEvt );
};
- FixedText aTextText;
- Edit aTextEdit;
+ FixedText aTextText;
+ Edit aTextEdit;
FixedLine aSettingsFL;
- FixedText aCategoryText;
- CategoryBox aCategoryBox;
- FixedText aFormatText;
- ListBox aFormatBox;
- //#i61007# order of captions
+ FixedText aCategoryText;
+ CategoryBox aCategoryBox;
+ FixedText aFormatText;
+ ListBox aFormatBox;
+ //#i61007# order of captions
FixedText aNumberingSeparatorFT;
Edit aNumberingSeparatorED;
FixedText aSepText;
Edit aSepEdit;
- FixedText aPosText;
- ListBox aPosBox;
- OKButton aOKButton;
+ FixedText aPosText;
+ ListBox aPosBox;
+ OKButton aOKButton;
CancelButton aCancelButton;
- HelpButton aHelpButton;
+ HelpButton aHelpButton;
PushButton aAutoCaptionButton;
- PushButton aOptionButton;
+ PushButton aOptionButton;
String sNone;
@@ -101,11 +101,11 @@ class SwCaptionDialog : public SvxStandardDialog
String sCharacterStyle;
String sObjectName;
- bool bCopyAttributes;
+ bool bCopyAttributes;
bool bOrderNumberingFirst; //#i61007# order of captions
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed;
DECL_LINK( SelectHdl, ListBox * );
DECL_LINK( ModifyHdl, Edit * );
@@ -116,7 +116,7 @@ class SwCaptionDialog : public SvxStandardDialog
void DrawSample();
void CheckButtonWidth();
- void ApplyCaptionOrder(); //#i61007# order of captions
+ void ApplyCaptionOrder(); //#i61007# order of captions
public:
SwCaptionDialog( Window *pParent, SwView &rV );
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx
index f8da4b00c8d9..2b64258983c1 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/ui/inc/dbconfig.hxx
@@ -2,7 +2,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
@@ -44,8 +44,8 @@ public:
SwDBConfig();
virtual ~SwDBConfig();
- void Load();
- const SwDBData& GetAddressSource();
+ void Load();
+ const SwDBData& GetAddressSource();
const SwDBData& GetBibliographySource();
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 9ca9c15b06ef..a060c278cbb5 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -2,7 +2,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
@@ -91,59 +91,59 @@ SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32, 32 )
class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
{
- FixedText aFtInsertData;
- RadioButton aRbAsTable;
- RadioButton aRbAsField;
- RadioButton aRbAsText;
+ FixedText aFtInsertData;
+ RadioButton aRbAsTable;
+ RadioButton aRbAsField;
+ RadioButton aRbAsText;
FixedLine aFlHead;
- FixedText aFtDbColumn;
+ FixedText aFtDbColumn;
- ListBox aLbTblDbColumn;
- ListBox aLbTxtDbColumn;
+ ListBox aLbTblDbColumn;
+ ListBox aLbTxtDbColumn;
FixedLine aFlFormat;
- RadioButton aRbDbFmtFromDb;
- RadioButton aRbDbFmtFromUsr;
+ RadioButton aRbDbFmtFromDb;
+ RadioButton aRbDbFmtFromUsr;
NumFormatListBox aLbDbFmtFromUsr;
/* ----- Page Text/Field ------- */
ImageButton aIbDbcolToEdit;
- MultiLineEdit aEdDbText;
- FixedText aFtDbParaColl;
- ListBox aLbDbParaColl;
+ MultiLineEdit aEdDbText;
+ FixedText aFtDbParaColl;
+ ListBox aLbDbParaColl;
/* ----- Page Table ------------ */
ImageButton aIbDbcolAllTo;
ImageButton aIbDbcolOneTo;
ImageButton aIbDbcolOneFrom;
ImageButton aIbDbcolAllFrom;
- FixedText aFtTableCol;
- ListBox aLbTableCol;
- CheckBox aCbTableHeadon;
- RadioButton aRbHeadlColnms;
- RadioButton aRbHeadlEmpty;
- PushButton aPbTblFormat;
- PushButton aPbTblAutofmt;
-
- OKButton aBtOk;
- CancelButton aBtCancel;
- HelpButton aBtHelp;
+ FixedText aFtTableCol;
+ ListBox aLbTableCol;
+ CheckBox aCbTableHeadon;
+ RadioButton aRbHeadlColnms;
+ RadioButton aRbHeadlEmpty;
+ PushButton aPbTblFormat;
+ PushButton aPbTblAutofmt;
+
+ OKButton aBtOk;
+ CancelButton aBtCancel;
+ HelpButton aBtHelp;
FixedLine aFlBottom;
SwInsDBColumns aDBColumns;
- const SwDBData aDBData;
+ const SwDBData aDBData;
- Link aOldNumFmtLnk;
- String sNoTmpl;
+ Link aOldNumFmtLnk;
+ String sNoTmpl;
- SwView* pView;
- SwTableAutoFmt* pTAutoFmt;
+ SwView* pView;
+ SwTableAutoFmt* pTAutoFmt;
- SfxItemSet* pTblSet;
- SwTableRep* pRep;
- USHORT nGBFmtLen;
+ SfxItemSet* pTblSet;
+ SwTableRep* pRep;
+ USHORT nGBFmtLen;
DECL_LINK( PageHdl, Button* );
DECL_LINK( AutoFmtHdl, PushButton* );
@@ -157,8 +157,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
BOOL SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, BOOL bInsField );
using SfxModalDialog::Notify;
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- virtual void Commit();
- void Load();
+ virtual void Commit();
+ void Load();
// setze die Tabellen - Eigenschaften
void SetTabSet();
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index c3f53c513842..6a874595cb27 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -2,7 +2,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
@@ -45,23 +45,23 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
{
ImageList aImageList;
ImageList aImageListHC;
- Image aDBBMP;
- Image aTableBMP;
- Image aQueryBMP;
+ Image aDBBMP;
+ Image aTableBMP;
+ Image aQueryBMP;
- String sDefDBName;
- BOOL bInitialized;
- BOOL bShowColumns;
+ String sDefDBName;
+ BOOL bInitialized;
+ BOOL bShowColumns;
SwDBTreeList_Impl* pImpl;
SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
- SW_DLLPRIVATE void InitTreeList();
- SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent );
+ SW_DLLPRIVATE void InitTreeList();
+ SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent );
SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
using SvTreeListBox::Select;
@@ -74,12 +74,12 @@ public:
String GetDBName( String& rTableName, String& rColumnName, BOOL* pbIsTable = 0);
- void Select( const String& rDBName, const String& rTableName,
+ void Select( const String& rDBName, const String& rTableName,
const String& rColumnName );
- void ShowColumns(BOOL bShowCol);
+ void ShowColumns(BOOL bShowCol);
void SetWrtShell(SwWrtShell& rSh);
-
+
void AddDataSource(const String& rSource);
};
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx
index 95a5864ef9d1..0a490f9a8f01 100644
--- a/sw/source/ui/inc/dbui.hxx
+++ b/sw/source/ui/inc/dbui.hxx
@@ -2,7 +2,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
@@ -43,14 +43,14 @@ public:
MONITOR_TYPE_MAIL,
MONITOR_TYPE_SAVE
};
- FixedText aDocName;
- FixedText aPrinting;
- FixedText aPrinter;
- FixedText aPrintInfo;
- CancelButton aCancel;
+ FixedText aDocName;
+ FixedText aPrinting;
+ FixedText aPrinter;
+ FixedText aPrintInfo;
+ CancelButton aCancel;
PrintMonitor( Window *pParent, PrintMonitorType eType );
-
+
void ResizeControls();
};
@@ -68,11 +68,11 @@ private: //methods
void UpdateCountingText();
private: //member
- FixedText m_aStatus;
- FixedText m_aProgress;
- FixedText m_aCreateDocuments;
- FixedText m_aCounting;
- CancelButton m_aCancelButton;
+ FixedText m_aStatus;
+ FixedText m_aProgress;
+ FixedText m_aCreateDocuments;
+ FixedText m_aCounting;
+ CancelButton m_aCancelButton;
String m_sCountingPattern;
String m_sVariable_Total;
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx
index 7be3129b8a5b..dba1a878330b 100644
--- a/sw/source/ui/inc/dialmgr.hxx
+++ b/sw/source/ui/inc/dialmgr.hxx
@@ -2,7 +2,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
@@ -38,13 +38,13 @@ class ResMgr;
struct SwDialogsResMgr
{
- static ResMgr* GetResMgr();
+ static ResMgr* GetResMgr();
};
-#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr()
-#define SW_RES(i) ResId(i,SWDIALOG_MGR())
-#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR()))
-#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR()))
+#define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr()
+#define SW_RES(i) ResId(i,SWDIALOG_MGR())
+#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR()))
+#define SW_RESSSTR(i) String(ResId(i,SWDIALOG_MGR()))
#endif
diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx
index 69b65f12ae1e..b8bffcc346ea 100644
--- a/sw/source/ui/inc/docfnote.hxx
+++ b/sw/source/ui/inc/docfnote.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx
index fd48d593ee3f..388e12e7537f 100644
--- a/sw/source/ui/inc/docstdlg.hxx
+++ b/sw/source/ui/inc/docstdlg.hxx
@@ -2,7 +2,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
@@ -71,11 +71,11 @@ private:
FixedInfo aCharNo;
FixedInfo aLineNo;
- PushButton aUpdatePB;
+ PushButton aUpdatePB;
SwDocStat aDocStat;
void Update();
-
+
using Window::SetData;
void SetData(const SwDocStat &rStat);
};
diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx
index fa306a080db1..14df0b150e29 100644
--- a/sw/source/ui/inc/drawbase.hxx
+++ b/sw/source/ui/inc/drawbase.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ class SwEditWin;
class KeyEvent;
class MouseEvent;
-#define MIN_FREEHAND_DISTANCE 10
+#define MIN_FREEHAND_DISTANCE 10
/*************************************************************************
|*
@@ -61,8 +61,8 @@ public:
SwDrawBase(SwWrtShell *pSh, SwEditWin* pWin, SwView* pView);
virtual ~SwDrawBase();
- void SetDrawPointer();
- void EnterSelectMode(const MouseEvent& rMEvt);
+ void SetDrawPointer();
+ void EnterSelectMode(const MouseEvent& rMEvt);
inline BOOL IsInsertForm() const { return m_bInsForm; }
inline BOOL IsCreateObj() const { return m_bCreateObj; }
@@ -72,12 +72,12 @@ public:
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- void BreakCreate();
+ void BreakCreate();
void SetSlotId(USHORT nSlot) {m_nSlotId = nSlot;}
USHORT GetSlotId() { return m_nSlotId;}
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
virtual void CreateDefaultObject();
@@ -87,6 +87,6 @@ public:
-#endif // _SW_DRAWBASE_HXX
+#endif // _SW_DRAWBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/ui/inc/drawsh.hxx
index 4325661414f9..fc39b69bac0f 100644
--- a/sw/source/ui/inc/drawsh.hxx
+++ b/sw/source/ui/inc/drawsh.hxx
@@ -2,7 +2,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
@@ -40,14 +40,14 @@ public:
SwDrawShell(SwView &rView);
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
- void ExecDrawDlg(SfxRequest& rReq);
- void ExecDrawAttrArgs(SfxRequest& rReq);
- void GetDrawAttrState(SfxItemSet &rSet);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void ExecDrawDlg(SfxRequest& rReq);
+ void ExecDrawAttrArgs(SfxRequest& rReq);
+ void GetDrawAttrState(SfxItemSet &rSet);
- void ExecFormText(SfxRequest& rReq);
- void GetFormTextState(SfxItemSet& rSet);
+ void ExecFormText(SfxRequest& rReq);
+ void GetFormTextState(SfxItemSet& rSet);
};
#endif
diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/ui/inc/drformsh.hxx
index 061b2f4aad23..ca08eb8b54e6 100644
--- a/sw/source/ui/inc/drformsh.hxx
+++ b/sw/source/ui/inc/drformsh.hxx
@@ -2,7 +2,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
@@ -39,10 +39,10 @@ public:
TYPEINFO();
SwDrawFormShell(SwView &rView);
- virtual ~SwDrawFormShell();
+ virtual ~SwDrawFormShell();
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
};
#endif
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx
index 75ce9441c6ea..ccf15d8da08f 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/ui/inc/drpcps.hxx
@@ -2,7 +2,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
@@ -63,27 +63,27 @@ class SwDropCapsPage : public SfxTabPage
{
friend class SwDropCapsPict;
- CheckBox aDropCapsBox;
- CheckBox aWholeWordCB;
- FixedText aSwitchText;
- NumericField aDropCapsField;
- FixedText aLinesText;
- NumericField aLinesField;
- FixedText aDistanceText;
- MetricField aDistanceField;
+ CheckBox aDropCapsBox;
+ CheckBox aWholeWordCB;
+ FixedText aSwitchText;
+ NumericField aDropCapsField;
+ FixedText aLinesText;
+ NumericField aLinesField;
+ FixedText aDistanceText;
+ MetricField aDistanceField;
FixedLine aSettingsFL;
- FixedText aTextText;
- Edit aTextEdit;
- FixedText aTemplateText;
- ListBox aTemplateBox;
+ FixedText aTextText;
+ Edit aTextEdit;
+ FixedText aTemplateText;
+ ListBox aTemplateBox;
FixedLine aContentFL;
- SwDropCapsPict *pPict;
+ SwDropCapsPict *pPict;
- BOOL bModified;
- BOOL bFormat;
- BOOL bHtmlMode;
+ BOOL bModified;
+ BOOL bFormat;
+ BOOL bHtmlMode;
SwWrtShell &rSh;
@@ -91,7 +91,7 @@ friend class SwDropCapsPict;
~SwDropCapsPage();
virtual int DeactivatePage(SfxItemSet *pSet);
- void FillSet( SfxItemSet &rSet );
+ void FillSet( SfxItemSet &rSet );
DECL_LINK( ClickHdl, Button * );
DECL_LINK( ModifyHdl, Edit * );
@@ -109,7 +109,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet &rSet);
virtual void Reset (const SfxItemSet &rSet);
- void SetFormat(BOOL bSet){bFormat = bSet;}
+ void SetFormat(BOOL bSet){bFormat = bSet;}
};
#endif
diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx
index e57cf394183f..60b9ecc90239 100644
--- a/sw/source/ui/inc/drwbassh.hxx
+++ b/sw/source/ui/inc/drwbassh.hxx
@@ -2,7 +2,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
@@ -37,11 +37,11 @@ struct SvxSwFrameValidation;
class SwDrawBaseShell: public SwBaseShell
{
- SwDrawBase* pDrawActual;
+ SwDrawBase* pDrawActual;
- UINT16 eDrawMode;
- BOOL bRotate : 1;
- BOOL bSelMove: 1;
+ UINT16 eDrawMode;
+ BOOL bRotate : 1;
+ BOOL bSelMove: 1;
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
@@ -52,12 +52,12 @@ public:
SFX_DECL_INTERFACE(SW_DRAWBASESHELL)
TYPEINFO();
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
- void DisableState(SfxItemSet &rSet) { Disable(rSet);}
- BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void DisableState(SfxItemSet &rSet) { Disable(rSet);}
+ BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0);
- void StateStatusline(SfxItemSet &rSet);
+ void StateStatusline(SfxItemSet &rSet);
};
diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx
index a77eadf598b1..115bae7fa76c 100644
--- a/sw/source/ui/inc/drwtxtsh.hxx
+++ b/sw/source/ui/inc/drwtxtsh.hxx
@@ -2,7 +2,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
@@ -38,49 +38,49 @@ class SfxModule;
class SwDrawTextShell: public SfxShell
{
- SwView &rView;
+ SwView &rView;
- SdrView *pSdrView;
+ SdrView *pSdrView;
- BOOL bRotate : 1;
- BOOL bSelMove: 1;
+ BOOL bRotate : 1;
+ BOOL bSelMove: 1;
- void SetAttrToMarked(const SfxItemSet& rAttr);
+ void SetAttrToMarked(const SfxItemSet& rAttr);
void InsertSymbol(SfxRequest& rReq);
- BOOL IsTextEdit();
+ BOOL IsTextEdit();
public:
SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
TYPEINFO();
- SwView &GetView() { return rView; }
+ SwView &GetView() { return rView; }
SwWrtShell &GetShell();
SwDrawTextShell(SwView &rView);
- virtual ~SwDrawTextShell();
+ virtual ~SwDrawTextShell();
virtual SfxUndoManager* GetUndoManager();
void StateDisableItems(SfxItemSet &);
- void Execute(SfxRequest &);
- void ExecDraw(SfxRequest &);
- void GetState(SfxItemSet &);
- void GetDrawTxtCtrlState(SfxItemSet&);
+ void Execute(SfxRequest &);
+ void ExecDraw(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void GetDrawTxtCtrlState(SfxItemSet&);
- void ExecFontWork(SfxRequest& rReq);
- void StateFontWork(SfxItemSet& rSet);
- void ExecFormText(SfxRequest& rReq);
- void GetFormTextState(SfxItemSet& rSet);
- void ExecDrawLingu(SfxRequest &rReq);
- void ExecUndo(SfxRequest &rReq);
- void StateUndo(SfxItemSet &rSet);
- void ExecClpbrd(SfxRequest &rReq);
- void StateClpbrd(SfxItemSet &rSet);
- void StateInsert(SfxItemSet &rSet);
- void ExecTransliteration(SfxRequest &);
+ void ExecFontWork(SfxRequest& rReq);
+ void StateFontWork(SfxItemSet& rSet);
+ void ExecFormText(SfxRequest& rReq);
+ void GetFormTextState(SfxItemSet& rSet);
+ void ExecDrawLingu(SfxRequest &rReq);
+ void ExecUndo(SfxRequest &rReq);
+ void StateUndo(SfxItemSet &rSet);
+ void ExecClpbrd(SfxRequest &rReq);
+ void StateClpbrd(SfxItemSet &rSet);
+ void StateInsert(SfxItemSet &rSet);
+ void ExecTransliteration(SfxRequest &);
- void Init();
- void StateStatusline(SfxItemSet &rSet);
+ void Init();
+ void StateStatusline(SfxItemSet &rSet);
};
#endif
diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/ui/inc/dselect.hxx
index 68af7d2a9366..40d559a2afea 100644
--- a/sw/source/ui/inc/dselect.hxx
+++ b/sw/source/ui/inc/dselect.hxx
@@ -2,7 +2,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
@@ -44,11 +44,11 @@ class DrawSelection : public SwDrawBase
// Mouse- & Key-Events
virtual BOOL KeyInput(const KeyEvent& rKEvt);
- virtual void Activate(const USHORT nSlotId); // Function aktivieren
+ virtual void Activate(const USHORT nSlotId); // Function aktivieren
};
-#endif // _SW_DSELECT_HXX
+#endif // _SW_DSELECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 3cc702f8cd3b..b139e723d6f4 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -2,7 +2,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
@@ -38,47 +38,47 @@
#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx>
-class SwWrtShell;
-class SwView;
-class SwRect;
-class ViewShell;
-class SwAnchorMarker;
-class SdrObject;
-class SwShadowCursor;
-class DataChangedEvent;
+class SwWrtShell;
+class SwView;
+class SwRect;
+class ViewShell;
+class SwAnchorMarker;
+class SdrObject;
+class SwShadowCursor;
+class DataChangedEvent;
class SvxAutoCorrCfg;
class SvxAutoCorrect;
class SwPaM;
-struct SwApplyTemplate;
-struct QuickHelpData;
+struct SwApplyTemplate;
+struct QuickHelpData;
class SdrDropMarkerOverlay;
/*--------------------------------------------------------------------
- Beschreibung: Eingabe-Fenster
+ Beschreibung: Eingabe-Fenster
--------------------------------------------------------------------*/
class SwEditWin: public Window,
public DropTargetHelper, public DragSourceHelper
{
-friend void ScrollMDI(ViewShell* pVwSh, const SwRect&,
+friend void ScrollMDI(ViewShell* pVwSh, const SwRect&,
USHORT nRangeX, USHORT nRangeY);
-friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&);
+friend BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect&);
-friend void SizeNotify(ViewShell* pVwSh, const Size &);
+friend void SizeNotify(ViewShell* pVwSh, const Size &);
-friend void PageNumNotify( ViewShell* pVwSh,
+friend void PageNumNotify( ViewShell* pVwSh,
USHORT nPhyNum,
USHORT nVirtNum,
const String& rPg );
static QuickHelpData* pQuickHlpData;
- static BOOL bReplaceQuote;
- static long nDDStartPosX, nDDStartPosY;
+ static BOOL bReplaceQuote;
+ static long nDDStartPosX, nDDStartPosY;
- static Color aTextColor; //Textfarbe, fuer die Giesskanne
- static BOOL bTransparentBackColor; // Hintergrund transparent
- static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne
+ static Color aTextColor; //Textfarbe, fuer die Giesskanne
+ static BOOL bTransparentBackColor; // Hintergrund transparent
+ static Color aTextBackColor; //Texthintergrundfarbe, fuer die Giesskanne
/*
* Timer und Handler fuer das Weiterscrollen, wenn der
@@ -86,82 +86,82 @@ friend void PageNumNotify( ViewShell* pVwSh,
* EditWin stehen bleibt. In regelmaessigen Intervallen wird
* die Selektion in Richtung der Mausposition vergroessert.
*/
- AutoTimer aTimer;
+ AutoTimer aTimer;
// Timer fuer verschachtelte KeyInputs (z.B. fuer Tabellen)
- Timer aKeyInputTimer;
+ Timer aKeyInputTimer;
// timer for ANY-KeyInut question without a following KeyInputEvent
- Timer aKeyInputFlushTimer;
+ Timer aKeyInputFlushTimer;
- String aInBuffer;
+ String aInBuffer;
LanguageType eBufferLanguage;
- Point aStartPos;
- Point aMovePos;
- Point aRszMvHdlPt;
- Timer aTemplateTimer;
+ Point aStartPos;
+ Point aMovePos;
+ Point aRszMvHdlPt;
+ Timer aTemplateTimer;
// Type/Objecte ueber dem der MousePointer steht
SwCallMouseEvent aSaveCallEvent;
- SwApplyTemplate *pApplyTempl;
- SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers
+ SwApplyTemplate *pApplyTempl;
+ SwAnchorMarker *pAnchorMarker; // zum Verschieben eines Ankers
- SdrDropMarkerOverlay *pUserMarker;
- SdrObject *pUserMarkerObj;
- SwShadowCursor *pShadCrsr;
- Point *pRowColumnSelectionStart; // save position where table row/column selection has been started
+ SdrDropMarkerOverlay *pUserMarker;
+ SdrObject *pUserMarkerObj;
+ SwShadowCursor *pShadCrsr;
+ Point *pRowColumnSelectionStart; // save position where table row/column selection has been started
- SwView &rView;
+ SwView &rView;
- int aActHitType; // aktueller Mauspointer
+ int aActHitType; // aktueller Mauspointer
ULONG m_nDropFormat; //Format aus dem letzten QueryDrop
USHORT m_nDropAction; //Action aus dem letzten QueryDrop
USHORT m_nDropDestination; //Ziel aus dem letzten QueryDrop
- UINT16 eBezierMode;
- UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen
- SdrObjKind eDrawMode;
- BOOL bLinkRemoved : 1,
- bMBPressed : 1,
- bInsDraw : 1,
- bInsFrm : 1,
- bIsInMove : 1,
- bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren
- bOldIdle : 1, //Zum abschalten des Idle'ns
- bOldIdleSet : 1, //waehrend QeueryDrop
- bTblInsDelMode : 1, //
- bTblIsInsMode : 1, //
- bTblIsColMode : 1, //
- bChainMode : 1, //Rahmen verbinden
- bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an
+ UINT16 eBezierMode;
+ UINT16 nInsFrmColCount; //Spaltenzahl fuer interaktiven Rahmen
+ SdrObjKind eDrawMode;
+ BOOL bLinkRemoved : 1,
+ bMBPressed : 1,
+ bInsDraw : 1,
+ bInsFrm : 1,
+ bIsInMove : 1,
+ bIsInDrag : 1, //StartExecuteDrag nich doppelt ausfuehren
+ bOldIdle : 1, //Zum abschalten des Idle'ns
+ bOldIdleSet : 1, //waehrend QeueryDrop
+ bTblInsDelMode : 1, //
+ bTblIsInsMode : 1, //
+ bTblIsColMode : 1, //
+ bChainMode : 1, //Rahmen verbinden
+ bWasShdwCrsr : 1, //ShadowCrsr war im MouseButtonDown an
bLockInput : 1, //Lock waehrend die Rechenleiste aktiv ist
bIsRowDrag : 1, //selection of rows is used, in combination with pRowColumnSelectionStart
/** #i42732# display status of font size/name depending on either the input language or the
selection position depending on what has changed lately
*/
bUseInputLanguage: 1,
- bObjectSelect : 1;
+ bObjectSelect : 1;
USHORT nKS_NUMDOWN_Count; // #i23725#
USHORT nKS_NUMINDENTINC_Count;
- void LeaveArea(const Point &);
- void JustifyAreaTimer();
- inline void EnterArea();
+ void LeaveArea(const Point &);
+ void JustifyAreaTimer();
+ inline void EnterArea();
- void RstMBDownFlags();
+ void RstMBDownFlags();
- void ChangeFly( BYTE nDir, BOOL bWeb = FALSE );
+ void ChangeFly( BYTE nDir, BOOL bWeb = FALSE );
void ChangeDrawing( BYTE nDir );
- BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos);
+ BOOL EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos);
BOOL RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode);
//Hilfsfunktionen fuer D&D
- void DropCleanup();
- void CleanupDropUserMarker();
- USHORT GetDropDestination( const Point& rPixPnt,
+ void DropCleanup();
+ void CleanupDropUserMarker();
+ USHORT GetDropDestination( const Point& rPixPnt,
SdrObject ** ppObj = 0 );
//select the object/cursor at the mouse position of the context menu request
BOOL SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos );
@@ -173,8 +173,8 @@ friend void PageNumNotify( ViewShell* pVwSh,
* vergroessert.
*/
DECL_LINK( TimerHandler, Timer * );
- void StartDDTimer();
- void StopDDTimer(SwWrtShell *, const Point &);
+ void StartDDTimer();
+ void StopDDTimer(SwWrtShell *, const Point &);
DECL_LINK( DDHandler, Timer * );
// timer for ANY-KeyInut question without a following KeyInputEvent
@@ -190,90 +190,90 @@ friend void PageNumNotify( ViewShell* pVwSh,
protected:
- virtual void DataChanged( const DataChangedEvent& );
- virtual void PrePaint();
- virtual void Paint( const Rectangle& rRect );
- virtual void KeyInput(const KeyEvent &rKEvt);
+ virtual void DataChanged( const DataChangedEvent& );
+ virtual void PrePaint();
+ virtual void Paint( const Rectangle& rRect );
+ virtual void KeyInput(const KeyEvent &rKEvt);
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual void GetFocus();
+ virtual void LoseFocus();
- virtual void MouseMove(const MouseEvent& rMEvt);
- virtual void MouseButtonDown(const MouseEvent& rMEvt);
- virtual void MouseButtonUp(const MouseEvent& rMEvt);
- virtual void RequestHelp(const HelpEvent& rEvt);
+ virtual void MouseMove(const MouseEvent& rMEvt);
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual void MouseButtonUp(const MouseEvent& rMEvt);
+ virtual void RequestHelp(const HelpEvent& rEvt);
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void Command( const CommandEvent& rCEvt );
// Drag & Drop Interface
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
virtual XubString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
-
+
void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg,
SvxAutoCorrect* pACorr, sal_Bool bFromIME = sal_False );
public:
- void UpdatePointer(const Point &, USHORT nButtons = 0);
+ void UpdatePointer(const Point &, USHORT nButtons = 0);
- BOOL IsDrawSelMode();
- BOOL IsDrawAction() { return (bInsDraw); }
- void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; }
+ BOOL IsDrawSelMode();
+ BOOL IsDrawAction() { return (bInsDraw); }
+ void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; }
- void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; }
- BOOL IsObjectSelect() const { return bObjectSelect; }
+ void SetObjectSelect( BOOL bVal ) { bObjectSelect = bVal; }
+ BOOL IsObjectSelect() const { return bObjectSelect; }
- inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; }
- inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); }
- void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect );
+ inline SdrObjKind GetSdrDrawMode(/*BOOL bBuf = FALSE*/) const { return eDrawMode; }
+ inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( FALSE ); }
+ void StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect );
- BOOL IsFrmAction() { return (bInsFrm); }
- inline UINT16 GetBezierMode() { return eBezierMode; }
- void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; }
- void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten
- void InsFrm(USHORT nCols);
- void StopInsFrm();
- UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen
+ BOOL IsFrmAction() { return (bInsFrm); }
+ inline UINT16 GetBezierMode() { return eBezierMode; }
+ void SetBezierMode(UINT16 eBezMode) { eBezierMode = eBezMode; }
+ void EnterDrawTextMode(const Point& aDocPos); // DrawTextEditMode einschalten
+ void InsFrm(USHORT nCols);
+ void StopInsFrm();
+ UINT16 GetFrmColCount() const {return nInsFrmColCount;} //Spaltenzahl fuer interaktiven Rahmen
- void SetChainMode( BOOL bOn );
- BOOL IsChainMode() const { return bChainMode; }
+ void SetChainMode( BOOL bOn );
+ BOOL IsChainMode() const { return bChainMode; }
void FlushInBuffer();
BOOL IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const;
- static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; }
- static BOOL IsReplaceQuote() { return bReplaceQuote; }
+ static void SetReplaceQuote(BOOL bOn = TRUE) { bReplaceQuote = bOn; }
+ static BOOL IsReplaceQuote() { return bReplaceQuote; }
- void SetApplyTemplate(const SwApplyTemplate &);
+ void SetApplyTemplate(const SwApplyTemplate &);
SwApplyTemplate* GetApplyTemplate() const { return pApplyTempl; }
- void StartExecuteDrag();
- void DragFinished();
+ void StartExecuteDrag();
+ void DragFinished();
USHORT GetDropAction() const { return m_nDropAction; }
ULONG GetDropFormat() const { return m_nDropFormat; }
- Color GetTextColor() { return aTextColor; }
+ Color GetTextColor() { return aTextColor; }
- void SetTextColor(const Color& rCol ) { aTextColor = rCol; }
+ void SetTextColor(const Color& rCol ) { aTextColor = rCol; }
- Color GetTextBackColor()
+ Color GetTextBackColor()
{ return aTextBackColor; }
- void SetTextBackColor(const Color& rCol )
+ void SetTextBackColor(const Color& rCol )
{ aTextBackColor = rCol; }
- void SetTextBackColorTransparent(BOOL bSet)
+ void SetTextBackColorTransparent(BOOL bSet)
{ bTransparentBackColor = bSet; }
- BOOL IsTextBackColorTransparent()
+ BOOL IsTextBackColorTransparent()
{ return bTransparentBackColor; }
- void LockKeyInput(BOOL bSet){bLockInput = bSet;}
+ void LockKeyInput(BOOL bSet){bLockInput = bSet;}
const SwView &GetView() const { return rView; }
- SwView &GetView() { return rView; }
+ SwView &GetView() { return rView; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -283,8 +283,8 @@ public:
static inline long GetDDStartPosX() { return nDDStartPosX; }
static inline long GetDDStartPosY() { return nDDStartPosY; }
- static void _InitStaticData();
- static void _FinitStaticData();
+ static void _InitStaticData();
+ static void _FinitStaticData();
//#i3370# remove quick help to prevent saving of autocorrection suggestions
void StopQuickHelp();
diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx
index d086b5bb8e2a..03f6277c0015 100644
--- a/sw/source/ui/inc/envimg.hxx
+++ b/sw/source/ui/inc/envimg.hxx
@@ -2,7 +2,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
@@ -52,16 +52,16 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem
public:
rtl::OUString aAddrText; // Text fuer Empfaenger
- sal_Bool bSend; // Absender?
- rtl::OUString aSendText; // Text fuer Absender
+ sal_Bool bSend; // Absender?
+ rtl::OUString aSendText; // Text fuer Absender
sal_Int32 lAddrFromLeft; // Linker Abstand fuer Empfaenger (twips)
sal_Int32 lAddrFromTop; // Oberer Abstand fuer Empfaenger (twips)
sal_Int32 lSendFromLeft; // Linker Abstand fuer Absender (twips)
sal_Int32 lSendFromTop; // Oberer Abstand fuer Absender (twips)
sal_Int32 lWidth; // Breite des Umschlags (twips)
sal_Int32 lHeight; // Hoehe des Umschlags (twips)
- SwEnvAlign eAlign; // Ausrichtung beim Einzug
- sal_Bool bPrintFromAbove; // Von oben drucken?
+ SwEnvAlign eAlign; // Ausrichtung beim Einzug
+ sal_Bool bPrintFromAbove; // Von oben drucken?
sal_Int32 lShiftRight; // Verschiebung nach rechts (twips)
sal_Int32 lShiftDown; // Verschiebung nach unten (twips)
@@ -76,7 +76,7 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
// class SwEnvCfgItem -------------------------------------------------------
@@ -91,7 +91,7 @@ public:
SwEnvItem& GetItem() {return aEnvItem;}
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
};
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx
index 470edbf2661b..62b3df48e9df 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/ui/inc/envlop.hxx
@@ -2,7 +2,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
@@ -71,16 +71,16 @@ friend class SwEnvFmtPage;
friend class SwEnvPrtPage;
friend class SwEnvPreview;
- String sInsert;
- String sChange;
- SwEnvItem aEnvItem;
- SwWrtShell *pSh;
- Printer *pPrinter;
- SfxItemSet *pAddresseeSet;
- SfxItemSet *pSenderSet;
+ String sInsert;
+ String sChange;
+ SwEnvItem aEnvItem;
+ SwWrtShell *pSh;
+ Printer *pPrinter;
+ SfxItemSet *pAddresseeSet;
+ SfxItemSet *pSenderSet;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
- virtual short Ok();
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual short Ok();
public:
SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert);
@@ -92,13 +92,13 @@ class SwEnvPage : public SfxTabPage
{
FixedText aAddrText;
MultiLineEdit aAddrEdit;
- FixedText aDatabaseFT;
- ListBox aDatabaseLB;
- FixedText aTableFT;
- ListBox aTableLB;
+ FixedText aDatabaseFT;
+ ListBox aDatabaseLB;
+ FixedText aTableFT;
+ ListBox aTableLB;
ImageButton aInsertBT;
- FixedText aDBFieldFT;
- ListBox aDBFieldLB;
+ FixedText aDBFieldFT;
+ ListBox aDBFieldLB;
CheckBox aSenderBox;
MultiLineEdit aSenderEdit;
SwEnvPreview aPreview;
diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx
index 47b85163e7a7..7a32185a709f 100644
--- a/sw/source/ui/inc/fldedt.hxx
+++ b/sw/source/ui/inc/fldedt.hxx
@@ -2,7 +2,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
@@ -38,13 +38,13 @@ class SwFldEditDlg : public SfxSingleTabDialog
SwWrtShell* pSh;
ImageButton aPrevBT;
ImageButton aNextBT;
- PushButton aAddressBT;
+ PushButton aAddressBT;
DECL_LINK( AddressHdl, PushButton *pBt = 0 );
DECL_LINK( NextPrevHdl, Button *pBt = 0 );
- void Init();
- SfxTabPage* CreatePage(USHORT nGroup);
+ void Init();
+ SfxTabPage* CreatePage(USHORT nGroup);
public:
@@ -53,10 +53,10 @@ public:
DECL_LINK( OKHdl, Button * );
- virtual short Execute();
+ virtual short Execute();
- void EnableInsert(BOOL bEnable);
- void InsertHdl();
+ void EnableInsert(BOOL bEnable);
+ void InsertHdl();
};
#endif
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index da36b2ebed85..85afff1957d1 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -2,7 +2,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
@@ -114,21 +114,21 @@ struct SwInsertFld_Data
class SW_DLLPUBLIC SwFldMgr
{
private:
- SwField* pCurFld;
- SbModule* pModule;
- const SvxMacroItem* pMacroItem;
- SwWrtShell* pWrtShell; // darf auch NULL sein!
- String aCurPar1;
- String aCurPar2;
- String sCurFrame;
+ SwField* pCurFld;
+ SbModule* pModule;
+ const SvxMacroItem* pMacroItem;
+ SwWrtShell* pWrtShell; // darf auch NULL sein!
+ String aCurPar1;
+ String aCurPar2;
+ String sCurFrame;
String sMacroPath;
String sMacroName;
- ULONG nCurFmt;
- BOOL bEvalExp;
+ ULONG nCurFmt;
+ BOOL bEvalExp;
- SW_DLLPRIVATE USHORT GetCurrLanguage() const;
+ SW_DLLPRIVATE USHORT GetCurrLanguage() const;
com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
@@ -139,13 +139,13 @@ public:
~SwFldMgr();
void SetWrtShell( SwWrtShell* pShell )
- { pWrtShell = pShell; }
-
+ { pWrtShell = pShell; }
+
// Feld einfuegen ueber TypeId (TYP_ ...)
BOOL InsertFld( const SwInsertFld_Data& rData );
// Direkt das aktuelle Feld aendern
- void UpdateCurFld(ULONG nFormat,
+ void UpdateCurFld(ULONG nFormat,
const String& rPar1,
const String& rPar2,
SwField * _pField = 0); // #111840#
@@ -155,44 +155,44 @@ public:
inline ULONG GetCurFldFmt() const;
// Ein Feld ermitteln
- SwField* GetCurFld();
+ SwField* GetCurFld();
- void InsertFldType(SwFieldType& rType);
+ void InsertFldType(SwFieldType& rType);
- BOOL ChooseMacro(const String &rSelMacro = aEmptyStr);
- void SetMacroPath(const String& rPath);
- inline const String& GetMacroPath() const { return (sMacroPath); }
- inline const String& GetMacroName() const { return (sMacroName); }
- inline void SetMacroModule(SbModule* pMod) { pModule = pMod; }
+ BOOL ChooseMacro(const String &rSelMacro = aEmptyStr);
+ void SetMacroPath(const String& rPath);
+ inline const String& GetMacroPath() const { return (sMacroPath); }
+ inline const String& GetMacroName() const { return (sMacroName); }
+ inline void SetMacroModule(SbModule* pMod) { pModule = pMod; }
// Vorheriger Naechster gleichen Typ
BOOL GoNextPrev( BOOL bNext = TRUE, SwFieldType* pTyp = 0 );
- BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); }
- BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); }
+ BOOL GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( TRUE, pTyp ); }
+ BOOL GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( FALSE, pTyp ); }
// Erfragen von Werten aus Datenbankfeldern (BASIC )
-// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh);
- BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName,
+// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh);
+ BOOL IsDBNumeric(const String& rDBName, const String& rTblQryName,
BOOL bIsTable, const String& rFldName);
// RefMark mit Namen organisieren
- BOOL CanInsertRefMark( const String& rStr );
+ BOOL CanInsertRefMark( const String& rStr );
// Zugriff ueber ResId auf Feldtypen
- USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const;
- SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const;
- SwFieldType* GetFldType(USHORT nResId, const String& rName) const;
+ USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX) const;
+ SwFieldType* GetFldType(USHORT nResId, USHORT nId = 0) const;
+ SwFieldType* GetFldType(USHORT nResId, const String& rName) const;
- void RemoveFldType(USHORT nResId, const String& rName);
+ void RemoveFldType(USHORT nResId, const String& rName);
// Zugriff ueber TypeId aus dem Dialog
// Ids fuer einen Bereich von Feldern
const SwFldGroupRgn& GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const;
- USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const;
+ USHORT GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType = 0) const;
// TypeId des aktuellen Feldes
- USHORT GetCurTypeId() const;
+ USHORT GetCurTypeId() const;
// TypeId fuer einen konkrete Pos in der Liste
static USHORT GetTypeId(USHORT nPos);
@@ -206,16 +206,16 @@ public:
BOOL GetSubTypes(USHORT nId, SvStringsDtor& rToFill);
// Formate zu einem Typ
- USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const;
- String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const;
- USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const;
- ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
+ USHORT GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode = FALSE) const;
+ String GetFormatStr(USHORT nTypeId, ULONG nFormatId) const;
+ USHORT GetFormatId(USHORT nTypeId, ULONG nFormatId) const;
+ ULONG GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
// Evaluierung der ExpressionFelder ausschalten fuer das Einfuegen
// vieler Expressionfelder (siehe Etiketten)
//
- inline void SetEvalExpFlds(BOOL bEval);
- void EvalExpFlds(SwWrtShell* pSh = NULL);
+ inline void SetEvalExpFlds(BOOL bEval);
+ void EvalExpFlds(SwWrtShell* pSh = NULL);
};
inline void SwFldMgr::SetEvalExpFlds(BOOL bEval)
diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx
index e8959a98e123..61ee679d3cb3 100644
--- a/sw/source/ui/inc/fldtdlg.hxx
+++ b/sw/source/ui/inc/fldtdlg.hxx
@@ -2,7 +2,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
@@ -41,12 +41,12 @@ class SwFldDlg: public SfxTabDialog
BOOL m_bHtmlMode;
BOOL m_bDataBaseMode;
- virtual BOOL Close();
- virtual SfxItemSet* CreateInputItemSet( USHORT nId );
- virtual void Activate();
+ virtual BOOL Close();
+ virtual SfxItemSet* CreateInputItemSet( USHORT nId );
+ virtual void Activate();
virtual void PageCreated(USHORT nId, SfxTabPage& rPage);
- void ReInitTabPage( USHORT nPageId,
+ void ReInitTabPage( USHORT nPageId,
BOOL bOnlyActivate = FALSE );
public:
@@ -55,10 +55,10 @@ public:
DECL_LINK( OKHdl, Button * );
- void Initialize(SfxChildWinInfo *pInfo);
- void ReInitDlg();
- void EnableInsert(BOOL bEnable);
- void InsertHdl();
+ void Initialize(SfxChildWinInfo *pInfo);
+ void ReInitDlg();
+ void EnableInsert(BOOL bEnable);
+ void InsertHdl();
void ActivateDatabasePage();
};
diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx
index 54479e9b232b..88ecbbea0ad1 100644
--- a/sw/source/ui/inc/fldwrap.hxx
+++ b/sw/source/ui/inc/fldwrap.hxx
@@ -2,7 +2,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
@@ -40,8 +40,8 @@ public:
SFX_DECL_CHILDWINDOW(SwFldDlgWrapper);
- virtual BOOL ReInitDlg(SwDocShell *pDocSh);
- void ShowPage(USHORT nPage = 0);
+ virtual BOOL ReInitDlg(SwDocShell *pDocSh);
+ void ShowPage(USHORT nPage = 0);
};
/* -----------------04.02.2003 14:14-----------------
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 554c5ccc88c4..7ffbe2eb9200 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -2,7 +2,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
@@ -85,7 +85,7 @@ public:
SwStdFontConfig();
~SwStdFontConfig();
- virtual void Commit();
+ virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
const String& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
@@ -111,7 +111,7 @@ public:
void SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType )
{ ChangeInt(nFont + FONT_PER_GROUP * nScriptType, nHeight);}
-
+
sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang );
static String GetDefaultFor(USHORT nFontType, LanguageType eLang);
diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx
index 07891a0b5874..0de096964c3f 100644
--- a/sw/source/ui/inc/formatclipboard.hxx
+++ b/sw/source/ui/inc/formatclipboard.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx
index f303f1e6f1d7..835b67d4b556 100644
--- a/sw/source/ui/inc/formedt.hxx
+++ b/sw/source/ui/inc/formedt.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ class SwWrtShell;
class SwForm;
/*--------------------------------------------------------------------
- Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
+ Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
--------------------------------------------------------------------*/
class SwIdxFormDlg : public SvxStandardDialog
{
@@ -58,38 +58,38 @@ class SwIdxFormDlg : public SvxStandardDialog
DECL_LINK( DoubleClickHdl, Button * );
DECL_LINK( ModifyHdl, Edit * );
DECL_LINK( AssignHdl, Button * );
- void UpdatePattern();
- void Apply();
+ void UpdatePattern();
+ void Apply();
- ListBox aEntryLB;
- OKButton aOKBtn;
- CancelButton aCancelBT;
- FixedText aLevelFT;
- Edit aEntryED;
- PushButton aEntryBT;
- PushButton aTabBT;
- PushButton aPageBT;
- PushButton aJumpBT;
+ ListBox aEntryLB;
+ OKButton aOKBtn;
+ CancelButton aCancelBT;
+ FixedText aLevelFT;
+ Edit aEntryED;
+ PushButton aEntryBT;
+ PushButton aTabBT;
+ PushButton aPageBT;
+ PushButton aJumpBT;
FixedLine aEntryFL;
- FixedText aLevelFT2;
- ListBox aLevelLB;
- FixedText aTemplateFT;
- ListBox aParaLayLB;
- PushButton aStdBT;
- PushButton aAssignBT;
+ FixedText aLevelFT2;
+ ListBox aLevelLB;
+ FixedText aTemplateFT;
+ ListBox aParaLayLB;
+ PushButton aStdBT;
+ PushButton aAssignBT;
FixedLine aFormatFL;
- SwWrtShell &rSh;
- SwForm *pForm;
- USHORT nAktLevel;
- BOOL bLastLinkIsEnd;
+ SwWrtShell &rSh;
+ SwForm *pForm;
+ USHORT nAktLevel;
+ BOOL bLastLinkIsEnd;
public:
SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
~SwIdxFormDlg();
- static BOOL IsNoNum(SwWrtShell& rSh, const String& rName);
- const SwForm& GetTOXForm();
+ static BOOL IsNoNum(SwWrtShell& rSh, const String& rName);
+ const SwForm& GetTOXForm();
};
inline const SwForm& SwIdxFormDlg::GetTOXForm()
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx
index d5e8b484384e..a94d961719ff 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/ui/inc/frmdlg.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
class SwWrtShell;
/*--------------------------------------------------------------------
- Beschreibung: Rahmendialog
+ Beschreibung: Rahmendialog
--------------------------------------------------------------------*/
class SwFrmDlg : public SfxTabDialog
{
@@ -49,13 +49,13 @@ class SwFrmDlg : public SfxTabDialog
virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
public:
- SwFrmDlg( SfxViewFrame *pFrame, Window *pParent,
+ SwFrmDlg( SfxViewFrame *pFrame, Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bNewFrm = TRUE,
- USHORT nResType = DLG_FRM_STD,
- BOOL bFmt = FALSE,
- UINT16 nDefPage = 0,
- const String* pFmtStr = 0);
+ BOOL bNewFrm = TRUE,
+ USHORT nResType = DLG_FRM_STD,
+ BOOL bFmt = FALSE,
+ UINT16 nDefPage = 0,
+ const String* pFmtStr = 0);
~SwFrmDlg();
diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx
index de84a1ba1061..e13b820802b5 100644
--- a/sw/source/ui/inc/frmmgr.hxx
+++ b/sw/source/ui/inc/frmmgr.hxx
@@ -2,7 +2,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
@@ -38,42 +38,42 @@
#include <fmtanchr.hxx>
#include "swdllapi.h"
-class SwWrtShell;
+class SwWrtShell;
struct SvxSwFrameValidation;
struct SwPosition;
-class SwFmt;
-class SwFmtCol;
+class SwFmt;
+class SwFmtCol;
-const SwTwips DFLT_WIDTH = MM50 * 4;
-const SwTwips DFLT_HEIGHT = MM50;
+const SwTwips DFLT_WIDTH = MM50 * 4;
+const SwTwips DFLT_HEIGHT = MM50;
-#define FULL_ATTRSET 0xffff
+#define FULL_ATTRSET 0xffff
-#define FRMMGR_TYPE_NONE 0x00
-#define FRMMGR_TYPE_TEXT 0x01
-#define FRMMGR_TYPE_GRF 0x02
-#define FRMMGR_TYPE_OLE 0x04
+#define FRMMGR_TYPE_NONE 0x00
+#define FRMMGR_TYPE_TEXT 0x01
+#define FRMMGR_TYPE_GRF 0x02
+#define FRMMGR_TYPE_OLE 0x04
#define FRMMGR_TYPE_LABEL 0x08
-#define FRMMGR_TYPE_ENVELP 0x10
+#define FRMMGR_TYPE_ENVELP 0x10
class SW_DLLPUBLIC SwFlyFrmAttrMgr
{
- SfxItemSet aSet;
- Point aAbsPos;
- SwWrtShell *pOwnSh;
+ SfxItemSet aSet;
+ Point aAbsPos;
+ SwWrtShell *pOwnSh;
- BOOL bAbsPos,
+ BOOL bAbsPos,
bNewFrm;
BOOL bIsInVertical;
// interne Verrechnung fuer Umrandung
- SW_DLLPRIVATE SwTwips CalcTopSpace();
- SW_DLLPRIVATE SwTwips CalcBottomSpace();
- SW_DLLPRIVATE SwTwips CalcLeftSpace();
- SW_DLLPRIVATE SwTwips CalcRightSpace();
+ SW_DLLPRIVATE SwTwips CalcTopSpace();
+ SW_DLLPRIVATE SwTwips CalcBottomSpace();
+ SW_DLLPRIVATE SwTwips CalcLeftSpace();
+ SW_DLLPRIVATE SwTwips CalcRightSpace();
- SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update
+ SW_DLLPRIVATE void _UpdateFlyFrm(); //Nacharbeit nach Einfuegen oder Update
public:
SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell* pSh, BYTE nType );
@@ -81,65 +81,65 @@ public:
//CopyCtor fuer die Dialoge, zum Pruefen der Metrics
SwFlyFrmAttrMgr( BOOL bNew, SwWrtShell *pSh, const SfxItemSet &rSet );
- inline SwWrtShell* GetShell() { return pOwnSh; }
+ inline SwWrtShell* GetShell() { return pOwnSh; }
- void SetAnchor(RndStdIds eId);
- inline RndStdIds GetAnchor() const;
+ void SetAnchor(RndStdIds eId);
+ inline RndStdIds GetAnchor() const;
void SetHorzOrientation(sal_Int16 eOrient);
void SetVertOrientation(sal_Int16 eOrient);
// Absolute Position
- void SetAbsPos(const Point& rLPoint);
+ void SetAbsPos(const Point& rLPoint);
// Relative Position vom Anker
- void SetPos(const Point& rLPoint);
- inline Point GetPos() const;
+ void SetPos(const Point& rLPoint);
+ inline Point GetPos() const;
// Groesse
- void SetSize(const Size& rLSize);
- inline const Size& GetSize() const;
+ void SetSize(const Size& rLSize);
+ inline const Size& GetSize() const;
- inline USHORT GetHeightPercent() const;
+ inline USHORT GetHeightPercent() const;
void SetHeightSizeType(SwFrmSize eType);
// Abstand zum Inhalt
- void SetLRSpace( long nLeft = LONG_MAX,
+ void SetLRSpace( long nLeft = LONG_MAX,
long nRight = LONG_MAX );
- void SetULSpace( long nTop = LONG_MAX,
+ void SetULSpace( long nTop = LONG_MAX,
long nBottom= LONG_MAX );
- void SetCol( const SwFmtCol &rCol);
+ void SetCol( const SwFmtCol &rCol);
// Attribute aendern und erfragen
- void UpdateAttrMgr();
- void UpdateFlyFrm();
+ void UpdateAttrMgr();
+ void UpdateFlyFrm();
// neuen Rahmen erzeugen
- BOOL InsertFlyFrm();
- void InsertFlyFrm(RndStdIds eAnchorType,
- const Point &rPos,
- const Size &rSize,
- BOOL bAbsPos = FALSE);
+ BOOL InsertFlyFrm();
+ void InsertFlyFrm(RndStdIds eAnchorType,
+ const Point &rPos,
+ const Size &rSize,
+ BOOL bAbsPos = FALSE);
// Metriken pruefen und aendern
void ValidateMetrics(SvxSwFrameValidation& rVal,
const SwPosition* pToCharCntntPos,
BOOL bOnlyPercentRefValue = FALSE);
- void DelAttr(USHORT nId);
+ void DelAttr(USHORT nId);
// Set rausreichen
inline const SfxItemSet &GetAttrSet() const { return aSet; }
- inline SfxItemSet &GetAttrSet() { return aSet; }
- void SetAttrSet(const SfxItemSet& rSet);
+ inline SfxItemSet &GetAttrSet() { return aSet; }
+ void SetAttrSet(const SfxItemSet& rSet);
inline const SwFmtVertOrient &GetVertOrient() const;
inline const SwFmtHoriOrient &GetHoriOrient() const;
inline const SvxShadowItem &GetShadow() const;
- inline const SvxBoxItem &GetBox() const;
- inline const SwFmtSurround &GetSurround() const;
+ inline const SvxBoxItem &GetBox() const;
+ inline const SwFmtSurround &GetSurround() const;
inline const SwFmtFrmSize &GetFrmSize() const;
long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); }
@@ -167,7 +167,7 @@ inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const
{
return ((SvxShadowItem&)aSet.Get(RES_SHADOW));
}
-inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const
+inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const
{
return ((SvxBoxItem&)aSet.Get(RES_BOX));
}
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 1e82d3d75574..dea90b5cbb52 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -2,7 +2,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
@@ -48,48 +48,48 @@ struct FrmMap;
struct SwPosition;
/*--------------------------------------------------------------------
- Beschreibung: Rahmendialog
+ Beschreibung: Rahmendialog
--------------------------------------------------------------------*/
class SwFrmPage: public SfxTabPage
{
// Size
- FixedText aWidthFT;
- FixedText aWidthAutoFT;
- PercentField aWidthED;
- CheckBox aRelWidthCB;
- CheckBox aAutoWidthCB;
- FixedText aHeightFT;
- FixedText aHeightAutoFT;
- PercentField aHeightED;
- CheckBox aRelHeightCB;
- CheckBox aAutoHeightCB;
- CheckBox aFixedRatioCB;
- PushButton aRealSizeBT;
+ FixedText aWidthFT;
+ FixedText aWidthAutoFT;
+ PercentField aWidthED;
+ CheckBox aRelWidthCB;
+ CheckBox aAutoWidthCB;
+ FixedText aHeightFT;
+ FixedText aHeightAutoFT;
+ PercentField aHeightED;
+ CheckBox aRelHeightCB;
+ CheckBox aAutoHeightCB;
+ CheckBox aFixedRatioCB;
+ PushButton aRealSizeBT;
FixedLine aSizeFL;
// Anker
FixedLine aTypeFL;
FixedLine aTypeSepFL;
- RadioButton aAnchorAtPageRB;
- RadioButton aAnchorAtParaRB;
- RadioButton aAnchorAtCharRB;
- RadioButton aAnchorAsCharRB;
- RadioButton aAnchorAtFrameRB;
+ RadioButton aAnchorAtPageRB;
+ RadioButton aAnchorAtParaRB;
+ RadioButton aAnchorAtCharRB;
+ RadioButton aAnchorAsCharRB;
+ RadioButton aAnchorAtFrameRB;
// Position
- FixedText aHorizontalFT;
- ListBox aHorizontalDLB;
- FixedText aAtHorzPosFT;
- MetricField aAtHorzPosED;
- FixedText aHoriRelationFT;
- ListBox aHoriRelationLB;
- CheckBox aMirrorPagesCB;
- FixedText aVerticalFT;
- ListBox aVerticalDLB;
- FixedText aAtVertPosFT;
- MetricField aAtVertPosED;
- FixedText aVertRelationFT;
- ListBox aVertRelationLB;
+ FixedText aHorizontalFT;
+ ListBox aHorizontalDLB;
+ FixedText aAtHorzPosFT;
+ MetricField aAtHorzPosED;
+ FixedText aHoriRelationFT;
+ ListBox aHoriRelationLB;
+ CheckBox aMirrorPagesCB;
+ FixedText aVerticalFT;
+ ListBox aVerticalDLB;
+ FixedText aAtVertPosFT;
+ MetricField aAtVertPosED;
+ FixedText aVertRelationFT;
+ ListBox aVertRelationLB;
// OD 02.10.2003 #i18732# - check box for new option 'FollowTextFlow'
CheckBox aFollowTextFlowCB;
FixedLine aPositionFL;
@@ -104,18 +104,18 @@ class SwFrmPage: public SfxTabPage
BOOL bAtVertPosModified;
BOOL bFormat;
- BOOL bNew;
- BOOL bNoModifyHdl;
+ BOOL bNew;
+ BOOL bNoModifyHdl;
BOOL bVerticalChanged; //check done whether frame is in vertical environment
BOOL bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged
BOOL bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
BOOL bHtmlMode;
USHORT nHtmlMode;
- USHORT nDlgType;
- Size aGrfSize;
- Size aWrap;
- SwTwips nUpperBorder;
- SwTwips nLowerBorder;
+ USHORT nDlgType;
+ Size aGrfSize;
+ Size aWrap;
+ SwTwips nUpperBorder;
+ SwTwips nLowerBorder;
double fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button
// OD 12.11.2003 #i22341# - keep content position of character for
@@ -132,7 +132,7 @@ class SwFrmPage: public SfxTabPage
FrmMap* pHMap;
virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual int DeactivatePage(SfxItemSet *pSet);
DECL_LINK( RangeModifyHdl, Edit * );
@@ -140,8 +140,8 @@ class SwFrmPage: public SfxTabPage
DECL_LINK( PosHdl, ListBox * );
DECL_LINK( RelHdl, ListBox * );
void InitPos(RndStdIds eId, USHORT nH, USHORT nHRel,
- USHORT nV, USHORT nVRel,
- long nX, long nY);
+ USHORT nV, USHORT nVRel,
+ long nX, long nY);
DECL_LINK( RealSizeHdl, Button * );
DECL_LINK( RelSizeClickHdl, CheckBox * );
@@ -151,10 +151,10 @@ class SwFrmPage: public SfxTabPage
DECL_LINK( AutoHeightClickHdl, void* );
// Beispiel aktualisieren
- void UpdateExample();
+ void UpdateExample();
DECL_LINK( ModifyHdl, Edit * );
- void Init(const SfxItemSet& rSet, BOOL bReset = FALSE);
+ void Init(const SfxItemSet& rSet, BOOL bReset = FALSE);
// OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous
// in the alignment.
USHORT FillPosLB( const FrmMap* _pMap,
@@ -174,7 +174,7 @@ class SwFrmPage: public SfxTabPage
short GetRelation(FrmMap *pMap, ListBox &rRelationLB);
RndStdIds GetAnchor();
- void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button
+ void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button
SwFrmPage(Window *pParent, const SfxItemSet &rSet);
~SwFrmPage();
@@ -190,40 +190,40 @@ public:
virtual BOOL FillItemSet(SfxItemSet &rSet);
virtual void Reset(const SfxItemSet &rSet);
- void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
- void SetFormatUsed(BOOL bFmt);
- void SetFrmType(USHORT nType) { nDlgType = nType; }
- inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; }
+ void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
+ void SetFormatUsed(BOOL bFmt);
+ void SetFrmType(USHORT nType) { nDlgType = nType; }
+ inline BOOL IsInGraficMode( void ) { return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; }
};
class SwGrfExtPage: public SfxTabPage
{
// Spiegeln
FixedLine aMirrorFL;
- CheckBox aMirrorVertBox;
- CheckBox aMirrorHorzBox;
- RadioButton aAllPagesRB;
- RadioButton aLeftPagesRB;
- RadioButton aRightPagesRB;
- BmpWindow aBmpWin;
+ CheckBox aMirrorVertBox;
+ CheckBox aMirrorHorzBox;
+ RadioButton aAllPagesRB;
+ RadioButton aLeftPagesRB;
+ RadioButton aRightPagesRB;
+ BmpWindow aBmpWin;
FixedLine aConnectFL;
- FixedText aConnectFT;
- Edit aConnectED;
- PushButton aBrowseBT;
+ FixedText aConnectFT;
+ Edit aConnectED;
+ PushButton aBrowseBT;
- String aFilterName;
- String aGrfName, aNewGrfName;
+ String aFilterName;
+ String aGrfName, aNewGrfName;
::sfx2::FileDialogHelper* pGrfDlg;
- BOOL bHtmlMode;
+ BOOL bHtmlMode;
// Handler fuer Spiegeln
DECL_LINK( MirrorHdl, CheckBox * );
DECL_LINK( BrowseHdl, Button * );
- virtual void ActivatePage(const SfxItemSet& rSet);
+ virtual void ActivatePage(const SfxItemSet& rSet);
SwGrfExtPage(Window *pParent, const SfxItemSet &rSet);
~SwGrfExtPage();
@@ -243,25 +243,25 @@ class SwFrmURLPage : public SfxTabPage
{
//Hyperlink
FixedLine aHyperLinkFL;
- FixedText aURLFT;
- Edit aURLED;
- PushButton aSearchPB;
- FixedText aNameFT;
- Edit aNameED;
- FixedText aFrameFT;
- ComboBox aFrameCB;
+ FixedText aURLFT;
+ Edit aURLED;
+ PushButton aSearchPB;
+ FixedText aNameFT;
+ Edit aNameED;
+ FixedText aFrameFT;
+ ComboBox aFrameCB;
//Image map
FixedLine aImageFL;
- CheckBox aServerCB;
- CheckBox aClientCB;
+ CheckBox aServerCB;
+ CheckBox aClientCB;
DECL_LINK( InsertFileHdl, PushButton * );
SwFrmURLPage(Window *pParent, const SfxItemSet &rSet);
~SwFrmURLPage();
-
+
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -275,23 +275,23 @@ public:
class SwFrmAddPage : public SfxTabPage
{
- FixedText aNameFT;
- Edit aNameED;
- FixedText aAltNameFT;
- Edit aAltNameED;
- FixedText aPrevFT;
+ FixedText aNameFT;
+ Edit aNameED;
+ FixedText aAltNameFT;
+ Edit aAltNameED;
+ FixedText aPrevFT;
ListBox aPrevLB;
- FixedText aNextFT;
+ FixedText aNextFT;
ListBox aNextLB;
FixedLine aNamesFL;
- CheckBox aProtectContentCB;
- CheckBox aProtectFrameCB;
- CheckBox aProtectSizeCB;
+ CheckBox aProtectContentCB;
+ CheckBox aProtectFrameCB;
+ CheckBox aProtectSizeCB;
FixedLine aProtectFL;
- CheckBox aEditInReadonlyCB;
- CheckBox aPrintFrameCB;
+ CheckBox aEditInReadonlyCB;
+ CheckBox aPrintFrameCB;
FixedText aTextFlowFT;
ListBox aTextFlowLB;
@@ -299,10 +299,10 @@ class SwFrmAddPage : public SfxTabPage
SwWrtShell* pWrtSh;
- USHORT nDlgType;
- BOOL bHtmlMode;
- BOOL bFormat;
- BOOL bNew;
+ USHORT nDlgType;
+ BOOL bHtmlMode;
+ BOOL bFormat;
+ BOOL bNew;
DECL_LINK(EditModifyHdl, Edit*);
DECL_LINK(ChainModifyHdl, ListBox*);
@@ -312,16 +312,16 @@ class SwFrmAddPage : public SfxTabPage
public:
- static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet);
- static USHORT* GetRanges();
+ static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet);
+ static USHORT* GetRanges();
virtual BOOL FillItemSet(SfxItemSet &rSet);
virtual void Reset(const SfxItemSet &rSet);
- void SetFormatUsed(BOOL bFmt);
- void SetFrmType(USHORT nType) { nDlgType = nType; }
- void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
- void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
+ void SetFormatUsed(BOOL bFmt);
+ void SetFrmType(USHORT nType) { nDlgType = nType; }
+ void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
+ void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
};
diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/ui/inc/frmsh.hxx
index 0e83ccbc6bf7..5eeb05538eda 100644
--- a/sw/source/ui/inc/frmsh.hxx
+++ b/sw/source/ui/inc/frmsh.hxx
@@ -2,7 +2,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
@@ -37,15 +37,15 @@ public:
SFX_DECL_INTERFACE(SW_FRAMESHELL)
SwFrameShell(SwView &rView);
- virtual ~SwFrameShell();
+ virtual ~SwFrameShell();
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
- void ExecFrameStyle(SfxRequest& rReq);
- void GetLineStyleState(SfxItemSet &rSet);
- void StateInsert(SfxItemSet &rSet);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void ExecFrameStyle(SfxRequest& rReq);
+ void GetLineStyleState(SfxItemSet &rSet);
+ void StateInsert(SfxItemSet &rSet);
- void StateStatusline(SfxItemSet &rSet);
+ void StateStatusline(SfxItemSet &rSet);
};
#endif
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index 4c71fff51b40..bb06c7157623 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -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
@@ -41,17 +41,17 @@
#define DLG_VIEW_HEADER (RC_FRMDLG_BEGIN + 8)
#define DLG_FORMAT_COLUMN (RC_FRMDLG_BEGIN + 10)
#define DLG_CAPTION (RC_FRMDLG_BEGIN + 11)
-#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12)
+#define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12)
-#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12)
-#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13)
+#define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12)
+#define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13)
#define STR_PATTERN_BRD (RC_FRMDLG_BEGIN + 13)
#define STR_SHPATTERN (RC_FRMDLG_BEGIN + 14)
#define STR_LNPATTERN (RC_FRMDLG_BEGIN + 15)
#define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16)
#define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17)
-#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18)
+#define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18)
#define BMP_PORTRAIT (RC_FRMDLG_BEGIN + 16)
#define BMP_LANDSCAPE (RC_FRMDLG_BEGIN + 17)
@@ -95,44 +95,44 @@
/*
#define STR_FRAME (STR_FRMDLG_BEGIN + 20)
-#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21)
-#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22)
-#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23)
-#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24)
-#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25)
-#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26)
-#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27)
-#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28)
-#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29)
-#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30)
-#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31)
-#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32)
-#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33)
-#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34)
-#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35)
-#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36)
-#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37)
-#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38)
-#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39)
-#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40)
-#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41)
-#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42)
-#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43)
+#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21)
+#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22)
+#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23)
+#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24)
+#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25)
+#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26)
+#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27)
+#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28)
+#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29)
+#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30)
+#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31)
+#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32)
+#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33)
+#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34)
+#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35)
+#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36)
+#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37)
+#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38)
+#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39)
+#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40)
+#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41)
+#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42)
+#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43)
#define STR_FLY_MIR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 44)*/
-#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45)
+#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45)
#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46)
#define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47)
#define MSG_COLUMN_ERR_BOUNDWIDTH (STR_FRMDLG_BEGIN + 48)
-#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49)
-
-#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
-#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51)
-#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52)
-#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53)
-#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54)
-#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55)
+#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49)
+
+#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
+#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51)
+#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52)
+#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53)
+#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54)
+#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55)
#define FRMDLG_ACT_END STR_CHAR_CENTER
diff --git a/sw/source/ui/inc/globals.h b/sw/source/ui/inc/globals.h
index 530fef285f9a..7a404392ab2e 100644
--- a/sw/source/ui/inc/globals.h
+++ b/sw/source/ui/inc/globals.h
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc
index cf06e4de05ca..1a27e6236222 100644
--- a/sw/source/ui/inc/globdoc.hrc
+++ b/sw/source/ui/inc/globdoc.hrc
@@ -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
@@ -30,10 +30,10 @@
#include "rcid.hrc"
-#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2)
-#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3)
-#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4)
-#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5)
+#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2)
+#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3)
+#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4)
+#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5)
#define MN_GLOBALFILE (RC_GLOBDOC_BEGIN + 30)
#define MN_GLOBALEDIT (RC_GLOBDOC_BEGIN + 31)
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index 8c38b3e91efd..09495c424dd2 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -2,7 +2,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
@@ -63,35 +63,35 @@ public:
SwGlossaryGroupTLB(Window* pParent, const ResId& rResId) :
SvTabListBox(pParent, rResId) {}
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
};
class SwGlossaryGroupDlg : public SvxStandardDialog
{
- FEdit aNameED;
- ListBox aPathLB;
- SwGlossaryGroupTLB aGroupTLB;
+ FEdit aNameED;
+ ListBox aPathLB;
+ SwGlossaryGroupTLB aGroupTLB;
- OKButton aOkPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
- PushButton aNewPB;
- PushButton aDelPB;
- PushButton aRenamePB;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
+ PushButton aNewPB;
+ PushButton aDelPB;
+ PushButton aRenamePB;
FixedText aBibFT;
FixedText aPathFT;
FixedText aSelectFT;
- SvStrings* pRemovedArr;
- SvStrings* pInsertedArr;
- SvStrings* pRenamedArr;
+ SvStrings* pRemovedArr;
+ SvStrings* pInsertedArr;
+ SvStrings* pRenamedArr;
- SwGlossaryHdl *pGlosHdl;
+ SwGlossaryHdl *pGlosHdl;
- String sCreatedGroup;
+ String sCreatedGroup;
- BOOL IsDeleteAllowed(const String &rGroup);
+ BOOL IsDeleteAllowed(const String &rGroup);
protected:
virtual void Apply();
@@ -107,7 +107,7 @@ public:
SwGlossaryHdl *pGlosHdl);
~SwGlossaryGroupDlg();
- const String& GetCreatedGroupName() const {return sCreatedGroup;}
+ const String& GetCreatedGroupName() const {return sCreatedGroup;}
};
#endif
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index 8a88d86fe3a6..89f09207a3e9 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -2,7 +2,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
@@ -70,8 +70,8 @@ class SW_DLLPUBLIC SwGlossaries
SvStrings *m_pGlosArr;
BOOL m_bError;
- SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const;
- SW_DLLPRIVATE SvStrings *GetNameList();
+ SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const;
+ SW_DLLPRIVATE SvStrings *GetNameList();
// implementation in unoatxt.cxx
SW_DLLPRIVATE void RemoveFileFromList( const String& rGroup );
@@ -119,28 +119,28 @@ public:
bool _bCreate = false
);
- USHORT GetGroupCnt();
- String GetGroupName(USHORT );
- String GetGroupTitle( const String& rGroupName );
+ USHORT GetGroupCnt();
+ String GetGroupName(USHORT );
+ String GetGroupTitle( const String& rGroupName );
- BOOL FindGroupName(String & rGroup);
+ BOOL FindGroupName(String & rGroup);
- SwTextBlocks* GetGroupDoc(const String &rName,
+ SwTextBlocks* GetGroupDoc(const String &rName,
BOOL bCreate = FALSE) const;
- SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());}
- void PutGroupDoc(SwTextBlocks *pBlock);
- static String GetDefName();
- static String GetExtension();
-
- String GetCompleteGroupName( const ::rtl::OUString& GroupName );
-
- BOOL NewGroupDoc(String &rGroupName, const String& rTitle);
- BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle);
- BOOL DelGroupDoc(const String &);
- SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE );
- void SaveGroupDoc(const String &rGrpName, const String& rLongName );
- void UpdateGlosPath(BOOL bFull);
- void ShowError();
+ SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());}
+ void PutGroupDoc(SwTextBlocks *pBlock);
+ static String GetDefName();
+ static String GetExtension();
+
+ String GetCompleteGroupName( const ::rtl::OUString& GroupName );
+
+ BOOL NewGroupDoc(String &rGroupName, const String& rTitle);
+ BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle);
+ BOOL DelGroupDoc(const String &);
+ SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE );
+ void SaveGroupDoc(const String &rGrpName, const String& rLongName );
+ void UpdateGlosPath(BOOL bFull);
+ void ShowError();
inline ULONG IsGlosPathErr() { return m_bError; }
const SvStrings* GetPathArray() const {return m_pPathArr;}
};
diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx
index 7e5d9fbfd619..6abf6ddacb83 100644
--- a/sw/source/ui/inc/gloshdl.hxx
+++ b/sw/source/ui/inc/gloshdl.hxx
@@ -2,7 +2,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
@@ -41,68 +41,68 @@ class SfxViewFrame;
class SW_DLLPUBLIC SwGlossaryHdl
{
- SwGlossaries& rStatGlossaries;
- String aCurGrp;
- SfxViewFrame* pViewFrame;
- SwWrtShell* pWrtShell;
- SwTextBlocks* pCurGrp;
+ SwGlossaries& rStatGlossaries;
+ String aCurGrp;
+ SfxViewFrame* pViewFrame;
+ SwWrtShell* pWrtShell;
+ SwTextBlocks* pCurGrp;
- SW_DLLPRIVATE void _SetMacros(const String &rName,
+ SW_DLLPRIVATE void _SetMacros(const String &rName,
const SvxMacro *pStart,
const SvxMacro *pEnd);
- SW_DLLPRIVATE BOOL Expand( const String& rShortName,
+ SW_DLLPRIVATE BOOL Expand( const String& rShortName,
SwGlossaries* pGlossaries,
SwTextBlocks *pGlossary );
public:
BOOL ConvertToNew(SwTextBlocks& rOld);
- void GlossaryDlg();
+ void GlossaryDlg();
- USHORT GetGroupCnt() const;
- String GetGroupName( USHORT, String* pTitle = 0 );
- BOOL NewGroup(String & rGroupName, const String& rTitle);
- BOOL DelGroup(const String &);
- BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle);
- void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE);
+ USHORT GetGroupCnt() const;
+ String GetGroupName( USHORT, String* pTitle = 0 );
+ BOOL NewGroup(String & rGroupName, const String& rTitle);
+ BOOL DelGroup(const String &);
+ BOOL RenameGroup(const String & rOld, String& rNew, const String& rNewTitle);
+ void SetCurGroup(const String &aGrp, BOOL bApi = FALSE, BOOL bAlwaysCreateNew = FALSE);
const String &GetCurGroup() const { return aCurGrp; }
- USHORT GetGlossaryCnt();
- String GetGlossaryName(USHORT);
- String GetGlossaryShortName(const String &rName);
- String GetGlossaryShortName(USHORT);
+ USHORT GetGlossaryCnt();
+ String GetGlossaryName(USHORT);
+ String GetGlossaryShortName(const String &rName);
+ String GetGlossaryShortName(USHORT);
BOOL Rename( const String& rOldShortName, const String& rNewShortName,
const String& rNewName);
BOOL CopyOrMove( const String& rSourceGroupName, String& rSourceShortName,
const String& rDestGroupName, const String& rLongName, BOOL bMove );
- BOOL HasShortName(const String &rShortName) const;
+ BOOL HasShortName(const String &rShortName) const;
//wird NewGlossary vom Basic gerufen, dann soll dir zuvor eingestellte
//Gruppe ggf. neu erstellt werden
- BOOL NewGlossary(const String &rName, const String &rShortName,
+ BOOL NewGlossary(const String &rName, const String &rShortName,
BOOL bApiCall = FALSE, BOOL bNoAttr = FALSE );
- BOOL DelGlossary(const String&);
- BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName);
+ BOOL DelGlossary(const String&);
+ BOOL CopyToClipboard(SwWrtShell& rSh, const String& rShortName);
BOOL ExpandGlossary();
- BOOL InsertGlossary(const String &rName);
+ BOOL InsertGlossary(const String &rName);
- void SetMacros(const String& rName,
+ void SetMacros(const String& rName,
const SvxMacro* pStart,
const SvxMacro* pEnd,
SwTextBlocks *pGlossary = 0 );
- void GetMacros(const String& rShortName,
+ void GetMacros(const String& rShortName,
SvxMacro& rStart,
SvxMacro& rEnd,
SwTextBlocks* pGlossary = 0 );
- BOOL IsReadOnly( const String* = 0 ) const;
- BOOL IsOld() const;
+ BOOL IsReadOnly( const String* = 0 ) const;
+ BOOL IsOld() const;
- BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden
+ BOOL FindGroupName(String & rGroup); // Gruppe ohne Pfadindex finden
- BOOL ImportGlossaries( const String& rName );
+ BOOL ImportGlossaries( const String& rName );
SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *);
~SwGlossaryHdl();
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index dc50675b0ca5..762734fd7883 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -2,7 +2,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
@@ -40,12 +40,12 @@ class SvStringsISortDtor;
struct AutoTextGroup
{
- USHORT nCount;
- String sName;
- String sTitle;
- String sLongNames; // durch 0x0A getrennte Langnamen
- String sShortNames; // durch 0x0A getrennte Kurznamen
- DateTime aDateModified;
+ USHORT nCount;
+ String sName;
+ String sTitle;
+ String sLongNames; // durch 0x0A getrennte Langnamen
+ String sShortNames; // durch 0x0A getrennte Kurznamen
+ DateTime aDateModified;
};
@@ -54,31 +54,31 @@ SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4, 4)
class SwGlossaryList : public AutoTimer
{
- AutoTextGroups aGroupArr;
- String sPath;
- BOOL bFilled;
+ AutoTextGroups aGroupArr;
+ String sPath;
+ BOOL bFilled;
- AutoTextGroup* FindGroup(const String& rGroupName);
- void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss);
+ AutoTextGroup* FindGroup(const String& rGroupName);
+ void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss);
public:
SwGlossaryList();
~SwGlossaryList();
- BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames );
- BOOL GetShortName(const String& rLongName,
+ BOOL HasLongName(const String& rBegin, SvStringsISortDtor* pLongNames );
+ BOOL GetShortName(const String& rLongName,
String& rShortName, String& rGroupName );
- USHORT GetGroupCount();
- String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0);
- USHORT GetBlockCount(USHORT nGroup);
- String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName);
+ USHORT GetGroupCount();
+ String GetGroupName(USHORT nPos, BOOL bNoPath = TRUE, String* pTitle = 0);
+ USHORT GetBlockCount(USHORT nGroup);
+ String GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName);
- void Update();
+ void Update();
- virtual void Timeout();
+ virtual void Timeout();
- void ClearGroups();
+ void ClearGroups();
};
#endif
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index f987b382562f..303c44f9ba26 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -2,7 +2,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
@@ -65,7 +65,7 @@ const short RET_EDIT = 100;
class SwGlTreeListBox : public SvTreeListBox
{
- const String sReadonly;
+ const String sReadonly;
SvLBoxEntry* pDragEntry;
@@ -78,15 +78,15 @@ class SwGlTreeListBox : public SvTreeListBox
SvLBoxEntry*& rpNewParent,
ULONG& rNewChildPos
);
- virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget,
+ virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget,
SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent,
- ULONG& rNewChildPos);
+ ULONG& rNewChildPos);
public:
SwGlTreeListBox(Window* pParent, const ResId& rResId);
- virtual void RequestHelp( const HelpEvent& rHEvt );
- void Clear();
+ virtual void RequestHelp( const HelpEvent& rHEvt );
+ void Clear();
};
//------------------------------------------------------------------
@@ -96,44 +96,44 @@ class SwGlossaryDlg : public SvxStandardDialog
friend class SwNewGlosNameDlg;
friend class SwGlTreeListBox;
- CheckBox aInsertTipCB;
- FixedText aNameLbl;
- Edit aNameED;
- FixedText aShortNameLbl;
- NoSpaceEdit aShortNameEdit;
- SwGlTreeListBox aCategoryBox;
+ CheckBox aInsertTipCB;
+ FixedText aNameLbl;
+ Edit aNameED;
+ FixedText aShortNameLbl;
+ NoSpaceEdit aShortNameEdit;
+ SwGlTreeListBox aCategoryBox;
FixedLine aRelativeFL;
- CheckBox aFileRelCB;
- CheckBox aNetRelCB;
+ CheckBox aFileRelCB;
+ CheckBox aNetRelCB;
Window aExampleWIN;
Window aExampleDummyWIN;
CheckBox aShowExampleCB;
- OKButton aInsertBtn;
- CancelButton aCloseBtn;
- HelpButton aHelpBtn;
- MenuButton aEditBtn;
- PushButton aBibBtn;
- PushButton aPathBtn;
+ OKButton aInsertBtn;
+ CancelButton aCloseBtn;
+ HelpButton aHelpBtn;
+ MenuButton aEditBtn;
+ PushButton aBibBtn;
+ PushButton aPathBtn;
- String sReadonlyPath;
+ String sReadonlyPath;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText;
- SwOneExampleFrame* pExampleFrame;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > _xAutoText;
+ SwOneExampleFrame* pExampleFrame;
- PopupMenu* pMenu;
- SwGlossaryHdl* pGlossaryHdl;
+ PopupMenu* pMenu;
+ SwGlossaryHdl* pGlossaryHdl;
- String sResumeGroup;
- String sResumeShortName;
- BOOL bResume;
+ String sResumeGroup;
+ String sResumeShortName;
+ BOOL bResume;
- const sal_Bool bSelection : 1;
- sal_Bool bReadOnly : 1;
- sal_Bool bIsOld : 1;
- sal_Bool bIsDocReadOnly:1;
+ const sal_Bool bSelection : 1;
+ sal_Bool bReadOnly : 1;
+ sal_Bool bIsOld : 1;
+ sal_Bool bIsDocReadOnly:1;
- SwWrtShell* pSh;
+ SwWrtShell* pSh;
void EnableShortName(sal_Bool bOn = sal_True);
@@ -150,26 +150,26 @@ class SwGlossaryDlg : public SvxStandardDialog
DECL_LINK( PreviewLoadedHdl, void * );
- virtual void Apply();
- void Init();
- SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort);
- void ShowAutoText(const String& rGroup, const String& rShortName);
- void ResumeShowAutoText();
+ virtual void Apply();
+ void Init();
+ SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort);
+ void ShowAutoText(const String& rGroup, const String& rShortName);
+ void ResumeShowAutoText();
- BOOL GetResumeData(String& rGroup, String& rShortName)
+ BOOL GetResumeData(String& rGroup, String& rShortName)
{rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;}
- void SetResumeData(const String& rGroup, const String& rShortName)
+ void SetResumeData(const String& rGroup, const String& rShortName)
{sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = TRUE;}
- void ResetResumeData() {bResume = FALSE;}
+ void ResetResumeData() {bResume = FALSE;}
public:
SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell);
~SwGlossaryDlg();
- String GetCurrGrpName() const;
- inline String GetCurrLongName() const;
- inline String GetCurrShortName() const;
+ String GetCurrGrpName() const;
+ inline String GetCurrLongName() const;
+ inline String GetCurrShortName() const;
static String GetCurrGroup();
- static void SetActGroup(const String& rNewGroup);
- static String GetExtension();
+ static void SetActGroup(const String& rNewGroup);
+ static String GetExtension();
};
inline String SwGlossaryDlg::GetCurrLongName() const
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx
index be8cd87ad1ba..f258613dd3a7 100644
--- a/sw/source/ui/inc/glshell.hxx
+++ b/sw/source/ui/inc/glshell.hxx
@@ -2,7 +2,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
@@ -31,10 +31,10 @@
class SwGlosDocShell : public SwDocShell
{
- String aLongName;
- String aShortName;
- String aGroupName;
- sal_Bool bShow;
+ String aLongName;
+ String aShortName;
+ String aGroupName;
+ sal_Bool bShow;
using SotObject::GetInterface;
@@ -45,27 +45,27 @@ public:
TYPEINFO();
SFX_DECL_INTERFACE(SW_GLOSDOCSHELL)
-
+
SwGlosDocShell( sal_Bool bNewShow = sal_True);
virtual ~SwGlosDocShell();
- void Execute( SfxRequest& );
- void GetState( SfxItemSet& );
- void SetLongName( const String& rLongName )
+ void Execute( SfxRequest& );
+ void GetState( SfxItemSet& );
+ void SetLongName( const String& rLongName )
{ aLongName = rLongName; }
- void SetShortName( const String& rShortName )
+ void SetShortName( const String& rShortName )
{ aShortName = rShortName; }
- void SetGroupName( const String& rGroupName )
+ void SetGroupName( const String& rGroupName )
{ aGroupName = rGroupName; }
- const String& GetShortName(){return aShortName;}
+ const String& GetShortName(){return aShortName;}
};
class SwWebGlosDocShell : public SwWebDocShell
{
- String aLongName;
- String aShortName;
- String aGroupName;
+ String aLongName;
+ String aShortName;
+ String aGroupName;
using SotObject::GetInterface;
@@ -76,19 +76,19 @@ public:
TYPEINFO();
SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL)
-
+
SwWebGlosDocShell();
virtual ~SwWebGlosDocShell();
- void Execute( SfxRequest& );
- void GetState( SfxItemSet& );
- void SetLongName( const String& rLongName )
+ void Execute( SfxRequest& );
+ void GetState( SfxItemSet& );
+ void SetLongName( const String& rLongName )
{ aLongName = rLongName; }
- void SetShortName( const String& rShortName )
+ void SetShortName( const String& rShortName )
{ aShortName = rShortName; }
- void SetGroupName( const String& rGroupName )
+ void SetGroupName( const String& rGroupName )
{ aGroupName = rGroupName; }
- const String& GetShortName(){return aShortName;}
+ const String& GetShortName(){return aShortName;}
};
#endif
diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx
index 231cc170baab..3bbe9e3e5eeb 100644
--- a/sw/source/ui/inc/grfsh.hxx
+++ b/sw/source/ui/inc/grfsh.hxx
@@ -2,7 +2,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
@@ -35,9 +35,9 @@ class SwGrfShell: public SwBaseShell
public:
SFX_DECL_INTERFACE(SW_GRFSHELL)
- void Execute(SfxRequest &);
- void ExecAttr(SfxRequest &);
- void GetAttrState(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void ExecAttr(SfxRequest &);
+ void GetAttrState(SfxItemSet &);
SwGrfShell(SwView &rView);
};
diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h
index 819f63ecbe72..0dd616e22353 100644
--- a/sw/source/ui/inc/hidfunc.h
+++ b/sw/source/ui/inc/hidfunc.h
@@ -2,7 +2,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
@@ -25,329 +25,329 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define HID_EXIT 1017
-#define HID_NEW_WINDOW 1701
-#define HID_ARRANGE_CASCADE_WIN 1703
-#define HID_ARRANGE_HORZ_WIN 1704
-#define HID_ARRANGE_VERT_WIN 1705
-#define HID_ARRANGE_ALL_WIN 1702
-#define HID_SHOW_HELP_INDEX 1802
-#define HID_NEW_FILE 1005
-#define HID_NEW_FILE_DEFAULT 1024
-#define HID_CLOSE_FILE 1001
-#define HID_DOC_MGR_DLG 1032
-#define HID_CONFIG_TOOLBOX 1629
-#define HID_CONFIG_MENU 1630
-#define HID_CONFIG_KEY 1631
-#define HID_TEMPLATE_PI 1657
-#define HID_ADDR_PI 1658
-#define HID_AUTO_FORMAT 1651
-#define HID_NAVIGATION_PI 1656
-#define HID_NAVIGATION_PI_GOTO_PAGE 1659
-#define HID_HELP_PI 1655
-#define HID_FORMAT_DROPCAPS 1454
-#define HID_CONFIG_VIEWOPTIONS 1635
-#define HID_CONFIG_COLORS 1636
-#define HID_TOOLBOX 1213
-#define HID_RIBBON 1210
-#define HID_RULER 1211
-#define HID_VLINEAL 1216
-#define HID_VSCROLLBAR 1217
-#define HID_HSCROLLBAR 1218
-#define HID_SAVE_FILE 1013
-#define HID_SAVE_ALL 1023
-#define HID_SAVE_FILE_AS 1012
-#define HID_OPEN_LASTVERSION 1009
-#define HID_STATUSBAR 1212
-#define HID_ABOUT_DLG 1806
-#define HID_SEND_MAIL 1022
-#define HID_OPEN_FILE 1007
-#define HID_INSERT_FILE 1309
-#define HID_DOCSTAT_DLG 1020
-#define HID_LOAD_TEMPLATE_DLG 1021
-#define HID_ESCAPE 1941
-#define HID_PLAY_MACRO_DLG 1624
-#define HID_RECORD_MACRO_DLG 1622
-#define HID_ASSIGN_LOCAL_MACRO_DLG 1632
-#define HID_COMPILE_MACRO 1633
-#define HID_CREATE_DOCUMENT 1019
-#define HID_PAGEUP 1937
-#define HID_PAGEDOWN 1938
-#define HID_SET_LEFT_PARA 1418
-#define HID_SET_RIGHT_PARA 1419
-#define HID_SET_CENTER_PARA 1420
-#define HID_SET_JUSTIFY_PARA 1421
-#define HID_SET_ADJUST 1428
-#define HID_FORMAT_RESET 1469
-#define HID_INDENT_TO_TABSTOP 1417
-#define HID_UNINDENT_TO_TABSTOP 1431
-#define HID_SET_BOLD 1405
-#define HID_SET_ITALIC 1406
-#define HID_SET_UNDERLINE 1409
-#define HID_SET_STRIKEOUT 1410
-#define HID_SET_OUTLINE 1408
-#define HID_SET_SHADOW 1407
-#define HID_SET_SUPER_SCRIPT 1411
-#define HID_SET_SUB_SCRIPT 1412
-#define HID_SET_COLOR 1413
-#define HID_SET_CASEMAP 1414
-#define HID_SET_LANGUAGE 1415
-#define HID_SET_KERNING 1416
-#define HID_SET_FONT 1401
-#define HID_SET_FONT_SIZE 1402
-#define HID_GROW_FONT_SIZE 1403
-#define HID_SHRINK_FONT_SIZE 1404
-#define HID_SET_LINE_SPACE_1 1422
-#define HID_SET_LINE_SPACE_15 1423
-#define HID_SET_LINE_SPACE_2 1424
-#define HID_SET_PROP_LINE_SPACE 1540
-#define HID_SET_ABS_LINE_SPACE 1541
-#define HID_INSERT_SYMBOL 1328
-#define HID_INSERT_OBJECT_DLG 1322
-#define HID_EDIT_OBJECT 1110
-#define HID_EDIT_LINK_DLG 1109
-#define HID_EDIT_FILE_INFO_DLG 1107
-#define HID_EDIT_IDX_ENTRY_DLG 1123
-#define HID_NUM_BULLET_DOWN 1130
-#define HID_NUM_BULLET_MOVEUP 1134
-#define HID_NUM_BULLET_MOVEDOWN 1135
-#define HID_NUM_BULLET_UP 1131
-#define HID_NUM_BULLET_PREV 1132
-#define HID_NUM_BULLET_NEXT 1133
-#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142
-#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141
-#define HID_NUM_BULLET_OUTLINE_UP 1140
-#define HID_NUM_BULLET_OUTLINE_DOWN 1139
-#define HID_NUM_BULLET_NONUM 1136
-#define HID_NUM_NUMBERING_ON 1144
-#define HID_NUM_BULLET_ON 1138
-#define HID_NUM_BULLET_OFF 1137
-#define HID_INSERT_IDX_ENTRY_DLG 1335
-#define HID_POSTIT 1329
-#define HID_INSERT_CAPTION 1310
-#define HID_INSERT_IDX 1336
-#define HID_INSERT_USERIDX 1337
-#define HID_INSERT_CNTNTIDX 1338
-#define HID_INSERT_IDX_ENTRY 1340
-#define HID_INSERT_USERIDX_ENTRY 1341
-#define HID_INSERT_CNTNTIDX_ENTRY 1342
-#define HID_INSERT_FRAME 1334
-#define HID_INSERT_FRAME_INTERACT 1333
-#define HID_INSERT_SOFT_HYPHEN 1350
-#define HID_INSERT_HARD_SPACE 1351
-#define HID_FORMAT_FRAME_DLG 1456
-#define HID_FRAME_TO_TOP 1470
-#define HID_FRAME_TO_BOTTOM 1471
-#define HID_FRAME_NOWRAP 1472
-#define HID_FRAME_WRAP 1473
-#define HID_FRAME_WRAPTHRU 1474
-#define HID_FRAME_ALIGN_HORZ_LEFT 1475
-#define HID_FRAME_ALIGN_HORZ_RIGHT 1476
-#define HID_FRAME_ALIGN_HORZ_CENTER 1477
-#define HID_FRAME_ALIGN_VERT_TOP 1478
-#define HID_FRAME_ALIGN_VERT_BOTTOM 1479
-#define HID_FRAME_ALIGN_VERT_CENTER 1480
-#define HID_EDIT_FIELD 1104
-#define HID_SET_FIELD_VALUE 1112
-#define HID_INSERT_FIELD 1308
-#define HID_INSERT_MERGEFIELD_DLG 1320
-#define HID_EXECUTE_MACROFIELD 1127
-#define HID_UPDATE_FIELDS 1126
-#define HID_UPDATE_INPUTFIELDS 1143
-#define HID_CALC_TABLE 1129
-#define HID_INSERT_BREAK_DLG 1304
-#define HID_INSERT_BOOKMARK 1302
-#define HID_DELETE_BOOKMARK 1301
-#define HID_INSERT_GRAFIC 1315
-#define HID_FORMAT_TABLE_DLG 1460
-#define HID_INSERT_TABLE 1330
-#define HID_INSERT_COLS 1332
-#define HID_PAGE_STYLE_SET_COLS 1538
-#define HID_CONVERT_TEXT_TABLE 1500
-#define HID_TABLE_INSERT_ROW 1501
-#define HID_TABLE_INSERT_COL 1502
-#define HID_TABLE_DELETE_ROW 1503
-#define HID_TABLE_DELETE_COL 1504
-#define HID_TABLE_SPLIT_CELLS 1505
-#define HID_TABLE_MERGE_CELLS 1506
-#define HID_TABLE_SET_ROW_HEIGHT 1507
-#define HID_TABLE_SET_COL_WIDTH 1508
-#define HID_TABLE_SET_ULSPACE 1509
-#define HID_TABLE_SET_GRID 1510
-#define HID_TABLE_SET_SHADOW 1511
-#define HID_FORMAT_CHAR_DLG 1441
-#define HID_FORMAT_PAGE_DLG 1452
-#define HID_CHANGE_PAGENUM 1634
-#define HID_FORMAT_PARA_DLG 1443
-#define HID_FORMAT_TAB_DLG 1445
-#define HID_FORMAT_BORDER_DLG 1447
-#define HID_FORMAT_BORDER 1439
-#define HID_FORMAT_SHADOW 1438
-#define HID_FORMAT_BACKGROUND 1448
-#define HID_FORMAT_BACKGROUND_DLG 1450
-#define HID_SET_FRM_SIZE 1481
-#define HID_SET_FRM_POSITION 1482
-#define HID_SET_FRM_ANCHOR 1483
-#define HID_SET_FRM_WRAP 1484
-#define HID_SET_FRM_DIST 1485
-#define HID_SET_FRM_OPTIONS 1486
-#define HID_SET_FRM_MACRO 1494
-#define HID_SET_FRM_COLUMNS 1495
-#define HID_SET_FRM_COLUMN_WIDTH 1496
-#define HID_SET_GRF_MIRROR 1488
-#define HID_SET_TABLE_WIDTH 1489
-#define HID_SET_TABLE_ALIGN 1490
-#define HID_TABLE_SET_READ_ONLY_CELLS 1517
-#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519
-#define HID_NEW_STYLE_BY_EXAMPLE 1462
-#define HID_UPDATE_STYLES_DIRECT 1497
-#define HID_UPDATE_STYLE_BY_EXAMPLE 1463
-#define HID_STYLE_SHEET_FRAME_DLG 1464
-#define HID_STYLE_SHEET_DOC_DLG 1465
-#define HID_SET_STANDARD_FONTS 1442
-#define HID_COPY 1102
-#define HID_PASTE 1113
-#define HID_PASTEUNFORMATTED 1115
-#define HID_PASTESPECIAL 1114
-#define HID_CUT 1103
-#define HID_FLIP_HORZ_GRAFIC 1425
-#define HID_FLIP_VERT_GRAFIC 1426
-#define HID_FORMAT_GRAFIC_DLG 1458
-#define HID_VIEW_BOUNDS 1214
-#define HID_VIEW_FIELDS 1215
-#define HID_VIEW_META_CHARS 1224
-#define HID_VIEW_MARKS 1225
-#define HID_VIEW_FIELDNAME 1226
-#define HID_VIEW_TABLEGRID 1227
-#define HID_SEARCH 1117
-#define HID_REPEAT_SEARCH 1150
-#define HID_REPLACE 1118
-#define HID_GOTO 1111
-#define HID_SETUP_PRINTER_DLG 1015
-#define HID_PRINT_FILE 1010
-#define HID_PRINT_FILE_DEFAULT 1025
-#define HID_FAX 1028
-#define HID_PRINT_FILE_OPTIONS 1011
-#define HID_THESAURUS_DLG 1604
-#define HID_SPELLING_DLG 1601
-#define HID_HYPHENATE_OPT_DLG 1607
-#define HID_MERGE_FILE_DLG 1004
-#define HID_SELECT_DATABASE 1030
-#define HID_DOC_INFO_DLG 1031
-#define HID_MERGE_FILE 1003
-#define HID_MERGE_RECORD 1327
-#define HID_INSERT_RECORD 1326
-#define HID_NUMBERING_OUTLINE_DLG 1612
-#define HID_NUMBER_BULLETS 1121
-#define HID_ZOOM 1231
-#define HID_SORTING 1613
-#define HID_SORTING_DLG 1614
-#define HID_CALCULATE 1615
-#define HID_REFRESH_VIEW 1201
-#define HID_CHAR_LEFT 1901
-#define HID_CHAR_RIGHT 1902
-#define HID_LINE_UP 1903
-#define HID_LINE_DOWN 1904
-#define HID_START_OF_LINE 1905
-#define HID_END_OF_LINE 1906
-#define HID_START_OF_DOCUMENT 1907
-#define HID_END_OF_DOCUMENT 1908
-#define HID_SELECT_WORD 1943
-#define HID_SELECT_ALL 1119
-#define HID_START_OF_NEXT_PAGE 1909
-#define HID_END_OF_NEXT_PAGE 1910
-#define HID_START_OF_PREV_PAGE 1911
-#define HID_END_OF_PREV_PAGE 1912
-#define HID_START_OF_PAGE 1913
-#define HID_END_OF_PAGE 1914
-#define HID_NEXT_WORD 1921
-#define HID_START_OF_PARA 1919
-#define HID_END_OF_PARA 1920
-#define HID_PREV_WORD 1922
-#define HID_NEXT_SENT 1923
-#define HID_PREV_SENT 1924
-#define HID_SET_INS_MODE 1936
-#define HID_SET_ADD_MODE 1939
-#define HID_SET_EXT_MODE 1940
-#define HID_START_TABLE 1947
-#define HID_END_TABLE 1948
-#define HID_NEXT_TABLE 1949
-#define HID_PREV_TABLE 1950
-#define HID_TABLE_SELECT_ALL 1515
-#define HID_TABLE_SELECT_COL 1514
-#define HID_TABLE_SELECT_ROW 1513
-#define HID_START_OF_COLUMN 1917
-#define HID_END_OF_COLUMN 1918
-#define HID_START_OF_NEXT_COLUMN 1951
-#define HID_END_OF_NEXT_COLUMN 1952
-#define HID_START_OF_PREV_COLUMN 1953
-#define HID_END_OF_PREV_COLUMN 1954
-#define HID_FOOTNOTE_TO_ANCHOR 1955
-#define HID_NEXT_FOOTNOTE 1956
-#define HID_PREV_FOOTNOTE 1957
-#define HID_CNTNT_TO_NEXT_FRAME 1958
-#define HID_FRAME_TO_ANCHOR 1959
-#define HID_TO_HEADER 1960
-#define HID_TO_FOOTER 1961
-#define HID_IDX_MARK_TO_IDX 1962
-#define HID_DELETE 1925
-#define HID_BACKSPACE 1926
-#define HID_DELETE_SENT 1927
-#define HID_DELETE_BACK_SENT 1928
-#define HID_DELETE_WORD 1929
-#define HID_DELETE_BACK_WORD 1930
-#define HID_DELETE_LINE 1931
-#define HID_DELETE_BACK_LINE 1932
-#define HID_DELETE_PARA 1933
-#define HID_DELETE_BACK_PARA 1934
-#define HID_DELETE_WHOLE_LINE 1935
-#define HID_INSERT_BREAK 1303
-#define HID_INSERT_PAGEBREAK 1323
-#define HID_INSERT_LINEBREAK 1318
-#define HID_INSERT_COLUMN_BREAK 1305
-#define HID_INSERT_FOOTNOTE 1311
-#define HID_INSERT_FOOTNOTE_DLG 1312
-#define HID_FORMAT_FOOTNOTE_DLG 1468
-#define HID_UNDO 1120
-#define HID_REDO 1116
-#define HID_REPEAT 1122
-#define HID_REPAGINATE 1161
-#define HID_SHOW_UPDATE_HELP 1805
-#define HID_SHOW_KEYBOARD_HELP 1803
-#define HID_SHOW_HELP_MANUAL 1804
-#define HID_GLOSSARY_DLG 1620
-#define HID_EXPAND_GLOSSARY 1628
-#define HID_INSERT_GLOSSARY 1640
-#define HID_AUTO_CORRECT_DLG 1650
-#define HID_AUTO_CORRECT 1649
-#define HID_CONFIG_DLG 1627
-#define HID_INSERT_STRING 1331
-#define HID_SET_CHAR_STYLE 1491
-#define HID_SET_PARA_STYLE 1492
-#define HID_SET_PAGE_STYLE 1493
-#define HID_SET_LRMARGIN 1429
-#define HID_SET_ULMARGIN 1430
-#define HID_SET_HYPHEN_ZONE 1432
-#define HID_SET_PAGE_BREAK 1433
-#define HID_FORMAT_PAGE 1451
-#define HID_SET_KEEP_TOGETHER 1434
-#define HID_SET_WIDOW 1436
-#define HID_SET_ORPHAN 1437
-#define HID_BUFFER_UPDATE 1124
-#define HID_FORMAT_TAB 1444
-#define HID_IS_END_OF_PARA 2000
-#define HID_IS_END_OF_WORD 2000
-#define HID_IS_END_OF_DOC 2000
-#define HID_IS_START_OF_PARA 2000
-#define HID_IS_START_OF_WORD 2000
-#define HID_IS_START_OF_DOC 2000
-#define HID_EDIT_FORMULA 1128
-#define HID_ENVELOP 2050
-#define HID_LABEL 2051
-#define HID_AGENDA_WIZZARD 1663
-#define HID_MEMO_WIZZARD 1662
-#define HID_FAX_WIZZARD 1661
-#define HID_LETTER_WIZZARD 1660
-#define HID_LAUNCH_REGISTRY 1002
+#define HID_EXIT 1017
+#define HID_NEW_WINDOW 1701
+#define HID_ARRANGE_CASCADE_WIN 1703
+#define HID_ARRANGE_HORZ_WIN 1704
+#define HID_ARRANGE_VERT_WIN 1705
+#define HID_ARRANGE_ALL_WIN 1702
+#define HID_SHOW_HELP_INDEX 1802
+#define HID_NEW_FILE 1005
+#define HID_NEW_FILE_DEFAULT 1024
+#define HID_CLOSE_FILE 1001
+#define HID_DOC_MGR_DLG 1032
+#define HID_CONFIG_TOOLBOX 1629
+#define HID_CONFIG_MENU 1630
+#define HID_CONFIG_KEY 1631
+#define HID_TEMPLATE_PI 1657
+#define HID_ADDR_PI 1658
+#define HID_AUTO_FORMAT 1651
+#define HID_NAVIGATION_PI 1656
+#define HID_NAVIGATION_PI_GOTO_PAGE 1659
+#define HID_HELP_PI 1655
+#define HID_FORMAT_DROPCAPS 1454
+#define HID_CONFIG_VIEWOPTIONS 1635
+#define HID_CONFIG_COLORS 1636
+#define HID_TOOLBOX 1213
+#define HID_RIBBON 1210
+#define HID_RULER 1211
+#define HID_VLINEAL 1216
+#define HID_VSCROLLBAR 1217
+#define HID_HSCROLLBAR 1218
+#define HID_SAVE_FILE 1013
+#define HID_SAVE_ALL 1023
+#define HID_SAVE_FILE_AS 1012
+#define HID_OPEN_LASTVERSION 1009
+#define HID_STATUSBAR 1212
+#define HID_ABOUT_DLG 1806
+#define HID_SEND_MAIL 1022
+#define HID_OPEN_FILE 1007
+#define HID_INSERT_FILE 1309
+#define HID_DOCSTAT_DLG 1020
+#define HID_LOAD_TEMPLATE_DLG 1021
+#define HID_ESCAPE 1941
+#define HID_PLAY_MACRO_DLG 1624
+#define HID_RECORD_MACRO_DLG 1622
+#define HID_ASSIGN_LOCAL_MACRO_DLG 1632
+#define HID_COMPILE_MACRO 1633
+#define HID_CREATE_DOCUMENT 1019
+#define HID_PAGEUP 1937
+#define HID_PAGEDOWN 1938
+#define HID_SET_LEFT_PARA 1418
+#define HID_SET_RIGHT_PARA 1419
+#define HID_SET_CENTER_PARA 1420
+#define HID_SET_JUSTIFY_PARA 1421
+#define HID_SET_ADJUST 1428
+#define HID_FORMAT_RESET 1469
+#define HID_INDENT_TO_TABSTOP 1417
+#define HID_UNINDENT_TO_TABSTOP 1431
+#define HID_SET_BOLD 1405
+#define HID_SET_ITALIC 1406
+#define HID_SET_UNDERLINE 1409
+#define HID_SET_STRIKEOUT 1410
+#define HID_SET_OUTLINE 1408
+#define HID_SET_SHADOW 1407
+#define HID_SET_SUPER_SCRIPT 1411
+#define HID_SET_SUB_SCRIPT 1412
+#define HID_SET_COLOR 1413
+#define HID_SET_CASEMAP 1414
+#define HID_SET_LANGUAGE 1415
+#define HID_SET_KERNING 1416
+#define HID_SET_FONT 1401
+#define HID_SET_FONT_SIZE 1402
+#define HID_GROW_FONT_SIZE 1403
+#define HID_SHRINK_FONT_SIZE 1404
+#define HID_SET_LINE_SPACE_1 1422
+#define HID_SET_LINE_SPACE_15 1423
+#define HID_SET_LINE_SPACE_2 1424
+#define HID_SET_PROP_LINE_SPACE 1540
+#define HID_SET_ABS_LINE_SPACE 1541
+#define HID_INSERT_SYMBOL 1328
+#define HID_INSERT_OBJECT_DLG 1322
+#define HID_EDIT_OBJECT 1110
+#define HID_EDIT_LINK_DLG 1109
+#define HID_EDIT_FILE_INFO_DLG 1107
+#define HID_EDIT_IDX_ENTRY_DLG 1123
+#define HID_NUM_BULLET_DOWN 1130
+#define HID_NUM_BULLET_MOVEUP 1134
+#define HID_NUM_BULLET_MOVEDOWN 1135
+#define HID_NUM_BULLET_UP 1131
+#define HID_NUM_BULLET_PREV 1132
+#define HID_NUM_BULLET_NEXT 1133
+#define HID_NUM_BULLET_OUTLINE_MOVEDOWN 1142
+#define HID_NUM_BULLET_OUTLINE_MOVEUP 1141
+#define HID_NUM_BULLET_OUTLINE_UP 1140
+#define HID_NUM_BULLET_OUTLINE_DOWN 1139
+#define HID_NUM_BULLET_NONUM 1136
+#define HID_NUM_NUMBERING_ON 1144
+#define HID_NUM_BULLET_ON 1138
+#define HID_NUM_BULLET_OFF 1137
+#define HID_INSERT_IDX_ENTRY_DLG 1335
+#define HID_POSTIT 1329
+#define HID_INSERT_CAPTION 1310
+#define HID_INSERT_IDX 1336
+#define HID_INSERT_USERIDX 1337
+#define HID_INSERT_CNTNTIDX 1338
+#define HID_INSERT_IDX_ENTRY 1340
+#define HID_INSERT_USERIDX_ENTRY 1341
+#define HID_INSERT_CNTNTIDX_ENTRY 1342
+#define HID_INSERT_FRAME 1334
+#define HID_INSERT_FRAME_INTERACT 1333
+#define HID_INSERT_SOFT_HYPHEN 1350
+#define HID_INSERT_HARD_SPACE 1351
+#define HID_FORMAT_FRAME_DLG 1456
+#define HID_FRAME_TO_TOP 1470
+#define HID_FRAME_TO_BOTTOM 1471
+#define HID_FRAME_NOWRAP 1472
+#define HID_FRAME_WRAP 1473
+#define HID_FRAME_WRAPTHRU 1474
+#define HID_FRAME_ALIGN_HORZ_LEFT 1475
+#define HID_FRAME_ALIGN_HORZ_RIGHT 1476
+#define HID_FRAME_ALIGN_HORZ_CENTER 1477
+#define HID_FRAME_ALIGN_VERT_TOP 1478
+#define HID_FRAME_ALIGN_VERT_BOTTOM 1479
+#define HID_FRAME_ALIGN_VERT_CENTER 1480
+#define HID_EDIT_FIELD 1104
+#define HID_SET_FIELD_VALUE 1112
+#define HID_INSERT_FIELD 1308
+#define HID_INSERT_MERGEFIELD_DLG 1320
+#define HID_EXECUTE_MACROFIELD 1127
+#define HID_UPDATE_FIELDS 1126
+#define HID_UPDATE_INPUTFIELDS 1143
+#define HID_CALC_TABLE 1129
+#define HID_INSERT_BREAK_DLG 1304
+#define HID_INSERT_BOOKMARK 1302
+#define HID_DELETE_BOOKMARK 1301
+#define HID_INSERT_GRAFIC 1315
+#define HID_FORMAT_TABLE_DLG 1460
+#define HID_INSERT_TABLE 1330
+#define HID_INSERT_COLS 1332
+#define HID_PAGE_STYLE_SET_COLS 1538
+#define HID_CONVERT_TEXT_TABLE 1500
+#define HID_TABLE_INSERT_ROW 1501
+#define HID_TABLE_INSERT_COL 1502
+#define HID_TABLE_DELETE_ROW 1503
+#define HID_TABLE_DELETE_COL 1504
+#define HID_TABLE_SPLIT_CELLS 1505
+#define HID_TABLE_MERGE_CELLS 1506
+#define HID_TABLE_SET_ROW_HEIGHT 1507
+#define HID_TABLE_SET_COL_WIDTH 1508
+#define HID_TABLE_SET_ULSPACE 1509
+#define HID_TABLE_SET_GRID 1510
+#define HID_TABLE_SET_SHADOW 1511
+#define HID_FORMAT_CHAR_DLG 1441
+#define HID_FORMAT_PAGE_DLG 1452
+#define HID_CHANGE_PAGENUM 1634
+#define HID_FORMAT_PARA_DLG 1443
+#define HID_FORMAT_TAB_DLG 1445
+#define HID_FORMAT_BORDER_DLG 1447
+#define HID_FORMAT_BORDER 1439
+#define HID_FORMAT_SHADOW 1438
+#define HID_FORMAT_BACKGROUND 1448
+#define HID_FORMAT_BACKGROUND_DLG 1450
+#define HID_SET_FRM_SIZE 1481
+#define HID_SET_FRM_POSITION 1482
+#define HID_SET_FRM_ANCHOR 1483
+#define HID_SET_FRM_WRAP 1484
+#define HID_SET_FRM_DIST 1485
+#define HID_SET_FRM_OPTIONS 1486
+#define HID_SET_FRM_MACRO 1494
+#define HID_SET_FRM_COLUMNS 1495
+#define HID_SET_FRM_COLUMN_WIDTH 1496
+#define HID_SET_GRF_MIRROR 1488
+#define HID_SET_TABLE_WIDTH 1489
+#define HID_SET_TABLE_ALIGN 1490
+#define HID_TABLE_SET_READ_ONLY_CELLS 1517
+#define HID_TABLE_UNSET_READ_ONLY_CELLS 1519
+#define HID_NEW_STYLE_BY_EXAMPLE 1462
+#define HID_UPDATE_STYLES_DIRECT 1497
+#define HID_UPDATE_STYLE_BY_EXAMPLE 1463
+#define HID_STYLE_SHEET_FRAME_DLG 1464
+#define HID_STYLE_SHEET_DOC_DLG 1465
+#define HID_SET_STANDARD_FONTS 1442
+#define HID_COPY 1102
+#define HID_PASTE 1113
+#define HID_PASTEUNFORMATTED 1115
+#define HID_PASTESPECIAL 1114
+#define HID_CUT 1103
+#define HID_FLIP_HORZ_GRAFIC 1425
+#define HID_FLIP_VERT_GRAFIC 1426
+#define HID_FORMAT_GRAFIC_DLG 1458
+#define HID_VIEW_BOUNDS 1214
+#define HID_VIEW_FIELDS 1215
+#define HID_VIEW_META_CHARS 1224
+#define HID_VIEW_MARKS 1225
+#define HID_VIEW_FIELDNAME 1226
+#define HID_VIEW_TABLEGRID 1227
+#define HID_SEARCH 1117
+#define HID_REPEAT_SEARCH 1150
+#define HID_REPLACE 1118
+#define HID_GOTO 1111
+#define HID_SETUP_PRINTER_DLG 1015
+#define HID_PRINT_FILE 1010
+#define HID_PRINT_FILE_DEFAULT 1025
+#define HID_FAX 1028
+#define HID_PRINT_FILE_OPTIONS 1011
+#define HID_THESAURUS_DLG 1604
+#define HID_SPELLING_DLG 1601
+#define HID_HYPHENATE_OPT_DLG 1607
+#define HID_MERGE_FILE_DLG 1004
+#define HID_SELECT_DATABASE 1030
+#define HID_DOC_INFO_DLG 1031
+#define HID_MERGE_FILE 1003
+#define HID_MERGE_RECORD 1327
+#define HID_INSERT_RECORD 1326
+#define HID_NUMBERING_OUTLINE_DLG 1612
+#define HID_NUMBER_BULLETS 1121
+#define HID_ZOOM 1231
+#define HID_SORTING 1613
+#define HID_SORTING_DLG 1614
+#define HID_CALCULATE 1615
+#define HID_REFRESH_VIEW 1201
+#define HID_CHAR_LEFT 1901
+#define HID_CHAR_RIGHT 1902
+#define HID_LINE_UP 1903
+#define HID_LINE_DOWN 1904
+#define HID_START_OF_LINE 1905
+#define HID_END_OF_LINE 1906
+#define HID_START_OF_DOCUMENT 1907
+#define HID_END_OF_DOCUMENT 1908
+#define HID_SELECT_WORD 1943
+#define HID_SELECT_ALL 1119
+#define HID_START_OF_NEXT_PAGE 1909
+#define HID_END_OF_NEXT_PAGE 1910
+#define HID_START_OF_PREV_PAGE 1911
+#define HID_END_OF_PREV_PAGE 1912
+#define HID_START_OF_PAGE 1913
+#define HID_END_OF_PAGE 1914
+#define HID_NEXT_WORD 1921
+#define HID_START_OF_PARA 1919
+#define HID_END_OF_PARA 1920
+#define HID_PREV_WORD 1922
+#define HID_NEXT_SENT 1923
+#define HID_PREV_SENT 1924
+#define HID_SET_INS_MODE 1936
+#define HID_SET_ADD_MODE 1939
+#define HID_SET_EXT_MODE 1940
+#define HID_START_TABLE 1947
+#define HID_END_TABLE 1948
+#define HID_NEXT_TABLE 1949
+#define HID_PREV_TABLE 1950
+#define HID_TABLE_SELECT_ALL 1515
+#define HID_TABLE_SELECT_COL 1514
+#define HID_TABLE_SELECT_ROW 1513
+#define HID_START_OF_COLUMN 1917
+#define HID_END_OF_COLUMN 1918
+#define HID_START_OF_NEXT_COLUMN 1951
+#define HID_END_OF_NEXT_COLUMN 1952
+#define HID_START_OF_PREV_COLUMN 1953
+#define HID_END_OF_PREV_COLUMN 1954
+#define HID_FOOTNOTE_TO_ANCHOR 1955
+#define HID_NEXT_FOOTNOTE 1956
+#define HID_PREV_FOOTNOTE 1957
+#define HID_CNTNT_TO_NEXT_FRAME 1958
+#define HID_FRAME_TO_ANCHOR 1959
+#define HID_TO_HEADER 1960
+#define HID_TO_FOOTER 1961
+#define HID_IDX_MARK_TO_IDX 1962
+#define HID_DELETE 1925
+#define HID_BACKSPACE 1926
+#define HID_DELETE_SENT 1927
+#define HID_DELETE_BACK_SENT 1928
+#define HID_DELETE_WORD 1929
+#define HID_DELETE_BACK_WORD 1930
+#define HID_DELETE_LINE 1931
+#define HID_DELETE_BACK_LINE 1932
+#define HID_DELETE_PARA 1933
+#define HID_DELETE_BACK_PARA 1934
+#define HID_DELETE_WHOLE_LINE 1935
+#define HID_INSERT_BREAK 1303
+#define HID_INSERT_PAGEBREAK 1323
+#define HID_INSERT_LINEBREAK 1318
+#define HID_INSERT_COLUMN_BREAK 1305
+#define HID_INSERT_FOOTNOTE 1311
+#define HID_INSERT_FOOTNOTE_DLG 1312
+#define HID_FORMAT_FOOTNOTE_DLG 1468
+#define HID_UNDO 1120
+#define HID_REDO 1116
+#define HID_REPEAT 1122
+#define HID_REPAGINATE 1161
+#define HID_SHOW_UPDATE_HELP 1805
+#define HID_SHOW_KEYBOARD_HELP 1803
+#define HID_SHOW_HELP_MANUAL 1804
+#define HID_GLOSSARY_DLG 1620
+#define HID_EXPAND_GLOSSARY 1628
+#define HID_INSERT_GLOSSARY 1640
+#define HID_AUTO_CORRECT_DLG 1650
+#define HID_AUTO_CORRECT 1649
+#define HID_CONFIG_DLG 1627
+#define HID_INSERT_STRING 1331
+#define HID_SET_CHAR_STYLE 1491
+#define HID_SET_PARA_STYLE 1492
+#define HID_SET_PAGE_STYLE 1493
+#define HID_SET_LRMARGIN 1429
+#define HID_SET_ULMARGIN 1430
+#define HID_SET_HYPHEN_ZONE 1432
+#define HID_SET_PAGE_BREAK 1433
+#define HID_FORMAT_PAGE 1451
+#define HID_SET_KEEP_TOGETHER 1434
+#define HID_SET_WIDOW 1436
+#define HID_SET_ORPHAN 1437
+#define HID_BUFFER_UPDATE 1124
+#define HID_FORMAT_TAB 1444
+#define HID_IS_END_OF_PARA 2000
+#define HID_IS_END_OF_WORD 2000
+#define HID_IS_END_OF_DOC 2000
+#define HID_IS_START_OF_PARA 2000
+#define HID_IS_START_OF_WORD 2000
+#define HID_IS_START_OF_DOC 2000
+#define HID_EDIT_FORMULA 1128
+#define HID_ENVELOP 2050
+#define HID_LABEL 2051
+#define HID_AGENDA_WIZZARD 1663
+#define HID_MEMO_WIZZARD 1662
+#define HID_FAX_WIZZARD 1661
+#define HID_LETTER_WIZZARD 1660
+#define HID_LAUNCH_REGISTRY 1002
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx
index 110c02540473..d8d49e0734f0 100644
--- a/sw/source/ui/inc/hyp.hxx
+++ b/sw/source/ui/inc/hyp.hxx
@@ -2,7 +2,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
@@ -38,29 +38,29 @@ class SwView;
class SwHyphWrapper : public SvxSpellWrapper {
private:
SwView* pView;
- ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
- Link aOldLnk;
- LanguageType nLangError; // nicht vorhandene Sprache
- sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige
- sal_uInt16 nPageStart; // 1. gepruefte Seite
- sal_Bool bInSelection : 1; // Trennen von selektiertem Text
- sal_Bool bShowError : 1; // nicht vorhandene Sprache melden
- sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen
+ Link aOldLnk;
+ LanguageType nLangError; // nicht vorhandene Sprache
+ sal_uInt16 nPageCount; // Seitenanzahl fuer Progressanzeige
+ sal_uInt16 nPageStart; // 1. gepruefte Seite
+ sal_Bool bInSelection : 1; // Trennen von selektiertem Text
+ sal_Bool bShowError : 1; // nicht vorhandene Sprache melden
+ sal_Bool bAutomatic : 1; // Trennstellen ohne Rueckfrage einfuegen
sal_Bool bInfoBox : 1; // display info-box when ending
DECL_LINK( SpellError, LanguageType * );
protected:
- virtual void SpellStart( SvxSpellArea eSpell );
- virtual sal_Bool SpellContinue();
- virtual void SpellEnd( );
- virtual sal_Bool SpellMore();
+ virtual void SpellStart( SvxSpellArea eSpell );
+ virtual sal_Bool SpellContinue();
+ virtual void SpellEnd( );
+ virtual sal_Bool SpellMore();
virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen
public:
- SwHyphWrapper( SwView* pVw,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenator > &rxHyph,
+ SwHyphWrapper( SwView* pVw,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::linguistic2::XHyphenator > &rxHyph,
sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect );
~SwHyphWrapper();
};
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx
index 22e71dbc6168..ff5c56270570 100644
--- a/sw/source/ui/inc/idxmrk.hxx
+++ b/sw/source/ui/inc/idxmrk.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ class SwInsertIdxMarkWrapper : public SfxChildWindow
{
AbstractMarkFloatDlg* pAbstDlg;
protected:
- SwInsertIdxMarkWrapper( Window *pParentWindow,
+ SwInsertIdxMarkWrapper( Window *pParentWindow,
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo );
@@ -46,14 +46,14 @@ protected:
SFX_DECL_CHILDWINDOW(SwInsertIdxMarkWrapper);
public:
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwInsertAuthMarkWrapper : public SfxChildWindow
{
AbstractMarkFloatDlg* pAbstDlg;
protected:
- SwInsertAuthMarkWrapper( Window *pParentWindow,
+ SwInsertAuthMarkWrapper( Window *pParentWindow,
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo );
@@ -61,7 +61,7 @@ protected:
SFX_DECL_CHILDWINDOW(SwInsertAuthMarkWrapper);
public:
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
#endif // _IDXMRK_HXX
diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx
index f12fbc1f3256..f90a4b8b5395 100644
--- a/sw/source/ui/inc/imaildsplistener.hxx
+++ b/sw/source/ui/inc/imaildsplistener.hxx
@@ -2,7 +2,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
@@ -37,10 +37,10 @@ class MailDispatcher;
/**
MailDispatcher listener interface.
- Clients may implement and register instances of the
+ Clients may implement and register instances of the
mail dispatcher interface in order to get notifications
- about the MailDispatcher status.
-
+ about the MailDispatcher status.
+
@see MailDispatcher
*/
class IMailDispatcherListener : public ::salhelper::ReferenceObject
@@ -50,29 +50,29 @@ public:
Called when the MailDispatcher is started.
*/
virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0;
-
+
/**
Called when the MailDispatcher is stopped.
*/
virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0;
-
+
/**
Called when there are no more mail messages
- to deliver.
+ to deliver.
*/
virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) = 0;
-
+
/**
- Called for every mail message that has been
+ Called for every mail message that has been
successfully delivered.
*/
- virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0;
-
+ virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0;
+
/**
Called for every mail message whose delivery
failed.
*/
- virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0;
+ virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0;
};
#endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX
diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx
index 2bb8665d9712..f2698c6b7a84 100644
--- a/sw/source/ui/inc/initui.hxx
+++ b/sw/source/ui/inc/initui.hxx
@@ -2,7 +2,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
@@ -41,13 +41,13 @@ class SvStringsDtor;
/*
* Extern Definitions
*/
-extern SwThesaurus* pThes;
+extern SwThesaurus* pThes;
-extern String* pOldGrfCat;
-extern String* pOldTabCat;
-extern String* pOldFrmCat;
+extern String* pOldGrfCat;
+extern String* pOldTabCat;
+extern String* pOldFrmCat;
-extern String* pCurrGlosGroup;
+extern String* pCurrGlosGroup;
SW_DLLPUBLIC String* GetOldGrfCat();
SW_DLLPUBLIC String* GetOldTabCat();
@@ -57,10 +57,10 @@ SW_DLLPUBLIC String* GetOldDrwCat();
SW_DLLPUBLIC String* GetCurrGlosGroup();
SW_DLLPUBLIC void SetCurrGlosGroup(String* pStr);
-extern SvStringsDtor* pDBNameList;
+extern SvStringsDtor* pDBNameList;
-extern SvStringsDtor* pAuthFieldNameList;
-extern SvStringsDtor* pAuthFieldTypeList;
+extern SvStringsDtor* pAuthFieldNameList;
+extern SvStringsDtor* pAuthFieldTypeList;
// stellt die Textbausteinverwaltung zur Verfuegung
class SwGlossaries;
@@ -71,8 +71,8 @@ class SwGlossaryList;
BOOL HasGlossaryList();
SwGlossaryList* GetGlossaryList();
-extern void _InitUI();
-extern void _FinitUI();
+extern void _InitUI();
+extern void _FinitUI();
extern void _InitSpell();
extern void _FinitSpell();
diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx
index 35aa82ed6c17..3634dd120a69 100644
--- a/sw/source/ui/inc/inpdlg.hxx
+++ b/sw/source/ui/inc/inpdlg.hxx
@@ -2,7 +2,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
@@ -46,27 +46,27 @@ class SwWrtShell;
class SwFldInputDlg: public SvxStandardDialog
{
- virtual void Apply();
+ virtual void Apply();
virtual void StateChanged( StateChangedType );
- SwWrtShell &rSh;
- SwInputField* pInpFld;
- SwSetExpField* pSetFld;
- SwUserFieldType* pUsrType;
+ SwWrtShell &rSh;
+ SwInputField* pInpFld;
+ SwSetExpField* pSetFld;
+ SwUserFieldType* pUsrType;
- Edit aLabelED;
+ Edit aLabelED;
- MultiLineEdit aEditED;
+ MultiLineEdit aEditED;
FixedLine aEditFL;
- OKButton aOKBT;
- CancelButton aCancelBT;
- PushButton aNextBT;
- HelpButton aHelpBT;
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ PushButton aNextBT;
+ HelpButton aHelpBT;
DECL_LINK(NextHdl, PushButton*);
public:
- SwFldInputDlg( Window *pParent, SwWrtShell &rSh,
+ SwFldInputDlg( Window *pParent, SwWrtShell &rSh,
SwField* pField, BOOL bNextButton = FALSE );
~SwFldInputDlg();
};
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx
index 72750bb7d251..e409b1b9f453 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/ui/inc/inputwin.hxx
@@ -2,7 +2,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
@@ -46,11 +46,11 @@ public:
InputEdit(Window* pParent, WinBits nStyle) :
Edit(pParent , nStyle){}
- void UpdateRange(const String& aSel,
+ void UpdateRange(const String& aSel,
const String& aTblName );
protected:
- virtual void KeyInput( const KeyEvent& );
+ virtual void KeyInput( const KeyEvent& );
};
//========================================================================
@@ -59,23 +59,23 @@ class SwInputWindow : public ToolBox
{
friend class InputEdit;
- Edit aPos;
- InputEdit aEdit;
- PopupMenu aPopMenu;
- SwFldMgr* pMgr;
- SwWrtShell* pWrtShell;
- SwView* pView;
+ Edit aPos;
+ InputEdit aEdit;
+ PopupMenu aPopMenu;
+ SwFldMgr* pMgr;
+ SwWrtShell* pWrtShell;
+ SwView* pView;
SfxBindings* pBindings;
- String aAktTableName, sOldFml;
- USHORT nActionCnt;
+ String aAktTableName, sOldFml;
+ USHORT nActionCnt;
- BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf
- BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel
- BOOL bIsTable : 1;
- BOOL bDelSel : 1;
- BOOL bDoesUndo : 1;
- BOOL bResetUndo : 1;
- BOOL bCallUndo : 1;
+ BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf
+ BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel
+ BOOL bIsTable : 1;
+ BOOL bDelSel : 1;
+ BOOL bDoesUndo : 1;
+ BOOL bResetUndo : 1;
+ BOOL bCallUndo : 1;
void DelBoxCntnt();
@@ -84,35 +84,35 @@ friend class InputEdit;
using Window::IsActive;
protected:
- virtual void Resize();
- virtual void Click();
+ virtual void Resize();
+ virtual void Click();
DECL_LINK( MenuHdl, Menu * );
DECL_LINK( DropdownClickHdl, ToolBox* );
- void ApplyFormula();
- void CancelFormula();
+ void ApplyFormula();
+ void CancelFormula();
public:
SwInputWindow( Window* pParent, SfxBindings* pBindings );
- virtual ~SwInputWindow();
+ virtual ~SwInputWindow();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- void SelectHdl( ToolBox*);
-
- void ShowWin();
-
- BOOL IsActive(){ return bActive; };
-
+ void SelectHdl( ToolBox*);
+
+ void ShowWin();
+
+ BOOL IsActive(){ return bActive; };
+
DECL_LINK( SelTblCellsNotify, SwWrtShell * );
- void SetFormula( const String& rFormula, BOOL bDelSel = TRUE );
- const SwView* GetView() const{return pView;}
+ void SetFormula( const String& rFormula, BOOL bDelSel = TRUE );
+ const SwView* GetView() const{return pView;}
};
class SwInputChild : public SfxChildWindow
{
- BOOL bObjVis;
- SfxDispatcher* pDispatch;
+ BOOL bObjVis;
+ SfxDispatcher* pDispatch;
public:
SwInputChild( Window* ,
USHORT nId,
@@ -120,10 +120,10 @@ public:
SfxChildWinInfo* );
~SwInputChild();
SFX_DECL_CHILDWINDOW( SwInputChild );
- void SetFormula( const String& rFormula, BOOL bDelSel = TRUE )
+ void SetFormula( const String& rFormula, BOOL bDelSel = TRUE )
{ ((SwInputWindow*)pWindow)->SetFormula(
rFormula, bDelSel ); }
- const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();}
+ const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();}
};
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx
index 3e16d9f75840..208709f40d9a 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/ui/inc/insfnote.hxx
@@ -2,7 +2,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
@@ -39,30 +39,30 @@ class SwWrtShell;
class SwInsFootNoteDlg: public SvxStandardDialog
{
- SwWrtShell &rSh;
+ SwWrtShell &rSh;
//Alles fuer das/die Zeichen
- String aFontName;
- CharSet eCharSet;
- char cExtChar;
- BOOL bExtCharAvailable;
- BOOL bEdit;
- RadioButton aNumberAutoBtn;
- RadioButton aNumberCharBtn;
- Edit aNumberCharEdit;
- PushButton aNumberExtChar;
+ String aFontName;
+ CharSet eCharSet;
+ char cExtChar;
+ BOOL bExtCharAvailable;
+ BOOL bEdit;
+ RadioButton aNumberAutoBtn;
+ RadioButton aNumberCharBtn;
+ Edit aNumberCharEdit;
+ PushButton aNumberExtChar;
FixedLine aNumberFL;
//Alles fuer die Auswahl Fussnote/Endnote
- RadioButton aFtnBtn;
- RadioButton aEndNoteBtn;
+ RadioButton aFtnBtn;
+ RadioButton aEndNoteBtn;
FixedLine aTypeFL;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- ImageButton aPrevBT;
- ImageButton aNextBT;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ ImageButton aPrevBT;
+ ImageButton aNextBT;
DECL_LINK( NumberCharHdl, Button * );
DECL_LINK( NumberEditHdl, void * );
@@ -70,9 +70,9 @@ class SwInsFootNoteDlg: public SvxStandardDialog
DECL_LINK( NumberExtCharHdl, Button *);
DECL_LINK( NextPrevHdl, Button * );
- virtual void Apply();
+ virtual void Apply();
- void Init();
+ void Init();
public:
SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE);
diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx
index e6d02f2ac22d..d9066762acdd 100644
--- a/sw/source/ui/inc/insrule.hxx
+++ b/sw/source/ui/inc/insrule.hxx
@@ -2,7 +2,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
@@ -37,14 +37,14 @@ class ValueSet;
class SwInsertGrfRulerDlg : public SfxModalDialog
{
FixedLine aSelectionFL;
- OKButton aOkPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOkPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
- List aGrfNames;
- String sSimple;
+ List aGrfNames;
+ String sSimple;
String sRulers;
- USHORT nSelPos;
+ USHORT nSelPos;
SwRulerValueSet* pExampleVS;
@@ -56,9 +56,9 @@ public:
SwInsertGrfRulerDlg( Window* pParent );
~SwInsertGrfRulerDlg();
- String GetGraphicName();
- BOOL IsSimpleLine() {return nSelPos == 1;}
- BOOL HasImages() const {return 0 != aGrfNames.Count();}
+ String GetGraphicName();
+ BOOL IsSimpleLine() {return nSelPos == 1;}
+ BOOL HasImages() const {return 0 != aGrfNames.Count();}
};
#endif
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx
index a65320e294a6..24b7a71e9f7b 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/ui/inc/instable.hxx
@@ -2,7 +2,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
@@ -49,29 +49,29 @@ class SwInsTableDlg : public SfxModalDialog
FixedLine aFL;
FixedText aColLbl;
- NumericField aColEdit;
- FixedText aRowLbl;
- NumericField aRowEdit;
+ NumericField aColEdit;
+ FixedText aRowLbl;
+ NumericField aRowEdit;
FixedLine aOptionsFL;
CheckBox aHeaderCB;
- CheckBox aRepeatHeaderCB;
- FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
- FixedText aRepeatHeaderBeforeFT;
- NumericField aRepeatHeaderNF;
- FixedText aRepeatHeaderAfterFT;
- TextControlCombo aRepeatHeaderCombo;
+ CheckBox aRepeatHeaderCB;
+ FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
+ FixedText aRepeatHeaderBeforeFT;
+ NumericField aRepeatHeaderNF;
+ FixedText aRepeatHeaderAfterFT;
+ TextControlCombo aRepeatHeaderCombo;
- CheckBox aDontSplitCB;
- CheckBox aBorderCB;
+ CheckBox aDontSplitCB;
+ CheckBox aBorderCB;
OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- PushButton aAutoFmtBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ PushButton aAutoFmtBtn;
- SwWrtShell* pShell;
- SwTableAutoFmt* pTAutoFmt;
+ SwWrtShell* pShell;
+ SwTableAutoFmt* pTAutoFmt;
sal_Int64 nEnteredValRepeatHeaderNF;
DECL_LINK( ModifyName, Edit * );
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index b1529ba85afd..b931de046030 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -2,7 +2,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
@@ -52,11 +52,11 @@ class SwJavaEditDialog : public SvxStandardDialog
{
private:
FixedText aTypeFT;
- Edit aTypeED;
+ Edit aTypeED;
RadioButton aUrlRB;
RadioButton aEditRB;
- PushButton aUrlPB;
- Edit aUrlED;
+ PushButton aUrlPB;
+ Edit aUrlED;
MultiLineEdit aEditED;
FixedLine aPostItFL;
@@ -69,7 +69,7 @@ private:
String aText;
String aType;
- BOOL bNew;
+ BOOL bNew;
BOOL bIsUrl;
SwScriptField* pFld;
@@ -85,10 +85,10 @@ private:
DECL_LINK( InsertFileHdl, PushButton * );
DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper * );
- virtual void Apply();
+ virtual void Apply();
- void CheckTravel();
- void SetFld();
+ void CheckTravel();
+ void SetFld();
using Window::GetText;
using Window::GetType;
@@ -98,9 +98,9 @@ public:
~SwJavaEditDialog();
String GetText() { return aText; }
-
+
String GetType() { return aType; }
-
+
BOOL IsUrl() { return bIsUrl; }
BOOL IsNew() { return bNew; }
BOOL IsUpdate();
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index 20791d16c43a..debf93978dfe 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -2,7 +2,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
@@ -45,19 +45,19 @@ class Printer;
class SwLabDlg : public SfxTabDialog
{
- SwLabelConfig aLabelsCfg;
- SwNewDBMgr* pNewDBMgr;
- SwLabPrtPage* pPrtPage;
-
- SvUShorts aTypeIds;
- SvStringsDtor aMakes;
-
- SwLabRecs* pRecs;
- String aLstGroup;
- String sBusinessCardDlg;
- String sFormat;
- String sMedium;
- BOOL m_bLabel;
+ SwLabelConfig aLabelsCfg;
+ SwNewDBMgr* pNewDBMgr;
+ SwLabPrtPage* pPrtPage;
+
+ SvUShorts aTypeIds;
+ SvStringsDtor aMakes;
+
+ SwLabRecs* pRecs;
+ String aLstGroup;
+ String sBusinessCardDlg;
+ String sFormat;
+ String sMedium;
+ BOOL m_bLabel;
void _ReplaceGroup( const String &rMake );
virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
@@ -67,17 +67,17 @@ public:
SwNewDBMgr* pNewDBMgr, BOOL bLabel);
~SwLabDlg();
- SwLabRec* GetRecord(const String &rRecName, BOOL bCont);
- void GetLabItem(SwLabItem &rItem);
+ SwLabRec* GetRecord(const String &rRecName, BOOL bCont);
+ void GetLabItem(SwLabItem &rItem);
- SwLabRecs &Recs() { return *pRecs; }
- const SwLabRecs &Recs() const { return *pRecs; }
+ SwLabRecs &Recs() { return *pRecs; }
+ const SwLabRecs &Recs() const { return *pRecs; }
- SvUShorts &TypeIds() { return aTypeIds; }
+ SvUShorts &TypeIds() { return aTypeIds; }
const SvUShorts &TypeIds() const { return aTypeIds; }
- SvStringsDtor &Makes() { return aMakes; }
- const SvStringsDtor &Makes() const { return aMakes; }
+ SvStringsDtor &Makes() { return aMakes; }
+ const SvStringsDtor &Makes() const { return aMakes; }
Printer *GetPrt();
inline void ReplaceGroup( const String &rMake );
diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx
index 34b5e0786d8e..f178c91fc824 100644
--- a/sw/source/ui/inc/labelcfg.hxx
+++ b/sw/source/ui/inc/labelcfg.hxx
@@ -2,7 +2,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
@@ -47,12 +47,12 @@ public:
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr);
+ void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr);
const com::sun::star::uno::Sequence<rtl::OUString>&
GetManufacturers() const {return aNodeNames;}
- sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType);
- void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType,
+ sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType);
+ void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType,
const SwLabRec& rRec);
};
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx
index 197887906b45..c36538b1d38d 100644
--- a/sw/source/ui/inc/labimg.hxx
+++ b/sw/source/ui/inc/labimg.hxx
@@ -2,7 +2,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
@@ -48,80 +48,80 @@ public:
virtual int operator ==(const SfxPoolItem& rItem) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
-
- rtl::OUString aLstMake; //Letzte Auswahl merken.
- rtl::OUString aLstType;
- rtl::OUString sDBName; // Verwendete Datenbank
-
- rtl::OUString aWriting; // Aufschrift
- rtl::OUString aMake; // Etikettenmarke
- rtl::OUString aType; // Etikettentyp
- rtl::OUString aBin; // Druckerschacht
- sal_Int32 lHDist; // Horizontaler Abstand (Benutzer)
- sal_Int32 lVDist; // Vertikaler Abstand (Benutzer)
- sal_Int32 lWidth; // Breite (Benutzer)
- sal_Int32 lHeight; // Hoehe (Benutzer)
- sal_Int32 lLeft; // Rand links (Benutzer)
- sal_Int32 lUpper; // Rand oben (Benutzer)
- sal_Int32 nCols; // Anzahl Spalten (Benutzer)
- sal_Int32 nRows; // Anzahl Zeilen (Benutzer)
- sal_Int32 nCol; // Spalte fuer Einzeldruck
- sal_Int32 nRow; // Zeile fuer Einzeldruck
- sal_Bool bAddr;// Adresse als Aufschrift?
- sal_Bool bCont;// Endlospapier?
- sal_Bool bPage;// Ganze Seite oder einzelnes Etikett?
- sal_Bool bSynchron;// Alle Etiketten synchronisieren
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+
+ rtl::OUString aLstMake; //Letzte Auswahl merken.
+ rtl::OUString aLstType;
+ rtl::OUString sDBName; // Verwendete Datenbank
+
+ rtl::OUString aWriting; // Aufschrift
+ rtl::OUString aMake; // Etikettenmarke
+ rtl::OUString aType; // Etikettentyp
+ rtl::OUString aBin; // Druckerschacht
+ sal_Int32 lHDist; // Horizontaler Abstand (Benutzer)
+ sal_Int32 lVDist; // Vertikaler Abstand (Benutzer)
+ sal_Int32 lWidth; // Breite (Benutzer)
+ sal_Int32 lHeight; // Hoehe (Benutzer)
+ sal_Int32 lLeft; // Rand links (Benutzer)
+ sal_Int32 lUpper; // Rand oben (Benutzer)
+ sal_Int32 nCols; // Anzahl Spalten (Benutzer)
+ sal_Int32 nRows; // Anzahl Zeilen (Benutzer)
+ sal_Int32 nCol; // Spalte fuer Einzeldruck
+ sal_Int32 nRow; // Zeile fuer Einzeldruck
+ sal_Bool bAddr;// Adresse als Aufschrift?
+ sal_Bool bCont;// Endlospapier?
+ sal_Bool bPage;// Ganze Seite oder einzelnes Etikett?
+ sal_Bool bSynchron;// Alle Etiketten synchronisieren
//parts of the business card
- rtl::OUString aPrivFirstName;
- rtl::OUString aPrivName;
- rtl::OUString aPrivShortCut;
- rtl::OUString aPrivFirstName2;
- rtl::OUString aPrivName2;
- rtl::OUString aPrivShortCut2;
- rtl::OUString aPrivStreet;
- rtl::OUString aPrivZip;
- rtl::OUString aPrivCity;
- rtl::OUString aPrivCountry;
- rtl::OUString aPrivState;
- rtl::OUString aPrivTitle;
- rtl::OUString aPrivProfession;
- rtl::OUString aPrivPhone;
- rtl::OUString aPrivMobile;
- rtl::OUString aPrivFax;
- rtl::OUString aPrivWWW;
- rtl::OUString aPrivMail;
- rtl::OUString aCompCompany;
- rtl::OUString aCompCompanyExt;
- rtl::OUString aCompSlogan;
- rtl::OUString aCompStreet;
- rtl::OUString aCompZip;
- rtl::OUString aCompCity;
- rtl::OUString aCompCountry;
- rtl::OUString aCompState;
- rtl::OUString aCompPosition;
- rtl::OUString aCompPhone;
- rtl::OUString aCompMobile;
- rtl::OUString aCompFax;
- rtl::OUString aCompWWW;
- rtl::OUString aCompMail;
-
- rtl::OUString sGlossaryGroup;
- rtl::OUString sGlossaryBlockName;
+ rtl::OUString aPrivFirstName;
+ rtl::OUString aPrivName;
+ rtl::OUString aPrivShortCut;
+ rtl::OUString aPrivFirstName2;
+ rtl::OUString aPrivName2;
+ rtl::OUString aPrivShortCut2;
+ rtl::OUString aPrivStreet;
+ rtl::OUString aPrivZip;
+ rtl::OUString aPrivCity;
+ rtl::OUString aPrivCountry;
+ rtl::OUString aPrivState;
+ rtl::OUString aPrivTitle;
+ rtl::OUString aPrivProfession;
+ rtl::OUString aPrivPhone;
+ rtl::OUString aPrivMobile;
+ rtl::OUString aPrivFax;
+ rtl::OUString aPrivWWW;
+ rtl::OUString aPrivMail;
+ rtl::OUString aCompCompany;
+ rtl::OUString aCompCompanyExt;
+ rtl::OUString aCompSlogan;
+ rtl::OUString aCompStreet;
+ rtl::OUString aCompZip;
+ rtl::OUString aCompCity;
+ rtl::OUString aCompCountry;
+ rtl::OUString aCompState;
+ rtl::OUString aCompPosition;
+ rtl::OUString aCompPhone;
+ rtl::OUString aCompMobile;
+ rtl::OUString aCompFax;
+ rtl::OUString aCompWWW;
+ rtl::OUString aCompMail;
+
+ rtl::OUString sGlossaryGroup;
+ rtl::OUString sGlossaryBlockName;
};
// class SwLabCfgItem -------------------------------------------------------
class SwLabCfgItem : public utl::ConfigItem
{
- SwLabItem aItem;
- sal_Bool bIsLabel;
+ SwLabItem aItem;
+ sal_Bool bIsLabel;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
SwLabCfgItem(sal_Bool bLabel);
- SwLabItem& GetItem() {return aItem;}
+ SwLabItem& GetItem() {return aItem;}
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx
index c798a34c7b93..21bdfa05040f 100644
--- a/sw/source/ui/inc/langhelper.hxx
+++ b/sw/source/ui/inc/langhelper.hxx
@@ -2,7 +2,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
@@ -42,26 +42,26 @@ namespace SwLangHelper
extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh );
extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
-// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
+// extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet );
-// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet );
+// extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void ResetLanguages( SwWrtShell &rWrtSh, bool bIsForSelection );
-// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection );
+// extern void ResetLanguages( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection );
extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection );
-
+
// document
extern void SelectCurrentPara( SwWrtShell &rWrtSh );
// EditView
extern void SelectPara( EditView &rEditView, const ESelection &rCurSel );
-
+
extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection );
extern String GetTextForLanguageGuessing( SwWrtShell &rSh );
-
+
extern LanguageType GetLanguage( SfxItemSet aSet, USHORT nLangWhichId );
extern LanguageType GetLanguage( SwWrtShell &rSh, USHORT nLangWhichId );
-
+
extern LanguageType GetCurrentLanguage( SfxItemSet aSet, USHORT nScriptType );
extern LanguageType GetCurrentLanguage( SwWrtShell &rSh );
}
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx
index e8a7c800aa93..ae99c2f505f2 100644
--- a/sw/source/ui/inc/linenum.hxx
+++ b/sw/source/ui/inc/linenum.hxx
@@ -2,7 +2,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
@@ -62,31 +62,31 @@ public:
--------------------------------------------------------------------*/
class SwLineNumberingPage : public SfxTabPage
{
- CheckBox aNumberingOnCB;
- FixedText aCharStyleFT;
- ListBox aCharStyleLB;
- FixedText aFormatFT;
- SwNumberingTypeListBox aFormatLB;
- FixedText aPosFT;
- ListBox aPosLB;
- FixedText aOffsetFT;
- MetricField aOffsetMF;
- FixedText aNumIntervalFT;
- NumericField aNumIntervalNF;
- FixedText aNumRowsFT;
+ CheckBox aNumberingOnCB;
+ FixedText aCharStyleFT;
+ ListBox aCharStyleLB;
+ FixedText aFormatFT;
+ SwNumberingTypeListBox aFormatLB;
+ FixedText aPosFT;
+ ListBox aPosLB;
+ FixedText aOffsetFT;
+ MetricField aOffsetMF;
+ FixedText aNumIntervalFT;
+ NumericField aNumIntervalNF;
+ FixedText aNumRowsFT;
FixedLine aDisplayFL;
- FixedText aDivisorFT;
- Edit aDivisorED;
- FixedText aDivIntervalFT;
- NumericField aDivIntervalNF;
- FixedText aDivRowsFT;
+ FixedText aDivisorFT;
+ Edit aDivisorED;
+ FixedText aDivIntervalFT;
+ NumericField aDivIntervalNF;
+ FixedText aDivRowsFT;
FixedLine aDivisorFL;
- CheckBox aCountEmptyLinesCB;
- CheckBox aCountFrameLinesCB;
- CheckBox aRestartEachPageCB;
+ CheckBox aCountEmptyLinesCB;
+ CheckBox aCountFrameLinesCB;
+ CheckBox aRestartEachPageCB;
FixedLine aCountFL;
- SwWrtShell* pSh;
+ SwWrtShell* pSh;
SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet );
~SwLineNumberingPage();
@@ -96,10 +96,10 @@ class SwLineNumberingPage : public SfxTabPage
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/ui/inc/listsh.hxx
index 30a97c04c0f2..939f3cc6ef3c 100644
--- a/sw/source/ui/inc/listsh.hxx
+++ b/sw/source/ui/inc/listsh.hxx
@@ -2,7 +2,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
@@ -38,8 +38,8 @@ public:
SwListShell(SwView &rView);
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
};
#endif
diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx
index bb6cb134e34b..1872e5394a6d 100644
--- a/sw/source/ui/inc/macassgn.hxx
+++ b/sw/source/ui/inc/macassgn.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx
index 9f2929771891..fded1cb9fcd7 100644
--- a/sw/source/ui/inc/mailconfigpage.hxx
+++ b/sw/source/ui/inc/mailconfigpage.hxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ class SwMailConfigPage : public SfxTabPage
friend class SwTestAccountSettingsDialog;
FixedLine m_aIdentityFL;
-
+
FixedText m_aDisplayNameFT;
Edit m_aDisplayNameED;
FixedText m_aAddressFT;
@@ -52,7 +52,7 @@ class SwMailConfigPage : public SfxTabPage
CheckBox m_aReplyToCB;
FixedText m_aReplyToFT;
Edit m_aReplyToED;
-
+
FixedLine m_aSMTPFL;
FixedText m_aServerFT;
@@ -60,10 +60,10 @@ class SwMailConfigPage : public SfxTabPage
FixedText m_aPortFT;
NumericField m_aPortNF;
- CheckBox m_aSecureCB;
+ CheckBox m_aSecureCB;
PushButton m_aServerAuthenticationPB;
-
+
FixedLine m_aSeparatorFL;
PushButton m_aTestPB;
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/ui/inc/maildispatcher.hxx
index ad5521d3814a..5e1ec613356c 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -2,7 +2,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
@@ -43,25 +43,25 @@ class IMailDispatcherListener;
A MailDispatcher should be used for sending a bunch a mail messages
asynchronously. Usually a client enqueues a number of mail messages
and then calls start to begin sending them. An instance of this class
- must not be shared among different client threads. Instead each client
+ must not be shared among different client threads. Instead each client
thread should create an own instance of this class.
-*/
+*/
class MailDispatcher : public ::salhelper::ReferenceObject, private ::osl::Thread
{
public:
- // bringing operator new/delete into scope
+ // bringing operator new/delete into scope
using osl::Thread::operator new;
using osl::Thread::operator delete;
using osl::Thread::join;
-
+
public:
- /**
+ /**
@param xSmtpService
[in] a reference to a mail server. A user must be
connected to the mail server otherwise errors occur
during the delivery of mail messages.
-
+
@throws ::com::sun::star::uno::RuntimeException
on errors during construction of an instance of this class.
*/
@@ -70,39 +70,39 @@ public:
/**
Shutdown the mail dispatcher. Every mail messages
not yet sent will be discarded.
- */
+ */
virtual ~MailDispatcher();
-
+
/**
Enqueue a mail message for delivery. A client must
- start the mail dispatcher in order to send the
+ start the mail dispatcher in order to send the
enqueued mail messages.
-
+
@param xMailMessage
[in] a mail message that should be send.
*/
void enqueueMailMessage(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage);
- /**
- Dequeues a mail message.
+ /**
+ Dequeues a mail message.
This enables the caller to remove attachments when sending mails is to be cancelled.
*/
::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> dequeueMailMessage();
-
+
/**
Start sending mail messages asynchronously. A client may register
- a listener for mail dispatcher events. For every mail message sent
- the notification will be sent. While handling such notification a
+ a listener for mail dispatcher events. For every mail message sent
+ the notification will be sent. While handling such notification a
client may enqueue new mail messages. If there are no more mail
messages to send an respective notification is sent and the mail
dispatcher waits for more mail messages.
-
+
@precond not isStarted()
*/
void start();
-
+
/**
Stop sending mail messages.
-
+
@precond isStarted()
*/
void stop();
@@ -114,52 +114,52 @@ public:
mail dispatcher thread will never end.
*/
void shutdown();
-
+
/**
Check whether the mail dispatcher is started or not.
-
- @return
+
+ @return
<TRUE/> if the sending thread is running.
*/
bool isStarted() const;
-
+
/** returns if the thread is still running
*/
using osl::Thread::isRunning;
-
+
/** returns if shutdown has already been called
*/
- bool isShutdownRequested() const
- { return shutdown_requested_; }
+ bool isShutdownRequested() const
+ { return shutdown_requested_; }
/**
Register a listener for mail dispatcher events.
*/
void addListener(::rtl::Reference<IMailDispatcherListener> listener);
-
+
/**
Unregister a listener for mail dispatcher events
*/
void removeListener(::rtl::Reference<IMailDispatcherListener> listener);
-
+
protected:
virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
private:
std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener();
- void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message);
-
-private:
- ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_;
+ void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message);
+
+private:
+ ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_;
::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage > > messages_;
- ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_;
+ ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_;
::osl::Mutex message_container_mutex_;
- ::osl::Mutex listener_container_mutex_;
+ ::osl::Mutex listener_container_mutex_;
::osl::Mutex thread_status_mutex_;
::osl::Condition mail_dispatcher_active_;
- ::osl::Condition wakening_call_;
+ ::osl::Condition wakening_call_;
::rtl::Reference<MailDispatcher> m_xSelfReference;
- bool run_;
+ bool run_;
bool shutdown_requested_;
};
diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/ui/inc/mailmergechildwindow.hxx
index afa4af930ce4..f79055a837f0 100644
--- a/sw/source/ui/inc/mailmergechildwindow.hxx
+++ b/sw/source/ui/inc/mailmergechildwindow.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx
index f2e160ab81c7..9aec2cb3e515 100644
--- a/sw/source/ui/inc/mailmergehelper.hxx
+++ b/sw/source/ui/inc/mailmergehelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx
index ea413b445b13..da0e68442be6 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/ui/inc/mailmergewizard.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ class SwMailMergeConfigItem;
#define MM_MERGEPAGE 6
#define MM_OUTPUTPAGE 7
-class SwMailMergeWizard : public ::svt::RoadmapWizard
+class SwMailMergeWizard : public ::svt::RoadmapWizard
{
SwView* m_pSwView;
String sDocumentURL;
@@ -69,11 +69,11 @@ protected:
virtual svt::OWizardPage* createPage(WizardState _nState);
virtual void enterState( WizardState _nState );
-// roadmap feature ??
+// roadmap feature ??
// virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
virtual String getStateDisplayName( WizardState _nState ) const;
-public:
+public:
SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
~SwMailMergeWizard();
@@ -92,13 +92,13 @@ public:
sal_uInt16 GetRestartPage() const {return m_nRestartPage;}
void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;}
- sal_Bool skipUntil( sal_uInt16 nPage)
+ sal_Bool skipUntil( sal_uInt16 nPage)
{return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));}
- void updateRoadmapItemLabel( WizardState _nState );
+ void updateRoadmapItemLabel( WizardState _nState );
- virtual short Execute();
- virtual void StartExecuteModal( const Link& rEndDialogHdl );
+ virtual short Execute();
+ virtual void StartExecuteModal( const Link& rEndDialogHdl );
};
#endif
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index 810f98adf492..b229e511e6b0 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -2,7 +2,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
@@ -63,62 +63,62 @@ class SwMailMergeDlg : public SvxStandardDialog
Window* pBeamerWin;
RadioButton aAllRB;
- RadioButton aMarkedRB;
- RadioButton aFromRB;
- NumericField aFromNF;
- FixedText aBisFT;
- NumericField aToNF;
+ RadioButton aMarkedRB;
+ RadioButton aFromRB;
+ NumericField aFromNF;
+ FixedText aBisFT;
+ NumericField aToNF;
FixedLine aRecordFL;
FixedLine aSeparatorFL;
RadioButton aPrinterRB;
- RadioButton aMailingRB;
- RadioButton aFileRB;
+ RadioButton aMailingRB;
+ RadioButton aFileRB;
- CheckBox aSingleJobsCB;
+ CheckBox aSingleJobsCB;
FixedLine aSaveMergedDocumentFL;
RadioButton aSaveSingleDocRB;
RadioButton aSaveIndividualRB;
CheckBox aGenerateFromDataBaseCB;
-
+
FixedText aColumnFT;
ListBox aColumnLB;
FixedText aPathFT;
- Edit aPathED;
- PushButton aPathPB;
+ Edit aPathED;
+ PushButton aPathPB;
FixedText aFilterFT;
ListBox aFilterLB;
- ListBox aAddressFldLB;
- FixedText aSubjectFT;
- Edit aSubjectED;
- FixedText aFormatFT;
- FixedText aAttachFT;
- Edit aAttachED;
- PushButton aAttachPB;
- CheckBox aFormatHtmlCB;
- CheckBox aFormatRtfCB;
- CheckBox aFormatSwCB;
+ ListBox aAddressFldLB;
+ FixedText aSubjectFT;
+ Edit aSubjectED;
+ FixedText aFormatFT;
+ FixedText aAttachFT;
+ Edit aAttachED;
+ PushButton aAttachPB;
+ CheckBox aFormatHtmlCB;
+ CheckBox aFormatRtfCB;
+ CheckBox aFormatSwCB;
FixedLine aDestFL;
FixedLine aBottomSeparatorFL;
OKButton aOkBTN;
- CancelButton aCancelBTN;
- HelpButton aHelpBTN;
+ CancelButton aCancelBTN;
+ HelpButton aHelpBTN;
SwMailMergeDlg_Impl* pImpl;
SwWrtShell& rSh;
SwModuleOptions* pModOpt;
- const String& rDBName;
- const String& rTableName;
+ const String& rDBName;
+ const String& rTableName;
- USHORT nMergeType;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection;
+ USHORT nMergeType;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
Size m_aDialogSize;
@@ -133,7 +133,7 @@ class SwMailMergeDlg : public SvxStandardDialog
DECL_LINK( ModifyHdl, NumericField* pLB );
DECL_LINK( SaveTypeHdl, RadioButton* pBtn );
- virtual void Apply();
+ virtual void Apply();
virtual void Resize();
bool ExecQryShell();
@@ -146,8 +146,8 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
~SwMailMergeDlg();
- inline USHORT GetMergeType() { return nMergeType; }
- const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;}
+ inline USHORT GetMergeType() { return nMergeType; }
+ const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;}
inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
@@ -180,9 +180,9 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog
OKButton aOK;
CancelButton aCancel;
HelpButton aHelp;
-public:
+public:
SwMailMergeFieldConnectionsDlg(Window* pParent);
- ~SwMailMergeFieldConnectionsDlg();
+ ~SwMailMergeFieldConnectionsDlg();
BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();}
};
diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/ui/inc/mediash.hxx
index d01dc6692d96..f90a18d551e6 100644
--- a/sw/source/ui/inc/mediash.hxx
+++ b/sw/source/ui/inc/mediash.hxx
@@ -2,7 +2,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
@@ -35,8 +35,8 @@ class SwMediaShell: public SwBaseShell
public:
SFX_DECL_INTERFACE(SW_MEDIASHELL)
- void ExecMedia(SfxRequest &);
- void GetMediaState(SfxItemSet &);
+ void ExecMedia(SfxRequest &);
+ void GetMediaState(SfxItemSet &);
SwMediaShell(SwView &rView);
};
diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx
index fb37057c40ec..0b765ea6cedc 100644
--- a/sw/source/ui/inc/mergetbl.hxx
+++ b/sw/source/ui/inc/mergetbl.hxx
@@ -2,7 +2,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
@@ -36,14 +36,14 @@
class SwMergeTblDlg : public SvxStandardDialog
{
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOKPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
FixedLine aMergeFL;
- RadioButton aMergePrevRB;
- RadioButton aMergeNextRB;
+ RadioButton aMergePrevRB;
+ RadioButton aMergeNextRB;
- BOOL& rMergePrev;
+ BOOL& rMergePrev;
protected:
virtual void Apply();
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index 39f33d39d677..6e71237edf06 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -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
@@ -30,78 +30,78 @@
#include "rcid.hrc"
-#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2)
+#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2)
-#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3)
-#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4)
+#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3)
+#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4)
-#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5)
-#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6)
+#define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5)
+#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6)
-#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7)
-#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8)
-#define DLG_NUMBERING (RC_MISC_BEGIN + 9)
-#define DLG_ZOOM (RC_MISC_BEGIN + 10)
-#define DLG_GLOSSARY (RC_MISC_BEGIN + 11)
-#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12)
+#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7)
+#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8)
+#define DLG_NUMBERING (RC_MISC_BEGIN + 9)
+#define DLG_ZOOM (RC_MISC_BEGIN + 10)
+#define DLG_GLOSSARY (RC_MISC_BEGIN + 11)
+#define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12)
#define DLG_DOC_FOOTNOTE (RC_MISC_BEGIN + 13)
-#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14)
-#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15)
-#define DLG_BIB_BASE (RC_MISC_BEGIN + 16)
-#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
-#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
-#define DLG_SORTING (RC_MISC_BEGIN + 19)
-#define DLG_CHARMAP (RC_MISC_BEGIN + 20)
-#define DLG_AUTOCORR (RC_MISC_BEGIN + 23)
-#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24)
-#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25)
-#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26)
+#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14)
+#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15)
+#define DLG_BIB_BASE (RC_MISC_BEGIN + 16)
+#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
+#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
+#define DLG_SORTING (RC_MISC_BEGIN + 19)
+#define DLG_CHARMAP (RC_MISC_BEGIN + 20)
+#define DLG_AUTOCORR (RC_MISC_BEGIN + 23)
+#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24)
+#define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25)
+#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26)
#define DLG_PRCNT_SET (RC_MISC_BEGIN + 27)
#define DLG_INSERT_RULER (RC_MISC_BEGIN + 28)
#define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29)
-#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
+#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
#define DLG_MOD_REDLINE_ACCEPT (RC_MISC_BEGIN + 32)
-#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
-#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31)
-#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
-#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
-#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
+#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
+#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31)
+#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
+#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
+#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
-#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40)
-#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41)
-#define MSG_SRTERR (RC_MISC_BEGIN + 42)
+#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40)
+#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41)
+#define MSG_SRTERR (RC_MISC_BEGIN + 42)
-#define STR_GLOSSARY (RC_MISC_BEGIN + 43)
-#define STR_CHANGE_START (RC_MISC_BEGIN + 44)
-#define STR_CHANGE_END (RC_MISC_BEGIN + 45)
+#define STR_GLOSSARY (RC_MISC_BEGIN + 43)
+#define STR_CHANGE_START (RC_MISC_BEGIN + 44)
+#define STR_CHANGE_END (RC_MISC_BEGIN + 45)
#define STR_SAVE_GLOSSARY (RC_MISC_BEGIN + 46)
#define STR_FULLNUMS_START (RC_MISC_BEGIN + 47)
-#define STR_FULLNUMS_1 (STR_FULLNUMS_START )
-#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1)
-#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2)
-#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3)
-#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4)
-#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5)
-#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6)
-#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7)
-
-#define STR_BULLET_THEME (RC_MISC_BEGIN + 55)
-#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56)
-
-#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60)
-#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61)
+#define STR_FULLNUMS_1 (STR_FULLNUMS_START )
+#define STR_FULLNUMS_2 (STR_FULLNUMS_START + 1)
+#define STR_FULLNUMS_3 (STR_FULLNUMS_START + 2)
+#define STR_FULLNUMS_4 (STR_FULLNUMS_START + 3)
+#define STR_FULLNUMS_5 (STR_FULLNUMS_START + 4)
+#define STR_FULLNUMS_6 (STR_FULLNUMS_START + 5)
+#define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6)
+#define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7)
+
+#define STR_BULLET_THEME (RC_MISC_BEGIN + 55)
+#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56)
+
+#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60)
+#define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61)
#define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62)
-#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63)
-#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64)
+#define STRRES_NUMTYPES (RC_MISC_BEGIN + 63)
+#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64)
-#define MISC_ACT_END STRRES_NUMTYPES
+#define MISC_ACT_END STRRES_NUMTYPES
#if MISC_ACT_END > RC_MISC_END
#error Resource-Id Ueberlauf in #file, #line
#endif
-#endif // _MISC_HRC
+#endif // _MISC_HRC
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx
index 9fa90ea19c34..1bdace009700 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/ui/inc/mmconfigitem.hxx
@@ -2,7 +2,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
@@ -103,8 +103,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>
GetColumnsSupplier();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
GetResultSet() const;
void DisposeResultSet();
@@ -136,14 +136,14 @@ public:
sal_Bool IsAddressBlock()const;
void SetAddressBlock(sal_Bool bSet);
-
+
sal_Bool IsHideEmptyParagraphs() const;
void SetHideEmptyParagraphs(sal_Bool bSet);
- const com::sun::star::uno::Sequence< ::rtl::OUString>
+ const com::sun::star::uno::Sequence< ::rtl::OUString>
GetAddressBlocks() const;
void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks);
-
+
void SetCurrentAddressBlockIndex( sal_Int32 nSet );
sal_Int32 GetCurrentAddressBlockIndex() const;
@@ -178,7 +178,7 @@ public:
bool IsAddressFieldsAssigned() const;
bool IsGreetingFieldsAssigned() const;
- //e-Mail settings:
+ //e-Mail settings:
::rtl::OUString GetMailDisplayName() const;
void SetMailDisplayName(const ::rtl::OUString& rName);
diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx
index e6b4ccc22c50..52da8a77b931 100644
--- a/sw/source/ui/inc/multmrk.hxx
+++ b/sw/source/ui/inc/multmrk.hxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@
class SwTOXMgr;
/*--------------------------------------------------------------------
- Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
+ Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
--------------------------------------------------------------------*/
class SwMultiTOXMarkDlg : public SvxStandardDialog
@@ -51,17 +51,17 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog
DECL_LINK( SelectHdl, ListBox * );
FixedLine aTOXFL;
- FixedText aEntryFT;
- FixedInfo aTextFT;
- FixedText aTOXFT;
- ListBox aTOXLB;
- OKButton aOkBT;
- CancelButton aCancelBT;
+ FixedText aEntryFT;
+ FixedInfo aTextFT;
+ FixedText aTOXFT;
+ ListBox aTOXLB;
+ OKButton aOkBT;
+ CancelButton aCancelBT;
- SwTOXMgr &rMgr;
- USHORT nPos;
+ SwTOXMgr &rMgr;
+ USHORT nPos;
- void Apply();
+ void Apply();
public:
SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr );
~SwMultiTOXMarkDlg();
diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx
index e7993325209c..8306ea4549c3 100644
--- a/sw/source/ui/inc/navicfg.hxx
+++ b/sw/source/ui/inc/navicfg.hxx
@@ -2,7 +2,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
@@ -32,13 +32,13 @@
class SwNavigationConfig : public utl::ConfigItem
{
- sal_Int32 nRootType; //RootType
- sal_Int32 nSelectedPos; //SelectedPosition
- sal_Int32 nOutlineLevel; //OutlineLevel
- sal_Int32 nRegionMode; //InsertMode
- sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState
- sal_Bool bIsSmall; //ShowListBox
- sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig?
+ sal_Int32 nRootType; //RootType
+ sal_Int32 nSelectedPos; //SelectedPosition
+ sal_Int32 nOutlineLevel; //OutlineLevel
+ sal_Int32 nRegionMode; //InsertMode
+ sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState
+ sal_Bool bIsSmall; //ShowListBox
+ sal_Bool bIsGlobalActive; //GlobalDocMode// Globalansicht fuer GlobalDoc gueltig?
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
@@ -49,8 +49,8 @@ public:
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- sal_Int32 GetRootType()const {return nRootType;}
- void SetRootType(sal_Int32 nSet){
+ sal_Int32 GetRootType()const {return nRootType;}
+ void SetRootType(sal_Int32 nSet){
if(nRootType != nSet)
{
SetModified();
@@ -58,8 +58,8 @@ public:
}
}
- sal_Int32 GetSelectedPos()const {return nSelectedPos;}
- void SetSelectedPos(sal_Int32 nSet){
+ sal_Int32 GetSelectedPos()const {return nSelectedPos;}
+ void SetSelectedPos(sal_Int32 nSet){
if(nSelectedPos != nSet)
{
SetModified();
@@ -68,8 +68,8 @@ public:
}
- sal_Int32 GetOutlineLevel()const {return nOutlineLevel;}
- void SetOutlineLevel(sal_Int32 nSet){
+ sal_Int32 GetOutlineLevel()const {return nOutlineLevel;}
+ void SetOutlineLevel(sal_Int32 nSet){
if(nOutlineLevel != nSet)
{
SetModified();
@@ -77,8 +77,8 @@ public:
}
}
- sal_Int32 GetRegionMode()const {return nRegionMode;}
- void SetRegionMode(sal_Int32 nSet){
+ sal_Int32 GetRegionMode()const {return nRegionMode;}
+ void SetRegionMode(sal_Int32 nSet){
if(nRegionMode != nSet)
{
SetModified();
@@ -88,7 +88,7 @@ public:
sal_Int32 GetActiveBlock()const {return nActiveBlock;}
- void SetActiveBlock(sal_Int32 nSet){
+ void SetActiveBlock(sal_Int32 nSet){
if(nActiveBlock != nSet)
{
SetModified();
@@ -96,8 +96,8 @@ public:
}
}
- sal_Bool IsSmall() const {return bIsSmall;}
- void SetSmall(sal_Bool bSet){
+ sal_Bool IsSmall() const {return bIsSmall;}
+ void SetSmall(sal_Bool bSet){
if(bIsSmall != bSet)
{
SetModified();
@@ -105,8 +105,8 @@ public:
}
}
- sal_Bool IsGlobalActive() const {return bIsGlobalActive;}
- void SetGlobalActive(sal_Bool bSet){
+ sal_Bool IsGlobalActive() const {return bIsGlobalActive;}
+ void SetGlobalActive(sal_Bool bSet){
if(bIsGlobalActive != bSet)
{
SetModified();
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx
index 94e833d41dc7..d9bce94770a0 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/ui/inc/navicont.hxx
@@ -2,7 +2,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
@@ -35,28 +35,28 @@ class SwDocShell;
class TransferDataContainer;
class TransferableDataHelper;
-/* [Beschreibung]
+/* [Beschreibung]
Navigator-Bookmark zur eindeutigen Identifizierung im Sw
*/
class NaviContentBookmark
{
- String aUrl; // URL inkl. Sprungmarke
- String aDescr; // Description
- long nDocSh; // Adresse der DocShell
- USHORT nDefDrag; // Description enthaelt defaultDragType
+ String aUrl; // URL inkl. Sprungmarke
+ String aDescr; // Description
+ long nDocSh; // Adresse der DocShell
+ USHORT nDefDrag; // Description enthaelt defaultDragType
public:
NaviContentBookmark();
NaviContentBookmark( const String &rUrl, const String& rDesc,
USHORT nDragType, const SwDocShell* );
- const String& GetURL() const { return aUrl; }
- const String& GetDescription() const { return aDescr; }
- USHORT GetDefaultDragType() const { return nDefDrag; }
- long GetDocShell() const { return nDocSh; }
- void Copy( TransferDataContainer& rData ) const;
- BOOL Paste( TransferableDataHelper& rData );
+ const String& GetURL() const { return aUrl; }
+ const String& GetDescription() const { return aDescr; }
+ USHORT GetDefaultDragType() const { return nDefDrag; }
+ long GetDocShell() const { return nDocSh; }
+ void Copy( TransferDataContainer& rData ) const;
+ BOOL Paste( TransferableDataHelper& rData );
};
#endif
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 21a3ecd4dcf4..2c042bc98bec 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -2,7 +2,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
@@ -52,8 +52,8 @@ class SwNavigationPI;
class SwNavHelpToolBox : public SwHelpToolBox
{
- virtual void MouseButtonDown(const MouseEvent &rEvt);
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void MouseButtonDown(const MouseEvent &rEvt);
+ virtual void RequestHelp( const HelpEvent& rHEvt );
public:
SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId);
};
@@ -67,44 +67,44 @@ class SwNavigationPI : public Window,
friend class SwGlobalTree;
// --------- members -----------------------------
- SwNavHelpToolBox aContentToolBox;
- SwHelpToolBox aGlobalToolBox;
- ImageList aContentImageList;
+ SwNavHelpToolBox aContentToolBox;
+ SwHelpToolBox aGlobalToolBox;
+ ImageList aContentImageList;
ImageList aContentImageListH;
- SwContentTree aContentTree;
+ SwContentTree aContentTree;
SwGlobalTree aGlobalTree;
- ListBox aDocListBox;
- Timer aPageChgTimer;
- String sContentFileName;
- String aContextArr[3];
- String aStatusArr[4];
- Point aBoxBottomLeft; // Pos., wenn Box unten ist
-
- SfxObjectShellLock *pxObjectShell;
- SwView *pContentView;
- SwWrtShell *pContentWrtShell;
- SwView *pActContView;
- SwView *pCreateView;
+ ListBox aDocListBox;
+ Timer aPageChgTimer;
+ String sContentFileName;
+ String aContextArr[3];
+ String aStatusArr[4];
+ Point aBoxBottomLeft; // Pos., wenn Box unten ist
+
+ SfxObjectShellLock *pxObjectShell;
+ SwView *pContentView;
+ SwWrtShell *pContentWrtShell;
+ SwView *pActContView;
+ SwView *pCreateView;
SfxPopupWindow *pPopupWindow;
SfxPopupWindow *pFloatingWindow;
SfxChildWindowContext* pContextWin;
- SwNavigationConfig *pConfig;
- SfxBindings &rBindings;
+ SwNavigationConfig *pConfig;
+ SfxBindings &rBindings;
- long nDocLBIniHeight;
- long nWishWidth;
- USHORT nAutoMarkIdx;
- USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link
- short nZoomIn;
- short nZoomOutInit;
- short nZoomOut;
+ long nDocLBIniHeight;
+ long nWishWidth;
+ USHORT nAutoMarkIdx;
+ USHORT nRegionMode; // 0 - URL, 1 - Bereich mit Link 2 - B. ohne Link
+ short nZoomIn;
+ short nZoomOutInit;
+ short nZoomOut;
- BOOL bSmallMode : 1;
- BOOL bIsZoomedIn : 1;
- BOOL bPageCtrlsVisible : 1;
- BOOL bGlobalMode : 1;
+ BOOL bSmallMode : 1;
+ BOOL bIsZoomedIn : 1;
+ BOOL bPageCtrlsVisible : 1;
+ BOOL bGlobalMode : 1;
// --------- methods -----------------------------
BOOL _IsZoomedIn() const {return bIsZoomedIn;}
@@ -139,43 +139,43 @@ class SwNavigationPI : public Window,
protected:
- virtual BOOL Close();
- virtual void Resize();
+ virtual BOOL Close();
+ virtual void Resize();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
// zum App-Ende rechtzeitig ObjectShellLock loslassen
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- NumEditAction& GetPageEdit();
- BOOL ToggleTree();
- void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;}
+ NumEditAction& GetPageEdit();
+ BOOL ToggleTree();
+ void SetGlobalMode(BOOL bSet) {bGlobalMode = bSet;}
public:
SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*);
~SwNavigationPI();
- void GotoPage(); // Seite anspringen; bindbare Funktion
+ void GotoPage(); // Seite anspringen; bindbare Funktion
- void Update() { FillBox(); }
- void UpdateListBox();
- void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds);
+ void Update() { FillBox(); }
+ void UpdateListBox();
+ void MoveOutline(USHORT nSource, USHORT nTarget, BOOL bWithCilds);
virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
- static String CreateDropFileName( TransferableDataHelper& rData );
- static void CleanEntry( String& rEntry );
+ static String CreateDropFileName( TransferableDataHelper& rData );
+ static void CleanEntry( String& rEntry );
- USHORT GetRegionDropMode() const {return nRegionMode;}
- void SetRegionDropMode(USHORT nNewMode);
+ USHORT GetRegionDropMode() const {return nRegionMode;}
+ void SetRegionDropMode(USHORT nNewMode);
- sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- BOOL IsGlobalDoc() const;
- BOOL IsGlobalMode() const {return bGlobalMode;}
+ BOOL IsGlobalDoc() const;
+ BOOL IsGlobalMode() const {return bGlobalMode;}
SwView* GetCreateView() const;
void CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus);
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 332ca4f81d50..0c293bad2ca1 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -2,7 +2,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
@@ -52,15 +52,15 @@ class SwOutlineTabDialog;
struct SwBmpItemInfo
{
- SvxBrushItem* pBrushItem;
- USHORT nItemId;
+ SvxBrushItem* pBrushItem;
+ USHORT nItemId;
};
/*-----------------07.02.97 15.37-------------------
--------------------------------------------------*/
-#define NUM_PAGETYPE_BULLET 0
+#define NUM_PAGETYPE_BULLET 0
#define NUM_PAGETYPE_SINGLENUM 1
#define NUM_PAGETYPE_NUM 2
#define NUM_PAGETYPE_BMP 3
@@ -73,20 +73,20 @@ class SwNumPositionTabPage : public SfxTabPage
{
FixedLine aPositionFL;
FixedLine aLevelFL;
- MultiListBox aLevelLB;
+ MultiListBox aLevelLB;
// --> OD 2008-02-01 #newlistlevelattrs#
// former set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
- FixedText aDistBorderFT;
- MetricField aDistBorderMF;
- CheckBox aRelativeCB;
- FixedText aIndentFT;
- MetricField aIndentMF;
- FixedText aDistNumFT;
- MetricField aDistNumMF;
- FixedText aAlignFT;
- ListBox aAlignLB;
+ FixedText aDistBorderFT;
+ MetricField aDistBorderMF;
+ CheckBox aRelativeCB;
+ FixedText aIndentFT;
+ MetricField aIndentMF;
+ FixedText aDistNumFT;
+ MetricField aDistNumMF;
+ FixedText aAlignFT;
+ ListBox aAlignLB;
// <--
// --> OD 2008-02-01 #newlistlevelattrs#
@@ -104,25 +104,25 @@ class SwNumPositionTabPage : public SfxTabPage
MetricField aIndentAtMF;
// <--
- PushButton aStandardPB;
+ PushButton aStandardPB;
- NumberingPreview aPreviewWIN;
+ NumberingPreview aPreviewWIN;
- SwNumRule* pActNum;
- SwNumRule* pSaveNum;
- SwWrtShell* pWrtSh;
+ SwNumRule* pActNum;
+ SwNumRule* pSaveNum;
+ SwWrtShell* pWrtSh;
- SwOutlineTabDialog* pOutlineDlg;
- USHORT nActNumLvl;
+ SwOutlineTabDialog* pOutlineDlg;
+ USHORT nActNumLvl;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
+ BOOL bModified : 1;
+ BOOL bPreset : 1;
+ BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
// --> OD 2008-02-01 #newlistlevelattrs#
bool bLabelAlignmentPosAndSpaceModeActive;
// <--
- void InitControls();
+ void InitControls();
DECL_LINK( LevelHdl, ListBox * );
DECL_LINK( EditModifyHdl, Edit*);
@@ -149,20 +149,20 @@ public:
const SfxItemSet& rSet);
~SwNumPositionTabPage();
- virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual void ActivatePage(const SfxItemSet& rSet);
+ virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
- void SetWrtShell(SwWrtShell* pSh);
+ void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
+ void SetWrtShell(SwWrtShell* pSh);
#if OSL_DEBUG_LEVEL > 1
- void SetModified(BOOL bRepaint = TRUE);
+ void SetModified(BOOL bRepaint = TRUE);
#else
- void SetModified(BOOL bRepaint = TRUE)
+ void SetModified(BOOL bRepaint = TRUE)
{ bModified = TRUE;
if(bRepaint)
{
@@ -175,14 +175,14 @@ public:
class SwSvxNumBulletTabDialog : public SfxTabDialog
{
- SwWrtShell& rWrtSh;
+ SwWrtShell& rWrtSh;
- String sRemoveText;
- int nRetOptionsDialog;
+ String sRemoveText;
+ int nRetOptionsDialog;
protected:
- virtual short Ok();
- virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage);
+ virtual short Ok();
+ virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage);
DECL_LINK(RemoveNumberingHdl, PushButton*);
public:
SwSvxNumBulletTabDialog(Window* pParent,
diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx
index 3ac0d047b436..68ba9615fc2a 100644
--- a/sw/source/ui/inc/numberingtypelistbox.hxx
+++ b/sw/source/ui/inc/numberingtypelistbox.hxx
@@ -2,7 +2,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
@@ -31,9 +31,9 @@
#include <vcl/lstbox.hxx>
#include "swdllapi.h"
-#define INSERT_NUM_TYPE_NO_NUMBERING 0x01
-#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02
-#define INSERT_NUM_TYPE_BITMAP 0x04
+#define INSERT_NUM_TYPE_NO_NUMBERING 0x01
+#define INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING 0x02
+#define INSERT_NUM_TYPE_BITMAP 0x04
#define INSERT_NUM_TYPE_BULLET 0x08
#define INSERT_NUM_EXTENDED_TYPES 0x10
@@ -48,10 +48,10 @@ public:
USHORT nTypeFlags = INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING|INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES );
~SwNumberingTypeListBox();
- void Reload(USHORT nTypeFlags);
+ void Reload(USHORT nTypeFlags);
- sal_Int16 GetSelectedNumberingType();
- sal_Bool SelectNumberingType(sal_Int16 nType);
+ sal_Int16 GetSelectedNumberingType();
+ sal_Bool SelectNumberingType(sal_Int16 nType);
};
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx
index 31ef802ebbb1..cb72486f718e 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/ui/inc/numfmtlb.hxx
@@ -2,7 +2,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
@@ -36,13 +36,13 @@ class SwView;
class SW_DLLPUBLIC NumFormatListBox : public ListBox
{
- short nCurrFormatType;
- USHORT nStdEntry;
- BOOL bOneArea;
- ULONG nDefFormat;
- SwView* pVw;
- SvNumberFormatter* pOwnFormatter;
- LanguageType eCurLanguage;
+ short nCurrFormatType;
+ USHORT nStdEntry;
+ BOOL bOneArea;
+ ULONG nDefFormat;
+ SwView* pVw;
+ SvNumberFormatter* pOwnFormatter;
+ LanguageType eCurLanguage;
BOOL bShowLanguageControl; //determine whether the language control has
//to be shown in the number format dialog
BOOL bUseAutomaticLanguage;//determine whether language is automatically assigned
@@ -51,7 +51,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
SW_DLLPRIVATE double GetDefValue(const short nFormatType) const;
SW_DLLPRIVATE void Init(short nFormatType, BOOL bUsrFmts);
- SW_DLLPRIVATE SwView* GetView();
+ SW_DLLPRIVATE SwView* GetView();
public:
NumFormatListBox( Window* pWin, const ResId& rResId,
@@ -66,14 +66,14 @@ public:
void Clear();
- inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; }
+ inline void SetOneArea(BOOL bOnlyOne = TRUE) { bOneArea = bOnlyOne; }
- void SetFormatType(const short nFormatType);
- inline short GetFormatType() const { return nCurrFormatType; }
- void SetDefFormat(const ULONG nDefFmt);
- ULONG GetFormat() const;
+ void SetFormatType(const short nFormatType);
+ inline short GetFormatType() const { return nCurrFormatType; }
+ void SetDefFormat(const ULONG nDefFmt);
+ ULONG GetFormat() const;
- inline LanguageType GetCurLanguage() const { return eCurLanguage;}
+ inline LanguageType GetCurLanguage() const { return eCurLanguage;}
void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;}
void SetAutomaticLanguage(BOOL bSet){bUseAutomaticLanguage = bSet;}
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx
index 236c0205c9a0..d084a5d8a043 100644
--- a/sw/source/ui/inc/numpara.hxx
+++ b/sw/source/ui/inc/numpara.hxx
@@ -2,7 +2,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
@@ -43,30 +43,30 @@
---------------------------------------------------------------------------*/
class SwParagraphNumTabPage : public SfxTabPage
{
- FixedLine aOutlineStartFL;
- FixedText aOutlineLvFT;
- ListBox aOutlineLvLB;
+ FixedLine aOutlineStartFL;
+ FixedText aOutlineLvFT;
+ ListBox aOutlineLvLB;
FixedText aNumberStyleFT;
- ListBox aNumberStyleLB;
+ ListBox aNumberStyleLB;
FixedLine aNewStartFL;
- TriStateBox aNewStartCB;
+ TriStateBox aNewStartCB;
TriStateBox aNewStartNumberCB;
- NumericField aNewStartNF;
+ NumericField aNewStartNF;
FixedLine aCountParaFL;
- TriStateBox aCountParaCB;
- TriStateBox aRestartParaCountCB;
- FixedText aRestartFT;
- NumericField aRestartNF;
+ TriStateBox aCountParaCB;
+ TriStateBox aRestartParaCountCB;
+ FixedText aRestartFT;
+ NumericField aRestartNF;
// --> OD 2008-04-14 #outlinelevel#
const String msOutlineNumbering;
// <--
- BOOL bModified : 1;
- BOOL bCurNumrule : 1;
+ BOOL bModified : 1;
+ BOOL bCurNumrule : 1;
DECL_LINK( NewStartHdl_Impl, CheckBox* );
DECL_LINK( StyleHdl_Impl, ListBox* );
@@ -78,18 +78,18 @@ protected:
public:
~SwParagraphNumTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static USHORT* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
- void EnableNewStart();
- void DisableOutline();
- void DisableNumbering();
+ void EnableNewStart();
+ void DisableOutline();
+ void DisableNumbering();
- ListBox& GetStyleBox() {return aNumberStyleLB;};
+ ListBox& GetStyleBox() {return aNumberStyleLB;};
};
diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx
index 1d0002f0d56e..53636d279e9f 100644
--- a/sw/source/ui/inc/numprevw.hxx
+++ b/sw/source/ui/inc/numprevw.hxx
@@ -2,7 +2,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
@@ -39,15 +39,15 @@ class SwNumRule;
class NumberingPreview : public Window
{
- const SwNumRule* pActNum;
- Font aStdFont;
- long nPageWidth;
- const String* pOutlineNames;
- BOOL bPosition;
- UINT16 nActLevel;
+ const SwNumRule* pActNum;
+ Font aStdFont;
+ long nPageWidth;
+ const String* pOutlineNames;
+ BOOL bPosition;
+ UINT16 nActLevel;
protected:
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
public:
NumberingPreview(Window* pParent, const ResId& rResId ) :
@@ -55,15 +55,15 @@ class NumberingPreview : public Window
pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) {}
~NumberingPreview();
- void SetNumRule(const SwNumRule* pNum)
+ void SetNumRule(const SwNumRule* pNum)
{pActNum = pNum; Invalidate();};
- void SetPageWidth(long nPgWidth)
+ void SetPageWidth(long nPgWidth)
{nPageWidth = nPgWidth;}
- void SetOutlineNames(const String* pNames)
+ void SetOutlineNames(const String* pNames)
{pOutlineNames = pNames;}
- void SetPositionMode()
+ void SetPositionMode()
{ bPosition = TRUE;}
- void SetLevel(USHORT nSet) {nActLevel = nSet;}
+ void SetLevel(USHORT nSet) {nActLevel = nSet;}
};
diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/ui/inc/olesh.hxx
index c4c220b795e0..2a36cbf73cb7 100644
--- a/sw/source/ui/inc/olesh.hxx
+++ b/sw/source/ui/inc/olesh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx
index f83feb7f27db..df7e083e2dca 100644
--- a/sw/source/ui/inc/olmenu.hxx
+++ b/sw/source/ui/inc/olmenu.hxx
@@ -2,7 +2,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
@@ -45,14 +45,14 @@ class SwWrtShell;
class SwSpellPopup : public PopupMenu
{
- SwWrtShell* pSh;
+ SwWrtShell* pSh;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary > > aDics;
+ ::com::sun::star::linguistic2::XDictionary > > aDics;
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt;
+ ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt;
::com::sun::star::uno::Sequence< rtl::OUString > aSuggestions;
-
+
LanguageType nCheckedLanguage;
LanguageType nGuessLangWord;
LanguageType nGuessLangPara;
@@ -64,9 +64,9 @@ class SwSpellPopup : public PopupMenu
bool bGrammarResults; // show grammar results? Or show spellcheck results?
Image aInfo16;
-
- void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh,
+
+ void fillLangPopupMenu( PopupMenu *pPopupMenu, USHORT nLangStart,
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh,
std::map< sal_Int16, ::rtl::OUString > &rLangTable );
using PopupMenu::Execute;
@@ -82,7 +82,7 @@ public:
sal_Int32 nErrorInResult,
const ::com::sun::star::uno::Sequence< rtl::OUString > &rSuggestions,
const String & rParaText );
-
+
sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin );
void Execute( USHORT nId );
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx
index c4758b649ead..6d2c525460b5 100644
--- a/sw/source/ui/inc/optcomp.hxx
+++ b/sw/source/ui/inc/optcomp.hxx
@@ -2,7 +2,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
@@ -42,45 +42,45 @@ class SwCompatibilityOptPage : public SfxTabPage
{
private:
// controls
- FixedLine m_aMainFL;
- FixedText m_aFormattingFT;
- ListBox m_aFormattingLB;
- FixedText m_aOptionsFT;
- SvxCheckListBox m_aOptionsLB;
- PushButton m_aResetPB;
- PushButton m_aDefaultPB;
+ FixedLine m_aMainFL;
+ FixedText m_aFormattingFT;
+ ListBox m_aFormattingLB;
+ FixedText m_aOptionsFT;
+ SvxCheckListBox m_aOptionsLB;
+ PushButton m_aResetPB;
+ PushButton m_aDefaultPB;
// config item
- SvtCompatibilityOptions m_aConfigItem;
+ SvtCompatibilityOptions m_aConfigItem;
// text of the user entry
- String m_sUserEntry;
+ String m_sUserEntry;
// text of the "use as default" querybox
- String m_sUseAsDefaultQuery;
+ String m_sUseAsDefaultQuery;
// shell of the current document
- SwWrtShell* m_pWrtShell;
+ SwWrtShell* m_pWrtShell;
// impl object
SwCompatibilityOptPage_Impl* m_pImpl;
// saved options after "Reset"; used in "FillItemSet" for comparison
- ULONG m_nSavedOptions;
+ ULONG m_nSavedOptions;
// handler
- DECL_LINK( SelectHdl, ListBox* );
- DECL_LINK( UseAsDefaultHdl, PushButton* );
+ DECL_LINK( SelectHdl, ListBox* );
+ DECL_LINK( UseAsDefaultHdl, PushButton* );
// private methods
- void InitControls( const SfxItemSet& rSet );
- void ReplaceFormatName( String& rEntry );
- void SetCurrentOptions( ULONG nOptions );
- ULONG GetDocumentOptions() const;
- void WriteOptions();
+ void InitControls( const SfxItemSet& rSet );
+ void ReplaceFormatName( String& rEntry );
+ void SetCurrentOptions( ULONG nOptions );
+ ULONG GetDocumentOptions() const;
+ void WriteOptions();
public:
SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet );
~SwCompatibilityOptPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index fb2bb6c26189..bbef62cc589f 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -2,7 +2,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
@@ -50,12 +50,12 @@ private:
FixedLine aUpdateFL;
FixedText aLinkFT;
RadioButton aAlwaysRB;
- RadioButton aRequestRB;
- RadioButton aNeverRB;
+ RadioButton aRequestRB;
+ RadioButton aNeverRB;
FixedText aFieldFT;
CheckBox aAutoUpdateFields;
- CheckBox aAutoUpdateCharts;
+ CheckBox aAutoUpdateCharts;
FixedLine aSettingsFL;
FixedText aMetricFT;
@@ -65,7 +65,7 @@ private:
CheckBox aUseSquaredPageMode;
CheckBox aUseCharUnit;
- SwWrtShell* pWrtShell;
+ SwWrtShell* pWrtShell;
sal_Bool bHTMLMode;
UINT16 nLastTab;
sal_Int32 nOldLinkMode;
@@ -77,11 +77,11 @@ public:
SwLoadOptPage( Window* pParent, const SfxItemSet& rSet );
~SwLoadOptPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
class SwCaptionOptDlg : public SfxSingleTabDialog
@@ -105,69 +105,69 @@ public:
class SwCaptionPreview : public Window
{
private:
- String maText;
- Point maDrawPos;
+ String maText;
+ Point maDrawPos;
public:
SwCaptionPreview( Window* pParent, const ResId& rResId );
- void SetPreviewText( const String& rText );
- virtual void Paint( const Rectangle& rRect );
+ void SetPreviewText( const String& rText );
+ virtual void Paint( const Rectangle& rRect );
};
class SwCaptionOptPage : public SfxTabPage
{
private:
- FixedText aCheckFT;
- SvxCheckListBox aCheckLB;
+ FixedText aCheckFT;
+ SvxCheckListBox aCheckLB;
FixedText aFtCaptionOrder;
ListBox aLbCaptionOrder;
-
+
SwCaptionPreview aPreview;
-
+
FixedLine aSettingsGroupFL;
- FixedText aCategoryText;
- CaptionComboBox aCategoryBox;
- FixedText aFormatText;
- ListBox aFormatBox;
- //#i61007# order of captions
+ FixedText aCategoryText;
+ CaptionComboBox aCategoryBox;
+ FixedText aFormatText;
+ ListBox aFormatBox;
+ //#i61007# order of captions
FixedText aNumberingSeparatorFT;
Edit aNumberingSeparatorED;
- FixedText aTextText;
- Edit aTextEdit;
- FixedText aPosText;
- ListBox aPosBox;
-
- FixedLine aNumCaptFL;
- FixedText aFtLevel;
- ListBox aLbLevel;
- FixedText aFtDelim;
- Edit aEdDelim;
-
- FixedLine aCategoryFL;
- FixedText aCharStyleFT;
- ListBox aCharStyleLB;
- CheckBox aApplyBorderCB;
-
- String sSWTable;
- String sSWFrame;
- String sSWGraphic;
- String sOLE;
-
- String sIllustration;
- String sTable;
- String sText;
+ FixedText aTextText;
+ Edit aTextEdit;
+ FixedText aPosText;
+ ListBox aPosBox;
+
+ FixedLine aNumCaptFL;
+ FixedText aFtLevel;
+ ListBox aLbLevel;
+ FixedText aFtDelim;
+ Edit aEdDelim;
+
+ FixedLine aCategoryFL;
+ FixedText aCharStyleFT;
+ ListBox aCharStyleLB;
+ CheckBox aApplyBorderCB;
+
+ String sSWTable;
+ String sSWFrame;
+ String sSWGraphic;
+ String sOLE;
+
+ String sIllustration;
+ String sTable;
+ String sText;
String sDrawing;
- String sBegin;
- String sEnd;
- String sAbove;
- String sBelow;
+ String sBegin;
+ String sEnd;
+ String sAbove;
+ String sBelow;
String sNone;
- SwFldMgr *pMgr;
- USHORT eType;
- BOOL bHTMLMode;
+ SwFldMgr *pMgr;
+ USHORT eType;
+ BOOL bHTMLMode;
DECL_LINK( SelectHdl, ListBox *pLB = 0 );
DECL_LINK( ModifyHdl, Edit *pEdt = 0 );
@@ -175,23 +175,23 @@ private:
DECL_LINK( ShowEntryHdl, SvxCheckListBox *pLB = 0 );
DECL_LINK( SaveEntryHdl, SvxCheckListBox *pLB = 0 );
- void DelUserData();
- void SetOptions( const USHORT nPos,
+ void DelUserData();
+ void SetOptions( const USHORT nPos,
const SwCapObjType eType,
const SvGlobalName *pOleId = 0);
- void SaveEntry( SvLBoxEntry* pEntry );
- void DrawSample();
+ void SaveEntry( SvLBoxEntry* pEntry );
+ void DrawSample();
public:
SwCaptionOptPage( Window* pParent,
const SfxItemSet& rSet );
~SwCaptionOptPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 86a197bdc922..2fdb986bf222 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -2,7 +2,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
@@ -51,29 +51,29 @@ class SwContentOptPage : public SfxTabPage
{
//visual aids
FixedLine aLineFL;
- CheckBox aCrossCB;
- CheckBox aSolidHandleCB;
- CheckBox aBigHandleCB;
+ CheckBox aCrossCB;
+ CheckBox aSolidHandleCB;
+ CheckBox aBigHandleCB;
//view
FixedLine aWindowFL;
- CheckBox aHScrollBox;
- CheckBox aVScrollBox;
+ CheckBox aHScrollBox;
+ CheckBox aVScrollBox;
CheckBox aAnyRulerCB;
CheckBox aHRulerCBox;
ListBox aHMetric;
- CheckBox aVRulerCBox;
+ CheckBox aVRulerCBox;
CheckBox aVRulerRightCBox;
ListBox aVMetric;
- CheckBox aSmoothCBox;
+ CheckBox aSmoothCBox;
//display
FixedLine aDispFL;
- CheckBox aGrfCB;
- CheckBox aTblCB;
- CheckBox aDrwCB;
- CheckBox aFldNameCB;
- CheckBox aPostItCB;
+ CheckBox aGrfCB;
+ CheckBox aTblCB;
+ CheckBox aDrwCB;
+ CheckBox aFldNameCB;
+ CheckBox aPostItCB;
FixedLine aSettingsFL;
FixedText aMetricFT;
@@ -86,11 +86,11 @@ public:
const SfxItemSet& rSet );
~SwContentOptPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
@@ -101,11 +101,11 @@ class SwAddPrinterTabPage : public SfxTabPage
{
FixedLine aFL1;
CheckBox aGrfCB;
-// CheckBox aTabCB;
-// CheckBox aDrawCB;
- CheckBox aCtrlFldCB;
- CheckBox aBackgroundCB;
- CheckBox aBlackFontCB;
+// CheckBox aTabCB;
+// CheckBox aDrawCB;
+ CheckBox aCtrlFldCB;
+ CheckBox aBackgroundCB;
+ CheckBox aBlackFontCB;
CheckBox aPrintHiddenTextCB;
CheckBox aPrintTextPlaceholderCB;
@@ -113,8 +113,8 @@ class SwAddPrinterTabPage : public SfxTabPage
FixedLine aFL2;
CheckBox aLeftPageCB;
- CheckBox aRightPageCB;
-// CheckBox aReverseCB;
+ CheckBox aRightPageCB;
+// CheckBox aReverseCB;
CheckBox aProspectCB;
CheckBox aProspectCB_RTL;
@@ -128,15 +128,15 @@ class SwAddPrinterTabPage : public SfxTabPage
FixedLine aFL4;
CheckBox aPrintEmptyPagesCB;
// CheckBox aSingleJobsCB;
- CheckBox aPaperFromSetupCB;
+ CheckBox aPaperFromSetupCB;
FixedText aFaxFT;
ListBox aFaxLB;
String sNone;
- BOOL bAttrModified;
- BOOL bPreview;
+ BOOL bAttrModified;
+ BOOL bPreview;
- void Init();
+ void Init();
DECL_LINK( AutoClickHdl, CheckBox * );
DECL_LINK( SelectHdl, ListBox * );
@@ -145,14 +145,14 @@ class SwAddPrinterTabPage : public SfxTabPage
const SfxItemSet& rSet );
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
- void SetFax( const SvStringsDtor& );
- void SelectFax( const String& );
- void SetPreview(BOOL bPrev);
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
+ void SetFax( const SvStringsDtor& );
+ void SelectFax( const String& );
+ void SetPreview(BOOL bPrev);
virtual void PageCreated (SfxAllItemSet aSet);
};
@@ -164,49 +164,49 @@ class SwStdFontTabPage : public SfxTabPage
FixedText aTypeFT;
FixedText aStandardLbl;
- ComboBox aStandardBox;
+ ComboBox aStandardBox;
FixedText aHeightFT;
FontSizeBox aStandardHeightLB;
FixedText aTitleLbl ;
- ComboBox aTitleBox ;
+ ComboBox aTitleBox ;
FontSizeBox aTitleHeightLB;
- FixedText aListLbl ;
- ComboBox aListBox ;
+ FixedText aListLbl ;
+ ComboBox aListBox ;
FontSizeBox aListHeightLB;
- FixedText aLabelLbl ;
- ComboBox aLabelBox ;
+ FixedText aLabelLbl ;
+ ComboBox aLabelBox ;
FontSizeBox aLabelHeightLB;
- FixedText aIdxLbl ;
- ComboBox aIdxBox ;
+ FixedText aIdxLbl ;
+ ComboBox aIdxBox ;
FontSizeBox aIndexHeightLB;
- CheckBox aDocOnlyCB ;
+ CheckBox aDocOnlyCB ;
PushButton aStandardPB;
- String sShellStd;
- String sShellTitle;
- String sShellList;
+ String sShellStd;
+ String sShellTitle;
+ String sShellList;
String sShellLabel;
String sShellIndex;
- SfxPrinter* pPrt;
+ SfxPrinter* pPrt;
FontList* pFontList;
- SwStdFontConfig* pFontConfig;
- SwWrtShell* pWrtShell;
+ SwStdFontConfig* pFontConfig;
+ SwWrtShell* pWrtShell;
LanguageType eLanguage;
// waren nur defaults vorhanden? wurden sie mit den Boxen ueberschrieben
- BOOL bListDefault :1;
- BOOL bSetListDefault :1;
- BOOL bLabelDefault :1;
- BOOL bSetLabelDefault :1;
- BOOL bIdxDefault :1;
- BOOL bSetIdxDefault :1;
- BOOL bDeletePrinter :1;
+ BOOL bListDefault :1;
+ BOOL bSetListDefault :1;
+ BOOL bLabelDefault :1;
+ BOOL bSetLabelDefault :1;
+ BOOL bIdxDefault :1;
+ BOOL bSetIdxDefault :1;
+ BOOL bDeletePrinter :1;
BOOL bListHeightDefault :1;
BOOL bSetListHeightDefault :1;
@@ -231,11 +231,11 @@ class SwStdFontTabPage : public SfxTabPage
~SwStdFontTabPage();
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;}
virtual void PageCreated (SfxAllItemSet aSet);
@@ -245,39 +245,39 @@ class SwTableOptionsTabPage : public SfxTabPage
{
FixedLine aTableFL;
CheckBox aHeaderCB;
- CheckBox aRepeatHeaderCB;
- CheckBox aDontSplitCB;
- CheckBox aBorderCB;
+ CheckBox aRepeatHeaderCB;
+ CheckBox aDontSplitCB;
+ CheckBox aBorderCB;
FixedLine aSeparatorFL;
FixedLine aTableInsertFL;
- CheckBox aNumFormattingCB;
- CheckBox aNumFmtFormattingCB;
- CheckBox aNumAlignmentCB;
+ CheckBox aNumFormattingCB;
+ CheckBox aNumFmtFormattingCB;
+ CheckBox aNumAlignmentCB;
FixedLine aMoveFL;
FixedText aMoveFT;
FixedText aRowMoveFT;
- MetricField aRowMoveMF;
- FixedText aColMoveFT;
- MetricField aColMoveMF;
+ MetricField aRowMoveMF;
+ FixedText aColMoveFT;
+ MetricField aColMoveMF;
FixedText aInsertFT;
- FixedText aRowInsertFT;
- MetricField aRowInsertMF;
- FixedText aColInsertFT;
- MetricField aColInsertMF;
+ FixedText aRowInsertFT;
+ MetricField aRowInsertMF;
+ FixedText aColInsertFT;
+ MetricField aColInsertMF;
FixedText aHandlingFT;
- RadioButton aFixRB;
+ RadioButton aFixRB;
RadioButton aFixPropRB;
RadioButton aVarRB;
- FixedText aFixFT;
- FixedText aFixPropFT;
- FixedText aVarFT;
+ FixedText aFixFT;
+ FixedText aFixPropFT;
+ FixedText aVarFT;
- SwWrtShell* pWrtShell;
+ SwWrtShell* pWrtShell;
BOOL bHTMLMode;
DECL_LINK(CheckBoxHdl, CheckBox *pCB);
@@ -289,11 +289,11 @@ class SwTableOptionsTabPage : public SfxTabPage
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;}
virtual void PageCreated (SfxAllItemSet aSet);
@@ -307,12 +307,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
{
//nonprinting characters
FixedLine aUnprintFL;
- CheckBox aParaCB;
- CheckBox aSHyphCB;
- CheckBox aSpacesCB;
- CheckBox aHSpacesCB;
- CheckBox aTabCB;
- CheckBox aBreakCB;
+ CheckBox aParaCB;
+ CheckBox aSHyphCB;
+ CheckBox aSpacesCB;
+ CheckBox aHSpacesCB;
+ CheckBox aTabCB;
+ CheckBox aBreakCB;
CheckBox aCharHiddenCB;
CheckBox aFldHiddenCB;
CheckBox aFldHiddenParaCB;
@@ -320,26 +320,26 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
FixedLine aSeparatorFL;
FixedLine aFlagFL;
- CheckBox aOnOffCB;
+ CheckBox aOnOffCB;
- FixedText aFillModeFT;
+ FixedText aFillModeFT;
RadioButton aFillMarginRB;
RadioButton aFillIndentRB;
RadioButton aFillTabRB;
RadioButton aFillSpaceRB;
FixedLine aCrsrOptFL;
- CheckBox aCrsrInProtCB;
+ CheckBox aCrsrInProtCB;
SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
~SwShdwCrsrOptionsTabPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
/*-----------------------------------------------------------------------
@@ -347,36 +347,36 @@ public:
-----------------------------------------------------------------------*/
class SwMarkPreview : public Window
{
- Color m_aBgCol; // background
- Color m_aTransCol; // transparency
- Color m_aMarkCol; // marks
- Color m_aLineCol; // general lines
- Color m_aShadowCol; // shadow
- Color m_aTxtCol; // text
- Color m_aPrintAreaCol; // frame for print area
+ Color m_aBgCol; // background
+ Color m_aTransCol; // transparency
+ Color m_aMarkCol; // marks
+ Color m_aLineCol; // general lines
+ Color m_aShadowCol; // shadow
+ Color m_aTxtCol; // text
+ Color m_aPrintAreaCol; // frame for print area
- Rectangle aPage;
- Rectangle aLeftPagePrtArea;
- Rectangle aRightPagePrtArea;
+ Rectangle aPage;
+ Rectangle aLeftPagePrtArea;
+ Rectangle aRightPagePrtArea;
- USHORT nMarkPos;
+ USHORT nMarkPos;
using OutputDevice::DrawRect;
- void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
+ void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
- void Paint(const Rectangle&);
- void PaintPage(const Rectangle &rRect);
- void InitColors( void );
+ void Paint(const Rectangle&);
+ void PaintPage(const Rectangle &rRect);
+ void InitColors( void );
protected:
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
SwMarkPreview(Window* pParent, const ResId& rResID);
- virtual ~SwMarkPreview();
+ virtual ~SwMarkPreview();
- inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
- inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; }
+ inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
+ inline void SetMarkPos(USHORT nPos) { nMarkPos = nPos; }
};
/*-----------------------------------------------------------------------
@@ -388,9 +388,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage
FixedText aInsertFT;
FixedText aInsertAttrFT;
- ListBox aInsertLB;
+ ListBox aInsertLB;
FixedText aInsertColorFT;
- ColorListBox aInsertColorLB;
+ ColorListBox aInsertColorLB;
SvxFontPrevWindow aInsertedPreviewWN;
FixedText aDeletedFT;
@@ -410,13 +410,13 @@ class SwRedlineOptionsTabPage : public SfxTabPage
FixedLine aChangedFL;
FixedText aMarkPosFT;
- ListBox aMarkPosLB;
- FixedText aMarkColorFT;
- ColorListBox aMarkColorLB;
- SwMarkPreview aMarkPreviewWN;
+ ListBox aMarkPosLB;
+ FixedText aMarkColorFT;
+ ColorListBox aMarkColorLB;
+ SwMarkPreview aMarkPreviewWN;
String sAuthor;
- String sNone;
+ String sNone;
SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
~SwRedlineOptionsTabPage();
@@ -425,14 +425,14 @@ class SwRedlineOptionsTabPage : public SfxTabPage
DECL_LINK( ChangedMaskPrevHdl, ListBox *pLB = 0 );
DECL_LINK( ColorHdl, ColorListBox *pColorLB );
- void InitFontStyle(SvxFontPrevWindow& rExampleWin);
+ void InitFontStyle(SvxFontPrevWindow& rExampleWin);
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
/*--------OS 11.01.95 -----------------------------------
@@ -447,11 +447,11 @@ public:
SwTestTabPage( Window* pParent,
const SfxItemSet& rSet );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
private:
FixedLine aTestFL;
@@ -466,9 +466,9 @@ private:
CheckBox aTest9CBox;
CheckBox aTest10CBox;
- BOOL bAttrModified;
+ BOOL bAttrModified;
- void Init();
+ void Init();
DECL_LINK( AutoClickHdl, CheckBox * );
};
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index 52e6e3fb1aa2..4992bb6dd541 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <vcl/field.hxx>
-#include "swtypes.hxx" //fuer MAXLEVEL
+#include "swtypes.hxx" //fuer MAXLEVEL
#include <numprevw.hxx>
#include <numberingtypelistbox.hxx>
@@ -57,12 +57,12 @@ class SwOutlineTabDialog : public SfxTabDialog
static USHORT nNumLevel;
String aNullStr;
- String aCollNames[MAXLEVEL];
- PopupMenu aFormMenu;
+ String aCollNames[MAXLEVEL];
+ PopupMenu aFormMenu;
- SwWrtShell& rWrtSh;
- SwNumRule* pNumRule;
- SwChapterNumRules* pChapterNumRules;
+ SwWrtShell& rWrtSh;
+ SwNumRule* pNumRule;
+ SwChapterNumRules* pChapterNumRules;
BOOL bModified : 1;
@@ -71,8 +71,8 @@ class SwOutlineTabDialog : public SfxTabDialog
DECL_LINK( FormHdl, Button * );
DECL_LINK( MenuSelectHdl, Menu * );
- virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage);
- virtual short Ok();
+ virtual void PageCreated(USHORT nPageId, SfxTabPage& rPage);
+ virtual short Ok();
public:
SwOutlineTabDialog(Window* pParent,
@@ -80,9 +80,9 @@ class SwOutlineTabDialog : public SfxTabDialog
SwWrtShell &);
~SwOutlineTabDialog();
- SwNumRule* GetNumRule() {return pNumRule;}
- USHORT GetLevel(const String &rFmtName) const;
- String* GetCollNames() {return aCollNames;}
+ SwNumRule* GetNumRule() {return pNumRule;}
+ USHORT GetLevel(const String &rFmtName) const;
+ String* GetCollNames() {return aCollNames;}
static USHORT GetActNumLevel() {return nNumLevel;}
static void SetActNumLevel(USHORT nSet) {nNumLevel = nSet;}
@@ -90,33 +90,33 @@ class SwOutlineTabDialog : public SfxTabDialog
class SwOutlineSettingsTabPage : public SfxTabPage
{
- ListBox aLevelLB;
+ ListBox aLevelLB;
FixedLine aLevelFL;
- FixedText aCollLbl;
- ListBox aCollBox;
- FixedText aNumberLbl;
- SwNumberingTypeListBox aNumberBox;
- FixedText aCharFmtFT;
- ListBox aCharFmtLB;
+ FixedText aCollLbl;
+ ListBox aCollBox;
+ FixedText aNumberLbl;
+ SwNumberingTypeListBox aNumberBox;
+ FixedText aCharFmtFT;
+ ListBox aCharFmtLB;
FixedText aAllLevelFT;
- NumericField aAllLevelNF;
- FixedText aDelim;
- FixedText aPrefixFT;
- Edit aPrefixED;
- FixedText aSuffixFT;
- Edit aSuffixED;
- FixedText aStartLbl;
- NumericField aStartEdit;
+ NumericField aAllLevelNF;
+ FixedText aDelim;
+ FixedText aPrefixFT;
+ Edit aPrefixED;
+ FixedText aSuffixFT;
+ Edit aSuffixED;
+ FixedText aStartLbl;
+ NumericField aStartEdit;
FixedLine aNumberFL;
NumberingPreview aPreviewWIN;
- String aNoFmtName;
- String aSaveCollNames[MAXLEVEL];
- SwWrtShell* pSh;
- SwNumRule* pNumRule;
- String* pCollNames;
- USHORT nActLevel;
+ String aNoFmtName;
+ String aSaveCollNames[MAXLEVEL];
+ SwWrtShell* pSh;
+ SwNumRule* pNumRule;
+ String* pCollNames;
+ USHORT nActLevel;
DECL_LINK( LevelHdl, ListBox * );
DECL_LINK( ToggleComplete, NumericField * );
@@ -127,9 +127,9 @@ class SwOutlineSettingsTabPage : public SfxTabPage
DECL_LINK( StartModified, NumericField * );
DECL_LINK( CharFmtHdl, ListBox * );
- void Update();
+ void Update();
- void SetModified(){aPreviewWIN.Invalidate();}
+ void SetModified(){aPreviewWIN.Invalidate();}
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
using SfxTabPage::ActivatePage;
@@ -141,12 +141,12 @@ public:
void SetWrtShell(SwWrtShell* pShell);
- virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual void ActivatePage(const SfxItemSet& rSet);
+ virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
- static SfxTabPage* Create( Window* pParent,
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
};
diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/ui/inc/pardlg.hxx
index 2bb0be8dc5fe..1ee9b31c1377 100644
--- a/sw/source/ui/inc/pardlg.hxx
+++ b/sw/source/ui/inc/pardlg.hxx
@@ -2,7 +2,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
@@ -34,8 +34,8 @@ class SwView;
class SfxItemSet;
//DialogModes:
-#define DLG_STD 0
-#define DLG_ENVELOP 2
+#define DLG_STD 0
+#define DLG_ENVELOP 2
#endif
diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/ui/inc/pattern.hxx
index d8bfd1a5e179..d28afaafc89b 100644
--- a/sw/source/ui/inc/pattern.hxx
+++ b/sw/source/ui/inc/pattern.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx
index ac46e739f863..22a262962506 100644
--- a/sw/source/ui/inc/pgfnote.hxx
+++ b/sw/source/ui/inc/pgfnote.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
#include <svtools/ctrlbox.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Fussnoteneinstellungs-TabPage
+ Beschreibung: Fussnoteneinstellungs-TabPage
--------------------------------------------------------------------*/
class SwFootNotePage: public SfxTabPage
{
@@ -53,34 +53,34 @@ private:
SwFootNotePage(Window *pParent, const SfxItemSet &rSet);
~SwFootNotePage();
- RadioButton aMaxHeightPageBtn;
- RadioButton aMaxHeightBtn;
- MetricField aMaxHeightEdit;
- FixedText aDistLbl;
- MetricField aDistEdit;
- FixedLine aPosHeader;
-
- FixedText aLinePosLbl;
- ListBox aLinePosBox;
- FixedText aLineTypeLbl;
- LineListBox aLineTypeBox;
- FixedText aLineWidthLbl;
- MetricField aLineWidthEdit;
- FixedText aLineDistLbl;
- MetricField aLineDistEdit;
- FixedLine aLineHeader;
+ RadioButton aMaxHeightPageBtn;
+ RadioButton aMaxHeightBtn;
+ MetricField aMaxHeightEdit;
+ FixedText aDistLbl;
+ MetricField aDistEdit;
+ FixedLine aPosHeader;
+
+ FixedText aLinePosLbl;
+ ListBox aLinePosBox;
+ FixedText aLineTypeLbl;
+ LineListBox aLineTypeBox;
+ FixedText aLineWidthLbl;
+ MetricField aLineWidthEdit;
+ FixedText aLineDistLbl;
+ MetricField aLineDistEdit;
+ FixedLine aLineHeader;
DECL_LINK( HeightPage, Button * );
DECL_LINK( HeightMetric, Button * );
DECL_LINK( HeightModify, MetricField * );
- long lMaxHeight;
+ long lMaxHeight;
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
-
+
virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx
index 4b4ccc9bbdce..c580aa5fb5c1 100644
--- a/sw/source/ui/inc/pggrid.hxx
+++ b/sw/source/ui/inc/pggrid.hxx
@@ -2,7 +2,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
@@ -61,8 +61,8 @@ class SwTextGridPage: public SfxTabPage
FixedText aCharsRangeFT;
FixedText aCharWidthFT;
- MetricField aCharWidthMF;
-
+ MetricField aCharWidthMF;
+
FixedText aRubySizeFT;
MetricField aRubySizeMF;
@@ -81,7 +81,7 @@ class SwTextGridPage: public SfxTabPage
sal_Bool m_bRubyUserValue;
Size m_aPageSize;
sal_Bool m_bVertical;
- sal_Bool m_bSquaredMode;
+ sal_Bool m_bSquaredMode;
sal_Bool m_bHRulerChanged;
sal_Bool m_bVRulerChanged;
@@ -109,7 +109,7 @@ public:
virtual void Reset(const SfxItemSet &rSet);
virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
#endif
diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx
index 6377f43c81b4..198159a70b56 100644
--- a/sw/source/ui/inc/popbox.hxx
+++ b/sw/source/ui/inc/popbox.hxx
@@ -2,7 +2,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
@@ -37,21 +37,21 @@ class SwNavigationPI;
class SwHelpToolBox: public ToolBox, public DropTargetHelper
{
Link aDoubleClickLink;
- Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!!
+ Link aRightClickLink; // Link bekommt MouseEvent als Parameter !!!
using ToolBox::DoubleClick;
protected:
virtual void MouseButtonDown(const MouseEvent &rEvt);
virtual long DoubleClick(ToolBox *);
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
public:
SwHelpToolBox(SwNavigationPI* pParent, const ResId &);
~SwHelpToolBox();
- void SetDoubleClickLink(const Link &); // inline
- void SetRightClickLink(const Link &); // inline
+ void SetDoubleClickLink(const Link &); // inline
+ void SetRightClickLink(const Link &); // inline
};
inline void SwHelpToolBox::SetDoubleClickLink(const Link &rLink) {
diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc
index 62f210938a36..72fc074b526b 100644
--- a/sw/source/ui/inc/popup.hrc
+++ b/sw/source/ui/inc/popup.hrc
@@ -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
@@ -30,24 +30,24 @@
#include "rcid.hrc"
-#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0)
-#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1)
-#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2)
-#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3)
-#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4)
-#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5)
-#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6)
-#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7)
+#define MN_TEXT_POPUPMENU (RC_POPUPS_BEGIN + 0)
+#define MN_TAB_POPUPMENU (RC_POPUPS_BEGIN + 1)
+#define MN_FRM_POPUPMENU (RC_POPUPS_BEGIN + 2)
+#define MN_DRAW_POPUPMENU (RC_POPUPS_BEGIN + 3)
+#define MN_DRWTXT_POPUPMENU (RC_POPUPS_BEGIN + 4)
+#define MN_GRF_POPUPMENU (RC_POPUPS_BEGIN + 5)
+#define MN_OLE_POPUPMENU (RC_POPUPS_BEGIN + 6)
+#define MN_PPREVIEW_POPUPMENU (RC_POPUPS_BEGIN + 7)
#define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8)
-#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9)
-#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10)
-#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11)
-#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12)
-#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13)
-#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14)
-#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15)
-#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16)
-#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17)
+#define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9)
+#define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10)
+#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11)
+#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12)
+#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13)
+#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14)
+#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15)
+#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16)
+#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17)
#if MN_MEDIA_POPUPMENU > RC_POPUPS_END
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index aafe5510983c..20df4cf8e1df 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -2,7 +2,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
@@ -40,8 +40,8 @@ class SW_DLLPUBLIC PercentField : public MetricField
sal_Int64 nOldBaseValue;
sal_Int64 nLastPercent;
sal_Int64 nLastValue;
- USHORT nOldDigits;
- FieldUnit eOldUnit;
+ USHORT nOldDigits;
+ FieldUnit eOldUnit;
sal_Bool bLockAutoCalculation; //prevent recalcution of percent values when the
//reference value is changed
@@ -69,7 +69,7 @@ public:
sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE);
- BOOL IsValueModified();
+ BOOL IsValueModified();
//using NumericFormatter::SetMax;
void SetMax(sal_Int64 nNewMax, FieldUnit eInUnit = FUNIT_NONE);
@@ -86,9 +86,9 @@ public:
sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit);
- void ShowPercent(BOOL bPercent);
+ void ShowPercent(BOOL bPercent);
- USHORT GetOldDigits() const {return nOldDigits;}
+ USHORT GetOldDigits() const {return nOldDigits;}
void LockAutoCalculation(sal_Bool bLock) {bLockAutoCalculation = bLock;}
sal_Bool IsAutoCalculationLocked()const {return bLockAutoCalculation;}
diff --git a/sw/source/ui/inc/prtopt.hxx b/sw/source/ui/inc/prtopt.hxx
index a2c47fd47066..ee2454db4448 100644
--- a/sw/source/ui/inc/prtopt.hxx
+++ b/sw/source/ui/inc/prtopt.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ public:
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- virtual void doSetModified( ) { bModified = sal_True; SetModified();}
+ virtual void doSetModified( ) { bModified = sal_True; SetModified();}
SwPrintOptions& operator=(const SwPrintData& rData)
{
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 04206297a9d3..3350689bbb6c 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -2,7 +2,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
@@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
// aktuelle Dispatcher-Shell
SwPagePreViewWin aViewWin;
//viewdata of the previous SwView and the new crsrposition
- String sSwViewData,
+ String sSwViewData,
//and the new cursor position if the user double click in the PagePreView
sNewCrsrPos;
// to support keyboard the number of the page to go to can be set too
@@ -197,7 +197,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
*pPageDownBtn;
// Dummy-Window zum F�llen der rechten unteren Ecke, wenn beide Scrollbars
// aktiv sind
- Window *pScrollFill;
+ Window *pScrollFill;
USHORT mnPageCount;
BOOL bNormalPrint;
@@ -245,7 +245,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
protected:
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
- virtual Size GetOptimalSizePixel() const;
+ virtual Size GetOptimalSizePixel() const;
void SetZoom(SvxZoomType eSet, USHORT nFactor);
@@ -276,11 +276,11 @@ public:
USHORT GetPageCount() const { return mnPageCount; }
- BOOL HandleWheelCommands( const CommandEvent& );
+ BOOL HandleWheelCommands( const CommandEvent& );
- const String& GetPrevSwViewData() const { return sSwViewData; }
- void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; }
- const String& GetNewCrsrPos() const { return sNewCrsrPos; }
+ const String& GetPrevSwViewData() const { return sSwViewData; }
+ void SetNewCrsrPos( const String& rStr ) { sNewCrsrPos = rStr; }
+ const String& GetNewCrsrPos() const { return sNewCrsrPos; }
USHORT GetNewPage() const {return nNewPage;}
void SetNewPage(USHORT nSet) {nNewPage = nSet;}
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 685d03c824c6..40f70e0f9243 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -2,7 +2,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
@@ -44,21 +44,21 @@ class SwChildWinWrapper;
struct SwRedlineDataChild
{
- const SwRedlineData* pChild; // Verweis auf originale gestackte Daten
- const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten
- SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag
+ const SwRedlineData* pChild; // Verweis auf originale gestackte Daten
+ const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten
+ SvLBoxEntry* pTLBChild; // zugehoeriger TreeListBox-Eintrag
};
struct SwRedlineDataParent
{
- const SwRedlineData* pData; // RedlineDataPtr
- const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten
- SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag
- String sComment; // Redline-Kommentar
+ const SwRedlineData* pData; // RedlineDataPtr
+ const SwRedlineDataChild* pNext; // Verweis auf gestackte Daten
+ SvLBoxEntry* pTLBParent; // zugehoeriger TreeListBox-Eintrag
+ String sComment; // Redline-Kommentar
- inline BOOL operator==( const SwRedlineDataParent& rObj ) const
+ inline BOOL operator==( const SwRedlineDataParent& rObj ) const
{ return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); }
- inline BOOL operator< ( const SwRedlineDataParent& rObj ) const
+ inline BOOL operator< ( const SwRedlineDataParent& rObj ) const
{ return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); }
};
@@ -78,52 +78,52 @@ SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100, 100)
class SW_DLLPUBLIC SwRedlineAcceptDlg
{
- Dialog* pParentDlg;
- SwRedlineDataParentArr aRedlineParents;
- SwRedlineDataChildArr aRedlineChilds;
+ Dialog* pParentDlg;
+ SwRedlineDataParentArr aRedlineParents;
+ SwRedlineDataChildArr aRedlineChilds;
SwRedlineDataParentSortArr aUsedSeqNo;
- SvxAcceptChgCtr aTabPagesCTRL;
- PopupMenu aPopup;
- Timer aDeselectTimer;
- Timer aSelectTimer;
- String sInserted;
- String sDeleted;
- String sFormated;
- String sTableChgd;
- String sFmtCollSet;
- String sFilterAction;
- String sAutoFormat;
- Size aBorderSz;
- SvxTPView* pTPView;
- SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
- Link aOldSelectHdl;
- Link aOldDeselectHdl;
- BOOL bOnlyFormatedRedlines;
- BOOL bHasReadonlySel;
- BOOL bRedlnAutoFmt;
+ SvxAcceptChgCtr aTabPagesCTRL;
+ PopupMenu aPopup;
+ Timer aDeselectTimer;
+ Timer aSelectTimer;
+ String sInserted;
+ String sDeleted;
+ String sFormated;
+ String sTableChgd;
+ String sFmtCollSet;
+ String sFilterAction;
+ String sAutoFormat;
+ Size aBorderSz;
+ SvxTPView* pTPView;
+ SvxRedlinTable* pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
+ Link aOldSelectHdl;
+ Link aOldDeselectHdl;
+ BOOL bOnlyFormatedRedlines;
+ BOOL bHasReadonlySel;
+ BOOL bRedlnAutoFmt;
// prevent update dialog data during longer operations (cf #102657#)
bool bInhibitActivate;
- SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* );
- SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* );
- SW_DLLPRIVATE DECL_LINK( RejectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* );
- SW_DLLPRIVATE DECL_LINK( UndoHdl, void* );
- SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( SelectHdl, void* );
- SW_DLLPRIVATE DECL_LINK( GotoHdl, void* );
- SW_DLLPRIVATE DECL_LINK( CommandHdl, void* );
-
- SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild);
- SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt);
- SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX);
- SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd);
- SW_DLLPRIVATE void InitAuthors();
-
- SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0);
- SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0);
- SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const;
+ SW_DLLPRIVATE DECL_LINK( AcceptHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( AcceptAllHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( RejectHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( RejectAllHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( UndoHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( DeselectHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( SelectHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( GotoHdl, void* );
+ SW_DLLPRIVATE DECL_LINK( CommandHdl, void* );
+
+ SW_DLLPRIVATE USHORT CalcDiff(USHORT nStart, BOOL bChild);
+ SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt);
+ SW_DLLPRIVATE void InsertParents(USHORT nStart, USHORT nEnd = USHRT_MAX);
+ SW_DLLPRIVATE void RemoveParents(USHORT nStart, USHORT nEnd);
+ SW_DLLPRIVATE void InitAuthors();
+
+ SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack = 0);
+ SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, USHORT nStack = 0);
+ SW_DLLPRIVATE USHORT GetRedlinePos( const SvLBoxEntry& rEntry) const;
public:
SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt = FALSE);
@@ -131,17 +131,17 @@ public:
DECL_LINK( FilterChangedHdl, void *pDummy = 0 );
- inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; }
- inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; }
+ inline SvxAcceptChgCtr* GetChgCtrl() { return &aTabPagesCTRL; }
+ inline BOOL HasRedlineAutoFmt() const { return bRedlnAutoFmt; }
- void Init(USHORT nStart = 0);
- void CallAcceptReject( BOOL bSelect, BOOL bAccept );
+ void Init(USHORT nStart = 0);
+ void CallAcceptReject( BOOL bSelect, BOOL bAccept );
- void Initialize(const String &rExtraData);
- void FillInfo(String &rExtraData) const;
+ void Initialize(const String &rExtraData);
+ void FillInfo(String &rExtraData) const;
- virtual void Activate();
- virtual void Resize();
+ virtual void Activate();
+ virtual void Resize();
};
/*------------------------------------------------------------------------
@@ -150,18 +150,18 @@ public:
class SwModelessRedlineAcceptDlg : public SfxModelessDialog
{
- SwRedlineAcceptDlg* pImplDlg;
- SwChildWinWrapper* pChildWin;
+ SwRedlineAcceptDlg* pImplDlg;
+ SwChildWinWrapper* pChildWin;
- virtual void Resize();
+ virtual void Resize();
public:
SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent);
~SwModelessRedlineAcceptDlg();
- virtual void Activate();
- virtual void FillInfo(SfxChildWinInfo&) const;
- void Initialize (SfxChildWinInfo* pInfo);
+ virtual void Activate();
+ virtual void FillInfo(SfxChildWinInfo&) const;
+ void Initialize (SfxChildWinInfo* pInfo);
};
@@ -172,14 +172,14 @@ public:
class SwRedlineAcceptChild : public SwChildWinWrapper
{
public:
- SwRedlineAcceptChild( Window* ,
+ SwRedlineAcceptChild( Window* ,
USHORT nId,
SfxBindings*,
SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW( SwRedlineAcceptChild );
- virtual BOOL ReInitDlg(SwDocShell *pDocSh);
+ virtual BOOL ReInitDlg(SwDocShell *pDocSh);
};
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 0019b4b1b291..d175d09d6548 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -2,7 +2,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
@@ -76,10 +76,10 @@ class SwEditRegionDlg : public SfxModalDialog
FixedLine aLinkFL;
TriStateBox aFileCB;
- CheckBox aDDECB;
- FixedText aFileNameFT;
- FixedText aDDECommandFT;
- Edit aFileNameED;
+ CheckBox aDDECB;
+ FixedText aFileNameFT;
+ FixedText aDDECommandFT;
+ Edit aFileNameED;
PushButton aFilePB;
FixedText aSubRegionFT;
ComboBox aSubRegionED;
@@ -93,7 +93,7 @@ class SwEditRegionDlg : public SfxModalDialog
FixedLine aHideFL;
TriStateBox aHideCB;
FixedText aConditionFT;
- ConditionEdit aConditionED;
+ ConditionEdit aConditionED;
// --> FME 2004-06-22 #114856# edit in readonly sections
FixedLine aPropertiesFL;
@@ -101,10 +101,10 @@ class SwEditRegionDlg : public SfxModalDialog
// <--
OKButton aOK;
- CancelButton aCancel;
- PushButton aOptionsPB;
- PushButton aDismiss;
- HelpButton aHelp;
+ CancelButton aCancel;
+ PushButton aOptionsPB;
+ PushButton aDismiss;
+ HelpButton aHelp;
ImageList aImageIL;
ImageList aImageILH;
@@ -116,13 +116,13 @@ class SwEditRegionDlg : public SfxModalDialog
Window* m_pOldDefDlgParent;
BOOL bDontCheckPasswd :1;
- BOOL bWeb :1;
+ BOOL bWeb :1;
Image BuildBitmap(BOOL bProtect,BOOL bHidden,BOOL bHighContrast);
void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry);
- USHORT FindArrPos(const SwSectionFmt* pFmt);
+ USHORT FindArrPos(const SwSectionFmt* pFmt);
DECL_LINK( GetFirstEntryHdl, SvTreeListBox * );
DECL_LINK( DeselectHdl, SvTreeListBox * );
@@ -166,13 +166,13 @@ class SwInsertSectionTabPage : public SfxTabPage
FixedLine aLinkFL;
CheckBox aFileCB;
- CheckBox aDDECB;
- FixedText aDDECommandFT;
- FixedText aFileNameFT;
- Edit aFileNameED;
+ CheckBox aDDECB;
+ FixedText aDDECommandFT;
+ FixedText aFileNameFT;
+ Edit aFileNameED;
PushButton aFilePB;
FixedText aSubRegionFT;
- ComboBox aSubRegionED;
+ ComboBox aSubRegionED;
FixedLine aProtectFL;
CheckBox aProtectCB;
@@ -182,7 +182,7 @@ class SwInsertSectionTabPage : public SfxTabPage
FixedLine aHideFL;
CheckBox aHideCB;
FixedText aConditionFT;
- ConditionEdit aConditionED;
+ ConditionEdit aConditionED;
// --> FME 2004-06-22 #114856# edit in readonly sections
FixedLine aPropertiesFL;
@@ -193,7 +193,7 @@ class SwInsertSectionTabPage : public SfxTabPage
String m_sFilterName;
String m_sFilePasswd;
-// SwFmtCol* pCols;
+// SwFmtCol* pCols;
::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd;
SwWrtShell* m_pWrtSh;
sfx2::DocumentInserter* m_pDocInserter;
@@ -215,44 +215,44 @@ public:
SwInsertSectionTabPage(Window *pParent, const SfxItemSet &rAttrSet);
virtual ~SwInsertSectionTabPage();
- void SetWrtShell(SwWrtShell& rSh);
+ void SetWrtShell(SwWrtShell& rSh);
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
};
class SwSectionFtnEndTabPage : public SfxTabPage
{
FixedLine aFtnFL;
- CheckBox aFtnNtAtTextEndCB;
+ CheckBox aFtnNtAtTextEndCB;
- CheckBox aFtnNtNumCB;
- FixedText aFtnOffsetLbl;
- NumericField aFtnOffsetFld;
+ CheckBox aFtnNtNumCB;
+ FixedText aFtnOffsetLbl;
+ NumericField aFtnOffsetFld;
- CheckBox aFtnNtNumFmtCB;
- FixedText aFtnPrefixFT;
- Edit aFtnPrefixED;
- SwNumberingTypeListBox aFtnNumViewBox;
- FixedText aFtnSuffixFT;
- Edit aFtnSuffixED;
+ CheckBox aFtnNtNumFmtCB;
+ FixedText aFtnPrefixFT;
+ Edit aFtnPrefixED;
+ SwNumberingTypeListBox aFtnNumViewBox;
+ FixedText aFtnSuffixFT;
+ Edit aFtnSuffixED;
FixedLine aEndFL;
- CheckBox aEndNtAtTextEndCB;
+ CheckBox aEndNtAtTextEndCB;
- CheckBox aEndNtNumCB;
- FixedText aEndOffsetLbl;
- NumericField aEndOffsetFld;
+ CheckBox aEndNtNumCB;
+ FixedText aEndOffsetLbl;
+ NumericField aEndOffsetFld;
- CheckBox aEndNtNumFmtCB;
- FixedText aEndPrefixFT;
- Edit aEndPrefixED;
- SwNumberingTypeListBox aEndNumViewBox;
- FixedText aEndSuffixFT;
- Edit aEndSuffixED;
+ CheckBox aEndNtNumFmtCB;
+ FixedText aEndPrefixFT;
+ Edit aEndPrefixED;
+ SwNumberingTypeListBox aEndNumViewBox;
+ FixedText aEndSuffixFT;
+ Edit aEndSuffixED;
DECL_LINK( FootEndHdl, CheckBox * );
@@ -262,10 +262,10 @@ public:
SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet );
virtual ~SwSectionFtnEndTabPage();
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
};
@@ -295,12 +295,12 @@ public:
class SwInsertSectionTabDialog : public SfxTabDialog
{
- SwWrtShell& rWrtSh;
+ SwWrtShell& rWrtSh;
::std::auto_ptr<SwSectionData> m_pSectionData;
protected:
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
- virtual short Ok();
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual short Ok();
public:
SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
virtual ~SwInsertSectionTabDialog();
@@ -313,7 +313,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog
{
SwWrtShell& rWrtSh;
protected:
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
public:
SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
virtual ~SwSectionPropertyTabDialog();
diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc
index 45c494b6f136..892261512a83 100644
--- a/sw/source/ui/inc/ribbar.hrc
+++ b/sw/source/ui/inc/ribbar.hrc
@@ -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
@@ -29,59 +29,59 @@
#include "rcid.hrc"
-#define MN_FORM1 1 // Defines fuer NumNames-Popup
+#define MN_FORM1 1 // Defines fuer NumNames-Popup
#define MN_FORMBASE MN_FORM1
#define MN_FORM2 2
#define MN_FORM3 3
#define MN_FORM4 4
#define MN_FORM5 5
-#define WIN_RIBBAR RC_RIBBAR_BEGIN
-
-#define CB_FORMAT (RC_RIBBAR_BEGIN +1)
-#define CB_FONT (RC_RIBBAR_BEGIN +2)
-#define CB_SIZE (RC_RIBBAR_BEGIN +3)
-#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4)
-#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5)
-#define BMP_OK PB_FORMULA_OK
-#define BMP_CANCEL PB_FORMULA_CANCEL
-#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6)
-#define FT_POS (RC_RIBBAR_BEGIN +7)
-#define BT_FORMULA (RC_RIBBAR_BEGIN +8)
+#define WIN_RIBBAR RC_RIBBAR_BEGIN
+
+#define CB_FORMAT (RC_RIBBAR_BEGIN +1)
+#define CB_FONT (RC_RIBBAR_BEGIN +2)
+#define CB_SIZE (RC_RIBBAR_BEGIN +3)
+#define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4)
+#define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5)
+#define BMP_OK PB_FORMULA_OK
+#define BMP_CANCEL PB_FORMULA_CANCEL
+#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6)
+#define FT_POS (RC_RIBBAR_BEGIN +7)
+#define BT_FORMULA (RC_RIBBAR_BEGIN +8)
#define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9)
-#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10)
-#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11)
-#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12)
-#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13)
-#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14)
-#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15)
-#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16)
+#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10)
+#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11)
+#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12)
+#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13)
+#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14)
+#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15)
+#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16)
-#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17)
+#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17)
-#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18)
-#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19)
-#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20)
+#define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18)
+#define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19)
+#define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20)
//Resourcen fuer Inputwin (Rechenleiste)
-#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21)
-#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22)
+#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21)
+#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22)
-#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23)
+#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23)
#define RID_INSERT_CTRL (RC_RIBBAR_BEGIN + 24)
#define RID_INSERT_OBJ_CTRL (RC_RIBBAR_BEGIN + 25)
#define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26)
#define RID_TBL_OPT_CTRL (RC_RIBBAR_BEGIN + 27)
-#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28)
+#define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28)
#define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29)
#define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30)
#define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31)
-#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31)
+#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 31)
#define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0)
-#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1)
+#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1)
#define STR_IMGBTN_TBL_DOWN (STR_IMGBTN_START + 2)
#define STR_IMGBTN_FRM_DOWN (STR_IMGBTN_START + 3)
#define STR_IMGBTN_PGE_DOWN (STR_IMGBTN_START + 4)
@@ -98,11 +98,11 @@
#define STR_IMGBTN_POSTIT_DOWN (STR_IMGBTN_START +15)
#define STR_IMGBTN_SRCH_REP_DOWN (STR_IMGBTN_START +16)
#define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17)
-#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18)
+#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18)
#define STR_IMGBTN_TBLFML_ERR_DOWN (STR_IMGBTN_START +19)
#define STR_IMGBTN_NEXT_UP (STR_IMGBTN_START +20)
-#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21)
+#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21)
#define STR_IMGBTN_TBL_UP (STR_IMGBTN_START +22)
#define STR_IMGBTN_FRM_UP (STR_IMGBTN_START +23)
#define STR_IMGBTN_PGE_UP (STR_IMGBTN_START +24)
@@ -119,16 +119,16 @@
#define STR_IMGBTN_POSTIT_UP (STR_IMGBTN_START +35)
#define STR_IMGBTN_SRCH_REP_UP (STR_IMGBTN_START +36)
#define STR_IMGBTN_INDEX_ENTRY_UP (STR_IMGBTN_START +37)
-#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38)
+#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38)
#define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39)
#define BTN_NAVI (STR_IMGBTN_START +40)
#define MN_ANCHOR_POPUP (STR_IMGBTN_START +41)
-#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP
+#define RC_RIBBAR_ACT_END MN_ANCHOR_POPUP
-#if RC_RIBBAR_ACT_END > RC_RIBBAR_END
+#if RC_RIBBAR_ACT_END > RC_RIBBAR_END
#error Resource-Id Ueberlauf in #file, #line
#endif
diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx
index 9f5e24e93018..f292473c27b7 100644
--- a/sw/source/ui/inc/rowht.hxx
+++ b/sw/source/ui/inc/rowht.hxx
@@ -2,7 +2,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
@@ -42,13 +42,13 @@ class SwWrtShell;
class SwTableHeightDlg : public SvxStandardDialog
{
- MetricField aHeightEdit;
- CheckBox aAutoHeightCB;
+ MetricField aHeightEdit;
+ CheckBox aAutoHeightCB;
FixedLine aHeightFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- SwWrtShell &rSh;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ SwWrtShell &rSh;
protected:
virtual void Apply();
diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx
index 6d360af5671f..2293db4f555a 100644
--- a/sw/source/ui/inc/scroll.hxx
+++ b/sw/source/ui/inc/scroll.hxx
@@ -2,7 +2,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
@@ -32,14 +32,14 @@
class SwScrollbar: public ScrollBar
{
Size aDocSz;
- BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal
- BOOL bAuto :1; // fuer Scrollingmode
- BOOL bThumbEnabled:1;
- BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen
- BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt?
-
- void AutoShow();
+ BOOL bHori :1; // Horizontal = TRUE, sonst Vertikal
+ BOOL bAuto :1; // fuer Scrollingmode
+ BOOL bThumbEnabled:1;
+ BOOL bVisible :1; // Show/Hide sollen nur noch dieses Flag setzen
+ BOOL bSizeSet :1; // wurde die Groesse bereits gesetzt?
+ void AutoShow();
+
using Window::Hide;
using Window::SetPosSizePixel;
using Window::IsVisible;
@@ -47,19 +47,19 @@ class SwScrollbar: public ScrollBar
public:
void ExtendedShow( BOOL bVisible = TRUE );
- void Hide() { Show( FALSE ); }
- void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
- BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; }
+ void Hide() { Show( FALSE ); }
+ void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
+ BOOL IsVisible(BOOL bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; }
// Aenderung der Dokumentgroesse
- void DocSzChgd(const Size &rNewSize);
+ void DocSzChgd(const Size &rNewSize);
// Aenderung des sichtbaren Bereiches
- void ViewPortChgd(const Rectangle &rRectangle);
+ void ViewPortChgd(const Rectangle &rRectangle);
// was fuer einer ist es denn ??
BOOL IsHoriScroll() const { return bHori; }
- void SetAuto(BOOL bSet);
- BOOL IsAuto() { return bAuto;}
+ void SetAuto(BOOL bSet);
+ BOOL IsAuto() { return bAuto;}
SwScrollbar(Window *pParent, BOOL bHori = TRUE );
~SwScrollbar();
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx
index d8c86a972de2..925a73809541 100644
--- a/sw/source/ui/inc/selglos.hxx
+++ b/sw/source/ui/inc/selglos.hxx
@@ -2,7 +2,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
@@ -38,19 +38,19 @@
class SwSelGlossaryDlg : public ModalDialog
{
protected:
- ListBox aGlosBox;
+ ListBox aGlosBox;
FixedLine aGlosFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
DECL_LINK(DoubleClickHdl, ListBox*);
public:
SwSelGlossaryDlg(Window * pParent, const String &rShortName);
~SwSelGlossaryDlg();
- void InsertGlos(const String &rRegion, const String &rGlosName); // inline
- USHORT GetSelectedIdx() const; // inline
- void SelectEntryPos(USHORT nIdx); // inline
+ void InsertGlos(const String &rRegion, const String &rGlosName); // inline
+ USHORT GetSelectedIdx() const; // inline
+ void SelectEntryPos(USHORT nIdx); // inline
};
inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion,
@@ -62,9 +62,9 @@ inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion,
aGlosBox.InsertEntry( aTmp );
}
inline USHORT SwSelGlossaryDlg::GetSelectedIdx() const
-{ return aGlosBox.GetSelectEntryPos(); }
+{ return aGlosBox.GetSelectEntryPos(); }
inline void SwSelGlossaryDlg::SelectEntryPos(USHORT nIdx)
-{ aGlosBox.SelectEntryPos(nIdx); }
+{ aGlosBox.SelectEntryPos(nIdx); }
#endif
diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/ui/inc/sharedconnection.hxx
index cf61e646b9cc..faa27c384cec 100644
--- a/sw/source/ui/inc/sharedconnection.hxx
+++ b/sw/source/ui/inc/sharedconnection.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx
index 8b1a4e9123de..d01bc5bccfe1 100644
--- a/sw/source/ui/inc/shdwcrsr.hxx
+++ b/sw/source/ui/inc/shdwcrsr.hxx
@@ -2,7 +2,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
@@ -55,9 +55,9 @@ public:
void Paint();
- const Point& GetPoint() const { return aOldPt; }
- long GetHeight() const { return nOldHeight; }
- USHORT GetMode() const { return nOldMode; }
+ const Point& GetPoint() const { return aOldPt; }
+ long GetHeight() const { return nOldHeight; }
+ USHORT GetMode() const { return nOldMode; }
Rectangle GetRect() const;
};
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index 2058b6432ed8..243c4fcf9256 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -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
@@ -38,12 +38,12 @@
#define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6)
#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7)
#define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8)
-#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9)
+#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9)
#define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10)
-#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11)
-#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12)
-#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13)
-#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14)
+#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11)
+#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12)
+#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13)
+#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14)
#define RID_TEXT_TOOLBOX (RC_SHELLS_BEGIN + 15)
#define RID_TABLE_TOOLBOX (RC_SHELLS_BEGIN + 16)
@@ -69,7 +69,7 @@
#define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33)
#define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34)
-#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37)
+#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37)
#define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38)
#define STR_SWBG_OLE (RC_SHELLS_BEGIN + 39)
#define STR_SWBG_FRAME (RC_SHELLS_BEGIN + 40)
@@ -84,23 +84,23 @@
#define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48)
// FREE
-#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50)
-#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51)
+#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50)
+#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51)
-#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52)
-#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53)
-#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54)
-#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55)
-#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56)
-#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57)
+#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52)
+#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53)
+#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54)
+#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55)
+#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56)
+#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57)
-// #i68101# no longer needed
+// #i68101# no longer needed
// #define STR_NAME_SHAPE_LABEL (RC_SHELLS_BEGIN + 58)
// #define STR_NAME_SHAPE_DIALOG (RC_SHELLS_BEGIN + 59)
#define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60)
-#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61)
+#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61)
#define SHELLS_ACT_END RID_MEDIA_TOOLBOX
diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx
index a49e131cd666..661c063abdbd 100644
--- a/sw/source/ui/inc/split.hxx
+++ b/sw/source/ui/inc/split.hxx
@@ -2,7 +2,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
@@ -42,17 +42,17 @@ class SwWrtShell;
class SwSplitTableDlg : public SvxStandardDialog
{
- FixedText aCountLbl;
- NumericField aCountEdit;
+ FixedText aCountLbl;
+ NumericField aCountEdit;
FixedLine aCountFL;
- ImageRadioButton aHorzBox;
+ ImageRadioButton aHorzBox;
ImageRadioButton aVertBox;
CheckBox aPropCB;
FixedLine aDirFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
- SwWrtShell& rSh;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
+ SwWrtShell& rSh;
protected:
virtual void Apply();
diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx
index f570d05fd0f3..8e8da96dadce 100644
--- a/sw/source/ui/inc/splittbl.hxx
+++ b/sw/source/ui/inc/splittbl.hxx
@@ -2,7 +2,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
@@ -36,16 +36,16 @@ class SwWrtShell;
class SwSplitTblDlg : public SvxStandardDialog
{
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOKPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
FixedLine aSplitFL;
- RadioButton aCntntCopyRB;
- RadioButton aBoxAttrCopyWithParaRB ;
- RadioButton aBoxAttrCopyNoParaRB ;
- RadioButton aBorderCopyRB;
+ RadioButton aCntntCopyRB;
+ RadioButton aBoxAttrCopyWithParaRB ;
+ RadioButton aBoxAttrCopyNoParaRB ;
+ RadioButton aBorderCopyRB;
- SwWrtShell &rShell;
+ SwWrtShell &rShell;
USHORT m_nSplit;
protected:
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx
index 485cd94f1d84..05fb56e88d44 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/ui/inc/srcedtw.hxx
@@ -2,7 +2,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
@@ -50,22 +50,22 @@ namespace utl
class TextViewOutWin : public Window
{
- ExtTextView* pTextView;
+ ExtTextView* pTextView;
protected:
- virtual void Paint( const Rectangle& );
- virtual void KeyInput( const KeyEvent& rKeyEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void DataChanged( const DataChangedEvent& );
+ virtual void Paint( const Rectangle& );
+ virtual void KeyInput( const KeyEvent& rKeyEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void DataChanged( const DataChangedEvent& );
public:
TextViewOutWin(Window* pParent, WinBits nBits) :
Window(pParent, nBits), pTextView(0){}
- void SetTextView( ExtTextView* pView ) {pTextView = pView;}
+ void SetTextView( ExtTextView* pView ) {pTextView = pView;}
};
@@ -74,27 +74,27 @@ namespace svt{ class SourceViewConfig;}
class SwSrcEditWindow : public Window, public SfxListener, public utl::ConfigurationListener
{
private:
- ExtTextView* pTextView;
- ExtTextEngine* pTextEngine;
+ ExtTextView* pTextView;
+ ExtTextEngine* pTextEngine;
- TextViewOutWin* pOutWin;
- ScrollBar *pHScrollbar,
+ TextViewOutWin* pOutWin;
+ ScrollBar *pHScrollbar,
*pVScrollbar;
- SwSrcView* pSrcView;
+ SwSrcView* pSrcView;
utl::SourceViewConfig* pSourceViewConfig;
- long nCurTextWidth;
- USHORT nStartLine;
+ long nCurTextWidth;
+ USHORT nStartLine;
rtl_TextEncoding eSourceEncoding;
- BOOL bReadonly;
- BOOL bDoSyntaxHighlight;
- BOOL bHighlighting;
+ BOOL bReadonly;
+ BOOL bDoSyntaxHighlight;
+ BOOL bHighlighting;
- Timer aSyntaxIdleTimer;
- Table aSyntaxLineTable;
+ Timer aSyntaxIdleTimer;
+ Table aSyntaxLineTable;
- void ImpDoHighlight( const String& rSource, USHORT nLineOff );
+ void ImpDoHighlight( const String& rSource, USHORT nLineOff );
using OutputDevice::SetFont;
void SetFont();
@@ -107,15 +107,15 @@ private:
protected:
- virtual void Resize();
- virtual void DataChanged( const DataChangedEvent& );
- virtual void GetFocus();
-// virtual void LoseFocus();
+ virtual void Resize();
+ virtual void DataChanged( const DataChangedEvent& );
+ virtual void GetFocus();
+// virtual void LoseFocus();
- void CreateTextEngine();
- void DoSyntaxHighlight( USHORT nPara );
+ void CreateTextEngine();
+ void DoSyntaxHighlight( USHORT nPara );
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
DECL_LINK(ScrollHdl, ScrollBar*);
@@ -124,38 +124,38 @@ public:
SwSrcEditWindow( Window* pParent, SwSrcView* pParentView );
~SwSrcEditWindow();
- void SetScrollBarRanges();
- void InitScrollBars();
- ULONG Read( SvStream& rInput)
+ void SetScrollBarRanges();
+ void InitScrollBars();
+ ULONG Read( SvStream& rInput)
{return pTextEngine->Read(rInput);}
- ULONG Write( SvStream& rOutput)
+ ULONG Write( SvStream& rOutput)
{return pTextEngine->Write(rOutput);}
- ExtTextView* GetTextView()
+ ExtTextView* GetTextView()
{return pTextView;}
- TextEngine* GetTextEngine()
+ TextEngine* GetTextEngine()
{return pTextEngine;}
- SwSrcView* GetSrcView() {return pSrcView;}
+ SwSrcView* GetSrcView() {return pSrcView;}
- TextViewOutWin* GetOutWin() {return pOutWin;}
+ TextViewOutWin* GetOutWin() {return pOutWin;}
virtual void Invalidate( USHORT nFlags = 0 );
- void ClearModifyFlag()
+ void ClearModifyFlag()
{ pTextEngine->SetModified(FALSE); }
- BOOL IsModified() const
+ BOOL IsModified() const
{ return pTextEngine->IsModified();}
- void CreateScrollbars();
+ void CreateScrollbars();
- void SetReadonly(BOOL bSet){bReadonly = bSet;}
- BOOL IsReadonly(){return bReadonly;}
+ void SetReadonly(BOOL bSet){bReadonly = bSet;}
+ BOOL IsReadonly(){return bReadonly;}
- void DoDelayedSyntaxHighlight( USHORT nPara );
+ void DoDelayedSyntaxHighlight( USHORT nPara );
- void SetStartLine(USHORT nLine){nStartLine = nLine;}
+ void SetStartLine(USHORT nLine){nStartLine = nLine;}
- virtual void Command( const CommandEvent& rCEvt );
- void HandleWheelCommand( const CommandEvent& rCEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ void HandleWheelCommand( const CommandEvent& rCEvt );
void SetTextEncoding(rtl_TextEncoding eEncoding);
};
diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx
index 1e99efb2f895..b4d6d55a7b91 100644
--- a/sw/source/ui/inc/srcview.hxx
+++ b/sw/source/ui/inc/srcview.hxx
@@ -2,7 +2,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
@@ -41,20 +41,20 @@ class SfxMedium;
class SwSrcView: public SfxViewShell
{
- SwSrcEditWindow aEditWin;
+ SwSrcEditWindow aEditWin;
- SvxSearchItem* pSearchItem;
+ SvxSearchItem* pSearchItem;
- BOOL bSourceSaved :1;
+ BOOL bSourceSaved :1;
rtl_TextEncoding eLoadEncoding;
void Init();
// fuer Readonly-Umschaltung
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
protected:
- USHORT StartSearchAndReplace(const SvxSearchItem& rItem,
+ USHORT StartSearchAndReplace(const SvxSearchItem& rItem,
BOOL bFromStart,
BOOL bApi,
BOOL bRecursive = FALSE);
@@ -71,30 +71,30 @@ public:
~SwSrcView();
- SwDocShell* GetDocShell();
+ SwDocShell* GetDocShell();
SwSrcEditWindow& GetEditWin() {return aEditWin;}
- void SaveContent(const String& rTmpFile);
- void SaveContentTo(SfxMedium& rMed);
+ void SaveContent(const String& rTmpFile);
+ void SaveContentTo(SfxMedium& rMed);
- BOOL IsModified() {return aEditWin.IsModified();}
+ BOOL IsModified() {return aEditWin.IsModified();}
- void Execute(SfxRequest&);
- void GetState(SfxItemSet&);
+ void Execute(SfxRequest&);
+ void GetState(SfxItemSet&);
- SvxSearchItem* GetSearchItem();
- void SetSearchItem( const SvxSearchItem& rItem );
+ SvxSearchItem* GetSearchItem();
+ void SetSearchItem( const SvxSearchItem& rItem );
- void Load(SwDocShell* pDocShell);
+ void Load(SwDocShell* pDocShell);
virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false );
virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
-
+
sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly );
- void SourceSaved() {bSourceSaved = TRUE;}
- BOOL HasSourceSaved() const {return bSourceSaved;}
+ void SourceSaved() {bSourceSaved = TRUE;}
+ BOOL HasSourceSaved() const {return bSourceSaved;}
};
diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx
index 8b689fad973a..4863e737f4cd 100644
--- a/sw/source/ui/inc/srtdlg.hxx
+++ b/sw/source/ui/inc/srtdlg.hxx
@@ -2,7 +2,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
@@ -40,38 +40,38 @@ class CollatorRessource;
class SwSortDlg : public SvxStandardDialog
{
- FixedText aColLbl;
- FixedText aTypLbl;
- FixedText aDirLbl;
+ FixedText aColLbl;
+ FixedText aTypLbl;
+ FixedText aDirLbl;
FixedLine aDirFL;
- CheckBox aKeyCB1;
- NumericField aColEdt1;
- ListBox aTypDLB1;
- RadioButton aSortUpRB;
- RadioButton aSortDnRB;
+ CheckBox aKeyCB1;
+ NumericField aColEdt1;
+ ListBox aTypDLB1;
+ RadioButton aSortUpRB;
+ RadioButton aSortDnRB;
- CheckBox aKeyCB2;
- NumericField aColEdt2;
- ListBox aTypDLB2;
- RadioButton aSortUp2RB;
- RadioButton aSortDn2RB;
+ CheckBox aKeyCB2;
+ NumericField aColEdt2;
+ ListBox aTypDLB2;
+ RadioButton aSortUp2RB;
+ RadioButton aSortDn2RB;
- CheckBox aKeyCB3;
- NumericField aColEdt3;
- ListBox aTypDLB3;
- RadioButton aSortUp3RB;
- RadioButton aSortDn3RB;
+ CheckBox aKeyCB3;
+ NumericField aColEdt3;
+ ListBox aTypDLB3;
+ RadioButton aSortUp3RB;
+ RadioButton aSortDn3RB;
FixedLine aSortFL;
- RadioButton aColumnRB;
- RadioButton aRowRB;
+ RadioButton aColumnRB;
+ RadioButton aRowRB;
FixedLine aDelimFL;
- RadioButton aDelimTabRB;
- RadioButton aDelimFreeRB;
- Edit aDelimEdt;
+ RadioButton aDelimTabRB;
+ RadioButton aDelimFreeRB;
+ Edit aDelimEdt;
PushButton aDelimPB;
FixedLine aLangFL;
@@ -80,22 +80,22 @@ class SwSortDlg : public SvxStandardDialog
FixedLine aSortOptFL;
CheckBox aCaseCB;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
String aColTxt;
String aRowTxt;
String aNumericTxt;
- SwWrtShell &rSh;
+ SwWrtShell &rSh;
CollatorRessource* pColRes;
USHORT nX;
USHORT nY;
- virtual void Apply();
- sal_Unicode GetDelimChar() const;
+ virtual void Apply();
+ sal_Unicode GetDelimChar() const;
DECL_LINK( CheckHdl, CheckBox * );
DECL_LINK( DelimHdl, RadioButton* );
diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx
index f72de63e0c81..61ba61034b62 100644
--- a/sw/source/ui/inc/stmenu.hxx
+++ b/sw/source/ui/inc/stmenu.hxx
@@ -2,7 +2,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
@@ -62,7 +62,7 @@ class SwSmartTagPopup : public PopupMenu
sal_uInt32 mnActionID;
InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties,
- sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {}
+ sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {}
};
std::vector< InvokeAction > maInvokeActions;
@@ -70,7 +70,7 @@ class SwSmartTagPopup : public PopupMenu
using PopupMenu::Execute;
public:
- SwSmartTagPopup( SwView* _pSwView,
+ SwSmartTagPopup( SwView* _pSwView,
::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange );
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx
index be57eddd40ff..6f7358eab7a4 100644
--- a/sw/source/ui/inc/swcont.hxx
+++ b/sw/source/ui/inc/swcont.hxx
@@ -2,7 +2,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
@@ -34,33 +34,33 @@
class SwContentType;
//Reihenfolge und Anzahl mit ResIds abgleichen!!
-#define CONTENT_TYPE_OUTLINE 0
-#define CONTENT_TYPE_TABLE 1
+#define CONTENT_TYPE_OUTLINE 0
+#define CONTENT_TYPE_TABLE 1
#define CONTENT_TYPE_FRAME 2
#define CONTENT_TYPE_GRAPHIC 3
#define CONTENT_TYPE_OLE 4
#define CONTENT_TYPE_BOOKMARK 5
#define CONTENT_TYPE_REGION 6
-#define CONTENT_TYPE_URLFIELD 7
+#define CONTENT_TYPE_URLFIELD 7
#define CONTENT_TYPE_REFERENCE 8
-#define CONTENT_TYPE_INDEX 9
-#define CONTENT_TYPE_POSTIT 10
+#define CONTENT_TYPE_INDEX 9
+#define CONTENT_TYPE_POSTIT 10
#define CONTENT_TYPE_DRAWOBJECT 11
-#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1
+#define CONTENT_TYPE_MAX CONTENT_TYPE_DRAWOBJECT +1
// Typen fuer das Globaldokument
-#define GLOBAL_CONTENT_REGION 100
+#define GLOBAL_CONTENT_REGION 100
#define GLOBAL_CONTENT_INDEX 101
-#define GLOBAL_CONTENT_TEXT 102
-#define GLOBAL_CONTENT_MAX 3
+#define GLOBAL_CONTENT_TEXT 102
+#define GLOBAL_CONTENT_MAX 3
// Strings fuer Kontextmenue
-#define CONTEXT_COUNT 12
+#define CONTEXT_COUNT 12
#define GLOBAL_CONTEXT_COUNT 14
// Modi fuer Drag 'n Drop
-#define REGION_MODE_NONE 0
+#define REGION_MODE_NONE 0
#define REGION_MODE_LINK 1
#define REGION_MODE_EMBEDDED 2
@@ -76,28 +76,28 @@ class SwTypeNumber
SwTypeNumber(BYTE nId) :nTypeId(nId){}
virtual ~SwTypeNumber();
- virtual BYTE GetTypeId();
+ virtual BYTE GetTypeId();
};
//----------------------------------------------------------------------------
class SwContent : public SwTypeNumber
{
- const SwContentType* pParent;
- String sContentName;
- long nYPosition;
- BOOL bInvisible;
+ const SwContentType* pParent;
+ String sContentName;
+ long nYPosition;
+ BOOL bInvisible;
public:
SwContent(const SwContentType* pCnt, const String& rName, long nYPos );
- virtual BOOL IsProtect() const;
- const SwContentType* GetParent() const {return pParent;}
- const String& GetName() const {return sContentName;}
- int operator==(const SwContent& /*rCont*/) const
+ virtual BOOL IsProtect() const;
+ const SwContentType* GetParent() const {return pParent;}
+ const String& GetName() const {return sContentName;}
+ int operator==(const SwContent& /*rCont*/) const
{
//gleich sind sie nie, sonst fallen sie aus dem Array
return FALSE;
}
- int operator<(const SwContent& rCont) const
+ int operator<(const SwContent& rCont) const
{
//zuerst nach Position dann nach Name sortieren
return nYPosition != rCont.nYPosition ?
@@ -105,10 +105,10 @@ public:
sContentName < rCont.sContentName;;
}
- long GetYPos() const {return nYPosition;}
+ long GetYPos() const {return nYPosition;}
- BOOL IsInvisible() const {return bInvisible;}
- void SetInvisible(){ bInvisible = TRUE;}
+ BOOL IsInvisible() const {return bInvisible;}
+ void SetInvisible(){ bInvisible = TRUE;}
};
#endif
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index 9a3274a61f1c..9776574d34f4 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -2,7 +2,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
@@ -50,41 +50,41 @@ class SwView_Impl;
typedef sal_uInt16 TransferBufferType;
namespace nsTransferBufferType
{
- const sal_uInt16 TRNSFR_NONE = 0x0000;
- const sal_uInt16 TRNSFR_DOCUMENT = 0x0001;
- const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002;
- const sal_uInt16 TRNSFR_GRAPHIC = 0x0004;
- const sal_uInt16 TRNSFR_TABELLE = 0x0008;
- const sal_uInt16 TRNSFR_DDELINK = 0x0010;
- const sal_uInt16 TRNSFR_OLE = 0x0020;
- const sal_uInt16 TRNSFR_INETFLD = 0x0040;
- const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern!
+ const sal_uInt16 TRNSFR_NONE = 0x0000;
+ const sal_uInt16 TRNSFR_DOCUMENT = 0x0001;
+ const sal_uInt16 TRNSFR_DOCUMENT_WORD = 0x0002;
+ const sal_uInt16 TRNSFR_GRAPHIC = 0x0004;
+ const sal_uInt16 TRNSFR_TABELLE = 0x0008;
+ const sal_uInt16 TRNSFR_DDELINK = 0x0010;
+ const sal_uInt16 TRNSFR_OLE = 0x0020;
+ const sal_uInt16 TRNSFR_INETFLD = 0x0040;
+ const sal_uInt16 TRNSFR_DRAWING = 0x0081; //Drawing ist auch intern!
}
-#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor
+#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor
class SwTransferable : public TransferableHelper
{
friend class SwView_Impl;
SfxObjectShellRef aDocShellRef;
- TransferableDataHelper aOleData;
- TransferableObjectDescriptor aObjDesc;
+ TransferableDataHelper aOleData;
+ TransferableObjectDescriptor aObjDesc;
::sfx2::SvBaseLinkRef refDdeLink;
- SwWrtShell *pWrtShell;
+ SwWrtShell *pWrtShell;
/* #96392# Added pCreatorView to distinguish SwFrameShell from
SwWrtShell. */
const ViewShell *pCreatorView;
- SwDocFac *pClpDocFac;
- Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf;
- INetBookmark *pBkmk; // URL und Beschreibung!
- ImageMap *pImageMap;
- INetImage *pTargetURL;
+ SwDocFac *pClpDocFac;
+ Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf;
+ INetBookmark *pBkmk; // URL und Beschreibung!
+ ImageMap *pImageMap;
+ INetImage *pTargetURL;
TransferBufferType eBufferType;
- BOOL bOldIdle :1; //D&D Idle flag from the viewsettings
- BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop)
+ BOOL bOldIdle :1; //D&D Idle flag from the viewsettings
+ BOOL bCleanUp :1; //D&D cleanup after Drop (not by internal Drop)
// helper methods for the copy
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const;
@@ -144,17 +144,17 @@ class SwTransferable : public TransferableHelper
// not available
SwTransferable();
SwTransferable( const SwTransferable& );
- SwTransferable& operator=( const SwTransferable& );
+ SwTransferable& operator=( const SwTransferable& );
protected:
- virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm,
+ virtual void AddSupportedFormats();
+ virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor );
+ virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm,
void* pUserObject,
sal_uInt32 nUserObjectId,
const DATA_FLAVOR& rFlavor );
- virtual void DragFinished( sal_Int8 nDropAction );
- virtual void ObjectReleased();
+ virtual void DragFinished( sal_Int8 nDropAction );
+ virtual void ObjectReleased();
using TransferableHelper::StartDrag;
@@ -169,17 +169,17 @@ public:
static void InitOle( SfxObjectShell* pDoc, SwDoc& rDoc );
// copy - methods and helper methods for the copy
- int Cut();
- int Copy( BOOL bIsCut = FALSE );
+ int Cut();
+ int Copy( BOOL bIsCut = FALSE );
int PrepareForCopy( BOOL bIsCut = FALSE );
- int CalculateAndCopy(); // special for Calculator
+ int CalculateAndCopy(); // special for Calculator
int CopyGlossary( SwTextBlocks& rGlossary, const String& rStr );
// remove the DDE-Link format promise
void RemoveDDELinkFormat( const Window& rWin );
// paste - methods and helper methods for the paste
- static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& );
+ static BOOL IsPaste( const SwWrtShell&, const TransferableDataHelper& );
static int Paste( SwWrtShell&, TransferableDataHelper& );
static int PasteData( TransferableDataHelper& rData,
SwWrtShell& rSh, USHORT nAction, ULONG nFormat,
@@ -201,9 +201,9 @@ public:
// Interfaces for Drag & Drop
void StartDrag( Window* pWin, const Point& rPos );
-
- SwWrtShell* GetShell() { return pWrtShell; }
- void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; }
+
+ SwWrtShell* GetShell() { return pWrtShell; }
+ void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; }
// Interfaces for Selection
/* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 6f8122277bd5..678eaf09e89e 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -2,7 +2,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
@@ -47,8 +47,8 @@ class SW_DLLPUBLIC SwBoxEntry
{
friend class SwComboBox;
- BOOL bModified : 1;
- BOOL bNew : 1;
+ BOOL bModified : 1;
+ BOOL bNew : 1;
String aName;
USHORT nId;
@@ -68,26 +68,26 @@ typedef USHORT SwComboBoxStyle;
namespace nsSwComboBoxStyle
{
- const SwComboBoxStyle CBS_UPPER = 0x01;
- const SwComboBoxStyle CBS_LOWER = 0x02;
- const SwComboBoxStyle CBS_ALL = 0x04;
- const SwComboBoxStyle CBS_FILENAME = 0x08;
+ const SwComboBoxStyle CBS_UPPER = 0x01;
+ const SwComboBoxStyle CBS_LOWER = 0x02;
+ const SwComboBoxStyle CBS_ALL = 0x04;
+ const SwComboBoxStyle CBS_FILENAME = 0x08;
#ifdef WIN
- const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER;
+ const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER;
#else
- const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME;
+ const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME;
#endif
}
class SW_DLLPUBLIC SwComboBox : public ComboBox
{
- SwEntryLst aEntryLst;
- SwEntryLst aDelEntryLst;
- SwBoxEntry aDefault;
- USHORT nStyle;
+ SwEntryLst aEntryLst;
+ SwEntryLst aDelEntryLst;
+ SwBoxEntry aDefault;
+ USHORT nStyle;
- SW_DLLPRIVATE void InitComboBox();
- SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry);
+ SW_DLLPRIVATE void InitComboBox();
+ SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry);
using ComboBox::InsertEntry;
using ComboBox::RemoveEntry;
@@ -101,24 +101,24 @@ public:
USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL);
~SwComboBox();
- virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
void InsertEntry(const SwBoxEntry&);
- USHORT InsertEntry( const XubString& rStr, USHORT = 0)
- { InsertEntry( SwBoxEntry( rStr ) ); return 0; }
+ USHORT InsertEntry( const XubString& rStr, USHORT = 0)
+ { InsertEntry( SwBoxEntry( rStr ) ); return 0; }
- void RemoveEntry(USHORT nPos);
+ void RemoveEntry(USHORT nPos);
- USHORT GetEntryPos(const SwBoxEntry& rEntry) const;
- const SwBoxEntry& GetEntry(USHORT) const;
+ USHORT GetEntryPos(const SwBoxEntry& rEntry) const;
+ const SwBoxEntry& GetEntry(USHORT) const;
- USHORT GetRemovedCount() const;
- const SwBoxEntry& GetRemovedEntry(USHORT nPos) const;
+ USHORT GetRemovedCount() const;
+ const SwBoxEntry& GetRemovedEntry(USHORT nPos) const;
- USHORT GetStyle() const { return nStyle; }
- void SetStyle(const USHORT nSt) { nStyle = nSt; }
+ USHORT GetStyle() const { return nStyle; }
+ void SetStyle(const USHORT nSt) { nStyle = nSt; }
- String GetText() const;
+ String GetText() const;
};
#endif /* _SWLBOX_HXX */
diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc
index eed234a6d886..697617aeb4ef 100644
--- a/sw/source/ui/inc/swmn_tmpl.hrc
+++ b/sw/source/ui/inc/swmn_tmpl.hrc
@@ -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
@@ -38,7 +38,7 @@
/* --------------------- F O R M A T --------------------------------- */
-#define SEPARATOR MenuItem { Separator = TRUE; }
+#define SEPARATOR MenuItem { Separator = TRUE; }
//define for ITEM_FORMAT_NUMBERING
#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
@@ -242,7 +242,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
Identifier = FN_REDLINE_REJECT_DIRECT ; \
HelpID = FN_REDLINE_REJECT_DIRECT ; \
Text [ en-US ] = "Reject Change" ; \
- }; \
+ }; \
SEPARATOR ;
#define _MN_EDIT_BIB_ENTRY_DLG \
MenuItem \
@@ -275,14 +275,14 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
Identifier = FN_REMOVE_HYPERLINK ; \
HelpID = FN_REMOVE_HYPERLINK ; \
Text [ en-US ] = "Remo~ve Hyperlink"; \
- };
+ };
#define _MN_EDIT_OPEN_SMARTTAGMENU \
MenuItem \
{ \
ITEM_OPEN_SMARTTAGMENU \
};
-
+
#define _MN_EDIT__HYPERLINK \
MenuItem\
{\
@@ -290,7 +290,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
HelpID = FN_EDIT_HYPERLINK ; \
Text [ en-US ] = "~Edit Hyperlink" ; \
};
-
+
#define _DEFAULT_TEXT_EDIT_ELEMENTS \
_MN_EDIT_FIELD \
_MN_EDIT_FOOTNOTE \
@@ -339,7 +339,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
Identifier = FN_NUM_BULLET_DOWN; \
HelpId = FN_NUM_BULLET_DOWN; \
Text[ en-US ] = "Down One Level"; \
- };
+ };
#define BASE_TEXT_POPUPMENU_BEGIN \
{ \
@@ -353,7 +353,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
MN_TXT \
MN_NUMBERING \
ITEM_TRANSLITERATE_MENU \
- SEPARATOR ;
+ SEPARATOR ;
// not in Writer/Web
#define BASE_TEXT_POPUPMENU_NOWEB \
@@ -375,12 +375,12 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
HelpID = FN_REMOVE_CUR_TOX; \
Text [ en-US ] = "Delete Index/Table"; \
}; \
- SEPARATOR ;
+ SEPARATOR ;
#define BASE_TEXT_POPUPMENU_END \
_DEFAULT_TEXT_EDIT_ELEMENTS \
}; \
-};
+};
-#endif
+#endif
diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx
index 7b4a9b4afd74..583870434a6e 100644
--- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/ui/inc/swmodalredlineacceptdlg.hxx
@@ -2,7 +2,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
@@ -34,16 +34,16 @@ class SwRedlineAcceptDlg;
class SwModalRedlineAcceptDlg : public SfxModalDialog
{
- SwRedlineAcceptDlg* pImplDlg;
+ SwRedlineAcceptDlg* pImplDlg;
- virtual void Resize();
+ virtual void Resize();
public:
SwModalRedlineAcceptDlg(Window *pParent);
~SwModalRedlineAcceptDlg();
- void AcceptAll( BOOL bAccept );
- virtual void Activate();
+ void AcceptAll( BOOL bAccept );
+ virtual void Activate();
};
#endif
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index 1d51a0ef5e5d..30b8961cb4fa 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -2,7 +2,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
@@ -44,16 +44,16 @@
class SwRenameXNamedDlg : public ModalDialog
{
- FixedText aNewNameFT;
- NoSpaceEdit aNewNameED;
+ FixedText aNewNameFT;
+ NoSpaceEdit aNewNameED;
FixedLine aNameFL;
- OKButton aOk;
- CancelButton aCancel;
- HelpButton aHelp;
+ OKButton aOk;
+ CancelButton aCancel;
+ HelpButton aHelp;
- String sRemoveWarning;
+ String sRemoveWarning;
- STAR_REFERENCE( container::XNamed ) & xNamed;
+ STAR_REFERENCE( container::XNamed ) & xNamed;
STAR_REFERENCE( container::XNameAccess ) & xNameAccess;
STAR_REFERENCE( container::XNameAccess ) xSecondAccess;
STAR_REFERENCE( container::XNameAccess ) xThirdAccess;
@@ -66,7 +66,7 @@ public:
STAR_REFERENCE( container::XNamed ) & xNamed,
STAR_REFERENCE( container::XNameAccess ) & xNameAccess );
- void SetForbiddenChars( const String& rSet )
+ void SetForbiddenChars( const String& rSet )
{ aNewNameED.SetForbiddenChars( rSet ); }
void SetAlternativeAccess(
diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx
index 5867deb610eb..e0684fcb13d3 100644
--- a/sw/source/ui/inc/swtablerep.hxx
+++ b/sw/source/ui/inc/swtablerep.hxx
@@ -2,7 +2,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
@@ -37,59 +37,59 @@ class SwTabCols;
struct TColumn;
class SW_DLLPUBLIC SwTableRep
{
- TColumn* pTColumns;
-
- SwTwips nTblWidth;
- SwTwips nSpace;
- SwTwips nLeftSpace;
- SwTwips nRightSpace;
- USHORT nAlign;
- USHORT nColCount;
- USHORT nAllCols;
- USHORT nWidthPercent;
- BOOL bComplex : 1;
- BOOL bLineSelected : 1;
- BOOL bWidthChanged : 1;
- BOOL bColsChanged : 1;
+ TColumn* pTColumns;
+
+ SwTwips nTblWidth;
+ SwTwips nSpace;
+ SwTwips nLeftSpace;
+ SwTwips nRightSpace;
+ USHORT nAlign;
+ USHORT nColCount;
+ USHORT nAllCols;
+ USHORT nWidthPercent;
+ BOOL bComplex : 1;
+ BOOL bLineSelected : 1;
+ BOOL bWidthChanged : 1;
+ BOOL bColsChanged : 1;
public:
SwTableRep( const SwTabCols& rTabCol, BOOL bComplex );
~SwTableRep();
- BOOL FillTabCols( SwTabCols& rTabCol ) const;
+ BOOL FillTabCols( SwTabCols& rTabCol ) const;
- SwTwips GetLeftSpace() const {return nLeftSpace;}
- void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;}
+ SwTwips GetLeftSpace() const {return nLeftSpace;}
+ void SetLeftSpace(SwTwips nSet) {nLeftSpace = nSet;}
- SwTwips GetRightSpace() const {return nRightSpace;}
- void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;}
+ SwTwips GetRightSpace() const {return nRightSpace;}
+ void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;}
- SwTwips GetWidth() const {return nTblWidth;}
- void SetWidth(SwTwips nSet) {nTblWidth = nSet;}
+ SwTwips GetWidth() const {return nTblWidth;}
+ void SetWidth(SwTwips nSet) {nTblWidth = nSet;}
- USHORT GetWidthPercent() const {return nWidthPercent;}
- void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;}
+ USHORT GetWidthPercent() const {return nWidthPercent;}
+ void SetWidthPercent(USHORT nSet) {nWidthPercent = nSet;}
- USHORT GetAlign() const {return nAlign;}
- void SetAlign(USHORT nSet) {nAlign = nSet;}
+ USHORT GetAlign() const {return nAlign;}
+ void SetAlign(USHORT nSet) {nAlign = nSet;}
- BOOL IsComplex() const {return bComplex;}
- USHORT GetColCount() const {return nColCount;}
- USHORT GetAllColCount() const {return nAllCols;}
+ BOOL IsComplex() const {return bComplex;}
+ USHORT GetColCount() const {return nColCount;}
+ USHORT GetAllColCount() const {return nAllCols;}
- BOOL HasColsChanged() const {return bColsChanged;}
- void SetColsChanged() {bColsChanged = TRUE;}
+ BOOL HasColsChanged() const {return bColsChanged;}
+ void SetColsChanged() {bColsChanged = TRUE;}
- BOOL HasWidthChanged() const {return bWidthChanged;}
- void SetWidthChanged() {bWidthChanged = TRUE;}
+ BOOL HasWidthChanged() const {return bWidthChanged;}
+ void SetWidthChanged() {bWidthChanged = TRUE;}
- BOOL IsLineSelected() const {return bLineSelected;}
- void SetLineSelected(BOOL bSet) {bLineSelected = bSet;}
+ BOOL IsLineSelected() const {return bLineSelected;}
+ void SetLineSelected(BOOL bSet) {bLineSelected = bSet;}
- SwTwips GetSpace() const { return nSpace;}
- void SetSpace(SwTwips nSet) {nSpace = nSet;}
+ SwTwips GetSpace() const { return nSpace;}
+ void SetSpace(SwTwips nSet) {nSpace = nSet;}
- TColumn* GetColumns() const {return pTColumns;}
+ TColumn* GetColumns() const {return pTColumns;}
};
#endif
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx
index 20f951af4ed8..a1ae526a98cf 100644
--- a/sw/source/ui/inc/swuiccoll.hxx
+++ b/sw/source/ui/inc/swuiccoll.hxx
@@ -2,7 +2,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
@@ -36,29 +36,29 @@ class SwFmt;
class SwCondCollPage : public SfxTabPage
{
FixedLine aConditionFL;
- CheckBox aConditionCB;
+ CheckBox aConditionCB;
- FixedText aContextFT;
- FixedText aUsedFT;
- SvTabListBox aTbLinks;
+ FixedText aContextFT;
+ FixedText aUsedFT;
+ SvTabListBox aTbLinks;
- FixedText aStyleFT;
- ListBox aStyleLB;
- ListBox aFilterLB;
+ FixedText aStyleFT;
+ ListBox aStyleLB;
+ ListBox aFilterLB;
- PushButton aRemovePB;
- PushButton aAssignPB;
+ PushButton aRemovePB;
+ PushButton aAssignPB;
- String sNoTmpl;
- ResStringArray aStrArr;
+ String sNoTmpl;
+ ResStringArray aStrArr;
- SwWrtShell &rSh;
+ SwWrtShell &rSh;
const CommandStruct*pCmds;
- SwFmt* pFmt;
+ SwFmt* pFmt;
- CollName* pNms;
+ CollName* pNms;
- BOOL bNewTemplate;
+ BOOL bNewTemplate;
SwCondCollPage(Window *pParent, const SfxItemSet &rSet);
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 527f38499e7f..a0358f9ce178 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -2,7 +2,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
@@ -70,32 +70,32 @@ struct SwIndexSections_Impl;
class SwMultiTOXTabDialog : public SfxTabDialog
{
- Window aExampleContainerWIN;
+ Window aExampleContainerWIN;
Window aExampleWIN;
- CheckBox aShowExampleCB;
- SwTOXMgr* pMgr;
- SwWrtShell& rSh;
+ CheckBox aShowExampleCB;
+ SwTOXMgr* pMgr;
+ SwWrtShell& rSh;
- SwOneExampleFrame* pExampleFrame;
+ SwOneExampleFrame* pExampleFrame;
- SwTOXDescription** pDescArr; //
- SwForm** pFormArr; //
- SwIndexSections_Impl** pxIndexSectionsArr;
+ SwTOXDescription** pDescArr; //
+ SwForm** pFormArr; //
+ SwIndexSections_Impl** pxIndexSectionsArr;
- SwTOXBase* pParamTOXBase;
+ SwTOXBase* pParamTOXBase;
- CurTOXType eCurrentTOXType;
+ CurTOXType eCurrentTOXType;
- String sUserDefinedIndex;
- USHORT nTypeCount;
- USHORT nInitialTOXType;
+ String sUserDefinedIndex;
+ USHORT nTypeCount;
+ USHORT nInitialTOXType;
- BOOL bEditTOX;
- BOOL bExampleCreated;
- BOOL bGlobalFlag;
+ BOOL bEditTOX;
+ BOOL bExampleCreated;
+ BOOL bGlobalFlag;
- virtual short Ok();
- SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX);
+ virtual short Ok();
+ SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX);
DECL_LINK(CreateExample_Hdl, void* );
DECL_LINK(ShowPreviewHdl, CheckBox*);
@@ -107,26 +107,26 @@ public:
BOOL bGlobal = FALSE);
~SwMultiTOXTabDialog();
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
- SwForm* GetForm(CurTOXType eType);
+ SwForm* GetForm(CurTOXType eType);
- CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;}
- void SetCurrentTOXType(CurTOXType eSet)
+ CurTOXType GetCurrentTOXType() const { return eCurrentTOXType;}
+ void SetCurrentTOXType(CurTOXType eSet)
{
eCurrentTOXType = eSet;
}
- void UpdateExample();
- BOOL IsTOXEditMode() const { return bEditTOX;}
+ void UpdateExample();
+ BOOL IsTOXEditMode() const { return bEditTOX;}
- SwWrtShell& GetWrtShell() {return rSh;}
+ SwWrtShell& GetWrtShell() {return rSh;}
- SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes);
- void CreateOrUpdateExample(
+ SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes);
+ void CreateOrUpdateExample(
TOXTypes nTOXIndex, USHORT nPage = 0, USHORT nCurLevel = USHRT_MAX);
- static BOOL IsNoNum(SwWrtShell& rSh, const String& rName);
+ static BOOL IsNoNum(SwWrtShell& rSh, const String& rName);
};
class IndexEntryRessource;
@@ -135,65 +135,65 @@ class IndexEntrySupplierWrapper;
class SwTOXSelectTabPage : public SfxTabPage
{
FixedLine aTypeTitleFL;
- FixedText aTitleFT;
- Edit aTitleED;
- FixedText aTypeFT;
- ListBox aTypeLB;
- CheckBox aReadOnlyCB;
+ FixedText aTitleFT;
+ Edit aTitleED;
+ FixedText aTypeFT;
+ ListBox aTypeLB;
+ CheckBox aReadOnlyCB;
FixedLine aAreaFL;
FixedText aAreaFT;
ListBox aAreaLB;
- FixedText aLevelFT; //content, user
- NumericField aLevelNF; //content, user
+ FixedText aLevelFT; //content, user
+ NumericField aLevelNF; //content, user
//content
FixedLine aCreateFromFL; // content, user, illustration
- CheckBox aFromHeadingsCB;
-// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei
- CheckBox aAddStylesCB;
- PushButton aAddStylesPB;
+ CheckBox aFromHeadingsCB;
+// PushButton aChapterDlgPB; //#outline level,removed by zhaojianwei
+ CheckBox aAddStylesCB;
+ PushButton aAddStylesPB;
//user
- CheckBox aFromTablesCB;
- CheckBox aFromFramesCB;
- CheckBox aFromGraphicsCB;
- CheckBox aFromOLECB;
- CheckBox aLevelFromChapterCB;
+ CheckBox aFromTablesCB;
+ CheckBox aFromFramesCB;
+ CheckBox aFromGraphicsCB;
+ CheckBox aFromOLECB;
+ CheckBox aLevelFromChapterCB;
//illustration + table
- RadioButton aFromCaptionsRB;
+ RadioButton aFromCaptionsRB;
RadioButton aFromObjectNamesRB;
//illustration and tables
- FixedText aCaptionSequenceFT;
- ListBox aCaptionSequenceLB;
- FixedText aDisplayTypeFT;
- ListBox aDisplayTypeLB;
+ FixedText aCaptionSequenceFT;
+ ListBox aCaptionSequenceLB;
+ FixedText aDisplayTypeFT;
+ ListBox aDisplayTypeLB;
//all but illustration and table
- CheckBox aTOXMarksCB;
+ CheckBox aTOXMarksCB;
//
//index only
- CheckBox aCollectSameCB;
- CheckBox aUseFFCB;
- CheckBox aUseDashCB;
- CheckBox aCaseSensitiveCB;
- CheckBox aInitialCapsCB;
- CheckBox aKeyAsEntryCB;
- CheckBox aFromFileCB;
- MenuButton aAutoMarkPB;
+ CheckBox aCollectSameCB;
+ CheckBox aUseFFCB;
+ CheckBox aUseDashCB;
+ CheckBox aCaseSensitiveCB;
+ CheckBox aInitialCapsCB;
+ CheckBox aKeyAsEntryCB;
+ CheckBox aFromFileCB;
+ MenuButton aAutoMarkPB;
FixedLine aIdxOptionsFL; // index only
// object only
- SwOLENames aFromNames;
- SvxCheckListBox aFromObjCLB;
+ SwOLENames aFromNames;
+ SvxCheckListBox aFromObjCLB;
FixedLine aFromObjFL;
- CheckBox aSequenceCB;
- FixedText aBracketFT;
- ListBox aBracketLB;
+ CheckBox aSequenceCB;
+ FixedText aBracketFT;
+ ListBox aBracketLB;
FixedLine aAuthorityFormatFL;
//all
@@ -206,34 +206,34 @@ class SwTOXSelectTabPage : public SfxTabPage
IndexEntryRessource* pIndexRes;
Point aCBLeftPos1;
- Point aCBLeftPos2;
- Point aCBLeftPos3;
+ Point aCBLeftPos2;
+ Point aCBLeftPos3;
- String aStyleArr[MAXLEVEL];
- String sAutoMarkURL;
- String sAutoMarkType;
- String sAddStyleUser;
- String sAddStyleContent;
+ String aStyleArr[MAXLEVEL];
+ String sAutoMarkURL;
+ String sAutoMarkType;
+ String sAddStyleUser;
+ String sAddStyleContent;
const IndexEntrySupplierWrapper* pIndexEntryWrapper;
- BOOL bFirstCall;
+ BOOL bFirstCall;
- DECL_LINK(TOXTypeHdl, ListBox* );
- DECL_LINK(TOXAreaHdl, ListBox* );
-// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei
+ DECL_LINK(TOXTypeHdl, ListBox* );
+ DECL_LINK(TOXAreaHdl, ListBox* );
+// DECL_LINK(ChapterHdl, PushButton* ); //#outline level,removed by zhaojianwei
DECL_LINK(AddStylesHdl, PushButton* );
DECL_LINK(MenuEnableHdl, Menu*);
DECL_LINK(MenuExecuteHdl, Menu*);
DECL_LINK(LanguageHdl, ListBox*);
- DECL_LINK(CheckBoxHdl, CheckBox* );
+ DECL_LINK(CheckBoxHdl, CheckBox* );
DECL_LINK(RadioButtonHdl, RadioButton* );
DECL_LINK(ModifyHdl, void*);
- void ApplyTOXDescription();
- void FillTOXDescription();
-
+ void ApplyTOXDescription();
+ void FillTOXDescription();
+
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -241,17 +241,17 @@ public:
SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet);
~SwTOXSelectTabPage();
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
- virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual void ActivatePage( const SfxItemSet& );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc
- void SetWrtShell(SwWrtShell& rSh);
+ void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc
+ void SetWrtShell(SwWrtShell& rSh);
};
DECLARE_LIST(TOXControlList, Control*)
@@ -262,21 +262,21 @@ class SwTOXEntryTabPage;
class SwTokenWindow : public Window
{
- ImageButton aLeftScrollWin;
- Window aCtrlParentWin;
- ImageButton aRightScrollWin;
- TOXControlList aControlList;
- SwForm* pForm;
- USHORT nLevel;
- BOOL bValid;
- String aButtonTexts[TOKEN_END]; // Text of the buttons
- String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons
- String sCharStyle;
- Link aButtonSelectedHdl;
- Control* pActiveCtrl;
- Link aModifyHdl;
-
- SwTOXEntryTabPage* m_pParent;
+ ImageButton aLeftScrollWin;
+ Window aCtrlParentWin;
+ ImageButton aRightScrollWin;
+ TOXControlList aControlList;
+ SwForm* pForm;
+ USHORT nLevel;
+ BOOL bValid;
+ String aButtonTexts[TOKEN_END]; // Text of the buttons
+ String aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons
+ String sCharStyle;
+ Link aButtonSelectedHdl;
+ Control* pActiveCtrl;
+ Link aModifyHdl;
+
+ SwTOXEntryTabPage* m_pParent;
DECL_LINK(EditResize, Edit*);
DECL_LINK(NextItemHdl, SwTOXEdit* );
@@ -285,46 +285,46 @@ class SwTokenWindow : public Window
DECL_LINK(TbxFocusBtnHdl, SwTOXButton* );
DECL_LINK(ScrollHdl, ImageButton* );
- void SetActiveControl(Control* pSet);
+ void SetActiveControl(Control* pSet);
- Control* InsertItem(const String& rText, const SwFormToken& aToken);
- void AdjustPositions();
- void AdjustScrolling();
- void MoveControls(long nOffset);
+ Control* InsertItem(const String& rText, const SwFormToken& aToken);
+ void AdjustPositions();
+ void AdjustScrolling();
+ void MoveControls(long nOffset);
public:
SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId);
~SwTokenWindow();
- void SetForm(SwForm& rForm, USHORT nLevel);
- USHORT GetLastLevel()const {return nLevel;};
+ void SetForm(SwForm& rForm, USHORT nLevel);
+ USHORT GetLastLevel()const {return nLevel;};
- BOOL IsValid() const {return bValid;}
+ BOOL IsValid() const {return bValid;}
- void SetInvalid() {bValid = FALSE;}
+ void SetInvalid() {bValid = FALSE;}
- String GetPattern() const;
+ String GetPattern() const;
- void SetButtonSelectedHdl(const Link& rLink)
+ void SetButtonSelectedHdl(const Link& rLink)
{ aButtonSelectedHdl = rLink;}
- void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;}
+ void SetModifyHdl(const Link& rLink){aModifyHdl = rLink;}
- Control* GetActiveControl()
+ Control* GetActiveControl()
{ return pActiveCtrl;}
- void InsertAtSelection(const String& rText, const SwFormToken& aToken);
- void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE);
+ void InsertAtSelection(const String& rText, const SwFormToken& aToken);
+ void RemoveControl(SwTOXButton* pDel, BOOL bInternalCall = FALSE);
- BOOL Contains(FormTokenType) const;
+ BOOL Contains(FormTokenType) const;
- BOOL DetermineLinkStart();
+ BOOL DetermineLinkStart();
//helper for pattern buttons and edits
- BOOL CreateQuickHelp(Control* pCtrl,
+ BOOL CreateQuickHelp(Control* pCtrl,
const SwFormToken& rToken, const HelpEvent& );
- virtual void Resize();
+ virtual void Resize();
virtual void GetFocus();
};
@@ -346,81 +346,81 @@ class SwTOXEntryTabPage : public SfxTabPage
FixedText aTokenFT;
SwTokenWindow aTokenWIN;
- PushButton aAllLevelsPB;
-
- PushButton aEntryNoPB;
- PushButton aEntryPB;
- PushButton aTabPB;
- PushButton aChapterInfoPB;
- PushButton aPageNoPB;
- PushButton aHyperLinkPB;
-
- ListBox aAuthFieldsLB;
- PushButton aAuthInsertPB;
- PushButton aAuthRemovePB;
-
- FixedText aCharStyleFT;
- ListBox aCharStyleLB; // character style of the current token
- PushButton aEditStylePB;
-
- FixedText aChapterEntryFT;
- ListBox aChapterEntryLB; // type of chapter info
-
- FixedText aNumberFormatFT;
- ListBox aNumberFormatLB; //!< format for numbering (E#)
-
- FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420
- NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420
- FixedText aFillCharFT;
- ComboBox aFillCharCB; // fill char for tab stop
- FixedText aTabPosFT;
- MetricField aTabPosMF; // tab stop position
- CheckBox aAutoRightCB;
+ PushButton aAllLevelsPB;
+
+ PushButton aEntryNoPB;
+ PushButton aEntryPB;
+ PushButton aTabPB;
+ PushButton aChapterInfoPB;
+ PushButton aPageNoPB;
+ PushButton aHyperLinkPB;
+
+ ListBox aAuthFieldsLB;
+ PushButton aAuthInsertPB;
+ PushButton aAuthRemovePB;
+
+ FixedText aCharStyleFT;
+ ListBox aCharStyleLB; // character style of the current token
+ PushButton aEditStylePB;
+
+ FixedText aChapterEntryFT;
+ ListBox aChapterEntryLB; // type of chapter info
+
+ FixedText aNumberFormatFT;
+ ListBox aNumberFormatLB; //!< format for numbering (E#)
+
+ FixedText aEntryOutlineLevelFT; //!< Fixed text, for i53420
+ NumericField aEntryOutlineLevelNF; //!< level to evaluate outline level to, for i53420
+ FixedText aFillCharFT;
+ ComboBox aFillCharCB; // fill char for tab stop
+ FixedText aTabPosFT;
+ MetricField aTabPosMF; // tab stop position
+ CheckBox aAutoRightCB;
FixedLine aEntryFL;
- CheckBox aRelToStyleCB; // position relative to the right margin of the para style
- FixedText aMainEntryStyleFT;
- ListBox aMainEntryStyleLB; // character style of main entries in indexes
- CheckBox aAlphaDelimCB;
- CheckBox aCommaSeparatedCB;
+ CheckBox aRelToStyleCB; // position relative to the right margin of the para style
+ FixedText aMainEntryStyleFT;
+ ListBox aMainEntryStyleLB; // character style of main entries in indexes
+ CheckBox aAlphaDelimCB;
+ CheckBox aCommaSeparatedCB;
FixedLine aFormatFL;
- RadioButton aSortDocPosRB;
- RadioButton aSortContentRB;
+ RadioButton aSortDocPosRB;
+ RadioButton aSortContentRB;
FixedLine aSortingFL;
- FixedText aFirstKeyFT;
- ListBox aFirstKeyLB;
+ FixedText aFirstKeyFT;
+ ListBox aFirstKeyLB;
ImageRadioButton aFirstSortUpRB;
ImageRadioButton aFirstSortDownRB;
- FixedText aSecondKeyFT;
- ListBox aSecondKeyLB;
+ FixedText aSecondKeyFT;
+ ListBox aSecondKeyLB;
ImageRadioButton aSecondSortUpRB;
ImageRadioButton aSecondSortDownRB;
- FixedText aThirdKeyFT;
- ListBox aThirdKeyLB;
+ FixedText aThirdKeyFT;
+ ListBox aThirdKeyLB;
ImageRadioButton aThirdSortUpRB;
ImageRadioButton aThirdSortDownRB;
FixedLine aSortKeyFL;
- String sDelimStr;
- String sLevelStr;
- String sAuthTypeStr;
+ String sDelimStr;
+ String sLevelStr;
+ String sAuthTypeStr;
- String sNoCharStyle;
- String sNoCharSortKey;
- Point aButtonPositions[5];
+ String sNoCharStyle;
+ String sNoCharSortKey;
+ Point aButtonPositions[5];
SwForm* m_pCurrentForm;
- Point aRelToStylePos;
- Point aRelToStyleIdxPos;
+ Point aRelToStylePos;
+ Point aRelToStyleIdxPos;
Size aLevelFLSize;
- CurTOXType aLastTOXType;
- BOOL bInLevelHdl;
+ CurTOXType aLastTOXType;
+ BOOL bInLevelHdl;
Point aChapterEntryFTPosition; //!< holds position of ChapterEntryFT control,
//to be used in moving the element among different tokens
@@ -443,9 +443,9 @@ class SwTOXEntryTabPage : public SfxTabPage
DECL_LINK(AllLevelsHdl, PushButton*);
- void EnableButtons();
- void WriteBackLevel();
- void UpdateDescriptor();
+ void EnableButtons();
+ void WriteBackLevel();
+ void UpdateDescriptor();
DECL_LINK(ModifyHdl, void*);
using SfxTabPage::ActivatePage;
@@ -455,33 +455,33 @@ public:
SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet);
~SwTOXEntryTabPage();
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
- virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
+ virtual void ActivatePage( const SfxItemSet& );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- void SetWrtShell(SwWrtShell& rSh);
+ void SetWrtShell(SwWrtShell& rSh);
- String GetLevelHelp(USHORT nLevel) const;
+ String GetLevelHelp(USHORT nLevel) const;
- void PreTokenButtonRemoved(const SwFormToken& rToken);
+ void PreTokenButtonRemoved(const SwFormToken& rToken);
};
class SwTOXStylesTabPage : public SfxTabPage
{
- FixedText aLevelFT2;
- ListBox aLevelLB;
- FixedText aTemplateFT;
- ListBox aParaLayLB;
- PushButton aStdBT;
+ FixedText aLevelFT2;
+ ListBox aLevelLB;
+ FixedText aTemplateFT;
+ ListBox aParaLayLB;
+ PushButton aStdBT;
ImageButton aAssignBT;
- PushButton aEditStyleBT;
+ PushButton aEditStyleBT;
FixedLine aFormatFL;
SwForm* m_pCurrentForm;
-// void UpdatePattern();
+// void UpdatePattern();
DECL_LINK( EditStyleHdl, Button *);
DECL_LINK( StdHdl, Button * );
@@ -490,7 +490,7 @@ class SwTOXStylesTabPage : public SfxTabPage
DECL_LINK( AssignHdl, Button * );
DECL_LINK( ModifyHdl, void*);
- SwForm& GetForm()
+ SwForm& GetForm()
{
SwMultiTOXTabDialog* pDlg = (SwMultiTOXTabDialog*)GetTabDialog();
return *pDlg->GetForm(pDlg->GetCurrentTOXType());
@@ -503,13 +503,13 @@ public:
SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet);
~SwTOXStylesTabPage();
- virtual BOOL FillItemSet( SfxItemSet& );
- virtual void Reset( const SfxItemSet& );
+ virtual BOOL FillItemSet( SfxItemSet& );
+ virtual void Reset( const SfxItemSet& );
- virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual void ActivatePage( const SfxItemSet& );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
};
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index 2fb8470d6087..e4a179612fbe 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@ class SwWrtShell;
class SwTOXMgr;
class SwTOXMark;
/*--------------------------------------------------------------------
- Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
+ Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
--------------------------------------------------------------------*/
class SwIndexMarkFloatDlg;
class SwIndexMarkModalDlg;
@@ -61,66 +61,66 @@ class SwIndexMarkDlg : public Window
{
friend class SwIndexMarkFloatDlg;
friend class SwIndexMarkModalDlg;
- FixedText aTypeFT;
- ListBox aTypeDCB;
- ImageButton aNewBT;
-
- FixedText aEntryFT;
- Edit aEntryED;
- FixedText aPhoneticFT0;
- Edit aPhoneticED0;
-
- FixedText aKeyFT;
- ComboBox aKeyDCB;
- FixedText aPhoneticFT1;
- Edit aPhoneticED1;
-
- FixedText aKey2FT;
- ComboBox aKey2DCB;
- FixedText aPhoneticFT2;
- Edit aPhoneticED2;
-
- FixedText aLevelFT;
- NumericField aLevelED;
- CheckBox aMainEntryCB;
- CheckBox aApplyToAllCB;
- CheckBox aSearchCaseSensitiveCB;
- CheckBox aSearchCaseWordOnlyCB;
+ FixedText aTypeFT;
+ ListBox aTypeDCB;
+ ImageButton aNewBT;
+
+ FixedText aEntryFT;
+ Edit aEntryED;
+ FixedText aPhoneticFT0;
+ Edit aPhoneticED0;
+
+ FixedText aKeyFT;
+ ComboBox aKeyDCB;
+ FixedText aPhoneticFT1;
+ Edit aPhoneticED1;
+
+ FixedText aKey2FT;
+ ComboBox aKey2DCB;
+ FixedText aPhoneticFT2;
+ Edit aPhoneticED2;
+
+ FixedText aLevelFT;
+ NumericField aLevelED;
+ CheckBox aMainEntryCB;
+ CheckBox aApplyToAllCB;
+ CheckBox aSearchCaseSensitiveCB;
+ CheckBox aSearchCaseWordOnlyCB;
FixedLine aIndexFL;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
- PushButton aDelBT;
- //PushButton aNewBT;
-
- ImageButton aPrevSameBT;
- ImageButton aNextSameBT;
- ImageButton aPrevBT;
- ImageButton aNextBT;
-
- String aOrgStr;
- sal_Int32 nOptionsId;
- sal_Bool bDel;
- sal_Bool bNewMark;
- sal_Bool bSelected;
-
- BOOL bPhoneticED0_ChangedByUser;
- BOOL bPhoneticED1_ChangedByUser;
- BOOL bPhoneticED2_ChangedByUser;
- LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
- BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+ PushButton aDelBT;
+ //PushButton aNewBT;
+
+ ImageButton aPrevSameBT;
+ ImageButton aNextSameBT;
+ ImageButton aPrevBT;
+ ImageButton aNextBT;
+
+ String aOrgStr;
+ sal_Int32 nOptionsId;
+ sal_Bool bDel;
+ sal_Bool bNewMark;
+ sal_Bool bSelected;
+
+ BOOL bPhoneticED0_ChangedByUser;
+ BOOL bPhoneticED1_ChangedByUser;
+ BOOL bPhoneticED2_ChangedByUser;
+ LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
+ BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry
com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier >
xExtendedIndexEntrySupplier;
- SwTOXMgr* pTOXMgr;
- SwWrtShell* pSh;
+ SwTOXMgr* pTOXMgr;
+ SwWrtShell* pSh;
- void Apply();
- void InitControls();
- void InsertMark();
- void UpdateMark();
+ void Apply();
+ void InitControls();
+ void InsertMark();
+ void UpdateMark();
DECL_LINK( InsertHdl, Button * );
DECL_LINK( CloseHdl, Button * );
@@ -138,15 +138,15 @@ class SwIndexMarkDlg : public Window
//this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled'
//it needs to be called ones if this dialog is opened to create a new entry (in InitControls),
//or otherwise it has to be called for each changed TOXMark (in UpdateDialog)
- void UpdateLanguageDependenciesForPhoneticReading();
- String GetDefaultPhoneticReading( const String& rText );
+ void UpdateLanguageDependenciesForPhoneticReading();
+ String GetDefaultPhoneticReading( const String& rText );
- void UpdateKeyBoxes();
+ void UpdateKeyBoxes();
- void UpdateDialog();
- void InsertUpdate();
+ void UpdateDialog();
+ void InsertUpdate();
- virtual void Activate();
+ virtual void Activate();
public:
@@ -160,72 +160,72 @@ public:
~SwIndexMarkDlg();
void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0);
- sal_Bool IsTOXType(const String& rName)
+ sal_Bool IsTOXType(const String& rName)
{return LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos(rName);}
};
class SwIndexMarkFloatDlg : public SfxModelessDialog
{
- SwIndexMarkDlg aDlg;
- virtual void Activate();
+ SwIndexMarkDlg aDlg;
+ virtual void Activate();
public:
- SwIndexMarkFloatDlg( SfxBindings* pBindings,
+ SwIndexMarkFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True);
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwIndexMarkModalDlg : public SvxStandardDialog
{
- SwIndexMarkDlg aDlg;
+ SwIndexMarkDlg aDlg;
public:
SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark);
- virtual void Apply();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ virtual void Apply();
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkModalDlg;
class SwAuthMarkDlg : public Window
{
- static sal_Bool bIsFromComponent;
+ static sal_Bool bIsFromComponent;
friend class SwAuthMarkModalDlg;
friend class SwAuthMarkFloatDlg;
RadioButton aFromComponentRB;
- RadioButton aFromDocContentRB;
- FixedText aAuthorFT;
- FixedInfo aAuthorFI;
- FixedText aTitleFT;
- FixedInfo aTitleFI;
- FixedText aEntryFT;
- Edit aEntryED;
- ListBox aEntryLB;
+ RadioButton aFromDocContentRB;
+ FixedText aAuthorFT;
+ FixedInfo aAuthorFI;
+ FixedText aTitleFT;
+ FixedInfo aTitleFI;
+ FixedText aEntryFT;
+ Edit aEntryED;
+ ListBox aEntryLB;
FixedLine aEntryFL;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
- PushButton aCreateEntryPB;
- PushButton aEditEntryPB;
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+ PushButton aCreateEntryPB;
+ PushButton aEditEntryPB;
- String sChangeST;
- sal_Bool bNewEntry;
- sal_Bool bBibAccessInitialized;
+ String sChangeST;
+ sal_Bool bNewEntry;
+ sal_Bool bBibAccessInitialized;
- SwWrtShell* pSh;
+ SwWrtShell* pSh;
- String m_sColumnTitles[AUTH_FIELD_END];
- String m_sFields[AUTH_FIELD_END];
+ String m_sColumnTitles[AUTH_FIELD_END];
+ String m_sFields[AUTH_FIELD_END];
- String m_sCreatedEntry[AUTH_FIELD_END];
+ String m_sCreatedEntry[AUTH_FIELD_END];
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess;
DECL_LINK(InsertHdl, PushButton*);
DECL_LINK(CloseHdl, PushButton*);
@@ -244,30 +244,30 @@ public:
sal_Bool bNew=sal_True);
~SwAuthMarkDlg();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkFloatDlg : public SfxModelessDialog
{
- SwAuthMarkDlg aDlg;
- virtual void Activate();
+ SwAuthMarkDlg aDlg;
+ virtual void Activate();
public:
- SwAuthMarkFloatDlg( SfxBindings* pBindings,
+ SwAuthMarkFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True);
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkModalDlg : public SvxStandardDialog
{
- SwAuthMarkDlg aDlg;
+ SwAuthMarkDlg aDlg;
public:
SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh);
- virtual void Apply();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ virtual void Apply();
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
#endif // _SWUI_IDXMRK_HXX
diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx
index 753e3c93cae2..2da315933548 100644
--- a/sw/source/ui/inc/swuipardlg.hxx
+++ b/sw/source/ui/inc/swuipardlg.hxx
@@ -2,7 +2,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
@@ -49,6 +49,6 @@ public:
~SwParaDlg();
};
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx
index fcfcbda25f54..9ab00e2623b7 100644
--- a/sw/source/ui/inc/swvset.hxx
+++ b/sw/source/ui/inc/swvset.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet
SwRulerValueSet( Window* pParent,
const ResId& rResId );
~SwRulerValueSet();
- virtual void UserDraw( const UserDrawEvent& rUDEvt );
+ virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
#endif
diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/ui/inc/swwrtshitem.hxx
index 27621fd3e9fd..5a2872cf6202 100644
--- a/sw/source/ui/inc/swwrtshitem.hxx
+++ b/sw/source/ui/inc/swwrtshitem.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@ class SwWrtShell;
class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem
{
- SwWrtShell* pWrtSh;
+ SwWrtShell* pWrtSh;
public:
TYPEINFO();
@@ -43,10 +43,10 @@ public:
SwWrtShellItem( const SwWrtShellItem& );
- virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- SwWrtShell* GetValue() const { return pWrtSh; }
+ SwWrtShell* GetValue() const { return pWrtSh; }
};
diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx
index 348b60cafaef..268d6311f984 100644
--- a/sw/source/ui/inc/syncbtn.hxx
+++ b/sw/source/ui/inc/syncbtn.hxx
@@ -2,7 +2,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
@@ -40,9 +40,9 @@
class SwSyncBtnDlg : public SfxFloatingWindow
{
- PushButton aSyncBtn;
+ PushButton aSyncBtn;
- DECL_LINK( BtnHdl, PushButton* pBtn = 0 );
+ DECL_LINK( BtnHdl, PushButton* pBtn = 0 );
public:
SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent);
@@ -57,7 +57,7 @@ public:
class SwSyncChildWin : public SfxChildWindow
{
public:
- SwSyncChildWin( Window* ,
+ SwSyncChildWin( Window* ,
USHORT nId,
SfxBindings*,
SfxChildWinInfo* );
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc
index 076028925804..721c6de5b67c 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/ui/inc/table.hrc
@@ -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
@@ -27,23 +27,23 @@
#include "rcid.hrc"
-#define DLG_INSERT_TABLE RC_TABLE_BEGIN
-#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1)
-#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2)
-//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx
-#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
-#define DLG_SPLIT (RC_TABLE_BEGIN + 5)
-#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6)
-#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
-#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9)
-#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10)
-#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11)
-#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12)
+#define DLG_INSERT_TABLE RC_TABLE_BEGIN
+#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1)
+#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2)
+//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx
+#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
+#define DLG_SPLIT (RC_TABLE_BEGIN + 5)
+#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6)
+#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
+#define DLG_AUTOFMT_TABLE (RC_TABLE_BEGIN + 9)
+#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10)
+#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11)
+#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12)
#define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
-#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14)
-#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15)
+#define DLG_SPLIT_TABLE (RC_TABLE_BEGIN + 14)
+#define DLG_MERGE_TABLE (RC_TABLE_BEGIN + 15)
-#define TABLE_ACT_END DLG_MERGE_TABLE
+#define TABLE_ACT_END DLG_MERGE_TABLE
#if TABLE_ACT_END > RC_TABLE_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx
index ed8f3cd8630a..3b233cdaefd4 100644
--- a/sw/source/ui/inc/tabledlg.hxx
+++ b/sw/source/ui/inc/tabledlg.hxx
@@ -2,7 +2,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
@@ -44,9 +44,9 @@ struct TColumn;
class SwTableTabDlg : public SfxTabDialog
{
SwWrtShell* pShell;
- USHORT nHtmlMode;
+ USHORT nHtmlMode;
- virtual void PageCreated(USHORT nId, SfxTabPage& rPage);
+ virtual void PageCreated(USHORT nId, SfxTabPage& rPage);
public:
SwTableTabDlg( Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh );
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx
index 135569ab6561..e00bb6538267 100644
--- a/sw/source/ui/inc/tablemgr.hxx
+++ b/sw/source/ui/inc/tablemgr.hxx
@@ -2,7 +2,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
@@ -51,10 +51,10 @@ const char cParaDelim = 0x0a;
class SW_DLLPUBLIC SwTableFUNC
{
- SwFrmFmt *pFmt;
- SwWrtShell *pSh;
- BOOL bCopy;
- SwTabCols aCols;
+ SwFrmFmt *pFmt;
+ SwWrtShell *pSh;
+ BOOL bCopy;
+ SwTabCols aCols;
private:
SW_DLLPRIVATE int GetRightSeparator(int nNum) const;
@@ -64,13 +64,13 @@ public:
SwTableFUNC(SwWrtShell *pShell, BOOL bCopyFmt = FALSE);
~SwTableFUNC();
- void InitTabCols();
- void ColWidthDlg(Window *pParent );
+ void InitTabCols();
+ void ColWidthDlg(Window *pParent );
SwTwips GetColWidth(USHORT nNum) const;
SwTwips GetMaxColWidth(USHORT nNum) const;
- void SetColWidth(USHORT nNum, SwTwips nWidth );
- USHORT GetColCount() const;
- USHORT GetCurColNum() const;
+ void SetColWidth(USHORT nNum, SwTwips nWidth );
+ USHORT GetColCount() const;
+ USHORT GetCurColNum() const;
BOOL IsTableSelected() const { return pFmt != 0; }
@@ -82,7 +82,7 @@ public:
void UpdateChart();
/// @return the XModel of the newly inserted chart if successfull
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
};
diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx
index 544cab3b66e4..5e2ba33f430d 100644
--- a/sw/source/ui/inc/tabsh.hxx
+++ b/sw/source/ui/inc/tabsh.hxx
@@ -2,7 +2,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
@@ -45,13 +45,13 @@ public:
SFX_DECL_INTERFACE(SW_TABSHELL)
TYPEINFO();
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
- void GetFrmBorderState(SfxItemSet &rSet);
- void GetLineStyleState(SfxItemSet &rSet);
- void ExecTableStyle(SfxRequest& rReq);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
+ void GetFrmBorderState(SfxItemSet &rSet);
+ void GetLineStyleState(SfxItemSet &rSet);
+ void ExecTableStyle(SfxRequest& rReq);
- void ExecNumberFormat(SfxRequest& rReq);
+ void ExecNumberFormat(SfxRequest& rReq);
SwTableShell(SwView &rView);
};
diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx
index 1b3c0260cb60..d78b44a8903b 100644
--- a/sw/source/ui/inc/tautofmt.hxx
+++ b/sw/source/ui/inc/tautofmt.hxx
@@ -2,7 +2,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
@@ -53,36 +53,36 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
class SwAutoFormatDlg : public SfxModalDialog
{
FixedLine aFlFormat;
- ListBox aLbFormat;
- CheckBox aBtnNumFormat;
- CheckBox aBtnBorder;
- CheckBox aBtnFont;
- CheckBox aBtnPattern;
- CheckBox aBtnAlignment;
+ ListBox aLbFormat;
+ CheckBox aBtnNumFormat;
+ CheckBox aBtnBorder;
+ CheckBox aBtnFont;
+ CheckBox aBtnPattern;
+ CheckBox aBtnAlignment;
FixedLine aFlFormats;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- PushButton aBtnRename;
- MoreButton aBtnMore;
- String aStrTitle;
- String aStrLabel;
- String aStrClose;
- String aStrDelTitle;
- String aStrDelMsg;
- String aStrRenameTitle;
- String aStrInvalidFmt;
- AutoFmtPreview* pWndPreview;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ PushButton aBtnRename;
+ MoreButton aBtnMore;
+ String aStrTitle;
+ String aStrLabel;
+ String aStrClose;
+ String aStrDelTitle;
+ String aStrDelMsg;
+ String aStrRenameTitle;
+ String aStrInvalidFmt;
+ AutoFmtPreview* pWndPreview;
//------------------------
- SwWrtShell* pShell;
- SwTableAutoFmtTbl* pTableTbl;
- BYTE nIndex;
- BYTE nDfltStylePos;
- BOOL bCoreDataChanged : 1;
- BOOL bSetAutoFmt : 1;
+ SwWrtShell* pShell;
+ SwTableAutoFmtTbl* pTableTbl;
+ BYTE nIndex;
+ BYTE nDfltStylePos;
+ BOOL bCoreDataChanged : 1;
+ BOOL bSetAutoFmt : 1;
void Init( const SwTableAutoFmt* pSelFmt );
diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/ui/inc/tblctrl.hxx
index cb0c01371745..df2e1a079974 100644
--- a/sw/source/ui/inc/tblctrl.hxx
+++ b/sw/source/ui/inc/tblctrl.hxx
@@ -2,7 +2,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
@@ -45,8 +45,8 @@ public:
SwTableOptimizeCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
~SwTableOptimizeCtrl();
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
+ virtual SfxPopupWindowType GetPopupWindowType() const;
+ virtual SfxPopupWindow* CreatePopupWindow();
};
diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/ui/inc/tblnumfm.hxx
index ca93e3a0ec07..d385f4122d3d 100644
--- a/sw/source/ui/inc/tblnumfm.hxx
+++ b/sw/source/ui/inc/tblnumfm.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/ui/inc/tbxanchr.hxx
index c36b31007f4a..a79ae1e76908 100644
--- a/sw/source/ui/inc/tbxanchr.hxx
+++ b/sw/source/ui/inc/tbxanchr.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx
index 6f95b73acb6a..ba4deea8a359 100644
--- a/sw/source/ui/inc/textcontrolcombo.hxx
+++ b/sw/source/ui/inc/textcontrolcombo.hxx
@@ -2,7 +2,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
@@ -38,9 +38,9 @@ class SW_DLLPUBLIC TextControlCombo : public Window
{
protected:
- Control& mrCtrl;
- FixedText& mrFTbefore;
- FixedText& mrFTafter;
+ Control& mrCtrl;
+ FixedText& mrFTbefore;
+ FixedText& mrFTafter;
public:
@@ -49,16 +49,16 @@ public:
TextControlCombo( Window* _pParent, const ResId& _rResId,
Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter );
- virtual ~TextControlCombo();
+ virtual ~TextControlCombo();
- void Arrange( FixedText& _rOrg, BOOL bShow = true );
+ void Arrange( FixedText& _rOrg, BOOL bShow = true );
// identical to window functionality
- void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );
- void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); }
-
- void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE );
- void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); }
+ void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );
+ void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); }
+
+ void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE );
+ void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); }
};
diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/ui/inc/textsh.hxx
index 5817013c9ca9..a8215b653e3f 100644
--- a/sw/source/ui/inc/textsh.hxx
+++ b/sw/source/ui/inc/textsh.hxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@ class SvxHyperlinkItem;
class SwTextShell: public SwBaseShell
{
- SwFldMgr* pPostItFldMgr;
+ SwFldMgr* pPostItFldMgr;
void InsertSymbol( SfxRequest& );
void InsertHyperlink(const SvxHyperlinkItem& rHlnkItem);
@@ -51,34 +51,34 @@ public:
DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * );
DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * );
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
- void ExecInsert(SfxRequest &);
- void StateInsert(SfxItemSet&);
- void ExecDelete(SfxRequest &);
- void ExecEnterNum(SfxRequest &);
- void ExecBasicMove(SfxRequest &);
- void ExecMove(SfxRequest &);
- void ExecMovePage(SfxRequest &);
- void ExecMoveCol(SfxRequest &);
- void ExecMoveLingu(SfxRequest &);
- void ExecMoveMisc(SfxRequest &);
- void ExecField(SfxRequest &rReq);
- void StateField(SfxItemSet &);
- void ExecIdx(SfxRequest &);
- void GetIdxState(SfxItemSet &);
- void ExecGlossary(SfxRequest &);
+ void ExecInsert(SfxRequest &);
+ void StateInsert(SfxItemSet&);
+ void ExecDelete(SfxRequest &);
+ void ExecEnterNum(SfxRequest &);
+ void ExecBasicMove(SfxRequest &);
+ void ExecMove(SfxRequest &);
+ void ExecMovePage(SfxRequest &);
+ void ExecMoveCol(SfxRequest &);
+ void ExecMoveLingu(SfxRequest &);
+ void ExecMoveMisc(SfxRequest &);
+ void ExecField(SfxRequest &rReq);
+ void StateField(SfxItemSet &);
+ void ExecIdx(SfxRequest &);
+ void GetIdxState(SfxItemSet &);
+ void ExecGlossary(SfxRequest &);
- void ExecCharAttr(SfxRequest &);
- void ExecCharAttrArgs(SfxRequest &);
- void ExecParaAttr(SfxRequest &);
- void ExecParaAttrArgs(SfxRequest &);
- void ExecAttr(SfxRequest &);
- void ExecDB(SfxRequest &);
- void ExecTransliteration(SfxRequest &);
+ void ExecCharAttr(SfxRequest &);
+ void ExecCharAttrArgs(SfxRequest &);
+ void ExecParaAttr(SfxRequest &);
+ void ExecParaAttrArgs(SfxRequest &);
+ void ExecAttr(SfxRequest &);
+ void ExecDB(SfxRequest &);
+ void ExecTransliteration(SfxRequest &);
- void GetAttrState(SfxItemSet &);
+ void GetAttrState(SfxItemSet &);
SwTextShell(SwView &rView);
virtual ~SwTextShell();
diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/ui/inc/tmpdlg.hxx
index ddb24179758e..7729dcac97cc 100644
--- a/sw/source/ui/inc/tmpdlg.hxx
+++ b/sw/source/ui/inc/tmpdlg.hxx
@@ -2,7 +2,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
@@ -41,8 +41,8 @@ class SwTemplateDlg: public SfxStyleDialog
USHORT nType;
USHORT nHtmlMode;
- SwWrtShell* pWrtShell;
- BOOL bNewStyle;
+ SwWrtShell* pWrtShell;
+ BOOL bNewStyle;
DECL_LINK( NumOptionsHdl, PushButton* );
@@ -50,9 +50,9 @@ public:
SwTemplateDlg( Window* pParent,
SfxStyleSheetBase& rBase,
USHORT nRegion,
- BOOL bColumn = FALSE,
- SwWrtShell* pActShell = 0,
- BOOL bNew = FALSE );
+ BOOL bColumn = FALSE,
+ SwWrtShell* pActShell = 0,
+ BOOL bNew = FALSE );
~SwTemplateDlg();
const SfxItemSet* GetRefreshedSet();
diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx
index 25a946a1c98c..81ef7b73b84c 100644
--- a/sw/source/ui/inc/tmplctrl.hxx
+++ b/sw/source/ui/inc/tmplctrl.hxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@ class SwTemplateControl : public SfxStatusBarControl
protected:
virtual void Command( const CommandEvent& rCEvt );
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox_tmpl.hrc
index 73ab3059d705..8c73a70c6041 100644
--- a/sw/source/ui/inc/toolbox_tmpl.hrc
+++ b/sw/source/ui/inc/toolbox_tmpl.hrc
@@ -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
diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/ui/inc/toxmgr.hxx
index c8c01a0ac777..22d4914f0cc0 100644
--- a/sw/source/ui/inc/toxmgr.hxx
+++ b/sw/source/ui/inc/toxmgr.hxx
@@ -2,7 +2,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
@@ -42,32 +42,32 @@ class SwForm;
//one single method will be sufficient to insert AND upate indexes
class SW_DLLPUBLIC SwTOXDescription
{
- TOXTypes eTOXType;
- String aStyleNames[MAXLEVEL];
- String sSequenceName;
- String sMainEntryCharStyle;
- String sAutoMarkURL;
- String* pTitle;
- String* pTOUName;
- SwForm* pForm;
- USHORT nContent;
- USHORT nIndexOptions;
- USHORT nOLEOptions;
+ TOXTypes eTOXType;
+ String aStyleNames[MAXLEVEL];
+ String sSequenceName;
+ String sMainEntryCharStyle;
+ String sAutoMarkURL;
+ String* pTitle;
+ String* pTOUName;
+ SwForm* pForm;
+ USHORT nContent;
+ USHORT nIndexOptions;
+ USHORT nOLEOptions;
LanguageType eLanguage;
String sSortAlgorithm;
String sAuthBrackets;
- SwCaptionDisplay eCaptionDisplay;
- SwTOXSortKey eSortKey1;
- SwTOXSortKey eSortKey2;
- SwTOXSortKey eSortKey3;
- BYTE nLevel;
- BOOL bFromObjectNames : 1;
- BOOL bFromChapter : 1;
- BOOL bReadonly: 1;
- BOOL bLevelFromChapter : 1;
- BOOL bIsAuthSequence :1;
- BOOL bSortByDocument :1;
+ SwCaptionDisplay eCaptionDisplay;
+ SwTOXSortKey eSortKey1;
+ SwTOXSortKey eSortKey2;
+ SwTOXSortKey eSortKey3;
+ BYTE nLevel;
+ BOOL bFromObjectNames : 1;
+ BOOL bFromChapter : 1;
+ BOOL bReadonly: 1;
+ BOOL bLevelFromChapter : 1;
+ BOOL bIsAuthSequence :1;
+ BOOL bSortByDocument :1;
//TODO: TemplateNames
//const String* pTemplateName = 0, ???
@@ -104,67 +104,67 @@ public:
delete pTOUName;
}
- void SetTOXType(TOXTypes eSet) { eTOXType = eSet;}
- TOXTypes GetTOXType() const { return eTOXType;}
+ void SetTOXType(TOXTypes eSet) { eTOXType = eSet;}
+ TOXTypes GetTOXType() const { return eTOXType;}
const String& GetStyleNames(USHORT nLvl) const
{return aStyleNames[nLvl];}
void SetStyleNames(const String& rSet, USHORT nLvl)
{aStyleNames[nLvl] = rSet; }
- const String& GetAutoMarkURL() const { return sAutoMarkURL;}
- void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;}
+ const String& GetAutoMarkURL() const { return sAutoMarkURL;}
+ void SetAutoMarkURL(const String& rSet) {sAutoMarkURL = rSet;}
- void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);}
- const String* GetTitle() const {return pTitle; }
+ void SetTitle(const String& pSet) {delete pTitle; pTitle = new String(pSet);}
+ const String* GetTitle() const {return pTitle; }
- void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);}
- const String* GetTOUName() const {return pTOUName; }
+ void SetTOUName(const String& pSet) {delete pTOUName; pTOUName = new String(pSet);}
+ const String* GetTOUName() const {return pTOUName; }
- void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);}
- const SwForm* GetForm() const {return pForm;}
+ void SetForm(const SwForm& rSet) {delete pForm; pForm = new SwForm(rSet);}
+ const SwForm* GetForm() const {return pForm;}
- void SetContentOptions(USHORT nSet) { nContent = nSet;}
- USHORT GetContentOptions() const { return nContent;}
+ void SetContentOptions(USHORT nSet) { nContent = nSet;}
+ USHORT GetContentOptions() const { return nContent;}
- void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;}
- USHORT GetIndexOptions() const { return nIndexOptions;}
+ void SetIndexOptions(USHORT nSet) { nIndexOptions = nSet;}
+ USHORT GetIndexOptions() const { return nIndexOptions;}
- const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;}
- void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;}
+ const String& GetMainEntryCharStyle() const {return sMainEntryCharStyle;}
+ void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;}
- void SetLevel(BYTE nSet) {nLevel = nSet;}
- BYTE GetLevel()const {return nLevel; }
+ void SetLevel(BYTE nSet) {nLevel = nSet;}
+ BYTE GetLevel()const {return nLevel; }
- void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;}
- BOOL IsCreateFromObjectNames() const {return bFromObjectNames;}
+ void SetCreateFromObjectNames(BOOL bSet) { bFromObjectNames = bSet;}
+ BOOL IsCreateFromObjectNames() const {return bFromObjectNames;}
- const String& GetSequenceName() const {return sSequenceName;}
- void SetSequenceName(const String& rSet) {sSequenceName = rSet;}
+ const String& GetSequenceName() const {return sSequenceName;}
+ void SetSequenceName(const String& rSet) {sSequenceName = rSet;}
- SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;}
- void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
+ SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;}
+ void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
- void SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
- BOOL IsFromChapter() const {return bFromChapter;}
+ void SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
+ BOOL IsFromChapter() const {return bFromChapter;}
- void SetReadonly(BOOL bSet){bReadonly = bSet;}
- BOOL IsReadonly() const {return bReadonly;}
+ void SetReadonly(BOOL bSet){bReadonly = bSet;}
+ BOOL IsReadonly() const {return bReadonly;}
- USHORT GetOLEOptions() const {return nOLEOptions;}
- void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
+ USHORT GetOLEOptions() const {return nOLEOptions;}
+ void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
- BOOL IsLevelFromChapter() const {return bLevelFromChapter;}
- void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
+ BOOL IsLevelFromChapter() const {return bLevelFromChapter;}
+ void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
- String GetAuthBrackets() const {return sAuthBrackets;}
- void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;}
+ String GetAuthBrackets() const {return sAuthBrackets;}
+ void SetAuthBrackets(const String& rSet) {sAuthBrackets = rSet;}
- BOOL IsAuthSequence() const {return bIsAuthSequence;}
- void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;}
+ BOOL IsAuthSequence() const {return bIsAuthSequence;}
+ void SetAuthSequence(BOOL bSet){bIsAuthSequence = bSet;}
- BOOL IsSortByDocument()const {return bSortByDocument ;}
- void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;}
+ BOOL IsSortByDocument()const {return bSortByDocument ;}
+ void SetSortByDocument(BOOL bSet) {bSortByDocument = bSet;}
void SetSortKeys(SwTOXSortKey eKey1,
SwTOXSortKey eKey2,
@@ -186,18 +186,18 @@ public:
class SwTOXMarkDescription
{
- TOXTypes eTOXType;
- int nLevel;
- BOOL bMainEntry;
+ TOXTypes eTOXType;
+ int nLevel;
+ BOOL bMainEntry;
- String* pPrimKey;
- String* pSecKey;
- String* pAltStr;
- String* pTOUName;
+ String* pPrimKey;
+ String* pSecKey;
+ String* pAltStr;
+ String* pTOUName;
- String* pPhoneticReadingOfAltStr;
- String* pPhoneticReadingOfPrimKey;
- String* pPhoneticReadingOfSecKey;
+ String* pPhoneticReadingOfAltStr;
+ String* pPhoneticReadingOfPrimKey;
+ String* pPhoneticReadingOfSecKey;
// forbidden and not implemented.
SwTOXMarkDescription();
@@ -230,51 +230,51 @@ public:
delete pPhoneticReadingOfSecKey;
}
- TOXTypes GetTOXType()const {return eTOXType;}
+ TOXTypes GetTOXType()const {return eTOXType;}
- void SetLevel(int nSet) {nLevel = nSet;}
- int GetLevel() const {return nLevel;}
+ void SetLevel(int nSet) {nLevel = nSet;}
+ int GetLevel() const {return nLevel;}
- void SetMainEntry(BOOL bSet) {bMainEntry = bSet;}
- BOOL IsMainEntry() const {return bMainEntry;}
+ void SetMainEntry(BOOL bSet) {bMainEntry = bSet;}
+ BOOL IsMainEntry() const {return bMainEntry;}
- void SetPrimKey(const String& rSet)
+ void SetPrimKey(const String& rSet)
{delete pPrimKey; pPrimKey = new String(rSet);}
- const String* GetPrimKey() const {return pPrimKey;}
+ const String* GetPrimKey() const {return pPrimKey;}
- void SetSecKey(const String& rSet)
+ void SetSecKey(const String& rSet)
{delete pSecKey; pSecKey = new String(rSet);}
- const String* GetSecKey() const { return pSecKey; }
+ const String* GetSecKey() const { return pSecKey; }
- void SetAltStr(const String& rSet)
+ void SetAltStr(const String& rSet)
{delete pAltStr; pAltStr = new String(rSet);}
- const String* GetAltStr() const { return pAltStr; }
+ const String* GetAltStr() const { return pAltStr; }
- void SetTOUName(const String& rSet)
+ void SetTOUName(const String& rSet)
{delete pTOUName; pTOUName = new String(rSet);}
- const String* GetTOUName() const {return pTOUName;}
+ const String* GetTOUName() const {return pTOUName;}
- void SetPhoneticReadingOfAltStr(const String& rSet)
+ void SetPhoneticReadingOfAltStr(const String& rSet)
{delete pPhoneticReadingOfAltStr; pPhoneticReadingOfAltStr = new String(rSet);}
- const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; }
+ const String* GetPhoneticReadingOfAltStr() const { return pPhoneticReadingOfAltStr; }
- void SetPhoneticReadingOfPrimKey(const String& rSet)
+ void SetPhoneticReadingOfPrimKey(const String& rSet)
{delete pPhoneticReadingOfPrimKey; pPhoneticReadingOfPrimKey = new String(rSet);}
- const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; }
+ const String* GetPhoneticReadingOfPrimKey() const { return pPhoneticReadingOfPrimKey; }
- void SetPhoneticReadingOfSecKey(const String& rSet)
+ void SetPhoneticReadingOfSecKey(const String& rSet)
{delete pPhoneticReadingOfSecKey; pPhoneticReadingOfSecKey = new String(rSet);}
- const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; }
+ const String* GetPhoneticReadingOfSecKey() const { return pPhoneticReadingOfSecKey; }
};
class SW_DLLPUBLIC SwTOXMgr
{
- SwWrtShell* pSh;
- SwTOXMark* pCurTOXMark;
- SwTOXMarks aCurMarks;
+ SwWrtShell* pSh;
+ SwTOXMark* pCurTOXMark;
+ SwTOXMarks aCurMarks;
- SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr);
+ SW_DLLPRIVATE USHORT GetUserTypeID(const String& rStr);
public:
// single argument ctors shall be explicit.
@@ -283,29 +283,29 @@ public:
//
// Methoden fuer Verzeichnismarkierungen
//
- void InsertTOXMark(const SwTOXMarkDescription& rDesc);
+ void InsertTOXMark(const SwTOXMarkDescription& rDesc);
- void UpdateTOXMark(const SwTOXMarkDescription& rDesc);
+ void UpdateTOXMark(const SwTOXMarkDescription& rDesc);
- void DeleteTOXMark();
- void NextTOXMark(BOOL bSame=FALSE);
- void PrevTOXMark(BOOL bSame=FALSE);
+ void DeleteTOXMark();
+ void NextTOXMark(BOOL bSame=FALSE);
+ void PrevTOXMark(BOOL bSame=FALSE);
// Aktuelle TOXmarks holen
- USHORT GetTOXMarks();
- USHORT GetTOXMarkCount();
- SwTOXMark* GetTOXMark(USHORT nId);
- SwTOXMark* GetCurTOXMark();
- void SetCurTOXMark(USHORT nId);
+ USHORT GetTOXMarks();
+ USHORT GetTOXMarkCount();
+ SwTOXMark* GetTOXMark(USHORT nId);
+ SwTOXMark* GetCurTOXMark();
+ void SetCurTOXMark(USHORT nId);
//
// Methoden fuer Verzeichnisse
//
- BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0);
+ BOOL UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0);
- const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const;
- const SwTOXBase* GetCurTOX();
+ const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const;
+ const SwTOXBase* GetCurTOX();
};
@@ -313,10 +313,10 @@ public:
Beschreibung: Inlines
--------------------------------------------------------------------*/
inline USHORT SwTOXMgr::GetTOXMarkCount()
- { return aCurMarks.Count(); }
+ { return aCurMarks.Count(); }
inline SwTOXMark* SwTOXMgr::GetCurTOXMark()
- { return pCurTOXMark; }
+ { return pCurTOXMark; }
#endif
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx
index 5dd02380cb85..f8f426f8f84a 100644
--- a/sw/source/ui/inc/uiborder.hxx
+++ b/sw/source/ui/inc/uiborder.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx
index dfd891839572..8990e15eb843 100644
--- a/sw/source/ui/inc/uiitems.hxx
+++ b/sw/source/ui/inc/uiitems.hxx
@@ -2,7 +2,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
@@ -58,11 +58,11 @@ public:
const IntlWrapper* pIntl = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; }
const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; }
- void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; }
+ void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; }
};
class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
@@ -76,8 +76,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- void SetValue(void * pPtr) { pMisc= pPtr; }
- void* GetValue() const { return pMisc; }
+ void SetValue(void * pPtr) { pMisc= pPtr; }
+ void* GetValue() const { return pMisc; }
};
class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem
@@ -92,11 +92,11 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- const SwNumRule* GetNumRule() const { return pRule; }
- SwNumRule* GetNumRule() { return pRule; }
+ const SwNumRule* GetNumRule() const { return pRule; }
+ SwNumRule* GetNumRule() { return pRule; }
};
class SwBackgroundDestinationItem : public SfxUInt16Item
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx
index 2cb957b7dc0b..230119359742 100644
--- a/sw/source/ui/inc/uinums.hxx
+++ b/sw/source/ui/inc/uinums.hxx
@@ -2,7 +2,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
@@ -78,7 +78,7 @@ public:
const SwNumRulesWithName &operator=(const SwNumRulesWithName &);
- const String& GetName() const { return aName; }
+ const String& GetName() const { return aName; }
void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const;
void Store( SvStream& );
@@ -87,24 +87,24 @@ public:
class SwBaseNumRules
{
public:
- enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms
+ enum { nMaxRules = MAX_NUM_RULES }; // zur Zeit 9 definierte Forms
protected:
- SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ];
- String sFileName;
- USHORT nVersion;
- BOOL bModified;
+ SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ];
+ String sFileName;
+ USHORT nVersion;
+ BOOL bModified;
- virtual int Load(SvStream&);
- virtual BOOL Store(SvStream&);
+ virtual int Load(SvStream&);
+ virtual BOOL Store(SvStream&);
- void Init();
+ void Init();
public:
SwBaseNumRules(const String& rFileName);
virtual ~SwBaseNumRules();
- inline const SwNumRulesWithName* GetRules(USHORT nIdx) const;
- virtual void ApplyNumRules(
+ inline const SwNumRulesWithName* GetRules(USHORT nIdx) const;
+ virtual void ApplyNumRules(
const SwNumRulesWithName &rCopy,
USHORT nIdx);
@@ -117,7 +117,7 @@ public:
SwChapterNumRules();
virtual ~SwChapterNumRules();
- virtual void ApplyNumRules( const SwNumRulesWithName &rCopy,
+ virtual void ApplyNumRules( const SwNumRulesWithName &rCopy,
USHORT nIdx);
};
diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx
index 5f0e1d93f2cd..ef4d99c412d9 100644
--- a/sw/source/ui/inc/uitool.hxx
+++ b/sw/source/ui/inc/uitool.hxx
@@ -2,7 +2,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
@@ -57,13 +57,13 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc );
void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet);
// Auffuellen der Tabs mit DefaultTabs
-SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs);
+SW_DLLPUBLIC void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs);
// DefaultTabs loeschen aus dem TabStopArray
-//void EraseDefTabs(SvxTabStopItem& rTabs);
+//void EraseDefTabs(SvxTabStopItem& rTabs);
// Abstand zwischen dem 1. und zweitem Element ermitteln
-SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs);
+SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs);
// erfrage ob im Set eine Sfx-PageDesc-Kombination vorliegt
// und setze diesen im Set und loesche die Transport Items
@@ -71,8 +71,8 @@ SW_DLLPUBLIC USHORT GetTabDist(const SvxTabStopItem& rTabs);
void SwToSfxPageDescAttr( SfxItemSet& rSet );
void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet );
-SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb);
-void SetDfltMetric(FieldUnit eMetric, BOOL bWeb);
+SW_DLLPUBLIC FieldUnit GetDfltMetric(BOOL bWeb);
+void SetDfltMetric(FieldUnit eMetric, BOOL bWeb);
SW_DLLPUBLIC BOOL HasCharUnit( BOOL bWeb );
void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb);
@@ -89,7 +89,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent,
String GetAppLangDateTimeString( const DateTime& );
-// search for a command string withing the menu structure and execute it
+// search for a command string withing the menu structure and execute it
// at the dispatcher if there is one, if executed return true
bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, USHORT nId );
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index e92eb71dcf23..e8941ab6c062 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
#include <sfx2/objsh.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx> // helper for implementations
#include <swunodef.hxx>
#include <cppuhelper/weakref.hxx>
@@ -56,7 +56,7 @@ namespace com{ namespace sun{ namespace star {
class SwScannerEventListener : public ::cppu::WeakImplHelper1<
STAR_NMSPC::lang::XEventListener >
{
- SwView* pView;
+ SwView* pView;
public:
@@ -74,7 +74,7 @@ public:
class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
CLIP_NMSPC::XClipboardListener >
{
- SwView* pView;
+ SwView* pView;
// XEventListener
virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject )
@@ -86,7 +86,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
public:
SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {}
- virtual ~SwClipboardChangeListener();
+ virtual ~SwClipboardChangeListener();
void ViewDestroyed() { pView = 0; }
@@ -97,10 +97,10 @@ class SwMailMergeConfigItem;
class SwView_Impl
{
- STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr;
- STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr;
- STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor;
- STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object
+ STAR_REFERENCE( lang::XEventListener ) xScanEvtLstnr;
+ STAR_REFERENCE( lang::XEventListener ) xClipEvtLstnr;
+ STAR_REFERENCE( frame::XDispatchProviderInterceptor ) xDisProvInterceptor;
+ STAR_REFERENCE( view::XSelectionSupplier ) *pxXTextView; // UNO object
com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable;
// temporary document for printing text of selection / multi selection
@@ -109,9 +109,9 @@ class SwView_Impl
SfxObjectShellRef aEmbeddedObjRef;
SwView* pView;
- SwScannerEventListener* pScanEvtLstnr;
- SwClipboardChangeListener* pClipEvtLstnr;
- ShellModes eShellMode;
+ SwScannerEventListener* pScanEvtLstnr;
+ SwClipboardChangeListener* pClipEvtLstnr;
+ ShellModes eShellMode;
SwMailMergeConfigItem* pConfigItem;
sal_uInt16 nMailMergeRestartPage;
@@ -129,18 +129,18 @@ public:
SwView_Impl(SwView* pShell);
~SwView_Impl();
- void SetShellMode(ShellModes eSet);
+ void SetShellMode(ShellModes eSet);
::com::sun::star::view::XSelectionSupplier* GetUNOObject();
- SwXTextView* GetUNOObject_Impl();
+ SwXTextView* GetUNOObject_Impl();
void Invalidate();
- ShellModes GetShellMode() {return eShellMode;}
+ ShellModes GetShellMode() {return eShellMode;}
void ExecuteScan(SfxRequest& rReq);
- SwScannerEventListener& GetScannerEventListener();
+ SwScannerEventListener& GetScannerEventListener();
- void AddClipboardListener();
+ void AddClipboardListener();
SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; }
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index 039769abda5f..dc7710055265 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -2,7 +2,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
@@ -61,11 +61,11 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
// ::osl::Mutex m_aMutex;#102295# solar mutex has to be used currently
// the component which's dispatches we're intercepting
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted;
// chaining
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> m_xDispatch;
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index af9a7a3a73c6..c58e98779ba9 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -2,7 +2,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
@@ -47,16 +47,16 @@ class SwOneExampleFrame;
class SwFrmCtrlWindow : public Window
{
- SwOneExampleFrame* pExampleFrame;
+ SwOneExampleFrame* pExampleFrame;
public:
- SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame);
+ SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame);
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void Command( const CommandEvent& rCEvt );
};
class MenuResource : public Resource
{
- ResStringArray aMenuArray;
+ ResStringArray aMenuArray;
public:
MenuResource(const ResId& rResId);
@@ -64,7 +64,7 @@ public:
ResStringArray& GetMenuArray() {return aMenuArray;}
};
-#define EX_SHOW_ONLINE_LAYOUT 0x001
+#define EX_SHOW_ONLINE_LAYOUT 0x001
// hard zoom value
#define EX_SHOW_BUSINESS_CARDS 0x02
@@ -80,28 +80,28 @@ class SW_DLLPUBLIC SwOneExampleFrame
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > _xController;
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > _xCursor;
- SwFrmCtrlWindow aTopWindow;
- Window& rWindow;
- Timer aLoadedTimer;
- Link aInitializedLink;
+ SwFrmCtrlWindow aTopWindow;
+ Window& rWindow;
+ Timer aLoadedTimer;
+ Link aInitializedLink;
- MenuResource aMenuRes;
- String sArgumentURL;
+ MenuResource aMenuRes;
+ String sArgumentURL;
- SwView* pModuleView;
+ SwView* pModuleView;
- sal_uInt32 nStyleFlags;
+ sal_uInt32 nStyleFlags;
- sal_Bool bIsInitialized;
- sal_Bool bServiceAvailable;
+ sal_Bool bIsInitialized;
+ sal_Bool bServiceAvailable;
- static sal_Bool bShowServiceNotAvailableMessage;
+ static sal_Bool bShowServiceNotAvailableMessage;
SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* );
SW_DLLPRIVATE DECL_LINK( PopupHdl, Menu* );
- SW_DLLPRIVATE void CreateControl();
- SW_DLLPRIVATE void DisposeControl();
+ SW_DLLPRIVATE void CreateControl();
+ SW_DLLPRIVATE void DisposeControl();
public:
SwOneExampleFrame(Window& rWin,
@@ -110,10 +110,10 @@ public:
String* pURL = 0);
~SwOneExampleFrame();
- STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; }
- STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;}
- STAR_REFERENCE( frame::XController ) & GetController() {return _xController;}
- STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;}
+ STAR_REFERENCE( awt::XControl ) & GetControl() {return _xControl; }
+ STAR_REFERENCE( frame::XModel ) & GetModel() {return _xModel;}
+ STAR_REFERENCE( frame::XController ) & GetController() {return _xController;}
+ STAR_REFERENCE( text::XTextCursor ) & GetTextCursor() {return _xCursor;}
void ClearDocument( BOOL bStartTimer = FALSE );
@@ -122,7 +122,7 @@ public:
void CreatePopup(const Point& rPt);
- static void CreateErrorMessage(Window* pParent);
+ static void CreateErrorMessage(Window* pParent);
};
#endif
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 974eef497bfa..726cebaf04e7 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
-#include <cppuhelper/implbase8.hxx> // helper for implementations
+#include <cppuhelper/implbase8.hxx> // helper for implementations
#include <svl/itemprop.hxx>
#include "calbck.hxx"
#include "TextCursorHelper.hxx"
@@ -75,8 +75,8 @@ class SwXTextView :
const SfxItemPropertySet* m_pPropSet; // property map for SwXTextView properties
// (not related to pxViewSettings!)
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > * pxViewSettings;
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > * pxTextViewCursor;
SdrObject* GetControl(
@@ -89,7 +89,7 @@ public:
SwXTextView(SwView* pSwView);
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire( ) throw();
virtual void SAL_CALL release( ) throw();
@@ -147,7 +147,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException);
- void NotifySelChanged();
+ void NotifySelChanged();
void NotifyDBChanged();
SwView* GetView() {return m_pView;}
@@ -258,10 +258,10 @@ public:
void Invalidate(){m_pView = 0;}
// ITextCursorHelper
- virtual const SwPaM* GetPaM() const;
- virtual SwPaM* GetPaM();
- virtual const SwDoc* GetDoc() const;
- virtual SwDoc* GetDoc();
+ virtual const SwPaM* GetPaM() const;
+ virtual SwPaM* GetPaM();
+ virtual const SwDoc* GetDoc() const;
+ virtual SwDoc* GetDoc();
};
#endif
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx
index 3d2ec33f14b1..db607c05b423 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/ui/inc/usrpref.hxx
@@ -2,7 +2,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
@@ -39,8 +39,8 @@ class SwMasterUsrPref;
class SwContentViewConfig : public utl::ConfigItem
{
- SwMasterUsrPref& rParent;
- BOOL bWeb;
+ SwMasterUsrPref& rParent;
+ BOOL bWeb;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
@@ -52,13 +52,13 @@ class SwContentViewConfig : public utl::ConfigItem
virtual void Commit();
void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void SetModified(){ConfigItem::SetModified();}
};
class SwLayoutViewConfig : public utl::ConfigItem
{
- SwMasterUsrPref& rParent;
- BOOL bWeb;
+ SwMasterUsrPref& rParent;
+ BOOL bWeb;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
@@ -66,15 +66,15 @@ class SwLayoutViewConfig : public utl::ConfigItem
~SwLayoutViewConfig();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- virtual void Commit();
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ virtual void Commit();
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
class SwGridConfig : public utl::ConfigItem
{
- SwMasterUsrPref& rParent;
- BOOL bWeb;
+ SwMasterUsrPref& rParent;
+ BOOL bWeb;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
@@ -83,13 +83,13 @@ class SwGridConfig : public utl::ConfigItem
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
class SwCursorConfig : public utl::ConfigItem
{
- SwMasterUsrPref& rParent;
+ SwMasterUsrPref& rParent;
com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
public:
@@ -98,13 +98,13 @@ class SwCursorConfig : public utl::ConfigItem
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
class SwWebColorConfig : public utl::ConfigItem
{
- SwMasterUsrPref& rParent;
+ SwMasterUsrPref& rParent;
com::sun::star::uno::Sequence<rtl::OUString> aPropNames;
public:
@@ -113,8 +113,8 @@ class SwWebColorConfig : public utl::ConfigItem
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- void Load();
- void SetModified(){ConfigItem::SetModified();}
+ void Load();
+ void SetModified(){ConfigItem::SetModified();}
};
class SwMasterUsrPref : public SwViewOption
@@ -126,14 +126,14 @@ class SwMasterUsrPref : public SwViewOption
friend class SwWebColorConfig;
SwFldUpdateFlags eFldUpdateFlags; //udpate of fields and charts
- sal_Int32 nLinkUpdateMode;
- FieldUnit eUserMetric;
+ sal_Int32 nLinkUpdateMode;
+ FieldUnit eUserMetric;
FieldUnit eHScrollMetric;
sal_Bool bIsHScrollMetricSet;
FieldUnit eVScrollMetric;
sal_Bool bIsVScrollMetricSet;
- sal_Int32 nDefTab; //default tab stop distance
+ sal_Int32 nDefTab; //default tab stop distance
sal_Bool bIsSquaredPageMode; //default page mode for text grid
SwContentViewConfig aContentConfig;
@@ -218,7 +218,7 @@ public:
};
sal_Bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
- FieldUnit GetMetric() const { return eUserMetric;}
+ FieldUnit GetMetric() const { return eUserMetric;}
void SetMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False)
{
eUserMetric = eSet;
@@ -262,14 +262,14 @@ public:
if(!bNoModify)
aLayoutConfig.SetModified();
}
-
+
//default page mode for text grid
sal_Bool IsSquaredPageMode() const {return bIsSquaredPageMode;}
- void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False )
- {
+ void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False )
+ {
bIsSquaredPageMode = bVal;
if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
};
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc
index aa7dab24054a..17961add6636 100644
--- a/sw/source/ui/inc/utlui.hrc
+++ b/sw/source/ui/inc/utlui.hrc
@@ -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
@@ -31,21 +31,21 @@
#include "rcid.hrc"
-#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1)
-#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2)
+#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1)
+#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2)
// ------------------------------------------------------------------------
// Strings in NumberFormatter-Listbox
-#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4)
+#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4)
// hyperlink status bar control
#define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5)
#define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6)
// Namene der Inhaltstypen (RC_UTLUI_BEGIN + 7)
#define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8)
-#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST
-#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9)
+#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST
+#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9)
#define STR_CONTENT_TYPE_FRAME (RC_UTLUI_BEGIN + 10)
#define STR_CONTENT_TYPE_GRAPHIC (RC_UTLUI_BEGIN + 11)
#define STR_CONTENT_TYPE_OLE (RC_UTLUI_BEGIN + 12)
@@ -53,14 +53,14 @@
#define STR_CONTENT_TYPE_REGION (RC_UTLUI_BEGIN + 14)
#define STR_CONTENT_TYPE_URLFIELD (RC_UTLUI_BEGIN + 15)
#define STR_CONTENT_TYPE_REFERENCE (RC_UTLUI_BEGIN + 16)
-#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17)
-#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18)
-#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19)
-#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19)
-
-#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1)
-#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0)
-#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1)
+#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17)
+#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18)
+#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19)
+#define STR_CONTENT_END (RC_UTLUI_BEGIN + 19)
+
+#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1)
+#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0)
+#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1)
#define STR_CONTENT_TYPE_SINGLE_FRAME (STR_CONTENT_TYPE_SINGLE_FIRST + 2)
#define STR_CONTENT_TYPE_SINGLE_GRAPHIC (STR_CONTENT_TYPE_SINGLE_FIRST + 3)
#define STR_CONTENT_TYPE_SINGLE_OLE (STR_CONTENT_TYPE_SINGLE_FIRST + 4)
@@ -71,24 +71,24 @@
#define STR_CONTENT_TYPE_SINGLE_INDEX (STR_CONTENT_TYPE_SINGLE_FIRST + 9)
#define STR_CONTENT_TYPE_SINGLE_POSTIT (STR_CONTENT_TYPE_SINGLE_FIRST + 10)
#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11)
-#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
-
-#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END
-#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN
-#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1)
-#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2)
-#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3)
-#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4)
-#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5)
-#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6)
-#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7)
-#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8)
-#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9)
-
-#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1)
-
-#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2)
-#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0)
+#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
+
+#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END
+#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN
+#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1)
+#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2)
+#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3)
+#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4)
+#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5)
+#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6)
+#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7)
+#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8)
+#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9)
+
+#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1)
+
+#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2)
+#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0)
#define STR_AUTH_TYPE_BOOK (STR_AUTH_TYPE_START + 1)
#define STR_AUTH_TYPE_BOOKLET (STR_AUTH_TYPE_START + 2)
#define STR_AUTH_TYPE_CONFERENCE (STR_AUTH_TYPE_START + 3)
@@ -110,10 +110,10 @@
#define STR_AUTH_TYPE_CUSTOM3 (STR_AUTH_TYPE_START + 19)
#define STR_AUTH_TYPE_CUSTOM4 (STR_AUTH_TYPE_START + 20)
#define STR_AUTH_TYPE_CUSTOM5 (STR_AUTH_TYPE_START + 21)
-#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5)
+#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5)
-#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1)
-#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0)
+#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1)
+#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0)
#define STR_AUTH_FIELD_AUTHORITY_TYPE (STR_AUTH_FIELD_START + 1)
#define STR_AUTH_FIELD_ADDRESS (STR_AUTH_FIELD_START + 2)
#define STR_AUTH_FIELD_ANNOTE (STR_AUTH_FIELD_START + 3)
@@ -144,24 +144,24 @@
#define STR_AUTH_FIELD_CUSTOM4 (STR_AUTH_FIELD_START + 28)
#define STR_AUTH_FIELD_CUSTOM5 (STR_AUTH_FIELD_START + 29)
#define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30)
-#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN)
+#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN)
-#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1)
+#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1)
-#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1)
+#define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1)
#define DLG_ADDR_PI (RC_UTLUI_BEGIN + 2)
#define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3)
-#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4)
+#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4)
#define IMG_NAVI_ENTRYBMPH (RC_UTLUI_BEGIN + 5)
#define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6)
#define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7)
-#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8)
-#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9)
-#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10)
-#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11)
+#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8)
+#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9)
+#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10)
+#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11)
#define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12)
@@ -185,7 +185,7 @@
#define IMG_DBTABLE 2
#define IMG_DBQUERY 3
-#define UTLUI_ACT_END RES_FRMEX_MENU
+#define UTLUI_ACT_END RES_FRMEX_MENU
#if UTLUI_ACT_END > RC_UTLUI_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 6a5b63db7628..eb788c5c0876 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -2,7 +2,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
@@ -102,8 +102,8 @@ namespace com{ namespace sun { namespace star {
namespace sfx2 { class FileDialogHelper; }
const long nLeftOfst = -370;
-const long nScrollX = 30;
-const long nScrollY = 30;
+const long nScrollX = 30;
+const long nScrollY = 30;
#define MINZOOM 20
#define MAXZOOM 600
@@ -134,7 +134,7 @@ enum ShellModes
};
/*--------------------------------------------------------------------
- Beschreibung: Anwendung einer Vorlage
+ Beschreibung: Anwendung einer Vorlage
--------------------------------------------------------------------*/
struct SwApplyTemplate
{
@@ -142,9 +142,9 @@ struct SwApplyTemplate
{
SwTxtFmtColl* pTxtColl;
SwPageDesc* pPageDesc;
- SwFrmFmt* pFrmFmt;
- SwCharFmt* pCharFmt;
- SwNumRule* pNumRule;
+ SwFrmFmt* pFrmFmt;
+ SwCharFmt* pCharFmt;
+ SwNumRule* pNumRule;
} aColl;
int eType;
@@ -163,7 +163,7 @@ struct SwApplyTemplate
};
/*--------------------------------------------------------------------
- Beschreibung: Sicht auf ein Dokument
+ Beschreibung: Sicht auf ein Dokument
--------------------------------------------------------------------*/
class SW_DLLPUBLIC SwView: public SfxViewShell
{
@@ -180,90 +180,90 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
static SvxSearchDialog *pSrchDlg;
static SvxSearchItem *pSrchItem;
- static USHORT nInsertCtrlState;
- static USHORT nWebInsertCtrlState;
- static USHORT nInsertObjectCtrlState;
- static USHORT nInsertFieldCtrlState;
- static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi)
+ static USHORT nInsertCtrlState;
+ static USHORT nWebInsertCtrlState;
+ static USHORT nInsertObjectCtrlState;
+ static USHORT nInsertFieldCtrlState;
+ static USHORT nMoveType; // fuer Buttons unter dem Scrollbar (viewmdi)
static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte Merker
static BOOL bExtra;
static BOOL bFound;
- static BOOL bJustOpened;
+ static BOOL bJustOpened;
static SearchAttrItemList* pSrchList;
static SearchAttrItemList* pReplList;
SvxHtmlOptions aHTMLOpt;
- Timer aTimer; //Fuer verzoegerte ChgLnks waehrend
+ Timer aTimer; //Fuer verzoegerte ChgLnks waehrend
//einer Aktion
- String aPageStr; //Statusanzeige, aktuelle Seite
- String sSwViewData,
+ String aPageStr; //Statusanzeige, aktuelle Seite
+ String sSwViewData,
//and the new cursor position if the user double click in the PagePreView
sNewCrsrPos;
// to support keyboard the number of the page to go to can be set too
USHORT nNewPage;
- Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus
+ Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus
//aus dem Dokument heraus.
SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#
- Size aDocSz; // aktuelle Dokumentgroesse
- Rectangle aVisArea; // sichtbarer Bereich
+ Size aDocSz; // aktuelle Dokumentgroesse
+ Rectangle aVisArea; // sichtbarer Bereich
- SwEditWin *pEditWin;
- SwWrtShell *pWrtShell;
+ SwEditWin *pEditWin;
+ SwWrtShell *pWrtShell;
- SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher
- FmFormShell *pFormShell; // DB-FormShell
+ SfxShell *pShell; //aktuelle SubShell auf dem Dispatcher
+ FmFormShell *pFormShell; // DB-FormShell
- SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic
+ SwView_Impl *pViewImpl; // Impl-Daten fuer UNO + Basic
- SwScrollbar *pHScrollbar, // MDI Bedienelemente
+ SwScrollbar *pHScrollbar, // MDI Bedienelemente
*pVScrollbar;
- Window *pScrollFill; // Dummy-Window zum Fuellen der rechten
+ Window *pScrollFill; // Dummy-Window zum Fuellen der rechten
// unteren Ecke, wenn beide Scrollbars
// aktiv sind
SvxRuler *pHRuler,
*pVRuler;
- ImageButton *pTogglePageBtn;
+ ImageButton *pTogglePageBtn;
- SwHlpImageButton *pPageUpBtn,
+ SwHlpImageButton *pPageUpBtn,
*pPageDownBtn;
- SwNaviImageButton *pNaviBtn;
- SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine
- SwDrawBase *pDrawActual;
+ SwNaviImageButton *pNaviBtn;
+ SwGlossaryHdl *pGlosHdl; // Henkel Textbausteine
+ SwDrawBase *pDrawActual;
- const SwFrmFmt *pLastTableFormat;
+ const SwFrmFmt *pLastTableFormat;
SwFormatClipboard *pFormatClipboard; //holds data for format paintbrush
- SwPostItMgr *mpPostItMgr;
+ SwPostItMgr *mpPostItMgr;
- int nSelectionType;
+ int nSelectionType;
static const int MASTERENUMCOMMANDS = 6;
- String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
+ String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
USHORT nPageCnt;
// Aktueller Drawmode
- USHORT nDrawSfxId;
+ USHORT nDrawSfxId;
String sDrawCustom; //some drawing types are marked with strings!
- USHORT nFormSfxId;
- USHORT nLastPasteDestination;
+ USHORT nFormSfxId;
+ USHORT nLastPasteDestination;
// save the border distance status from SwView::StateTabWin to re-use it in SwView::ExecTabWin()
USHORT nLeftBorderDistance;
USHORT nRightBorderDistance;
- BOOL bCenterCrsr : 1,
+ BOOL bCenterCrsr : 1,
bTopCrsr : 1,
bAllwaysShowSel : 1,
bTabColFromDoc : 1,
@@ -289,17 +289,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// Methoden fuers Suchen
// Suchkontext setzen
- SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE);
- SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0);
- SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions );
- SW_DLLPRIVATE void Replace();
+ SW_DLLPRIVATE BOOL SearchAndWrap(BOOL bApi = FALSE);
+ SW_DLLPRIVATE BOOL SearchAll(USHORT* pFound = 0);
+ SW_DLLPRIVATE ULONG FUNC_Search( const SwSearchOptions& rOptions );
+ SW_DLLPRIVATE void Replace();
- BOOL IsDocumentBorder();
+ BOOL IsDocumentBorder();
- SW_DLLPRIVATE BOOL IsTextTool() const;
+ SW_DLLPRIVATE BOOL IsTextTool() const;
// Bedienelemente verwalten anlegen
- SW_DLLPRIVATE void CreateBtns();
+ SW_DLLPRIVATE void CreateBtns();
SW_DLLPRIVATE DECL_LINK( BtnPage, Button * );
SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * );
@@ -307,38 +307,38 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * );
- inline long GetXScroll() const;
- inline long GetYScroll() const;
- SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
- SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect,
+ inline long GetXScroll() const;
+ inline long GetYScroll() const;
+ SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
+ SW_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect,
USHORT nRangeX = USHRT_MAX,
USHORT nRangeY = USHRT_MAX);
- SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const;
- SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const;
+ SW_DLLPRIVATE BOOL GetPageScrollUpOffset(SwTwips& rOff) const;
+ SW_DLLPRIVATE BOOL GetPageScrollDownOffset(SwTwips& rOff) const;
// Scrollbar Movements
- SW_DLLPRIVATE long PageUp();
- SW_DLLPRIVATE long PageDown();
- SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect);
- SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect);
- SW_DLLPRIVATE long PhyPageUp();
- SW_DLLPRIVATE long PhyPageDown();
+ SW_DLLPRIVATE long PageUp();
+ SW_DLLPRIVATE long PageDown();
+ SW_DLLPRIVATE long PageUpCrsr(BOOL bSelect);
+ SW_DLLPRIVATE long PageDownCrsr(BOOL bSelect);
+ SW_DLLPRIVATE long PhyPageUp();
+ SW_DLLPRIVATE long PhyPageDown();
SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori );
SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
- SW_DLLPRIVATE BOOL UpdateScrollbars();
- SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
+ SW_DLLPRIVATE BOOL UpdateScrollbars();
+ SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
SW_DLLPRIVATE void CreatePageButtons(BOOL bShow);
// Linguistik-Funktionen
- SW_DLLPRIVATE void HyphenateDocument();
- SW_DLLPRIVATE BOOL IsDrawTextHyphenate();
- SW_DLLPRIVATE void HyphenateDrawText();
- SW_DLLPRIVATE void StartThesaurus();
+ SW_DLLPRIVATE void HyphenateDocument();
+ SW_DLLPRIVATE BOOL IsDrawTextHyphenate();
+ SW_DLLPRIVATE void HyphenateDrawText();
+ SW_DLLPRIVATE void StartThesaurus();
// text conversion
SW_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
@@ -349,60 +349,60 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 );
SW_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
- SW_DLLPRIVATE BOOL CheckSpecialCntnt();
- SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE)
+ SW_DLLPRIVATE BOOL CheckSpecialCntnt();
+ SW_DLLPRIVATE void SpellKontext(BOOL bOn = TRUE)
{ bCenterCrsr = bOn; bAllwaysShowSel = bOn; }
// Methoden fuers Printing
- SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
- SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent );
- SfxTabPage* CreatePrintOptionsPage( Window* pParent,
+ SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
+ SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent );
+ SfxTabPage* CreatePrintOptionsPage( Window* pParent,
const SfxItemSet& rSet);
// fuer Readonly-Umschaltung
- SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- SW_DLLPRIVATE void _CheckReadonlyState();
- SW_DLLPRIVATE void _CheckReadonlySelection();
+ SW_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ SW_DLLPRIVATE void _CheckReadonlyState();
+ SW_DLLPRIVATE void _CheckReadonlySelection();
// Methode fuer PageDesc drehen
- SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR);
+ SW_DLLPRIVATE void SwapPageMargin(const SwPageDesc&, SvxLRSpaceItem& rLR);
- SW_DLLPRIVATE void _SetZoom( const Size &rEditSz,
+ SW_DLLPRIVATE void _SetZoom( const Size &rEditSz,
SvxZoomType eZoomType,
short nFactor = 100,
BOOL bViewOnly = FALSE);
- SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner );
+ SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner );
- SW_DLLPRIVATE void ShowAtResize();
+ SW_DLLPRIVATE void ShowAtResize();
- SW_DLLPRIVATE virtual void Move();
+ SW_DLLPRIVATE virtual void Move();
SW_DLLPRIVATE BOOL InsertGraphicDlg( SfxRequest& );
protected:
- SwView_Impl* GetViewImpl() {return pViewImpl;}
+ SwView_Impl* GetViewImpl() {return pViewImpl;}
void ImpSetVerb( int nSelType );
- int GetSelectionType() const { return nSelectionType; }
- void SetSelectionType(int nSet) { nSelectionType = nSet;}
+ int GetSelectionType() const { return nSelectionType; }
+ void SetSelectionType(int nSet) { nSelectionType = nSet;}
// fuer die SwWebView
- void SetShell( SfxShell* pS ) { pShell = pS; }
- void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; }
+ void SetShell( SfxShell* pS ) { pShell = pS; }
+ void SetFormShell( FmFormShell* pSh ) { pFormShell = pSh; }
- virtual void SelectShell();
+ virtual void SelectShell();
- virtual void Activate(BOOL);
- virtual void Deactivate(BOOL);
- virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
- virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
- virtual Size GetOptimalSizePixel() const;
+ virtual void Activate(BOOL);
+ virtual void Deactivate(BOOL);
+ virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
+ virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
+ virtual Size GetOptimalSizePixel() const;
- void SetImageButtonColor(Color& rColor);
+ void SetImageButtonColor(Color& rColor);
const SwFrmFmt* GetLastTblFrmFmt() const {return pLastTableFormat;}
- void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;}
+ void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;}
// form letter execution
void GenerateFormLetter(BOOL bUseCurrentDocument);
@@ -415,26 +415,26 @@ public:
SFX_DECL_INTERFACE(SW_VIEWSHELL)
TYPEINFO();
- SfxDispatcher &GetDispatcher();
+ SfxDispatcher &GetDispatcher();
void GotFocus() const;
- virtual SdrView* GetDrawView() const;
- virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
- virtual void ShowCursor( bool bOn = TRUE );
- virtual ErrCode DoVerb( long nVerb );
+ virtual SdrView* GetDrawView() const;
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
+ virtual void ShowCursor( bool bOn = TRUE );
+ virtual ErrCode DoVerb( long nVerb );
- virtual USHORT SetPrinter( SfxPrinter* pNew,
+ virtual USHORT SetPrinter( SfxPrinter* pNew,
USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false);
- ShellModes GetShellMode();
+ ShellModes GetShellMode();
- com::sun::star::view::XSelectionSupplier* GetUNOObject();
+ com::sun::star::view::XSelectionSupplier* GetUNOObject();
- String GetSelectionTextParam( BOOL bCompleteWords,
+ String GetSelectionTextParam( BOOL bCompleteWords,
BOOL bEraseTrail );
- virtual BOOL HasSelection( BOOL bText ) const;
- virtual String GetSelectionText( BOOL bCompleteWords = FALSE );
- virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
- virtual void MarginChanged();
+ virtual BOOL HasSelection( BOOL bText ) const;
+ virtual String GetSelectionText( BOOL bCompleteWords = FALSE );
+ virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+ virtual void MarginChanged();
// replace word/selection with text from the thesaurus
// (this code has special handling for "in word" character)
@@ -443,12 +443,12 @@ public:
String GetThesaurusLookUpText( bool bSelection ) const;
// Shell sofort wechseln -> fuer GetSelectionObject
- void StopShellTimer();
+ void StopShellTimer();
- inline SwWrtShell& GetWrtShell () const { return *pWrtShell; }
- inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; }
+ inline SwWrtShell& GetWrtShell () const { return *pWrtShell; }
+ inline SwWrtShell* GetWrtShellPtr() const { return pWrtShell; }
- inline SwEditWin &GetEditWin() { return *pEditWin; }
+ inline SwEditWin &GetEditWin() { return *pEditWin; }
inline const SwEditWin &GetEditWin () const { return *pEditWin; }
#if defined WIN || defined WNT || defined UNX
@@ -456,29 +456,29 @@ public:
#endif
//Handler fuer Textbausteine an die Textshell rausreichen, gfs. anlegen
- SwGlossaryHdl* GetGlosHdl();
+ SwGlossaryHdl* GetGlosHdl();
- inline const Rectangle& GetVisArea() const { return aVisArea; }
+ inline const Rectangle& GetVisArea() const { return aVisArea; }
- BOOL IsScroll(const Rectangle& rRect) const;
- void Scroll( const Rectangle& rRect,
+ BOOL IsScroll(const Rectangle& rRect) const;
+ void Scroll( const Rectangle& rRect,
USHORT nRangeX = USHRT_MAX,
USHORT nRangeY = USHRT_MAX);
- long SetVScrollMax(long lMax);
- long SetHScrollMax(long lMax);
+ long SetVScrollMax(long lMax);
+ long SetHScrollMax(long lMax);
DECL_LINK( SpellError, LanguageType * );
- BOOL ExecSpellPopup( const Point& rPt );
+ BOOL ExecSpellPopup( const Point& rPt );
BOOL ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
// SMARTTAGS
BOOL ExecSmartTagPopup( const Point& rPt );
DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
- BOOL ExecDrwTxtSpellPopup(const Point& rPt);
+ BOOL ExecDrwTxtSpellPopup(const Point& rPt);
- void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; }
- void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; }
+ void SetTabColFromDocPos( const Point &rPt ) { aTabColFromDocPos = rPt; }
+ void SetTabColFromDoc( BOOL b ) { bTabColFromDoc = b; }
BOOL IsTabColFromDoc() const { return bTabColFromDoc; }
void SetTabRowFromDoc( BOOL b ) { bTabRowFromDoc = b; }
BOOL IsTabRowFromDoc() const { return bTabRowFromDoc; }
@@ -490,26 +490,26 @@ public:
BOOL IsNumIndentFromDoc() const { return NULL != pNumRuleNodeFromDoc; }
// <- #i23726#
- void DocSzChgd( const Size& rNewSize );
- const Size& GetDocSz() const { return aDocSz; }
- virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE);
- void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE);
- void CheckVisArea();
+ void DocSzChgd( const Size& rNewSize );
+ const Size& GetDocSz() const { return aDocSz; }
+ virtual void SetVisArea( const Rectangle&, BOOL bUpdateScrollbar = TRUE);
+ void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE);
+ void CheckVisArea();
static LAYOUT_NS Dialog* GetSearchDialog();
- static USHORT GetMoveType();
- static void SetMoveType(USHORT nSet);
+ static USHORT GetMoveType();
+ static void SetMoveType(USHORT nSet);
DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416#
- static void SetActMark(sal_Int32 nSet);
+ static void SetActMark(sal_Int32 nSet);
- BOOL HandleWheelCommands( const CommandEvent& );
+ BOOL HandleWheelCommands( const CommandEvent& );
// Rahmen einfuegen
- void InsFrmMode(USHORT nCols);
+ void InsFrmMode(USHORT nCols);
- void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE);
- virtual void SetZoomFactor( const Fraction &rX, const Fraction & );
+ void SetZoom( SvxZoomType eZoomType, short nFactor = 100, BOOL bViewOnly = FALSE);
+ virtual void SetZoomFactor( const Fraction &rX, const Fraction & );
void SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly = FALSE );
@@ -525,63 +525,63 @@ public:
int KillTab();
int StatVLineal() const { return ((Window*)pVRuler)->IsVisible(); }
- void ChangeVLinealMetric(FieldUnit eUnit);
+ void ChangeVLinealMetric(FieldUnit eUnit);
void GetVLinealMetric(FieldUnit& rToFill) const;
int StatTab() const { return ((Window*)pHRuler)->IsVisible(); }
SvxRuler& GetHLineal() { return *pHRuler; }
SvxRuler& GetVLineal() { return *pVRuler; }
- void InvalidateRulerPos();
- void ChangeTabMetric(FieldUnit eUnit);
+ void InvalidateRulerPos();
+ void ChangeTabMetric(FieldUnit eUnit);
void GetHLinealMetric(FieldUnit& rToFill) const;
// Handler
- void Execute(SfxRequest&);
- void ExecPageMove(SfxRequest&);
- void ExecStyle(SfxRequest&);
- void ExecLingu(SfxRequest&);
- void ExecDataBase(SfxRequest&);
- void ExecDlg(SfxRequest&);
- void ExecDlgExt(SfxRequest&);
- void ExecDBDlg(SfxRequest &);
- void ExecColl(SfxRequest&);
- void ExecutePrint(SfxRequest&);
- void ExecDraw(SfxRequest&);
- void ExecTabWin(SfxRequest&);
- void ExecuteStatusLine(SfxRequest&);
+ void Execute(SfxRequest&);
+ void ExecPageMove(SfxRequest&);
+ void ExecStyle(SfxRequest&);
+ void ExecLingu(SfxRequest&);
+ void ExecDataBase(SfxRequest&);
+ void ExecDlg(SfxRequest&);
+ void ExecDlgExt(SfxRequest&);
+ void ExecDBDlg(SfxRequest &);
+ void ExecColl(SfxRequest&);
+ void ExecutePrint(SfxRequest&);
+ void ExecDraw(SfxRequest&);
+ void ExecTabWin(SfxRequest&);
+ void ExecuteStatusLine(SfxRequest&);
DECL_LINK( ExecRulerClick, Ruler * );
- void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE);
+ void ExecSearch(SfxRequest&, BOOL bNoMessage = FALSE);
void ExecViewOptions(SfxRequest &);
void StateViewOptions(SfxItemSet &);
void StateSearch(SfxItemSet &);
- void GetState(SfxItemSet&);
- void StateStatusLine(SfxItemSet&);
+ void GetState(SfxItemSet&);
+ void StateStatusLine(SfxItemSet&);
// Funktionen fuer Drawing
- void SetDrawFuncPtr(SwDrawBase* pFuncPtr);
- inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; }
- void GetDrawState(SfxItemSet &rSet);
- void ExitDraw();
- inline BOOL IsDrawRotate() { return bDrawRotate; }
- inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; }
- inline BOOL IsDrawSelMode() { return bDrawSelMode; }
- void SetSelDrawSlot();
- inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; }
- void NoRotate(); // Rotate-Mode abschalten
- BOOL EnterDrawTextMode(const Point& aDocPos);
+ void SetDrawFuncPtr(SwDrawBase* pFuncPtr);
+ inline SwDrawBase* GetDrawFuncPtr(/*BOOL bBuf = FALSE*/) const { return pDrawActual; }
+ void GetDrawState(SfxItemSet &rSet);
+ void ExitDraw();
+ inline BOOL IsDrawRotate() { return bDrawRotate; }
+ inline void FlipDrawRotate() { bDrawRotate = !bDrawRotate; }
+ inline BOOL IsDrawSelMode() { return bDrawSelMode; }
+ void SetSelDrawSlot();
+ inline void FlipDrawSelMode() { bDrawSelMode = !bDrawSelMode; }
+ void NoRotate(); // Rotate-Mode abschalten
+ BOOL EnterDrawTextMode(const Point& aDocPos);
void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();}
- BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); }
- BOOL IsFormMode() const;
- BOOL IsBezierEditMode();
- BOOL AreOnlyFormsSelected() const;
- BOOL HasDrwObj(SdrObject *pSdrObj) const;
- BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const;
- BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL,
+ BOOL IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); }
+ BOOL IsFormMode() const;
+ BOOL IsBezierEditMode();
+ BOOL AreOnlyFormsSelected() const;
+ BOOL HasDrwObj(SdrObject *pSdrObj) const;
+ BOOL HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const;
+ BOOL BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL,
Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false );
- void StateTabWin(SfxItemSet&);
+ void StateTabWin(SfxItemSet&);
// Attribute haben sich geaendert
DECL_LINK( AttrChangedNotify, SwWrtShell * );
@@ -590,34 +590,34 @@ public:
DECL_LINK( FormControlActivated, FmFormShell* );
// Links bearbeiten
- void EditLinkDlg();
- void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0);
- void InsertCaption(const InsCaptionOpt *pOpt);
+ void EditLinkDlg();
+ void AutoCaption(const USHORT nType, const SvGlobalName *pOleId = 0);
+ void InsertCaption(const InsCaptionOpt *pOpt);
// Async Aufruf durch Core
void UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr);
- String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr);
+ String GetPageStr(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr);
// Shell rausreichen
- SfxShell *GetCurShell() { return pShell; }
- SwDocShell *GetDocShell();
- inline const SwDocShell *GetDocShell() const;
- inline FmFormShell *GetFormShell() { return pFormShell; }
- inline const FmFormShell *GetFormShell() const { return pFormShell; }
+ SfxShell *GetCurShell() { return pShell; }
+ SwDocShell *GetDocShell();
+ inline const SwDocShell *GetDocShell() const;
+ inline FmFormShell *GetFormShell() { return pFormShell; }
+ inline const FmFormShell *GetFormShell() const { return pFormShell; }
//damit in DToren der SubShells ggf. pShell zurueckgesetzt werden kann
- void ResetSubShell() { pShell = 0; }
+ void ResetSubShell() { pShell = 0; }
- virtual void WriteUserData(String &, BOOL bBrowse = FALSE );
- virtual void ReadUserData(const String &, BOOL bBrowse = FALSE );
+ virtual void WriteUserData(String &, BOOL bBrowse = FALSE );
+ virtual void ReadUserData(const String &, BOOL bBrowse = FALSE );
virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse );
virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse );
void SetCrsrAtTop( BOOL bFlag, BOOL bCenter = FALSE )
{ bTopCrsr = bFlag, bCenterCrsr = bCenter; }
- BOOL IsCrsrAtTop() const { return bTopCrsr; }
- BOOL IsCrsrAtCenter() const { return bCenterCrsr; }
+ BOOL IsCrsrAtTop() const { return bTopCrsr; }
+ BOOL IsCrsrAtCenter() const { return bCenterCrsr; }
BOOL JumpToSwMark( const String& rMark );
@@ -681,12 +681,12 @@ inline long SwView::GetYScroll() const
return aVisArea.GetHeight() * nScrollY / 100L;
}
-inline const SwDocShell *SwView::GetDocShell() const
+inline const SwDocShell *SwView::GetDocShell() const
{
return ((SwView*)this)->GetDocShell();
}
-SfxTabPage* CreatePrintOptionsPage( Window *pParent,
+SfxTabPage* CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions,
BOOL bPreview);
diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/ui/inc/viewlayoutctrl.hxx
index 8363955a165e..ccab207954d7 100644
--- a/sw/source/ui/inc/viewlayoutctrl.hxx
+++ b/sw/source/ui/inc/viewlayoutctrl.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc
index e9e446d62cdb..7f6f1b8c85f6 100644
--- a/sw/source/ui/inc/web.hrc
+++ b/sw/source/ui/inc/web.hrc
@@ -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
@@ -30,37 +30,37 @@
#include "rcid.hrc"
-#define RC_WEB_ICON (RC_WEB_BEGIN + 1)
-#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2)
-#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3)
-#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4)
-#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5)
-#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6)
-#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7)
-#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8)
-#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9)
-#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10)
-#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11)
-#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12)
+#define RC_WEB_ICON (RC_WEB_BEGIN + 1)
+#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2)
+#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3)
+#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4)
+#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5)
+#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6)
+#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7)
+#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8)
+#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9)
+#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10)
+#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11)
+#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12)
-#define MN_WEBFILE (RC_WEB_BEGIN + 30)
-#define MN_WEBEDIT (RC_WEB_BEGIN + 31)
-#define MN_WEBVIEW (RC_WEB_BEGIN + 32)
-#define MN_WEBINS (RC_WEB_BEGIN + 33)
-#define MN_WEBFORMAT (RC_WEB_BEGIN + 34)
-#define MN_WEBEXTRA (RC_WEB_BEGIN + 35)
-#define MN_WEBWIN (RC_WEB_BEGIN + 36)
+#define MN_WEBFILE (RC_WEB_BEGIN + 30)
+#define MN_WEBEDIT (RC_WEB_BEGIN + 31)
+#define MN_WEBVIEW (RC_WEB_BEGIN + 32)
+#define MN_WEBINS (RC_WEB_BEGIN + 33)
+#define MN_WEBFORMAT (RC_WEB_BEGIN + 34)
+#define MN_WEBEXTRA (RC_WEB_BEGIN + 35)
+#define MN_WEBWIN (RC_WEB_BEGIN + 36)
-#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46)
+#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46)
-#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47)
-#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48)
-#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49)
-#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50)
-#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51)
-#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52)
-#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53)
+#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47)
+#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48)
+#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49)
+#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50)
+#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51)
+#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52)
+#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53)
// ------------------------------------------------------------------------
diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/ui/inc/wformsh.hxx
index 38e587ff5e35..44fc9769d0d7 100644
--- a/sw/source/ui/inc/wformsh.hxx
+++ b/sw/source/ui/inc/wformsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/ui/inc/wfrmsh.hxx
index a141842440f2..31750dd38902 100644
--- a/sw/source/ui/inc/wfrmsh.hxx
+++ b/sw/source/ui/inc/wfrmsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/ui/inc/wgrfsh.hxx
index eaf5e4625007..3d0d9921fbb7 100644
--- a/sw/source/ui/inc/wgrfsh.hxx
+++ b/sw/source/ui/inc/wgrfsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wlistsh.hxx b/sw/source/ui/inc/wlistsh.hxx
index dd3fe48ac9ba..2f34938e0d68 100644
--- a/sw/source/ui/inc/wlistsh.hxx
+++ b/sw/source/ui/inc/wlistsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/ui/inc/wolesh.hxx
index 6d714580b8e4..ffb6c81270be 100644
--- a/sw/source/ui/inc/wolesh.hxx
+++ b/sw/source/ui/inc/wolesh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index 5c6dbabea04f..3d640caac2dd 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ class SwWordCountDialog : public SfxModalDialog
OKButton aOK;
HelpButton aHelp;
-public:
+public:
SwWordCountDialog(Window* pParent);
~SwWordCountDialog();
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 364d0d3ab418..ff5ca137ff8f 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -2,7 +2,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
@@ -39,8 +39,8 @@ class SwView;
// doppelter Eintrag! hrc und hxx
// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
#define NID_START 20000
-#define NID_NEXT 20000
-#define NID_PREV 20001
+#define NID_NEXT 20000
+#define NID_PREV 20001
#define NID_TBL 20002
#define NID_FRM 20003
#define NID_PGE 20004
@@ -48,17 +48,17 @@ class SwView;
#define NID_CTRL 20006
#define NID_REG 20007
#define NID_BKM 20008
-#define NID_GRF 20009
-#define NID_OLE 20010
-#define NID_OUTL 20011
-#define NID_SEL 20012
-#define NID_FTN 20013
-#define NID_MARK 20014
+#define NID_GRF 20009
+#define NID_OLE 20010
+#define NID_OUTL 20011
+#define NID_SEL 20012
+#define NID_FTN 20013
+#define NID_MARK 20014
#define NID_POSTIT 20015
#define NID_SRCH_REP 20016
#define NID_INDEX_ENTRY 20017
-#define NID_TABLE_FORMULA 20018
-#define NID_TABLE_FORMULA_ERROR 20019
+#define NID_TABLE_FORMULA 20018
+#define NID_TABLE_FORMULA_ERROR 20019
#define NID_COUNT 20
@@ -69,10 +69,10 @@ class SwView;
class SwTbxInsertCtrl : public SfxToolBoxControl
{
- USHORT nLastSlotId;
+ USHORT nLastSlotId;
using SfxToolBoxControl::Select;
- virtual void Select( BOOL bMod1 = FALSE );
+ virtual void Select( BOOL bMod1 = FALSE );
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -80,9 +80,9 @@ public:
SwTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
~SwTbxInsertCtrl();
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID,
+ virtual SfxPopupWindowType GetPopupWindowType() const;
+ virtual SfxPopupWindow* CreatePopupWindow();
+ virtual void StateChanged( USHORT nSID,
SfxItemState eState,
const SfxPoolItem* pState );
@@ -95,20 +95,20 @@ public:
class SwTbxAutoTextCtrl : public SfxToolBoxControl
{
- PopupMenu* pPopup;
- SwView* pView;
+ PopupMenu* pPopup;
+ SwView* pView;
- void DelPopup();
+ void DelPopup();
public:
SFX_DECL_TOOLBOX_CONTROL();
SwTbxAutoTextCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
~SwTbxAutoTextCtrl();
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID,
+ virtual SfxPopupWindowType GetPopupWindowType() const;
+ virtual SfxPopupWindow* CreatePopupWindow();
+ virtual void StateChanged( USHORT nSID,
SfxItemState eState,
const SfxPoolItem* pState );
@@ -122,8 +122,8 @@ public:
class SwScrollNaviToolBox : public ToolBox
{
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
public:
SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) :
@@ -135,16 +135,16 @@ class SwScrollNaviPopup : public SfxPopupWindow
SwScrollNaviToolBox aToolBox;
FixedLine aSeparator;
FixedInfo aInfoField;
- ImageList aIList;
+ ImageList aIList;
ImageList aIListH;
- String sQuickHelp[2 * NID_COUNT];
+ String sQuickHelp[2 * NID_COUNT];
- USHORT nFwdId;
- USHORT nBackId;
+ USHORT nFwdId;
+ USHORT nBackId;
void ApplyImageList();
-
+
using Window::GetQuickHelpText;
protected:
@@ -155,8 +155,8 @@ public:
SwScrollNaviPopup( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
~SwScrollNaviPopup();
- static String GetQuickHelpText(BOOL bNext);
-
+ static String GetQuickHelpText(BOOL bNext);
+
virtual SfxPopupWindow* Clone() const;
void GrabFocus(){aToolBox.GrabFocus();}
};
@@ -167,8 +167,8 @@ public:
class SwNaviImageButton : public ImageButton
{
- SwScrollNaviPopup* pPopup;
- Image aImage;
+ SwScrollNaviPopup* pPopup;
+ Image aImage;
Image aImageH;
String sQuickText;
SfxPopupWindow* pPopupWindow;
@@ -178,7 +178,7 @@ class SwNaviImageButton : public ImageButton
protected:
DECL_LINK( PopupModeEndHdl, void * );
DECL_LINK( ClosePopupWindow, SfxPopupWindow * );
-
+
virtual void Click();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void SetPopupWindow( SfxPopupWindow* pWindow );
@@ -188,21 +188,21 @@ class SwNaviImageButton : public ImageButton
};
//----------------------------------------------------------------------------
-// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen
+// Die ImageButtons muessen sich bei Bedarf den HelpText selbst setzen
//----------------------------------------------------------------------------
class SwHlpImageButton : public ImageButton
{
- BOOL bUp;
+ BOOL bUp;
public:
SwHlpImageButton(Window* pParent, const ResId& rResId, BOOL bUpBtn) :
ImageButton(pParent, rResId), bUp(bUpBtn){}
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
};
/* -----------------26.11.2002 09:25-----------------
- *
+ *
* --------------------------------------------------*/
class SwPreviewZoomControl : public SfxToolBoxControl
{
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index ef8172ec7218..ce0172e5539d 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -2,7 +2,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
@@ -45,63 +45,63 @@ class SwWrtShell;
class SwWrapDlg : public SfxSingleTabDialog
{
- SwWrtShell* pWrtShell;
+ SwWrtShell* pWrtShell;
public:
SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode);
~SwWrapDlg();
- inline SwWrtShell* GetWrtShell() { return pWrtShell; }
+ inline SwWrtShell* GetWrtShell() { return pWrtShell; }
};
/*--------------------------------------------------------------------
- Beschreibung: Umlauf-TabPage
+ Beschreibung: Umlauf-TabPage
--------------------------------------------------------------------*/
class SwWrapTabPage: public SfxTabPage
{
// WRAPPING
FixedLine aWrapFLC;
- ImageRadioButton aNoWrapRB;
- ImageRadioButton aWrapLeftRB;
- ImageRadioButton aWrapRightRB;
- ImageRadioButton aWrapParallelRB;
- ImageRadioButton aWrapThroughRB;
- ImageRadioButton aIdealWrapRB;
+ ImageRadioButton aNoWrapRB;
+ ImageRadioButton aWrapLeftRB;
+ ImageRadioButton aWrapRightRB;
+ ImageRadioButton aWrapParallelRB;
+ ImageRadioButton aWrapThroughRB;
+ ImageRadioButton aIdealWrapRB;
// MARGIN
FixedLine aMarginFL;
- FixedText aLeftMarginFT;
- MetricField aLeftMarginED;
- FixedText aRightMarginFT;
- MetricField aRightMarginED;
- FixedText aTopMarginFT;
- MetricField aTopMarginED;
- FixedText aBottomMarginFT;
- MetricField aBottomMarginED;
+ FixedText aLeftMarginFT;
+ MetricField aLeftMarginED;
+ FixedText aRightMarginFT;
+ MetricField aRightMarginED;
+ FixedText aTopMarginFT;
+ MetricField aTopMarginED;
+ FixedText aBottomMarginFT;
+ MetricField aBottomMarginED;
// OPTIONS
FixedLine aOptionsSepFL;
FixedLine aOptionsFL;
CheckBox aWrapAnchorOnlyCB;
- CheckBox aWrapTransparentCB;
- CheckBox aWrapOutlineCB;
- CheckBox aWrapOutsideCB;
+ CheckBox aWrapTransparentCB;
+ CheckBox aWrapOutlineCB;
+ CheckBox aWrapOutsideCB;
- ImageList aWrapIL;
+ ImageList aWrapIL;
ImageList aWrapILH;
- USHORT nOldLeftMargin;
- USHORT nOldRightMargin;
- USHORT nOldUpperMargin;
- USHORT nOldLowerMargin;
+ USHORT nOldLeftMargin;
+ USHORT nOldRightMargin;
+ USHORT nOldUpperMargin;
+ USHORT nOldLowerMargin;
RndStdIds nAnchorId;
- USHORT nHtmlMode;
+ USHORT nHtmlMode;
Size aFrmSize;
- SwWrtShell* pWrtSh;
+ SwWrtShell* pWrtSh;
BOOL bFormat;
BOOL bNew;
@@ -114,8 +114,8 @@ class SwWrapTabPage: public SfxTabPage
void ApplyImageList();
void EnableModes(const SfxItemSet& rSet);
- virtual void ActivatePage(const SfxItemSet& rSet);
- virtual int DeactivatePage(SfxItemSet *pSet);
+ virtual void ActivatePage(const SfxItemSet& rSet);
+ virtual int DeactivatePage(SfxItemSet *pSet);
virtual void DataChanged( const DataChangedEvent& rDCEvt );
DECL_LINK( RangeModifyHdl, MetricField * );
@@ -129,14 +129,14 @@ public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- virtual BOOL FillItemSet(SfxItemSet &rSet);
- virtual void Reset(const SfxItemSet &rSet);
+ virtual BOOL FillItemSet(SfxItemSet &rSet);
+ virtual void Reset(const SfxItemSet &rSet);
- static USHORT* GetRanges();
- inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
- inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt;
+ static USHORT* GetRanges();
+ inline void SetNewFrame(BOOL bNewFrame) { bNew = bNewFrame; }
+ inline void SetFormatUsed(BOOL bFmt, BOOL bDrw) { bFormat = bFmt;
bDrawMode = bDrw; }
- inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
+ inline void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
};
#endif
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index d35f0246c9db..cd9af8f07a78 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -2,7 +2,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
@@ -69,22 +69,22 @@ namespace com { namespace sun { namespace star { namespace util {
typedef sal_Int32 SelectionType;
namespace nsSelectionType
{
- const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001
- const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002
- const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010
- const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform
- const SelectionType SEL_NUM = 0x000040; // NumListe
- const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle
- const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert
- const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...)
- const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode
- const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren
- const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms
- const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients.
- const SelectionType SEL_MEDIA = 0x004000; // Media object
- const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape
- const SelectionType SEL_FONTWORK = 0x010000; // fontwork
- const SelectionType SEL_POSTIT = 0x020000; //annotation
+ const SelectionType SEL_TXT = CNT_TXT; // Text, niemals auch Rahmen 0x0001
+ const SelectionType SEL_GRF = CNT_GRF; // Grafik 0x0002
+ const SelectionType SEL_OLE = CNT_OLE; // OLE 0x0010
+ const SelectionType SEL_FRM = 0x000020; // Rahmen, keine Inhaltsform
+ const SelectionType SEL_NUM = 0x000040; // NumListe
+ const SelectionType SEL_TBL = 0x000080; // Cursor steht in Tabelle
+ const SelectionType SEL_TBL_CELLS = 0x000100; // Tabellenzellen sind selektiert
+ const SelectionType SEL_DRW = 0x000200; // Zeichenobjekte (Rechteck, Kreis...)
+ const SelectionType SEL_DRW_TXT = 0x000400; // Draw-Textobjekte im Editmode
+ const SelectionType SEL_BEZ = 0x000800; // Bezierobjekte editieren
+ const SelectionType SEL_DRW_FORM = 0x001000; // Zeichenobjekte: DB-Forms
+ const SelectionType SEL_FOC_FRM_CTRL = 0x002000; // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients.
+ const SelectionType SEL_MEDIA = 0x004000; // Media object
+ const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape
+ const SelectionType SEL_FONTWORK = 0x010000; // fontwork
+ const SelectionType SEL_POSTIT = 0x020000; //annotation
}
@@ -109,10 +109,10 @@ public:
typedef long (SwWrtShell::*SELECTFUNC)(const Point *, BOOL bProp );
- SELECTFUNC fnDrag;
- SELECTFUNC fnSetCrsr;
- SELECTFUNC fnEndDrag;
- SELECTFUNC fnKillSel;
+ SELECTFUNC fnDrag;
+ SELECTFUNC fnSetCrsr;
+ SELECTFUNC fnEndDrag;
+ SELECTFUNC fnKillSel;
// Alle Selektionen aufheben
long ResetSelect( const Point *, BOOL );
@@ -120,112 +120,112 @@ public:
//setzt den Cursorstack nach dem Bewegen mit PageUp/-Down
//zurueck, falls ein Stack aufgebaut ist
inline void ResetCursorStack();
- SelectionType GetSelectionType() const;
+ SelectionType GetSelectionType() const;
- BOOL IsModePushed() const { return 0 != pModeStack; }
- void PushMode();
- void PopMode();
+ BOOL IsModePushed() const { return 0 != pModeStack; }
+ void PushMode();
+ void PopMode();
- void SttSelect();
- void EndSelect();
- BOOL IsInSelect() const { return bInSelect; }
- void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; }
+ void SttSelect();
+ void EndSelect();
+ BOOL IsInSelect() const { return bInSelect; }
+ void SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; }
// Liegt eine Text- oder Rahmenselektion vor?
BOOL HasSelection() const { return SwCrsrShell::HasSelection() ||
IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); }
BOOL Pop( BOOL bOldCrsr = TRUE );
- void EnterStdMode();
- BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
+ void EnterStdMode();
+ BOOL IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
- void EnterExtMode();
- void LeaveExtMode();
- long ToggleExtMode();
- BOOL IsExtMode() const { return bExtMode; }
+ void EnterExtMode();
+ void LeaveExtMode();
+ long ToggleExtMode();
+ BOOL IsExtMode() const { return bExtMode; }
- void EnterAddMode();
- void LeaveAddMode();
- long ToggleAddMode();
- BOOL IsAddMode() const { return bAddMode; }
+ void EnterAddMode();
+ void LeaveAddMode();
+ long ToggleAddMode();
+ BOOL IsAddMode() const { return bAddMode; }
- void EnterBlockMode();
- void LeaveBlockMode();
- long ToggleBlockMode();
- BOOL IsBlockMode() const { return bBlockMode; }
+ void EnterBlockMode();
+ void LeaveBlockMode();
+ long ToggleBlockMode();
+ BOOL IsBlockMode() const { return bBlockMode; }
- void SetInsMode( BOOL bOn = TRUE );
- void ToggleInsMode() { SetInsMode( !bIns ); }
- BOOL IsInsMode() const { return bIns; }
+ void SetInsMode( BOOL bOn = TRUE );
+ void ToggleInsMode() { SetInsMode( !bIns ); }
+ BOOL IsInsMode() const { return bIns; }
void SetRedlineModeAndCheckInsMode( USHORT eMode );
- void EnterSelFrmMode(const Point *pStartDrag = 0);
- void LeaveSelFrmMode();
- BOOL IsSelFrmMode() const { return bLayoutMode; }
+ void EnterSelFrmMode(const Point *pStartDrag = 0);
+ void LeaveSelFrmMode();
+ BOOL IsSelFrmMode() const { return bLayoutMode; }
// Selektion von Rahmen aufheben
- void UnSelectFrm();
+ void UnSelectFrm();
- void Invalidate();
+ void Invalidate();
// Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar
inline void SelTblCells( const Link &rLink, BOOL bMark = TRUE );
- inline void EndSelTblCells();
+ inline void EndSelTblCells();
//Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird
//in der Regel in MB-Up gerufen.
- BOOL IsExtSel() const { return bSelWrd || bSelLn; }
+ BOOL IsExtSel() const { return bSelWrd || bSelLn; }
// erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist
// Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen.
- inline BOOL Is_FnDragEQBeginDrag() const;
+ inline BOOL Is_FnDragEQBeginDrag() const;
//Basisabfragen
- BOOL IsInWrd() { return IsInWord(); }
- BOOL IsSttWrd() { return IsStartWord(); }
- BOOL IsEndWrd();
- BOOL IsSttOfPara() const { return IsSttPara(); }
- BOOL IsEndOfPara() const { return IsEndPara(); }
+ BOOL IsInWrd() { return IsInWord(); }
+ BOOL IsSttWrd() { return IsStartWord(); }
+ BOOL IsEndWrd();
+ BOOL IsSttOfPara() const { return IsSttPara(); }
+ BOOL IsEndOfPara() const { return IsEndPara(); }
//Word bzw. Satz selektieren.
- BOOL SelNearestWrd();
- BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE );
+ BOOL SelNearestWrd();
+ BOOL SelWrd (const Point * = 0, BOOL bProp=FALSE );
// --> FME 2004-07-30 #i32329# Enhanced selection
void SelSentence (const Point * = 0, BOOL bProp=FALSE );
void SelPara (const Point * = 0, BOOL bProp=FALSE );
// <--
- long SelAll();
+ long SelAll();
//Basiscursortravelling
typedef BOOL (SwWrtShell:: *FNSimpleMove)();
BOOL SimpleMove( FNSimpleMove, BOOL bSelect );
- BOOL Left ( USHORT nMode, BOOL bSelect,
+ BOOL Left ( USHORT nMode, BOOL bSelect,
USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE );
- BOOL Right ( USHORT nMode, BOOL bSelect,
+ BOOL Right ( USHORT nMode, BOOL bSelect,
USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE );
- BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1,
+ BOOL Up ( BOOL bSelect = FALSE, USHORT nCount = 1,
BOOL bBasicCall = FALSE );
- BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1,
+ BOOL Down ( BOOL bSelect = FALSE, USHORT nCount = 1,
BOOL bBasicCall = FALSE );
- BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
- BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
+ BOOL NxtWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
+ BOOL PrvWrd ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
- BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall );
+ BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall );
BOOL RightMargin( BOOL bSelect, BOOL bBasicCall );
- BOOL SttDoc ( BOOL bSelect = FALSE );
- BOOL EndDoc ( BOOL bSelect = FALSE );
-
- BOOL SttNxtPg ( BOOL bSelect = FALSE );
- BOOL SttPrvPg ( BOOL bSelect = FALSE );
- BOOL EndNxtPg ( BOOL bSelect = FALSE );
- BOOL EndPrvPg ( BOOL bSelect = FALSE );
- BOOL SttPg ( BOOL bSelect = FALSE );
- BOOL EndPg ( BOOL bSelect = FALSE );
- BOOL SttPara ( BOOL bSelect = FALSE );
- BOOL EndPara ( BOOL bSelect = FALSE );
- BOOL FwdPara ( BOOL bSelect = FALSE )
+ BOOL SttDoc ( BOOL bSelect = FALSE );
+ BOOL EndDoc ( BOOL bSelect = FALSE );
+
+ BOOL SttNxtPg ( BOOL bSelect = FALSE );
+ BOOL SttPrvPg ( BOOL bSelect = FALSE );
+ BOOL EndNxtPg ( BOOL bSelect = FALSE );
+ BOOL EndPrvPg ( BOOL bSelect = FALSE );
+ BOOL SttPg ( BOOL bSelect = FALSE );
+ BOOL EndPg ( BOOL bSelect = FALSE );
+ BOOL SttPara ( BOOL bSelect = FALSE );
+ BOOL EndPara ( BOOL bSelect = FALSE );
+ BOOL FwdPara ( BOOL bSelect = FALSE )
{ return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); }
- BOOL BwdPara ( BOOL bSelect = FALSE )
+ BOOL BwdPara ( BOOL bSelect = FALSE )
{ return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); }
BOOL FwdSentence( BOOL bSelect = FALSE )
{ return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); }
@@ -242,30 +242,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
BOOL SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr = 0 );
// Spaltenweise Spruenge
- BOOL StartOfColumn ( BOOL bSelect = FALSE );
- BOOL EndOfColumn ( BOOL bSelect = FALSE );
- BOOL StartOfNextColumn ( BOOL bSelect = FALSE );
- BOOL EndOfNextColumn ( BOOL bSelect = FALSE );
- BOOL StartOfPrevColumn ( BOOL bSelect = FALSE );
- BOOL EndOfPrevColumn ( BOOL bSelect = FALSE );
+ BOOL StartOfColumn ( BOOL bSelect = FALSE );
+ BOOL EndOfColumn ( BOOL bSelect = FALSE );
+ BOOL StartOfNextColumn ( BOOL bSelect = FALSE );
+ BOOL EndOfNextColumn ( BOOL bSelect = FALSE );
+ BOOL StartOfPrevColumn ( BOOL bSelect = FALSE );
+ BOOL EndOfPrevColumn ( BOOL bSelect = FALSE );
// setze den Cursor auf die Seite "nPage" an den Anfang
// zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx
// werden hier alle bestehenden Selektionen vor dem Setzen des
// Cursors aufgehoben
- BOOL GotoPage( USHORT nPage, BOOL bRecord );
+ BOOL GotoPage( USHORT nPage, BOOL bRecord );
//setzen des Cursors; merken der alten Position fuer Zurueckblaettern.
DECL_LINK( ExecFlyMac, void * );
- BOOL PageCrsr(SwTwips lOffset, BOOL bSelect);
+ BOOL PageCrsr(SwTwips lOffset, BOOL bSelect);
// Felder Update
- void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE );
+ void UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE );
- void NoEdit(BOOL bHideCrsr = TRUE);
- void Edit();
- BOOL IsNoEdit() const { return bNoEdit; }
+ void NoEdit(BOOL bHideCrsr = TRUE);
+ void Edit();
+ BOOL IsNoEdit() const { return bNoEdit; }
BOOL IsRetainSelection() const { return mbRetainSelection; }
void SetRetainSelection( BOOL bRet ) { mbRetainSelection = bRet; }
@@ -274,20 +274,20 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
void ChgDBData(const SwDBData& SwDBData);
// Loeschen
- long DelToEndOfLine();
- long DelToStartOfLine();
- long DelLine();
- long DelLeft();
+ long DelToEndOfLine();
+ long DelToStartOfLine();
+ long DelLine();
+ long DelLeft();
// loescht auch Rahmen bzw. setzt den Cursor in den Rahmen,
// wenn bDelFrm == FALSE ist
long DelRight();
- long DelToEndOfPara();
- long DelToStartOfPara();
- long DelToEndOfSentence();
- long DelToStartOfSentence();
- long DelNxtWord();
- long DelPrvWord();
+ long DelToEndOfPara();
+ long DelToStartOfPara();
+ long DelToEndOfSentence();
+ long DelToStartOfSentence();
+ long DelNxtWord();
+ long DelPrvWord();
// Prueft, ob eine Wortselektion vorliegt.
// Gemaess den Regeln fuer intelligentes Cut / Paste
@@ -299,27 +299,27 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
WORD_SPACE_AFTER = 2,
WORD_NO_SPACE = 3
};
- int IntelligentCut(int nSelectionType, BOOL bCut = TRUE);
+ int IntelligentCut(int nSelectionType, BOOL bCut = TRUE);
// Editieren
- void Insert(SwField &);
- void Insert(const String &);
+ void Insert(SwField &);
+ void Insert(const String &);
// Graphic
- void Insert( const String &rPath, const String &rFilter,
+ void Insert( const String &rPath, const String &rFilter,
const Graphic &, SwFlyFrmAttrMgr * = 0,
BOOL bRule = FALSE );
- void InsertByWord( const String & );
- void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 );
- void InsertLineBreak();
- void InsertColumnBreak();
- void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE );
- void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
- BOOL CanInsert();
+ void InsertByWord( const String & );
+ void InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 );
+ void InsertLineBreak();
+ void InsertColumnBreak();
+ void InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE );
+ void SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
+ BOOL CanInsert();
// Verzeichnisse
- void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
- BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+ void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+ BOOL UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
// Numerierung und Bullets
/**
@@ -328,21 +328,21 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
@param bNum TRUE: turn on numbering
FALSE: turn on bullets
*/
- void NumOrBulletOn(BOOL bNum); // #i29560#
- void NumOrBulletOff(); // #i29560#
+ void NumOrBulletOn(BOOL bNum); // #i29560#
+ void NumOrBulletOff(); // #i29560#
void NumOn();
- void BulletOn();
+ void BulletOn();
//OLE
void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 fuer Clipboard
const svt::EmbeddedObjectRef&,
- SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen.
+ SvGlobalName *pName = 0, // != 0 entspr. Object erzeugen.
BOOL bActivate = TRUE,
USHORT nSlotId = 0); // SlotId fuer Dialog
BOOL InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
- void LaunchOLEObj( long nVerb = 0 ); // Server starten
- BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;}
+ void LaunchOLEObj( long nVerb = 0 ); // Server starten
+ BOOL IsOLEObj() const { return GetCntType() == CNT_OLE;}
virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset );
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
const SwRect *pFlyPrtRect = 0,
@@ -353,29 +353,29 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
// Vorlagen und Formate
// enum gibt an, was geschehen soll, wenn das Style nicht gefunden wurde
- enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen
+ enum GetStyle { GETSTYLE_NOCREATE, // keins anlegen
GETSTYLE_CREATESOME, // falls auf PoolId mapt anlegen
- GETSTYLE_CREATEANY }; // ggfs Standard returnen
+ GETSTYLE_CREATEANY }; // ggfs Standard returnen
- SwTxtFmtColl* GetParaStyle(const String &rCollName,
+ SwTxtFmtColl* GetParaStyle(const String &rCollName,
GetStyle eCreate = GETSTYLE_NOCREATE);
- SwCharFmt* GetCharStyle(const String &rFmtName,
+ SwCharFmt* GetCharStyle(const String &rFmtName,
GetStyle eCreate = GETSTYLE_NOCREATE);
- SwFrmFmt* GetTblStyle(const String &rFmtName);
+ SwFrmFmt* GetTblStyle(const String &rFmtName);
- void SetPageStyle(const String &rCollName);
+ void SetPageStyle(const String &rCollName);
- String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const;
+ String GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const;
// Aktuelle Vorlage anhand der geltenden Attribute aendern
- void QuickUpdateStyle();
+ void QuickUpdateStyle();
enum DoType { UNDO, REDO, REPEAT };
- void Do( DoType eDoType, USHORT nCnt = 1 );
- String GetDoString( DoType eDoType ) const;
- String GetRepeatString() const;
- USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
+ void Do( DoType eDoType, USHORT nCnt = 1 );
+ String GetDoString( DoType eDoType ) const;
+ String GetRepeatString() const;
+ USHORT GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
//Suchen oder Ersetzen
ULONG SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
@@ -400,7 +400,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
// Aktion vor Cursorbewegung
// Hebt gfs. Selektionen auf, triggert Timer und GCAttr()
- void MoveCrsr( BOOL bWithSelect = FALSE );
+ void MoveCrsr( BOOL bWithSelect = FALSE );
// Eingabefelder updaten
BOOL StartInputFldDlg(SwField*, BOOL bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0);
@@ -426,8 +426,8 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE );
// Zugehoerige SwView ermitteln
- const SwView& GetView() const { return rView; }
- SwView& GetView() { return rView; }
+ const SwView& GetView() const { return rView; }
+ SwView& GetView() { return rView; }
//Weil es sonst keiner macht, gibt es hier eine ExecMacro()
void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 );
@@ -474,17 +474,17 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
private:
- SW_DLLPRIVATE void OpenMark();
- SW_DLLPRIVATE void CloseMark( BOOL bOkFlag );
+ SW_DLLPRIVATE void OpenMark();
+ SW_DLLPRIVATE void CloseMark( BOOL bOkFlag );
- SW_DLLPRIVATE String GetWrdDelim();
- SW_DLLPRIVATE String GetSDelim();
- SW_DLLPRIVATE String GetBothDelim();
+ SW_DLLPRIVATE String GetWrdDelim();
+ SW_DLLPRIVATE String GetSDelim();
+ SW_DLLPRIVATE String GetBothDelim();
struct ModeStack
{
- ModeStack *pNext;
- BOOL bAdd,
+ ModeStack *pNext;
+ BOOL bAdd,
bBlock,
bExt,
bIns;
@@ -527,13 +527,13 @@ private:
} *pCrsrStack;
- SwView &rView;
+ SwView &rView;
- Point aDest;
- BOOL bDestOnStack;
- BOOL HasCrsrStack() const { return 0 != pCrsrStack; }
- SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect);
- SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE);
+ Point aDest;
+ BOOL bDestOnStack;
+ BOOL HasCrsrStack() const { return 0 != pCrsrStack; }
+ SW_DLLPRIVATE BOOL PushCrsr(SwTwips lOffset, BOOL bSelect);
+ SW_DLLPRIVATE BOOL PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE);
// ENDE Cursor bei PageUp / -Down mitnehmen
SW_DLLPRIVATE BOOL _SttWrd();
@@ -549,63 +549,63 @@ private:
BOOL _FwdPara();
SW_DLLPRIVATE BOOL _BwdPara();
- // Selektionen
- BOOL bIns :1;
- BOOL bInSelect :1;
- BOOL bExtMode :1;
- BOOL bAddMode :1;
+ // Selektionen
+ BOOL bIns :1;
+ BOOL bInSelect :1;
+ BOOL bExtMode :1;
+ BOOL bAddMode :1;
BOOL bBlockMode :1;
- BOOL bLayoutMode :1;
- BOOL bNoEdit :1;
- BOOL bCopy :1;
- BOOL bSelWrd :1;
- BOOL bSelLn :1;
- BOOL bIsInClickToEdit:1;
- BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen
+ BOOL bLayoutMode :1;
+ BOOL bNoEdit :1;
+ BOOL bCopy :1;
+ BOOL bSelWrd :1;
+ BOOL bSelLn :1;
+ BOOL bIsInClickToEdit:1;
+ BOOL bClearMark :1; // Selektion fuer ChartAutoPilot nicht loeschen
BOOL mbRetainSelection :1; // Do not remove selections
- Point aStart;
- Link aSelTblLink;
+ Point aStart;
+ Link aSelTblLink;
- SELECTFUNC fnLeaveSelect;
+ SELECTFUNC fnLeaveSelect;
//setzt den Cursorstack nach dem Bewegen mit PageUp/-Down zurueck.
- SW_DLLPRIVATE void _ResetCursorStack();
+ SW_DLLPRIVATE void _ResetCursorStack();
- SW_DLLPRIVATE void SttDragDrop(Timer *);
+ SW_DLLPRIVATE void SttDragDrop(Timer *);
using SwCrsrShell::SetCrsr;
- SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long SetCrsr(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long SetCrsrKillSel(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long StdSelect(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long BeginDrag(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long Drag(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long EndDrag(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long ExtSelWrd(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long ExtSelLn(const Point *, BOOL bProp=FALSE );
//Verschieben von Text aus Drag and Drop; Point ist
//Destination fuer alle Selektionen.
- SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long MoveText(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long BeginFrmDrag(const Point *, BOOL bProp=FALSE );
//nach SSize/Move eines Frames Update; Point ist Destination.
- SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long UpdateLayoutFrm(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long SttLeaveSelect(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long AddLeaveSelect(const Point *, BOOL bProp=FALSE );
+ SW_DLLPRIVATE long Ignore(const Point *, BOOL bProp=FALSE );
- SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;}
- SW_DLLPRIVATE BOOL _CanInsert();
+ SW_DLLPRIVATE void LeaveExtSel() { bSelWrd = bSelLn = FALSE;}
+ SW_DLLPRIVATE BOOL _CanInsert();
- SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0,
+ SW_DLLPRIVATE BOOL GoStart(BOOL KeepArea = FALSE, BOOL * = 0,
BOOL bSelect = FALSE, BOOL bDontMoveRegion = FALSE);
- SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0);
+ SW_DLLPRIVATE BOOL GoEnd(BOOL KeepArea = FALSE, BOOL * = 0);
enum BookMarkMove
{
@@ -638,10 +638,10 @@ inline void SwWrtShell::EndSelTblCells()
inline BOOL SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
-inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const
+inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const
{
#ifdef GCC
- SELECTFUNC fnTmp = &SwWrtShell::BeginDrag;
+ SELECTFUNC fnTmp = &SwWrtShell::BeginDrag;
return fnDrag == fnTmp;
#else
return sal::static_int_cast< BOOL >(fnDrag == &SwWrtShell::BeginDrag);
diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/ui/inc/wtabsh.hxx
index fbb5b4d9c57f..d88dea2474d4 100644
--- a/sw/source/ui/inc/wtabsh.hxx
+++ b/sw/source/ui/inc/wtabsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/ui/inc/wtextsh.hxx
index b94199828613..e558bcf6aeec 100644
--- a/sw/source/ui/inc/wtextsh.hxx
+++ b/sw/source/ui/inc/wtextsh.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/inc/wview.hxx b/sw/source/ui/inc/wview.hxx
index c76d8bd7d5e1..2c60c6307fe3 100644
--- a/sw/source/ui/inc/wview.hxx
+++ b/sw/source/ui/inc/wview.hxx
@@ -2,7 +2,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
@@ -34,7 +34,7 @@
class SW_DLLPUBLIC SwWebView: public SwView
{
protected:
- virtual void SelectShell();
+ virtual void SelectShell();
public:
SFX_DECL_VIEWFACTORY(SwWebView);
diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/ui/inc/zoomctrl.hxx
index cfd0c41784ba..ed69f44a621a 100644
--- a/sw/source/ui/inc/zoomctrl.hxx
+++ b/sw/source/ui/inc/zoomctrl.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@ private:
String sPreviewZoom;
public:
virtual void Command( const CommandEvent& rCEvt );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 9c232d4c128e..f4157fa0049f 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -2,7 +2,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
@@ -297,18 +297,18 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
String aTmpName( SwStyleNameMapper::GetSpecialExtraProgName( rDesc.GetSequenceName() ) );
lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, aTmpName );
- lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames());
+ lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames());
sal_Int16 nSet = text::ChapterFormat::NAME_NUMBER;
switch (rDesc.GetCaptionDisplay())
{
case CAPTION_COMPLETE: nSet = text::ChapterFormat::NAME_NUMBER;break;
- case CAPTION_NUMBER : nSet = text::ChapterFormat::NUMBER; break;
+ case CAPTION_NUMBER : nSet = text::ChapterFormat::NUMBER; break;
case CAPTION_TEXT : nSet = text::ChapterFormat::NAME; break;
}
lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_DISPLAY_TYPE, nSet);
- sal_uInt16 nOLEOptions = rDesc.GetOLEOptions();
+ sal_uInt16 nOLEOptions = rDesc.GetOLEOptions();
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_MATH, 0 != (nsSwTOOElements::TOO_MATH &nOLEOptions ));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CHART, 0 != (nsSwTOOElements::TOO_CHART &nOLEOptions ));
lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_STAR_CALC, 0 != (nsSwTOOElements::TOO_CALC &nOLEOptions ));
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7444f76e1285..ed51110f53dc 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,7 +2,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
@@ -101,12 +101,12 @@ using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
static const sal_Unicode aDeliStart = '['; //fuer die form
-static const sal_Unicode aDeliEnd = ']'; //fuer die form
+static const sal_Unicode aDeliEnd = ']'; //fuer die form
-#define POS_GRF 0
-#define POS_OLE 1
-#define POS_TABLE 2
-#define POS_FRAME 3
+#define POS_GRF 0
+#define POS_OLE 1
+#define POS_TABLE 2
+#define POS_FRAME 3
#define IDX_FILE_EXTENSION String::CreateFromAscii( \
RTL_CONSTASCII_STRINGPARAM( "*.sdi" ))
@@ -151,8 +151,8 @@ struct AutoMarkEntry
String sPrimKey;
String sSecKey;
String sComment;
- sal_Bool bCase;
- sal_Bool bWord;
+ sal_Bool bCase;
+ sal_Bool bWord;
AutoMarkEntry() :
bCase(sal_False),
@@ -165,63 +165,63 @@ SV_IMPL_PTRARR(AutoMarkEntryArr, AutoMarkEntryPtr);
typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base;
class SwEntryBrowseBox : public SwEntryBrowseBox_Base
{
- Edit aCellEdit;
- ::svt::CheckBoxControl aCellCheckBox;
+ Edit aCellEdit;
+ ::svt::CheckBoxControl aCellCheckBox;
- String sSearch;
- String sAlternative;
- String sPrimKey;
- String sSecKey;
- String sComment;
- String sCaseSensitive;
- String sWordOnly;
- String sYes;
- String sNo;
+ String sSearch;
+ String sAlternative;
+ String sPrimKey;
+ String sSecKey;
+ String sComment;
+ String sCaseSensitive;
+ String sWordOnly;
+ String sYes;
+ String sNo;
- AutoMarkEntryArr aEntryArr;
+ AutoMarkEntryArr aEntryArr;
- ::svt::CellControllerRef xController;
- ::svt::CellControllerRef xCheckController;
+ ::svt::CellControllerRef xController;
+ ::svt::CellControllerRef xCheckController;
- long nCurrentRow;
- sal_Bool bModified;
+ long nCurrentRow;
+ sal_Bool bModified;
- void SetModified() {bModified = sal_True;}
+ void SetModified() {bModified = sal_True;}
protected:
- virtual sal_Bool SeekRow( long nRow );
-// virtual void PaintField( OutputDevice& rDev, const awt::Rectangle& rRect,
-// sal_uInt16 nColumnId ) const;
- virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const;
- virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
- virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
- virtual sal_Bool SaveModified();
+ virtual sal_Bool SeekRow( long nRow );
+// virtual void PaintField( OutputDevice& rDev, const awt::Rectangle& rRect,
+// sal_uInt16 nColumnId ) const;
+ virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const;
+ virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
+ virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
+ virtual sal_Bool SaveModified();
public:
SwEntryBrowseBox(Window* pParent, const ResId& rId,
BrowserMode nMode = 0 );
- void ReadEntries(SvStream& rInStr);
- void WriteEntries(SvStream& rOutStr);
+ void ReadEntries(SvStream& rInStr);
+ void WriteEntries(SvStream& rOutStr);
- sal_Bool IsModified()const;
+ sal_Bool IsModified()const;
virtual String GetCellText( long nRow, USHORT nColumn ) const;
};
class SwAutoMarkDlg_Impl : public ModalDialog
{
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOKPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
- SwEntryBrowseBox aEntriesBB;
+ SwEntryBrowseBox aEntriesBB;
FixedLine aEntriesFL;
- String sAutoMarkURL;
- const String sAutoMarkType;
+ String sAutoMarkURL;
+ const String sAutoMarkType;
- sal_Bool bCreateMode;
+ sal_Bool bCreateMode;
DECL_LINK(OkHdl, OKButton*);
public:
@@ -247,7 +247,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
SwWrtShell &rShell,
SwTOXBase* pCurTOX,
sal_uInt16 nToxType, sal_Bool bGlobal) :
- SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet),
+ SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet),
aExampleContainerWIN(this, SW_RES(WIN_EXAMPLE)),
aExampleWIN( &aExampleContainerWIN, 0 ),
aShowExampleCB( this, SW_RES(CB_SHOWEXAMPLE)),
@@ -331,9 +331,9 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
OSL_ENSURE(pFact, "Dialogdiet fail!");
AddTabPage(TP_TOX_SELECT, SwTOXSelectTabPage::Create, 0);
AddTabPage(TP_TOX_STYLES, SwTOXStylesTabPage::Create, 0);
- AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
+ AddTabPage(TP_COLUMN, SwColumnPage::Create, 0);
AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
- AddTabPage(TP_TOX_ENTRY, SwTOXEntryTabPage::Create, 0);
+ AddTabPage(TP_TOX_ENTRY, SwTOXEntryTabPage::Create, 0);
if(!pCurTOX)
SetCurPageId(TP_TOX_SELECT);
@@ -372,7 +372,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
delete pExampleFrame;
}
-void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
+void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
if( TP_BACKGROUND == nId )
{
@@ -396,7 +396,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
}
-short SwMultiTOXTabDialog::Ok()
+short SwMultiTOXTabDialog::Ok()
{
short nRet = SfxTabDialog::Ok();
SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType);
@@ -435,7 +435,7 @@ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType)
return pFormArr[nIndex];
}
-SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
+SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
{
sal_uInt16 nIndex = eType.GetFlatIndex();
if(!pDescArr[nIndex])
@@ -586,14 +586,14 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
{
SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
- //if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
- if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
+ //if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
+ if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(nId != USHRT_MAX &&
- //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
- ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
+ //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
+ ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
return sal_False;
@@ -606,9 +606,9 @@ public:
SwIndexTreeLB(Window* pWin, const ResId& rResId) :
SvTreeListBox(pWin, rResId), pHeaderBar(0){}
- virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* );
- void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;}
+ void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;}
};
long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
@@ -625,7 +625,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
return nData;
}
-void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
+void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
{
SvLBoxEntry* pEntry = FirstSelected();
KeyCode aCode = rKEvt.GetKeyCode();
@@ -661,16 +661,16 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
class SwHeaderTree : public Control
{
- HeaderBar aStylesHB;
- SwIndexTreeLB aStylesTLB;
+ HeaderBar aStylesHB;
+ SwIndexTreeLB aStylesTLB;
public:
SwHeaderTree(Window* pParent, const ResId rResId);
- HeaderBar& GetHeaderBar() {return aStylesHB;}
- SwIndexTreeLB& GetTreeListBox() { return aStylesTLB;}
+ HeaderBar& GetHeaderBar() {return aStylesHB;}
+ SwIndexTreeLB& GetTreeListBox() { return aStylesTLB;}
- virtual void GetFocus();
+ virtual void GetFocus();
};
SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) :
@@ -690,7 +690,7 @@ SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) :
aStylesTLB.SetHeaderBar(&aStylesHB);
}
-void SwHeaderTree::GetFocus()
+void SwHeaderTree::GetFocus()
{
Control::GetFocus();
aStylesTLB.GrabFocus();
@@ -698,17 +698,17 @@ void SwHeaderTree::GetFocus()
class SwAddStylesDlg_Impl : public SfxModalDialog
{
- OKButton aOk;
- CancelButton aCancel;
- HelpButton aHelp;
+ OKButton aOk;
+ CancelButton aCancel;
+ HelpButton aHelp;
FixedLine aStylesFL;
- SwHeaderTree aHeaderTree;
+ SwHeaderTree aHeaderTree;
ImageButton aLeftPB;
ImageButton aRightPB;
- String sHBFirst;
- String* pStyleArr;
+ String sHBFirst;
+ String* pStyleArr;
DECL_LINK(OkHdl, OKButton*);
DECL_LINK(LeftRightHdl, PushButton*);
@@ -751,7 +751,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
nWidth /= 14;
nWidth--;
- rHB.InsertItem( 100, sHBFirst, 4 * nWidth );
+ rHB.InsertItem( 100, sHBFirst, 4 * nWidth );
for( i = 1; i <= MAXLEVEL; i++)
rHB.InsertItem( 100 + i, String::CreateFromInt32(i), nWidth );
rHB.Show();
@@ -772,7 +772,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
}
// now the other styles
//
- const SwTxtFmtColl *pColl = 0;
+ const SwTxtFmtColl *pColl = 0;
const sal_uInt16 nSz = rWrtSh.GetTxtFmtCollCount();
for ( sal_uInt16 j = 0;j < nSz; ++j )
@@ -961,20 +961,20 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
//aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));//#outline level,removed by zhaojianwei
- PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu();
+ PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu();
pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl));
Link aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
- aAddStylesCB .SetClickHdl(aLk);
+ aAddStylesCB .SetClickHdl(aLk);
aFromHeadingsCB .SetClickHdl(aLk);
aTOXMarksCB .SetClickHdl(aLk);
aFromFileCB .SetClickHdl(aLk);
- aCollectSameCB .SetClickHdl(aLk);
- aUseFFCB .SetClickHdl(aLk);
- aUseDashCB .SetClickHdl(aLk);
- aInitialCapsCB .SetClickHdl(aLk);
- aKeyAsEntryCB .SetClickHdl(aLk);
+ aCollectSameCB .SetClickHdl(aLk);
+ aUseFFCB .SetClickHdl(aLk);
+ aUseDashCB .SetClickHdl(aLk);
+ aInitialCapsCB .SetClickHdl(aLk);
+ aKeyAsEntryCB .SetClickHdl(aLk);
Link aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
aTitleED.SetModifyHdl(aModifyLk);
@@ -1025,17 +1025,17 @@ long lcl_TOXTypesToUserData(CurTOXType eType)
sal_uInt16 nRet = TOX_INDEX;
switch(eType.eType)
{
- case TOX_INDEX : nRet = TO_INDEX; break;
+ case TOX_INDEX : nRet = TO_INDEX; break;
case TOX_USER :
{
nRet = eType.nIndex << 8;
nRet |= TO_USER;
}
break;
- case TOX_CONTENT : nRet = TO_CONTENT; break;
+ case TOX_CONTENT : nRet = TO_CONTENT; break;
case TOX_ILLUSTRATIONS:nRet = TO_ILLUSTRATION; break;
- case TOX_OBJECTS : nRet = TO_OBJECT; break;
- case TOX_TABLES : nRet = TO_TABLE; break;
+ case TOX_OBJECTS : nRet = TO_OBJECT; break;
+ case TOX_TABLES : nRet = TO_TABLE; break;
case TOX_AUTHORITIES : nRet = TO_AUTHORITIES; break;
}
return nRet;
@@ -1058,24 +1058,24 @@ CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData)
switch(nData&0xff)
{
- case TO_INDEX : eRet.eType = TOX_INDEX; break;
- case TO_USER :
+ case TO_INDEX : eRet.eType = TOX_INDEX; break;
+ case TO_USER :
{
eRet.eType = TOX_USER;
eRet.nIndex = (nData&0xff00) >> 8;
}
break;
- case TO_CONTENT : eRet.eType = TOX_CONTENT; break;
+ case TO_CONTENT : eRet.eType = TOX_CONTENT; break;
case TO_ILLUSTRATION: eRet.eType = TOX_ILLUSTRATIONS; break;
- case TO_OBJECT : eRet.eType = TOX_OBJECTS; break;
- case TO_TABLE : eRet.eType = TOX_TABLES; break;
- case TO_AUTHORITIES : eRet.eType = TOX_AUTHORITIES; break;
+ case TO_OBJECT : eRet.eType = TOX_OBJECTS; break;
+ case TO_TABLE : eRet.eType = TOX_TABLES; break;
+ case TO_AUTHORITIES : eRet.eType = TOX_AUTHORITIES; break;
default: OSL_ENSURE(false, "what a type?");
}
return eRet;
}
-void SwTOXSelectTabPage::ApplyTOXDescription()
+void SwTOXSelectTabPage::ApplyTOXDescription()
{
SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
@@ -1275,7 +1275,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
break;
}
- rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() &&
+ rDesc.SetLevelFromChapter( aLevelFromChapterCB.IsVisible() &&
aLevelFromChapterCB.IsChecked());
if(aTOXMarksCB.IsChecked() && aTOXMarksCB.IsVisible())
nContentOptions |= nsSwTOXElement::TOX_MARK;
@@ -1348,12 +1348,12 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
return LEAVE_PAGE;
}
-SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
+SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
{
return new SwTOXSelectTabPage(pParent, rAttrSet);
}
-IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
+IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
{
SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
if(!bFirstCall)
@@ -1407,14 +1407,14 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aSortAlgorithmFT.Show(bEnableSortLanguage);
aSortAlgorithmLB.Show(bEnableSortLanguage);
- //if(nType & TO_CONTENT) //#outline level,removed by zhaojianwei
+ //if(nType & TO_CONTENT) //#outline level,removed by zhaojianwei
//{
//Point aPos(aAddStylesPB.GetPosPixel());
//aPos.X() = aChapterDlgPB.GetPosPixel().X();
//aAddStylesPB.SetPosPixel(aPos);
//}
//else if( nType & TO_ILLUSTRATION )//<-removed end.
- if( nType & TO_ILLUSTRATION ) //add by zhaojianwei
+ if( nType & TO_ILLUSTRATION ) //add by zhaojianwei
aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
else if( nType & TO_TABLE )
@@ -1425,7 +1425,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aAddStylesCB.SetText(sAddStyleUser);
// move left!
Point aPos(aAddStylesPB.GetPosPixel());
- // aPos.X() = aChapterDlgPB.GetPosPixel().X();
+ // aPos.X() = aChapterDlgPB.GetPosPixel().X();
aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
aAddStylesPB.SetPosPixel(aPos);
}
@@ -1438,8 +1438,8 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aKeyAsEntryCB.Show( 0 != (nType & TO_INDEX) );
aFromFileCB.Show( 0 != (nType & TO_INDEX) );
aAutoMarkPB.Show( 0 != (nType & TO_INDEX) );
-// aCreateAutoMarkPB.Show(nType &TO_INDEX);
-// aEditAutoMarkPB.Show(nType & TO_INDEX);
+// aCreateAutoMarkPB.Show(nType &TO_INDEX);
+// aEditAutoMarkPB.Show(nType & TO_INDEX);
aIdxOptionsFL.Show( 0 != (nType & TO_INDEX) );
@@ -1472,7 +1472,7 @@ IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG)
return 0;
}
-IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox )
+IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox )
{
SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
@@ -1552,13 +1552,13 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
return 0;
};
-IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
+IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
{
OSL_ENSURE(false, "not implemented");
switch((long)pBox->GetEntryData( pBox->GetSelectEntryPos() ))
{
case AREA_DOCUMENT : break;
- case AREA_CHAPTER : break;
+ case AREA_CHAPTER : break;
}
return 0;
}
@@ -1568,38 +1568,38 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
///* -----------------14.06.99 13:10-------------------
//
// --------------------------------------------------*/
-//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton)
+//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton)
//{
-// SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-// SwWrtShell& rSh = pTOXDlg->GetWrtShell();
+// SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+// SwWrtShell& rSh = pTOXDlg->GetWrtShell();
//
-// SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
-// SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
+// SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
+// SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
//
-// if(RET_OK == pDlg->Execute())
-// {
-// CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
-// SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
-// // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
-// // zugewiesen wurden
-// String sStr;
-// for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
-// {
-// sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
-// if(bNum)
-// {
-// //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
-// if(i < 5)
+// if(RET_OK == pDlg->Execute())
+// {
+// CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
+// SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
+// // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
+// // zugewiesen wurden
+// String sStr;
+// for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
+// {
+// sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
+// if(bNum)
+// {
+// //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
+// if(i < 5)
// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT1 + i), sStr );
-// else
+// else
// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr );
-// pForm->SetTemplate( i + 1, sStr );
-// }
-// }
+// pForm->SetTemplate( i + 1, sStr );
+// }
+// }
//
-// }
-// delete pDlg;
-// return 0;
+// }
+// delete pDlg;
+// return 0;
//}
IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
@@ -1652,9 +1652,9 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
class SwTOXEdit : public Edit
{
- SwFormToken aFormToken;
- Link aPrevNextControlLink;
- sal_Bool bNextControl;
+ SwFormToken aFormToken;
+ Link aPrevNextControlLink;
+ sal_Bool bNextControl;
SwTokenWindow* m_pParent;
public:
SwTOXEdit( Window* pParent, SwTokenWindow* pTokenWin,
@@ -1667,34 +1667,34 @@ public:
SetHelpId( HID_TOX_ENTRY_EDIT );
}
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
- sal_Bool IsNextControl() const {return bNextControl;}
- void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;}
+ sal_Bool IsNextControl() const {return bNextControl;}
+ void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;}
- const SwFormToken& GetFormToken()
+ const SwFormToken& GetFormToken()
{
aFormToken.sText = GetText();
return aFormToken;
}
- void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId)
+ void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId)
{
aFormToken.sCharStyleName = rSet;
aFormToken.nPoolId = nPoolId;
}
- void AdjustSize();
+ void AdjustSize();
};
-void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt )
+void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt )
{
if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt))
Edit::RequestHelp(rHEvt);
}
-void SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
+void SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
{
const Selection& rSel = GetSelection();
sal_uInt16 nTextLen = GetText().Len();
@@ -1732,9 +1732,9 @@ void SwTOXEdit::AdjustSize()
class SwTOXButton : public PushButton
{
- SwFormToken aFormToken;
- Link aPrevNextControlLink;
- sal_Bool bNextControl;
+ SwFormToken aFormToken;
+ Link aPrevNextControlLink;
+ sal_Bool bNextControl;
SwTokenWindow* m_pParent;
public:
SwTOXButton( Window* pParent, SwTokenWindow* pTokenWin,
@@ -1747,12 +1747,12 @@ public:
SetHelpId(HID_TOX_ENTRY_BUTTON);
}
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
- sal_Bool IsNextControl() const {return bNextControl;}
+ sal_Bool IsNextControl() const {return bNextControl;}
void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;}
- const SwFormToken& GetFormToken() const {return aFormToken;}
+ const SwFormToken& GetFormToken() const {return aFormToken;}
void SetCharStyleName(const String& rSet, sal_uInt16 nPoolId)
{
@@ -1767,7 +1767,7 @@ public:
{ aFormToken.cTabFillChar = cSet; }
void SetTabAlign(SvxTabAdjust eAlign)
- { aFormToken.eTabAlign = eAlign;}
+ { aFormToken.eTabAlign = eAlign;}
//---> i89791
//used for entry number format, in TOC only
@@ -1824,7 +1824,7 @@ public:
}
};
-void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
+void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
{
sal_Bool bCall = sal_False;
KeyCode aCode = rKEvt.GetKeyCode();
@@ -1850,7 +1850,7 @@ void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
PushButton::KeyInput(rKEvt);
}
-void SwTOXButton::RequestHelp( const HelpEvent& rHEvt )
+void SwTOXButton::RequestHelp( const HelpEvent& rHEvt )
{
if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt))
Button::RequestHelp(rHEvt);
@@ -1927,8 +1927,8 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aChapterEntryFT(this, SW_RES(FT_CHAPTERENTRY )),
aChapterEntryLB(this, SW_RES(LB_CHAPTERENTRY )),
- aNumberFormatFT(this, SW_RES(FT_ENTRY_NO )),//i53420
- aNumberFormatLB(this, SW_RES(LB_ENTRY_NO )),
+ aNumberFormatFT(this, SW_RES(FT_ENTRY_NO )),//i53420
+ aNumberFormatLB(this, SW_RES(LB_ENTRY_NO )),
aEntryOutlineLevelFT(this, SW_RES(FT_LEVEL_OL )),//i53420
aEntryOutlineLevelNF(this, SW_RES(NF_LEVEL_OL )),
@@ -1990,7 +1990,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aLevelLB.SetWindowBits( WB_HSCROLL );
aLevelLB.SetSpaceBetweenEntries(0);
aLevelLB.SetSelectionMode( SINGLE_SELECTION );
- aLevelLB.SetHighlightRange(); // select full width
+ aLevelLB.SetHighlightRange(); // select full width
aLevelLB.SetHelpId(HID_INSERT_INDEX_ENTRY_LEVEL_LB);
aLevelLB.Show();
@@ -2111,7 +2111,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage()
{
}
-sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
{
// nothing to do
return sal_True;
@@ -2247,20 +2247,20 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
lcl_ChgXPos(aCharStyleFT, nDiff);
lcl_ChgXPos(aCharStyleLB, nDiff);
lcl_ChgWidth(aCharStyleLB, -nDiff);
- // lcl_ChgXPos(aEditStylePB, -nDiff);
+ // lcl_ChgXPos(aEditStylePB, -nDiff);
lcl_ChgXPos(aFillCharFT, nDiff);
lcl_ChgXPos(aFillCharCB, nDiff);
- lcl_ChgXPos(aTabPosFT, nDiff);
- lcl_ChgXPos(aTabPosMF, nDiff);
+ lcl_ChgXPos(aTabPosFT, nDiff);
+ lcl_ChgXPos(aTabPosMF, nDiff);
lcl_ChgXPos(aAutoRightCB, nDiff);
- lcl_ChgXPos(aAuthFieldsLB, nDiff);
- lcl_ChgXPos(aAuthInsertPB, nDiff);
- lcl_ChgXPos(aAuthRemovePB, nDiff);
+ lcl_ChgXPos(aAuthFieldsLB, nDiff);
+ lcl_ChgXPos(aAuthInsertPB, nDiff);
+ lcl_ChgXPos(aAuthRemovePB, nDiff);
lcl_ChgXPos(aTokenFT, nDiff);
lcl_ChgXPos(aTokenWIN, nDiff);
lcl_ChgWidth(aTokenWIN, -nDiff);
- lcl_ChgXPos(aSortDocPosRB, nDiff);
- lcl_ChgXPos(aSortContentRB, nDiff);
+ lcl_ChgXPos(aSortDocPosRB, nDiff);
+ lcl_ChgXPos(aSortContentRB, nDiff);
lcl_ChgXPos(aFormatFL, nDiff);
lcl_ChgWidth(aFormatFL, -nDiff);
lcl_ChgXPos(aSortingFL, nDiff);
@@ -2300,42 +2300,42 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
aHyperLinkPB.SetPosPixel(aButtonPositions[4]);
//show or hide controls
- aEntryNoPB.Show( bToxIsContent );
- aHyperLinkPB.Show( bToxIsContent );
- aRelToStyleCB.Show( !bToxIsAuthorities );
+ aEntryNoPB.Show( bToxIsContent );
+ aHyperLinkPB.Show( bToxIsContent );
+ aRelToStyleCB.Show( !bToxIsAuthorities );
aChapterInfoPB.Show( !bToxIsContent && !bToxIsAuthorities);
- aEntryPB.Show( !bToxIsAuthorities );
- aPageNoPB.Show( !bToxIsAuthorities );
- aAuthFieldsLB.Show( bToxIsAuthorities );
- aAuthInsertPB.Show( bToxIsAuthorities );
- aAuthRemovePB.Show( bToxIsAuthorities );
+ aEntryPB.Show( !bToxIsAuthorities );
+ aPageNoPB.Show( !bToxIsAuthorities );
+ aAuthFieldsLB.Show( bToxIsAuthorities );
+ aAuthInsertPB.Show( bToxIsAuthorities );
+ aAuthRemovePB.Show( bToxIsAuthorities );
aFormatFL.Show( !bToxIsAuthorities );
- aSortDocPosRB.Show( bToxIsAuthorities );
- aSortContentRB.Show( bToxIsAuthorities );
+ aSortDocPosRB.Show( bToxIsAuthorities );
+ aSortContentRB.Show( bToxIsAuthorities );
aSortingFL.Show( bToxIsAuthorities );
- aFirstKeyFT.Show( bToxIsAuthorities );
- aFirstKeyLB.Show( bToxIsAuthorities );
- aSecondKeyFT.Show( bToxIsAuthorities );
- aSecondKeyLB.Show( bToxIsAuthorities );
- aThirdKeyFT.Show( bToxIsAuthorities );
- aThirdKeyLB.Show( bToxIsAuthorities );
+ aFirstKeyFT.Show( bToxIsAuthorities );
+ aFirstKeyLB.Show( bToxIsAuthorities );
+ aSecondKeyFT.Show( bToxIsAuthorities );
+ aSecondKeyLB.Show( bToxIsAuthorities );
+ aThirdKeyFT.Show( bToxIsAuthorities );
+ aThirdKeyLB.Show( bToxIsAuthorities );
aSortKeyFL.Show( bToxIsAuthorities );
- aFirstSortUpRB.Show( bToxIsAuthorities );
- aFirstSortDownRB.Show( bToxIsAuthorities );
- aSecondSortUpRB.Show( bToxIsAuthorities );
- aSecondSortDownRB.Show( bToxIsAuthorities );
- aThirdSortUpRB.Show( bToxIsAuthorities );
- aThirdSortDownRB.Show( bToxIsAuthorities );
+ aFirstSortUpRB.Show( bToxIsAuthorities );
+ aFirstSortDownRB.Show( bToxIsAuthorities );
+ aSecondSortUpRB.Show( bToxIsAuthorities );
+ aSecondSortDownRB.Show( bToxIsAuthorities );
+ aThirdSortUpRB.Show( bToxIsAuthorities );
+ aThirdSortDownRB.Show( bToxIsAuthorities );
aRelToStyleCB.SetPosPixel( bToxIsIndex ? aRelToStyleIdxPos
: aRelToStylePos );
-// aRecalcTabCB.Show( aCurType.eType == TOX_CONTENT);
+// aRecalcTabCB.Show( aCurType.eType == TOX_CONTENT);
- aMainEntryStyleFT.Show( bToxIsIndex );
- aMainEntryStyleLB.Show( bToxIsIndex );
- aAlphaDelimCB.Show( bToxIsIndex );
- aCommaSeparatedCB.Show( bToxIsIndex );
+ aMainEntryStyleFT.Show( bToxIsIndex );
+ aMainEntryStyleLB.Show( bToxIsIndex );
+ aAlphaDelimCB.Show( bToxIsIndex );
+ aCommaSeparatedCB.Show( bToxIsIndex );
}
aLastTOXType = aCurType;
@@ -2375,7 +2375,7 @@ void SwTOXEntryTabPage::UpdateDescriptor()
rDesc.SetSortKeys(aKey1, aKey2, aKey3);
}
- SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType);
+ SwForm* pCurrentForm = pTOXDlg->GetForm(aLastTOXType);
if(aRelToStyleCB.IsVisible())
{
pCurrentForm->SetRelTabPos(aRelToStyleCB.IsChecked());
@@ -2390,7 +2390,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
return LEAVE_PAGE;
}
-SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
+SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet)
{
return new SwTOXEntryTabPage(pParent, rAttrSet);
}
@@ -2402,7 +2402,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
SfxStringItem aStyle(SID_STYLE_EDIT, aCharStyleLB.GetSelectEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR);
// TODO: WrtShell?
-// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
+// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell().
@@ -2568,7 +2568,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
if(TOKEN_AUTHORITY == aToken.eTokenType)
{
sal_uInt32 nSearch = aToken.nAuthorityField;
- sal_uInt16 nLstBoxPos = aAuthFieldsLB.GetEntryPos( (void*) nSearch );
+ sal_uInt16 nLstBoxPos = aAuthFieldsLB.GetEntryPos( (void*) nSearch );
OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?");
aAuthFieldsLB.RemoveEntry(nLstBoxPos);
}
@@ -2872,7 +2872,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh)
RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyStr ));
}
-String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
+String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
{
String sRet;
SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
@@ -2891,7 +2891,7 @@ String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) :
Window( pParent, rResId ),
- aLeftScrollWin(this, ResId(WIN_LEFT_SCROLL, *rResId.GetResMgr() )),
+ aLeftScrollWin(this, ResId(WIN_LEFT_SCROLL, *rResId.GetResMgr() )),
aCtrlParentWin(this, ResId(WIN_CTRL_PARENT, *rResId.GetResMgr() )),
aRightScrollWin(this, ResId(WIN_RIGHT_SCROLL, *rResId.GetResMgr() )),
pForm(0),
@@ -2925,8 +2925,8 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) :
SwTokenWindow::~SwTokenWindow()
{
-// for(sal_uInt16 i = GetItemCount(); i ; i--)
-// RemoveItem(i - 1);
+// for(sal_uInt16 i = GetItemCount(); i ; i--)
+// RemoveItem(i - 1);
for( sal_uInt32 n = 0; n < aControlList.Count(); ++n )
{
@@ -2942,7 +2942,7 @@ SwTokenWindow::~SwTokenWindow()
}
}
-void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
+void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
{
SetActiveControl(0);
bValid = sal_True;
@@ -2993,7 +2993,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
const sal_Char* pTmp = 0;
switch( aToken.eTokenType )
{
- case TOKEN_ENTRY_NO: pTmp = SwForm::aFormEntryNum; break;
+ case TOKEN_ENTRY_NO: pTmp = SwForm::aFormEntryNum; break;
case TOKEN_ENTRY_TEXT: pTmp = SwForm::aFormEntryTxt; break;
case TOKEN_ENTRY: pTmp = SwForm::aFormEntry; break;
case TOKEN_TAB_STOP: pTmp = SwForm::aFormTab; break;
@@ -3046,7 +3046,7 @@ void SwTokenWindow::SetActiveControl(Control* pSet)
}
}
-Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToken)
+Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToken)
{
Control* pRet = 0;
Control* pLast = aControlList.Last();
@@ -3100,7 +3100,7 @@ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT
return pRet;
}
-void SwTokenWindow::InsertAtSelection(
+void SwTokenWindow::InsertAtSelection(
const String& rText,
const SwFormToken& rToken)
{
@@ -3186,7 +3186,7 @@ void SwTokenWindow::InsertAtSelection(
if(bPreStartLinkFound)
{
aToInsertToken.eTokenType = TOKEN_LINK_END;
- aToInsertToken.sText = aButtonTexts[TOKEN_LINK_END];
+ aToInsertToken.sText = aButtonTexts[TOKEN_LINK_END];
}
if(bPostLinkStartFound)
@@ -3463,7 +3463,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
return 0;
}
-String SwTokenWindow::GetPattern() const
+String SwTokenWindow::GetPattern() const
{
String sRet;
const Control* pControl = ((SwTokenWindow*)this)->aControlList.First();
@@ -3525,8 +3525,8 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl,
Rectangle aItemRect( aPos, pCtrl->GetSizePixel() );
if(rToken.eTokenType == TOKEN_TAB_STOP )
{
-// sEntry += '\n';
-// sEntry += rToken.nTabStopPosition;
+// sEntry += '\n';
+// sEntry += rToken.nTabStopPosition;
}
else
{
@@ -3666,13 +3666,13 @@ void SwTokenWindow::GetFocus()
SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) :
SfxTabPage(pParent, SW_RES(TP_TOX_STYLES), rAttrSet),
- aLevelFT2(this, SW_RES(FT_LEVEL )),
- aLevelLB(this, SW_RES(LB_LEVEL )),
- aTemplateFT(this, SW_RES(FT_TEMPLATE)),
- aParaLayLB(this, SW_RES(LB_PARALAY )),
- aStdBT(this, SW_RES(BT_STD )),
- aAssignBT(this, SW_RES(BT_ASSIGN )),
- aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )),
+ aLevelFT2(this, SW_RES(FT_LEVEL )),
+ aLevelLB(this, SW_RES(LB_LEVEL )),
+ aTemplateFT(this, SW_RES(FT_TEMPLATE)),
+ aParaLayLB(this, SW_RES(LB_PARALAY )),
+ aStdBT(this, SW_RES(BT_STD )),
+ aAssignBT(this, SW_RES(BT_ASSIGN )),
+ aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )),
aFormatFL(this, SW_RES(FL_FORMAT )),
m_pCurrentForm(0)
{
@@ -3681,12 +3681,12 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS
aAssignBT.SetModeImage( Image( SW_RES( IMG_ONE_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST );
- aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl));
- aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl));
- aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl));
- aParaLayLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
- aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
- aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl));
+ aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl));
+ aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl));
+ aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl));
+ aParaLayLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
+ aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
+ aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl));
}
SwTOXStylesTabPage::~SwTOXStylesTabPage()
@@ -3694,17 +3694,17 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage()
delete m_pCurrentForm;
}
-sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
{
return sal_True;
}
-void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet )
+void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet )
{
ActivatePage(rSet);
}
-void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
+void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
{
m_pCurrentForm = new SwForm(GetForm());
aParaLayLB.Clear();
@@ -3716,7 +3716,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
// form-Pattern anzeigen ohne Titel
- //1. TemplateEntry anzeigen
+ //1. TemplateEntry anzeigen
String aStr( SW_RES( STR_TITLE ));
if( m_pCurrentForm->GetTemplate( 0 ).Len() )
{
@@ -3777,7 +3777,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return LEAVE_PAGE;
}
-SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent,
+SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwTOXStylesTabPage(pParent, rAttrSet);
@@ -3789,7 +3789,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
{
SfxStringItem aStyle(SID_STYLE_EDIT, aParaLayLB.GetSelectEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA);
-// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
+// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
@@ -3805,9 +3805,9 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
--------------------------------------------------------------------*/
IMPL_LINK( SwTOXStylesTabPage, AssignHdl, Button *, EMPTYARG )
{
- sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos();
+ sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos();
sal_uInt16 nTemplPos = aParaLayLB.GetSelectEntryPos();
- if(nLevPos != LISTBOX_ENTRY_NOTFOUND &&
+ if(nLevPos != LISTBOX_ENTRY_NOTFOUND &&
nTemplPos != LISTBOX_ENTRY_NOTFOUND)
{
String aStr(aLevelLB.GetEntry(nLevPos));
@@ -3834,7 +3834,7 @@ IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG )
{
sal_uInt16 nPos = aLevelLB.GetSelectEntryPos();
if(nPos != LISTBOX_ENTRY_NOTFOUND)
- { String aStr(aLevelLB.GetEntry(nPos));
+ { String aStr(aLevelLB.GetEntry(nPos));
sal_uInt16 nDelPos = aStr.Search(aDeliStart);
if(nDelPos != STRING_NOTFOUND)
aStr.Erase(nDelPos-1);
@@ -3887,12 +3887,12 @@ IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG)
return 0;
}
-#define ITEM_SEARCH 1
+#define ITEM_SEARCH 1
#define ITEM_ALTERNATIVE 2
#define ITEM_PRIM_KEY 3
#define ITEM_SEC_KEY 4
#define ITEM_COMMENT 5
-#define ITEM_CASE 6
+#define ITEM_CASE 6
#define ITEM_WORDONLY 7
@@ -3906,7 +3906,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId,
BROWSER_HLINESFULL |
BROWSER_VLINESFULL |
BROWSER_AUTO_VSCROLL|
- BROWSER_HIDECURSOR ),
+ BROWSER_HIDECURSOR ),
aCellEdit(&GetDataWindow(), 0),
aCellCheckBox(&GetDataWindow()),
@@ -3970,19 +3970,19 @@ String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const
AutoMarkEntry* pEntry = aEntryArr[ static_cast< USHORT >(nRow) ];
switch(nColumn)
{
- case ITEM_SEARCH :pRet = &pEntry->sSearch; break;
+ case ITEM_SEARCH :pRet = &pEntry->sSearch; break;
case ITEM_ALTERNATIVE :pRet = &pEntry->sAlternative; break;
- case ITEM_PRIM_KEY :pRet = &pEntry->sPrimKey ; break;
- case ITEM_SEC_KEY :pRet = &pEntry->sSecKey ; break;
- case ITEM_COMMENT :pRet = &pEntry->sComment ; break;
- case ITEM_CASE :pRet = pEntry->bCase ? &sYes : &sNo; break;
- case ITEM_WORDONLY :pRet = pEntry->bWord ? &sYes : &sNo; break;
+ case ITEM_PRIM_KEY :pRet = &pEntry->sPrimKey ; break;
+ case ITEM_SEC_KEY :pRet = &pEntry->sSecKey ; break;
+ case ITEM_COMMENT :pRet = &pEntry->sComment ; break;
+ case ITEM_CASE :pRet = pEntry->bCase ? &sYes : &sNo; break;
+ case ITEM_WORDONLY :pRet = pEntry->bWord ? &sYes : &sNo; break;
}
}
return *pRet;
}
-void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
+void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
const Rectangle& rRect, sal_uInt16 nColumnId) const
{
String sPaint = GetCellText( nCurrentRow, nColumnId );
@@ -4018,13 +4018,13 @@ sal_Bool SwEntryBrowseBox::SaveModified()
: aEntryArr[nRow];
switch(nCol)
{
- case ITEM_SEARCH : pEntry->sSearch = sNew; break;
+ case ITEM_SEARCH : pEntry->sSearch = sNew; break;
case ITEM_ALTERNATIVE : pEntry->sAlternative = sNew; break;
- case ITEM_PRIM_KEY : pEntry->sPrimKey = sNew; break;
- case ITEM_SEC_KEY : pEntry->sSecKey = sNew; break;
- case ITEM_COMMENT : pEntry->sComment = sNew; break;
- case ITEM_CASE : pEntry->bCase = bVal; break;
- case ITEM_WORDONLY : pEntry->bWord = bVal; break;
+ case ITEM_PRIM_KEY : pEntry->sPrimKey = sNew; break;
+ case ITEM_SEC_KEY : pEntry->sSecKey = sNew; break;
+ case ITEM_COMMENT : pEntry->sComment = sNew; break;
+ case ITEM_CASE : pEntry->bCase = bVal; break;
+ case ITEM_WORDONLY : pEntry->bWord = bVal; break;
}
if(nRow >= aEntryArr.Count())
{
@@ -4039,7 +4039,7 @@ sal_Bool SwEntryBrowseBox::SaveModified()
return sal_True;
}
-void SwEntryBrowseBox::InitController(
+void SwEntryBrowseBox::InitController(
::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol)
{
String rTxt = GetCellText( nRow, nCol );
@@ -4058,7 +4058,7 @@ void SwEntryBrowseBox::InitController(
}
}
-void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
+void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
{
AutoMarkEntry* pToInsert = 0;
const String sZero('0');
@@ -4082,10 +4082,10 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
pToInsert = new AutoMarkEntry;
USHORT nSttPos = 0;
- pToInsert->sSearch = sLine.GetToken(0, ';', nSttPos );
+ pToInsert->sSearch = sLine.GetToken(0, ';', nSttPos );
pToInsert->sAlternative = sLine.GetToken(0, ';', nSttPos );
- pToInsert->sPrimKey = sLine.GetToken(0, ';', nSttPos );
- pToInsert->sSecKey = sLine.GetToken(0, ';', nSttPos );
+ pToInsert->sPrimKey = sLine.GetToken(0, ';', nSttPos );
+ pToInsert->sSecKey = sLine.GetToken(0, ';', nSttPos );
String sStr = sLine.GetToken(0, ';', nSttPos );
pToInsert->bCase = sStr.Len() && sStr != sZero;
@@ -4111,7 +4111,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
RowInserted(0, aEntryArr.Count() + 1, sal_True);
}
-void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
+void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
{
//check if the current controller is modified
sal_uInt16 nCol = GetCurColumnId();
@@ -4170,10 +4170,10 @@ sal_Bool SwEntryBrowseBox::IsModified()const
SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkURL,
const String& rAutoMarkType, sal_Bool bCreate) :
ModalDialog(pParent, SW_RES(DLG_CREATE_AUTOMARK)),
- aOKPB( this, SW_RES(PB_OK )),
- aCancelPB( this, SW_RES(PB_CANCEL )),
- aHelpPB( this, SW_RES(PB_HELP )),
- aEntriesBB( this, SW_RES(BB_ENTRIES )),
+ aOKPB( this, SW_RES(PB_OK )),
+ aCancelPB( this, SW_RES(PB_CANCEL )),
+ aHelpPB( this, SW_RES(PB_HELP )),
+ aEntriesBB( this, SW_RES(BB_ENTRIES )),
aEntriesFL( this, SW_RES(FL_ENTRIES )),
sAutoMarkURL(rAutoMarkURL),
sAutoMarkType(rAutoMarkType),
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index c544be2c7a2e..5b80e4342b52 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -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
@@ -43,7 +43,7 @@
#define BT_ENTRY_NUMBER 23
#define BT_ENTRY_TEXT 24
#define BT_TAB 25
-#define BT_STD 26
+#define BT_STD 26
#define BT_PAGE 27
#define FL_ENTRY 28
//#define FT_LEVEL 28
@@ -52,101 +52,101 @@
#define LB_PARALAY 31
#define BT_ASSIGN 32
#define FL_FORMAT 33
-#define BT_ENTRY 34
+#define BT_ENTRY 34
//#define BT_EDIT 34
-#define BT_JUMP 35
-#define CB_RECALC_TABS 36
+#define BT_JUMP 35
+#define CB_RECALC_TABS 36
#define CB_FIRST_TAB_POS 37
#define MF_FIRST_TAB_POS 38
-#define CB_REL_TO_TEXT 39
-#define BT_EDIT_STYLE 40
-#define CB_SAME 41
-#define CB_FF 42
-#define CB_CASE 43
-#define CB_SEC 44
-#define CB_ALPHA 45
+#define CB_REL_TO_TEXT 39
+#define BT_EDIT_STYLE 40
+#define CB_SAME 41
+#define CB_FF 42
+#define CB_CASE 43
+#define CB_SEC 44
+#define CB_ALPHA 45
#define FL_OPT 46
#define CB_MAKRS 47
-#define DLB_TOD 48
+#define DLB_TOD 48
#define CB_TEMPL 49
#define DLB_LAYOUT 50
#define CB_OBJECT 51
#define DLB_OBJECT 52
#define FL_SOURCE 53
-#define CB_USER_MARKS 54
+#define CB_USER_MARKS 54
#define BT_ALL_LEVEL 55
#define FT_MAIN_ENTRY_STYLE 56
#define LB_MAIN_ENTRY_STYLE 57
//restart numbering
-#define FT_TYPE 1
-#define LB_TYPE 2
-#define CB_READONLY 3
-#define FT_TITLE 4
+#define FT_TYPE 1
+#define LB_TYPE 2
+#define CB_READONLY 3
+#define FT_TITLE 4
#define FL_TYPETITLE 6
-#define LB_AREA 7
+#define LB_AREA 7
-#define NF_LEVEL 9
+#define NF_LEVEL 9
#define FL_AREA 10
-#define CB_FROMHEADINGS 11
-#define PB_CHAPTERDLG 12
-#define CB_ADDSTYLES 13
-#define PB_ADDSTYLES 14
+#define CB_FROMHEADINGS 11
+#define PB_CHAPTERDLG 12
+#define CB_ADDSTYLES 13
+#define PB_ADDSTYLES 14
-#define CB_FROMOLE 17
-#define CB_LEVELFROMCHAPTER 18
-#define RB_FROMCAPTIONS 19
-#define RB_FROMOBJECTNAMES 20
-#define CB_TOXMARKS 21
+#define CB_FROMOLE 17
+#define CB_LEVELFROMCHAPTER 18
+#define RB_FROMCAPTIONS 19
+#define RB_FROMOBJECTNAMES 20
+#define CB_TOXMARKS 21
#define FL_CREATEFROM 22
-#define CB_COLLECTSAME 23
-#define CB_USEFF 24
-#define CB_CASESENSITIVE 25
-#define CB_INITIALCAPS 26
-#define CB_KEYASENTRY 27
-#define CB_FROMFILE 28
+#define CB_COLLECTSAME 23
+#define CB_USEFF 24
+#define CB_CASESENSITIVE 25
+#define CB_INITIALCAPS 26
+#define CB_KEYASENTRY 27
+#define CB_FROMFILE 28
-#define MB_AUTOMARK 29
+#define MB_AUTOMARK 29
#define FL_IDXOPTIONS 30
#define FT_TOKEN 32
#define CB_USE_DASH 33
#define FL_LEVEL 34
-#define WIN_TOKEN 35
-#define PB_ENTRYNO 36
-#define PB_ENTRY 37
-#define PB_CHAPTERINFO 38
-#define PB_PAGENO 39
-#define PB_TAB 40
-#define PB_HYPERLINK 41
-#define FT_CHARSTYLE 42
-#define LB_CHARSTYLE 43
-#define PB_EDITSTYLE 44
-#define FT_FILLCHAR 45
-#define CB_FILLCHAR 46
-#define FT_CHAPTERENTRY 47
-#define LB_CHAPTERENTRY 48
-#define FT_SORTING 49
-#define LB_SORTING 50
-#define FT_TABPOS 51
-#define MF_TABPOS 52
-#define CB_AUTORIGHT 53
-#define CB_RELTOSTYLE 54
-#define CB_RECALCTAB 56
-#define CB_NUMSTYLEFROMPDESC 57
-#define CB_ALPHADELIM 58
-#define CB_COMMASEPARATED 59
+#define WIN_TOKEN 35
+#define PB_ENTRYNO 36
+#define PB_ENTRY 37
+#define PB_CHAPTERINFO 38
+#define PB_PAGENO 39
+#define PB_TAB 40
+#define PB_HYPERLINK 41
+#define FT_CHARSTYLE 42
+#define LB_CHARSTYLE 43
+#define PB_EDITSTYLE 44
+#define FT_FILLCHAR 45
+#define CB_FILLCHAR 46
+#define FT_CHAPTERENTRY 47
+#define LB_CHAPTERENTRY 48
+#define FT_SORTING 49
+#define LB_SORTING 50
+#define FT_TABPOS 51
+#define MF_TABPOS 52
+#define CB_AUTORIGHT 53
+#define CB_RELTOSTYLE 54
+#define CB_RECALCTAB 56
+#define CB_NUMSTYLEFROMPDESC 57
+#define CB_ALPHADELIM 58
+#define CB_COMMASEPARATED 59
-#define STR_NO_CHAR_STYLE 61
-#define CLB_FROMOBJ 62
+#define STR_NO_CHAR_STYLE 61
+#define CLB_FROMOBJ 62
#define FL_FROMOBJ 63
-#define RES_SRCTYPES 64
-#define WIN_LEFT_SCROLL 65
-#define WIN_CTRL_PARENT 66
+#define RES_SRCTYPES 64
+#define WIN_LEFT_SCROLL 65
+#define WIN_CTRL_PARENT 66
#define WIN_RIGHT_SCROLL 67
-#define PB_ALL_LEVELS 68
+#define PB_ALL_LEVELS 68
#define FT_AREA 69
#define STR_BUTTON_TEXT_START 70
#define STR_TOKEN_ENTRY_NO (STR_BUTTON_TEXT_START)
@@ -160,7 +160,7 @@
#define STR_TOKEN_LINK_END (STR_BUTTON_TEXT_START + 8)
#define STR_TOKEN_AUTHORITY (STR_BUTTON_TEXT_START + 9)
-#define STR_BUTTON_HELP_TEXT_START (STR_TOKEN_AUTHORITY + 1)
+#define STR_BUTTON_HELP_TEXT_START (STR_TOKEN_AUTHORITY + 1)
#define STR_TOKEN_HELP_ENTRY_NO (STR_BUTTON_HELP_TEXT_START)
#define STR_TOKEN_HELP_ENTRY_TEXT (STR_BUTTON_HELP_TEXT_START + 1)
#define STR_TOKEN_HELP_ENTRY (STR_BUTTON_HELP_TEXT_START + 2)
@@ -172,58 +172,58 @@
#define STR_TOKEN_HELP_LINK_END (STR_BUTTON_HELP_TEXT_START + 8)
#define STR_TOKEN_HELP_AUTHORITY (STR_BUTTON_HELP_TEXT_START + 9)
-#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1)
-#define TLB_STYLES 100
+#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1)
+#define TLB_STYLES 100
#define FL_STYLES 101
-#define PB_OK 102
-#define PB_CANCEL 103
-#define PB_HELP 104
+#define PB_OK 102
+#define PB_CANCEL 103
+#define PB_HELP 104
#define FT_CAPTIONSEQUENCE 105
#define LB_CAPTIONSEQUENCE 106
#define FT_DISPLAYTYPE 107
#define LB_DISPLAYTYPE 108
-#define TR_HEADER 109
-#define PB_LEFT 110
+#define TR_HEADER 109
+#define PB_LEFT 110
#define PB_RIGHT 111
-#define HB_STYLES 112
+#define HB_STYLES 112
#define ST_HB_FIRST 113
-#define CB_FROMTABLES 114
-#define CB_FROMFRAMES 115
+#define CB_FROMTABLES 114
+#define CB_FROMFRAMES 115
#define CB_FROMGRAPHICS 116
-#define ST_USER_ADDSTYLE 117
-#define ST_AUTOMARK_TYPE 118
-#define LB_AUTHFIELD 119
-#define PB_AUTHINSERT 120
-#define PB_AUTHREMOVE 121
-#define CB_SEQUENCE 122
-#define FT_BRACKET 123
-#define LB_BRACKET 124
+#define ST_USER_ADDSTYLE 117
+#define ST_AUTOMARK_TYPE 118
+#define LB_AUTHFIELD 119
+#define PB_AUTHINSERT 120
+#define PB_AUTHREMOVE 121
+#define CB_SEQUENCE 122
+#define FT_BRACKET 123
+#define LB_BRACKET 124
#define FL_AUTHORITY 125
-#define RB_DOCPOS 126
+#define RB_DOCPOS 126
#define RB_SORTCONTENT 127
-#define FT_FIRSTKEY 128
-#define LB_FIRSTKEY 129
-#define FT_SECONDKEY 130
-#define LB_SECONDKEY 131
-#define FT_THIRDDKEY 132
+#define FT_FIRSTKEY 128
+#define LB_FIRSTKEY 129
+#define FT_SECONDKEY 130
+#define LB_SECONDKEY 131
+#define FT_THIRDDKEY 132
#define LB_THIRDKEY 133
#define FL_SORTKEY 134
#define FL_SORTING 135
-#define STR_NOSORTKEY 136
-#define RB_SORTUP1 137
+#define STR_NOSORTKEY 136
+#define RB_SORTUP1 137
#define RB_SORTUP2 138
#define RB_SORTUP3 139
#define RB_SORTDOWN1 140
#define RB_SORTDOWN2 141
#define RB_SORTDOWN3 142
-#define STR_DELIM 143
+#define STR_DELIM 143
#define FL_SORTOPTIONS 144
#define FT_LANGUAGE 145
#define LB_LANGUAGE 146
#define FT_SORTALG 147
#define LB_SORTALG 148
-#define IMG_SORTUP_HC 149
-#define IMG_SORTDOWN_HC 150
+#define IMG_SORTUP_HC 149
+#define IMG_SORTDOWN_HC 150
#define ST_NO_BRACKET 151
#define FT_LEVEL_OL 152
@@ -231,20 +231,20 @@
#define FT_ENTRY_NO 154
#define LB_ENTRY_NO 155
-#define TO_CONTENT 1
-#define TO_INDEX 2
+#define TO_CONTENT 1
+#define TO_INDEX 2
#define TO_ILLUSTRATION 4
-#define TO_TABLE 8
-#define TO_USER 16
-#define TO_OBJECT 32
+#define TO_TABLE 8
+#define TO_USER 16
+#define TO_OBJECT 32
#define TO_AUTHORITIES 64
-#define AREA_DOCUMENT 1
-#define AREA_CHAPTER 2
+#define AREA_DOCUMENT 1
+#define AREA_CHAPTER 2
//TabDialog
-#define WIN_EXAMPLE 1
-#define RES_EXAMPLE_TEXT 2
+#define WIN_EXAMPLE 1
+#define RES_EXAMPLE_TEXT 2
#define ST_HEADING_1 4
#define ST_TEXT_1 5
@@ -252,31 +252,31 @@
#define ST_TEXT_1_1 7
#define ST_HEADING_1_2 8
#define ST_TEXT_1_2 9
-#define ST_TABLE_LABEL 10
+#define ST_TABLE_LABEL 10
#define ST_FRAME_LABEL 11
#define ST_GRAPHIC_LABEL 12
-#define ST_USERDEFINEDINDEX 13
-#define CB_SHOWEXAMPLE 14
+#define ST_USERDEFINEDINDEX 13
+#define CB_SHOWEXAMPLE 14
// AutoMark dialog
-#define BB_ENTRIES 1
+#define BB_ENTRIES 1
#define FL_ENTRIES 2
-#define ST_SEARCH 10
+#define ST_SEARCH 10
#define ST_ALTERNATIVE 11
-#define ST_PRIMKEY 12
-#define ST_SECKEY 13
-#define ST_COMMENT 14
-#define ST_CASESENSITIVE 15
-#define ST_WORDONLY 16
-#define ST_TRUE 17
+#define ST_PRIMKEY 12
+#define ST_SECKEY 13
+#define ST_COMMENT 14
+#define ST_CASESENSITIVE 15
+#define ST_WORDONLY 16
+#define ST_TRUE 17
#define ST_FALSE 18
//ButtonMenu
-#define MN_AUTOMARK_OPEN 1
-#define MN_AUTOMARK_NEW 2
+#define MN_AUTOMARK_OPEN 1
+#define MN_AUTOMARK_NEW 2
#define MN_AUTOMARK_EDIT 3
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 68f008b8d5ff..8220ed42ba2d 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -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
@@ -124,25 +124,25 @@ TabPage TP_TOX_SELECT
Size = MAP_APPFONT ( 248, 8 ) ;
Text [ en-US ] = "Type and title";
};
- FixedText FT_TITLE
+ FixedText FT_TITLE
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
Size = MAP_APPFONT ( 30 ,10 ) ;
Text [ en-US ] = "~Title";
};
- Edit ED_TITLE
+ Edit ED_TITLE
{
Pos = MAP_APPFONT ( 45 , 14 ) ;
Size = MAP_APPFONT ( 203 , 12 ) ;
Border = TRUE;
};
- FixedText FT_TYPE
+ FixedText FT_TYPE
{
Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 30, 10 ) ;
Text [ en-US ] = "Type";
};
- ListBox LB_TYPE
+ ListBox LB_TYPE
{
Pos = MAP_APPFONT ( 45 , 30 ) ;
Size = MAP_APPFONT ( 80 , 80 ) ;
@@ -150,16 +150,16 @@ TabPage TP_TOX_SELECT
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "Table of Contents" ; TO_CONTENT ;> ;
- < "Alphabetical Index" ; TO_INDEX ;> ;
+ < "Table of Contents" ; TO_CONTENT ;> ;
+ < "Alphabetical Index" ; TO_INDEX ;> ;
< "Illustration Index" ; TO_ILLUSTRATION ;> ;
- < "Index of Tables" ; TO_TABLE ;> ;
- < "User-Defined" ; TO_USER ;> ;
- < "Table of Objects" ; TO_OBJECT ;> ;
- < "Bibliography" ; TO_AUTHORITIES ;> ;
+ < "Index of Tables" ; TO_TABLE ;> ;
+ < "User-Defined" ; TO_USER ;> ;
+ < "Table of Objects" ; TO_OBJECT ;> ;
+ < "Bibliography" ; TO_AUTHORITIES ;> ;
};
};
- CheckBox CB_READONLY
+ CheckBox CB_READONLY
{
Pos = MAP_APPFONT ( 51 , 46 ) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
@@ -186,8 +186,8 @@ TabPage TP_TOX_SELECT
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "Entire document" ; AREA_DOCUMENT ;> ;
- < "Chapter" ; AREA_CHAPTER ;> ;
+ < "Entire document" ; AREA_DOCUMENT ;> ;
+ < "Chapter" ; AREA_CHAPTER ;> ;
};
};
FixedText FT_LEVEL
@@ -216,7 +216,7 @@ TabPage TP_TOX_SELECT
Size = MAP_APPFONT ( 248, 8 ) ;
Text [ en-US ] = "Create from";
};
- CheckBox CB_FROMHEADINGS
+ CheckBox CB_FROMHEADINGS
{
Pos = MAP_APPFONT ( 12 , 99 ) ;
Size = MAP_APPFONT ( 95 , 10 ) ;
@@ -224,14 +224,14 @@ TabPage TP_TOX_SELECT
Text [ en-US ] = "Outline";
};
// #outline level,removed by zhaojianwei
-/* PushButton PB_CHAPTERDLG
+/* PushButton PB_CHAPTERDLG
{
Pos = MAP_APPFONT ( 115 , 98 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "~..." ;
TabStop = TRUE ;
};
-*/
+*/
CheckBox CB_ADDSTYLES
{
Pos = MAP_APPFONT ( 12 , 115 ) ;
@@ -242,21 +242,21 @@ TabPage TP_TOX_SELECT
{
Text [ en-US ] = "Styl~es";
};
- PushButton PB_ADDSTYLES
+ PushButton PB_ADDSTYLES
{
Pos = MAP_APPFONT ( 115 , 114 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "..." ;
TabStop = TRUE ;
};
- CheckBox CB_TOXMARKS
+ CheckBox CB_TOXMARKS
{
Pos = MAP_APPFONT ( 12 , 131 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text [ en-US ] = "Inde~x marks";
};
- RadioButton RB_FROMCAPTIONS
+ RadioButton RB_FROMCAPTIONS
{
Pos = MAP_APPFONT ( 12 , 98 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
@@ -300,13 +300,13 @@ TabPage TP_TOX_SELECT
Size = MAP_APPFONT ( 90 , 10 ) ;
Text [ en-US ] = "Object names";
};
- CheckBox CB_COLLECTSAME
+ CheckBox CB_COLLECTSAME
{
Pos = MAP_APPFONT ( 12 , 98 ) ;
Size = MAP_APPFONT ( 121 , 10 ) ;
Text [ en-US ] = "Combine identical entries";
};
- CheckBox CB_USEFF
+ CheckBox CB_USEFF
{
Pos = MAP_APPFONT ( 18 , 111 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
@@ -318,31 +318,31 @@ TabPage TP_TOX_SELECT
Size = MAP_APPFONT ( 115 , 10 ) ;
Text [ en-US ] = "Combine with -";
};
- CheckBox CB_CASESENSITIVE
+ CheckBox CB_CASESENSITIVE
{
Pos = MAP_APPFONT ( 18 , 137 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text [ en-US ] = "Case sensitive";
};
- CheckBox CB_INITIALCAPS
+ CheckBox CB_INITIALCAPS
{
Pos = MAP_APPFONT ( 136 , 98 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text [ en-US ] = "AutoCapitalize entries";
};
- CheckBox CB_KEYASENTRY
+ CheckBox CB_KEYASENTRY
{
Pos = MAP_APPFONT ( 136, 111 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text [ en-US ] = "Keys as separate entries";
};
- CheckBox CB_FROMFILE
+ CheckBox CB_FROMFILE
{
Pos = MAP_APPFONT ( 136 , 124 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
Text [ en-US ] = "~Concordance file";
};
- MenuButton MB_AUTOMARK
+ MenuButton MB_AUTOMARK
{
Pos = MAP_APPFONT ( 136 , 137 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -370,31 +370,31 @@ TabPage TP_TOX_SELECT
};
Text [ en-US ] = "~File";
};
- CheckBox CB_FROMTABLES
+ CheckBox CB_FROMTABLES
{
Pos = MAP_APPFONT ( 112 , 99 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text [ en-US ] = "Tables";
};
- CheckBox CB_FROMFRAMES
+ CheckBox CB_FROMFRAMES
{
Pos = MAP_APPFONT ( 182 , 99 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text [ en-US ] = "Te~xt frames";
};
- CheckBox CB_FROMGRAPHICS
+ CheckBox CB_FROMGRAPHICS
{
Pos = MAP_APPFONT ( 112 , 113 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text [ en-US ] = "Graphics";
};
- CheckBox CB_FROMOLE
+ CheckBox CB_FROMOLE
{
Pos = MAP_APPFONT ( 182 , 113 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
Text [ en-US ] = "OLE objects";
};
- CheckBox CB_LEVELFROMCHAPTER
+ CheckBox CB_LEVELFROMCHAPTER
{
Pos = MAP_APPFONT ( 118 , 127 ) ;
Size = MAP_APPFONT ( 103 , 10 ) ;
@@ -417,21 +417,21 @@ TabPage TP_TOX_SELECT
{
StringArray 1
{
-/* ids from tox.hxx
- TOO_MATH = 0x01,
- TOO_CHART = 0x02,
- TOO_IMAGE = 0x04,
- TOO_CALC = 0x08,
+/* ids from tox.hxx
+ TOO_MATH = 0x01,
+ TOO_CHART = 0x02,
+ TOO_IMAGE = 0x04,
+ TOO_CALC = 0x08,
TOO_DRAW_IMPRESS= 0x10,
- TOO_OTHER = 0x80*/
+ TOO_OTHER = 0x80*/
ItemList [ en-US ] =
{
- < "%PRODUCTNAME Math" ; 1;> ;
- < "%PRODUCTNAME Chart" ; 2;> ;
- < "%PRODUCTNAME Calc" ; 8;> ;
- < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ;
- < "Other OLE Objects"; 128;> ;
+ < "%PRODUCTNAME Math" ; 1;> ;
+ < "%PRODUCTNAME Chart" ; 2;> ;
+ < "%PRODUCTNAME Calc" ; 8;> ;
+ < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ;
+ < "Other OLE Objects"; 128;> ;
};
};
};
@@ -1187,7 +1187,7 @@ ModalDialog DLG_ADD_IDX_STYLES
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
- String ST_HB_FIRST
+ String ST_HB_FIRST
{
Text [ en-US ] = "Not applied";
};
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 5884f12b67aa..66a407d1d895 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -2,7 +2,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
@@ -55,7 +55,7 @@
#include <wrtsh.hxx>
#include <view.hxx>
#include <multmrk.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <cmdid.h>
#include <index.hrc>
#include <idxmrk.hrc>
@@ -70,7 +70,7 @@
SFX_IMPL_CHILDWINDOW(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG)
-SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow,
+SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow,
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
@@ -81,7 +81,7 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow,
pAbstDlg = pFact->CreateIndexMarkFloatDlg( DLG_INSIDXMARK , pBindings, this, pParentWindow, pInfo );
OSL_ENSURE(pAbstDlg, "Dialogdiet fail!");
pWindow = pAbstDlg->GetWindow();
- pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg()
+ pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg()
// -> Show() will invoke StateChanged() and save pos
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
}
@@ -93,14 +93,14 @@ SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const
return aInfo;
}
-void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
+void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
{
pAbstDlg->ReInitDlg(rWrtShell);
}
SFX_IMPL_CHILDWINDOW(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG)
-SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow,
+SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow,
sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
@@ -121,7 +121,7 @@ SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const
return aInfo;
}
-void SwInsertAuthMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
+void SwInsertAuthMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
{
pAbstDlg->ReInitDlg(rWrtShell);
}
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc
index 859aeb25b3fa..263da88f935d 100644
--- a/sw/source/ui/index/idxmrk.hrc
+++ b/sw/source/ui/index/idxmrk.hrc
@@ -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
@@ -24,79 +24,79 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_NXT 102
-#define BT_NXTSAME 103
-#define BT_PREV 104
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_NXT 102
+#define BT_NXTSAME 103
+#define BT_PREV 104
#define BT_PREVSAME 105
-#define BT_DEL 106
-#define BT_HELP 107
-#define LBL_INDEX 1
-#define DCB_INDEX 2
-#define LBL_ENTRY 3
-#define SL_ENTRY 4
-#define LBL_KEY 5
-#define DCB_KEY 6
-#define LBL_LEVEL 7
-#define SL_LEVEL 8
+#define BT_DEL 106
+#define BT_HELP 107
+#define LBL_INDEX 1
+#define DCB_INDEX 2
+#define LBL_ENTRY 3
+#define SL_ENTRY 4
+#define LBL_KEY 5
+#define DCB_KEY 6
+#define LBL_LEVEL 7
+#define SL_LEVEL 8
#define FL_INDEX 10
-#define LBL_KEY2 11
-#define DCB_KEY2 12
+#define LBL_KEY2 11
+#define DCB_KEY2 12
#define CB_APPLY_TO_ALL 13
-#define CB_MAIN_ENTRY 14
-#define FT_ENTRY 20
-#define ED_ENTRY 21
-#define PB_OK 22
+#define CB_MAIN_ENTRY 14
+#define FT_ENTRY 20
+#define ED_ENTRY 21
+#define PB_OK 22
#define PB_CANCEL 23
-#define PB_HELP 24
+#define PB_HELP 24
#define FL_ENTRIES 25
#define PB_CREATEENTRY 26
#define FL_ENTRY 27
-#define FT_TITLE 28
+#define FT_TITLE 28
#define FI_TITLE 29
#define FT_AUTHOR 30
#define FI_AUTHOR 31
-#define ST_CHANGE 32
-#define WIN_DLG 33
-#define BT_NEW 34
+#define ST_CHANGE 32
+#define WIN_DLG 33
+#define BT_NEW 34
#define FL_NAME 37
#define FT_NAME 38
#define ED_NAME 39
-#define LB_ENTRY 40
-#define RB_FROMCOMPONENT 41
+#define LB_ENTRY 40
+#define RB_FROMCOMPONENT 41
#define RB_FROMDOCCONTENT 42
-#define PB_EDITENTRY 43
-#define CB_CASESENSITIVE 44
-#define CB_WORDONLY 45
-#define FT_PHONETIC_1 46
-#define FT_PHONETIC_2 47
-#define FT_PHONETIC_3 48
-#define ED_PHONETIC_1 48
-#define ED_PHONETIC_2 49
-#define ED_PHONETIC_3 50
+#define PB_EDITENTRY 43
+#define CB_CASESENSITIVE 44
+#define CB_WORDONLY 45
+#define FT_PHONETIC_1 46
+#define FT_PHONETIC_2 47
+#define FT_PHONETIC_3 48
+#define ED_PHONETIC_1 48
+#define ED_PHONETIC_2 49
+#define ED_PHONETIC_3 50
//------------------------------------------------------
// defines for positions and sizes for IDX_DIALOG_WINDOW
-#define IDX_COL1 12
-#define IDX_COL2 56
+#define IDX_COL1 12
+#define IDX_COL2 56
-#define IDX_COL2_FULLEND 150
-#define IDX_NEWIMAGE_WIDTH 12
-#define IDX_NEWIMAGE_XPOS (IDX_COL2_FULLEND-1-IDX_NEWIMAGE_WIDTH)
+#define IDX_COL2_FULLEND 150
+#define IDX_NEWIMAGE_WIDTH 12
+#define IDX_NEWIMAGE_XPOS (IDX_COL2_FULLEND-1-IDX_NEWIMAGE_WIDTH)
-#define IDX_PHONETIC_EDIT_WIDTH 62
-#define IDX_PHONETIC_TEXT_WIDTH 62
+#define IDX_PHONETIC_EDIT_WIDTH 62
+#define IDX_PHONETIC_TEXT_WIDTH 62
-#define IDX_COL_PHONETIC_TEXT (IDX_COL2+IDX_PHONETIC_EDIT_WIDTH+8)
-#define IDX_COL_PHONETIC_EDIT (IDX_COL_PHONETIC_TEXT+IDX_PHONETIC_TEXT_WIDTH+1)
+#define IDX_COL_PHONETIC_TEXT (IDX_COL2+IDX_PHONETIC_EDIT_WIDTH+8)
+#define IDX_COL_PHONETIC_EDIT (IDX_COL_PHONETIC_TEXT+IDX_PHONETIC_TEXT_WIDTH+1)
-#define IDX_COL_BUTTONS_NORMAL 162
-#define IDX_COL_BUTTONS_CJK (IDX_COL_PHONETIC_EDIT+IDX_PHONETIC_EDIT_WIDTH+14)
+#define IDX_COL_BUTTONS_NORMAL 162
+#define IDX_COL_BUTTONS_CJK (IDX_COL_PHONETIC_EDIT+IDX_PHONETIC_EDIT_WIDTH+14)
-#define IDX_WIN_WIDTH_NORMAL 218
-#define IDX_WIN_WIDTH_CJK (IDX_WIN_WIDTH_NORMAL+IDX_COL_BUTTONS_CJK-IDX_COL_BUTTONS_NORMAL)
+#define IDX_WIN_WIDTH_NORMAL 218
+#define IDX_WIN_WIDTH_CJK (IDX_WIN_WIDTH_NORMAL+IDX_COL_BUTTONS_CJK-IDX_COL_BUTTONS_NORMAL)
#define IDX_ROW_2_TEXT 31
#define IDX_ROW_2_LIST (IDX_ROW_2_TEXT-2)
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 483485bf1b4b..6a4ce1934d8b 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -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
@@ -31,11 +31,11 @@
#include "helpid.h"
#include "cmdid.h"
-#define IDX_PHONETIC_LISTBOX_DESCRIPTION \
-Text [ en-US ] = "Phonetic reading"; \
+#define IDX_PHONETIC_LISTBOX_DESCRIPTION \
+Text [ en-US ] = "Phonetic reading"; \
#define IDX_DIALOG_WINDOW \
- Window WIN_DLG \
+ Window WIN_DLG \
{ \
Pos = MAP_APPFONT ( 0 , 0 ) ; \
Size = MAP_APPFONT ( IDX_WIN_WIDTH , WINDOW_HEIGHT ) ; \
@@ -65,19 +65,19 @@ Text [ en-US ] = "Phonetic reading"; \
Text [ en-US ] = "~Delete" ; \
TabStop = TRUE ; \
}; \
- ListBox DCB_INDEX \
- { \
- Pos = MAP_APPFONT ( IDX_COL2 , 14) ; \
- Size = MAP_APPFONT ( DCB_INDEX_WIDTH , 56 ) ; \
- TabStop = TRUE ; \
- DropDown = TRUE ; \
- }; \
- ImageButton BT_NEW \
- { \
+ ListBox DCB_INDEX \
+ { \
+ Pos = MAP_APPFONT ( IDX_COL2 , 14) ; \
+ Size = MAP_APPFONT ( DCB_INDEX_WIDTH , 56 ) ; \
+ TabStop = TRUE ; \
+ DropDown = TRUE ; \
+ }; \
+ ImageButton BT_NEW \
+ { \
Pos = MAP_APPFONT ( IDX_NEWIMAGE_XPOS , 13 ) ; \
Size = MAP_APPFONT ( IDX_NEWIMAGE_WIDTH , 15 ) ; \
QuickHelpText [ en-US ] = "New User-defined Index";\
- }; \
+ }; \
ImageButton BT_PREVSAME \
{ \
Hide = TRUE ; \
@@ -169,55 +169,55 @@ Text [ en-US ] = "Phonetic reading"; \
Size = MAP_APPFONT ( LIST_WIDTH , 56 ) ; \
TabStop = TRUE ; \
DropDown = TRUE ; \
- }; \
- FixedText FT_PHONETIC_1 \
- { \
+ }; \
+ FixedText FT_PHONETIC_1 \
+ { \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_2_TEXT ) ; \
Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \
- Hide = PHONETIC_HIDDEN; \
- IDX_PHONETIC_LISTBOX_DESCRIPTION \
- }; \
- Edit ED_PHONETIC_1 \
- { \
+ Hide = PHONETIC_HIDDEN; \
+ IDX_PHONETIC_LISTBOX_DESCRIPTION \
+ }; \
+ Edit ED_PHONETIC_1 \
+ { \
Border = TRUE ; \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_2_LIST ) ; \
- Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
- Hide = PHONETIC_HIDDEN; \
- TabStop = TRUE ; \
+ Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
+ Hide = PHONETIC_HIDDEN; \
+ TabStop = TRUE ; \
Left = TRUE ; \
- }; \
- FixedText FT_PHONETIC_2 \
- { \
+ }; \
+ FixedText FT_PHONETIC_2 \
+ { \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_3_TEXT ) ; \
Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \
- Hide = PHONETIC_HIDDEN; \
- IDX_PHONETIC_LISTBOX_DESCRIPTION \
- }; \
- Edit ED_PHONETIC_2 \
- { \
+ Hide = PHONETIC_HIDDEN; \
+ IDX_PHONETIC_LISTBOX_DESCRIPTION \
+ }; \
+ Edit ED_PHONETIC_2 \
+ { \
Border = TRUE ; \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_3_LIST ) ; \
- Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
- Hide = PHONETIC_HIDDEN; \
- TabStop = TRUE ; \
+ Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
+ Hide = PHONETIC_HIDDEN; \
+ TabStop = TRUE ; \
Left = TRUE ; \
- }; \
- FixedText FT_PHONETIC_3 \
- { \
+ }; \
+ FixedText FT_PHONETIC_3 \
+ { \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_TEXT , IDX_ROW_4_TEXT ) ; \
Size = MAP_APPFONT ( IDX_PHONETIC_TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; \
Hide = PHONETIC_HIDDEN; \
- IDX_PHONETIC_LISTBOX_DESCRIPTION \
- }; \
- Edit ED_PHONETIC_3 \
- { \
+ IDX_PHONETIC_LISTBOX_DESCRIPTION \
+ }; \
+ Edit ED_PHONETIC_3 \
+ { \
Border = TRUE ; \
Pos = MAP_APPFONT ( IDX_COL_PHONETIC_EDIT , IDX_ROW_4_LIST ) ; \
- Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
- Hide = PHONETIC_HIDDEN; \
- TabStop = TRUE ; \
+ Size = MAP_APPFONT ( IDX_PHONETIC_EDIT_WIDTH , 12 ) ; \
+ Hide = PHONETIC_HIDDEN; \
+ TabStop = TRUE ; \
Left = TRUE ; \
- }; \
+ }; \
FixedText LBL_LEVEL \
{ \
Pos = MAP_APPFONT ( IDX_COL1 , 76 ) ; \
@@ -241,7 +241,7 @@ Text [ en-US ] = "Phonetic reading"; \
SpinSize = 1 ; \
}; \
CheckBox CB_MAIN_ENTRY \
- { \
+ { \
Pos = MAP_APPFONT ( IDX_COL1 , 76 ) ; \
Size = MAP_APPFONT ( 100 , 8 ) ; \
Text [ en-US ] = "~Main entry";\
@@ -277,15 +277,15 @@ ModalDialog DLG_EDIT_IDXMARK
Sizeable = FALSE ;
HelpID = FN_EDIT_IDX_ENTRY_DLG;
SVLook = TRUE ;
- #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL
+ #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL
Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ;
#define GB_HEIGHT 109
#define DCB_INDEX_WIDTH 94
#define PHONETIC_HIDDEN TRUE
- #define LIST_WIDTH 94
- #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL
- #define COL_BUTTONS_2 (COL_BUTTONS+26)
- #define WINDOW_HEIGHT 118
+ #define LIST_WIDTH 94
+ #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL
+ #define COL_BUTTONS_2 (COL_BUTTONS+26)
+ #define WINDOW_HEIGHT 118
IDX_DIALOG_WINDOW
};
ModalDialog DLG_EDIT_IDXMARK_CJK
@@ -301,10 +301,10 @@ ModalDialog DLG_EDIT_IDXMARK_CJK
#define GB_HEIGHT 109
#define DCB_INDEX_WIDTH 94
#define PHONETIC_HIDDEN FALSE
- #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH
- #define COL_BUTTONS IDX_COL_BUTTONS_CJK
- #define COL_BUTTONS_2 (COL_BUTTONS+26)
- #define WINDOW_HEIGHT 118
+ #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH
+ #define COL_BUTTONS IDX_COL_BUTTONS_CJK
+ #define COL_BUTTONS_2 (COL_BUTTONS+26)
+ #define WINDOW_HEIGHT 118
IDX_DIALOG_WINDOW
};
ModelessDialog DLG_INSIDXMARK
@@ -314,19 +314,19 @@ ModelessDialog DLG_INSIDXMARK
Closeable = TRUE;
Sizeable = FALSE ;
Hide = TRUE ;
-// Zoomable = TRUE ;
+// Zoomable = TRUE ;
HelpID = FN_INSERT_IDX_ENTRY_DLG;
SVLook = TRUE ;
- #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL
+ #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL
Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ;
-// Moveable = TRUE ;
+// Moveable = TRUE ;
#define GB_HEIGHT 129
#define DCB_INDEX_WIDTH 79
#define PHONETIC_HIDDEN TRUE
- #define LIST_WIDTH 94
- #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL
- #define COL_BUTTONS_2 (COL_BUTTONS+26)
- #define WINDOW_HEIGHT 138
+ #define LIST_WIDTH 94
+ #define COL_BUTTONS IDX_COL_BUTTONS_NORMAL
+ #define COL_BUTTONS_2 (COL_BUTTONS+26)
+ #define WINDOW_HEIGHT 138
IDX_DIALOG_WINDOW
};
ModelessDialog DLG_INSIDXMARK_CJK
@@ -335,19 +335,19 @@ ModelessDialog DLG_INSIDXMARK_CJK
Moveable = TRUE ;
Closeable = TRUE;
Sizeable = FALSE ;
-// Zoomable = TRUE ;
+// Zoomable = TRUE ;
HelpID = FN_INSERT_IDX_ENTRY_DLG;
SVLook = TRUE ;
#define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK
Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ;
-// Moveable = TRUE ;
+// Moveable = TRUE ;
#define GB_HEIGHT 129
#define DCB_INDEX_WIDTH 79
#define PHONETIC_HIDDEN FALSE
- #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH
- #define COL_BUTTONS IDX_COL_BUTTONS_CJK
- #define COL_BUTTONS_2 (COL_BUTTONS+26)
- #define WINDOW_HEIGHT 138
+ #define LIST_WIDTH IDX_PHONETIC_EDIT_WIDTH
+ #define COL_BUTTONS IDX_COL_BUTTONS_CJK
+ #define COL_BUTTONS_2 (COL_BUTTONS+26)
+ #define WINDOW_HEIGHT 138
IDX_DIALOG_WINDOW
};
ModalDialog DLG_NEW_USER_IDX
@@ -411,30 +411,30 @@ String STR_IDXMRK_INSERT
Text [ en-US ] = "Insert Index Entry" ;
};
-#define AUTH_DIALOG_WINDOW \
- Window WIN_DLG \
+#define AUTH_DIALOG_WINDOW \
+ Window WIN_DLG \
{ \
- Pos = MAP_APPFONT ( 0 , 0 ) ; \
+ Pos = MAP_APPFONT ( 0 , 0 ) ; \
Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ; \
- RadioButton RB_FROMCOMPONENT \
+ RadioButton RB_FROMCOMPONENT \
{ \
- Pos = MAP_APPFONT ( 12 , 14 ) ; \
- Size = MAP_APPFONT ( 147 , 12 ) ; \
+ Pos = MAP_APPFONT ( 12 , 14 ) ; \
+ Size = MAP_APPFONT ( 147 , 12 ) ; \
Text [ en-US ] = "From bibliography ~database";\
- }; \
+ }; \
RadioButton RB_FROMDOCCONTENT \
{ \
- Pos = MAP_APPFONT ( 12, 29 ) ; \
+ Pos = MAP_APPFONT ( 12, 29 ) ; \
Size = MAP_APPFONT ( 147 , 12 ) ; \
Text [ en-US ] = "~From document content";\
- }; \
+ }; \
FixedText FT_AUTHOR \
{ \
Pos = MAP_APPFONT ( 12 , 14 + RADIO_BUTTON_HEIGHT) ; \
Size = MAP_APPFONT ( 60 , 8 ) ; \
Text [ en-US ] = "Author";\
}; \
- FixedText FI_AUTHOR \
+ FixedText FI_AUTHOR \
{ \
Pos = MAP_APPFONT ( 12 , 25 + RADIO_BUTTON_HEIGHT) ; \
Size = MAP_APPFONT ( 140, 8 ) ; \
@@ -446,7 +446,7 @@ String STR_IDXMRK_INSERT
Size = MAP_APPFONT ( 60 , 8 ) ; \
Text [ en-US ] = "Title";\
}; \
- FixedText FI_TITLE \
+ FixedText FI_TITLE \
{ \
Pos = MAP_APPFONT ( 12 , 48 + RADIO_BUTTON_HEIGHT) ; \
Size = MAP_APPFONT ( 140, 8 ) ; \
@@ -535,12 +535,12 @@ ModelessDialog DLG_INSAUTHMARK
Moveable = TRUE ;
Closeable = TRUE ;
Sizeable = FALSE ;
-// Zoomable = TRUE ;
+// Zoomable = TRUE ;
HelpID = FN_INSERT_AUTH_ENTRY_DLG;
SVLook = TRUE ;
#define RADIO_BUTTON_HEIGHT 30
Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ;
-// Moveable = TRUE ;
+// Moveable = TRUE ;
AUTH_DIALOG_WINDOW
};
ModalDialog DLG_CREATE_AUTH_ENTRY
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 979ab2a4b9f9..9b9e1513605d 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -2,7 +2,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
@@ -49,9 +49,9 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr& rTOXMgr ) :
SvxStandardDialog(pParent, SW_RES(DLG_MULTMRK)),
aTOXFL(this, SW_RES(FL_TOX)),
- aEntryFT(this, SW_RES(FT_ENTRY)),
- aTextFT(this, SW_RES(FT_TEXT)),
- aTOXFT(this, SW_RES(FT_TOX)),
+ aEntryFT(this, SW_RES(FT_ENTRY)),
+ aTextFT(this, SW_RES(FT_TEXT)),
+ aTOXFT(this, SW_RES(FT_TOX)),
aTOXLB(this, SW_RES(LB_TOX)),
aOkBT(this, SW_RES(OK_BT)),
aCancelBT(this, SW_RES(CANCEL_BT)),
@@ -74,7 +74,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr& rTOXMgr ) :
IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
{
if(pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- { SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos());
+ { SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos());
aTextFT.SetText(pMark->GetTOXType()->GetTypeName());
nPos = pBox->GetSelectEntryPos();
}
diff --git a/sw/source/ui/index/multmrk.hrc b/sw/source/ui/index/multmrk.hrc
index 8a24f9c0336d..d46f37359852 100644
--- a/sw/source/ui/index/multmrk.hrc
+++ b/sw/source/ui/index/multmrk.hrc
@@ -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
@@ -24,11 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define FT_ENTRY 1
-#define FT_TOX 2
-#define OK_BT 3
-#define LB_TOX 4
+#define FT_ENTRY 1
+#define FT_TOX 2
+#define OK_BT 3
+#define LB_TOX 4
#define FT_TEXT 5
#define FL_TOX 6
-#define CANCEL_BT 7
+#define CANCEL_BT 7
diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src
index be7b47d836d4..83db407d1a3f 100644
--- a/sw/source/ui/index/multmrk.src
+++ b/sw/source/ui/index/multmrk.src
@@ -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
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index a49272f481bf..1ec95e7aea8c 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@
#include <wrtsh.hxx>
#include <view.hxx>
#include <multmrk.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <cmdid.h>
#include <index.hrc>
#include <idxmrk.hrc>
@@ -97,7 +97,7 @@ using namespace ::comphelper;
using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Dialog zum Einfuegen einer Verzeichnismarkierung
+ Beschreibung: Dialog zum Einfuegen einer Verzeichnismarkierung
--------------------------------------------------------------------*/
SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
sal_Bool bNewDlg,
@@ -106,7 +106,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
Window(pParent, rResId),
aTypeFT (this, SW_RES(LBL_INDEX )),
aTypeDCB(this, SW_RES(DCB_INDEX )),
- aNewBT(this, SW_RES(BT_NEW )),
+ aNewBT(this, SW_RES(BT_NEW )),
aEntryFT(this, SW_RES(LBL_ENTRY )),
aEntryED(this, SW_RES(SL_ENTRY )),
@@ -168,43 +168,43 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
SetStyle(GetStyle()|WB_DIALOGCONTROL);
FreeResource();
- aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK );
- aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE );
- aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE );
- aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW );
- aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV );
- aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME );
- aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT );
- aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME );
- aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE );
- aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY );
- aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY );
- aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY );
- aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL );
- aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY);
- aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL );
- aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
- aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
- aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
-
- aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE );
- aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY );
+ aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK );
+ aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE );
+ aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE );
+ aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW );
+ aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV );
+ aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME );
+ aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT );
+ aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME );
+ aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE );
+ aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY );
+ aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY );
+ aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY );
+ aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL );
+ aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY);
+ aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL );
+ aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
+ aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
+ aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING );
+
+ aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE );
+ aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY );
GetParent()->SetText( SW_RESSTR( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT));
- aDelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, DelHdl));
- aPrevBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevHdl));
- aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevSameHdl));
- aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextHdl));
- aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextSameHdl));
- //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
- aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
- aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
- aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
- aOKBT.SetClickHdl(LINK(this,SwIndexMarkDlg, InsertHdl));
- aCancelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, CloseHdl));
- aEntryED.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
+ aDelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, DelHdl));
+ aPrevBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevHdl));
+ aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevSameHdl));
+ aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextHdl));
+ aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextSameHdl));
+ //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
+ aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
+ aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
+ aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
+ aOKBT.SetClickHdl(LINK(this,SwIndexMarkDlg, InsertHdl));
+ aCancelBT.SetClickHdl(LINK(this,SwIndexMarkDlg, CloseHdl));
+ aEntryED.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
aNewBT.SetClickHdl(LINK(this, SwIndexMarkDlg, NewUserIdxHdl));
aApplyToAllCB.SetClickHdl(LINK(this, SwIndexMarkDlg, SearchTypeHdl));
aPhoneticED0.SetModifyHdl(LINK(this,SwIndexMarkDlg, PhoneticEDModifyHdl));
@@ -236,7 +236,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
}
/*--------------------------------------------------------------------
- Beschreibung: Controls neu initialisieren mit der aktuellen
+ Beschreibung: Controls neu initialisieren mit der aktuellen
Markierung
--------------------------------------------------------------------*/
void SwIndexMarkDlg::InitControls()
@@ -326,7 +326,7 @@ void SwIndexMarkDlg::InitControls()
UpdateDialog();
}
else
- { // aktuelle Selektion (1.Element) anzeigen ????
+ { // aktuelle Selektion (1.Element) anzeigen ????
sal_uInt16 nCnt = pSh->GetCrsrCnt();
if (nCnt < 2)
{
@@ -346,7 +346,7 @@ void SwIndexMarkDlg::InitControls()
}
// Verzeichnistyp ist default
- if( sTmpTypeSelection.Len() &&
+ if( sTmpTypeSelection.Len() &&
LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos( sTmpTypeSelection ) )
aTypeDCB.SelectEntry(sTmpTypeSelection);
else
@@ -355,7 +355,7 @@ void SwIndexMarkDlg::InitControls()
}
}
-void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
+void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
{
//no phonetic reading if no global cjk support
if( !xExtendedIndexEntrySupplier.is() )
@@ -411,7 +411,7 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
*/
}
-String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText )
+String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText )
{
if( !bIsPhoneticReadingEnabled )
return aEmptyStr;
@@ -423,7 +423,7 @@ String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText )
/* -----------------07.09.99 10:43-------------------
Change the content of aEntryED if text is selected
--------------------------------------------------*/
-void SwIndexMarkDlg::Activate()
+void SwIndexMarkDlg::Activate()
{
// aktuelle Selektion (1.Element) anzeigen ????
if(bNewMark)
@@ -450,7 +450,7 @@ void SwIndexMarkDlg::Activate()
}
/*--------------------------------------------------------------------
- Beschreibung: Ok-Button auswerten
+ Beschreibung: Ok-Button auswerten
--------------------------------------------------------------------*/
void SwIndexMarkDlg::Apply()
{
@@ -499,7 +499,7 @@ void SwIndexMarkDlg::InsertUpdate()
}
/*--------------------------------------------------------------------
- Beschreibung: Marke einfuegen
+ Beschreibung: Marke einfuegen
--------------------------------------------------------------------*/
static void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive)
{
@@ -537,7 +537,7 @@ void SwIndexMarkDlg::InsertMark()
switch(nPos)
{
case POS_CONTENT : break;
- case POS_INDEX: // Stichwortverzeichnismarke
+ case POS_INDEX: // Stichwortverzeichnismarke
{
UpdateKeyBoxes();
String aPrim(aKeyDCB.GetText());
@@ -579,11 +579,11 @@ void SwIndexMarkDlg::InsertMark()
}
/*--------------------------------------------------------------------
- Beschreibung: Marke Updaten
+ Beschreibung: Marke Updaten
--------------------------------------------------------------------*/
void SwIndexMarkDlg::UpdateMark()
{
- String aAltText(aEntryED.GetText());
+ String aAltText(aEntryED.GetText());
String* pAltText = aOrgStr != aEntryED.GetText() ? &aAltText : 0;
//empty alternative texts are not allowed
if(pAltText && !pAltText->Len())
@@ -629,7 +629,7 @@ void SwIndexMarkDlg::UpdateKeyBoxes()
sal_uInt16 nPos = aKeyDCB.GetEntryPos(aKey);
if(nPos == LISTBOX_ENTRY_NOTFOUND && aKey.Len() > 0)
- { // neuen Key erzeugen
+ { // neuen Key erzeugen
aKeyDCB.InsertEntry(aKey);
}
@@ -637,21 +637,21 @@ void SwIndexMarkDlg::UpdateKeyBoxes()
nPos = aKey2DCB.GetEntryPos(aKey);
if(nPos == LISTBOX_ENTRY_NOTFOUND && aKey.Len() > 0)
- { // neuen Key erzeugen
+ { // neuen Key erzeugen
aKey2DCB.InsertEntry(aKey);
}
}
class SwNewUserIdxDlg : public ModalDialog
{
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
+ OKButton aOKPB;
+ CancelButton aCancelPB;
+ HelpButton aHelpPB;
FixedLine aNameFL;
- FixedText aNameFT;
- Edit aNameED;
+ FixedText aNameFT;
+ Edit aNameED;
- SwIndexMarkDlg* pDlg;
+ SwIndexMarkDlg* pDlg;
DECL_LINK( ModifyHdl, Edit*);
@@ -672,8 +672,8 @@ class SwNewUserIdxDlg : public ModalDialog
aNameED.GrabFocus();
}
- virtual void Apply();
- String GetName(){return aNameED.GetText();}
+ virtual void Apply();
+ String GetName(){return aNameED.GetText();}
};
void SwNewUserIdxDlg::Apply()
{
@@ -731,7 +731,7 @@ IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen
+ Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen
--------------------------------------------------------------------*/
IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox )
{
@@ -740,12 +740,12 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox )
// Verzeichnistyp setzen
sal_uInt16 nPos = aTypeDCB.GetEntryPos(aTypeDCB.GetSelectEntry());
sal_Bool bLevelEnable = sal_False,
- bKeyEnable = sal_False,
- bSetKey2 = sal_False,
+ bKeyEnable = sal_False,
+ bSetKey2 = sal_False,
bKey2Enable = sal_False,
- bEntryHasText = sal_False,
- bKey1HasText = sal_False,
- bKey2HasText = sal_False;
+ bEntryHasText = sal_False,
+ bKey1HasText = sal_False,
+ bKey2HasText = sal_False;
if(nPos == POS_INDEX)
{
if(aEntryED.GetText().Len())
@@ -881,9 +881,9 @@ void SwIndexMarkDlg::UpdateDialog()
sal_Bool bLevelEnable = sal_True,
bKeyEnable = sal_False,
bKey2Enable = sal_False,
- bEntryHasText = sal_False,
- bKey1HasText = sal_False,
- bKey2HasText = sal_False;
+ bEntryHasText = sal_False,
+ bKey1HasText = sal_False,
+ bKey2HasText = sal_False;
TOXTypes eCurType = pMark->GetTOXType()->GetType();
if(TOX_INDEX == eCurType)
@@ -1032,8 +1032,8 @@ IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox )
aPhoneticED2.SetText(GetDefaultPhoneticReading(pBox->GetText()));
}
}
- sal_Bool bKey1HasText = (0 != aKeyDCB.GetText().Len());
- sal_Bool bKey2HasText = (0 != aKey2DCB.GetText().Len());
+ sal_Bool bKey1HasText = (0 != aKeyDCB.GetText().Len());
+ sal_Bool bKey2HasText = (0 != aKey2DCB.GetText().Len());
aPhoneticFT1.Enable(bKey1HasText&&bIsPhoneticReadingEnabled);
aPhoneticED1.Enable(bKey1HasText&bIsPhoneticReadingEnabled);
@@ -1082,7 +1082,7 @@ SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled(
Initialize(pInfo);
}
-void SwIndexMarkFloatDlg::Activate()
+void SwIndexMarkFloatDlg::Activate()
{
SfxModelessDialog::Activate();
aDlg.Activate();
@@ -1101,7 +1101,7 @@ SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_ID
aDlg.ReInitDlg(rSh, pCurTOXMark);
}
-void SwIndexMarkModalDlg::Apply()
+void SwIndexMarkModalDlg::Apply()
{
aDlg.Apply();
}
@@ -1110,21 +1110,21 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog
{
FixedLine aEntriesFL;
- FixedText* pFixedTexts[AUTH_FIELD_END];
- ListBox* pTypeListBox;
- ComboBox* pIdentifierBox;
- Edit* pEdits[AUTH_FIELD_END];
+ FixedText* pFixedTexts[AUTH_FIELD_END];
+ ListBox* pTypeListBox;
+ ComboBox* pIdentifierBox;
+ Edit* pEdits[AUTH_FIELD_END];
OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
- Link aShortNameCheckLink;
+ Link aShortNameCheckLink;
- SwWrtShell& rWrtSh;
+ SwWrtShell& rWrtSh;
- sal_Bool m_bNewEntryMode;
- sal_Bool m_bNameAllowed;
+ sal_Bool m_bNewEntryMode;
+ sal_Bool m_bNameAllowed;
DECL_LINK(IdentifierHdl, ComboBox*);
DECL_LINK(ShortNameHdl, Edit*);
@@ -1138,9 +1138,9 @@ public:
sal_Bool bCreate);
~SwCreateAuthEntryDlg_Impl();
- String GetEntryText(ToxAuthorityField eField) const;
+ String GetEntryText(ToxAuthorityField eField) const;
- void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;}
+ void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;}
};
@@ -1229,11 +1229,11 @@ SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent,
aFromComponentRB.Check(bIsFromComponent);
aFromDocContentRB.Check(!bIsFromComponent);
- aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK );
- aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE);
- aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY );
- aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY );
- aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY );
+ aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK );
+ aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE);
+ aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY );
+ aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY );
+ aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY );
aOKBT.SetClickHdl(LINK(this,SwAuthMarkDlg, InsertHdl));
aCancelBT.SetClickHdl(LINK(this,SwAuthMarkDlg, CloseHdl));
@@ -1261,7 +1261,7 @@ SwAuthMarkDlg::~SwAuthMarkDlg()
{
}
-void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell)
+void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell)
{
pSh = &rWrtShell;
InitControls();
@@ -1329,7 +1329,7 @@ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox)
{
const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
- const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0;
+ const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0;
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = pEntry ?
pEntry->GetAuthorField((ToxAuthorityField)i) : aEmptyStr;
@@ -1356,7 +1356,7 @@ IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG )
//check if the entry already exists with different content
const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
- const SwAuthEntry* pEntry = pFType ?
+ const SwAuthEntry* pEntry = pFType ?
pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER])
: 0;
if(pEntry)
@@ -1497,7 +1497,7 @@ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton)
if(pFType)
{
SvStringsDtor aIds;
- pFType->GetAllEntryIdentifiers( aIds );
+ pFType->GetAllEntryIdentifiers( aIds );
for(sal_uInt16 n = 0; n < aIds.Count(); n++)
aEntryLB.InsertEntry(*aIds.GetObject(n));
}
@@ -1676,7 +1676,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
if(pFType)
{
SvStringsDtor aIds;
- pFType->GetAllEntryIdentifiers( aIds );
+ pFType->GetAllEntryIdentifiers( aIds );
for(sal_uInt16 n = 0; n < aIds.Count(); n++)
pIdentifierBox->InsertEntry(*aIds.GetObject(n));
}
@@ -1744,7 +1744,7 @@ SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl()
delete pIdentifierBox;
}
-String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const
+String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const
{
String sRet;
if( AUTH_FIELD_AUTHORITY_TYPE == eField )
@@ -1830,7 +1830,7 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
aDlg.ReInitDlg(*pWrtShell);
}
-void SwAuthMarkFloatDlg::Activate()
+void SwAuthMarkFloatDlg::Activate()
{
SfxModelessDialog::Activate();
aDlg.Activate();
@@ -1849,7 +1849,7 @@ SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) :
aDlg.ReInitDlg(rSh);
}
-void SwAuthMarkModalDlg::Apply()
+void SwAuthMarkModalDlg::Apply()
{
aDlg.InsertHdl(0);
}
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index 642bdad7e5a2..4d45c1913005 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -2,7 +2,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
@@ -85,7 +85,7 @@ void SwTOXMgr::DeleteTOXMark()
pCurTOXMark = pNext;
}
-void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc)
+void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc)
{
SwTOXMark* pMark = 0;
switch(rDesc.GetTOXType())
@@ -197,7 +197,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
if(rDesc.GetAltStr())
{
// JP 26.08.96: Bug 30344 - entweder der Text aus dem Doc oder
- // ein Alternativ-Text, beides gibts nicht!
+ // ein Alternativ-Text, beides gibts nicht!
BOOL bReplace = pCurTOXMark->IsAlternativeText();
if( bReplace )
pCurTOXMark->SetAlternativeText( *rDesc.GetAltStr() );
@@ -224,7 +224,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
/*--------------------------------------------------------------------
- Beschreibung: UserTypeID ermitteln
+ Beschreibung: UserTypeID ermitteln
--------------------------------------------------------------------*/
@@ -339,9 +339,9 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
USHORT nPos = 0;
USHORT nSize = pSh->GetTOXTypeCount(eCurTOXType);
for(USHORT i=0; rDesc.GetTOUName() && i < nSize; ++i)
- { const SwTOXType* pType = pSh->GetTOXType(TOX_USER, i);
+ { const SwTOXType* pType = pSh->GetTOXType(TOX_USER, i);
if(pType->GetTypeName() == *rDesc.GetTOUName())
- { nPos = i;
+ { nPos = i;
break;
}
}
@@ -400,7 +400,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
pSh->DelRight();
pNewTOX = (SwTOXBase*)pCurTOX;
}
-// pTOX->SetOptions(rDesc.GetIndexOptions());
+// pTOX->SetOptions(rDesc.GetIndexOptions());
pNewTOX->SetFromObjectNames(rDesc.IsCreateFromObjectNames());
pNewTOX->SetOLEOptions(rDesc.GetOLEOptions());
}
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 887405d2c5fb..775651c8329e 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@
#include <doc.hxx>
#include <docsh.hxx>
#include <txatritr.hxx>
-#include <mdiexp.hxx> // Progress
+#include <mdiexp.hxx> // Progress
#include <edtwin.hxx>
#include <crsskip.hxx>
#include <index.hxx>
@@ -544,7 +544,7 @@ void SwHHCWrapper::ReplaceUnit(
if (pNewUnitLanguage)
{
//OSL_ENSURE(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ),
- // "similar language should not be changed!");
+ // "similar language should not be changed!");
aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) );
}
@@ -595,7 +595,7 @@ void SwHHCWrapper::Convert()
pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent,
pEndPos->nNode.GetNode().GetTxtNode(), pEndPos->nContent );
}
- else // we are not in the text (maybe a graphic or OLE object is selected) let's start from the top
+ else // we are not in the text (maybe a graphic or OLE object is selected) let's start from the top
{
// get PaM that points to the start of the document
SwNode& rNode = pView->GetDocShell()->GetDoc()->GetNodes().GetEndOfContent();
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index d066fff361a9..ea0d7e143334 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -2,7 +2,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
@@ -49,8 +49,8 @@
#include <unomid.h>
-#define HYPHHERE '-'
-#define PSH (&pView->GetWrtShell())
+#define HYPHHERE '-'
+#define PSH (&pView->GetWrtShell())
using namespace ::com::sun::star;
using ::rtl::OUString;
@@ -157,7 +157,7 @@ sal_Bool SwHyphWrapper::SpellMore()
void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos )
{
if( nPos)
- PSH->InsertSoftHyph( nPos + 1); // does nPos == 1 really mean
+ PSH->InsertSoftHyph( nPos + 1); // does nPos == 1 really mean
// insert hyphen after first char?
// (instead of nPos == 0)
else
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 65f7abf985fe..52d469bd3779 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -2,7 +2,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
@@ -128,7 +128,7 @@ LanguageType lcl_CheckLanguage(
sal_Bool bIsParaText )
{
LanguageType nLang = LANGUAGE_NONE;
- if (bIsParaText) // check longer texts with language-guessing...
+ if (bIsParaText) // check longer texts with language-guessing...
{
if (!xLangGuess.is())
return nLang;
@@ -153,7 +153,7 @@ LanguageType lcl_CheckLanguage(
if (nLang == LANGUAGE_DONTKNOW)
nLang = LANGUAGE_NONE;
}
- else // check single word
+ else // check single word
{
if (!xSpell.is())
return nLang;
@@ -226,7 +226,7 @@ void SwSpellPopup::fillLangPopupMenu(
return;
SvtLanguageTable aLanguageTable;
-
+
// set of languages to be displayed in the sub menus
std::set< OUString > aLangItems;
@@ -442,7 +442,7 @@ bGrammarResults(false)
pMenu->InsertItem( nAutoCorrItemId, aEntry );
pMenu->SetHelpId( nAutoCorrItemId, HID_LINGU_AUTOCORR);
-
+
++nAutoCorrItemId;
++nItemId;
}
@@ -575,7 +575,7 @@ bGrammarResults(false)
SetItemImage( MN_SPELLING_DLG, rImg );
//////////////////////////////////////////////////////////////////////////////////
-
+
RemoveDisabledEntries( TRUE, TRUE );
}
@@ -731,7 +731,7 @@ void SwSpellPopup::Execute( USHORT nId )
return;
if (/*bGrammarResults && */nId == MN_SHORT_COMMENT)
- return; // nothing to do since it is the error message (short comment)
+ return; // nothing to do since it is the error message (short comment)
if ((MN_SUGGESTION_START <= nId && nId <= MN_SUGGESTION_END) ||
(MN_AUTOCORR_START <= nId && nId <= MN_AUTOCORR_END))
@@ -772,7 +772,7 @@ void SwSpellPopup::Execute( USHORT nId )
pSh->DelLeft();
pSh->Insert( aTmp );
-
+
/* #102505# EndAction/EndUndo moved down since insertion
of temporary auto correction is now undoable two and
must reside in the same undo group.*/
@@ -809,24 +809,24 @@ void SwSpellPopup::Execute( USHORT nId )
pSh->GetView().GetViewFrame()->GetDispatcher()->
Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON );
}
- }
+ }
else if (nId == MN_IGNORE_SELECTION)
{
SwPaM *pPaM = pSh->GetCrsr();
if (pPaM)
pSh->IgnoreGrammarErrorAt( *pPaM );
- }
+ }
else if (nId == MN_IGNORE_WORD)
{
uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY );
linguistic::AddEntryToDic( xDictionary,
xSpellAlt->getWord(), sal_False, aEmptyStr, LANGUAGE_NONE );
- }
+ }
else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END)
{
OUString aWord( xSpellAlt->getWord() );
// OSL_ENSURE( nDicIdx < aDics.getLength(), "dictionary index out of range" );
-
+
PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC);
String aDicName ( pMenu->GetItemText(nId) );
@@ -851,18 +851,18 @@ void SwSpellPopup::Execute( USHORT nId )
nAddRes );
}
}
- }
- else
+ }
+ else
{
// Set language for selection or for paragraph...
-
+
SfxItemSet aCoreSet( pSh->GetView().GetPool(),
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE,
RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
0 );
String aNewLangTxt;
-
+
if (MN_SET_LANGUAGE_SELECTION_START <= nId && nId <= MN_SET_LANGUAGE_SELECTION_END)
{
//Set language for current selection
@@ -917,7 +917,7 @@ void SwSpellPopup::Execute( USHORT nId )
lcl_CharDialog( *pSh, true, nId, 0, 0 );
pSh->Pop( FALSE ); // restore cursor
}
- }
+ }
pSh->EnterStdMode();
}
diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/ui/lingu/olmenu.hrc
index 887f8a2ad3af..6afce9516bfd 100644
--- a/sw/source/ui/lingu/olmenu.hrc
+++ b/sw/source/ui/lingu/olmenu.hrc
@@ -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
diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src
index b8d9124d2e52..9173509a69f6 100644
--- a/sw/source/ui/lingu/olmenu.src
+++ b/sw/source/ui/lingu/olmenu.src
@@ -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
@@ -113,25 +113,25 @@ String STR_HYP_OK
};
String STR_LANGSTATUS_NONE
{
- Text [ en-US ] = "None (Do not check spelling)" ;
+ Text [ en-US ] = "None (Do not check spelling)" ;
};
String STR_RESET_TO_DEFAULT_LANGUAGE
{
- Text [ en-US ] = "Reset to Default Language" ;
- Text [ x-comment ] = " ";
+ Text [ en-US ] = "Reset to Default Language" ;
+ Text [ x-comment ] = " ";
};
String STR_LANGSTATUS_MORE
{
- Text [ en-US ] = "More..." ;
+ Text [ en-US ] = "More..." ;
};
String STR_IGNORE_SELECTION
{
- Text [ en-US ] = "Ignore" ;
+ Text [ en-US ] = "Ignore" ;
};
Image IMG_INFO_16
{
ImageBitmap = Bitmap { File = "info_16.png" ; };
MASKCOLOR
-};
+};
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index a724f4d5cff4..95d886343422 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@
#include <docsh.hxx> // " " "
#include <wrtsh.hxx> // MakeVisible
#include <view.hxx>
-#include <dcontact.hxx> // Spelling von DrawObj
+#include <dcontact.hxx> // Spelling von DrawObj
#include <doc.hxx> // " " "
#include <docary.hxx>
#include <edtwin.hxx>
@@ -89,7 +89,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw,
pOutlView->GetOutliner()->SetRefDevice(pView->GetWrtShell().getIDocumentDeviceAccess()->getPrinter( false ));
// Hack: Es sollten alle SdrTextObj-Attribute an die EditEngine
- // uebertragen werden.
+ // uebertragen werden.
pOutlView->SetBackgroundColor( Color( COL_WHITE ) );
@@ -97,7 +97,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw,
Point aPoint( 0, 0 );
Rectangle aRect( aPoint, aSize );
pOutlView->SetOutputArea( aRect );
-// SetText( NULL );
+// SetText( NULL );
ClearModifyFlag();
}
@@ -110,9 +110,9 @@ SdrHHCWrapper::~SdrHHCWrapper()
pSdrView->SdrEndTextEdit( sal_True );
SetUpdateMode(sal_False);
pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
-// SetPaperSize( Size(1, 1) );
-// SetText(NULL);
-// pTextObj = NULL;
+// SetPaperSize( Size(1, 1) );
+// SetText(NULL);
+// pTextObj = NULL;
}
RemoveView( pOutlView );
delete pOutlView;
@@ -212,7 +212,7 @@ sal_Bool SdrHHCWrapper::ConvertNextDocument()
SetPaperSize( pTextObj->GetLogicRect().GetSize() );
SetUpdateMode(sal_True);
pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect());
-
+
pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), sal_False, this, pOutlView, sal_True, sal_True);
}
else
diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx
index c9e202dcfc56..0803ba0eb3f2 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.hxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.hxx
@@ -2,7 +2,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
@@ -41,10 +41,10 @@ class SdrHHCWrapper : public SdrOutliner
{
// modified version of SdrSpeller
- SwView* pView;
- SdrTextObj* pTextObj;
- OutlinerView* pOutlView;
- SdrObjListIter* pListIter;
+ SwView* pView;
+ SdrTextObj* pTextObj;
+ OutlinerView* pOutlView;
+ SdrObjListIter* pListIter;
sal_Int32 nOptions;
sal_uInt16 nDocIndex;
LanguageType nSourceLang;
@@ -53,11 +53,11 @@ class SdrHHCWrapper : public SdrOutliner
sal_Bool bIsInteractive;
public:
- SdrHHCWrapper( SwView* pVw,
+ SdrHHCWrapper( SwView* pVw,
LanguageType nSourceLanguage, LanguageType nTargetLanguage,
const Font* pTargetFnt,
sal_Int32 nConvOptions, sal_Bool bInteractive );
-
+
virtual ~SdrHHCWrapper();
virtual sal_Bool ConvertNextDocument();
diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src
index 1807d12744e4..3c5ab355aa38 100644
--- a/sw/source/ui/misc/autocorr.src
+++ b/sw/source/ui/misc/autocorr.src
@@ -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
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d70f0a99d308..e865a41477ba 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -2,7 +2,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
@@ -41,10 +41,10 @@
#include "view.hxx"
#include "basesh.hxx"
-#include "wrtsh.hxx" //
+#include "wrtsh.hxx" //
#include "cmdid.h"
-#include "bookmark.hxx" // SwInsertBookmarkDlg
-#include "IMark.hxx"
+#include "bookmark.hxx" // SwInsertBookmarkDlg
+#include "IMark.hxx"
#include "bookmark.hrc"
#include "misc.hrc"
@@ -78,8 +78,8 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
}
- aOkBtn.Enable(!bSelEntries); // neue Textmarke
- aDeleteBtn.Enable(bSelEntries); // loeschbar?
+ aOkBtn.Enable(!bSelEntries); // neue Textmarke
+ aDeleteBtn.Enable(bSelEntries); // loeschbar?
return 0;
}
@@ -95,10 +95,10 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG )
aBookmarkBox.RemoveEntry(aBookmarkBox.GetSelectEntryPos(i - 1));
aBookmarkBox.SetText(aEmptyStr);
- aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden
+ aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden
// aBookmarkBox.SetText(aEmptyStr);
- aOkBtn.Enable(); // Im OK Handler wird geloescht
+ aOkBtn.Enable(); // Im OK Handler wird geloescht
return 0;
}
@@ -122,8 +122,8 @@ void SwInsertBookmarkDlg::Apply()
}
// Textmarke einfuegen
- USHORT nLen = aBookmarkBox.GetText().Len();
- SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 );
+ USHORT nLen = aBookmarkBox.GetText().Len();
+ SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 );
if ( nLen && (aBookmarkBox.GetEntryPos(aTmpEntry) == COMBOBOX_ENTRY_NOTFOUND) )
{
diff --git a/sw/source/ui/misc/bookmark.hrc b/sw/source/ui/misc/bookmark.hrc
index 3320e3774516..ce808a6fa52f 100644
--- a/sw/source/ui/misc/bookmark.hrc
+++ b/sw/source/ui/misc/bookmark.hrc
@@ -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
@@ -26,9 +26,9 @@
************************************************************************/
-#define CB_BOOKMARK 1
+#define CB_BOOKMARK 1
#define FL_BOOKMARK 2
-#define BT_OK 20
-#define BT_CANCEL 21
-#define BT_DELETE 22
+#define BT_OK 20
+#define BT_CANCEL 21
+#define BT_DELETE 22
diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src
index 4e7a4ec0a01f..9ca4254eb680 100644
--- a/sw/source/ui/misc/bookmark.src
+++ b/sw/source/ui/misc/bookmark.src
@@ -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
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 796c9cafdec5..b35e10fa2333 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -2,7 +2,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
@@ -156,10 +156,10 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
if(PTR_CAST(SwWebDocShell, pDocSh))
{
- aParaTemplLbl .Hide();
- aParaTemplBox .Hide();
- aPageTemplLbl .Hide();
- aPageTemplBox .Hide();
+ aParaTemplLbl .Hide();
+ aParaTemplBox .Hide();
+ aPageTemplLbl .Hide();
+ aPageTemplBox .Hide();
aFtnCharTextTemplLbl.Hide();
aFtnCharTextTemplBox.Hide();
aFtnCharAnchorTemplLbl.Hide();
@@ -239,7 +239,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
SwTxtFmtColl* pColl = pInf->GetFtnTxtColl();
if( !pColl )
- aParaTemplBox.SelectEntry( sStr ); // Default
+ aParaTemplBox.SelectEntry( sStr ); // Default
else
{
OSL_ENSURE(!pColl->IsDefault(), "default style for footnotes is wrong");
@@ -279,7 +279,7 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet
}
/*------------------------------------------------------------------------
- Beschreibung: Unterschiedliche Arten der Numerierung; da die Listbox
+ Beschreibung: Unterschiedliche Arten der Numerierung; da die Listbox
unterschiedlich viele Eintraege hat, hier Funktionen
fuer das Setzen und Erfragen der gemeinten Art
der Numerierung.
@@ -332,7 +332,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
+ Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
auf der Seite.
In diesem Fall koennen alle Numerierungsarten verwendet
werden.
@@ -374,7 +374,7 @@ IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
+ Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
am Kapitel oder Dokumentende.
In diesem Fall kann keine seitenweise Numerierung verwendet
werden.
diff --git a/sw/source/ui/misc/docfnote.hrc b/sw/source/ui/misc/docfnote.hrc
index f826f276620e..fc40676715ef 100644
--- a/sw/source/ui/misc/docfnote.hrc
+++ b/sw/source/ui/misc/docfnote.hrc
@@ -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
@@ -24,37 +24,37 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define RB_POS_PAGE 1
-#define RB_POS_CHAPTER 2
-#define FT_POS 3
+#define RB_POS_PAGE 1
+#define RB_POS_CHAPTER 2
+#define FT_POS 3
#define FT_NUMTYPE 4
#define FT_NUMCOUNT 5
-#define LB_NUMVIEW 10
-#define LB_NUMCOUNT 11
-#define FLD_OFFSET 12
-#define FT_OFFSET 13
+#define LB_NUMVIEW 10
+#define LB_NUMCOUNT 11
+#define FLD_OFFSET 12
+#define FT_OFFSET 13
#define FL_NUM 14
-#define LB_PARA_TEMPL 30
-#define LB_PAGE_TEMPL 31
-#define FT_PARA_TEMPL 32
-#define FT_PAGE_TEMPL 33
+#define LB_PARA_TEMPL 30
+#define LB_PAGE_TEMPL 31
+#define FT_PARA_TEMPL 32
+#define FT_PAGE_TEMPL 33
#define FL_TEMPL 34
-#define FT_CONT 40
-#define ED_CONT 41
-#define FT_CONT_FROM 42
-#define ED_CONT_FROM 43
+#define FT_CONT 40
+#define ED_CONT 41
+#define FT_CONT_FROM 42
+#define ED_CONT_FROM 43
#define FL_CONT 44
#define FT_PREFIX 45
#define ED_PREFIX 46
#define FT_SUFFIX 47
#define ED_SUFFIX 48
-#define FT_TEXT_CHARFMT 49
-#define LB_TEXT_CHARFMT 50
-#define FT_ANCHR_CHARFMT 51
+#define FT_TEXT_CHARFMT 49
+#define LB_TEXT_CHARFMT 50
+#define FT_ANCHR_CHARFMT 51
#define FL_CHAR_TEMPL 52
-#define LB_ANCHR_CHARFMT 53
+#define LB_ANCHR_CHARFMT 53
diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src
index fbc1ba24393c..bdb4d55eb2e9 100644
--- a/sw/source/ui/misc/docfnote.src
+++ b/sw/source/ui/misc/docfnote.src
@@ -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
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index dfbb2b383a90..749878531660 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -2,7 +2,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
@@ -58,17 +58,17 @@
#define PATH_CASE_SENSITIVE 0x01
-#define PATH_READONLY 0x02
+#define PATH_READONLY 0x02
-#define RENAME_TOKEN_DELIM (sal_Unicode)1
+#define RENAME_TOKEN_DELIM (sal_Unicode)1
SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
const SvStrings* pPathArr,
SwGlossaryHdl *pHdl) :
SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
- aNameED( this, SW_RES(ED_NAME)),
- aPathLB( this, SW_RES(LB_PATH)),
+ aNameED( this, SW_RES(ED_NAME)),
+ aPathLB( this, SW_RES(LB_PATH)),
aGroupTLB( this, SW_RES(TLB_GROUPS)),
aOkPB( this, SW_RES(BT_OK)),
@@ -91,7 +91,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
FreeResource();
long nTabs[] =
- { 2, // Number of Tabs
+ { 2, // Number of Tabs
0, 160
};
@@ -265,7 +265,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG )
IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
{
String sGroup(aNameED.GetText());
-// sGroup.ToLower();
+// sGroup.ToLower();
sGroup += GLOS_DELIM;
sGroup += String::CreateFromInt32(aPathLB.GetSelectEntryPos());
OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!");
@@ -273,7 +273,7 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
pInsertedArr = new SvStrings;
pInsertedArr->Insert(new String(sGroup), pInsertedArr->Count());
String sTemp(aNameED.GetText());
-// sTemp.ToLower();
+// sTemp.ToLower();
sTemp += '\t';
sTemp += aPathLB.GetSelectEntry();
SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -399,7 +399,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
delete (GlosBibUserData*)pEntry->GetUserData();
aGroupTLB.GetModel()->Remove(pEntry);
String sTemp(aNameED.GetText());
-// sTemp.ToLower();
+// sTemp.ToLower();
sTemp += '\t';
sTemp += aPathLB.GetSelectEntry();
pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -417,7 +417,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
{
String sEntry(aNameED.GetText());
-// sEntry.ToLower();
+// sEntry.ToLower();
BOOL bEnableNew = TRUE;
BOOL bEnableDel = FALSE;
ULONG nCaseReadonly =
@@ -463,10 +463,10 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
bEnableDel = IsDeleteAllowed(pUserData->sGroupName);
-// String sGroup = aGroupTLB.GetEntryText(pEntry, 0);
-// sGroup += GLOS_DELIM;
-// sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1)));
-// bEnableDel = IsDeleteAllowed(sGroup);
+// String sGroup = aGroupTLB.GetEntryText(pEntry, 0);
+// sGroup += GLOS_DELIM;
+// sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1)));
+// bEnableDel = IsDeleteAllowed(sGroup);
}
aDelPB.Enable(bEnableDel);
@@ -510,7 +510,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent )
Edit::KeyInput( rKEvent );
}
-void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
+void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
{
Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
SvLBoxEntry* pEntry = GetEntry( aPos );
diff --git a/sw/source/ui/misc/glosbib.hrc b/sw/source/ui/misc/glosbib.hrc
index 834163d52fe0..2322dc63f285 100644
--- a/sw/source/ui/misc/glosbib.hrc
+++ b/sw/source/ui/misc/glosbib.hrc
@@ -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
@@ -28,14 +28,14 @@
#define FT_BIB 1
#define FT_PATH 2
#define FT_SELECT 3
-#define CO_NAME 2
-#define PB_NEW 3
-#define PB_DELETE 4
-#define BT_OK 5
-#define BT_CANCEL 6
+#define CO_NAME 2
+#define PB_NEW 3
+#define PB_DELETE 4
+#define BT_OK 5
+#define BT_CANCEL 6
#define BT_HELP 7
#define LB_PATH 8
#define TLB_GROUPS 9
#define ED_NAME 10
-#define PB_RENAME 11
+#define PB_RENAME 11
diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src
index 30a4a9e81930..75a03eb85e64 100644
--- a/sw/source/ui/misc/glosbib.src
+++ b/sw/source/ui/misc/glosbib.src
@@ -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
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index b669440a1ba4..d50883739069 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@
#include <unotools/pathoptions.hxx>
#include <unotools/tempfile.hxx>
#include <swtypes.hxx>
-#include <errhdl.hxx> // ASSERT
+#include <errhdl.hxx> // ASSERT
#include <uitool.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
@@ -69,7 +69,7 @@ String lcl_CheckFileName( const String& rNewFilePath,
for( xub_StrLen i = 0; i < rNewGroupName.Len(); i++ )
{
sal_Unicode cChar = rNewGroupName.GetChar(i);
- if( (cChar >= 'A' && cChar <= 'Z') ||
+ if( (cChar >= 'A' && cChar <= 'Z') ||
(cChar >= 'a' && cChar <= 'z') ||
(cChar >= '0' && cChar <= '9') ||
cChar == '_' || cChar == 0x20 )
@@ -108,7 +108,7 @@ String lcl_CheckFileName( const String& rNewFilePath,
/*------------------------------------------------------------------------
Beschreibung: Liefert den Namen der Default-Gruppe
------------------------------------------------------------------------*/
-String SwGlossaries::GetDefName()
+String SwGlossaries::GetDefName()
{
return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "standard" ));
@@ -127,7 +127,7 @@ sal_uInt16 SwGlossaries::GetGroupCnt()
------------------------------------------------------------------------*/
sal_Bool SwGlossaries::FindGroupName(String & rGroup)
{
- // enthaelt der Gruppenname keinen Pfad, kann hier ein passender
+ // enthaelt der Gruppenname keinen Pfad, kann hier ein passender
// Gruppeneintrag gesucht werden;
sal_uInt16 nCount = GetGroupCnt();
sal_uInt16 i;
@@ -164,9 +164,9 @@ String SwGlossaries::GetGroupName(sal_uInt16 nGroupId)
return *(*m_pGlosArr)[nGroupId];
}
-String SwGlossaries::GetGroupTitle( const String& rGroupName )
+String SwGlossaries::GetGroupTitle( const String& rGroupName )
{
- String sRet;
+ String sRet;
String sGroup(rGroupName);
if(STRING_NOTFOUND == sGroup.Search(GLOS_DELIM))
FindGroupName(sGroup);
@@ -199,7 +199,7 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
break;
}
if(i == nCount)
- { // Baustein nicht in der Liste
+ { // Baustein nicht in der Liste
String *pTmp = new String(aName);
m_pGlosArr->Insert(pTmp, m_pGlosArr->Count());
}
@@ -208,14 +208,14 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
}
/*------------------------------------------------------------------------
- Beschreibung: Loeschen Textblock
+ Beschreibung: Loeschen Textblock
------------------------------------------------------------------------*/
void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
delete pBlock;
}
/*------------------------------------------------------------------------
- Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname
+ Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname
Wird temp. auch als File angelegt, damit die
Gruppen auch spaeter (ohne Zugriff) vorhanden sind.
------------------------------------------------------------------------*/
@@ -241,7 +241,7 @@ sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle)
return sal_False;
}
-sal_Bool SwGlossaries::RenameGroupDoc(
+sal_Bool SwGlossaries::RenameGroupDoc(
const String& rOldGroup, String& rNewGroup, const String& rNewTitle )
{
sal_Bool bRet = sal_False;
@@ -445,7 +445,7 @@ SwGlossaries::SwGlossaries() :
------------------------------------------------------------------------*/
/* -----------------21.01.99 15:36-------------------
-* #61050# Doppelte Pfade fuehren zu Verwirrung - als raus damit
+* #61050# Doppelte Pfade fuehren zu Verwirrung - als raus damit
* --------------------------------------------------*/
sal_Bool lcl_FindSameEntry(const SvStrings& rDirArr, const String& rEntryURL)
{
@@ -548,7 +548,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
rtl::OUString aUName = rGroup;
{
// tell the UNO AutoTextGroup object that it's not valid anymore
- for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin();
+ for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin();
aLoop != m_aGlossaryGroups.end();
++aLoop
)
@@ -567,7 +567,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
{
// tell all our UNO AutoTextEntry objects that they're not valid anymore
- for ( UnoAutoTextEntries::iterator aLoop = m_aGlossaryEntries.begin();
+ for ( UnoAutoTextEntries::iterator aLoop = m_aGlossaryEntries.begin();
aLoop != m_aGlossaryEntries.end();
)
{
@@ -618,7 +618,7 @@ String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName )
void SwGlossaries::InvalidateUNOOjects()
{
// invalidate all the AutoTextGroup-objects
- for ( UnoAutoTextGroups::iterator aGroupLoop = m_aGlossaryGroups.begin();
+ for ( UnoAutoTextGroups::iterator aGroupLoop = m_aGlossaryGroups.begin();
aGroupLoop != m_aGlossaryGroups.end();
++aGroupLoop
)
@@ -631,7 +631,7 @@ void SwGlossaries::InvalidateUNOOjects()
m_aGlossaryGroups.swap( aTmpg );
// invalidate all the AutoTextEntry-objects
- for ( UnoAutoTextEntries::const_iterator aEntryLoop = m_aGlossaryEntries.begin();
+ for ( UnoAutoTextEntries::const_iterator aEntryLoop = m_aGlossaryEntries.begin();
aEntryLoop != m_aGlossaryEntries.end();
++aEntryLoop
)
@@ -674,9 +674,9 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O
}
if ( _rGroupName == pSwGroup->getName() )
- { // the group is already cached
+ { // the group is already cached
if ( sCompleteGroupName.Len() )
- { // the group still exists -> return it
+ { // the group still exists -> return it
xGroup = pSwGroup;
break;
}
@@ -738,9 +738,9 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String&
continue;
}
- if ( pEntry
- && ( COMPARE_EQUAL == pEntry->GetGroupName().CompareTo( sGroupName ) )
- && ( COMPARE_EQUAL == pEntry->GetEntryName().CompareTo( sEntryName ) )
+ if ( pEntry
+ && ( COMPARE_EQUAL == pEntry->GetGroupName().CompareTo( sGroupName ) )
+ && ( COMPARE_EQUAL == pEntry->GetEntryName().CompareTo( sEntryName ) )
)
{
xReturn = pEntry;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 2439da3752c5..bdd330c8506f 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -2,7 +2,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
@@ -68,7 +68,7 @@
#include <glossary.hxx>
#include <gloshdl.hxx>
#include <glosbib.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
+#include <initui.hxx> // fuer ::GetGlossaries()
#include <glosdoc.hxx>
#include <macassgn.hxx>
#include <swevent.hxx>
@@ -122,31 +122,31 @@ String lcl_GetValidShortCut( const String& rName )
struct GroupUserData
{
- String sGroupName;
- sal_uInt16 nPathIdx;
- BOOL bReadonly;
+ String sGroupName;
+ sal_uInt16 nPathIdx;
+ BOOL bReadonly;
GroupUserData()
: nPathIdx(0),
- bReadonly(FALSE) {}
+ bReadonly(FALSE) {}
};
/*------------------------------------------------------------------------
- Beschreibung: Dialog fuer neuen Bausteinnamen
+ Beschreibung: Dialog fuer neuen Bausteinnamen
------------------------------------------------------------------------*/
class SwNewGlosNameDlg : public ModalDialog
{
- FixedText aNNFT;
- Edit aNewName;
- FixedText aNSFT;
- NoSpaceEdit aNewShort;
- OKButton aOk;
- CancelButton aCancel;
+ FixedText aNNFT;
+ Edit aNewName;
+ FixedText aNSFT;
+ NoSpaceEdit aNewShort;
+ OKButton aOk;
+ CancelButton aCancel;
FixedLine aFL;
- FixedText aONFT;
- Edit aOldName;
- FixedText aOSFT;
- Edit aOldShort;
+ FixedText aONFT;
+ Edit aOldName;
+ FixedText aOSFT;
+ Edit aOldShort;
protected:
DECL_LINK( Modify, Edit * );
@@ -169,12 +169,12 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
aNewName(this, SW_RES( ED_NN )),
aNSFT (this, SW_RES( FT_NS )),
aNewShort(this,SW_RES( ED_NS )),
- aOk (this, SW_RES( BT_OKNEW)),
- aCancel (this, SW_RES( BT_CANCEL)),
+ aOk (this, SW_RES( BT_OKNEW)),
+ aCancel (this, SW_RES( BT_CANCEL)),
aFL (this, SW_RES( FL_NN )),
- aONFT (this, SW_RES( FT_ON )),
+ aONFT (this, SW_RES( FT_ON )),
aOldName(this, SW_RES( ED_ON )),
- aOSFT (this, SW_RES( FT_OS )),
+ aOSFT (this, SW_RES( FT_OS )),
aOldShort(this,SW_RES( ED_OS ))
{
FreeResource();
@@ -189,7 +189,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
}
/*------------------------------------------------------------------------
- Beschreibung: aktuell eingestellte Gruppe erfragen / setzen
+ Beschreibung: aktuell eingestellte Gruppe erfragen / setzen
------------------------------------------------------------------------*/
String SwGlossaryDlg::GetCurrGroup()
{
@@ -211,7 +211,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
SvxStandardDialog(&pViewFrame->GetWindow(), SW_RES(DLG_GLOSSARY)),
aInsertTipCB (this, SW_RES(CB_INSERT_TIP)),
- aNameLbl (this, SW_RES(FT_NAME)),
+ aNameLbl (this, SW_RES(FT_NAME)),
aNameED (this, SW_RES(ED_NAME)),
aShortNameLbl (this, SW_RES(FT_SHORTNAME)),
aShortNameEdit(this, SW_RES(ED_SHORTNAME)),
@@ -226,8 +226,8 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
aCloseBtn (this, SW_RES(PB_CLOSE)),
aHelpBtn (this, SW_RES(PB_HELP)),
aEditBtn (this, SW_RES(PB_EDIT)),
- aBibBtn (this, SW_RES(PB_BIB)),
- aPathBtn (this, SW_RES(PB_PATH)),
+ aBibBtn (this, SW_RES(PB_BIB)),
+ aPathBtn (this, SW_RES(PB_PATH)),
sReadonlyPath (SW_RES(ST_READONLY_PATH)),
pExampleFrame(0),
@@ -281,7 +281,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY);
aCategoryBox.SetWindowBits(WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
aCategoryBox.GetModel()->SetSortMode(SortAscending);
- aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren
+ aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren
aCategoryBox.SetNodeDefaultImages( );
Init();
@@ -299,7 +299,7 @@ SwGlossaryDlg::~SwGlossaryDlg()
}
/*------------------------------------------------------------------------
- Beschreibung: Auswahl neue Gruppe
+ Beschreibung: Auswahl neue Gruppe
------------------------------------------------------------------------*/
IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
{
@@ -347,7 +347,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
void SwGlossaryDlg::Apply()
{
const String aGlosName(aShortNameEdit.GetText());
- if(aGlosName.Len()) pGlossaryHdl->InsertGlossary(aGlosName);
+ if(aGlosName.Len()) pGlossaryHdl->InsertGlossary(aGlosName);
if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
{
SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_INSERT_GLOSSARY );
@@ -478,7 +478,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
{
case FN_GL_REPLACE:
case FN_GL_REPLACE_TEXT:
- pGlossaryHdl->NewGlossary( aNameED.GetText(),
+ pGlossaryHdl->NewGlossary( aNameED.GetText(),
aShortNameEdit.GetText(),
sal_False,
pMn->GetCurItemId() == FN_GL_REPLACE_TEXT);
@@ -507,7 +507,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
pChild->SetUserData(new String(aShortName));
aNameED.SetText(aStr);
aShortNameEdit.SetText(aShortName);
- NameModify(&aNameED); // fuer Schalten der Buttons
+ NameModify(&aNameED); // fuer Schalten der Buttons
if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
{
@@ -654,7 +654,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
}
/*--------------------------------------------------------------------
- Beschreibung: Dialog Verwaltung Bereiche
+ Beschreibung: Dialog Verwaltung Bereiche
--------------------------------------------------------------------*/
IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG )
{
@@ -731,7 +731,7 @@ IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche
+ Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche
------------------------------------------------------------------------*/
void SwGlossaryDlg::Init()
{
@@ -809,9 +809,9 @@ void SwGlossaryDlg::Init()
GrpSelect(&aCategoryBox);
}
//JP 16.11.99: the SvxTreeListBox has a Bug. The Box dont recalc the
- // outputsize, when all entries are insertet. The result is, that
- // the Focus/Highlight rectangle is to large and paintet over the
- // HScrollbar. -> Fix: call the resize
+ // outputsize, when all entries are insertet. The result is, that
+ // the Focus/Highlight rectangle is to large and paintet over the
+ // HScrollbar. -> Fix: call the resize
aCategoryBox.Resize();
aCategoryBox.GetModel()->Resort();
@@ -843,7 +843,7 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG )
IMPL_LINK_INLINE_END( SwGlossaryDlg, EditHdl, Button *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces
+ Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces
------------------------------------------------------------------------*/
IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
{
@@ -894,7 +894,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox )
* --------------------------------------------------*/
SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) :
SvTreeListBox(pParent, rResId),
- sReadonly (SW_RES(ST_READONLY)),
+ sReadonly (SW_RES(ST_READONLY)),
pDragEntry(0)
{
FreeResource();
@@ -1183,7 +1183,7 @@ void SwGlossaryDlg::ShowAutoText(const String& rGroup, const String& rShortName)
}
}
-void SwGlossaryDlg::ResumeShowAutoText()
+void SwGlossaryDlg::ResumeShowAutoText()
{
String sGroup, sShortName;
if(GetResumeData(sGroup, sShortName) && aExampleWIN.IsVisible())
diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc
index 4ee5aaaa7ede..52208bc962f7 100644
--- a/sw/source/ui/misc/glossary.hrc
+++ b/sw/source/ui/misc/glossary.hrc
@@ -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
@@ -27,57 +27,57 @@
// Box Textbausteine
-#define FT_SHORTNAME 1
-#define ED_SHORTNAME 2
-#define FT_NAME 3
-//#define DCB_NAME 4
-#define ED_NAME 4
+#define FT_SHORTNAME 1
+#define ED_SHORTNAME 2
+#define FT_NAME 3
+//#define DCB_NAME 4
+#define ED_NAME 4
#define CB_INSERT_TIP 5
-//#define FT_BIB 10
+//#define FT_BIB 10
-#define PB_INSERT 50
-#define PB_EDIT 52
-#define PB_BIB 54
-#define PB_CLOSE 55
-#define PB_PATH 56
+#define PB_INSERT 50
+#define PB_EDIT 52
+#define PB_BIB 54
+#define PB_CLOSE 55
+#define PB_PATH 56
#define PB_HELP 57
-#define MNU_EDIT 60
-#define FN_GL_DEFINE 61
-#define FN_GL_DEFINE_TEXT 62
-#define FN_GL_REPLACE 63
-#define FN_GL_EDIT 64
-#define FN_GL_DELETE 65
-#define FN_GL_RENAME 66
-#define FN_GL_MACRO 67
-#define CB_FILE_REL 68
+#define MNU_EDIT 60
+#define FN_GL_DEFINE 61
+#define FN_GL_DEFINE_TEXT 62
+#define FN_GL_REPLACE 63
+#define FN_GL_EDIT 64
+#define FN_GL_DELETE 65
+#define FN_GL_RENAME 66
+#define FN_GL_MACRO 67
+#define CB_FILE_REL 68
#define CB_NET_REL 69
#define FL_RELATIVE 70
#define WIN_EXAMPLE 72
-#define CB_SHOW_EXAMPLE 73
+#define CB_SHOW_EXAMPLE 73
#define FN_GL_COPY_TO_CLIPBOARD 74
-#define FN_GL_IMPORT 75
-#define ST_READONLY 76
-#define ST_READONLY_PATH 77
-#define FN_GL_REPLACE_TEXT 78
+#define FN_GL_IMPORT 75
+#define ST_READONLY 76
+#define ST_READONLY_PATH 77
+#define FN_GL_REPLACE_TEXT 78
#define WIN_EXAMPLE_DUMMY 79
// Box Bibliothek Textbausteine
#define FL_EDIT 1
#define FL_BIB 2
-#define ED_BIB 3
+#define ED_BIB 3
-#define PB_NEW 10
-#define PB_DELETE 11
+#define PB_NEW 10
+#define PB_DELETE 11
-#define BT_OK 100
+#define BT_OK 100
// beide
-#define LB_BIB 80
+#define LB_BIB 80
// Dialog Namensaenderung
-#define FT_ON 1
+#define FT_ON 1
#define FT_OS 2
#define FT_NN 3
#define FT_NS 4
@@ -86,6 +86,6 @@
#define ED_NN 7
#define ED_NS 8
#define FL_NN 9
-#define BT_CANCEL 10
-#define BT_OKNEW 11
+#define BT_CANCEL 10
+#define BT_OKNEW 11
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index a09b17ad4282..88f4ea0c886b 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -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
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index cf71bc7b511c..8d4fe1961e3a 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -2,7 +2,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
@@ -52,7 +52,7 @@
#include <doc.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
+#include <initui.hxx> // fuer ::GetGlossaries()
#include <cmdid.h>
#include <swerror.h>
#include <misc.hrc>
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 3ba70387c2c0..163eeba3576f 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -2,7 +2,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
@@ -39,31 +39,31 @@ class SwWrtShell;
class SwEndNoteOptionPage : public SfxTabPage
{
- FixedText aNumTypeFT;
- SwNumberingTypeListBox aNumViewBox;
- FixedText aOffsetLbl;
- NumericField aOffsetFld;
- FixedText aNumCountFT;
- ListBox aNumCountBox;
- FixedText aPrefixFT;
- Edit aPrefixED;
- FixedText aSuffixFT;
- Edit aSuffixED;
- FixedText aPosFT;
- RadioButton aPosPageBox;
- RadioButton aPosChapterBox;
+ FixedText aNumTypeFT;
+ SwNumberingTypeListBox aNumViewBox;
+ FixedText aOffsetLbl;
+ NumericField aOffsetFld;
+ FixedText aNumCountFT;
+ ListBox aNumCountBox;
+ FixedText aPrefixFT;
+ Edit aPrefixED;
+ FixedText aSuffixFT;
+ Edit aSuffixED;
+ FixedText aPosFT;
+ RadioButton aPosPageBox;
+ RadioButton aPosChapterBox;
FixedLine aNumFL;
- FixedText aParaTemplLbl;
- ListBox aParaTemplBox;
- FixedText aPageTemplLbl;
- ListBox aPageTemplBox;
+ FixedText aParaTemplLbl;
+ ListBox aParaTemplBox;
+ FixedText aPageTemplLbl;
+ ListBox aPageTemplBox;
FixedLine aTemplFL;
- FixedText aFtnCharAnchorTemplLbl;
- ListBox aFtnCharAnchorTemplBox;
- FixedText aFtnCharTextTemplLbl;
- ListBox aFtnCharTextTemplBox;
+ FixedText aFtnCharAnchorTemplLbl;
+ ListBox aFtnCharAnchorTemplBox;
+ FixedText aFtnCharTextTemplLbl;
+ ListBox aFtnCharTextTemplBox;
FixedLine aCharTemplFL;
FixedText aContLbl;
@@ -76,8 +76,8 @@ class SwEndNoteOptionPage : public SfxTabPage
String aNumPage;
String aNumChapter;
SwWrtShell *pSh;
- BOOL bPosDoc;
- BOOL bEndNote;
+ BOOL bPosDoc;
+ BOOL bEndNote;
inline void SelectNumbering(int eNum);
int GetNumbering() const;
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 5ca777508715..aaeaf82b83a8 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@
static BOOL bFootnote = TRUE;
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen der Fussnote durch OK
+ Beschreibung: Einfuegen der Fussnote durch OK
------------------------------------------------------------------------*/
void __EXPORT SwInsFootNoteDlg::Apply()
@@ -234,21 +234,21 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, BOOL bEd
rSh(rShell),
bExtCharAvailable(FALSE),
bEdit(bEd),
- aNumberAutoBtn (this,SW_RES(RB_NUMBER_AUTO)),
- aNumberCharBtn (this,SW_RES(RB_NUMBER_CHAR)),
- aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)),
- aNumberExtChar (this,SW_RES(BT_NUMBER_CHAR)),
+ aNumberAutoBtn (this,SW_RES(RB_NUMBER_AUTO)),
+ aNumberCharBtn (this,SW_RES(RB_NUMBER_CHAR)),
+ aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)),
+ aNumberExtChar (this,SW_RES(BT_NUMBER_CHAR)),
aNumberFL (this,SW_RES(FL_NUMBER)),
aFtnBtn (this,SW_RES(RB_TYPE_FTN)),
- aEndNoteBtn (this,SW_RES(RB_TYPE_ENDNOTE)),
+ aEndNoteBtn (this,SW_RES(RB_TYPE_ENDNOTE)),
aTypeFL (this,SW_RES(FL_TYPE)),
- aOkBtn (this,SW_RES(BT_OK)),
- aCancelBtn (this,SW_RES(BT_CANCEL)),
- aHelpBtn (this,SW_RES(BT_HELP)),
- aPrevBT (this,SW_RES(BT_PREV)),
- aNextBT (this,SW_RES(BT_NEXT))
+ aOkBtn (this,SW_RES(BT_OK)),
+ aCancelBtn (this,SW_RES(BT_CANCEL)),
+ aHelpBtn (this,SW_RES(BT_HELP)),
+ aPrevBT (this,SW_RES(BT_PREV)),
+ aNextBT (this,SW_RES(BT_NEXT))
{
aNumberAutoBtn.SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberAutoBtnHdl));
aNumberExtChar.SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberExtCharHdl));
diff --git a/sw/source/ui/misc/insfnote.hrc b/sw/source/ui/misc/insfnote.hrc
index 8ac15b4f9fc3..104693acea19 100644
--- a/sw/source/ui/misc/insfnote.hrc
+++ b/sw/source/ui/misc/insfnote.hrc
@@ -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
@@ -25,17 +25,17 @@
*
************************************************************************/
-#define RB_NUMBER_AUTO 1
-#define RB_NUMBER_CHAR 2
-#define ED_NUMBER_CHAR 3
-#define BT_NUMBER_CHAR 4
+#define RB_NUMBER_AUTO 1
+#define RB_NUMBER_CHAR 2
+#define ED_NUMBER_CHAR 3
+#define BT_NUMBER_CHAR 4
#define FL_NUMBER 5
#define FL_TYPE 6
-#define RB_TYPE_FTN 7
-#define RB_TYPE_ENDNOTE 8
+#define RB_TYPE_FTN 7
+#define RB_TYPE_ENDNOTE 8
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_HELP 102
-#define BT_PREV 103
-#define BT_NEXT 104
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_HELP 102
+#define BT_PREV 103
+#define BT_NEXT 104
diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src
index 1bf5f77dcb2e..fda4b92b0d87 100644
--- a/sw/source/ui/misc/insfnote.src
+++ b/sw/source/ui/misc/insfnote.src
@@ -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
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index 644604c2a72b..74373f74fd47 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -2,7 +2,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
@@ -146,7 +146,7 @@ void __EXPORT SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
Rectangle aRect = rUDEvt.GetRect();
OutputDevice* pDev = rUDEvt.GetDevice();
- USHORT nItemId = rUDEvt.GetItemId();
+ USHORT nItemId = rUDEvt.GetItemId();
Point aBLPos = aRect.TopLeft();
// Itemzaehlung beginnt bei 1, und die 1. ist die einfache Linie
diff --git a/sw/source/ui/misc/insrule.hrc b/sw/source/ui/misc/insrule.hrc
index 47289f2c366a..8e2477bc349f 100644
--- a/sw/source/ui/misc/insrule.hrc
+++ b/sw/source/ui/misc/insrule.hrc
@@ -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
@@ -28,8 +28,8 @@
#include "misc.hrc"
#define FL_SEL 1
-#define VS_EXAMPLE 2
-#define PB_OK 3
-#define PB_CANCEL 4
-#define PB_HELP 5
+#define VS_EXAMPLE 2
+#define PB_OK 3
+#define PB_CANCEL 4
+#define PB_HELP 5
#define ST_SIMPLE 6
diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src
index 89890e5904af..41e10db2266a 100644
--- a/sw/source/ui/misc/insrule.src
+++ b/sw/source/ui/misc/insrule.src
@@ -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
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index f6c141290185..26188ed2a495 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -2,7 +2,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
@@ -84,28 +84,28 @@ IMPL_LINK( SwLineNumberingDlg, OKHdl, Button *, EMPTYARG )
SwLineNumberingPage::SwLineNumberingPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, SW_RES(TP_LINENUMBERING), rSet),
- aNumberingOnCB ( this, SW_RES( CB_NUMBERING_ON )),
- aCharStyleFT ( this, SW_RES( FT_CHAR_STYLE )),
- aCharStyleLB ( this, SW_RES( LB_CHAR_STYLE )),
- aFormatFT ( this, SW_RES( FT_FORMAT )),
- aFormatLB ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES),
- aPosFT ( this, SW_RES( FT_POS )),
- aPosLB ( this, SW_RES( LB_POS )),
- aOffsetFT ( this, SW_RES( FT_OFFSET )),
- aOffsetMF ( this, SW_RES( MF_OFFSET )),
- aNumIntervalFT ( this, SW_RES( FT_NUM_INVERVAL )),
- aNumIntervalNF ( this, SW_RES( NF_NUM_INVERVAL )),
- aNumRowsFT ( this, SW_RES( FT_NUM_ROWS )),
+ aNumberingOnCB ( this, SW_RES( CB_NUMBERING_ON )),
+ aCharStyleFT ( this, SW_RES( FT_CHAR_STYLE )),
+ aCharStyleLB ( this, SW_RES( LB_CHAR_STYLE )),
+ aFormatFT ( this, SW_RES( FT_FORMAT )),
+ aFormatLB ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES),
+ aPosFT ( this, SW_RES( FT_POS )),
+ aPosLB ( this, SW_RES( LB_POS )),
+ aOffsetFT ( this, SW_RES( FT_OFFSET )),
+ aOffsetMF ( this, SW_RES( MF_OFFSET )),
+ aNumIntervalFT ( this, SW_RES( FT_NUM_INVERVAL )),
+ aNumIntervalNF ( this, SW_RES( NF_NUM_INVERVAL )),
+ aNumRowsFT ( this, SW_RES( FT_NUM_ROWS )),
aDisplayFL ( this, SW_RES( FL_DISPLAY )),
- aDivisorFT ( this, SW_RES( FT_DIVISOR )),
- aDivisorED ( this, SW_RES( ED_DIVISOR )),
- aDivIntervalFT ( this, SW_RES( FT_DIV_INTERVAL )),
- aDivIntervalNF ( this, SW_RES( NF_DIV_INTERVAL )),
- aDivRowsFT ( this, SW_RES( FT_DIV_ROWS )),
+ aDivisorFT ( this, SW_RES( FT_DIVISOR )),
+ aDivisorED ( this, SW_RES( ED_DIVISOR )),
+ aDivIntervalFT ( this, SW_RES( FT_DIV_INTERVAL )),
+ aDivIntervalNF ( this, SW_RES( NF_DIV_INTERVAL )),
+ aDivRowsFT ( this, SW_RES( FT_DIV_ROWS )),
aDivisorFL ( this, SW_RES( FL_DIVISOR )),
- aCountEmptyLinesCB ( this, SW_RES( CB_COUNT_EMPTYLINES )),
- aCountFrameLinesCB ( this, SW_RES( CB_COUNT_FRAMELINES )),
- aRestartEachPageCB ( this, SW_RES( CB_RESTART_PAGE )),
+ aCountEmptyLinesCB ( this, SW_RES( CB_COUNT_EMPTYLINES )),
+ aCountFrameLinesCB ( this, SW_RES( CB_COUNT_FRAMELINES )),
+ aRestartEachPageCB ( this, SW_RES( CB_RESTART_PAGE )),
aCountFL ( this, SW_RES( FL_COUNT ))
{
@@ -120,7 +120,7 @@ __EXPORT SwLineNumberingPage::~SwLineNumberingPage()
{
}
-SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new SwLineNumberingPage( pParent, rSet );
}
@@ -145,22 +145,22 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& )
}
// Format
-// SwFldMgr aMgr( pSh );
+// SwFldMgr aMgr( pSh );
USHORT nSelFmt = rInf.GetNumType().GetNumberingType();
-// USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
-
-// for( USHORT i = 0; i < nCnt; i++)
-// {
-// aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
-// USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
-// aFormatLB.SetEntryData( i, (void*)nFmtId );
-// if( nFmtId == nSelFmt )
-// aFormatLB.SelectEntryPos( i );
-// }
+// USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
+
+// for( USHORT i = 0; i < nCnt; i++)
+// {
+// aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
+// USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
+// aFormatLB.SetEntryData( i, (void*)nFmtId );
+// if( nFmtId == nSelFmt )
+// aFormatLB.SelectEntryPos( i );
+// }
aFormatLB.SelectNumberingType(nSelFmt);
-// if ( !aFormatLB.GetSelectEntryCount() )
-// aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
+// if ( !aFormatLB.GetSelectEntryCount() )
+// aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
// Position
aPosLB.SelectEntryPos((USHORT)rInf.GetPos());
diff --git a/sw/source/ui/misc/linenum.hrc b/sw/source/ui/misc/linenum.hrc
index 235d13576aa3..93e17b64eb9d 100644
--- a/sw/source/ui/misc/linenum.hrc
+++ b/sw/source/ui/misc/linenum.hrc
@@ -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
@@ -24,27 +24,27 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define CB_NUMBERING_ON 1
+#define CB_NUMBERING_ON 1
#define FT_CHAR_STYLE 2
#define LB_CHAR_STYLE 3
#define FT_FORMAT 4
#define LB_FORMAT 5
#define FT_POS 6
-#define LB_POS 7
-#define FT_OFFSET 8
-#define MF_OFFSET 9
+#define LB_POS 7
+#define FT_OFFSET 8
+#define MF_OFFSET 9
#define FT_NUM_INVERVAL 10
#define NF_NUM_INVERVAL 11
-#define FT_NUM_ROWS 12
+#define FT_NUM_ROWS 12
#define FL_DISPLAY 13
#define FT_DIVISOR 14
#define ED_DIVISOR 15
#define FT_DIV_INTERVAL 16
#define NF_DIV_INTERVAL 17
-#define FT_DIV_ROWS 18
+#define FT_DIV_ROWS 18
#define FL_DIVISOR 19
#define CB_COUNT_EMPTYLINES 20
#define CB_COUNT_FRAMELINES 21
#define FL_COUNT 22
-#define CB_RESTART_PAGE 23
+#define CB_RESTART_PAGE 23
diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src
index b82828a86362..61cee918d72f 100644
--- a/sw/source/ui/misc/linenum.src
+++ b/sw/source/ui/misc/linenum.src
@@ -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
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 8d3543964fa3..f93b95bb5feb 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -2,7 +2,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
@@ -190,7 +190,7 @@ SwNumPositionTabPage::~SwNumPositionTabPage()
void SwNumPositionTabPage::InitControls()
{
- bInInintControl = TRUE;
+ bInInintControl = TRUE;
// --> OD 2008-02-01 #newlistlevelattrs#
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
@@ -308,7 +308,7 @@ void SwNumPositionTabPage::InitControls()
bSetDistEmpty = TRUE;
if(bSameDist)
- aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
+ aDistNumMF .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
else
aDistNumMF.SetText(aEmptyStr);
if(bSameIndent)
@@ -401,7 +401,7 @@ void SwNumPositionTabPage::InitControls()
if(TRUE == bSetDistEmpty)
aDistBorderMF.SetText(aEmptyStr);
- bInInintControl = FALSE;
+ bInInintControl = FALSE;
}
void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
@@ -564,7 +564,7 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
}
// <--
-SfxTabPage* SwNumPositionTabPage::Create( Window* pParent,
+SfxTabPage* SwNumPositionTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwNumPositionTabPage(pParent, rAttrSet);
@@ -602,8 +602,8 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
if(eMetric == FUNIT_MM)
{
aDistBorderMF .SetDecimalDigits(1);
- aDistNumMF .SetDecimalDigits(1);
- aIndentMF .SetDecimalDigits(1);
+ aDistNumMF .SetDecimalDigits(1);
+ aIndentMF .SetDecimalDigits(1);
// --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetDecimalDigits(1);
aAlignedAtMF.SetDecimalDigits(1);
@@ -611,8 +611,8 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
// <--
}
aDistBorderMF .SetUnit( eMetric );
- aDistNumMF .SetUnit( eMetric );
- aIndentMF .SetUnit( eMetric );
+ aDistNumMF .SetUnit( eMetric );
+ aIndentMF .SetUnit( eMetric );
// --> OD 2008-02-18 #newlistlevelattrs#
aListtabMF.SetUnit( eMetric );
aAlignedAtMF.SetUnit( eMetric );
@@ -787,7 +787,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
}
if(bSetValue)
- aDistBorderMF.SetValue(aDistBorderMF.Normalize(nValue), FUNIT_TWIP);
+ aDistBorderMF.SetValue(aDistBorderMF.Normalize(nValue), FUNIT_TWIP);
else
aDistBorderMF.SetText(aEmptyStr);
aDistBorderMF.Enable(bOn || bSingleSelection||0 != pOutlineDlg);
@@ -1055,7 +1055,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
rCharFmtLB.Clear();
rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
- ::FillCharStyleListBox(rCharFmtLB, pDocShell);
+ ::FillCharStyleListBox(rCharFmtLB, pDocShell);
List aList;
for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++)
{
@@ -1079,7 +1079,7 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)) );
rPage.PageCreated(aSet);
-// ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh);
+// ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh);
}
break;
}
diff --git a/sw/source/ui/misc/num.hrc b/sw/source/ui/misc/num.hrc
index 379c8cb3e56d..6156208ff989 100644
--- a/sw/source/ui/misc/num.hrc
+++ b/sw/source/ui/misc/num.hrc
@@ -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
@@ -27,20 +27,20 @@
#define FL_LEVEL 1
-#define LB_LEVEL 2
+#define LB_LEVEL 2
#define FL_POSITION 3
#define FT_BORDERDIST 4
#define MF_BORDERDIST 5
#define CB_RELATIVE 6
-#define FT_INDENT 7
-#define MF_INDENT 8
-#define FT_NUMDIST 9
-#define MF_NUMDIST 10
-#define FT_ALIGN 11
+#define FT_INDENT 7
+#define MF_INDENT 8
+#define FT_NUMDIST 9
+#define MF_NUMDIST 10
+#define FT_ALIGN 11
#define LB_ALIGN 12
#define PB_STANDARD 13
#define WIN_PREVIEW 15
-#define ST_RESET 16
+#define ST_RESET 16
#define FT_LABEL_FOLLOWED_BY 17
#define LB_LABEL_FOLLOWED_BY 18
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index a89c30bb032a..0fbc45eb1c2f 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -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
@@ -36,7 +36,7 @@
/**************************************************************************/
/* */
-/* TabPage Positionen */
+/* TabPage Positionen */
/* */
/**************************************************************************/
TabPage TP_NUM_POSITION
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index e765fd2df33f..223be3177cae 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -2,7 +2,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
@@ -92,7 +92,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags)
bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_NO_NUMBERING);
nPos = 0;
break;
- case style::NumberingType::CHAR_SPECIAL: bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BULLET); break;
+ case style::NumberingType::CHAR_SPECIAL: bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BULLET); break;
case style::NumberingType::PAGE_DESCRIPTOR:bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING); break;
case style::NumberingType::BITMAP:bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BITMAP ); break;
default:
@@ -141,7 +141,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags)
}
}
-sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType()
+sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType()
{
sal_Int16 nRet = 0;
USHORT nSelPos = GetSelectEntryPos();
@@ -154,7 +154,7 @@ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType()
return nRet;
}
-sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType)
+sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType)
{
USHORT nPos = GetEntryPos((void*)(ULONG)nType);
SelectEntryPos( nPos );
diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src
index 8ca6e214e614..96bf9142a63f 100644
--- a/sw/source/ui/misc/numberingtypelistbox.src
+++ b/sw/source/ui/misc/numberingtypelistbox.src
@@ -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
@@ -34,16 +34,16 @@ Resource STRRES_NUMTYPES
ItemList [ en-US ] =
{
- < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
- < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
- < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
- < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
- < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
- < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+ < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
+ < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
+ < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
+ < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
+ < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
+ < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
< "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
- < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
- < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
- < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
+ < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
+ < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
+ < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
< "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ;
< "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
< "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 0a21d2ae19b3..26932fc0ba61 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@
#include <viewopt.hxx>
#include <svtools/ctrlbox.hxx>
#include <helpid.h>
-#include <globals.hrc> // fuer Vorlagenname 'keins'
+#include <globals.hrc> // fuer Vorlagenname 'keins'
#include <misc.hrc>
#include <outline.hrc>
#include <paratr.hxx>
@@ -200,8 +200,8 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() );
GetCancelButton().SetClickHdl(LINK(this, SwOutlineTabDialog, CancelHdl));
- AddTabPage(TP_NUM_POSITION , &SwNumPositionTabPage::Create, 0);
- AddTabPage(TP_OUTLINE_NUM , &SwOutlineSettingsTabPage::Create, 0);
+ AddTabPage(TP_NUM_POSITION , &SwNumPositionTabPage::Create, 0);
+ AddTabPage(TP_OUTLINE_NUM , &SwOutlineSettingsTabPage::Create, 0);
String sHeadline;
USHORT i;
@@ -222,7 +222,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
if(!rTxtColl.IsDefault())
{
- //BYTE nOutLevel = rTxtColl.GetOutlineLevel(); //<-#outline level, removed out by zhaojianwei
+ //BYTE nOutLevel = rTxtColl.GetOutlineLevel(); //<-#outline level, removed out by zhaojianwei
//if(nOutLevel != NO_NUMBERING)
//->added by zhaojianwei
if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
@@ -240,7 +240,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog()
delete pNumRule;
}
-void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
+void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
{
switch ( nPageId )
{
@@ -281,15 +281,15 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
BYTE nLevelNo = 0;
switch(pMenu->GetCurItemId())
{
- case MN_FORM1: nLevelNo = 1; break;
- case MN_FORM2: nLevelNo = 2; break;
- case MN_FORM3: nLevelNo = 3; break;
- case MN_FORM4: nLevelNo = 4; break;
- case MN_FORM5: nLevelNo = 5; break;
- case MN_FORM6: nLevelNo = 6; break;
- case MN_FORM7: nLevelNo = 7; break;
- case MN_FORM8: nLevelNo = 8; break;
- case MN_FORM9: nLevelNo = 9; break;
+ case MN_FORM1: nLevelNo = 1; break;
+ case MN_FORM2: nLevelNo = 2; break;
+ case MN_FORM3: nLevelNo = 3; break;
+ case MN_FORM4: nLevelNo = 4; break;
+ case MN_FORM5: nLevelNo = 5; break;
+ case MN_FORM6: nLevelNo = 6; break;
+ case MN_FORM7: nLevelNo = 7; break;
+ case MN_FORM8: nLevelNo = 8; break;
+ case MN_FORM9: nLevelNo = 9; break;
case MN_SAVE:
{
@@ -330,21 +330,21 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
*pNumRule = *rWrtSh.GetOutlineNumRule();
}
- USHORT nPageId = GetCurPageId();
- SfxTabPage* pPage = GetTabPage( nPageId );
+ USHORT nPageId = GetCurPageId();
+ SfxTabPage* pPage = GetTabPage( nPageId );
pPage->Reset(*GetOutputItemSet());
return 0;
}
-USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const
+USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const
{
for(USHORT i = 0; i < MAXLEVEL; ++i)
{
if(aCollNames[i] == rFmtName)
return i;
}
- return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei
+ return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei
}
@@ -374,22 +374,22 @@ short SwOutlineTabDialog::Ok()
const SfxPoolItem & rItem =
rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, FALSE);
- //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) //#outline level,removed by zhaojianwei
+ //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) //#outline level,removed by zhaojianwei
//{
- // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() ==
- // pOutlineRule->GetName())
- // {
- // rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE);
- // }
+ // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() ==
+ // pOutlineRule->GetName())
+ // {
+ // rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE);
+ // }
//}
//else
//{
- // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
- // pOutlineRule->GetName())
- // {
- // SwNumRuleItem aItem(pOutlineRule->GetName());
- // rTxtColl.SetFmtAttr(aItem);
- // }
+ // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
+ // pOutlineRule->GetName())
+ // {
+ // SwNumRuleItem aItem(pOutlineRule->GetName());
+ // rTxtColl.SetFmtAttr(aItem);
+ // }
//}
if ((BYTE)GetLevel(rTxtColl.GetName()) == MAXLEVEL) //add by zhaojianwei
{
@@ -405,7 +405,7 @@ short SwOutlineTabDialog::Ok()
}
else
{
- rTxtColl.AssignToListLevelOfOutlineStyle(GetLevel(rTxtColl.GetName()));
+ rTxtColl.AssignToListLevelOfOutlineStyle(GetLevel(rTxtColl.GetName()));
if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
pOutlineRule->GetName())
@@ -413,7 +413,7 @@ short SwOutlineTabDialog::Ok()
SwNumRuleItem aItem(pOutlineRule->GetName());
rTxtColl.SetFmtAttr(aItem);
}
- } //<-end,zhaojianwei
+ } //<-end,zhaojianwei
}
}
@@ -425,30 +425,30 @@ short SwOutlineTabDialog::Ok()
SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline );
if( !pColl )
{
- //if( !aCollNames[i].Len() ) //#outline level,removed by zhaojianwei
+ //if( !aCollNames[i].Len() ) //#outline level,removed by zhaojianwei
//{
- // SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
- // static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) );
- // pTxtColl->SetOutlineLevel( NO_NUMBERING );
- // pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
+ // SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
+ // static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) );
+ // pTxtColl->SetOutlineLevel( NO_NUMBERING );
+ // pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
//}
//else if(aCollNames[i] != sHeadline)
//{
- // SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle(
- // aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
- // if(pTxtColl)
- // {
- // pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) );
-
- // SwNumRuleItem aItem(pOutlineRule->GetName());
- // pTxtColl->SetFmtAttr(aItem);
- // }
+ // SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle(
+ // aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
+ // if(pTxtColl)
+ // {
+ // pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) );
+
+ // SwNumRuleItem aItem(pOutlineRule->GetName());
+ // pTxtColl->SetFmtAttr(aItem);
+ // }
//}
if(aCollNames[i] != sHeadline)//->added by zhaojianwei
{
SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) );
- pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle();
+ pTxtColl->DeleteAssignmentToListLevelOfOutlineStyle();
pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
if( aCollNames[i].Len() )
@@ -457,7 +457,7 @@ short SwOutlineTabDialog::Ok()
aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
if(pTxtColl)
{
- pTxtColl->AssignToListLevelOfOutlineStyle(i);
+ pTxtColl->AssignToListLevelOfOutlineStyle(i);
SwNumRuleItem aItem(pOutlineRule->GetName());
pTxtColl->SetFmtAttr(aItem);
}
@@ -485,8 +485,8 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES),
aCharFmtFT(this, SW_RES(FT_CHARFMT)),
aCharFmtLB(this, SW_RES(LB_CHARFMT)),
- aAllLevelFT( this, SW_RES(FT_ALL_LEVEL)),
- aAllLevelNF( this, SW_RES(NF_ALL_LEVEL)),
+ aAllLevelFT( this, SW_RES(FT_ALL_LEVEL)),
+ aAllLevelNF( this, SW_RES(NF_ALL_LEVEL)),
aDelim(this, SW_RES(FT_DELIM)),
aPrefixFT(this, SW_RES(FT_PREFIX)),
aPrefixED(this, SW_RES(ED_PREFIX)),
@@ -506,19 +506,19 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
SetExchangeSupport();
aCollBox.InsertEntry(aNoFmtName);
- aLevelLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl));
+ aLevelLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, LevelHdl));
aAllLevelNF.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, ToggleComplete));
- aCollBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect));
- aCollBox.SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus));
- aNumberBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect));
- aPrefixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
- aSuffixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
- aStartEdit.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified));
- aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl));
+ aCollBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CollSelect));
+ aCollBox.SetGetFocusHdl(LINK(this, SwOutlineSettingsTabPage, CollSelectGetFocus));
+ aNumberBox.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, NumberSelect));
+ aPrefixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
+ aSuffixED.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, DelimModify));
+ aStartEdit.SetModifyHdl(LINK(this, SwOutlineSettingsTabPage, StartModified));
+ aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl));
}
-void SwOutlineSettingsTabPage::Update()
+void SwOutlineSettingsTabPage::Update()
{
// falls eine Vorlage fuer diese Ebene bereits selektiert wurde,
// diese in der ListBox auswaehlean
@@ -543,13 +543,13 @@ void SwOutlineSettingsTabPage::Update()
pFirstFmt = aNumFmtArr[i]->GetCharFmt();
else
{
- bSameType &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType();
- bSameStart &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart();
+ bSameType &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType();
+ bSameStart &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart();
bSamePrefix &= aNumFmtArr[i]->GetPrefix() == aNumFmtArr[0]->GetPrefix();
bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix();
bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels();
const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt();
- bSameCharFmt &= !pFirstFmt && !pFmt
+ bSameCharFmt &= !pFirstFmt && !pFmt
|| pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName();
}
}
@@ -776,7 +776,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG )
{
-// bAutomaticCharStyles = FALSE;
+// bAutomaticCharStyles = FALSE;
String sEntry = aCharFmtLB.GetSelectEntry();
USHORT nMask = 1;
BOOL bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone;
@@ -907,12 +907,12 @@ BOOL SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& )
return TRUE;
}
-void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet )
+void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet )
{
ActivatePage(rSet);
}
-SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent,
+SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet)
{
return new SwOutlineSettingsTabPage(pParent, rAttrSet);
@@ -1223,7 +1223,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
}
}
}
- DrawOutDev( Point(0,0), aSize,
+ DrawOutDev( Point(0,0), aSize,
Point(0,0), aSize,
*pVDev );
delete pVDev;
diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc
index 2f8a4a469cb4..2d24c719543a 100644
--- a/sw/source/ui/misc/outline.hrc
+++ b/sw/source/ui/misc/outline.hrc
@@ -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
@@ -53,7 +53,7 @@
#define CB_COMPLETE 29
#define FL_NUMBER 30
-#define LB_ALIGN 31
+#define LB_ALIGN 31
#define FL_ALIGN 33
#define FT_START 40
@@ -71,7 +71,7 @@
#define FT_ALL_LEVEL 108
#define NF_ALL_LEVEL 109
-#define MN_FORM 110
+#define MN_FORM 110
#define MN_FORM1 111
#define MN_FORMBASE MN_FORM1
#define MN_FORM2 112
@@ -85,14 +85,14 @@
#define MN_SAVE 120
#define FL_LEVEL 130
-#define LB_LEVEL 131
+#define LB_LEVEL 131
#define WIN_PREVIEW 132
-#define FT_SUFFIX 134
-#define ED_SUFFIX 135
-#define FT_PREFIX 136
-#define ED_PREFIX 137
-#define ST_NO_COLL 138
+#define FT_SUFFIX 134
+#define ED_SUFFIX 135
+#define FT_PREFIX 136
+#define ED_PREFIX 137
+#define ST_NO_COLL 138
-#define ST_FORM 140
-#define FT_CHARFMT 141
+#define ST_FORM 140
+#define FT_CHARFMT 141
#define LB_CHARFMT 141
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index d7dffb4a000b..64dd97494a4e 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -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
@@ -200,7 +200,7 @@ TabDialog DLG_TAB_OUTLINE
};
/**************************************************************************/
/* */
-/* TabPage */
+/* TabPage */
/* */
/**************************************************************************/
TabPage TP_OUTLINE_NUM
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 83029d360fc6..018047d651fc 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -2,7 +2,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
@@ -79,7 +79,7 @@ static USHORT __FAR_DATA aPageRg[] = {
};
/*------------------------------------------------------------------------
- Beschreibung: liefert zurueck, ob die Linienbreite nWidth bereits
+ Beschreibung: liefert zurueck, ob die Linienbreite nWidth bereits
in der Listbox enthalten ist.
------------------------------------------------------------------------*/
BOOL lcl_HasLineWidth(USHORT nWidth)
@@ -92,7 +92,7 @@ BOOL lcl_HasLineWidth(USHORT nWidth)
}
/*------------------------------------------------------------------------
- Beschreibung: Handler fuer umschalten zwischen den unterschiedlichen
+ Beschreibung: Handler fuer umschalten zwischen den unterschiedlichen
Arten, wie die Hoehe des Fussnotenbereiches angegeben
werden kann.
------------------------------------------------------------------------*/
@@ -113,7 +113,7 @@ IMPL_LINK_INLINE_START( SwFootNotePage, HeightMetric, Button *, EMPTYARG )
IMPL_LINK_INLINE_END( SwFootNotePage, HeightMetric, Button *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Handler Grenzwerte
+ Beschreibung: Handler Grenzwerte
------------------------------------------------------------------------*/
IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG )
{
@@ -143,29 +143,29 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, SW_RES(TP_FOOTNOTE_PAGE), rSet),
aMaxHeightPageBtn(this, SW_RES(RB_MAXHEIGHT_PAGE)),
- aMaxHeightBtn(this, SW_RES(RB_MAXHEIGHT)),
- aMaxHeightEdit(this, SW_RES(ED_MAXHEIGHT)),
- aDistLbl(this, SW_RES(FT_DIST)),
- aDistEdit(this, SW_RES(ED_DIST)),
- aPosHeader(this, SW_RES(FL_FOOTNOTE_SIZE)),
-
- aLinePosLbl(this, SW_RES(FT_LINEPOS)),
- aLinePosBox(this, SW_RES(DLB_LINEPOS)),
- aLineTypeLbl(this, SW_RES(FT_LINETYPE)),
- aLineTypeBox(this, SW_RES(DLB_LINETYPE)),
- aLineWidthLbl(this, SW_RES(FT_LINEWIDTH)),
- aLineWidthEdit(this, SW_RES(ED_LINEWIDTH)),
- aLineDistLbl(this, SW_RES(FT_LINEDIST)),
- aLineDistEdit(this, SW_RES(ED_LINEDIST)),
- aLineHeader(this, SW_RES(FL_LINE))
+ aMaxHeightBtn(this, SW_RES(RB_MAXHEIGHT)),
+ aMaxHeightEdit(this, SW_RES(ED_MAXHEIGHT)),
+ aDistLbl(this, SW_RES(FT_DIST)),
+ aDistEdit(this, SW_RES(ED_DIST)),
+ aPosHeader(this, SW_RES(FL_FOOTNOTE_SIZE)),
+
+ aLinePosLbl(this, SW_RES(FT_LINEPOS)),
+ aLinePosBox(this, SW_RES(DLB_LINEPOS)),
+ aLineTypeLbl(this, SW_RES(FT_LINETYPE)),
+ aLineTypeBox(this, SW_RES(DLB_LINETYPE)),
+ aLineWidthLbl(this, SW_RES(FT_LINEWIDTH)),
+ aLineWidthEdit(this, SW_RES(ED_LINEWIDTH)),
+ aLineDistLbl(this, SW_RES(FT_LINEDIST)),
+ aLineDistEdit(this, SW_RES(ED_LINEDIST)),
+ aLineHeader(this, SW_RES(FL_LINE))
{
FreeResource();
SetExchangeSupport();
FieldUnit aMetric = ::GetDfltMetric(FALSE);
- SetMetric( aMaxHeightEdit, aMetric );
- SetMetric( aDistEdit, aMetric );
- SetMetric( aLineDistEdit, aMetric );
+ SetMetric( aMaxHeightEdit, aMetric );
+ SetMetric( aDistEdit, aMetric );
+ SetMetric( aLineDistEdit, aMetric );
MeasurementSystem eSys = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
long nHeightValue = MEASURE_METRIC != eSys ? 1440 : 1134;
aMaxHeightEdit.SetValue(aMaxHeightEdit.Normalize(nHeightValue),FUNIT_TWIP);;
@@ -243,7 +243,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Beschreibung: Attribute in den Set stopfen bei OK
--------------------------------------------------------------------*/
BOOL SwFootNotePage::FillItemSet(SfxItemSet &rSet)
{
diff --git a/sw/source/ui/misc/pgfnote.hrc b/sw/source/ui/misc/pgfnote.hrc
index fe94849c6d66..c213f29f309c 100644
--- a/sw/source/ui/misc/pgfnote.hrc
+++ b/sw/source/ui/misc/pgfnote.hrc
@@ -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
@@ -25,20 +25,20 @@
*
************************************************************************/
-#define RB_MAXHEIGHT_PAGE 1
-#define RB_MAXHEIGHT 2
-#define ED_MAXHEIGHT 3
-#define FT_DIST 4
-#define ED_DIST 5
-#define FL_FOOTNOTE_SIZE 10
+#define RB_MAXHEIGHT_PAGE 1
+#define RB_MAXHEIGHT 2
+#define ED_MAXHEIGHT 3
+#define FT_DIST 4
+#define ED_DIST 5
+#define FL_FOOTNOTE_SIZE 10
-#define FT_LINETYPE 20
-#define DLB_LINETYPE 21
-#define FT_LINEPOS 22
-#define DLB_LINEPOS 23
-#define FT_LINEWIDTH 24
-#define ED_LINEWIDTH 25
-#define FT_LINEDIST 26
-#define ED_LINEDIST 27
-#define FL_LINE 30
+#define FT_LINETYPE 20
+#define DLB_LINETYPE 21
+#define FT_LINEPOS 22
+#define DLB_LINEPOS 23
+#define FT_LINEWIDTH 24
+#define ED_LINEWIDTH 25
+#define FT_LINEDIST 26
+#define ED_LINEDIST 27
+#define FL_LINE 30
diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src
index 4ad558da0117..18acc28267ec 100644
--- a/sw/source/ui/misc/pgfnote.src
+++ b/sw/source/ui/misc/pgfnote.src
@@ -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
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index b936ebb5b265..91caa65b36d2 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -2,7 +2,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
@@ -106,7 +106,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
aControls[7] =&aCharWidthFT;
aControls[8] =&aCharWidthMF;
aControls[9] =&aRubySizeFT;
- aControls[10] =&aRubySizeMF;
+ aControls[10] =&aRubySizeMF;
aControls[11] =&aRubyBelowCB;
aControls[12] =&aDisplayFL;
aControls[13] =&aDisplayCB;
@@ -124,18 +124,18 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
aLinesPerPageNF.SetUpHdl(aLink);
aLinesPerPageNF.SetDownHdl(aLink);
aLinesPerPageNF.SetLoseFocusHdl(aLink);
-
+
Link aSizeLink = LINK(this, SwTextGridPage, TextSizeChangedHdl);
aTextSizeMF.SetUpHdl(aSizeLink);
aTextSizeMF.SetDownHdl(aSizeLink);
aTextSizeMF.SetLoseFocusHdl(aSizeLink);
aRubySizeMF.SetUpHdl(aSizeLink);
aRubySizeMF.SetDownHdl(aSizeLink);
- aRubySizeMF.SetLoseFocusHdl(aSizeLink);
+ aRubySizeMF.SetLoseFocusHdl(aSizeLink);
aCharWidthMF.SetUpHdl(aSizeLink);
aCharWidthMF.SetDownHdl(aSizeLink);
aCharWidthMF.SetLoseFocusHdl(aSizeLink);
-
+
Link aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl);
aNoGridRB .SetClickHdl(aGridTypeHdl);
aLinesGridRB.SetClickHdl(aGridTypeHdl);
@@ -144,7 +144,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
Link aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl);
aColorLB.SetSelectHdl(aModifyLk);
aPrintCB.SetClickHdl(aModifyLk);
- aRubyBelowCB.SetClickHdl(aModifyLk);
+ aRubyBelowCB.SetClickHdl(aModifyLk);
aDisplayCB.SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl));
@@ -335,7 +335,7 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get(
RES_LR_SPACE );
const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)rSet.Get(
- RES_UL_SPACE );
+ RES_UL_SPACE );
const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX);
sal_Int32 nDistanceLR = rLRSpace.GetLeft() + rLRSpace.GetRight();
sal_Int32 nDistanceUL = rULSpace.GetUpper() + rULSpace.GetLower();
@@ -360,7 +360,7 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
sal_Int32 nTextSize = static_cast< sal_Int32 >(m_bRubyUserValue ?
m_nRubyUserValue :
aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
-
+
if ( m_bSquaredMode )
{
aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextSize);
@@ -376,7 +376,7 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
sal_Int32 nTextWidth = static_cast< sal_Int32 >(aCharWidthMF.Denormalize(aCharWidthMF.GetValue(FUNIT_TWIP)));
aLinesPerPageNF.SetValue(m_aPageSize.Height() / nTextSize);
if (nTextWidth)
- aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth);
+ aCharsPerLineNF.SetValue(m_aPageSize.Width() / nTextWidth);
else
aCharsPerLineNF.SetValue( 45 );
SetLinesOrCharsRanges( aCharsRangeFT , aCharsPerLineNF.GetMax() );
@@ -413,7 +413,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
//prevent rounding errors in the MetricField by saving the used value
m_nRubyUserValue = nWidth;
m_bRubyUserValue = sal_True;
-
+
}
//set maximum line per page
{
@@ -433,7 +433,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
aTextSizeMF.SetValue(aTextSizeMF.Normalize(nHeight), FUNIT_TWIP);
aRubySizeMF.SetValue(0, FUNIT_TWIP);
SetLinesOrCharsRanges( aLinesRangeFT , aLinesPerPageNF.GetMax() );
-
+
m_nRubyUserValue = nHeight;
m_bRubyUserValue = sal_True;
}
@@ -500,10 +500,10 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
//one special case
if(bEnable)
DisplayGridHdl(&aDisplayCB);
-
+
bEnable = &aCharsGridRB == pButton;
aSnapToCharsCB.Enable(bEnable);
-
+
bEnable = &aLinesGridRB == pButton;
if(bEnable && !m_bSquaredMode )
{
@@ -513,7 +513,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
aCharWidthFT.Enable(sal_False);
aCharWidthMF.Enable(sal_False);
}
-
+
GridModifyHdl(0);
return 0;
}
diff --git a/sw/source/ui/misc/pggrid.hrc b/sw/source/ui/misc/pggrid.hrc
index e736e5040dbb..567a1df33a5c 100644
--- a/sw/source/ui/misc/pggrid.hrc
+++ b/sw/source/ui/misc/pggrid.hrc
@@ -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
diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src
index 747e1325d3da..a6377dd25f84 100644
--- a/sw/source/ui/misc/pggrid.src
+++ b/sw/source/ui/misc/pggrid.src
@@ -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
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 58f7bbc9bf7a..3dcffbe90b52 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -2,7 +2,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
@@ -106,7 +106,7 @@ BOOL SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh)
{
BOOL bRet;
- if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
+ if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
((SwModelessRedlineAcceptDlg*)GetWindow())->Activate();
return bRet;
@@ -116,7 +116,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( SfxBindings* _pBindings,
SwChildWinWrapper* pChild,
Window *_pParent) :
SfxModelessDialog(_pBindings, pChild, _pParent, SW_RES(DLG_REDLINE_ACCEPT)),
- pChildWin (pChild)
+ pChildWin (pChild)
{
pImplDlg = new SwRedlineAcceptDlg(this);
@@ -127,17 +127,17 @@ void SwModelessRedlineAcceptDlg::Activate()
{
SwView *pView = ::GetActiveView();
- if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
- return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
+ if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
+ return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
SwDocShell *pDocSh = pView->GetDocShell();
if (pChildWin->GetOldDocShell() != pDocSh)
- { // Dok-Wechsel
+ { // Dok-Wechsel
SwWait aWait( *pDocSh, FALSE );
SwWrtShell* pSh = pView->GetWrtShellPtr();
- pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl)
+ pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl)
BOOL bMod = pSh->IsModified();
SfxBoolItem aShow(FN_REDLINE_SHOW, TRUE);
@@ -180,7 +180,7 @@ SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg()
}
SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) :
- pParentDlg (pParent),
+ pParentDlg (pParent),
aTabPagesCTRL (pParent, SW_RES(CTRL_TABPAGES)),
aPopup (SW_RES(MN_REDLINE_POPUP)),
sInserted (SW_RES(STR_REDLINE_INSERTED)),
@@ -190,8 +190,8 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) :
sFmtCollSet (SW_RES(STR_REDLINE_FMTCOLLSET)),
sAutoFormat (SW_RES(STR_REDLINE_AUTOFMT)),
bOnlyFormatedRedlines( FALSE ),
- bHasReadonlySel ( FALSE ),
- bRedlnAutoFmt (bAutoFmt),
+ bHasReadonlySel ( FALSE ),
+ bRedlnAutoFmt (bAutoFmt),
bInhibitActivate( false )
{
aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL);
@@ -218,7 +218,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) :
pActLB->InsertEntry(sFmtCollSet);
pActLB->InsertEntry(sAutoFormat);
pTPView->ShowUndo(TRUE);
- pTPView->DisableUndo(); // Noch gibts keine UNDO-Events
+ pTPView->DisableUndo(); // Noch gibts keine UNDO-Events
}
pActLB->SelectEntryPos(0);
@@ -323,8 +323,8 @@ void SwRedlineAcceptDlg::InitAuthors()
bOnlyFormatedRedlines = FALSE;
//JP 27.9.2001: make no sense if we handle readonly sections
-// if( !bHasReadonlySel && rRedln.HasReadonlySel() )
-// bHasReadonlySel = TRUE;
+// if( !bHasReadonlySel && rRedln.HasReadonlySel() )
+// bHasReadonlySel = TRUE;
String *pAuthor = new String(rRedln.GetAuthorString());
if (!aStrings.Insert(pAuthor))
@@ -387,11 +387,11 @@ const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, USHORT
{
switch( rRedln.GetType(nStack) )
{
- case nsRedlineType_t::REDLINE_INSERT: return sInserted;
- case nsRedlineType_t::REDLINE_DELETE: return sDeleted;
- case nsRedlineType_t::REDLINE_FORMAT: return sFormated;
- case nsRedlineType_t::REDLINE_TABLE: return sTableChgd;
- case nsRedlineType_t::REDLINE_FMTCOLL: return sFmtCollSet;
+ case nsRedlineType_t::REDLINE_INSERT: return sInserted;
+ case nsRedlineType_t::REDLINE_DELETE: return sDeleted;
+ case nsRedlineType_t::REDLINE_FORMAT: return sFormated;
+ case nsRedlineType_t::REDLINE_TABLE: return sTableChgd;
+ case nsRedlineType_t::REDLINE_FMTCOLL: return sFmtCollSet;
default:;//prevent warning
}
@@ -424,10 +424,10 @@ void SwRedlineAcceptDlg::Activate()
aUsedSeqNo.Remove((USHORT)0, aUsedSeqNo.Count());
- if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
- return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
+ if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
+ return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
-/* if (HasRedlineAutoFmt())
+/* if (HasRedlineAutoFmt())
{
Init();
return;
@@ -527,13 +527,13 @@ USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild)
}
pTable->SetUpdateMode(FALSE);
- SwView *pView = ::GetActiveView();
- SwWrtShell* pSh = pView->GetWrtShellPtr();
+ SwView *pView = ::GetActiveView();
+ SwWrtShell* pSh = pView->GetWrtShellPtr();
USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
SwRedlineDataParent *pParent = aRedlineParents[nStart];
const SwRedline& rRedln = pSh->GetRedline(nStart);
- if (bChild) // Sollte eigentlich nie vorkommen, aber sicher ist sicher...
+ if (bChild) // Sollte eigentlich nie vorkommen, aber sicher ist sicher...
{
// Alle Childs des Eintrags wegwerfen und neu initialisieren
SwRedlineDataChildPtr pBackupData = (SwRedlineDataChildPtr)pParent->pNext;
@@ -587,7 +587,7 @@ USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild)
}
pTable->SetUpdateMode(TRUE);
- Init(nStart); // Alle Eintraege bis zum Ende abgleichen
+ Init(nStart); // Alle Eintraege bis zum Ende abgleichen
return USHRT_MAX;
}
@@ -605,7 +605,7 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl
{
USHORT nPos;
- if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // Gibts schon
+ if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // Gibts schon
{
if (pParent->pTLBParent)
{
@@ -696,7 +696,7 @@ void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd)
if (pCurEntry)
pTable->SetCurEntry(pCurEntry);
- SvLBoxTreeList* pModel = pTable->GetModel();
+ SvLBoxTreeList* pModel = pTable->GetModel();
for (USHORT i = nStart; i <= nEnd; i++)
{
@@ -746,16 +746,16 @@ void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd)
void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd)
{
- SwView *pView = ::GetActiveView();
- SwWrtShell* pSh = pView->GetWrtShellPtr();
- USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
+ SwView *pView = ::GetActiveView();
+ SwWrtShell* pSh = pView->GetWrtShellPtr();
+ USHORT nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0;
String sParent;
USHORT nCount = pSh->GetRedlineCount();
- nEnd = Min((USHORT)nEnd, (USHORT)(nCount - 1)); // Handelt auch nEnd=USHRT_MAX (bis zum Ende) ab
+ nEnd = Min((USHORT)nEnd, (USHORT)(nCount - 1)); // Handelt auch nEnd=USHRT_MAX (bis zum Ende) ab
if (nEnd == USHRT_MAX)
- return; // Keine Redlines im Dokument
+ return; // Keine Redlines im Dokument
RedlinData *pData;
SvLBoxEntry *pParent;
@@ -781,8 +781,8 @@ void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd)
const SwRedlineData *pRedlineData = &rRedln.GetRedlineData();
pRedlineParent = new SwRedlineDataParent;
- pRedlineParent->pData = pRedlineData;
- pRedlineParent->pNext = 0;
+ pRedlineParent->pData = pRedlineData;
+ pRedlineParent->pNext = 0;
String sComment(rRedln.GetComment());
sComment.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' ');
pRedlineParent->sComment = sComment;
@@ -1011,7 +1011,7 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
if (pTable->IsSelected(pActEntry))
{
pSelEntry = pActEntry = pTable->NextSelected(pSelEntry);
- continue; // Nicht zweimal selektieren
+ continue; // Nicht zweimal selektieren
}
}
else
@@ -1026,8 +1026,8 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType();
//JP 27.9.2001: make no sense if we handle readonly sections
-// if( !bReadonlySel && rRedln.HasReadonlySel() )
-// bReadonlySel = TRUE;
+// if( !bReadonlySel && rRedln.HasReadonlySel() )
+// bReadonlySel = TRUE;
if (pSh->GotoRedline(nPos, TRUE))
{
@@ -1085,7 +1085,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
!pTable->GetParent(pEntry) &&
!pTable->NextSelected(pEntry)
//JP 27.9.2001: make no sense if we handle readonly sections
-// && pRed->HasReadonlySel()
+// && pRed->HasReadonlySel()
);
aPopup.EnableItem( MN_SUB_SORT, pTable->First() != 0 );
@@ -1194,11 +1194,11 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
{
bSortDir = TRUE;
if (nRet - MN_SORT_ACTION == 4 && pTable->GetSortedCol() == 0xffff)
- break; // Haben wir schon
+ break; // Haben wir schon
nSortMode = nRet - MN_SORT_ACTION;
if (nSortMode == 4)
- nSortMode = 0xffff; // unsortiert bzw sortiert nach Position
+ nSortMode = 0xffff; // unsortiert bzw sortiert nach Position
if (pTable->GetSortedCol() == nSortMode)
bSortDir = !pTable->GetSortDirection();
@@ -1206,7 +1206,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
SwWait aWait( *::GetActiveView()->GetDocShell(), FALSE );
pTable->SortByCol(nSortMode, bSortDir);
if (nSortMode == 0xffff)
- Init(); // Alles neu fuellen
+ Init(); // Alles neu fuellen
}
break;
}
@@ -1258,7 +1258,7 @@ void SwRedlineAcceptDlg::FillInfo(String &rExtraData) const
{
rExtraData.AppendAscii("AcceptChgDat:(");
- USHORT nCount = pTable->TabCount();
+ USHORT nCount = pTable->TabCount();
rExtraData += String::CreateFromInt32(nCount);
rExtraData += ';';
diff --git a/sw/source/ui/misc/redlndlg.hrc b/sw/source/ui/misc/redlndlg.hrc
index 838b79f37d48..927d247c7948 100644
--- a/sw/source/ui/misc/redlndlg.hrc
+++ b/sw/source/ui/misc/redlndlg.hrc
@@ -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
@@ -24,15 +24,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define CTRL_TABPAGES 1
+#define CTRL_TABPAGES 1
-#define MN_EDIT_COMMENT 1
-#define MN_SUB_SORT 2
-#define MN_SORT_ACTION 3
-#define MN_SORT_AUTHOR 4
-#define MN_SORT_DATE 5
-#define MN_SORT_COMMENT 6
-#define MN_SORT_POSITION 7
+#define MN_EDIT_COMMENT 1
+#define MN_SUB_SORT 2
+#define MN_SORT_ACTION 3
+#define MN_SORT_AUTHOR 4
+#define MN_SORT_DATE 5
+#define MN_SORT_COMMENT 6
+#define MN_SORT_POSITION 7
-#define XBORDER 3
-#define YBORDER 3
+#define XBORDER 3
+#define YBORDER 3
diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/ui/misc/redlndlg.src
index 39418495363c..3af8626ee81b 100644
--- a/sw/source/ui/misc/redlndlg.src
+++ b/sw/source/ui/misc/redlndlg.src
@@ -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
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index cce1afa34754..0abd31faf002 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -2,7 +2,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,13 +73,13 @@ static USHORT nType3 = 0;
static USHORT nLang = LANGUAGE_NONE;
-static BOOL bAsc1 = TRUE;
-static BOOL bAsc2 = TRUE;
-static BOOL bAsc3 = TRUE;
-static BOOL bCol = FALSE;
-static BOOL bCsSens= FALSE;
+static BOOL bAsc1 = TRUE;
+static BOOL bAsc2 = TRUE;
+static BOOL bAsc3 = TRUE;
+static BOOL bCol = FALSE;
+static BOOL bCsSens= FALSE;
-static sal_Unicode cDeli = '\t';
+static sal_Unicode cDeli = '\t';
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -95,7 +95,7 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
}
/*--------------------------------------------------------------------
- Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten
+ Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten
feststellen
--------------------------------------------------------------------*/
BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY )
@@ -128,45 +128,45 @@ BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY )
SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
SvxStandardDialog(pParent, SW_RES(DLG_SORTING)),
- aColLbl(this, SW_RES(FT_COL )),
- aTypLbl(this, SW_RES(FT_KEYTYP)),
- aDirLbl(this, SW_RES(FT_DIR )),
+ aColLbl(this, SW_RES(FT_COL )),
+ aTypLbl(this, SW_RES(FT_KEYTYP)),
+ aDirLbl(this, SW_RES(FT_DIR )),
aDirFL(this, SW_RES(FL_DIR )),
aKeyCB1(this, SW_RES(CB_KEY1 )),
- aColEdt1(this, SW_RES(ED_KEY1 )),
- aTypDLB1(this, SW_RES(DLB_KEY1 )),
- aSortUpRB(this, SW_RES(RB_UP )),
- aSortDnRB(this, SW_RES(RB_DN )),
+ aColEdt1(this, SW_RES(ED_KEY1 )),
+ aTypDLB1(this, SW_RES(DLB_KEY1 )),
+ aSortUpRB(this, SW_RES(RB_UP )),
+ aSortDnRB(this, SW_RES(RB_DN )),
aKeyCB2(this, SW_RES(CB_KEY2 )),
- aColEdt2(this, SW_RES(ED_KEY2 )),
- aTypDLB2(this, SW_RES(DLB_KEY2 )),
- aSortUp2RB(this, SW_RES(RB_UP2 )),
- aSortDn2RB(this, SW_RES(RB_DN2 )),
+ aColEdt2(this, SW_RES(ED_KEY2 )),
+ aTypDLB2(this, SW_RES(DLB_KEY2 )),
+ aSortUp2RB(this, SW_RES(RB_UP2 )),
+ aSortDn2RB(this, SW_RES(RB_DN2 )),
aKeyCB3(this, SW_RES(CB_KEY3 )),
- aColEdt3(this, SW_RES(ED_KEY3 )),
- aTypDLB3(this, SW_RES(DLB_KEY3 )),
- aSortUp3RB(this, SW_RES(RB_UP3 )),
- aSortDn3RB(this, SW_RES(RB_DN3 )),
+ aColEdt3(this, SW_RES(ED_KEY3 )),
+ aTypDLB3(this, SW_RES(DLB_KEY3 )),
+ aSortUp3RB(this, SW_RES(RB_UP3 )),
+ aSortDn3RB(this, SW_RES(RB_DN3 )),
aSortFL(this, SW_RES(FL_SORT_2 )),
- aColumnRB(this, SW_RES(RB_COL )),
- aRowRB(this, SW_RES(RB_ROW )),
+ aColumnRB(this, SW_RES(RB_COL )),
+ aRowRB(this, SW_RES(RB_ROW )),
aDelimFL(this, SW_RES(FL_DELIM )),
aDelimTabRB(this, SW_RES(RB_TAB )),
- aDelimFreeRB(this, SW_RES(RB_TABCH )),
- aDelimEdt(this, SW_RES(ED_TABCH )),
- aDelimPB(this, SW_RES( PB_DELIM)),
+ aDelimFreeRB(this, SW_RES(RB_TABCH )),
+ aDelimEdt(this, SW_RES(ED_TABCH )),
+ aDelimPB(this, SW_RES( PB_DELIM)),
aLangFL(this, SW_RES( FL_LANG )),
- aLangLB(this, SW_RES( LB_LANG )),
+ aLangLB(this, SW_RES( LB_LANG )),
aSortOptFL(this, SW_RES( FL_SORT )),
- aCaseCB(this, SW_RES( CB_CASE )),
+ aCaseCB(this, SW_RES( CB_CASE )),
aOkBtn(this, SW_RES(BT_OK )),
aCancelBtn(this, SW_RES(BT_CANCEL)),
@@ -174,7 +174,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
aColTxt( SW_RES(STR_COL)),
aRowTxt( SW_RES(STR_ROW)),
- aNumericTxt( SW_RES(STR_NUMERIC)),
+ aNumericTxt( SW_RES(STR_NUMERIC)),
rSh(rShell),
pColRes( 0 ),
nX( 99 ),
@@ -267,7 +267,7 @@ SwSortDlg::~SwSortDlg()
delete pColRes;
}
-sal_Unicode SwSortDlg::GetDelimChar() const
+sal_Unicode SwSortDlg::GetDelimChar() const
{
sal_Unicode cRet = '\t';
if( !aDelimTabRB.IsChecked() )
diff --git a/sw/source/ui/misc/srtdlg.hrc b/sw/source/ui/misc/srtdlg.hrc
index 101f819b8739..034852718d12 100644
--- a/sw/source/ui/misc/srtdlg.hrc
+++ b/sw/source/ui/misc/srtdlg.hrc
@@ -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
@@ -48,15 +48,15 @@
#define RB_TABCH 22
#define ED_TABCH 23
#define FL_DELIM 24
-#define STR_ROW 25
-#define STR_COL 26
+#define STR_ROW 25
+#define STR_COL 26
#define BT_HELP 27
-#define FT_DIR 28
+#define FT_DIR 28
#define RB_UP2 29
#define RB_DN2 30
#define RB_UP3 31
#define RB_DN3 32
-#define STR_NUMERIC 33
+#define STR_NUMERIC 33
#define PB_DELIM 34
#define FL_LANG 35
#define LB_LANG 36
diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src
index a1e6caad6c5e..8a1eb3a3ee1c 100644
--- a/sw/source/ui/misc/srtdlg.src
+++ b/sw/source/ui/misc/srtdlg.src
@@ -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
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 3da0d76d1029..f45ef0ad4d4b 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -2,7 +2,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
@@ -76,14 +76,14 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) :
pImplDlg = new SwRedlineAcceptDlg(this, TRUE);
pImplDlg->Initialize(GetExtraData());
- pImplDlg->Activate(); // Zur Initialisierung der Daten
+ pImplDlg->Activate(); // Zur Initialisierung der Daten
FreeResource();
}
SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
{
- AcceptAll(FALSE); // Alles uebriggebliebene ablehnen
+ AcceptAll(FALSE); // Alles uebriggebliebene ablehnen
pImplDlg->FillInfo(GetExtraData());
delete pImplDlg;
@@ -106,7 +106,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( BOOL bAccept )
if (pFilterTP->IsDate() || pFilterTP->IsAuthor() ||
pFilterTP->IsRange() || pFilterTP->IsAction())
{
- pFilterTP->CheckDate(FALSE); // Alle Filter abschalten
+ pFilterTP->CheckDate(FALSE); // Alle Filter abschalten
pFilterTP->CheckAuthor(FALSE);
pFilterTP->CheckRange(FALSE);
pFilterTP->CheckAction(FALSE);
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index deade3e0d491..8e6aec6cffd7 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -212,15 +212,15 @@ ModalDialog DLG_TITLEPAGE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 182 ) ;
- Size = MAP_APPFONT ( 152 , 80 ) ;
+ Size = MAP_APPFONT ( 132 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
};
PushButton PB_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 170 , 182 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Pos = MAP_APPFONT ( 150 , 182 ) ;
+ Size = MAP_APPFONT ( 50 , 12 ) ;
Text [ en-US ] = "Edit..." ;
};
FixedLine FL_BOTTOM
diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/ui/ribbar/conarc.cxx
index d56ab137e452..65f066475e10 100644
--- a/sw/source/ui/ribbar/conarc.cxx
+++ b/sw/source/ui/ribbar/conarc.cxx
@@ -2,7 +2,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
@@ -50,7 +50,7 @@
ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView)
- : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0)
+ : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0)
{
}
@@ -95,9 +95,9 @@ BOOL ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
bReturn = TRUE;
}
else
- { nAnzButUp++;
+ { nAnzButUp++;
- if (nAnzButUp == 3) // Kreisbogenerzeugung beendet
+ if (nAnzButUp == 3) // Kreisbogenerzeugung beendet
{
SwDrawBase::MouseButtonUp(rMEvt);
nAnzButUp = 0;
@@ -107,7 +107,7 @@ BOOL ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
m_pSh->EndCreate(SDRCREATE_NEXTPOINT);
}
}
-/* else if ( pView->IsCreateObj() && rMEvt.IsRight() )
+/* else if ( pView->IsCreateObj() && rMEvt.IsRight() )
{
pView->EndCreateObj( SDRCREATE_FORCEEND );
bReturn = TRUE;
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx
index c22f535c48c8..a1efd85607b0 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -2,7 +2,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
@@ -180,7 +180,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj )
if( pSourceObj )
{
const SfxItemSet& rSource = pSourceObj->GetMergedItemSet();
- SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
+ SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index 7bd3373780ae..410f8f613185 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/ribbar/conpoly.cxx b/sw/source/ui/ribbar/conpoly.cxx
index 07fa43533570..1a738450d90d 100644
--- a/sw/source/ui/ribbar/conpoly.cxx
+++ b/sw/source/ui/ribbar/conpoly.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx
index 1905d6dcde60..9d0bd9b4bb5b 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/ui/ribbar/conrect.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index f9f27d6435c8..298ac5b0e952 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -2,7 +2,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
@@ -51,7 +51,7 @@
using namespace ::com::sun::star;
-extern BOOL bNoInterrupt; // in mainwn.cxx
+extern BOOL bNoInterrupt; // in mainwn.cxx
#define MINMOVE ((USHORT)m_pSh->GetOut()->PixelToLogic(Size(m_pSh->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width())
@@ -188,7 +188,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
******************************************************************/
if (pSdrView->HasMarkablePoints() && (!pSdrView->IsPointMarked(*aVEvt.pHdl) || rMEvt.IsShift()))
{
- SdrHdl* pHdl = NULL;
+ SdrHdl* pHdl = NULL;
if (!rMEvt.IsShift())
{
@@ -241,7 +241,7 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
if (!pSdrView->HasMarkablePoints())
{
//JP 10.10.2001: Bug 89619 - don't scroll the
- // cursor into the visible area
+ // cursor into the visible area
BOOL bUnlockView = !m_pSh->IsViewLocked();
m_pSh->LockView( TRUE ); //lock visible section
m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // Alles deselektieren
@@ -403,7 +403,7 @@ BOOL SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
}
m_pView->NoRotate();
- bCheckShell = TRUE; // ggf BezierShell anwerfen
+ bCheckShell = TRUE; // ggf BezierShell anwerfen
}
else if (!m_pSh->IsObjSelected() && !m_pWin->IsDrawAction())
{
@@ -463,7 +463,7 @@ BOOL SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
}
m_pView->NoRotate();
- bCheckShell = TRUE; // ggf BezierShell anwerfen
+ bCheckShell = TRUE; // ggf BezierShell anwerfen
}
}
diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx
index 1ba41c98777b..5c8c54690112 100644
--- a/sw/source/ui/ribbar/dselect.cxx
+++ b/sw/source/ui/ribbar/dselect.cxx
@@ -2,7 +2,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
@@ -38,7 +38,7 @@
#include "drawbase.hxx"
#include "dselect.hxx"
-extern BOOL bNoInterrupt; // in mainwn.cxx
+extern BOOL bNoInterrupt; // in mainwn.cxx
/*************************************************************************
|*
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index fd3cec7e1114..604786a30018 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -2,7 +2,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
@@ -66,10 +66,10 @@ SFX_IMPL_POS_CHILDWINDOW( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
//==================================================================
SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
- : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )),
+ : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )),
aPos( this, SW_RES(ED_POS)),
aEdit( this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION),
- aPopMenu( SW_RES(MN_CALC_POPUP)),
+ aPopMenu( SW_RES(MN_CALC_POPUP)),
pMgr(0),
pWrtShell(0),
pView(0),
@@ -101,12 +101,12 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY );
SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
- Size aSizeTbx = CalcWindowSizePixel();
+ Size aSizeTbx = CalcWindowSizePixel();
Size aSize = GetSizePixel();
aSize.Height() = aSizeTbx.Height();
SetSizePixel( aSize );
- Size aPosSize = aPos.GetSizePixel();
- Size aEditSize = aEdit.GetSizePixel();
+ Size aPosSize = aPos.GetSizePixel();
+ Size aEditSize = aEdit.GetSizePixel();
aPosSize.Height() = aEditSize.Height() = GetItemRect(FN_FORMULA_CALC).GetHeight() - 2;
Point aPosPos = aPos.GetPosPixel();
@@ -170,9 +170,9 @@ void __EXPORT SwInputWindow::Resize()
{
ToolBox::Resize();
- long nWidth = GetSizePixel().Width();
- long nLeft = aEdit.GetPosPixel().X();
- Size aEditSize = aEdit.GetSizePixel();
+ long nWidth = GetSizePixel().Width();
+ long nLeft = aEdit.GetPosPixel().X();
+ Size aEditSize = aEdit.GetSizePixel();
aEditSize.Width() = Max( ((long)(nWidth - nLeft - 5)), (long)0 );
aEdit.SetSizePixel( aEditSize );
@@ -215,7 +215,7 @@ void SwInputWindow::ShowWin()
pMgr = new SwFldMgr;
// JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
- // also setzen
+ // also setzen
String sEdit( '=' );
if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
{
@@ -325,7 +325,7 @@ static const char * __READONLY_DATA aStrArr[] = {
IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG )
{
USHORT nCurID = GetCurItemId();
- EndSelection(); // setzt CurItemId zurueck !
+ EndSelection(); // setzt CurItemId zurueck !
switch ( nCurID )
{
case FN_FORMULA_CALC :
@@ -346,7 +346,7 @@ IMPL_LINK( SwInputWindow, DropdownClickHdl, ToolBox*, EMPTYARG )
void __EXPORT SwInputWindow::Click( )
{
USHORT nCurID = GetCurItemId();
- EndSelection(); // setzt CurItemId zurueck !
+ EndSelection(); // setzt CurItemId zurueck !
switch ( nCurID )
{
case FN_FORMULA_CANCEL:
@@ -380,7 +380,7 @@ void SwInputWindow::ApplyFormula()
pWrtShell->Pop( FALSE );
// JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
- // also wieder entfernen
+ // also wieder entfernen
String sEdit( aEdit.GetText() );
sEdit.EraseLeadingChars().EraseTrailingChars();
if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) )
@@ -543,7 +543,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
GrabFocus();
return;
}
- const sal_Unicode cOpen = '<', cClose = '>',
+ const sal_Unicode cOpen = '<', cClose = '>',
cOpenBracket = '(';
String aPrefix = rName;
if(rName.Len())
@@ -627,7 +627,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
{
SetText( aActText );
SetSelection( Selection( nPos, nPos ) );
-// GetModifyHdl().Call( this );
+// GetModifyHdl().Call( this );
}
}
GrabFocus();
@@ -658,7 +658,7 @@ __EXPORT SwInputChild::~SwInputChild()
SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const
{
- SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
+ SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
return aInfo;
}
diff --git a/sw/source/ui/ribbar/inputwin.hrc b/sw/source/ui/ribbar/inputwin.hrc
index 96e45ac38708..e55fa18e3ef9 100644
--- a/sw/source/ui/ribbar/inputwin.hrc
+++ b/sw/source/ui/ribbar/inputwin.hrc
@@ -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
@@ -29,40 +29,40 @@
//PopupMenu Id's
-#define MN_CALC_PHD 1
-#define MN_CALC_SQRT 2
-#define MN_CALC_OR 3
-#define MN_CALC_XOR 4
-#define MN_CALC_AND 5
-#define MN_CALC_NOT 6
-#define MN_CALC_EQ 7
-#define MN_CALC_NEQ 8
-#define MN_CALC_LEQ 9
-#define MN_CALC_GEQ 10
-#define MN_CALC_LES 11
-#define MN_CALC_GRE 12
-#define MN_CALC_SUM 13
-#define MN_CALC_MEAN 14
-#define MN_CALC_MIN 15
-#define MN_CALC_MAX 16
-#define MN_CALC_SIN 17
-#define MN_CALC_COS 18
-#define MN_CALC_TAN 19
-#define MN_CALC_ASIN 20
-#define MN_CALC_ACOS 21
-#define MN_CALC_ATAN 22
-#define MN_CALC_POW 23
-#define MN_CALC_LISTSEP 24
-#define MN_CALC_ROUND 25
-
-#define MN_POP_OPS 29
-#define MN_POP_STATISTICS 30
-#define MN_POP_FUNC 31
-#define MN_RSC_END 32
-
-#define TBX_FORMULA 1
-#define ED_POS 2
-#define ED_FORMULA 3
+#define MN_CALC_PHD 1
+#define MN_CALC_SQRT 2
+#define MN_CALC_OR 3
+#define MN_CALC_XOR 4
+#define MN_CALC_AND 5
+#define MN_CALC_NOT 6
+#define MN_CALC_EQ 7
+#define MN_CALC_NEQ 8
+#define MN_CALC_LEQ 9
+#define MN_CALC_GEQ 10
+#define MN_CALC_LES 11
+#define MN_CALC_GRE 12
+#define MN_CALC_SUM 13
+#define MN_CALC_MEAN 14
+#define MN_CALC_MIN 15
+#define MN_CALC_MAX 16
+#define MN_CALC_SIN 17
+#define MN_CALC_COS 18
+#define MN_CALC_TAN 19
+#define MN_CALC_ASIN 20
+#define MN_CALC_ACOS 21
+#define MN_CALC_ATAN 22
+#define MN_CALC_POW 23
+#define MN_CALC_LISTSEP 24
+#define MN_CALC_ROUND 25
+
+#define MN_POP_OPS 29
+#define MN_POP_STATISTICS 30
+#define MN_POP_FUNC 31
+#define MN_RSC_END 32
+
+#define TBX_FORMULA 1
+#define ED_POS 2
+#define ED_FORMULA 3
#endif
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src
index 13d5fcdd0eae..e8f8fa58f58b 100644
--- a/sw/source/ui/ribbar/inputwin.src
+++ b/sw/source/ui/ribbar/inputwin.src
@@ -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
diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx
index 024886a608ed..3e7f9ef275eb 100644
--- a/sw/source/ui/ribbar/tblctrl.cxx
+++ b/sw/source/ui/ribbar/tblctrl.cxx
@@ -2,7 +2,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
@@ -33,7 +33,7 @@
#include <svl/intitem.hxx>
#include <vcl/toolbox.hxx>
-#include <sfx2/app.hxx>
+#include <sfx2/app.hxx>
#include "cmdid.h"
#include "swtypes.hxx"
@@ -51,7 +51,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item );
-SwTableOptimizeCtrl::SwTableOptimizeCtrl(
+SwTableOptimizeCtrl::SwTableOptimizeCtrl(
USHORT nSlotId,
USHORT nId,
ToolBox& rTbx ) :
@@ -88,7 +88,7 @@ SfxPopupWindow* SwTableOptimizeCtrl::CreatePopupWindow()
-SfxPopupWindowType SwTableOptimizeCtrl::GetPopupWindowType() const
+SfxPopupWindowType SwTableOptimizeCtrl::GetPopupWindowType() const
{
return SFX_POPUPWINDOW_ONCLICK;
}
diff --git a/sw/source/ui/ribbar/tblctrl.hrc b/sw/source/ui/ribbar/tblctrl.hrc
index 7cfa32d7bb5d..fcc31d473eda 100644
--- a/sw/source/ui/ribbar/tblctrl.hrc
+++ b/sw/source/ui/ribbar/tblctrl.hrc
@@ -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
@@ -28,7 +28,7 @@
#define _TBLCTRL_HRC
#include "ribbar.hrc"
-#define TBX_OPTIMIZE_TABLE 1
+#define TBX_OPTIMIZE_TABLE 1
#endif
diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src
index 0c783172af74..afc594998330 100644
--- a/sw/source/ui/ribbar/tblctrl.src
+++ b/sw/source/ui/ribbar/tblctrl.src
@@ -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
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index 0144c5f2c158..0f9278b0c8ae 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -2,7 +2,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
@@ -57,7 +57,7 @@
SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item);
/******************************************************************************
- * Beschreibung:
+ * Beschreibung:
******************************************************************************/
SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
@@ -68,7 +68,7 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
}
/******************************************************************************
- * Beschreibung:
+ * Beschreibung:
******************************************************************************/
SwTbxAnchor::~SwTbxAnchor()
@@ -76,7 +76,7 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
}
/******************************************************************************
- * Beschreibung:
+ * Beschreibung:
******************************************************************************/
void SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
@@ -93,7 +93,7 @@ void SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const Sfx
}
/******************************************************************************
- * Beschreibung:
+ * Beschreibung:
******************************************************************************/
SfxPopupWindow* SwTbxAnchor::CreatePopupWindow()
@@ -103,7 +103,7 @@ SfxPopupWindow* SwTbxAnchor::CreatePopupWindow()
}
/******************************************************************************
- * Beschreibung:
+ * Beschreibung:
******************************************************************************/
void SwTbxAnchor::Click()
diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src
index 41067b18fb08..9aa3763ea445 100644
--- a/sw/source/ui/ribbar/tbxanchr.src
+++ b/sw/source/ui/ribbar/tbxanchr.src
@@ -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
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 23e389683b48..772342bdc782 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -2,7 +2,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
@@ -169,7 +169,7 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
**********************************************************************/
-SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const
+SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const
{
return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
}
@@ -633,7 +633,7 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
/*-----------------20.06.97 13:41-------------------
--------------------------------------------------*/
-String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
+String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
{
USHORT nResId = STR_IMGBTN_START;
nResId += SwView::GetMoveType() - NID_START;
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc
index 5e5180f363aa..108cf44ee848 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/ui/ribbar/workctrl.hrc
@@ -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
@@ -28,11 +28,11 @@
#define _WORKCTRL_HRC
#include "ribbar.hrc"
-#define TBX_INSERT 1
-#define TBX_OBJ_INSERT 2
-#define TBX_FIELD_INSERT 3
+#define TBX_INSERT 1
+#define TBX_OBJ_INSERT 2
+#define TBX_FIELD_INSERT 3
#define TBX_NAVIGATION 4
-#define IL_VALUES 5
+#define IL_VALUES 5
#define IMG_BTN 6
#define ST_QUICK 7
#define FI_INFO 8
@@ -63,8 +63,8 @@
// doppelter Eintrag! hrc und hxx
// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
#define NID_START 20000
-#define NID_NEXT 20000
-#define NID_PREV 20001
+#define NID_NEXT 20000
+#define NID_PREV 20001
#define NID_TBL 20002
#define NID_FRM 20003
#define NID_PGE 20004
@@ -72,17 +72,17 @@
#define NID_CTRL 20006
#define NID_REG 20007
#define NID_BKM 20008
-#define NID_GRF 20009
-#define NID_OLE 20010
-#define NID_OUTL 20011
-#define NID_SEL 20012
-#define NID_FTN 20013
-#define NID_MARK 20014
+#define NID_GRF 20009
+#define NID_OLE 20010
+#define NID_OUTL 20011
+#define NID_SEL 20012
+#define NID_FTN 20013
+#define NID_MARK 20014
#define NID_POSTIT 20015
#define NID_SRCH_REP 20016
#define NID_INDEX_ENTRY 20017
-#define NID_TABLE_FORMULA 20018
-#define NID_TABLE_FORMULA_ERROR 20019
+#define NID_TABLE_FORMULA 20018
+#define NID_TABLE_FORMULA_ERROR 20019
#define NID_COUNT 20
#endif
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 2f3e156edf16..e2637c927c97 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -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
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 475d1fecddd1..bcd0dcd5fade 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -2,7 +2,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
@@ -621,7 +621,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break;
case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break;
- case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
+ case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
case SID_ATTR_CHAR_SHADOWED: nEEWhich = EE_CHAR_SHADOW;break;
case SID_ATTR_CHAR_STRIKEOUT: nEEWhich = EE_CHAR_STRIKEOUT;break;
case SID_ATTR_CHAR_LANGUAGE : nEEWhich = EE_CHAR_LANGUAGE;break;
@@ -819,7 +819,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() );
pDlg->Insert( SOT_FORMAT_STRING, aEmptyStr );
- pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr );
+ pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr );
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
@@ -1134,7 +1134,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
aOldSelection = pOLV->GetSelection();
if (!pOLV->GetEditView().HasSelection())
{
- bRestoreSelection = true;
+ bRestoreSelection = true;
pOLV->GetEditView().SelectCurrentWord();
}
@@ -1150,7 +1150,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
if (aReplaceText.Len() > 0)
ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText );
break;
- }
+ }
case SID_THESAURUS:
{
pOLV->StartThesaurus();
@@ -1259,7 +1259,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
SwLangHelper::GetLanguageStatus(pOLV,rSet);
break;
}
-
+
case SID_THES:
{
String aStatusVal;
@@ -1274,8 +1274,8 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
!xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale ))
rSet.DisableItem( SID_THES );
break;
- }
-
+ }
+
// disable "Thesaurus" if the language is not supported
case SID_THESAURUS:
{
@@ -1651,7 +1651,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
// attributieren (Font setzen)
SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() );
- SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
+ SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
EE_CHAR_FONTINFO );
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index b23744a8bcd9..71a212c18bf7 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2,7 +2,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
@@ -141,12 +141,12 @@ static BYTE nFooterPos;
#include <sfx2/msg.hxx>
#include "swslots.hxx"
-#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \
- SvxContourDlgChildWindow::GetChildWindowId() )-> \
+#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \
+ SvxContourDlgChildWindow::GetChildWindowId() )-> \
GetWindow() ) )
-#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \
- SvxIMapDlgChildWindow::GetChildWindowId() )-> \
+#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \
+ SvxIMapDlgChildWindow::GetChildWindowId() )-> \
GetWindow() ) )
@@ -164,7 +164,7 @@ SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0))
TYPEINIT1(SwBaseShell,SfxShell)
/*--------------------------------------------------------------------
- Beschreibung: statics
+ Beschreibung: statics
--------------------------------------------------------------------*/
void lcl_UpdateIMapDlg( SwWrtShell& rSh )
{
@@ -209,7 +209,7 @@ BOOL lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel )
}
/*--------------------------------------------------------------------
- Beschreibung: loeschen
+ Beschreibung: loeschen
--------------------------------------------------------------------*/
void SwBaseShell::ExecDelete(SfxRequest &rReq)
{
@@ -237,8 +237,8 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
}
else
// JP 15.07.96: wenns nicht mehr nach vorne geht, die
- // Numerierung aufheben. Z.B. am Doc-/
- // Rahmen-/Tabellen-/Bereichs-Anfang
+ // Numerierung aufheben. Z.B. am Doc-/
+ // Rahmen-/Tabellen-/Bereichs-Anfang
rSh.DelNumRules();
rSh.EndCrsrMove();
@@ -422,7 +422,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: ClipBoard-Status
+ Beschreibung: ClipBoard-Status
--------------------------------------------------------------------*/
void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
{
@@ -478,7 +478,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Undo ausfuehren
+ Beschreibung: Undo ausfuehren
--------------------------------------------------------------------*/
void SwBaseShell::ExecUndo(SfxRequest &rReq)
{
@@ -518,7 +518,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: Zustand Undo
+ Beschreibung: Zustand Undo
--------------------------------------------------------------------*/
void SwBaseShell::StateUndo(SfxItemSet &rSet)
{
@@ -548,7 +548,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet)
break;
}
case SID_REPEAT:
- { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion
+ { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion
if(rSh.GetRedoIds() == UNDO_EMPTY &&
!rSh.IsSelFrmMode() &&
rSh.GetRepeatIds() )
@@ -585,7 +585,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Slot-Id auswerten bzw. Dispatchen
+ Beschreibung: Slot-Id auswerten bzw. Dispatchen
--------------------------------------------------------------------*/
void SwBaseShell::Execute(SfxRequest &rReq)
{
@@ -945,7 +945,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
break;
case SID_IMAP:
{
- USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId();
+ USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId();
SfxViewFrame* pVFrame = GetView().GetViewFrame();
pVFrame->ToggleChildWindow( nId );
@@ -957,7 +957,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
break;
case SID_IMAP_EXEC:
{
- SvxIMapDlg* pDlg = SWIMAPDLG(GetView());
+ SvxIMapDlg* pDlg = SWIMAPDLG(GetView());
// Kontrolle, ob Zuweisung ueberhaupt sinnvoll/erlaubt
if ( rSh.IsFrmSelected() &&
@@ -1186,7 +1186,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
case RES_SHADOW:
{
rSh.StartAllAction();
- SfxItemSet aSet( rSh.GetAttrPool(),
+ SfxItemSet aSet( rSh.GetAttrPool(),
RES_SHADOW, RES_SHADOW,
RES_BACKGROUND, RES_BACKGROUND, 0 );
@@ -1403,7 +1403,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
break;
case RES_SHADOW:
{
- SfxItemSet aSet( rSh.GetAttrPool(),
+ SfxItemSet aSet( rSh.GetAttrPool(),
RES_SHADOW, RES_SHADOW );
// Tabellenzelle(n) selektiert?
@@ -1794,7 +1794,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Slots mit dieser Statusmethode disablen
+ Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
void SwBaseShell::StateDisableItems( SfxItemSet &rSet )
{
@@ -1809,7 +1809,7 @@ void SwBaseShell::StateDisableItems( SfxItemSet &rSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Slots mit dieser Statusmethode disablen
+ Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
void SwBaseShell::StateStyle( SfxItemSet &rSet )
{
@@ -1924,7 +1924,7 @@ void SwBaseShell::SetWrapMode( USHORT nSlot )
}
/*--------------------------------------------------------------------
- Beschreibung: Update der Statuszeile erzwingen
+ Beschreibung: Update der Statuszeile erzwingen
--------------------------------------------------------------------*/
void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
{
@@ -1935,7 +1935,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
(pSh && (pSh->IsFrmSelected() || pSh->IsObjSelected())) )
{
const SfxPointItem aTmp1( SID_ATTR_POSITION, pSh->GetAnchorObjDiff());
- const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize());
+ const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize());
rBnd.SetState( aTmp1 );
rBnd.SetState( aTmp2 );
}
@@ -1950,7 +1950,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor
+ Beschreibung: Ctor
--------------------------------------------------------------------*/
SwBaseShell::SwBaseShell(SwView& rVw) :
SfxShell( &rVw ),
@@ -2192,7 +2192,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
USHORT nWhich = aIter.FirstWhich();
int nSelType = rSh.GetSelectionType();
-// if ( nSelType & nsSelectionType::SEL_GRF ||
+// if ( nSelType & nsSelectionType::SEL_GRF ||
if( nSelType & nsSelectionType::SEL_OLE )
{
rSet.DisableItem( SID_BACKGROUND_COLOR );
@@ -2272,7 +2272,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
aBrushItem = (const SvxBrushItem&)aCoreSet.Get(RES_BACKGROUND);
}
-// BOOL bMsgOk = FALSE;
+// BOOL bMsgOk = FALSE;
switch (nSlot)
{
@@ -2285,7 +2285,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
//Brush &rBrush = aBrushItem.GetBrush();
if(pArgs)
{
- const SvxColorItem& rNewColorItem = (const SvxColorItem&)
+ const SvxColorItem& rNewColorItem = (const SvxColorItem&)
pArgs->Get(SID_BACKGROUND_COLOR);
const Color& rNewColor = rNewColorItem.GetValue();
aBrushItem.SetColor( rNewColor );
@@ -2308,7 +2308,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
}
break;
default:
-// bMsgOk = FALSE;
+// bMsgOk = FALSE;
rReq.Ignore();
OSL_ENSURE(false, "unknown message in ExecuteAttr!" );
return;
@@ -2333,7 +2333,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
else
{
SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
- if( pColl && pColl->IsAutoUpdateFmt())
+ if( pColl && pColl->IsAutoUpdateFmt())
{
SfxItemSet aSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND );
aSet.Put(aBrushItem);
@@ -2421,8 +2421,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
break;
case FN_FORMAT_BORDER_DLG:
{
- SfxItemSet aSet( rSh.GetAttrPool(),
- RES_BOX , RES_SHADOW,
+ SfxItemSet aSet( rSh.GetAttrPool(),
+ RES_BOX , RES_SHADOW,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0 );
SfxAbstractDialog * pDlg = 0;
@@ -2702,7 +2702,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
aRewriter.AddRule(UNDO_ARG3, SW_RES(STR_END_QUOTE));
}
- rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel
+ rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel
}
}
}
@@ -2721,7 +2721,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
List *pLst = aLst.GetList();
nParagraphPos = nGraphicPos = nOlePos = nFramePos = nTablePos =
nTableRowPos = nTableCellPos = nPagePos =
- nHeaderPos = nFooterPos = 0;
+ nHeaderPos = nFooterPos = 0;
BYTE nPos = 1;
pLst->Insert( (void*) new SW_RESSTR( STR_SWBG_PAGE ), pLst->Count() );
nPagePos = nPos++;
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index 25ff17cd7551..37ecf90a424f 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -2,7 +2,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
@@ -70,17 +70,17 @@ SwBezierShell::SwBezierShell(SwView &_rView):
SetHelpId(SW_BEZIERSHELL);
SwWrtShell *pSh = &GetShell();
- SdrView* pSdrView = pSh->GetDrawView();
+ SdrView* pSdrView = pSh->GetDrawView();
pSdrView->SetEliminatePolyPointLimitAngle(1500L);
}
void SwBezierShell::Execute(SfxRequest &rReq)
{
SwWrtShell *pSh = &GetShell();
- SdrView* pSdrView = pSh->GetDrawView();
+ SdrView* pSdrView = pSh->GetDrawView();
const SfxItemSet *pArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- BOOL bChanged = pSdrView->GetModel()->IsChanged();
+ USHORT nSlotId = rReq.GetSlot();
+ BOOL bChanged = pSdrView->GetModel()->IsChanged();
pSdrView->GetModel()->SetChanged(FALSE);
const SfxPoolItem* pItem;
if(pArgs)
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 496c218d6982..6caa02e5ba92 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -2,7 +2,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
@@ -51,10 +51,10 @@
void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
{
- SwWrtShell* pSh = &GetShell();
- SdrView* pView = pSh->GetDrawView();
- SdrModel* pDoc = pView->GetModel();
- BOOL bChanged = pDoc->IsChanged();
+ SwWrtShell* pSh = &GetShell();
+ SdrView* pView = pSh->GetDrawView();
+ SdrModel* pDoc = pView->GetModel();
+ BOOL bChanged = pDoc->IsChanged();
pDoc->SetChanged(FALSE);
SfxItemSet aNewAttr( pDoc->GetItemPool() );
@@ -178,9 +178,9 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
{
SwWrtShell* pSh = &GetShell();
- SdrView* pView = pSh->GetDrawView();
+ SdrView* pView = pSh->GetDrawView();
const SfxItemSet* pArgs = rReq.GetArgs();
- BOOL bChanged = pView->GetModel()->IsChanged();
+ BOOL bChanged = pView->GetModel()->IsChanged();
pView->GetModel()->SetChanged(FALSE);
GetView().NoRotate();
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 0e22efaa6a60..9744c07df768 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -2,7 +2,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
@@ -86,12 +86,12 @@ TYPEINIT1(SwDrawShell,SwDrawBaseShell)
void SwDrawShell::Execute(SfxRequest &rReq)
{
- SwWrtShell &rSh = GetShell();
- SdrView *pSdrView = rSh.GetDrawView();
- const SfxItemSet *pArgs = rReq.GetArgs();
- SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings();
- USHORT nSlotId = rReq.GetSlot();
- BOOL bChanged = pSdrView->GetModel()->IsChanged();
+ SwWrtShell &rSh = GetShell();
+ SdrView *pSdrView = rSh.GetDrawView();
+ const SfxItemSet *pArgs = rReq.GetArgs();
+ SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings();
+ USHORT nSlotId = rReq.GetSlot();
+ BOOL bChanged = pSdrView->GetModel()->IsChanged();
pSdrView->GetModel()->SetChanged(FALSE);
@@ -302,7 +302,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
USHORT nWhich = aIter.FirstWhich();
BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
- if (!bProtected) // Im Parent nachsehen
+ if (!bProtected) // Im Parent nachsehen
bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
while( nWhich )
@@ -382,8 +382,8 @@ SwDrawShell::SwDrawShell(SwView &_rView) :
void SwDrawShell::ExecFormText(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
- SdrView* pDrView = rSh.GetDrawView();
- BOOL bChanged = pDrView->GetModel()->IsChanged();
+ SdrView* pDrView = rSh.GetDrawView();
+ BOOL bChanged = pDrView->GetModel()->IsChanged();
pDrView->GetModel()->SetChanged(FALSE);
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
@@ -450,7 +450,7 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
!((SdrTextObj*) pObj)->HasText() )
{
-#define XATTR_ANZ 12
+#define XATTR_ANZ 12
static const USHORT nXAttr[ XATTR_ANZ ] =
{
XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE,
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index fca6bb3aaf07..afd4585286de 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -2,7 +2,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
@@ -115,7 +115,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
//issue a new command to insert the link
rTempView.GetViewFrame()->GetDispatcher()->Execute(
SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0);
- }
+ }
else
{
uno::Reference< awt::XControlModel > xControlModel = pUnoCtrl->GetUnoControlModel();
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 5945e8d327d4..e7d461b82c6f 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -2,7 +2,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
@@ -111,10 +111,10 @@ SwDrawBaseShell::~SwDrawBaseShell()
void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
SwWrtShell *pSh = &GetShell();
- SdrView* pSdrView = pSh->GetDrawView();
+ SdrView* pSdrView = pSh->GetDrawView();
const SfxItemSet *pArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- BOOL bChanged = pSdrView->GetModel()->IsChanged();
+ USHORT nSlotId = rReq.GetSlot();
+ BOOL bChanged = pSdrView->GetModel()->IsChanged();
pSdrView->GetModel()->SetChanged(FALSE);
const SfxPoolItem* pItem = 0;
if(pArgs)
@@ -146,7 +146,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
if( rMarkList.GetMark(0) != 0 )
{
- SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND,
+ SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND,
RES_ANCHOR, RES_ANCHOR,
RES_LR_SPACE, RES_UL_SPACE,
SID_HTML_MODE, SID_HTML_MODE,
@@ -400,7 +400,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
GetView().GetDrawFuncPtr()->Deactivate();
GetView().SetDrawFuncPtr(NULL);
}
- GetView().LeaveDrawCreate(); // In Selektionsmode wechseln
+ GetView().LeaveDrawCreate(); // In Selektionsmode wechseln
}
if (pSh->IsSelFrmMode())
@@ -416,7 +416,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
case SID_GROUP:
if (pSh->IsObjSelected() > 1 && pSh->IsGroupAllowed())
{
- pSh->GroupSelection(); // Objekt gruppieren
+ pSh->GroupSelection(); // Objekt gruppieren
rBind.Invalidate(SID_UNGROUP);
}
break;
@@ -424,7 +424,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
case SID_UNGROUP:
if (pSh->IsGroupSelected())
{
- pSh->UnGroupSelection(); // Objektgruppierung aufheben
+ pSh->UnGroupSelection(); // Objektgruppierung aufheben
rBind.Invalidate(SID_GROUP);
}
break;
@@ -457,7 +457,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 && bAlignPossible )
- { // Objekte nicht aneinander ausrichten
+ { // Objekte nicht aneinander ausrichten
USHORT nAnchor = pSh->GetAnchorId();
if (nAnchor == FLY_AS_CHAR)
@@ -491,7 +491,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
break;
}
if (nAnchor == FLY_AT_PARA)
- break; // Absatzverankerte Rahmen nicht ausrichten
+ break; // Absatzverankerte Rahmen nicht ausrichten
}
pSh->StartAction();
@@ -674,7 +674,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
USHORT nWhich = aIter.FirstWhich();
BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
- if (!bProtected) // Im Parent nachsehen
+ if (!bProtected) // Im Parent nachsehen
bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
while( nWhich )
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 6b831509558b..a3598f97808e 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -2,7 +2,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
@@ -160,14 +160,14 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
aOldSelection = pOLV->GetSelection();
if (!pOLV->GetEditView().HasSelection())
{
- bRestoreSelection = true;
+ bRestoreSelection = true;
pOLV->GetEditView().SelectCurrentWord();
}
bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,GetView(),rSh);
break;
}
-
+
case SID_THES:
{
String aReplaceText;
@@ -177,8 +177,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
if (aReplaceText.Len() > 0)
ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText );
break;
- }
-
+ }
+
case SID_ATTR_CHAR_FONT:
case SID_ATTR_CHAR_FONTHEIGHT:
case SID_ATTR_CHAR_WEIGHT:
@@ -442,8 +442,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
break;
case SID_AUTOSPELL_CHECK:
{
-//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView();
-//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner();
+//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView();
+//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner();
SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
sal_uInt32 nCtrl = pOutliner->GetControlWord();
@@ -574,7 +574,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
void SwDrawTextShell::GetState(SfxItemSet& rSet)
{
- if (!IsTextEdit()) // Sonst manchmal Absturz!
+ if (!IsTextEdit()) // Sonst manchmal Absturz!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -596,30 +596,30 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
nSlotId = SwLangHelper::GetLanguageStatus(pOLV,rSet);;
break;
}
-
+
case SID_THES:
{
String aStatusVal;
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, pOLV->GetEditView() );
rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
-
+
// disable "Thesaurus" context menu entry if there is nothing to look up
uno::Reference< linguistic2::XThesaurus > xThes( ::GetThesaurus() );
lang::Locale aLocale( SvxCreateLocale( nLang ) );
if (!bIsLookUpWord ||
!xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale ))
rSet.DisableItem( SID_THES );
-
+
//! avoid puting the same item as SfxBoolItem at the end of this function
nSlotId = 0;
break;
- }
-
+ }
+
case SID_ATTR_PARA_ADJUST_LEFT: eAdjust = SVX_ADJUST_LEFT; goto ASK_ADJUST;
- case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST;
- case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST;
- case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST;
+ case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST;
+ case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST;
+ case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST;
ASK_ADJUST:
{
if( !pAdjust )
@@ -632,9 +632,9 @@ ASK_ADJUST:
}
break;
- case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE;
- case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE;
- case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE;
ASK_LINESPACE:
{
if( !pLSpace )
@@ -650,9 +650,9 @@ ASK_LINESPACE:
}
break;
- case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT;
+ case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT;
goto ASK_ESCAPE;
- case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT;
+ case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT;
goto ASK_ESCAPE;
ASK_ESCAPE:
{
@@ -783,7 +783,7 @@ ASK_ESCAPE:
}
break;
default:
- nSlotId = 0; // don't know this slot
+ nSlotId = 0; // don't know this slot
break;
}
@@ -796,7 +796,7 @@ ASK_ESCAPE:
void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Sonst Absturz!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -860,7 +860,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Sonst Absturz!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -891,11 +891,11 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: ClipBoard-Status
+ Beschreibung: ClipBoard-Status
--------------------------------------------------------------------*/
void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Sonst Absturz!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
@@ -943,11 +943,11 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Hyperlink-Status
+ Beschreibung: Hyperlink-Status
--------------------------------------------------------------------*/
void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
{
- if (!IsTextEdit()) // Sonst Absturz!
+ if (!IsTextEdit()) // Sonst Absturz!
return;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 99632ad2de45..3ef80c8b6003 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -2,7 +2,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
@@ -110,8 +110,8 @@ void SwDrawTextShell::Init()
SwWrtShell &rSh = GetShell();
pSdrView = rSh.GetDrawView();
SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
- //#97471# mouse click _and_ key input at the same time
- if( !pOutliner )
+ //#97471# mouse click _and_ key input at the same time
+ if( !pOutliner )
return ;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
ULONG nCtrl = pOutliner->GetControlWord();
@@ -160,7 +160,7 @@ __EXPORT SwDrawTextShell::~SwDrawTextShell()
//DrawTextShell zerstoert.
// OSL_ENSURE( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" );
// if (pSdrView->IsTextEdit())
-// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit
+// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit
// GetShell().Edit();
}
@@ -171,7 +171,7 @@ SwWrtShell& SwDrawTextShell::GetShell()
}
/*--------------------------------------------------------------------
- Beschreibung: Slots mit dieser Statusmethode disablen
+ Beschreibung: Slots mit dieser Statusmethode disablen
--------------------------------------------------------------------*/
void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
{
@@ -199,7 +199,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
if (aNullRect != aOutRect)
{
GetShell().GetDrawView()->SetAttributes(rAttr);
-// Init();
+// Init();
}
}
@@ -306,9 +306,9 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
!((SdrTextObj*) pObj)->HasText() )
{
-#define XATTR_ANZ 12
+#define XATTR_ANZ 12
static const USHORT nXAttr[ XATTR_ANZ ] =
- { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE,
+ { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE,
XATTR_FORMTXTSTART, XATTR_FORMTXTMIRROR, XATTR_FORMTXTSTDFORM,
XATTR_FORMTXTHIDEFORM, XATTR_FORMTXTOUTLINE, XATTR_FORMTXTSHADOW,
XATTR_FORMTXTSHDWCOLOR, XATTR_FORMTXTSHDWXVAL, XATTR_FORMTXTSHDWYVAL
@@ -479,7 +479,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
}
break;
- case FN_FORMAT_RESET: // delete hard text attributes
+ case FN_FORMAT_RESET: // delete hard text attributes
{
pOLV->RemoveAttribsKeepLanguages( true );
pOLV->GetEditView().GetEditEngine()->RemoveFields(TRUE);
@@ -537,7 +537,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: Undo ausfuehren
+ Beschreibung: Undo ausfuehren
--------------------------------------------------------------------*/
void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
{
@@ -582,7 +582,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: Zustand Undo
+ Beschreibung: Zustand Undo
--------------------------------------------------------------------*/
void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
{
@@ -692,7 +692,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq )
}
/*--------------------------------------------------------------------
- Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX)
+ Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX)
--------------------------------------------------------------------*/
void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
{
@@ -794,7 +794,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
// attributieren (Font setzen)
SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() );
- SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
+ SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
EE_CHAR_FONTINFO );
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 4362e8eedd0d..0c5bea7a0f1d 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -2,7 +2,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
@@ -393,18 +393,18 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
else
{
- SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
- FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- SID_ATTR_BRUSH, SID_ATTR_BRUSH,
- SID_ATTR_LRSPACE, SID_ATTR_ULSPACE,
- FN_SURROUND, FN_HORI_ORIENT,
- FN_SET_FRM_NAME, FN_SET_FRM_NAME,
- FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO,
- SID_DOCFRAME, SID_DOCFRAME,
- SID_HTML_MODE, SID_HTML_MODE,
- FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
+ SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
+ SID_ATTR_BRUSH, SID_ATTR_BRUSH,
+ SID_ATTR_LRSPACE, SID_ATTR_ULSPACE,
+ FN_SURROUND, FN_HORI_ORIENT,
+ FN_SET_FRM_NAME, FN_SET_FRM_NAME,
+ FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO,
+ SID_DOCFRAME, SID_DOCFRAME,
+ SID_HTML_MODE, SID_HTML_MODE,
+ FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT,
0);
@@ -493,9 +493,9 @@ void SwFrameShell::Execute(SfxRequest &rReq)
// gesetzt werden
if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, FALSE, &pItem))
rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue());
- SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
- RES_SURROUND, RES_SURROUND,
- RES_ANCHOR, RES_ANCHOR,
+ SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
+ RES_SURROUND, RES_SURROUND,
+ RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT,RES_HORI_ORIENT,
0);
aShellSet.Put(*pOutSet);
@@ -737,10 +737,10 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
{
case SID_OBJECT_ALIGN_UP :
case FN_FRAME_ALIGN_VERT_TOP:
- nId = STR_TOP_BASE; break;
+ nId = STR_TOP_BASE; break;
case SID_OBJECT_ALIGN_MIDDLE :
case FN_FRAME_ALIGN_VERT_CENTER:
- nId = STR_CENTER_BASE; break;
+ nId = STR_CENTER_BASE; break;
case SID_OBJECT_ALIGN_DOWN :
case FN_FRAME_ALIGN_VERT_BOTTOM:
if(!bHtmlMode)
@@ -885,7 +885,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor fuer FrameShell
+ Beschreibung: Ctor fuer FrameShell
--------------------------------------------------------------------*/
SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 0fe336f2f006..bb6481c5b0aa 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -2,7 +2,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
@@ -123,20 +123,20 @@ void SwGrfShell::Execute(SfxRequest &rReq)
SwViewOption aUsrPref( *pVOpt );
SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1,
- RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
SID_ATTR_GRAF_KEEP_ZOOM, SID_ATTR_GRAF_KEEP_ZOOM,
SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE,
SID_ATTR_GRAF_FRMSIZE_PERCENT, SID_ATTR_GRAF_FRMSIZE_PERCENT,
SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC,
- FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
- FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO,
- FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG,
- SID_DOCFRAME, SID_DOCFRAME,
- SID_HTML_MODE, SID_HTML_MODE,
- FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
+ FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT,
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
+ FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
+ FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO,
+ FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG,
+ SID_DOCFRAME, SID_DOCFRAME,
+ SID_HTML_MODE, SID_HTML_MODE,
+ FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
0);
USHORT nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
@@ -180,7 +180,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet.Put( aSzItm );
Size aSz( aSizeCopy.GetWidthPercent(), aSizeCopy.GetHeightPercent() );
- if( 0xff == aSz.Width() ) aSz.Width() = 0;
+ if( 0xff == aSz.Width() ) aSz.Width() = 0;
if( 0xff == aSz.Height() ) aSz.Height() = 0;
aSzItm.SetSize( aSz );
@@ -264,9 +264,9 @@ void SwGrfShell::Execute(SfxRequest &rReq)
if(pFmt && pFmt->IsAutoUpdateFmt())
{
pFmt->SetFmtAttr(*pSet);
- SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
- RES_SURROUND, RES_SURROUND,
- RES_ANCHOR, RES_ANCHOR,
+ SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
+ RES_SURROUND, RES_SURROUND,
+ RES_ANCHOR, RES_ANCHOR,
RES_VERT_ORIENT,RES_HORI_ORIENT,
0);
aShellSet.Put(*pSet);
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index a654536a4ce3..7d00f174c05c 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -77,10 +77,10 @@ using ::rtl::OUString;
bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
{
- ::rtl::OUString aURL;
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- Window* pWindow = &GetView().GetViewFrame()->GetWindow();
- bool bAPI = false, bRet = false;
+ ::rtl::OUString aURL;
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ Window* pWindow = &GetView().GetViewFrame()->GetWindow();
+ bool bAPI = false, bRet = false;
if( pReqArgs )
{
@@ -110,15 +110,15 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
}
else
{
- SwWrtShell& rSh = GetShell();
+ SwWrtShell& rSh = GetShell();
if( !rSh.HasDrawView() )
rSh.MakeDrawView();
- Size aDocSz( rSh.GetDocSize() );
- const SwRect& rVisArea = rSh.VisArea();
- Point aPos( rVisArea.Center() );
- Size aSize;
+ Size aDocSz( rSh.GetDocSize() );
+ const SwRect& rVisArea = rSh.VisArea();
+ Point aPos( rVisArea.Center() );
+ Size aSize;
if( rVisArea.Width() > aDocSz.Width())
aPos.X() = aDocSz.Width() / 2 + rVisArea.Left();
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index aa82348a74c1..4385146ec4fa 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -2,7 +2,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
@@ -75,20 +75,20 @@ namespace SwLangHelper
EditEngine* pEditEngine=rEditView.GetEditEngine();
// the value of used script types
- const USHORT nScriptType =pOLV->GetSelectedScriptType();
+ const USHORT nScriptType =pOLV->GetSelectedScriptType();
String aScriptTypesInUse( String::CreateFromInt32( nScriptType ) );//pEditEngine->GetScriptType(aSelection)
SvtLanguageTable aLangTable;
-
+
// get keyboard language
String aKeyboardLang;
LanguageType nLang = LANGUAGE_DONTKNOW;
-
+
Window* pWin = rEditView.GetWindow();
if(pWin)
nLang = pWin->GetInputLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
- aKeyboardLang = aLangTable.GetString( nLang );
+ aKeyboardLang = aLangTable.GetString( nLang );
// get the language that is in use
const String aMultipleLanguages = String::CreateFromAscii("*");
@@ -97,14 +97,14 @@ namespace SwLangHelper
nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLangTable.GetString( nLang );
-
+
// build sequence for status value
uno::Sequence< ::rtl::OUString > aSeq( 4 );
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
aSeq[3] = SwLangHelper::GetTextForLanguageGuessing( pEditEngine, aSelection );
-
+
// set sequence as status value
SfxStringListItem aItem( SID_LANGUAGE_STATUS );
aItem.SetStringList( aSeq );
@@ -122,7 +122,7 @@ namespace SwLangHelper
// get the language
String aNewLangTxt;
-
+
SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False );
if (pItem)
aNewLangTxt = pItem->GetValue();
@@ -131,15 +131,15 @@ namespace SwLangHelper
//!! (call to GetView().GetViewFrame() will break if the
//!! SwTextShell got destroyed meanwhile.)
SfxViewFrame *pViewFrame = rView.GetViewFrame();
-
+
if (aNewLangTxt.EqualsAscii( "*" ))
{
// open the dialog "Tools/Options/Language Settings - Language"
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if (pFact)
- {
- VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS );
- pDlg->Execute();
+ {
+ VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS );
+ pDlg->Execute();
delete pDlg;
}
}
@@ -188,22 +188,22 @@ namespace SwLangHelper
rSh.StartAction();
rSh.LockView( TRUE );
rSh.Push();
-
+
// prepare to apply new language to all text in document
rSh.SelAll();
rSh.ExtendedSelectAll();
}
-
+
if (aNewLangTxt == aStrNone)
SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr );
else if (aNewLangTxt == aStrResetLangs)
SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection );
else
SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangTxt, bForSelection, aEditAttr );
-
+
// ugly hack, as it seems that EditView/EditEngine does not update their spellchecking marks
// when setting a new language attribute
- if (bForSelection)
+ if (bForSelection)
{
const SwViewOption* pVOpt = rView.GetWrtShellPtr()->GetViewOptions();
ULONG nCntrl = pEditEngine->GetControlWord();
@@ -225,7 +225,7 @@ namespace SwLangHelper
rEditView.Invalidate();
}
- if (!bForSelection)
+ if (!bForSelection)
{
// need to release view and restore selection...
rSh.Pop( FALSE );
@@ -234,14 +234,14 @@ namespace SwLangHelper
}
}
}
-
+
// invalidate slot to get the new language displayed
pViewFrame->GetBindings().Invalidate( rReq.GetSlot() );
-
+
rReq.Done();
return bRestoreSelection;
}
-
+
void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
{
@@ -254,7 +254,7 @@ namespace SwLangHelper
if (nLang != LANGUAGE_DONTKNOW)
{
USHORT nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( nLang );
-
+
EditEngine* pEditEngine = pOLV ? pOLV->GetEditView().GetEditEngine() : NULL;
OSL_ENSURE( !pOLV || pEditEngine, "OutlinerView without EditEngine???" );
@@ -266,7 +266,7 @@ namespace SwLangHelper
case SCRIPTTYPE_LATIN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE : RES_CHRATR_LANGUAGE; break;
case SCRIPTTYPE_ASIAN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CJK : RES_CHRATR_CJK_LANGUAGE; break;
case SCRIPTTYPE_COMPLEX : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CTL : RES_CHRATR_CTL_LANGUAGE; break;
- default:
+ default:
bIsSingleScriptType = false;
OSL_ENSURE(false, "unexpected case" );
}
@@ -300,8 +300,8 @@ namespace SwLangHelper
case EE_CHAR_LANGUAGE_CTL : nLangWhichId = RES_CHRATR_CTL_LANGUAGE; break;
}
rWrtSh.SetDefault( SvxLanguageItem( nLang, nLangWhichId ) );
-
- // set respective language attribute in text document to default
+
+ // set respective language attribute in text document to default
// (for all text in the document - which should be selected by now...)
SvUShortsSort aAttribs;
aAttribs.Insert( nLangWhichId );
@@ -382,8 +382,8 @@ namespace SwLangHelper
(void) aSelection;
// reset language for current selection.
- // The selection should already have been expanded to the whole paragraph or
- // to all text in the document if those are the ranges where to reset
+ // The selection should already have been expanded to the whole paragraph or
+ // to all text in the document if those are the ranges where to reset
// the language attributes
if (pOLV)
@@ -431,7 +431,7 @@ namespace SwLangHelper
}
else if (nState == SFX_ITEM_DEFAULT)
{
- // since the attribute is not set: retrieve the default value
+ // since the attribute is not set: retrieve the default value
nLang = (dynamic_cast< const SvxLanguageItem& >(aSet.GetPool()->GetDefaultItem( nLangWhichId ))).GetLanguage();
}
else if (nState == SFX_ITEM_DONTCARE)
@@ -511,7 +511,7 @@ namespace SwLangHelper
case SCRIPTTYPE_COMPLEX : nLangWhichId = EE_CHAR_LANGUAGE_CTL; break;
default: bIsSingleScriptType = false;
}
-
+
// get language according to the script type(s) in use
LanguageType nCurrentLang = LANGUAGE_SYSTEM;
if (bIsSingleScriptType)
@@ -535,7 +535,7 @@ namespace SwLangHelper
{
nCurrentLang = LANGUAGE_DONTKNOW;
break;
- }
+ }
}
}
OSL_ENSURE( nCurrentLang != LANGUAGE_SYSTEM, "failed to get the language?" );
@@ -570,7 +570,7 @@ namespace SwLangHelper
{
// string for guessing language
String aText;
-
+
aText = rEditEngine->GetText(aDocSelection);
if (aText.Len() > 0)
{
@@ -582,7 +582,7 @@ namespace SwLangHelper
nEnd = aText.Len() - nEnd > 100 ? nEnd + 100 : aText.Len();
aText = aText.Copy( nStt, nEnd - nStt );
}
-
+
return aText;
}
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 5505ff5e3e4b..abf89407e40b 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -2,7 +2,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
@@ -167,7 +167,7 @@ void SwListShell::Execute(SfxRequest &rReq)
rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN )
? TRUE
: FALSE );
- pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten!
+ pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten!
}
break;
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index ec8242d77f2d..c086fae3706b 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -2,7 +2,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
@@ -90,12 +90,12 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA))
void SwMediaShell::ExecMedia(SfxRequest &rReq)
{
SwWrtShell* pSh = &GetShell();
- SdrView* pSdrView = pSh->GetDrawView();
+ SdrView* pSdrView = pSh->GetDrawView();
if( pSdrView )
{
const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
+ USHORT nSlotId = rReq.GetSlot();
BOOL bChanged = pSdrView->GetModel()->IsChanged();
pSdrView->GetModel()->SetChanged( FALSE );
@@ -121,7 +121,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
{
if( pSh->IsObjSelected() )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) )
pItem = NULL;
@@ -160,16 +160,16 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
void SwMediaShell::GetMediaState(SfxItemSet &rSet)
{
- SfxWhichIter aIter( rSet );
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter( rSet );
+ USHORT nWhich = aIter.FirstWhich();
while( nWhich )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- SwWrtShell& rSh = GetShell();
- SdrView* pView = rSh.GetDrawView();
- bool bDisable = true;
+ SwWrtShell& rSh = GetShell();
+ SdrView* pView = rSh.GetDrawView();
+ bool bDisable = true;
if( pView )
{
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx
index a971998beb74..736e83e47d3f 100644
--- a/sw/source/ui/shells/olesh.cxx
+++ b/sw/source/ui/shells/olesh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 7e9a20bb6fc0..42b3b0029a7b 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -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
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index ab6850ce6aae..c91d12a6844d 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 77e973900566..41672f1e90b7 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -2,7 +2,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
@@ -122,25 +122,25 @@ TYPEINIT1(SwTableShell,SwBaseShell)
const USHORT __FAR_DATA aUITableAttrRange[] =
{
- FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME,
- FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
- FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE,
- FN_TABLE_REP, FN_TABLE_REP,
+ FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME,
+ FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
+ FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE,
+ FN_TABLE_REP, FN_TABLE_REP,
SID_RULER_BORDERS, SID_RULER_BORDERS,
- RES_LR_SPACE, RES_UL_SPACE,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW,
- RES_BOX, RES_SHADOW,
- RES_BACKGROUND, RES_BACKGROUND,
- SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION,
- SID_HTML_MODE, SID_HTML_MODE,
- SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
- RES_PAGEDESC, RES_BREAK,
- RES_KEEP, RES_KEEP,
- RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
- FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
+ RES_LR_SPACE, RES_UL_SPACE,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW,
+ RES_BOX, RES_SHADOW,
+ RES_BACKGROUND, RES_BACKGROUND,
+ SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION,
+ SID_HTML_MODE, SID_HTML_MODE,
+ SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
+ RES_PAGEDESC, RES_BREAK,
+ RES_KEEP, RES_KEEP,
+ RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
+ FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
RES_FRAMEDIR, RES_FRAMEDIR,
RES_ROW_SPLIT, RES_ROW_SPLIT,
- FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION,
+ FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION,
// --> collapsing borders FME 2005-05-27 #i29550#
RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS,
// <-- collapsing borders
@@ -178,8 +178,8 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
USHORT nBackgroundDestination = rSh.GetViewOptions()->GetTblDest();
rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination ));
SvxBrushItem aBrush( RES_BACKGROUND );
-// rSh.GetBoxBackground(aBrush);
-// rSet.Put( aBrush );
+// rSh.GetBoxBackground(aBrush);
+// rSet.Put( aBrush );
if(rSh.GetRowBackground(aBrush))
rSet.Put( aBrush, SID_ATTR_BRUSH_ROW );
else
@@ -202,7 +202,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
// Tabellenvariante, wenn mehrere Tabellenzellen selektiert
- rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
+ rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) ||
!bTableSel);
// Abstandsfeld immer anzeigen
@@ -494,7 +494,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
case SID_ATTR_BORDER:
{
-/* BOOL bPopCrsr = FALSE;
+/* BOOL bPopCrsr = FALSE;
if ( !rReq.IsAPI() )
{
//Keine Tabellenselektion -> Aenderung wird auf die gesamte
@@ -586,8 +586,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
if ((pBorderLine = aInfo.GetVert()) != NULL)
aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= TRUE;
-// if ( bPopCrsr && !bLine )
-// aBox.SetDistance( 0 );
+// if ( bPopCrsr && !bLine )
+// aBox.SetDistance( 0 );
aCoreSet.Put( aBox );
aCoreSet.Put( aInfo );
@@ -600,7 +600,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
rReq.AppendItem( aInfo );
bCallDone = TRUE;
-/* if ( bPopCrsr )
+/* if ( bPopCrsr )
{
rSh.KillPams();
rSh.Pop(FALSE);
@@ -789,7 +789,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
case TBLMERGE_OK:
bCallDone = TRUE;
//no break;
- case TBLMERGE_NOSELECTION: break;
+ case TBLMERGE_NOSELECTION: break;
case TBLMERGE_TOOCOMPLEX:
{
InfoBox aInfoBox( GetView().GetWindow(),
@@ -1054,7 +1054,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
case FN_TABLE_MODE_FIX :
case FN_TABLE_MODE_FIX_PROP :
- case FN_TABLE_MODE_VARIABLE :
+ case FN_TABLE_MODE_VARIABLE :
{
rSh.SetTblChgMode( ( FN_TABLE_MODE_FIX == nSlot ? TBLFIX_CHGABS
: FN_TABLE_MODE_FIX_PROP == nSlot
@@ -1268,7 +1268,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
case FN_INSERT_TABLE:
// Irgendeinen Wert "putten", damit Controller enabled bleibt.
// Statt "Insert:Table" erscheint dann "Format:Table".
-// rSet.Put(SfxUInt16Item(nSlot, 1));
+// rSet.Put(SfxUInt16Item(nSlot, 1));
break;
case FN_TABLE_OPTIMAL_HEIGHT:
@@ -1311,7 +1311,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
case FN_TABLE_MODE_FIX :
case FN_TABLE_MODE_FIX_PROP :
- case FN_TABLE_MODE_VARIABLE :
+ case FN_TABLE_MODE_VARIABLE :
{
TblChgMode nMode = rSh.GetTblChgMode();
BOOL bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) ||
@@ -1428,7 +1428,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
case SID_FRAME_LINESTYLE:
case SID_FRAME_LINECOLOR:
{
-/* Tabellenselektion ist abgeschafft
+/* Tabellenselektion ist abgeschafft
BOOL bPopCrsr = FALSE;
if ( !rReq.IsAPI() )
{
@@ -1461,7 +1461,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
}
rReq.Done();
-/* if ( bPopCrsr )
+/* if ( bPopCrsr )
{
rSh.KillPams();
rSh.Pop(FALSE);
@@ -1501,7 +1501,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
if(pArgs)
pArgs->GetItemState(GetPool().GetWhich(nSlot), FALSE, &pItem);
- // Sprache immer von Cursorposition besorgen
+ // Sprache immer von Cursorposition besorgen
LanguageType eLang = rSh.GetCurLang();
SvNumberFormatter* pFormatter = rSh.GetNumberFormatter();
sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
@@ -1512,12 +1512,12 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
case FN_NUMBER_FORMAT:
if( pItem )
{
- // Index fuer String bestimmen
+ // Index fuer String bestimmen
String aCode( ((const SfxStringItem*)pItem)->GetValue() );
nNumberFormat = pFormatter->GetEntryKey( aCode, eLang );
if( NUMBERFORMAT_ENTRY_NOT_FOUND == nNumberFormat )
{
- // neu eintragen
+ // neu eintragen
xub_StrLen nErrPos;
short nType;
if( !pFormatter->PutEntry( aCode, nErrPos, nType,
@@ -1526,14 +1526,14 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
}
}
break;
- case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break;
- case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break;
+ case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break;
+ case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break;
case FN_NUMBER_DATE: nFmtType = NUMBERFORMAT_DATE; break;
- case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break;
- case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break;
- case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break;
+ case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break;
+ case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break;
+ case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break;
- case FN_NUMBER_TWODEC: // #.##0,00
+ case FN_NUMBER_TWODEC: // #.##0,00
nFmtType = NUMBERFORMAT_NUMBER;
nOffset = NF_NUMBER_1000DEC2;
break;
@@ -1544,7 +1544,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
}
if( nFmtType )
- nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset;
+ nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset;
if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat )
{
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 7750582e0d05..8de4dc91ed5f 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
#include <crsskip.hxx>
-#include <hintids.hxx> //_immer_ vor den solar-Items
+#include <hintids.hxx> //_immer_ vor den solar-Items
#include <sfx2/lnkbase.hxx>
#include <fmtfld.hxx>
@@ -85,18 +85,18 @@
using namespace nsSwDocInfoSubType;
-extern BOOL bNoInterrupt; // in mainwn.cxx
+extern BOOL bNoInterrupt; // in mainwn.cxx
String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId )
{
USHORT nResId = 0;
switch( nRedlId )
{
- case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break;
- case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break;
- case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break;
- case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break;
- case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break;
+ case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break;
+ case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break;
+ case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break;
+ case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break;
+ case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break;
}
if( nResId )
rStr += SW_RESSTR( nResId );
@@ -302,7 +302,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
SfxViewFrame* pVFrame = GetView().GetViewFrame();
if (!pVFrame->HasChildWindow(FN_INSERT_FIELD))
- pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen
+ pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen
// Flddlg auf neue TabPage umschalten
USHORT nId = SwFldDlgWrapper::GetChildWindowId();
@@ -370,7 +370,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.Push();
rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, FALSE);
pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
- rSh.Pop(FALSE); // Cursorpos restaurieren
+ rSh.Pop(FALSE); // Cursorpos restaurieren
}
if (pPostIt)
@@ -393,7 +393,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
break;
case FN_REDLINE_COMMENT:
{
- /* this code can be used once we want redline comments in the margin, all other stuff can
+ /* this code can be used once we want redline comments in the margin, all other stuff can
then be deleted
String sComment;
const SwRedline *pRedline = rSh.GetCurrRedline();
@@ -436,8 +436,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
const SwRedline *pActRed = rSh.SelPrevRedline();
if (pActRed == pRedline)
- { // Neuer Cursor steht am Anfang des Current Redlines
- rSh.Pop(); // Alten Cursor wegwerfen
+ { // Neuer Cursor steht am Anfang des Current Redlines
+ rSh.Pop(); // Alten Cursor wegwerfen
rSh.Push();
pActRed = rSh.SelPrevRedline();
}
@@ -447,13 +447,13 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.EndAction();
rSh.ClearMark();
- rSh.SelNextRedline(); // Aktueller Redline wird selektiert
+ rSh.SelNextRedline(); // Aktueller Redline wird selektiert
rSh.StartAction();
rSh.Push();
pActRed = rSh.SelNextRedline();
BOOL bNext = pActRed != 0;
- rSh.Pop(FALSE); // Cursorpos restaurieren
+ rSh.Pop(FALSE); // Cursorpos restaurieren
if( rSh.IsCrsrPtAtEnd() )
rSh.SwapPam();
@@ -654,7 +654,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
}
USHORT nTempWhich = pField ? pField->GetTyp()->Which() : USHRT_MAX;
- if( USHRT_MAX == nTempWhich ||
+ if( USHRT_MAX == nTempWhich ||
RES_POSTITFLD == nTempWhich ||
RES_SCRIPTFLD == nTempWhich ||
RES_AUTHORITY == nTempWhich )
@@ -797,7 +797,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
{
// Traveling nur bei mehr als einem Feld
if( !pSh->IsCrsrPtAtEnd() )
- pSh->SwapPam(); // Cursor hinter den Redline stellen
+ pSh->SwapPam(); // Cursor hinter den Redline stellen
pSh->Push();
const SwRedline *pActRed = pSh->SelNextRedline();
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index 0e998d7c6224..b91d04b83fa0 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index cb47f09827c0..941f2db76097 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@
#include "cmdid.h"
#include "view.hxx"
#include "wrtsh.hxx"
-#include "swundo.hxx" // fuer Undo-Ids
+#include "swundo.hxx" // fuer Undo-Ids
#include "textsh.hxx"
#include "idxmrk.hxx"
#include "cnttab.hxx"
@@ -94,7 +94,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
SwTOXMgr aMgr(GetShellPtr());
USHORT nRet = RET_OK;
if(aMgr.GetTOXMarkCount() > 1)
- { // Mehrere Marken, welche solls denn sein ?
+ { // Mehrere Marken, welche solls denn sein ?
//
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -104,7 +104,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
nRet = pMultDlg->Execute();
delete pMultDlg;
}
- if( nRet == RET_OK)
+ if( nRet == RET_OK)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -129,7 +129,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
RES_LR_SPACE, RES_LR_SPACE,
FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE,
- 0 );
+ 0 );
SwWrtShell& rSh = GetShell();
SwRect aRect;
rSh.CalcBoundRect(aRect, FLY_AS_CHAR);
@@ -248,7 +248,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
else
rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, 0 != pAuthMark));
- if( bInReadonly || !pField ||
+ if( bInReadonly || !pField ||
pField->GetTyp()->Which() != RES_AUTHORITY)
rSet.DisableItem(FN_EDIT_AUTH_ENTRY_DLG);
rSet.DisableItem(FN_REMOVE_CUR_TOX);
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index f385b53e8b14..92e8103623bb 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -2,7 +2,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
@@ -85,7 +85,7 @@
#include <textsh.hxx>
#include <frmfmt.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // fuer Undo-IDs
+#include <swundo.hxx> // fuer Undo-IDs
#include <shellio.hxx>
#include <frmdlg.hxx>
#include <usrpref.hxx>
@@ -907,7 +907,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
aHLinkItem.SetInsertMode((SvxLinkInsertMode)(aHLinkItem.GetInsertMode() |
((nHtmlMode & HTMLMODE_ON) != 0 ? HLINK_HTMLMODE : 0)));
- aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT|
+ aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT|
HYPERDLG_EVENT_MOUSECLICK_OBJECT | HYPERDLG_EVENT_MOUSEOUT_OBJECT );
rSet.Put(aHLinkItem);
@@ -1173,9 +1173,9 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
bFontChanged = TRUE;
SvxFontItem aNewFontItem( aFont );
aNewFontItem.GetFamilyName() = aNewFont.GetName();
- aNewFontItem.GetFamily() = aNewFont.GetFamily();
- aNewFontItem.GetPitch() = aNewFont.GetPitch();
- aNewFontItem.GetCharSet() = aNewFont.GetCharSet();
+ aNewFontItem.GetFamily() = aNewFont.GetFamily();
+ aNewFontItem.GetPitch() = aNewFont.GetPitch();
+ aNewFontItem.GetCharSet() = aNewFont.GetCharSet();
SfxItemSet aRestoreSet( GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONT,
RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 8f8ecca3b901..5633e4cd09b9 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -2,7 +2,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
@@ -84,7 +84,7 @@
#include <docstat.hxx>
#include <outline.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // fuer Undo-IDs
+#include <swundo.hxx> // fuer Undo-IDs
#include <reffld.hxx>
#include <docsh.hxx>
#include <mdiexp.hxx>
@@ -662,7 +662,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
case FN_AUTOFORMAT_AUTO:
{
- SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get();
+ SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get();
BOOL bSet = pItem ? ((const SfxBoolItem*)pItem)->GetValue() : !pACfg->IsAutoFmtByInput();
if( bSet != pACfg->IsAutoFmtByInput() )
{
@@ -842,10 +842,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
- rWrtSh.Push(); //save current cursor
+ rWrtSh.Push(); //save current cursor
SwLangHelper::SelectCurrentPara( rWrtSh );
lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq );
- rWrtSh.Pop( FALSE ); //restore old cursor
+ rWrtSh.Pop( FALSE ); //restore old cursor
}
break;
case SID_ATTR_LRSPACE :
@@ -1148,7 +1148,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rReq.Done();
-/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht
+/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht
if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
{
Brush aBrush(pItem ? BRUSH_SOLID : BRUSH_NULL);
@@ -1406,7 +1406,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSet.DisableItem( SID_THES );
}
break;
-
+
case FN_NUMBER_NEWSTART :
if(!rSh.GetCurNumRule())
rSet.DisableItem(nWhich);
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 98086857f31c..632cea50f303 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -2,7 +2,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
@@ -95,8 +95,8 @@ struct DBTextStruct_Impl
{
SwDBData aDBData;
Sequence<Any> aSelection;
- Reference<XResultSet> xCursor;
- Reference<XConnection> xConnection;
+ Reference<XResultSet> xCursor;
+ Reference<XConnection> xConnection;
};
inline void AddSelList( List& rLst, long nRow )
@@ -166,15 +166,15 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
{
if(pSourceItem && pCommandItem && pCommandTypeItem)
{
- DBTextStruct_Impl* pNew = new DBTextStruct_Impl;
- pNew->aDBData.sDataSource = sSourceArg;
- pNew->aDBData.sCommand = sCommandArg;
- pNew->aDBData.nCommandType = nCommandTypeArg;
- pNew->aSelection = aSelection;
+ DBTextStruct_Impl* pNew = new DBTextStruct_Impl;
+ pNew->aDBData.sDataSource = sSourceArg;
+ pNew->aDBData.sCommand = sCommandArg;
+ pNew->aDBData.nCommandType = nCommandTypeArg;
+ pNew->aSelection = aSelection;
//if the cursor is NULL, it must be created inside InsertDBTextHdl
// because it called via a PostUserEvent
- pNew->xCursor = xCursor;
- pNew->xConnection = xConnection;
+ pNew->xCursor = xCursor;
+ pNew->xConnection = xConnection;
Application::PostUserEvent( STATIC_LINK( this, SwBaseShell,
InsertDBTextHdl ), pNew );
@@ -195,10 +195,10 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
ODataAccessDescriptor aDescriptor;
aDescriptor.setDataSource(sSourceArg);
- aDescriptor[daCommand] <<= sCommandArg;
- aDescriptor[daCursor] <<= xCursor;
- aDescriptor[daSelection] <<= aSelection;
- aDescriptor[daCommandType] <<= nCommandTypeArg;
+ aDescriptor[daCommand] <<= sCommandArg;
+ aDescriptor[daCursor] <<= xCursor;
+ aDescriptor[daSelection] <<= aSelection;
+ aDescriptor[daCommandType] <<= nCommandTypeArg;
SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor );
pNewDBMgr->MergeNew(aMergeDesc);
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 43ee2df4305f..71571fd92880 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -2,7 +2,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
@@ -67,8 +67,8 @@
#include <SwStyleNameMapper.hxx>
#include "swabstdlg.hxx"
#include "chrdlg.hrc"
-const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2)
-const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72)
+const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2)
+const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72)
@@ -254,7 +254,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
if (bGrow)
{
if( lSize == lFontMaxSz )
- break; // das wars, hoeher gehts nicht
+ break; // das wars, hoeher gehts nicht
if( ( lSize += lFontInc ) > lFontMaxSz )
lSize = lFontMaxSz;
}
@@ -316,14 +316,14 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
switch (rReq.GetSlot())
{
- case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break;
- case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break;
- case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break;
- case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break;
+ case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break;
+ case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break;
+ case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break;
+ case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break;
- case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break;
- case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break;
- case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break;
+ case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break;
+ case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break;
+ case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break;
default:
OSL_ENSURE(false, "SwTextShell::ExecParaAttr wrong Dispatcher");
@@ -377,10 +377,10 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
}
}
break;
- case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST;
- case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST;
- case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST;
- case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST;
+ case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST;
+ case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST;
+ case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST;
+ case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST;
SET_ADJUST:
{
aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST));
@@ -396,9 +396,9 @@ SET_ADJUST:
aSet.Put( aLineSpace );
}
break;
- case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE;
- case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE;
- case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE;
SET_LINESPACE:
{
@@ -549,7 +549,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet,
+ SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if (pDlg->Execute() == RET_OK)
@@ -582,7 +582,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
if(pItem)
{
SfxItemSet aCoreSet( GetPool(),
- RES_PAGEDESC, RES_PAGEDESC,
+ RES_PAGEDESC, RES_PAGEDESC,
SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, 0);
aCoreSet.Put(*pItem);
SfxToSwPageDescAttr( rSh, aCoreSet);
@@ -612,7 +612,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
sal_Bool bFlag = sal_False;
SfxBoolItem aFlagItem;
const SfxPoolItem* pItem = 0;
- int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen
+ int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen
SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, FALSE, &pItem);
if( SFX_ITEM_DEFAULT == eState )
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 9d0efc70c44d..3cf887b546dc 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -2,7 +2,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
@@ -116,22 +116,22 @@ void SwTextShell::ExecMove(SfxRequest &rReq)
switch ( nSlot )
{
case FN_START_OF_LINE_SEL:
- case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE );
+ case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE );
break;
case FN_END_OF_LINE_SEL:
- case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE );
+ case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE );
break;
case FN_START_OF_DOCUMENT_SEL:
- case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot);
+ case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot);
break;
case FN_END_OF_DOCUMENT_SEL:
- case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot );
+ case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot );
break;
- case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break;
+ case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break;
case SID_SELECTALL: bRet = 0 != rSh.SelAll(); break;
default: OSL_ENSURE(false, "wrong dispatcher"); return;
@@ -158,7 +158,7 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq)
case FN_START_OF_NEXT_PAGE: rSh.SttNxtPg( FN_START_OF_NEXT_PAGE_SEL == nSlot ); break;
case FN_END_OF_NEXT_PAGE_SEL:
- case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break;
+ case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break;
case FN_START_OF_PREV_PAGE_SEL:
case FN_START_OF_PREV_PAGE: rSh.SttPrvPg( FN_START_OF_PREV_PAGE_SEL == nSlot ); break;
@@ -167,10 +167,10 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq)
case FN_END_OF_PREV_PAGE: rSh.EndPrvPg( FN_END_OF_PREV_PAGE_SEL == nSlot ); break;
case FN_START_OF_PAGE_SEL:
- case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break;
+ case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break;
case FN_END_OF_PAGE_SEL:
- case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break;
+ case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break;
default: OSL_ENSURE(false, "wrong dispatcher"); return;
}
rReq.Done();
@@ -182,12 +182,12 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq)
SwWrtShell &rSh = GetShell();
switch ( rReq.GetSlot() )
{
- case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break;
- case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break;
+ case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break;
+ case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break;
case FN_START_OF_NEXT_COLUMN: rSh.StartOfNextColumn( FALSE ) ; break;
- case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break;
+ case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break;
case FN_START_OF_PREV_COLUMN: rSh.StartOfPrevColumn( FALSE ); break;
- case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break;
+ case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break;
default: OSL_ENSURE(false, "wrong dispatcher"); return;
}
rReq.Done();
@@ -203,7 +203,7 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq)
switch ( nSlot )
{
case FN_NEXT_WORD_SEL:
- case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot );
+ case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot );
break;
case FN_START_OF_PARA_SEL:
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index e08b4bdc0140..d3ac0e32f23a 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx
index 13f3cc462391..7103610a413a 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/smartmenu/stmenu.hrc b/sw/source/ui/smartmenu/stmenu.hrc
index 56afc5752f79..a31fbca218be 100644
--- a/sw/source/ui/smartmenu/stmenu.hrc
+++ b/sw/source/ui/smartmenu/stmenu.hrc
@@ -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
diff --git a/sw/source/ui/smartmenu/stmenu.src b/sw/source/ui/smartmenu/stmenu.src
index 9775b829e7a0..e4e30192d72c 100644
--- a/sw/source/ui/smartmenu/stmenu.src
+++ b/sw/source/ui/smartmenu/stmenu.src
@@ -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
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index 6cdca739c17a..dbbae724af02 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -2,7 +2,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
@@ -210,7 +210,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
if( xInit.is() )
{
uno::Reference< awt::XWindow > xDialogParentWindow(0);
- // initialize dialog
+ // initialize dialog
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
diff --git a/sw/source/ui/table/chartins.hrc b/sw/source/ui/table/chartins.hrc
index 91bbb0f424c6..92b4d1ff4b97 100644
--- a/sw/source/ui/table/chartins.hrc
+++ b/sw/source/ui/table/chartins.hrc
@@ -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
@@ -31,15 +31,15 @@
#include "rcid.hrc"
#include "table.hrc"
-#define ED_RANGE 1
+#define ED_RANGE 1
#define FT_RANGE 2
-#define BT_NEXT 3
+#define BT_NEXT 3
#define BT_FINISH 4
#define BT_HELP 5
#define BT_CANCEL 6
-#define CB_FIRST_ROW 7
+#define CB_FIRST_ROW 7
#define CB_FIRST_COL 8
-#define BT_PREV 9
+#define BT_PREV 9
#define FL_HLINE 10
#define FT_TEXT 11
#define FL_1 12
diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src
index 6a3c4fb5b34a..6c30097791b9 100644
--- a/sw/source/ui/table/chartins.src
+++ b/sw/source/ui/table/chartins.src
@@ -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
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 3fa7ecbf5afa..a67f78102f78 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -2,7 +2,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
@@ -66,14 +66,14 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) :
SvxStandardDialog( pParent, SW_RES(DLG_COL_WIDTH) ),
- aColFT(this, SW_RES(FT_COL)),
- aColEdit(this, SW_RES(ED_COL)),
- aWidthFT(this, SW_RES(FT_WIDTH)),
- aWidthEdit(this, SW_RES(ED_WIDTH)),
+ aColFT(this, SW_RES(FT_COL)),
+ aColEdit(this, SW_RES(ED_COL)),
+ aWidthFT(this, SW_RES(FT_WIDTH)),
+ aWidthEdit(this, SW_RES(ED_WIDTH)),
aWidthFL(this, SW_RES(FL_WIDTH)),
- aOKBtn(this, SW_RES(BT_OK)),
- aCancelBtn(this, SW_RES(BT_CANCEL)),
- aHelpBtn(this, SW_RES(BT_HELP)),
+ aOKBtn(this, SW_RES(BT_OK)),
+ aCancelBtn(this, SW_RES(BT_CANCEL)),
+ aHelpBtn(this, SW_RES(BT_HELP)),
rFnc(rTableFnc)
{
FreeResource();
diff --git a/sw/source/ui/table/colwd.hrc b/sw/source/ui/table/colwd.hrc
index 4ac7358a65a9..e7526f79d5ed 100644
--- a/sw/source/ui/table/colwd.hrc
+++ b/sw/source/ui/table/colwd.hrc
@@ -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
@@ -24,13 +24,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define FT_COL 1
-#define ED_COL 2
-#define FT_WIDTH 3
-#define ED_WIDTH 4
+#define FT_COL 1
+#define ED_COL 2
+#define FT_WIDTH 3
+#define ED_WIDTH 4
#define FL_WIDTH 5
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_HELP 102
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_HELP 102
diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src
index aa1cf468867f..cd34b41bd55b 100644
--- a/sw/source/ui/table/colwd.src
+++ b/sw/source/ui/table/colwd.src
@@ -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
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 74a084291d07..9e3d7235aff3 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -2,7 +2,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
@@ -123,15 +123,15 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
#pragma warning (disable : 4355)
#endif
aTabBtn (this, SW_RES(CB_TAB)),
- aSemiBtn (this, SW_RES(CB_SEMI)),
- aParaBtn (this, SW_RES(CB_PARA)),
+ aSemiBtn (this, SW_RES(CB_SEMI)),
+ aParaBtn (this, SW_RES(CB_PARA)),
aOtherBtn (this, SW_RES(RB_OTHER)),
aOtherEd (this, SW_RES(ED_OTHER)),
aKeepColumn (this, SW_RES(CB_KEEPCOLUMN)),
aDelimFL (this, SW_RES(FL_DELIM)),
aHeaderCB (this, SW_RES(CB_HEADER)),
- aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)),
+ aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)),
aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)),
aRepeatHeaderBeforeFT (this),
@@ -140,8 +140,8 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
aOptionsFL (this, SW_RES(FL_OPTIONS)),
- aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)),
- aBorderCB (this, SW_RES(CB_BORDER)),
+ aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)),
+ aBorderCB (this, SW_RES(CB_BORDER)),
aAutoFmtBtn(this,SW_RES(BT_AUTOFORMAT)),
aOkBtn(this,SW_RES(BT_OK)),
@@ -185,10 +185,10 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
else
{
//Einfuege-Optionen verstecken
- aHeaderCB .Show(FALSE);
- aRepeatHeaderCB .Show(FALSE);
- aDontSplitCB .Show(FALSE);
- aBorderCB .Show(FALSE);
+ aHeaderCB .Show(FALSE);
+ aRepeatHeaderCB .Show(FALSE);
+ aDontSplitCB .Show(FALSE);
+ aBorderCB .Show(FALSE);
aOptionsFL .Show(FALSE);
aRepeatHeaderCombo.Show(FALSE);
@@ -224,7 +224,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
CheckBoxHdl();
}
-SwConvertTableDlg:: ~SwConvertTableDlg()
+SwConvertTableDlg:: ~SwConvertTableDlg()
{
delete pTAutoFmt;
}
diff --git a/sw/source/ui/table/convert.hrc b/sw/source/ui/table/convert.hrc
index 7f7cbbec768f..e86906dd2085 100644
--- a/sw/source/ui/table/convert.hrc
+++ b/sw/source/ui/table/convert.hrc
@@ -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
@@ -24,24 +24,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define CB_TAB 1
-#define CB_SEMI 3
-#define CB_PARA 4
+#define CB_TAB 1
+#define CB_SEMI 3
+#define CB_PARA 4
#define FL_DELIM 5
-#define RB_OTHER 6
-#define ED_OTHER 7
-#define CB_KEEPCOLUMN 8
-#define STR_CONVERT_TEXT_TABLE 9
-#define CB_HEADER 13
-#define CB_REPEAT_HEADER 14
+#define RB_OTHER 6
+#define ED_OTHER 7
+#define CB_KEEPCOLUMN 8
+#define STR_CONVERT_TEXT_TABLE 9
+#define CB_HEADER 13
+#define CB_REPEAT_HEADER 14
#define CB_DONT_SPLIT 15
-#define CB_BORDER 16
+#define CB_BORDER 16
#define FL_OPTIONS 17
-#define FT_REPEAT_HEADER 18
-#define NF_REPEAT_HEADER 19
+#define FT_REPEAT_HEADER 18
+#define NF_REPEAT_HEADER 19
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_AUTOFORMAT 102
-#define BT_HELP 103
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_AUTOFORMAT 102
+#define BT_HELP 103
#define WIN_REPEAT_HEADER 104
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index e2ff4ed1c2e3..50baa2bb9a46 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -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
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 809beeae5adb..d262222d8a9d 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -2,7 +2,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
@@ -92,30 +92,30 @@ void SwInsTableDlg::GetValues( String& rName, USHORT& rRow, USHORT& rCol,
SwInsTableDlg::SwInsTableDlg( SwView& rView )
: SfxModalDialog( rView.GetWindow(), SW_RES(DLG_INSERT_TABLE) ),
aNameFT (this, SW_RES(FT_NAME)),
- aNameEdit (this, SW_RES(ED_NAME)),
+ aNameEdit (this, SW_RES(ED_NAME)),
aFL (this, SW_RES(FL_TABLE)),
aColLbl (this, SW_RES(FT_COL)),
- aColEdit (this, SW_RES(ED_COL)),
- aRowLbl (this, SW_RES(FT_ROW)),
- aRowEdit (this, SW_RES(ED_ROW)),
+ aColEdit (this, SW_RES(ED_COL)),
+ aRowLbl (this, SW_RES(FT_ROW)),
+ aRowEdit (this, SW_RES(ED_ROW)),
aOptionsFL (this, SW_RES(FL_OPTIONS)),
aHeaderCB (this, SW_RES(CB_HEADER)),
- aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)),
- aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)),
- aRepeatHeaderBeforeFT (this),
- aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER)),
- aRepeatHeaderAfterFT (this),
- aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
+ aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)),
+ aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER)),
+ aRepeatHeaderBeforeFT (this),
+ aRepeatHeaderNF (this, SW_RES(NF_REPEAT_HEADER)),
+ aRepeatHeaderAfterFT (this),
+ aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)),
- aBorderCB (this, SW_RES(CB_BORDER)),
+ aBorderCB (this, SW_RES(CB_BORDER)),
aOkBtn (this, SW_RES(BT_OK)),
- aCancelBtn (this, SW_RES(BT_CANCEL)),
- aHelpBtn (this, SW_RES(BT_HELP)),
- aAutoFmtBtn (this, SW_RES(BT_AUTOFORMAT)),
+ aCancelBtn (this, SW_RES(BT_CANCEL)),
+ aHelpBtn (this, SW_RES(BT_HELP)),
+ aAutoFmtBtn (this, SW_RES(BT_AUTOFORMAT)),
pShell(&rView.GetWrtShell()),
pTAutoFmt( 0 ),
diff --git a/sw/source/ui/table/instable.hrc b/sw/source/ui/table/instable.hrc
index 6077541a3c01..b11bf61929b9 100644
--- a/sw/source/ui/table/instable.hrc
+++ b/sw/source/ui/table/instable.hrc
@@ -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
@@ -25,25 +25,25 @@
*
************************************************************************/
-#define FT_COL 1
-#define FT_ROW 2
-#define ED_COL 4
-#define ED_ROW 5
+#define FT_COL 1
+#define FT_ROW 2
+#define ED_COL 4
+#define ED_ROW 5
#define FL_TABLE 10
-#define ED_NAME 11
+#define ED_NAME 11
#define FT_NAME 12
-#define CB_HEADER 13
-#define CB_REPEAT_HEADER 14
+#define CB_HEADER 13
+#define CB_REPEAT_HEADER 14
#define CB_DONT_SPLIT 15
-#define CB_BORDER 16
+#define CB_BORDER 16
#define FL_OPTIONS 17
-#define FT_REPEAT_HEADER 18
-#define NF_REPEAT_HEADER 19
+#define FT_REPEAT_HEADER 18
+#define NF_REPEAT_HEADER 19
-#define BT_OK 20
-#define BT_CANCEL 21
-#define BT_HELP 22
-#define BT_AUTOFORMAT 23
+#define BT_OK 20
+#define BT_CANCEL 21
+#define BT_HELP 22
+#define BT_AUTOFORMAT 23
-#define WIN_REPEAT_HEADER 25
+#define WIN_REPEAT_HEADER 25
diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src
index e5f83f2a1ee3..3930bb36abd7 100644
--- a/sw/source/ui/table/instable.src
+++ b/sw/source/ui/table/instable.src
@@ -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
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index 5e1e2d6ab39d..3bf417c63faa 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -2,7 +2,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
@@ -42,13 +42,13 @@
SwMergeTblDlg::SwMergeTblDlg( Window *pParent, BOOL& rWithPrev )
: SvxStandardDialog(pParent, SW_RES(DLG_MERGE_TABLE)),
- aOKPB( this, SW_RES(PB_OK )),
- aCancelPB( this, SW_RES(PB_CANCEL )),
- aHelpPB( this, SW_RES(PB_HELP )),
+ aOKPB( this, SW_RES(PB_OK )),
+ aCancelPB( this, SW_RES(PB_CANCEL )),
+ aHelpPB( this, SW_RES(PB_HELP )),
aMergeFL( this, SW_RES(FL_MERGE )),
- aMergePrevRB( this, SW_RES(RB_MERGE_PREV)),
- aMergeNextRB( this, SW_RES(RB_MERGE_NEXT)),
- rMergePrev( rWithPrev )
+ aMergePrevRB( this, SW_RES(RB_MERGE_PREV)),
+ aMergeNextRB( this, SW_RES(RB_MERGE_NEXT)),
+ rMergePrev( rWithPrev )
{
FreeResource();
aMergePrevRB.Check();
diff --git a/sw/source/ui/table/mergetbl.hrc b/sw/source/ui/table/mergetbl.hrc
index cee06b6ef20d..f4598011adac 100644
--- a/sw/source/ui/table/mergetbl.hrc
+++ b/sw/source/ui/table/mergetbl.hrc
@@ -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
@@ -24,9 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define PB_OK 1
+#define PB_OK 1
#define PB_CANCEL 2
-#define PB_HELP 3
+#define PB_HELP 3
#define FL_MERGE 4
#define RB_MERGE_PREV 5
#define RB_MERGE_NEXT 6
diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src
index 81ea30f9b003..97ef9cb2cdb4 100644
--- a/sw/source/ui/table/mergetbl.src
+++ b/sw/source/ui/table/mergetbl.src
@@ -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
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 7f82e172c7cd..03c428121069 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/table/rowht.hrc b/sw/source/ui/table/rowht.hrc
index e844f3c65a8d..564c5bf61b07 100644
--- a/sw/source/ui/table/rowht.hrc
+++ b/sw/source/ui/table/rowht.hrc
@@ -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
@@ -24,11 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define ED_HEIGHT 1
-#define CB_AUTOHEIGHT 2
+#define ED_HEIGHT 1
+#define CB_AUTOHEIGHT 2
#define FL_HEIGHT 3
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_HELP 102
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_HELP 102
diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src
index 71a616bef045..ea3ac27474fa 100644
--- a/sw/source/ui/table/rowht.src
+++ b/sw/source/ui/table/rowht.src
@@ -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
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index db1d1a1e80bc..f4240457d5ee 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -2,7 +2,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
@@ -44,16 +44,16 @@
--------------------------------------------------*/
SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) :
SvxStandardDialog(pParent, SW_RES(DLG_SPLIT_TABLE)),
- aOKPB( this, SW_RES(PB_OK )),
- aCancelPB( this, SW_RES(PB_CANCEL )),
- aHelpPB( this, SW_RES(PB_HELP )),
+ aOKPB( this, SW_RES(PB_OK )),
+ aCancelPB( this, SW_RES(PB_CANCEL )),
+ aHelpPB( this, SW_RES(PB_HELP )),
aSplitFL( this, SW_RES(FL_SPLIT )),
- aCntntCopyRB( this, SW_RES(RB_CNTNT )),
- aBoxAttrCopyWithParaRB( this, SW_RES(RB_BOX_PARA )),
- aBoxAttrCopyNoParaRB( this, SW_RES(RB_BOX_NOPARA)),
- aBorderCopyRB( this, SW_RES(RB_BORDER )),
+ aCntntCopyRB( this, SW_RES(RB_CNTNT )),
+ aBoxAttrCopyWithParaRB( this, SW_RES(RB_BOX_PARA )),
+ aBoxAttrCopyNoParaRB( this, SW_RES(RB_BOX_NOPARA)),
+ aBorderCopyRB( this, SW_RES(RB_BORDER )),
rShell(rSh),
- m_nSplit( HEADLINE_CNTNTCOPY )
+ m_nSplit( HEADLINE_CNTNTCOPY )
{
FreeResource();
aCntntCopyRB.Check();
diff --git a/sw/source/ui/table/splittbl.hrc b/sw/source/ui/table/splittbl.hrc
index 83882b374ecb..c57b0e499fcb 100644
--- a/sw/source/ui/table/splittbl.hrc
+++ b/sw/source/ui/table/splittbl.hrc
@@ -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
@@ -24,11 +24,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define PB_OK 1
+#define PB_OK 1
#define PB_CANCEL 2
-#define PB_HELP 3
+#define PB_HELP 3
#define FL_SPLIT 4
-#define RB_CNTNT 5
+#define RB_CNTNT 5
#define RB_BOX_NOPARA 6
-#define RB_BOX_PARA 7
+#define RB_BOX_PARA 7
#define RB_BORDER 8
diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src
index 879d4528d7de..e58d64ab96d2 100644
--- a/sw/source/ui/table/splittbl.src
+++ b/sw/source/ui/table/splittbl.src
@@ -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
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 0606f653ff7e..1d8669b1834e 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -2,7 +2,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
@@ -152,7 +152,7 @@ BOOL SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
{
// die unsichtbaren Trenner werden aus den alten TabCols genommen
// die sichtbaren kommen aus pTColumns
- TColumn* pOldTColumns = new TColumn[nAllCols + 1];
+ TColumn* pOldTColumns = new TColumn[nAllCols + 1];
SwTwips nStart = 0,
nEnd;
for(i = 0; i < nAllCols - 1; i++)
diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src
index 7a0ab5472347..7c0194be7791 100644
--- a/sw/source/ui/table/table.src
+++ b/sw/source/ui/table/table.src
@@ -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
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b58b2154a84c..61a16ac81d6a 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -2,7 +2,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
@@ -116,11 +116,11 @@ void DbgTblRep(SwTableRep* pRep)
SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, SW_RES( TP_FORMAT_TABLE ), rSet ),
aOptionsFL(this, SW_RES( FL_OPTIONS )),
- aNameFT(this, SW_RES( FT_NAME )),
- aNameED(this, SW_RES( ED_NAME )),
- aWidthFT(this, SW_RES( FT_WIDTH )),
- aWidthMF(this, SW_RES( ED_WIDTH )),
- aRelWidthCB(this, SW_RES( CB_REL_WIDTH )),
+ aNameFT(this, SW_RES( FT_NAME )),
+ aNameED(this, SW_RES( ED_NAME )),
+ aWidthFT(this, SW_RES( FT_WIDTH )),
+ aWidthMF(this, SW_RES( ED_WIDTH )),
+ aRelWidthCB(this, SW_RES( CB_REL_WIDTH )),
aPosFL(this, SW_RES( FL_POS )),
aFullBtn(this, SW_RES( RB_FULL )),
@@ -132,13 +132,13 @@ SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet )
aDistFL(this, SW_RES( FL_DIST )),
aLeftFT(this, SW_RES( FT_LEFT_DIST )),
- aLeftMF(this, SW_RES( ED_LEFT_DIST )),
- aRightFT(this, SW_RES( FT_RIGHT_DIST )),
- aRightMF(this, SW_RES( ED_RIGHT_DIST )),
- aTopFT (this, SW_RES( FT_TOP_DIST )),
- aTopMF(this, SW_RES( ED_TOP_DIST )),
- aBottomFT(this, SW_RES( FT_BOTTOM_DIST )),
- aBottomMF(this, SW_RES( ED_BOTTOM_DIST )),
+ aLeftMF(this, SW_RES( ED_LEFT_DIST )),
+ aRightFT(this, SW_RES( FT_RIGHT_DIST )),
+ aRightMF(this, SW_RES( ED_RIGHT_DIST )),
+ aTopFT (this, SW_RES( FT_TOP_DIST )),
+ aTopMF(this, SW_RES( ED_TOP_DIST )),
+ aBottomFT(this, SW_RES( FT_BOTTOM_DIST )),
+ aBottomMF(this, SW_RES( ED_BOTTOM_DIST )),
aPropertiesFL(this, SW_RES( FL_PROPERTIES )),
aTextDirectionFT(this, SW_RES( FT_TEXTDIRECTION )),
@@ -226,13 +226,13 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
aRightMF.SetRefValue(pTblData->GetSpace());
aLeftMF.MetricField::SetMin(0); // wird vom Percentfield ueberschrieben
aRightMF.MetricField::SetMin(0);// -""-
- aLeftMF.MetricField::SetMax(99); //
- aRightMF.MetricField::SetMax(99);//
+ aLeftMF.MetricField::SetMax(99); //
+ aRightMF.MetricField::SetMax(99);//
aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP );
aRightMF.SetPrcntValue(aRightMF.NormalizePercent(nRight ), FUNIT_TWIP );
}
else
- ModifyHdl(&aLeftMF); // Werte wieder korrigieren
+ ModifyHdl(&aLeftMF); // Werte wieder korrigieren
if(aFreeBtn.IsChecked())
{
@@ -318,9 +318,9 @@ IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG )
if(aFreeBtn.IsChecked())
{
BOOL bEnable = aRightMF.GetValue() == 0;
-// aWidthMF.Enable(bEnable);
+// aWidthMF.Enable(bEnable);
aRelWidthCB.Enable(bEnable);
-// aWidthFT.Enable(bEnable);
+// aWidthFT.Enable(bEnable);
if ( !bEnable )
{
aRelWidthCB.Check(FALSE);
@@ -406,7 +406,7 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
nRight -= nDiff/2;
}
}
- if( pEdit == &aRightMF )
+ if( pEdit == &aRightMF )
{
if( nRight + nLeft > pTblData->GetSpace() - MINLAY )
@@ -423,9 +423,9 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
nRight = nLeft;
if(nRight + nLeft > pTblData->GetSpace() - MINLAY )
{
- nLeft = bCenter ? (pTblData->GetSpace() - MINLAY) /2 :
+ nLeft = bCenter ? (pTblData->GetSpace() - MINLAY) /2 :
(pTblData->GetSpace() - MINLAY) - nRight;
- nRight = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : nRight;
+ nRight = bCenter ? (pTblData->GetSpace() - MINLAY) /2 : nRight;
}
nCurWidth = pTblData->GetSpace() - nLeft - nRight;
}
@@ -486,7 +486,7 @@ BOOL SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
}
if(aNameED.GetText() != aNameED.GetSavedValue())
{
- rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, aNameED.GetText()));
+ rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, aNameED.GetText()));
bModified = TRUE;
}
@@ -508,13 +508,13 @@ BOOL SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
void SwFormatTablePage::Reset( const SfxItemSet& )
{
const SfxItemSet& rSet = GetItemSet();
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if(bHtmlMode)
{
- aNameED .Disable();
- aTopFT .Hide();
- aTopMF .Hide();
+ aNameED .Disable();
+ aTopFT .Hide();
+ aTopMF .Hide();
aBottomFT.Hide();
aBottomMF.Hide();
aFreeBtn.Enable(FALSE);
@@ -655,7 +655,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
/*------------------------------------------------------------------------
------------------------------------------------------------------------*/
-void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
+void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
{
OSL_ENSURE(pTblData, "table data not available?");
if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP ))
@@ -808,24 +808,24 @@ DbgTblRep(pTblData)
SwTableColumnPage::SwTableColumnPage( Window* pParent,
const SfxItemSet& rSet ) :
SfxTabPage(pParent, SW_RES( TP_TABLE_COLUMN ), rSet ),
- aModifyTableCB(this, SW_RES(CB_MOD_TBL)),
- aProportionalCB(this, SW_RES(CB_PROP)),
- aSpaceFT(this, SW_RES(FT_SPACE)),
- aSpaceED(this, SW_RES(ED_SPACE)),
+ aModifyTableCB(this, SW_RES(CB_MOD_TBL)),
+ aProportionalCB(this, SW_RES(CB_PROP)),
+ aSpaceFT(this, SW_RES(FT_SPACE)),
+ aSpaceED(this, SW_RES(ED_SPACE)),
aUpBtn(this, SW_RES(COL_BTN_UP)),
aFT1(this, SW_RES(COL_FT_1)),
- aMF1(this, SW_RES(COL_MF_1)),
- aFT2(this, SW_RES(COL_FT_2)),
- aMF2(this, SW_RES(COL_MF_2)),
- aFT3(this, SW_RES(COL_FT_3)),
- aMF3(this, SW_RES(COL_MF_3)),
- aFT4(this, SW_RES(COL_FT_4)),
- aMF4(this, SW_RES(COL_MF_4)),
- aFT5(this, SW_RES(COL_FT_5)),
- aMF5(this, SW_RES(COL_MF_5)),
- aFT6(this, SW_RES(COL_FT_6)),
- aMF6(this, SW_RES(COL_MF_6)),
+ aMF1(this, SW_RES(COL_MF_1)),
+ aFT2(this, SW_RES(COL_FT_2)),
+ aMF2(this, SW_RES(COL_MF_2)),
+ aFT3(this, SW_RES(COL_FT_3)),
+ aMF3(this, SW_RES(COL_MF_3)),
+ aFT4(this, SW_RES(COL_FT_4)),
+ aMF4(this, SW_RES(COL_MF_4)),
+ aFT5(this, SW_RES(COL_FT_5)),
+ aMF5(this, SW_RES(COL_MF_5)),
+ aFT6(this, SW_RES(COL_FT_6)),
+ aMF6(this, SW_RES(COL_MF_6)),
aDownBtn(this, SW_RES(COL_BTN_DOWN)),
aColFL(this, SW_RES(COL_FL_LAYOUT)),
@@ -1086,8 +1086,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos )
if(!bModifyTable && !bProp )
{
-// Tabellenbreite bleibt, Differenz wird mit der/den
-// naechsten Zellen ausgeglichen
+// Tabellenbreite bleibt, Differenz wird mit der/den
+// naechsten Zellen ausgeglichen
while( nDiff )
{
if( ++nAktPos == nNoOfVisibleCols)
@@ -1120,8 +1120,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos )
}
else if(bModifyTable && !bProp)
{
-// Differenz wird ueber die Tabellenbreite ausgeglichen,
-// andere Spalten bleiben unveraendert
+// Differenz wird ueber die Tabellenbreite ausgeglichen,
+// andere Spalten bleiben unveraendert
OSL_ENSURE(nDiff <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
SwTwips nActSpace = pTblData->GetSpace() - nTableWidth;
if(nDiff > nActSpace)
@@ -1136,8 +1136,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos )
}
else if(bModifyTable & bProp)
{
-// Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird
-// entsprechend angepasst
+// Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird
+// entsprechend angepasst
OSL_ENSURE(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "wrong maximum" );
long nAdd = nDiff;
if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth)
@@ -1169,8 +1169,8 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos )
}
else
{
-// Die Differenz wird gleichmaessig auf alle anderen Spalten aufgeteilt
-// die Tabellenbreite bleibt konstant
+// Die Differenz wird gleichmaessig auf alle anderen Spalten aufgeteilt
+// die Tabellenbreite bleibt konstant
/*
SwTwips nDiffn = nDiff/(nNoOfVisibleCols - 1);
if(nDiff < 0 && (nNoOfVisibleCols - 1) * nDiffn != nDiff)
@@ -1233,7 +1233,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& )
bModifyTbl = FALSE;
if(bPercentMode)
{
- aModifyTableCB .Check(FALSE);
+ aModifyTableCB .Check(FALSE);
aProportionalCB .Check(FALSE);
}
else if( !bModifyTbl )
@@ -1246,7 +1246,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& )
aModifyTableCB.Enable( !bPercentMode && bModifyTbl );
aProportionalCB.Enable(!bPercentMode && bModifyTbl );
-/* if(pTblData->IsLineSelected() && pTblData->IsComplex())
+/* if(pTblData->IsLineSelected() && pTblData->IsComplex())
{
}*/
@@ -1339,7 +1339,7 @@ SwTwips SwTableColumnPage::GetVisibleWidth(USHORT nPos)
while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
nReturn += pTblData->GetColumns()[++i].nWidth;
-// return (*ppTableColumns)[i].nWidth;
+// return (*ppTableColumns)[i].nWidth;
return nReturn;
}
@@ -1425,7 +1425,7 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent,
aPageNoNF (this, SW_RES(NF_PAGENUM )),
aSplitCB (this, SW_RES(CB_SPLIT )),
aSplitRowCB (this, SW_RES(CB_SPLIT_ROW )),
- aKeepCB (this, SW_RES(CB_KEEP )),
+ aKeepCB (this, SW_RES(CB_KEEP )),
aHeadLineCB (this, SW_RES(CB_HEADLINE )),
aRepeatHeaderFT (this, SW_RES(FT_REPEAT_HEADER )),
aRepeatHeaderBeforeFT (this),
@@ -1548,9 +1548,9 @@ BOOL SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
}
BOOL bIsChecked = aPgBrkCB.IsChecked();
if ( !bPageItemPut &&
- ( bState != aPageCollCB.GetSavedValue() ||
- bIsChecked != aPgBrkCB.GetSavedValue() ||
- aPgBrkBeforeRB.IsChecked() != aPgBrkBeforeRB.GetSavedValue() ||
+ ( bState != aPageCollCB.GetSavedValue() ||
+ bIsChecked != aPgBrkCB.GetSavedValue() ||
+ aPgBrkBeforeRB.IsChecked() != aPgBrkBeforeRB.GetSavedValue() ||
aPgBrkRB.IsChecked() != aPgBrkRB.GetSavedValue() ))
{
SvxFmtBreakItem aBreak(
@@ -1750,7 +1750,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet )
aColBrkRB.Enable(FALSE);
aPgBrkBeforeRB.Enable(FALSE);
aPgBrkAfterRB.Enable(FALSE);
- aKeepCB .Enable(FALSE);
+ aKeepCB .Enable(FALSE);
aSplitCB.Enable(FALSE);
aPgBrkCB.Enable(FALSE);
aPageCollCB.Enable(FALSE);
@@ -1818,10 +1818,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG )
{
if( aPgBrkCB.IsChecked() )
{
- aPgBrkRB. Enable();
- aColBrkRB. Enable();
- aPgBrkBeforeRB. Enable();
- aPgBrkAfterRB. Enable();
+ aPgBrkRB. Enable();
+ aColBrkRB. Enable();
+ aPgBrkBeforeRB. Enable();
+ aPgBrkAfterRB. Enable();
if ( aPgBrkRB.IsChecked() && aPgBrkBeforeRB.IsChecked() )
{
@@ -1844,10 +1844,10 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG )
aPageCollLB.Enable(FALSE);
aPageNoFT.Enable(FALSE);
aPageNoNF.Enable(FALSE);
- aPgBrkRB. Enable(FALSE);
- aColBrkRB. Enable(FALSE);
- aPgBrkBeforeRB. Enable(FALSE);
- aPgBrkAfterRB. Enable(FALSE);
+ aPgBrkRB. Enable(FALSE);
+ aColBrkRB. Enable(FALSE);
+ aPgBrkBeforeRB. Enable(FALSE);
+ aPgBrkAfterRB. Enable(FALSE);
}
return 0;
}
@@ -1898,11 +1898,11 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
}
else if ( pBtn == &aPgBrkAfterRB )
{
- aPageCollCB .Check( FALSE );
- aPageCollCB .Enable(FALSE);
- aPageCollLB .Enable(FALSE);
- aPageNoFT .Enable(FALSE);
- aPageNoNF .Enable(FALSE);
+ aPageCollCB .Check( FALSE );
+ aPageCollCB .Enable(FALSE);
+ aPageCollLB .Enable(FALSE);
+ aPageNoFT .Enable(FALSE);
+ aPageNoNF .Enable(FALSE);
}
}
return 0;
@@ -1914,11 +1914,11 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
{
if ( pBtn == &aColBrkRB || aPgBrkAfterRB.IsChecked() )
{
- aPageCollCB .Check(FALSE);
- aPageCollCB .Enable(FALSE);
- aPageCollLB .Enable(FALSE);
- aPageNoFT .Enable(FALSE);
- aPageNoNF .Enable(FALSE);
+ aPageCollCB .Check(FALSE);
+ aPageCollCB .Enable(FALSE);
+ aPageCollLB .Enable(FALSE);
+ aPageNoFT .Enable(FALSE);
+ aPageNoNF .Enable(FALSE);
}
else if ( aPgBrkBeforeRB.IsChecked() )
PageBreakPosHdl_Impl( &aPgBrkBeforeRB );
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index 843bec591d9e..1640c623d957 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -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
@@ -26,85 +26,85 @@
************************************************************************/
#include "globals.hrc"
-#define ED_WIDTH 1
+#define ED_WIDTH 1
#define FL_WIDTH 3
-#define CB_REL_WIDTH 4
-#define RB_LEFT 10
-#define RB_RIGHT 11
-#define RB_CENTER 12
-#define RB_FREE 13
-#define RB_FULL 14
+#define CB_REL_WIDTH 4
+#define RB_LEFT 10
+#define RB_RIGHT 11
+#define RB_CENTER 12
+#define RB_FREE 13
+#define RB_FULL 14
#define FL_POS 15
-#define ED_LEFT_DIST 51
-#define ED_RIGHT_DIST 52
-#define FT_RIGHT_DIST 53
-#define FT_LEFT_DIST 54
-#define FT_TOP_DIST 20
-#define ED_TOP_DIST 21
-#define FT_BOTTOM_DIST 22
-#define ED_BOTTOM_DIST 23
+#define ED_LEFT_DIST 51
+#define ED_RIGHT_DIST 52
+#define FT_RIGHT_DIST 53
+#define FT_LEFT_DIST 54
+#define FT_TOP_DIST 20
+#define ED_TOP_DIST 21
+#define FT_BOTTOM_DIST 22
+#define ED_BOTTOM_DIST 23
#define FL_DIST 24
-#define FT_WIDTH 25
-#define FT_SCOL 30
-#define DLB_SCOL 31
-#define FT_POS 32
-#define DLB_SPOS 33
-#define FT_SSZ 34
-#define ED_SSZ 36
+#define FT_WIDTH 25
+#define FT_SCOL 30
+#define DLB_SCOL 31
+#define FT_POS 32
+#define DLB_SPOS 33
+#define FT_SSZ 34
+#define ED_SSZ 36
#define FL_SHADE 37
-#define CB_HEADLINE 40
-#define FT_REPEAT_HEADER 40
-#define NF_REPEAT_HEADER 40
-#define WIN_REPEAT_HEADER 40
+#define CB_HEADLINE 40
+#define FT_REPEAT_HEADER 40
+#define NF_REPEAT_HEADER 40
+#define WIN_REPEAT_HEADER 40
#define FL_HEADLINE 41
#define FL_PROPERTIES 42
#define FT_TEXTDIRECTION 43
#define LB_TEXTDIRECTION 44
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_MORE 102
-#define ED_NAME 103
-#define FT_NAME 104
+#define BT_OK 100
+#define BT_CANCEL 101
+#define BT_MORE 102
+#define ED_NAME 103
+#define FT_NAME 104
#define FL_OPTIONS 105
#define FL_NAME 106
-#define COL_FT_1 107
-#define COL_MF_1 108
-#define COL_FT_2 109
-#define COL_MF_2 110
-#define COL_FT_3 111
-#define COL_MF_3 112
-#define COL_FT_4 113
-#define COL_MF_4 114
-#define COL_FT_5 115
-#define COL_MF_5 116
-#define COL_FT_6 117
-#define COL_MF_6 118
+#define COL_FT_1 107
+#define COL_MF_1 108
+#define COL_FT_2 109
+#define COL_MF_2 110
+#define COL_FT_3 111
+#define COL_MF_3 112
+#define COL_FT_4 113
+#define COL_MF_4 114
+#define COL_FT_5 115
+#define COL_MF_5 116
+#define COL_FT_6 117
+#define COL_MF_6 118
#define COL_FL_LAYOUT 119
-#define COL_BTN_UP 120
-#define COL_BTN_DOWN 121
-#define CB_MOD_TBL 122
-#define CB_PROP 123
+#define COL_BTN_UP 120
+#define COL_BTN_DOWN 121
+#define CB_MOD_TBL 122
+#define CB_PROP 123
-#define FT_SPACE 125
-#define ED_SPACE 126
+#define FT_SPACE 125
+#define ED_SPACE 126
#define FL_FLOW 130
-#define CB_PAGEBREAK 131
-#define RB_BREAKPAGE 132
-#define RB_BREAKCOLUMN 133
-#define RB_PAGEBREAKBEFORE 134
-#define RB_PAGEBREAKAFTER 135
-#define CB_PAGECOLL 136
-#define LB_PAGECOLL 137
-#define FT_PAGENUM 138
-#define NF_PAGENUM 139
-#define CB_KEEP 144
-#define CB_SPLIT 145
+#define CB_PAGEBREAK 131
+#define RB_BREAKPAGE 132
+#define RB_BREAKCOLUMN 133
+#define RB_PAGEBREAKBEFORE 134
+#define RB_PAGEBREAKAFTER 135
+#define CB_PAGECOLL 136
+#define LB_PAGECOLL 137
+#define FT_PAGENUM 138
+#define NF_PAGENUM 139
+#define CB_KEEP 144
+#define CB_SPLIT 145
#define CB_SPLIT_ROW 146
#define FL_VERT_ORIENT 140
-#define RB_FROM_LEFT 144
+#define RB_FROM_LEFT 144
#define FT_VERTORIENT 150
#define LB_VERTORIENT 151
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 4243ba1b6c68..0dd3607c2d0b 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -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
@@ -551,7 +551,7 @@ TabPage TP_TABLE_COLUMN
};
/**************************************************************************/
/* */
-/* Textfluss */
+/* Textfluss */
/* */
/**************************************************************************/
TabPage TP_TABLE_TEXTFLOW
@@ -568,7 +568,7 @@ TabPage TP_TABLE_TEXTFLOW
};
CheckBox CB_PAGEBREAK
{
- // Disable = TRUE;
+ // Disable = TRUE;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 90 , 8 ) ;
Text [ en-US ] = "~Break" ;
@@ -585,7 +585,7 @@ TabPage TP_TABLE_TEXTFLOW
};
RadioButton RB_BREAKCOLUMN
{
- // Disable = TRUE;
+ // Disable = TRUE;
Pos = MAP_APPFONT ( 178 , 14 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
// ### ACHTUNG: Neuer Text in Resource? S~palte : ~Spalte
@@ -593,7 +593,7 @@ TabPage TP_TABLE_TEXTFLOW
};
RadioButton RB_PAGEBREAKBEFORE
{
- // Disable = TRUE;
+ // Disable = TRUE;
Pos = MAP_APPFONT ( 105 , 28 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Be~fore" ;
@@ -602,14 +602,14 @@ TabPage TP_TABLE_TEXTFLOW
};
RadioButton RB_PAGEBREAKAFTER
{
- // Disable = TRUE;
+ // Disable = TRUE;
Pos = MAP_APPFONT ( 178 , 28 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~After" ;
};
CheckBox CB_PAGECOLL
{
- // Disable = TRUE;
+ // Disable = TRUE;
Pos = MAP_APPFONT ( 12 , 44 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text [ en-US ] = "With Page St~yle" ;
diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx
index 62a4c27380a1..749b714cf039 100644
--- a/sw/source/ui/table/tablemgr.cxx
+++ b/sw/source/ui/table/tablemgr.cxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@
using namespace ::com::sun::star;
/*------------------------------------------------------------------------
- Beschreibung: Zeilenhoehe einstellen (Dialog)
+ Beschreibung: Zeilenhoehe einstellen (Dialog)
------------------------------------------------------------------------*/
@@ -120,7 +120,7 @@ SwTwips SwTableFUNC::GetMaxColWidth( USHORT nNum ) const
{
// Die max. Breite ergibt sich aus der eigenen Breite und
// der Breite der Nachbarzellen um je MINLAY verringert
- SwTwips nMax = nNum == 0 ?
+ SwTwips nMax = nNum == 0 ?
GetColWidth(1) - MINLAY :
nNum == GetColCount() ?
GetColWidth( nNum-1 ) - MINLAY :
@@ -215,7 +215,7 @@ void SwTableFUNC::UpdateChart()
}
}
-uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
+uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
uno::Reference< chart2::data::XDataProvider > &rxDataProvider,
sal_Bool bFillWithData,
const rtl::OUString &rCellRange,
@@ -249,7 +249,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
::svt::EmbeddedObjectRef aEmbObjRef( xObj, ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
if ( xObj.is() )
{
-
+
SwFlyFrmFmt* pTmp = 0;
pSh->InsertOleObject( aEmbObjRef, &pTmp );
if (ppFlyFrmFmt)
@@ -259,7 +259,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
if( xCompSupp.is())
{
xChartModel.set( xCompSupp->getComponent(), uno::UNO_QUERY );
- if( xChartModel.is() )
+ if( xChartModel.is() )
xChartModel->lockControllers(); //#i79578# don't request a new replacement image for charts to often - block change notifications
}
@@ -309,7 +309,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
bHasCategories = false;
if (nRowLen == 1 && nColLen == 1)
- bFirstCellAsLabel = false;
+ bFirstCellAsLabel = false;
else if (nRowLen > 1)
eDataRowSource = chart::ChartDataRowSource_ROWS;
else if (nColLen > 1)
@@ -337,12 +337,12 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
pSh->EndUndo( UNDO_UI_INSERT_CHART );
- if( xChartModel.is() )
+ if( xChartModel.is() )
xChartModel->unlockControllers(); //#i79578# don't request a new replacement image for charts to often
return xChartModel;
}
-USHORT SwTableFUNC::GetCurColNum() const
+USHORT SwTableFUNC::GetCurColNum() const
{
USHORT nPos = pSh->GetCurTabColNum();
USHORT nCount = 0;
@@ -355,7 +355,7 @@ USHORT SwTableFUNC::GetCurColNum() const
-USHORT SwTableFUNC::GetColCount() const
+USHORT SwTableFUNC::GetColCount() const
{
USHORT nCount = 0;
for(USHORT i = 0; i < aCols.Count(); i++ )
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 895cbeb54342..7a9c39bd67fb 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -2,7 +2,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
@@ -42,50 +42,50 @@ class SwTableRep;
struct TColumn
{
SwTwips nWidth;
- BOOL bVisible;
+ BOOL bVisible;
};
class SwFormatTablePage : public SfxTabPage
{
FixedLine aOptionsFL;
- FixedText aNameFT;
- TableNameEdit aNameED;
- FixedText aWidthFT;
- PercentField aWidthMF;
- CheckBox aRelWidthCB;
+ FixedText aNameFT;
+ TableNameEdit aNameED;
+ FixedText aWidthFT;
+ PercentField aWidthMF;
+ CheckBox aRelWidthCB;
FixedLine aPosFL;
- RadioButton aFullBtn;
- RadioButton aLeftBtn;
- RadioButton aFromLeftBtn;
- RadioButton aRightBtn;
- RadioButton aCenterBtn;
- RadioButton aFreeBtn;
+ RadioButton aFullBtn;
+ RadioButton aLeftBtn;
+ RadioButton aFromLeftBtn;
+ RadioButton aRightBtn;
+ RadioButton aCenterBtn;
+ RadioButton aFreeBtn;
FixedLine aDistFL;
- FixedText aLeftFT;
- PercentField aLeftMF;
- FixedText aRightFT;
- PercentField aRightMF;
- FixedText aTopFT;
- MetricField aTopMF;
- FixedText aBottomFT;
- MetricField aBottomMF;
+ FixedText aLeftFT;
+ PercentField aLeftMF;
+ FixedText aRightFT;
+ PercentField aRightMF;
+ FixedText aTopFT;
+ MetricField aTopMF;
+ FixedText aBottomFT;
+ MetricField aBottomMF;
FixedLine aPropertiesFL;
FixedText aTextDirectionFT;
ListBox aTextDirectionLB;
SwTableRep* pTblData;
- SwTwips nSaveWidth;
- SwTwips nMinTableWidth;
- USHORT nOldAlign;
- BOOL bModified;
- BOOL bFull:1;
+ SwTwips nSaveWidth;
+ SwTwips nMinTableWidth;
+ USHORT nOldAlign;
+ BOOL bModified;
+ BOOL bFull:1;
BOOL bHtmlMode : 1;
- void Init();
- void ModifyHdl( Edit* pEdit );
+ void Init();
+ void ModifyHdl( Edit* pEdit );
DECL_LINK( AutoClickHdl, CheckBox * );
DECL_LINK( RelWidthClickHdl, CheckBox * );
@@ -98,11 +98,11 @@ class SwFormatTablePage : public SfxTabPage
public:
SwFormatTablePage( Window* pParent, const SfxItemSet& rSet );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
- virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
+ virtual void ActivatePage( const SfxItemSet& rSet );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
/*-------------------------------------------------------
@@ -112,51 +112,51 @@ public:
class SwTableColumnPage : public SfxTabPage
{
- CheckBox aModifyTableCB;
- CheckBox aProportionalCB;
- FixedText aSpaceFT;
- MetricField aSpaceED;
-
- ImageButton aUpBtn;
- FixedText aFT1;
- PercentField aMF1;
- FixedText aFT2;
- PercentField aMF2;
- FixedText aFT3;
- PercentField aMF3;
- FixedText aFT4;
- PercentField aMF4;
- FixedText aFT5;
- PercentField aMF5;
- FixedText aFT6;
- PercentField aMF6;
- ImageButton aDownBtn;
+ CheckBox aModifyTableCB;
+ CheckBox aProportionalCB;
+ FixedText aSpaceFT;
+ MetricField aSpaceED;
+
+ ImageButton aUpBtn;
+ FixedText aFT1;
+ PercentField aMF1;
+ FixedText aFT2;
+ PercentField aMF2;
+ FixedText aFT3;
+ PercentField aMF3;
+ FixedText aFT4;
+ PercentField aMF4;
+ FixedText aFT5;
+ PercentField aMF5;
+ FixedText aFT6;
+ PercentField aMF6;
+ ImageButton aDownBtn;
FixedLine aColFL;
- SwTableRep* pTblData;
- PercentField* pFieldArr[MET_FIELDS];
- FixedText* pTextArr[MET_FIELDS];
- SwTwips nTableWidth;
- SwTwips nMinWidth;
- USHORT nNoOfCols;
- USHORT nNoOfVisibleCols;
+ SwTableRep* pTblData;
+ PercentField* pFieldArr[MET_FIELDS];
+ FixedText* pTextArr[MET_FIELDS];
+ SwTwips nTableWidth;
+ SwTwips nMinWidth;
+ USHORT nNoOfCols;
+ USHORT nNoOfVisibleCols;
//Breite merken, wenn auf autom. Ausrichtung gestellt wird
- USHORT aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields
- BOOL bModified:1;
- BOOL bModifyTbl:1;
- BOOL bPercentMode:1;
+ USHORT aValueTbl[MET_FIELDS];//primaere Zuordnung der MetricFields
+ BOOL bModified:1;
+ BOOL bModifyTbl:1;
+ BOOL bPercentMode:1;
- void Init(BOOL bWeb);
+ void Init(BOOL bWeb);
DECL_LINK( AutoClickHdl, CheckBox * );
- void ModifyHdl( PercentField* pEdit );
+ void ModifyHdl( PercentField* pEdit );
DECL_LINK( UpHdl, PercentField * );
DECL_LINK( DownHdl, PercentField * );
DECL_LINK( LoseFocusHdl, PercentField * );
DECL_LINK( ModeHdl, CheckBox * );
- void UpdateCols( USHORT nAktPos );
- SwTwips GetVisibleWidth(USHORT nPos);
- void SetVisibleWidth(USHORT nPos, SwTwips nNewWidth);
-
+ void UpdateCols( USHORT nAktPos );
+ SwTwips GetVisibleWidth(USHORT nPos);
+ void SetVisibleWidth(USHORT nPos, SwTwips nNewWidth);
+
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -164,11 +164,11 @@ public:
SwTableColumnPage( Window* pParent, const SfxItemSet& rSet );
~SwTableColumnPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
- virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
+ virtual void ActivatePage( const SfxItemSet& rSet );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
@@ -178,24 +178,24 @@ public:
class SwTextFlowPage : public SfxTabPage
{
FixedLine aFlowFL;
- CheckBox aPgBrkCB;
- RadioButton aPgBrkRB;
- RadioButton aColBrkRB;
- RadioButton aPgBrkBeforeRB;
- RadioButton aPgBrkAfterRB;
- CheckBox aPageCollCB;
- ListBox aPageCollLB;
- FixedText aPageNoFT;
- NumericField aPageNoNF;
- CheckBox aSplitCB;
+ CheckBox aPgBrkCB;
+ RadioButton aPgBrkRB;
+ RadioButton aColBrkRB;
+ RadioButton aPgBrkBeforeRB;
+ RadioButton aPgBrkAfterRB;
+ CheckBox aPageCollCB;
+ ListBox aPageCollLB;
+ FixedText aPageNoFT;
+ NumericField aPageNoNF;
+ CheckBox aSplitCB;
TriStateBox aSplitRowCB;
- CheckBox aKeepCB;
- CheckBox aHeadLineCB;
- FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
- FixedText aRepeatHeaderBeforeFT;
- NumericField aRepeatHeaderNF;
- FixedText aRepeatHeaderAfterFT;
- TextControlCombo aRepeatHeaderCombo;
+ CheckBox aKeepCB;
+ CheckBox aHeadLineCB;
+ FixedText aRepeatHeaderFT; // "dummy" to build before and after FT
+ FixedText aRepeatHeaderBeforeFT;
+ NumericField aRepeatHeaderNF;
+ FixedText aRepeatHeaderAfterFT;
+ TextControlCombo aRepeatHeaderCombo;
FixedText aTextDirectionFT;
ListBox aTextDirectionLB;
@@ -203,10 +203,10 @@ class SwTextFlowPage : public SfxTabPage
FixedText aVertOrientFT;
ListBox aVertOrientLB;
- SwWrtShell* pShell;
+ SwWrtShell* pShell;
- BOOL bPageBreak;
- BOOL bHtmlMode;
+ BOOL bPageBreak;
+ BOOL bHtmlMode;
DECL_LINK( PageBreakHdl_Impl, CheckBox* );
@@ -222,13 +222,13 @@ class SwTextFlowPage : public SfxTabPage
~SwTextFlowPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
- void SetShell(SwWrtShell* pSh);
+ void SetShell(SwWrtShell* pSh);
- void DisablePageBreak();
+ void DisablePageBreak();
};
#endif
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 9116b00608bd..b55aa852259b 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -2,7 +2,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
@@ -97,11 +97,11 @@ private:
uno::Reference< i18n::XBreakIterator > m_xBreak;
//-------------------------------------------
- void Init ();
- void DoPaint ( const Rectangle& rRect );
- void CalcCellArray ( BOOL bFitWidth );
- void CalcLineMap ();
- void PaintCells ();
+ void Init ();
+ void DoPaint ( const Rectangle& rRect );
+ void CalcCellArray ( BOOL bFitWidth );
+ void CalcLineMap ();
+ void PaintCells ();
BYTE GetFormatIndex( size_t nCol, size_t nRow ) const;
const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const;
@@ -111,7 +111,7 @@ private:
void DrawBackground();
void MakeFonts ( BYTE nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont );
- String MakeNumberString( String cellString, BOOL bAddDec );
+ String MakeNumberString( String cellString, BOOL bAddDec );
};
//========================================================================
@@ -119,7 +119,7 @@ private:
class SwStringInputDlg : public ModalDialog
{
public:
- SwStringInputDlg( Window* pParent,
+ SwStringInputDlg( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault );
@@ -128,22 +128,22 @@ public:
void GetInputString( String& rString ) const;
private:
- Edit aEdInput; // Edit erhaelt so den Focus
- FixedText aFtEditTitle;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
+ Edit aEdInput; // Edit erhaelt so den Focus
+ FixedText aFtEditTitle;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
};
-SwStringInputDlg::SwStringInputDlg( Window* pParent,
- const String& rTitle,
- const String& rEditTitle,
- const String& rDefault ) :
- ModalDialog ( pParent, SW_RES( DLG_SWDLG_STRINPUT ) ),
+SwStringInputDlg::SwStringInputDlg( Window* pParent,
+ const String& rTitle,
+ const String& rEditTitle,
+ const String& rDefault ) :
+ ModalDialog ( pParent, SW_RES( DLG_SWDLG_STRINPUT ) ),
//
- aEdInput ( this, SW_RES( ED_INPUT ) ),
+ aEdInput ( this, SW_RES( ED_INPUT ) ),
aFtEditTitle ( this, SW_RES( FT_LABEL ) ),
- aBtnOk ( this, SW_RES( BTN_OK ) ),
+ aBtnOk ( this, SW_RES( BTN_OK ) ),
aBtnCancel ( this, SW_RES( BTN_CANCEL ) )
{
SetText( rTitle );
@@ -174,33 +174,33 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell,
: SfxModalDialog( pParent, SW_RES( DLG_AUTOFMT_TABLE ) ),
//
aFlFormat ( this, SW_RES( FL_FORMAT ) ),
- aLbFormat ( this, SW_RES( LB_FORMAT ) ),
+ aLbFormat ( this, SW_RES( LB_FORMAT ) ),
- aBtnNumFormat ( this, SW_RES( BTN_NUMFORMAT ) ),
- aBtnBorder ( this, SW_RES( BTN_BORDER ) ),
- aBtnFont ( this, SW_RES( BTN_FONT ) ),
- aBtnPattern ( this, SW_RES( BTN_PATTERN ) ),
- aBtnAlignment ( this, SW_RES( BTN_ALIGNMENT ) ),
+ aBtnNumFormat ( this, SW_RES( BTN_NUMFORMAT ) ),
+ aBtnBorder ( this, SW_RES( BTN_BORDER ) ),
+ aBtnFont ( this, SW_RES( BTN_FONT ) ),
+ aBtnPattern ( this, SW_RES( BTN_PATTERN ) ),
+ aBtnAlignment ( this, SW_RES( BTN_ALIGNMENT ) ),
aFlFormats ( this, SW_RES( FL_FORMATS ) ),
- aBtnOk ( this, SW_RES( BTN_OK ) ),
- aBtnCancel ( this, SW_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SW_RES( BTN_HELP ) ),
- aBtnAdd ( this, SW_RES( BTN_ADD ) ),
- aBtnRemove ( this, SW_RES( BTN_REMOVE ) ),
+ aBtnOk ( this, SW_RES( BTN_OK ) ),
+ aBtnCancel ( this, SW_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, SW_RES( BTN_HELP ) ),
+ aBtnAdd ( this, SW_RES( BTN_ADD ) ),
+ aBtnRemove ( this, SW_RES( BTN_REMOVE ) ),
aBtnRename ( this, SW_RES( BTN_RENAME ) ),
aBtnMore ( this, SW_RES( BTN_MORE ) ),
- aStrTitle ( SW_RES( STR_ADD_TITLE ) ),
- aStrLabel ( SW_RES( STR_ADD_LABEL ) ),
- aStrClose ( SW_RES( STR_BTN_CLOSE ) ),
- aStrDelTitle ( SW_RES( STR_DEL_TITLE ) ),
- aStrDelMsg ( SW_RES( STR_DEL_MSG ) ),
- aStrRenameTitle ( SW_RES( STR_RENAME_TITLE ) ),
- aStrInvalidFmt ( SW_RES( STR_INVALID_AFNAME )),
+ aStrTitle ( SW_RES( STR_ADD_TITLE ) ),
+ aStrLabel ( SW_RES( STR_ADD_LABEL ) ),
+ aStrClose ( SW_RES( STR_BTN_CLOSE ) ),
+ aStrDelTitle ( SW_RES( STR_DEL_TITLE ) ),
+ aStrDelMsg ( SW_RES( STR_DEL_MSG ) ),
+ aStrRenameTitle ( SW_RES( STR_RENAME_TITLE ) ),
+ aStrInvalidFmt ( SW_RES( STR_INVALID_AFNAME )),
pWndPreview ( new AutoFmtPreview( this, SW_RES( WND_PREVIEW ), pWrtShell )),
//
pShell ( pWrtShell ),
- nIndex ( 0 ),
- nDfltStylePos ( 0 ),
+ nIndex ( 0 ),
+ nDfltStylePos ( 0 ),
bCoreDataChanged( FALSE ),
bSetAutoFmt ( bSetAutoFormat )
{
@@ -328,8 +328,8 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
pData->SetBackground( bCheck );
else if ( pBtn == &aBtnAlignment )
pData->SetJustify( bCheck );
-// else if ( pBtn == &aBtnAdjust )
-// pData->SetIncludeWidthHeight( bCheck );
+// else if ( pBtn == &aBtnAdjust )
+// pData->SetIncludeWidthHeight( bCheck );
else
bDataChgd = FALSE;
@@ -354,7 +354,7 @@ IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG )
BOOL bOk = FALSE, bFmtInserted = FALSE;
while( !bOk )
{
- SwStringInputDlg* pDlg = new SwStringInputDlg( this,
+ SwStringInputDlg* pDlg = new SwStringInputDlg( this,
aStrTitle,
aStrLabel,
aEmptyStr );
@@ -418,7 +418,7 @@ IMPL_LINK( SwAutoFormatDlg, AddHdl, void *, EMPTYARG )
IMPL_LINK( SwAutoFormatDlg, RemoveHdl, void *, EMPTYARG )
{
- String aMessage = aStrDelMsg ;
+ String aMessage = aStrDelMsg ;
aMessage.AppendAscii("\n\n");
aMessage += aLbFormat.GetSelectEntry() ;
aMessage += '\n';
@@ -573,7 +573,7 @@ IMPL_LINK_INLINE_END( SwAutoFormatDlg, OkHdl, Button *, EMPTYARG )
//------------------------------------------------------------------------
AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell* pWrtShell ) :
- Window ( pParent, rRes ),
+ Window ( pParent, rRes ),
aCurData ( aEmptyStr ),
aVD ( *this ),
@@ -586,19 +586,19 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell*
nDataColWidth2 ( (aPrvSize.Width() - 4 - 2 * nLabelColWidth) / 4 ),
nRowHeight ( (aPrvSize.Height() - 4) / 5 ),
aStrJan ( SW_RES( STR_JAN ) ),
- aStrFeb ( SW_RES( STR_FEB ) ),
- aStrMar ( SW_RES( STR_MAR ) ),
- aStrNorth ( SW_RES( STR_NORTH ) ),
- aStrMid ( SW_RES( STR_MID ) ),
- aStrSouth ( SW_RES( STR_SOUTH ) ),
- aStrSum ( SW_RES( STR_SUM ) ),
+ aStrFeb ( SW_RES( STR_FEB ) ),
+ aStrMar ( SW_RES( STR_MAR ) ),
+ aStrNorth ( SW_RES( STR_NORTH ) ),
+ aStrMid ( SW_RES( STR_MID ) ),
+ aStrSouth ( SW_RES( STR_SOUTH ) ),
+ aStrSum ( SW_RES( STR_SUM ) ),
m_xMSF ( comphelper::getProcessServiceFactory() )
{
if (!pWrtShell->IsCrsrInTbl()) // We haven't created the table yet
mbRTL = Application::GetSettings().GetLayoutRTL();
else
mbRTL = pWrtShell->IsTableRightToLeft();
-
+
OSL_ENSURE( m_xMSF.is(), "AutoFmtPreview: no MultiServiceFactory");
if ( m_xMSF.is() )
{
@@ -607,7 +607,7 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes, SwWrtShell*
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
uno::UNO_QUERY);
}
- pNumFmt = new SvNumberFormatter( m_xMSF, LANGUAGE_SYSTEM );
+ pNumFmt = new SvNumberFormatter( m_xMSF, LANGUAGE_SYSTEM );
Init();
}
@@ -696,14 +696,14 @@ void AutoFmtPreview::DrawString( size_t nCol, size_t nRow )
switch( nIndex )
{
- case 1: cellString = aStrJan; break;
- case 2: cellString = aStrFeb; break;
- case 3: cellString = aStrMar; break;
- case 5: cellString = aStrNorth; break;
- case 10: cellString = aStrMid; break;
- case 15: cellString = aStrSouth; break;
+ case 1: cellString = aStrJan; break;
+ case 2: cellString = aStrFeb; break;
+ case 3: cellString = aStrMar; break;
+ case 5: cellString = aStrNorth; break;
+ case 10: cellString = aStrMid; break;
+ case 15: cellString = aStrSouth; break;
case 4:
- case 20: cellString = aStrSum; break;
+ case 20: cellString = aStrSum; break;
case 6:
case 8:
@@ -712,22 +712,22 @@ void AutoFmtPreview::DrawString( size_t nCol, size_t nRow )
nNum = 5;
goto MAKENUMSTR;
case 17:
- case 7: nVal = nIndex;
+ case 7: nVal = nIndex;
nNum = 6;
goto MAKENUMSTR;
case 11:
case 12:
- case 13: nVal = nIndex;
+ case 13: nVal = nIndex;
nNum = 12 == nIndex ? 10 : 9;
goto MAKENUMSTR;
- case 9: nVal = 21; nNum = 7; goto MAKENUMSTR;
- case 14: nVal = 36; nNum = 11; goto MAKENUMSTR;
- case 19: nVal = 51; nNum = 7; goto MAKENUMSTR;
- case 21: nVal = 33; nNum = 13; goto MAKENUMSTR;
- case 22: nVal = 36; nNum = 14; goto MAKENUMSTR;
- case 23: nVal = 39; nNum = 13; goto MAKENUMSTR;
- case 24: nVal = 108; nNum = 15; goto MAKENUMSTR;
+ case 9: nVal = 21; nNum = 7; goto MAKENUMSTR;
+ case 14: nVal = 36; nNum = 11; goto MAKENUMSTR;
+ case 19: nVal = 51; nNum = 7; goto MAKENUMSTR;
+ case 21: nVal = 33; nNum = 13; goto MAKENUMSTR;
+ case 22: nVal = 36; nNum = 14; goto MAKENUMSTR;
+ case 23: nVal = 39; nNum = 13; goto MAKENUMSTR;
+ case 24: nVal = 108; nNum = 15; goto MAKENUMSTR;
MAKENUMSTR:
if( aCurData.IsValueFormat() )
{
@@ -750,14 +750,14 @@ MAKENUMSTR:
if( cellString.Len() )
{
- Size aStrSize;
+ Size aStrSize;
BYTE nFmtIndex = GetFormatIndex( nCol, nRow );
Rectangle cellRect = maArray.GetCellRect( nCol, nRow );
Point aPos = cellRect.TopLeft();
- USHORT nRightX = 0;
-// BOOL bJustify = aCurData.IsJustify();
-// ScHorJustifyAttr aHorJustifyItem;
-// CellHorJustify eJustification;
+ USHORT nRightX = 0;
+// BOOL bJustify = aCurData.IsJustify();
+// ScHorJustifyAttr aHorJustifyItem;
+// CellHorJustify eJustification;
Size theMaxStrSize( cellRect.GetWidth() - FRAME_OFFSET,
cellRect.GetHeight() - FRAME_OFFSET );
@@ -786,9 +786,9 @@ MAKENUMSTR:
while( theMaxStrSize.Width() <= aStrSize.Width() &&
cellString.Len() > 1 )
{
-// if( eJustification == SVX_HOR_JUSTIFY_RIGHT )
-// cellString.Erase( 0, 1 );
-// else
+// if( eJustification == SVX_HOR_JUSTIFY_RIGHT )
+// cellString.Erase( 0, 1 );
+// else
cellString.Erase( cellString.Len() - 1 );
aScriptedText.SetText( cellString, m_xBreak );
aStrSize = aScriptedText.GetTextSize();
@@ -818,7 +818,7 @@ MAKENUMSTR:
//-----------
// horizontal
//-----------
-/* if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/
+/* if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/
if( mbRTL )
aPos.X() += nRightX;
else if (aCurData.IsJustify())
@@ -995,22 +995,22 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ )
SW_MOD()->GetAccessibilityOptions().GetIsForBorders() )
aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
- Bitmap thePreview;
- Point aCenterPos;
- Size theWndSize = GetSizePixel();
- Size thePrevSize;
- Color oldColor;
- Font aFont;
+ Bitmap thePreview;
+ Point aCenterPos;
+ Size theWndSize = GetSizePixel();
+ Size thePrevSize;
+ Color oldColor;
+ Font aFont;
aFont = aVD.GetFont();
aFont.SetTransparent( TRUE );
- aVD.SetFont ( aFont );
+ aVD.SetFont ( aFont );
aVD.SetLineColor ();
const Color& rWinColor = GetSettings().GetStyleSettings().GetWindowColor();
aVD.SetBackground ( Wallpaper(rWinColor) );
aVD.SetFillColor ( rWinColor );
- aVD.SetOutputSizePixel ( aPrvSize );
+ aVD.SetOutputSizePixel ( aPrvSize );
//--------------------------------
// Zellen auf virtual Device malen
@@ -1028,7 +1028,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ )
aVD.SetLineColor();
aVD.DrawRect( Rectangle( Point(0,0), theWndSize ) );
SetLineColor( oldColor );
- aCenterPos = Point( (theWndSize.Width() - aPrvSize.Width() ) / 2,
+ aCenterPos = Point( (theWndSize.Width() - aPrvSize.Width() ) / 2,
(theWndSize.Height() - aPrvSize.Height()) / 2 );
aVD.DrawBitmap( aCenterPos, thePreview );
diff --git a/sw/source/ui/table/tautofmt.hrc b/sw/source/ui/table/tautofmt.hrc
index 5ffd2d3eb8d3..5f107ebbc385 100644
--- a/sw/source/ui/table/tautofmt.hrc
+++ b/sw/source/ui/table/tautofmt.hrc
@@ -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
@@ -30,47 +30,47 @@
#include "table.hrc"
// allgemein
#define BTN_OK 100
-#define BTN_CANCEL 102
+#define BTN_CANCEL 102
#define BTN_HELP 103
-#define BTN_MORE 104
-#define BTN_ADD 105
-#define BTN_REMOVE 106
-#define BTN_RENAME 107
-#define FT_LABEL 110
+#define BTN_MORE 104
+#define BTN_ADD 105
+#define BTN_REMOVE 106
+#define BTN_RENAME 107
+#define FT_LABEL 110
#define FL_FRAME 111
-#define STR_BTN_CLOSE 200
+#define STR_BTN_CLOSE 200
// Autoformat
-#define LB_FORMAT 1
+#define LB_FORMAT 1
#define FL_FORMAT 9
#define FL_FORMATS 29
-#define WND_PREVIEW 19
-#define BTN_NUMFORMAT 20
-#define BTN_BORDER 21
-#define BTN_FONT 23
-#define BTN_PATTERN 24
-#define BTN_ALIGNMENT 25
-//#define BTN_ADJUST 26
-#define STR_ADD_TITLE 100
-#define STR_ADD_LABEL 101
-#define STR_DEL_TITLE 102
-#define STR_DEL_MSG 103
+#define WND_PREVIEW 19
+#define BTN_NUMFORMAT 20
+#define BTN_BORDER 21
+#define BTN_FONT 23
+#define BTN_PATTERN 24
+#define BTN_ALIGNMENT 25
+//#define BTN_ADJUST 26
+#define STR_ADD_TITLE 100
+#define STR_ADD_LABEL 101
+#define STR_DEL_TITLE 102
+#define STR_DEL_MSG 103
#define STR_INVALID_AFNAME 104
-#define STR_RENAME_TITLE 105
+#define STR_RENAME_TITLE 105
// Autoformat-Preview:
-#define STR_JAN 121
-#define STR_FEB 122
-#define STR_MAR 123
-#define STR_NORTH 124
-#define STR_MID 125
-#define STR_SOUTH 126
-#define STR_SUM 127
+#define STR_JAN 121
+#define STR_FEB 122
+#define STR_MAR 123
+#define STR_NORTH 124
+#define STR_MID 125
+#define STR_SOUTH 126
+#define STR_SUM 127
// Gruppierung setzen/aufheben:
-#define BTN_GROUP_COLS 1
-#define BTN_GROUP_ROWS 3
-#define STR_GROUP 1
-#define STR_UNGROUP 2
+#define BTN_GROUP_COLS 1
+#define BTN_GROUP_ROWS 3
+#define STR_GROUP 1
+#define STR_UNGROUP 2
#define ED_INPUT 1
diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src
index 4bc6a62bb591..ab314e0932a3 100644
--- a/sw/source/ui/table/tautofmt.src
+++ b/sw/source/ui/table/tautofmt.src
@@ -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
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index 4f2c09fbc38e..fd6303e29a92 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@
#include <paratr.hxx>
#include <fmtpdsc.hxx>
#include <fmtrowsplt.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // fuer die UndoIds
#include <boost/shared_ptr.hpp>
//#define FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES 1
@@ -114,9 +114,9 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool
else if( nSelectionType == nsSelectionType::SEL_TBL )
{
pItemSet = new SfxItemSet(rPool,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween
RES_BACKGROUND, RES_SHADOW, //RES_BOX is inbetween
- SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
+ SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
RES_BREAK, RES_BREAK,
RES_PAGEDESC, RES_PAGEDESC,
RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 7e54dd7ce12d..45da8eadada1 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -2,7 +2,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
@@ -154,16 +154,16 @@ void lcl_InvalidateZoomSlots(SfxBindings& rBindings)
// erstmal der Zoom-Dialog
class SwPreViewZoomDlg : public SvxStandardDialog
{
- FixedText aRowLbl;
- NumericField aRowEdit;
- FixedText aColLbl;
- NumericField aColEdit;
+ FixedText aRowLbl;
+ NumericField aRowEdit;
+ FixedText aColLbl;
+ NumericField aColEdit;
- OKButton aOkBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ OKButton aOkBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
- virtual void Apply();
+ virtual void Apply();
public:
SwPreViewZoomDlg( SwPagePreViewWin& rParent );
@@ -565,7 +565,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt )
}
/******************************************************************************
- * Beschreibung: Userprefs bzw Viewoptions setzen
+ * Beschreibung: Userprefs bzw Viewoptions setzen
******************************************************************************/
void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol )
{
@@ -919,7 +919,7 @@ void SwPagePreView::Execute( SfxRequest &rReq )
case FN_START_OF_LINE:
case FN_START_OF_DOCUMENT:
aViewWin.SetSelectedPage( 1 );
- eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE;
+ eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE;
case FN_END_OF_LINE:
case FN_END_OF_DOCUMENT:
aViewWin.SetSelectedPage( mnPageCount );
@@ -963,9 +963,9 @@ MOVEPAGE:
return;
case FN_CLOSE_PAGEPREVIEW:
case SID_PRINTPREVIEW:
- // print preview is now always in the same frame as the tab view
- // -> always switch this frame back to normal view
- // (ScTabViewShell ctor reads stored view data)
+ // print preview is now always in the same frame as the tab view
+ // -> always switch this frame back to normal view
+ // (ScTabViewShell ctor reads stored view data)
GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, 0, 0, SFX_CALLMODE_ASYNCHRON );
break;
case FN_INSERT_BREAK:
@@ -998,7 +998,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet )
OSL_ENSURE(nWhich, "empty set");
SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout();
//#106746# zoom has to be disabled if Accessibility support is switched on
- // MT 2010/01, see #110498#
+ // MT 2010/01, see #110498#
BOOL bZoomEnabled = TRUE; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport();
while(nWhich)
@@ -1137,7 +1137,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet )
case SID_PRINTDOC:
case SID_PRINTDOCDIRECT:
- GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet );
+ GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet );
break;
}
nWhich = aIter.NextWhich();
@@ -1172,7 +1172,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
// die Felder aktualisieren
// ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen.
- // In den Methoden wird auf die akt. Shell abgefragt!
+ // In den Methoden wird auf die akt. Shell abgefragt!
SwEditShell* pESh = (SwEditShell*)GetViewShell();
BOOL bIsModified = pESh->IsModified();
@@ -1338,9 +1338,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori )
if( !bHori )
{
- pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) );
+ pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) );
pPageUpBtn->SetHelpId(FN_PAGEUP);
- pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) );
+ pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) );
pPageDownBtn->SetHelpId(FN_PAGEDOWN);
Link aLk( LINK( this, SwPagePreView, BtnPage ) );
pPageUpBtn->SetClickHdl( aLk );
@@ -1409,7 +1409,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar )
// ab hier alles aus der SwView uebernommen
void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
{
-// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel();
+// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel();
const StyleSettings &rSet = aViewWin.GetSettings().GetStyleSettings();
const long nTmp = rSet.GetScrollBarSize();// - nAdd;
if ( pVScrollbar->IsVisible( FALSE ))
@@ -1452,7 +1452,7 @@ void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize )
//Aufruf der DocSzChgd-Methode der Scrollbars ist noetig, da vom maximalen
//Scrollrange immer die halbe Hoehe der VisArea abgezogen wird.
if ( pVScrollbar &&
- aTmpSize.Width() > 0 && aTmpSize.Height() > 0 )
+ aTmpSize.Width() > 0 && aTmpSize.Height() > 0 )
{
ScrollDocSzChg();
}
@@ -1527,10 +1527,10 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar )
aPos.Y() = pScrollbar->OutputToScreenPixel(pScrollbar->GetPointerPosPixel()).Y();
Size aSize = pScrollbar->GetSizePixel();
Rectangle aRect;
- aRect.Left() = aPos.X() -8;
- aRect.Right() = aRect.Left();
- aRect.Top() = aPos.Y();
- aRect.Bottom() = aRect.Top();
+ aRect.Left() = aPos.X() -8;
+ aRect.Right() = aRect.Left();
+ aRect.Top() = aPos.Y();
+ aRect.Bottom() = aRect.Top();
Help::ShowQuickHelp(pScrollbar, aRect, sStateStr,
QUICKHELP_RIGHT|QUICKHELP_VCENTER);
@@ -1746,7 +1746,7 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
if ( pOld && pOld->IsPrinting() )
return SFX_PRINTERROR_BUSY;
- SwEditShell &rESh = (SwEditShell&)rSh; //Buh...
+ SwEditShell &rESh = (SwEditShell&)rSh; //Buh...
if( ( SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP ) & nDiffFlags )
{
rSh.getIDocumentDeviceAccess()->setPrinter( pNew, true, true );
@@ -1948,7 +1948,7 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt )
uno::Reference< ::com::sun::star::accessibility::XAccessible >
SwPagePreViewWin::CreateAccessible()
{
- SolarMutexGuard aGuard; // this should have
+ SolarMutexGuard aGuard; // this should have
// happend already!!!
OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" );
diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc
index 3724789431ed..d30f90e396f4 100644
--- a/sw/source/ui/uiview/pview.hrc
+++ b/sw/source/ui/uiview/pview.hrc
@@ -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
@@ -26,24 +26,24 @@
************************************************************************/
#include "view.hrc"
-#define FT_COL 1
-#define FT_ROW 2
-#define ED_COL 4
-#define ED_ROW 5
+#define FT_COL 1
+#define FT_ROW 2
+#define ED_COL 4
+#define ED_ROW 5
-#define BT_OK 20
-#define BT_CANCEL 21
-#define BT_HELP 22
+#define BT_OK 20
+#define BT_CANCEL 21
+#define BT_HELP 22
// Grenzwerte fuers Zooming (werden auch im piew.cxx benutzt!)
-#define PVIEW_MIN_ROW 1
-#define PVIEW_MAX_ROW 10
-#define PVIEW_MIN_COL 1
-#define PVIEW_MAX_COL 20
+#define PVIEW_MIN_ROW 1
+#define PVIEW_MAX_ROW 10
+#define PVIEW_MIN_COL 1
+#define PVIEW_MAX_COL 20
//Dialog Druckoptionen
#define FL_ROWCOL 1
-#define FT_ROWS 2
+#define FT_ROWS 2
#define NF_ROWS 3
#define FT_COLS 4
#define NF_COLS 5
@@ -68,5 +68,5 @@
#define MF_VMARGIN 23
#define PB_STANDARD 24
-#define RB_LANDSCAPE 24
+#define RB_LANDSCAPE 24
#define RB_PORTRAIT 25
diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src
index 1a8833e76b34..4b97c83c432b 100644
--- a/sw/source/ui/uiview/pview.src
+++ b/sw/source/ui/uiview/pview.src
@@ -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
diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index 15d596f5633b..a5e2ea954175 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ SwScrollbar::SwScrollbar( Window *pWin, BOOL bHoriz ) :
SwScrollbar::~SwScrollbar() {}
/*------------------------------------------------------------------------
- Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den
+ Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den
Range des Scrollbars neu einzustellen.
------------------------------------------------------------------------*/
@@ -71,7 +71,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize )
}
/*------------------------------------------------------------------------
- Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes
+ Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes
gerufen.
------------------------------------------------------------------------*/
@@ -134,7 +134,7 @@ void SwScrollbar::SetAuto(BOOL bSet)
if(!bAuto && bVisible && !ScrollBar::IsVisible())
ExtendedShow(TRUE);
else if(bAuto)
- AutoShow(); // oder automatisch verstecken
+ AutoShow(); // oder automatisch verstecken
}
}
/*-----------------14.04.98 11:43-------------------
@@ -151,7 +151,7 @@ void SwScrollbar::AutoShow()
ScrollBar::Show(FALSE);
}
else if ( !ScrollBar::IsVisible() &&
- (!bHori || nVis) ) //Optimierung fuer Browser.
+ (!bHori || nVis) ) //Optimierung fuer Browser.
//Horizontaler Scrollbar per
//default aus.
{
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 8d5dc09d6377..bea24340dded 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -2,7 +2,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
@@ -118,11 +118,11 @@ using ::com::sun::star::util::SearchOptions;
#define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL))
// Druckraender -> wie Basic - Ide
-#define LMARGPRN 1700
-#define RMARGPRN 900
-#define TMARGPRN 2000
-#define BMARGPRN 1000
-#define BORDERPRN 300
+#define LMARGPRN 1700
+#define RMARGPRN 900
+#define TMARGPRN 2000
+#define BMARGPRN 1000
+#define BORDERPRN 300
SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
{
@@ -132,7 +132,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) )
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU));
- SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
+ SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
SW_RES(RID_WEBTOOLS_TOOLBOX) );
SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
@@ -142,7 +142,7 @@ TYPEINIT1(SwSrcView, SfxViewShell)
void lcl_PrintHeader( OutputDevice &rOutDev, USHORT nPages, USHORT nCurPage, const String& rTitle )
{
- short nLeftMargin = LMARGPRN;
+ short nLeftMargin = LMARGPRN;
Size aSz = rOutDev.GetOutputSize();
short nBorder = BORDERPRN;
@@ -224,7 +224,7 @@ void lcl_ConvertTabsToSpaces( String& rLine )
rLine.Insert( aBlanker, nPos );
nMax = rLine.Len();
}
- nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
+ nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
}
}
}
@@ -254,7 +254,7 @@ SwSrcView::~SwSrcView()
sal_Int32 delay = xDocProps->getAutoloadSecs();
pDocShell->SetAutoLoad(INetURLObject(url), delay,
(delay != 0) || !url.equalsAscii(""));
-// EndListening(*GetViewFrame());
+// EndListening(*GetViewFrame());
EndListening(*pDocShell);
delete pSearchItem;
}
@@ -281,11 +281,11 @@ void SwSrcView::Init()
aEditWin.SetReadonly(TRUE);
}
-// StartListening(*GetViewFrame());
+// StartListening(*GetViewFrame());
StartListening(*pDocShell,TRUE);
}
-SwDocShell* SwSrcView::GetDocShell()
+SwDocShell* SwSrcView::GetDocShell()
{
SfxObjectShell* pObjShell = GetViewFrame()->GetObjectShell();
return PTR_CAST(SwDocShell, pObjShell);
@@ -293,7 +293,7 @@ SwDocShell* SwSrcView::GetDocShell()
void SwSrcView::SaveContent(const String& rTmpFile)
{
- SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE);
+ SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE);
SvStream* pOutStream = aMedium.GetOutStream();
pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) );
aEditWin.Write(*pOutStream);//, EE_FORMAT_TEXT);
@@ -314,7 +314,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
TemplateDescription::FILESAVE_AUTOEXTENSION,
TemplateDescription::FILESAVE_SIMPLE );
uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
-// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW);
+// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW);
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
// search for an html filter for export
@@ -681,7 +681,7 @@ USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool )
}
return 0;
}
-
+
SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate )
{
return GetDocShell()->GetDoc()->getPrinter( bCreate );
@@ -689,7 +689,7 @@ SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate )
sal_Int32 SwSrcView::PrintSource(
OutputDevice *pOutDev,
- sal_Int32 nPage,
+ sal_Int32 nPage,
bool bCalcNumPagesOnly )
{
if (!pOutDev || nPage <= 0)
@@ -754,7 +754,7 @@ sal_Int32 SwSrcView::PrintSource(
}
aPos.Y() += nParaSpace;
}
-
+
pOutDev->Pop();
OSL_ENSURE( bCalcNumPagesOnly || nPage <= nCurPage, "page number out of range" );
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index 7a93bbaa7212..2966c0058a0a 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -2,7 +2,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
@@ -65,7 +65,7 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
// the aLogRect will get the preliminary size now
aLogRect.SetSize( rSh.RequestObjectResize( SwRect( aLogRect ), GetObject() ) );
-
+
// the EndAllAction() call will trigger CalcAndSetScale() call,
// so the embedded object must get the correct size before
if ( aLogRect.GetSize() != GetScaledObjArea().GetSize() )
@@ -137,11 +137,11 @@ void SwOleClient::ViewChanged()
// this is an error
OSL_ENSURE( sal_False, "Something goes wrong on requesting object size!\n" );
}
-
+
Size aVisSize( aSz.Width, aSz.Height );
// Bug 24833: solange keine vernuenftige Size vom Object kommt,
- // kann nichts skaliert werden
+ // kann nichts skaliert werden
if( !aVisSize.Width() || !aVisSize.Height() )
return;
@@ -156,7 +156,7 @@ void SwOleClient::ViewChanged()
aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight();
SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize );
- rSh.LockView( TRUE ); //Scrollen im EndAction verhindern
+ rSh.LockView( TRUE ); //Scrollen im EndAction verhindern
rSh.StartAllAction();
rSh.RequestObjectResize( aRect, GetObject() );
rSh.EndAllAction();
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 51ff90209e9e..3350d8db1ab4 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -2,7 +2,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
@@ -114,12 +114,12 @@ void SwView_Impl::SetShellMode(ShellModes eSet)
eShellMode = eSet;
}
-view::XSelectionSupplier* SwView_Impl::GetUNOObject()
+view::XSelectionSupplier* SwView_Impl::GetUNOObject()
{
return pxXTextView->get();
}
-SwXTextView* SwView_Impl::GetUNOObject_Impl()
+SwXTextView* SwView_Impl::GetUNOObject_Impl()
{
view::XSelectionSupplier* pTextView = pxXTextView->get();
return ((SwXTextView*)pTextView);
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 77b6c83b681a..b129da7c4a49 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -2,7 +2,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
@@ -127,31 +127,31 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern sal_Bool bNoInterrupt; // in mainwn.cxx
-#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
+#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
SFX_VIEW_HAS_PRINTOPTIONS)
/*--------------------------------------------------------------------
- Beschreibung: Statics
+ Beschreibung: Statics
--------------------------------------------------------------------*/
int bDocSzUpdated = 1;
-SvxSearchItem* SwView::pSrchItem = 0;
+SvxSearchItem* SwView::pSrchItem = 0;
-sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE;
-sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE;
-sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM;
+sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE;
+sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE;
+sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM;
-sal_Bool SwView::bExtra = sal_False;
-sal_Bool SwView::bFound = sal_False;
-sal_Bool SwView::bJustOpened = sal_False;
+sal_Bool SwView::bExtra = sal_False;
+sal_Bool SwView::bFound = sal_False;
+sal_Bool SwView::bJustOpened = sal_False;
-SvxSearchDialog* SwView::pSrchDlg = 0;
-SearchAttrItemList* SwView::pSrchList = 0;
-SearchAttrItemList* SwView::pReplList = 0;
+SvxSearchDialog* SwView::pSrchDlg = 0;
+SearchAttrItemList* SwView::pSrchList = 0;
+SearchAttrItemList* SwView::pReplList = 0;
DBG_NAME(viewhdl)
@@ -241,7 +241,7 @@ void SwView::SelectShell()
{
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
-// Achtung: SelectShell fuer die WebView mitpflegen
+// Achtung: SelectShell fuer die WebView mitpflegen
//
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -277,10 +277,10 @@ void SwView::SelectShell()
SfxDispatcher &rDispatcher = GetDispatcher();
SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig();
- // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
+ // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
if ( pShell )
{
- rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
+ rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
//Zur alten Selektion merken welche Toolbar sichtbar war
USHORT nId = static_cast< USHORT >( rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT ));
@@ -503,7 +503,7 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
if( !bAttrChgNotified )
{
if ( pWrtShell->BasicActionPend() || bNoInterrupt ||
- GetDispatcher().IsLocked() || //do not confuse the SFX
+ GetDispatcher().IsLocked() || //do not confuse the SFX
GetViewFrame()->GetBindings().IsInUpdate() )//do not confuse the SFX
{
bAttrChgNotified = sal_True;
@@ -588,7 +588,7 @@ void SwView::_CheckReadonlyState()
SfxItemState eStateRO, eStateProtAll;
const SfxPoolItem *pItem;
// JP 29.04.97: von einem nur uns bekannten Slot den Status abfragen.
- // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
+ // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem );
eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
sal_Bool bChgd = sal_False;
@@ -597,37 +597,37 @@ void SwView::_CheckReadonlyState()
{
static sal_uInt16 aROIds[] =
{
- SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE,
+ SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE,
SID_UNDO,
- SID_REDO, SID_REPEAT, SID_PASTE,
+ SID_REDO, SID_REPEAT, SID_PASTE,
SID_PASTE_UNFORMATTED,
SID_PASTE_SPECIAL, SID_SBA_BRW_INSERT,
SID_BACKGROUND_COLOR, FN_INSERT_BOOKMARK,
- SID_CHARMAP, FN_INSERT_SOFT_HYPHEN,
- FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK,
- FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG,
- FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD,
- FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE,
- FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE,
- FN_CALCULATE, FN_FORMAT_RESET,
- FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT,
- SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK,
- SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20,
- SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND,
- SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT,
- SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE,
+ SID_CHARMAP, FN_INSERT_SOFT_HYPHEN,
+ FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK,
+ FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG,
+ FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD,
+ FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE,
+ FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE,
+ FN_CALCULATE, FN_FORMAT_RESET,
+ FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT,
+ SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK,
+ SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20,
+ SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND,
+ SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT,
+ SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE,
SID_ATTR_CHAR_OVERLINE,
- SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT,
- FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED,
- SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT,
- FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE,
- SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE,
- FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET,
- FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE,
- SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS,
+ SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT,
+ FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED,
+ SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT,
+ FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE,
+ SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE,
+ FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET,
+ FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE,
+ SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS,
SID_ATTR_PARA_ORPHANS,
- SID_ATTR_PARA_MODEL, SID_PARA_DLG,
- FN_SELECT_PARA, SID_DEC_INDENT,
+ SID_ATTR_PARA_MODEL, SID_PARA_DLG,
+ FN_SELECT_PARA, SID_DEC_INDENT,
SID_INC_INDENT
};
static sal_Bool bFirst = sal_True;
@@ -694,11 +694,11 @@ void SwView::_CheckReadonlySelection()
case SHELL_MODE_TABLE_LIST_TEXT:
{
//JP 22.01.99: temporaere Loesung!!! Sollte bei jeder Cursorbewegung
-// den Font von der akt. Einfuegeposition setzen, also ausserhalb
-// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und
-// das besorgen erscheint mir hier zu teuer zu sein.
-// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen
-// die Textformatierung dann den richtigen Font zusammen baut.
+// den Font von der akt. Einfuegeposition setzen, also ausserhalb
+// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und
+// das besorgen erscheint mir hier zu teuer zu sein.
+// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen
+// die Textformatierung dann den richtigen Font zusammen baut.
InputContext aCntxt( GetEditWin().GetInputContext() );
aCntxt.SetOptions( SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags
@@ -847,7 +847,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->pWrtShell,
pEditWin, *this);
//MA: Das kann doch nur zu einem GPF fuehren!
-// nSelectionType = ((SwView*)pOldSh)->nSelectionType;
+// nSelectionType = ((SwView*)pOldSh)->nSelectionType;
}
else
{
@@ -900,7 +900,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// <--
// JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im
- // ReadonlyFall nicht angezeigt wird
+ // ReadonlyFall nicht angezeigt wird
aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() );
//Kein Margin fuer OLE!
@@ -1031,7 +1031,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
{
SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
Execute( aSfxRequest );
- pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen
+ pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen
pWrtShell->SttEndDoc(TRUE);
}
@@ -1041,7 +1041,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// zur Zeit(360) wird die View erst nach dem Ctor eingetragen
// der folgende Ausdruck funktioniert auch, wenn sich das aendert
//JP 27.07.98: wenn per Undo nicht mehr die Modifizierung aufhebar ist,
- // so setze das Modified NICHT zurueck.
+ // so setze das Modified NICHT zurueck.
// --> OD 2005-02-11 #i38810# - no reset of modified state, if document
// was already modified.
if ( !pWrtShell->GetDoc()->IsUndoNoResetModified() &&
@@ -1131,7 +1131,7 @@ SwView::~SwView()
EndListening(*GetDocShell());
delete pScrollFill;
delete pWrtShell;
- pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen
+ pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen
pShell = 0;
delete pHScrollbar;
delete pVScrollbar;
@@ -1148,7 +1148,7 @@ SwView::~SwView()
}
/*--------------------------------------------------------------------
- Beschreibung: DocShell rausgrabbeln ueber das FrameWindow
+ Beschreibung: DocShell rausgrabbeln ueber das FrameWindow
--------------------------------------------------------------------*/
SwDocShell* SwView::GetDocShell()
{
@@ -1157,7 +1157,7 @@ SwDocShell* SwView::GetDocShell()
}
/*--------------------------------------------------------------------
- Beschreibung: CursorPos merken
+ Beschreibung: CursorPos merken
--------------------------------------------------------------------*/
void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
{
@@ -1229,8 +1229,8 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
sal_uInt16 nZoomFactor =
static_cast< sal_uInt16 >( rUserData.GetToken(0, ';', nPos ).ToInt32() );
- long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(),
- nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(),
+ long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(),
+ nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(),
nRight = rUserData.GetToken(0, ';', nPos ).ToInt32(),
nBottom= rUserData.GetToken(0, ';', nPos ).ToInt32();
@@ -1606,7 +1606,7 @@ void SwView::ShowCursor( bool bOn )
{
//JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area
BOOL bUnlockView = !pWrtShell->IsViewLocked();
- pWrtShell->LockView( TRUE ); //lock visible section
+ pWrtShell->LockView( TRUE ); //lock visible section
if( !bOn )
pWrtShell->HideCrsr();
@@ -1643,7 +1643,7 @@ String SwView::GetSelectionText( sal_Bool bCompleteWrds )
return GetSelectionTextParam( bCompleteWrds, sal_True );
}
-String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds,
+String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds,
sal_Bool bEraseTrail )
{
String sReturn;
@@ -1761,8 +1761,8 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
uno::Reference< XScannerManager > xScanMgr = SW_MOD()->GetScannerManager();
if( xScanMgr.is() )
{
- const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] );
- const ScanError eError = xScanMgr->getError( aContext );
+ const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] );
+ const ScanError eError = xScanMgr->getError( aContext );
if( ScanError_ScanErrorNone == eError )
{
@@ -1786,7 +1786,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
}
#endif
-void SwView::StopShellTimer()
+void SwView::StopShellTimer()
{
if(aTimer.IsActive())
{
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index d2aa60494801..e05b61e75153 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -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
@@ -36,14 +36,14 @@
// STR -------------------------------------------------------------------
-#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
-#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
+#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
+#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
-#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6)
+#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6)
-#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
+#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
-//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15)
+//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15)
#define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16)
#define MSG_SEARCH_START (RC_VIEW_BEGIN + 17)
#define MSG_SEARCH_END (RC_VIEW_BEGIN + 18)
@@ -51,32 +51,32 @@
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
#define MSG_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21)
-#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22)
-#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23)
+#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22)
+#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23)
#define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24)
#define MSG_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25)
-#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26)
-#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27)
-#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28)
-#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29)
-#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30)
+#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26)
+#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27)
+#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28)
+#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29)
+#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30)
-#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31)
+#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31)
#define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32)
#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33)
// MSG -------------------------------------------------------------------
#define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN)
-#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
-#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
+#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
+#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
// DLG -------------------------------------------------------------------
-#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN)
-#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1)
+#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN)
+#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1)
// Ueberlaufpruefung -----------------------------------------------------
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 9cf4f910f183..233664b50971 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -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
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index cc87cb45f745..f06c991222d1 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -2,7 +2,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
@@ -60,7 +60,7 @@
#include "basesh.hxx"
#include "docsh.hxx"
#include "globals.hrc"
-#include "cmdid.h" // FN_ ...
+#include "cmdid.h" // FN_ ...
#include "globdoc.hxx"
#include "wview.hxx"
#include "shells.hrc"
@@ -135,7 +135,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
TYPEINIT1(SwView,SfxViewShell)
-ShellModes SwView::GetShellMode()
+ShellModes SwView::GetShellMode()
{
return pViewImpl->GetShellMode();
}
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index 96074ea29b4a..70aeb587b305 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -2,7 +2,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
@@ -81,7 +81,7 @@ void SwView::Activate(BOOL bMDIActivate)
if ( bMDIActivate )
{
- pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar
+ pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar
if( sSwViewData.Len() )
{
@@ -133,7 +133,7 @@ void SwView::Deactivate(BOOL bMDIActivate)
if( bMDIActivate )
{
- pWrtShell->ShLooseFcs(); // Selektionen unsichtbar
+ pWrtShell->ShLooseFcs(); // Selektionen unsichtbar
pHRuler->SetActive( FALSE );
pVRuler->SetActive( FALSE );
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index b285b5dceaf9..da75a14be859 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -185,7 +185,7 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, USHORT nWhichId
}
/*---------------------------------------------------------------------------
- Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln.
+ Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln.
----------------------------------------------------------------------------*/
String SwView::GetPageStr( USHORT nPg, USHORT nLogPg,
const String& rDisplay )
@@ -542,7 +542,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
if( aPasswd.getLength() )
{
OSL_ENSURE( !((const SfxBoolItem*)pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" );
- // xmlsec05: new password dialog
+ // xmlsec05: new password dialog
Window* pParent;
const SfxPoolItem* pParentItem;
if( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) )
@@ -559,7 +559,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
if(SvPasswordHelper::CompareHashPassword(aPasswd, sNewPasswd))
pIDRA->SetRedlinePassword(Sequence <sal_Int8> ());
else
- { // xmlsec05: message box for wrong password
+ { // xmlsec05: message box for wrong password
break;
}
}
@@ -578,8 +578,8 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
&& ((SfxBoolItem*)pItem)->GetValue() == ( aPasswd.getLength() != 0 ) )
break;
- // xmlsec05: new password dialog
- // message box for wrong password
+ // xmlsec05: new password dialog
+ // message box for wrong password
Window* pParent;
const SfxPoolItem* pParentItem;
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) )
@@ -937,7 +937,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
}
}
break;
- case SID_ATTR_LANGUAGE :
+ case SID_ATTR_LANGUAGE :
if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem))
{
SvxLanguageItem aLang(((SvxLanguageItem*)pItem)->GetLanguage(), RES_CHRATR_LANGUAGE);
@@ -1163,7 +1163,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: SeitenNr-Feld invalidieren
+ Beschreibung: SeitenNr-Feld invalidieren
--------------------------------------------------------------------*/
void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr)
{
@@ -1175,7 +1175,7 @@ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgSt
}
/*--------------------------------------------------------------------
- Beschreibung: Status der Stauszeile
+ Beschreibung: Status der Stauszeile
--------------------------------------------------------------------*/
void SwView::StateStatusLine(SfxItemSet &rSet)
{
@@ -1193,7 +1193,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
/*
//JP 07.01.00: is a nice feature - show the selektion of DrawObjects
if( rShell.IsObjSelected()
-//??? || rShell.IsFrmSelected()
+//??? || rShell.IsFrmSelected()
)
{
String sDisplay( rShell.GetDrawView()->GetMarkedObjectList().
@@ -1201,7 +1201,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
rSet.Put( SfxStringItem( FN_STAT_PAGE, sDisplay ));
}
else
-*/ {
+*/ {
// Anzahl der Seiten, log. SeitenNr. SeitenNr ermitteln
USHORT nPage, nLogPage;
String sDisplay;
@@ -1210,7 +1210,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
GetPageStr( nPage, nLogPage, sDisplay) ));
USHORT nCnt = GetWrtShell().GetPageCnt();
- if (nPageCnt != nCnt) // Basic benachrichtigen
+ if (nPageCnt != nCnt) // Basic benachrichtigen
{
nPageCnt = nCnt;
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), FALSE);
@@ -1387,40 +1387,40 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
//#outline level, removed by zhaojianwei
//const SwNumRule* pNumRule = rShell.GetCurNumRule();
- //if (pNumRule) // Cursor in Numerierung
+ //if (pNumRule) // Cursor in Numerierung
//{
- // BYTE nNumLevel = rShell.GetNumLevel();
- // if( IsShowNum(nNumLevel) && MAXLEVEL >
- // ( nNumLevel = GetRealLevel( nNumLevel )) )
- // {
- // if( sStr.Len() )
- // sStr.AppendAscii(sStatusDelim);
- // sStr += SW_RESSTR(STR_NUM_LEVEL);
- // sStr += String::CreateFromInt32( nNumLevel + 1 );
- // if(!pNumRule->IsAutoRule())
- // {
- // SfxItemSet aSet(GetPool(),
- // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE);
- // rShell.GetCurAttr(aSet);
- // /* const SfxPoolItem* pItem; */
- // if(SFX_ITEM_AVAILABLE <=
- // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE
- // /*, &pItem */ ))
- // {
- // const String& rNumStyle =
- // ((const SfxStringItem &)
- // aSet.Get(RES_PARATR_NUMRULE)).GetValue();
- // /* #i5116# GetItemState does not necessarily
- // change pItem */
- // // ((const SfxStringItem*)pItem)->GetValue();
- // if(rNumStyle.Len())
- // {
- // sStr.AppendAscii(sStatusDelim);
- // sStr += rNumStyle;
- // }
- // }
- // }
- // }
+ // BYTE nNumLevel = rShell.GetNumLevel();
+ // if( IsShowNum(nNumLevel) && MAXLEVEL >
+ // ( nNumLevel = GetRealLevel( nNumLevel )) )
+ // {
+ // if( sStr.Len() )
+ // sStr.AppendAscii(sStatusDelim);
+ // sStr += SW_RESSTR(STR_NUM_LEVEL);
+ // sStr += String::CreateFromInt32( nNumLevel + 1 );
+ // if(!pNumRule->IsAutoRule())
+ // {
+ // SfxItemSet aSet(GetPool(),
+ // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE);
+ // rShell.GetCurAttr(aSet);
+ // /* const SfxPoolItem* pItem; */
+ // if(SFX_ITEM_AVAILABLE <=
+ // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE
+ // /*, &pItem */ ))
+ // {
+ // const String& rNumStyle =
+ // ((const SfxStringItem &)
+ // aSet.Get(RES_PARATR_NUMRULE)).GetValue();
+ // /* #i5116# GetItemState does not necessarily
+ // change pItem */
+ // // ((const SfxStringItem*)pItem)->GetValue();
+ // if(rNumStyle.Len())
+ // {
+ // sStr.AppendAscii(sStatusDelim);
+ // sStr += rNumStyle;
+ // }
+ // }
+ // }
+ // }
//}//<-removed end ,zhaojianwei
//-->#outline level,added by zhaojianwei
@@ -1428,7 +1428,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0;
//((SwTxtFmtColl*)rShell.GetCrsr()->GetNode()->GetTxtNode()->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle();
- if (pNumRule && !bOutlineNum ) // Cursor in Numerierung
+ if (pNumRule && !bOutlineNum ) // Cursor in Numerierung
{
BYTE nNumLevel = rShell.GetNumLevel();
// --> OD 2008-04-02 #refactorlists#
@@ -1521,7 +1521,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Execute fuer die Stauszeile
+ Beschreibung: Execute fuer die Stauszeile
--------------------------------------------------------------------*/
void SwView::ExecuteStatusLine(SfxRequest &rReq)
{
@@ -1689,7 +1689,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
else
{
const SwNumRule* pNumRule = rSh.GetCurNumRule();
- if( pNumRule ) // Cursor in Numerierung
+ if( pNumRule ) // Cursor in Numerierung
{
if( pNumRule->IsAutoRule() )
nId = FN_NUMBER_BULLETS;
@@ -1806,7 +1806,7 @@ void SwView::InsFrmMode(USHORT nCols)
}
/*--------------------------------------------------------------------
- Beschreibung: Links bearbeiten
+ Beschreibung: Links bearbeiten
--------------------------------------------------------------------*/
void SwView::EditLinkDlg()
{
@@ -1901,7 +1901,7 @@ BOOL SwView::JumpToSwMark( const String& rMark )
BOOL bSearchInNotes = FALSE;
if( pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END ))
{
- pWrtShell->EnterStdMode(); // Selektion wieder aufheben
+ pWrtShell->EnterStdMode(); // Selektion wieder aufheben
bRet = TRUE;
}
}
@@ -1968,7 +1968,7 @@ sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc )
}
/*--------------------------------------------------------------------
- Beschreibung: Links bearbeiten
+ Beschreibung: Links bearbeiten
--------------------------------------------------------------------*/
void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem )
{
@@ -2078,7 +2078,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion )
}
pDocSh->RegisterTransfer( *pMedium );
pMedium->DownLoad(); // ggfs. den DownLoad anstossen
- if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
+ if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref?
{
SwReader* pRdr;
Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, pWrtShell );
@@ -2090,15 +2090,15 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion )
if( pRead && pDocSh->GetDoc() )
nUndoCheck = lcl_PageDescWithHeader( *pDoc );
ULONG nErrno;
- { //Scope for SwWait-Object, to be able to execute slots
+ { //Scope for SwWait-Object, to be able to execute slots
//outside this scope.
SwWait aWait( *GetDocShell(), TRUE );
pWrtShell->StartAllAction();
if ( pWrtShell->HasSelection() )
- pWrtShell->DelRight(); // Selektionen loeschen
+ pWrtShell->DelRight(); // Selektionen loeschen
if( pRead )
{
- nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
+ nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
delete pRdr;
}
else
@@ -2116,7 +2116,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion )
{
SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
Execute( aReq );
- pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen
+ pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen
}
if( pDoc )
@@ -2154,7 +2154,7 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
SwWait aWait( *GetDocShell(), TRUE );
pWrtShell->StartAllAction();
- pWrtShell->EnterStdMode(); // Selektionen loeschen
+ pWrtShell->EnterStdMode(); // Selektionen loeschen
if( bCompare )
nFound = pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() );
@@ -2191,9 +2191,9 @@ namespace
{
Sequence < OUString > aNames = _rDatasourceContext->getElementNames();
- return ( !aNames.getLength()
- || ( ( 1 == aNames.getLength() )
- && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource
+ return ( !aNames.getLength()
+ || ( ( 1 == aNames.getLength() )
+ && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource
)
);
}
diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx
index 74187a1583cf..c5bbdd2f5a46 100644
--- a/sw/source/ui/uiview/viewcoll.cxx
+++ b/sw/source/ui/uiview/viewcoll.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx
index 5d83448f0d74..52d00139c798 100644
--- a/sw/source/ui/uiview/viewdlg.cxx
+++ b/sw/source/ui/uiview/viewdlg.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx
index 9a6bd8a0c77d..1c91d20a8fef 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/ui/uiview/viewdlg2.cxx
@@ -2,7 +2,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
@@ -178,7 +178,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
}
USHORT nID = USHRT_MAX;
- SwFieldType* pType = 0;
+ SwFieldType* pType = 0;
const USHORT nCount = aMgr.GetFldTypeCount();
if( rName.Len() )
{
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 07c8f7864434..bb472c7188cd 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -85,7 +85,7 @@
using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Drawing-Ids ausfuehren
+ Beschreibung: Drawing-Ids ausfuehren
--------------------------------------------------------------------*/
void SwView::ExecDraw(SfxRequest& rReq)
{
@@ -136,7 +136,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
if (nNewId == nFormSfxId)
{
bDeselect = sal_True;
- GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen
+ GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen
}
}
}
@@ -179,7 +179,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
}
else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER )
{
- Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() );
+ Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() );
if ( pWin )
pWin->EnterWait();
@@ -196,11 +196,11 @@ void SwView::ExecDraw(SfxRequest& rReq)
aDlg.Execute();
if ( pObj )
{
- Size aDocSize( pWrtShell->GetDocSize() );
- const SwRect& rVisArea = pWrtShell->VisArea();
- Point aPos( rVisArea.Center() );
- Size aSize;
- Size aPrefSize( pObj->GetSnapRect().GetSize() );
+ Size aDocSize( pWrtShell->GetDocSize() );
+ const SwRect& rVisArea = pWrtShell->VisArea();
+ Point aPos( rVisArea.Center() );
+ Size aSize;
+ Size aPrefSize( pObj->GetSnapRect().GetSize() );
if( rVisArea.Width() > aDocSize.Width())
aPos.X() = aDocSize.Width() / 2 + rVisArea.Left();
@@ -267,7 +267,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
LeaveDrawCreate();
if (pWrtShell->IsFrmSelected())
- pWrtShell->EnterStdMode(); // wegen Bug #45639
+ pWrtShell->EnterStdMode(); // wegen Bug #45639
SwDrawBase* pFuncPtr = NULL;
@@ -409,7 +409,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: Drawing beenden
+ Beschreibung: Drawing beenden
--------------------------------------------------------------------*/
void SwView::ExitDraw()
{
@@ -460,7 +460,7 @@ void SwView::ExitDraw()
}
/*--------------------------------------------------------------------
- Beschreibung: Rotate-Mode abschalten
+ Beschreibung: Rotate-Mode abschalten
--------------------------------------------------------------------*/
void SwView::NoRotate()
{
@@ -475,7 +475,7 @@ void SwView::NoRotate()
}
/******************************************************************************
- * Beschreibung: DrawTextEditMode einschalten
+ * Beschreibung: DrawTextEditMode einschalten
******************************************************************************/
sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
{
@@ -512,9 +512,9 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
}
/******************************************************************************
- * Beschreibung: DrawTextEditMode einschalten
+ * Beschreibung: DrawTextEditMode einschalten
******************************************************************************/
-sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
+sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
bool bIsNewObj, bool bSetSelectionToStart)
{
SwWrtShell *pSh = &GetWrtShell();
@@ -613,7 +613,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
}
/******************************************************************************
- * Beschreibung: Ist ein DrawTextObjekt selektiert?
+ * Beschreibung: Ist ein DrawTextObjekt selektiert?
******************************************************************************/
sal_Bool SwView::IsTextTool() const
{
@@ -700,7 +700,7 @@ sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const
if (pSdrObj->IsGroupObject())
{
- SdrObjList* pList = pSdrObj->GetSubList();
+ SdrObjList* pList = pSdrObj->GetSubList();
sal_uInt32 nCnt = pList->GetObjCount();
for (sal_uInt32 i = 0; i < nCnt; i++)
@@ -719,7 +719,7 @@ sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
if (pSdrObj->IsGroupObject())
{
- SdrObjList* pList = pSdrObj->GetSubList();
+ SdrObjList* pList = pSdrObj->GetSubList();
sal_uInt32 nCnt = pList->GetObjCount();
for (sal_uInt32 i = 0; i < nCnt; i++)
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx
index b9841b5def51..64d597a4774d 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/ui/uiview/viewfunc.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 163e55ca8f62..bcbcfa1a1cce 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -2,7 +2,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
@@ -57,24 +57,24 @@
#include <editeng/SpellPortions.hxx>
#include <swmodule.hxx>
#include <swwait.hxx>
-#include <initui.hxx> // fuer SpellPointer
+#include <initui.hxx> // fuer SpellPointer
#include <uitool.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
#include <basesh.hxx>
-#include <docsh.hxx> // CheckSpellChanges
-#include <viewopt.hxx> // Viewoptions
+#include <docsh.hxx> // CheckSpellChanges
+#include <viewopt.hxx> // Viewoptions
#include <swundo.hxx> // fuer Undo-Ids
#include <hyp.hxx> // Trennung
-#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling
-#include <pam.hxx> // Spelling: Multiselektion
+#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling
+#include <pam.hxx> // Spelling: Multiselektion
#include <edtwin.hxx>
#include <crsskip.hxx>
#include <ndtxt.hxx>
#include <vcl/lstbox.hxx>
#include <cmdid.h>
#include <globals.hrc>
-#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN
+#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN
#include <view.hrc>
#include <hhcwrp.hxx>
#include <com/sun/star/frame/XStorable.hpp>
@@ -113,7 +113,7 @@ using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::smarttags;
/*--------------------------------------------------------------------
- Beschreibung: Lingu-Dispatcher
+ Beschreibung: Lingu-Dispatcher
--------------------------------------------------------------------*/
void SwView::ExecLingu(SfxRequest &rReq)
{
@@ -144,7 +144,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
{
- // initialize dialog
+ // initialize dialog
Reference< awt::XWindow > xDialogParentWindow(0);
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
@@ -252,7 +252,7 @@ void SwView::StartTextConversion(
{
return;
}
-
+
SpellKontext(sal_True);
const SwViewOption* pVOpt = pWrtShell->GetViewOptions();
@@ -475,7 +475,7 @@ void SwView::HyphenateDocument()
Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() );
- pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig
+ pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig
sal_Bool bHyphSpecial = xProp.is() ?
*(sal_Bool*)xProp->getPropertyValue( C2U(UPN_IS_HYPH_SPECIAL) ).getValue() : sal_False;
@@ -517,11 +517,11 @@ bool SwView::IsValidSelectionForThesaurus() const
{
// must not be a multi-selection, and if it is a selection it needs
// to be within a single paragraph
-
+
const bool bMultiSel = pWrtShell->GetCrsr() != pWrtShell->GetCrsr()->GetNext();
const sal_Bool bSelection = ((SwCrsrShell*)pWrtShell)->HasSelection();
return !bMultiSel && (!bSelection || pWrtShell->IsSelOnePara() );
-}
+}
String SwView::GetThesaurusLookUpText( bool bSelection ) const
{
@@ -569,10 +569,10 @@ void SwView::InsertThesaurusSynonym( const String &rSynonmText, const String &rL
pWrtShell->EndAllAction();
pWrtShell->SetInsMode( bOldIns );
-}
+}
/*--------------------------------------------------------------------
- Beschreibung: Thesaurus starten
+ Beschreibung: Thesaurus starten
--------------------------------------------------------------------*/
void SwView::StartThesaurus()
{
@@ -611,9 +611,9 @@ void SwView::StartThesaurus()
else
{
// create dialog
- { //Scope for SwWait-Object
+ { //Scope for SwWait-Object
SwWait aWait( *GetDocShell(), sal_True );
- // load library with dialog only on demand ...
+ // load library with dialog only on demand ...
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp, eLang );
}
@@ -628,7 +628,7 @@ void SwView::StartThesaurus()
}
/*--------------------------------------------------------------------
- Beschreibung: Online-Vorschlaege anbieten
+ Beschreibung: Online-Vorschlaege anbieten
*--------------------------------------------------------------------*/
//!! Start of extra code for context menu modifying extensions
struct ExecuteInfo
@@ -641,7 +641,7 @@ struct ExecuteInfo
class AsyncExecute
{
public:
- DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* );
};
IMPL_STATIC_LINK_NOINSTANCE( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
@@ -698,7 +698,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
aMessageText = aGrammarCheckRes.aErrors[ nErrorInResult ].aShortComment;
// we like to use the grammar checking context menu if we either get
// some suggestions or at least a comment about the error found...
- bUseGrammarContext = bCorrectionRes &&
+ bUseGrammarContext = bCorrectionRes &&
(aSuggestions.getLength() > 0 || aMessageText.getLength() > 0);
}
@@ -709,11 +709,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
// get paragraph text
String aParaText;
SwPosition aPoint( *pWrtShell->GetCrsr()->GetPoint() );
- const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >(
+ const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >(
&aPoint.nNode.GetNode() );
if (pNode)
- aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok
- else
+ aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok
+ else
{
OSL_ENSURE(false, "text node expected but not found" );
}
@@ -737,11 +737,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
aEvent.ExecutePosition.Y = aPixPos.Y();
Menu* pMenu = 0;
- ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii(
+ ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii(
bUseGrammarContext ? "private:resource/GrammarContextMenu" : "private:resource/SpellContextMenu");
if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent ))
{
-
+
//! happy hacking for context menu modifying extensions of this
//! 'custom made' menu... *sigh* (code copied from sfx2 and framework)
if ( pMenu )
@@ -770,7 +770,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
uno::Reference< util::XURLTransformer > xURLTransformer;
if (xMgr.is())
{
- xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance(
+ xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance(
C2U("com.sun.star.util.URLTransformer")), UNO_QUERY);
}
@@ -779,7 +779,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
uno::Sequence< beans::PropertyValue > aArgs;
xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 );
-
+
if (xDispatch.is())
{
// Execute dispatch asynchronously
@@ -789,12 +789,12 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
pExecuteInfo->aArgs = aArgs;
Application::PostUserEvent( STATIC_LINK(0, AsyncExecute , ExecuteHdl_Impl), pExecuteInfo );
}
- }
+ }
catch (Exception &)
{
- }
+ }
}
- }
+ }
else
{
pPopup->Execute( aToFill.SVRect(), pEditWin );
@@ -826,9 +826,9 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
// This data structure maps a smart tag type string to the property bag
SwRect aToFill;
Sequence< rtl::OUString > aSmartTagTypes;
- Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps;
+ Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps;
Reference<text::XTextRange> xRange;
-
+
pWrtShell->GetSmartTagTerm( rPt, aToFill, aSmartTagTypes, aStringKeyMaps, xRange);
if ( xRange.is() && aSmartTagTypes.getLength() )
{
@@ -860,17 +860,17 @@ public:
void *GetImplWin() {
return NULL; //FIXME!!!
-// return mpImplWin;
+// return mpImplWin;
}
protected:
virtual void LoseFocus() {
-// printf("ListBox: lose focus!!\n");
+// printf("ListBox: lose focus!!\n");
ListBox::LoseFocus();
- }
+ }
virtual void Select() {
-// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect());
+// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect());
ListBox::Select();
}
};
@@ -912,10 +912,10 @@ public:
aText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cancel")));
Size tSize=aText.GetOptimalSize(WINDOWSIZE_PREFERRED);
aText.SetSizePixel(Size(lbSize.Width(), tSize.Height()));
- aText.SetPosPixel(Point(0, lbSize.Height()));
+ aText.SetPosPixel(Point(0, lbSize.Height()));
aText.Show();
- SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height()));
-// SetSizePixel(Size(200, 200));
+ SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height()));
+// SetSizePixel(Size(200, 200));
}
int getSelection() {
@@ -934,10 +934,10 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt ) {
if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) {
EndDialog(8);
- return 1;
+ return 1;
}
if (rNEvt.GetType() == EVENT_KEYINPUT) {
-// printf("PreNotify::KEYINPUT\n");
+// printf("PreNotify::KEYINPUT\n");
}
return Dialog::PreNotify(rNEvt);
}
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 04309b9821a1..158fc595da66 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -66,7 +66,7 @@
#include <IDocumentSettingAccess.hxx>
#include <PostItMgr.hxx>
-USHORT SwView::nMoveType = NID_PGE;
+USHORT SwView::nMoveType = NID_PGE;
sal_Int32 SwView::nActMark = 0;
@@ -117,7 +117,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
const MapMode aTmpMap( MAP_TWIP );
const Size aWindowSize( GetEditWin().PixelToLogic( rEditSize, aTmpMap ) );
- if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten
+ if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten
{
const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace();
aPageSize.Width() += Abs( long(rLeftLRSpace.GetLeft()) - long(rLRSpace.GetLeft()) );
@@ -165,10 +165,10 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
//MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen
//View updaten.
if ( !bViewOnly &&
- (USHORT(nFac) != pUsrPref->GetZoom() ||
+ (USHORT(nFac) != pUsrPref->GetZoom() ||
BYTE (eZoomType) != pUsrPref->GetZoomType()) )
{
- pUsrPref->SetZoom ( USHORT(nFac) );
+ pUsrPref->SetZoom ( USHORT(nFac) );
pUsrPref->SetZoomType( eZoomType );
SW_MOD()->ApplyUsrPref( *pUsrPref,
bViewOnly ? this: 0,
@@ -177,7 +177,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
}
if ( pOpt->GetZoom() != (USHORT) nFac )
{
- aOpt.SetZoom ( USHORT(nFac) );
+ aOpt.SetZoom ( USHORT(nFac) );
aOpt.SetReadonly(pOpt->IsReadonly());
pWrtShell->ApplyViewOptions( aOpt );
}
@@ -204,11 +204,11 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
// OS: Notloesung - in CalcVisArea wird u.U. wieder SetZoom gerufen und
// dann werden falsche Werte eingestellt
((SwViewOption*)pWrtShell->GetViewOptions())->SetZoomType( eZoomType );
- CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches
+ CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches
}
else if ( USHORT(nFac) != pOpt->GetZoom() )
{
- aOpt.SetZoom ( USHORT(nFac) );
+ aOpt.SetZoom ( USHORT(nFac) );
pWrtShell->ApplyViewOptions( aOpt );
}
@@ -230,7 +230,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
// mpPostItMgr->LayoutPostIts();
// }
-// eZoom = eZoomType;
+// eZoom = eZoomType;
}
void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly )
@@ -355,9 +355,9 @@ int SwView::_CreateScrollbar( BOOL bHori )
void SwView::CreatePageButtons(BOOL bShow)
{
Window *pMDI = &GetViewFrame()->GetWindow();
- pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE );
+ pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE );
pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP);
- pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE );
+ pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE );
pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN);
Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface();
pNaviBtn = new SwNaviImageButton(pMDI, xFrame );
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 2e92bc864234..4bdd79d27de0 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -2,7 +2,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
@@ -99,7 +99,7 @@ void lcl_GetPos(SwView* pView,
long lDelta = lPos - rSh.VisArea().Pos().*pPt;
const long lSize = aDocSz.*pSz + lBorder;
// Bug 11693: sollte rechts oder unten zuviel Wiese sein, dann muss
- // diese von der VisArea herausgerechnet werden!
+ // diese von der VisArea herausgerechnet werden!
long nTmp = pView->GetVisArea().Right()+lDelta;
if ( bHori && nTmp > lSize )
lDelta -= nTmp - lSize;
@@ -113,7 +113,7 @@ void lcl_GetPos(SwView* pView,
}
/*--------------------------------------------------------------------
- Beschreibung: Nullpunkt Lineal setzen
+ Beschreibung: Nullpunkt Lineal setzen
--------------------------------------------------------------------*/
void SwView::InvalidateRulerPos()
{
@@ -136,7 +136,7 @@ void SwView::InvalidateRulerPos()
}
/*--------------------------------------------------------------------
- Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen
+ Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen
viertel Bildschirm bis vor das Ende des Dokumentes
gescrollt werden kann.
--------------------------------------------------------------------*/
@@ -154,7 +154,7 @@ long SwView::SetVScrollMax( long lMax )
{
const long lBorder = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2;
long lSize = GetDocSz().Height() + lBorder - aVisArea.GetHeight();
- return Max( Min( lMax, lSize), 0L ); // siehe horz.
+ return Max( Min( lMax, lSize), 0L ); // siehe horz.
}
Point SwView::AlignToPixel(const Point &rPt) const
@@ -163,7 +163,7 @@ Point SwView::AlignToPixel(const Point &rPt) const
}
/*--------------------------------------------------------------------
- Beschreibung: Dokumentgroesse hat sich geaendert
+ Beschreibung: Dokumentgroesse hat sich geaendert
--------------------------------------------------------------------*/
void SwView::DocSzChgd(const Size &rSz)
{
@@ -173,7 +173,7 @@ extern int bDocSzUpdated;
aDocSz = rSz;
- if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung
+ if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung
{
bDocSzUpdated = FALSE;
return;
@@ -213,13 +213,13 @@ aDocSz = rSz;
}
/*--------------------------------------------------------------------
- Beschreibung: Visarea neu setzen
+ Beschreibung: Visarea neu setzen
--------------------------------------------------------------------*/
void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
{
const Size aOldSz( aVisArea.GetSize() );
- const Point aTopLeft( AlignToPixel( rRect.TopLeft() ));
+ const Point aTopLeft( AlignToPixel( rRect.TopLeft() ));
const Point aBottomRight( AlignToPixel( rRect.BottomRight() ));
Rectangle aLR( aTopLeft, aBottomRight );
@@ -306,7 +306,7 @@ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar )
}
/*--------------------------------------------------------------------
- Beschreibung: Pos VisArea setzen
+ Beschreibung: Pos VisArea setzen
--------------------------------------------------------------------*/
void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar )
{
@@ -318,7 +318,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar )
//mal sehen wie weit wir mit der halben BrushSize kommen.
//TODO: why BRUSH_SIZE?
Point aPt( rPt );
-// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE;
+// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE;
const long nTmp = GetWrtShell().IsFrameView() ? 4 : 8;
aPt = GetEditWin().LogicToPixel( aPt );
aPt.X() -= aPt.X() % nTmp;
@@ -329,7 +329,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar )
return;
const long lXDiff = aVisArea.Left() - aPt.X();
- const long lYDiff = aVisArea.Top() - aPt.Y();
+ const long lYDiff = aVisArea.Top() - aPt.Y();
SetVisArea( Rectangle( aPt,
Point( aVisArea.Right() - lXDiff, aVisArea.Bottom() - lYDiff ) ),
bUpdateScrollbar);
@@ -353,13 +353,13 @@ void SwView::CheckVisArea()
}
/*--------------------------------------------------------------------
- Beschreibung: Sichtbaren Bereich berechnen
+ Beschreibung: Sichtbaren Bereich berechnen
- OUT Point *pPt: neue Position des sichtbaren
+ OUT Point *pPt: neue Position des sichtbaren
Bereiches
- IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen
+ IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen
sichtbaren Bereiches befinden soll
- USHORT nRange optional exakte Angabe des Bereiches,
+ USHORT nRange optional exakte Angabe des Bereiches,
um den ggfs. gescrollt werden soll
--------------------------------------------------------------------*/
void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
@@ -377,12 +377,12 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
pPt->Y() = rRect.Top();
pPt->Y() = Max( lMin, pPt->Y() );
}
- else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben
+ else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben
{
pPt->Y() = rRect.Top() - (nRangeY != USHRT_MAX ? nRangeY : nYScroll);
pPt->Y() = Max( lMin, pPt->Y() );
}
- else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten
+ else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten
{
pPt->Y() = rRect.Bottom() -
(aVisArea.GetHeight()) + ( nRangeY != USHRT_MAX ?
@@ -390,14 +390,14 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
pPt->Y() = SetVScrollMax( pPt->Y() );
}
long nXScroll = GetXScroll();
- if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts
+ if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts
{
pPt->X() = rRect.Right() -
(aVisArea.GetWidth()) +
(nRangeX != USHRT_MAX ? nRangeX : nXScroll);
pPt->X() = SetHScrollMax( pPt->X() );
}
- else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links
+ else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links
{
pPt->X() = rRect.Left() - (nRangeX != USHRT_MAX ? nRangeX : nXScroll);
pPt->X() = Max( ::GetLeftMargin( *this ) + nLeftOfst, pPt->X() );
@@ -407,7 +407,7 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
}
/*--------------------------------------------------------------------
- Beschreibung: Scrolling
+ Beschreibung: Scrolling
--------------------------------------------------------------------*/
BOOL SwView::IsScroll( const Rectangle &rRect ) const
{
@@ -446,7 +446,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY )
if ( nTopDiff < nBottomDiff )
{
if ( nBottomDiff > 0 ) // Ist unterhalb ueberhaupt Platz?
- { // dann verschieben wir die Oberkante und merken uns dies
+ { // dann verschieben wir die Oberkante und merken uns dies
nDiffY = aDlgRect.Bottom() - aVisArea.Top();
aVisArea.Top() += nDiffY;
}
@@ -518,7 +518,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY )
aPnt.Y() += ( rRect.Top() + rRect.Bottom()
- aVisArea.Top() - aVisArea.Bottom() ) / 2 - nDiffY;
// ... in X-Richtung nur, wenn das Rechteck rechts oder links aus der
- // VisArea hinausragt.
+ // VisArea hinausragt.
if ( rRect.Right() > aVisArea.Right() || rRect.Left() < aVisArea.Left() )
{
aPnt.X() += ( rRect.Left() + rRect.Right()
@@ -537,7 +537,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY )
}
/*--------------------------------------------------------------------
- Beschreibung: Seitenweises Scrollen
+ Beschreibung: Seitenweises Scrollen
Liefern den Wert, um den bei PageUp / -Down gescrollt werden soll
--------------------------------------------------------------------*/
BOOL SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
@@ -674,7 +674,7 @@ long SwView::PageDownCrsr(BOOL bSelect)
}
/*------------------------------------------------------------------------
- Beschreibung: Handler der Scrollbars
+ Beschreibung: Handler der Scrollbars
------------------------------------------------------------------------*/
IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
{
@@ -689,7 +689,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
{
//Hier wieder auskommentieren wenn das mitscrollen nicht gewuenscht ist.
// JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
- // so we dont must do it agin.
+ // so we dont must do it agin.
EndScrollHdl(pScrollbar);
Point aPos( aVisArea.TopLeft() );
@@ -702,9 +702,9 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
if(pWrtShell->GetPageNumber( aPos.Y(), FALSE, nPhNum, nVirtNum, sDisplay ))
{
// JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
- // so we dont must do it agin.
+ // so we dont must do it agin.
// if(!GetViewFrame()->GetFrame().IsInPlace())
-// S F X_BINDINGS().Update(FN_STAT_PAGE);
+// S F X_BINDINGS().Update(FN_STAT_PAGE);
//QuickHelp:
if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() )
@@ -716,8 +716,8 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
pScrollbar->GetPosPixel() ).X() -8;
aRect.Top() = pScrollbar->OutputToScreenPixel(
pScrollbar->GetPointerPosPixel() ).Y();
- aRect.Right() = aRect.Left();
- aRect.Bottom() = aRect.Top();
+ aRect.Right() = aRect.Left();
+ aRect.Bottom() = aRect.Top();
String sPageStr( GetPageStr( nPhNum, nVirtNum, sDisplay ));
SwContentAtPos aCnt( SwContentAtPos::SW_OUTLINE );
@@ -748,7 +748,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler der Scrollbars
+ Beschreibung: Handler der Scrollbars
------------------------------------------------------------------------*/
IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
{
@@ -807,8 +807,8 @@ void SwView::CalcVisArea( const Size &rOutPixel )
const long lHeight = GetWrtShell().GetDocSize().Height() + lBorder;
if ( aRect.Bottom() > lHeight )
{
- long lDelta = aRect.Bottom() - lHeight;
- aRect.Top() -= lDelta;
+ long lDelta = aRect.Bottom() - lHeight;
+ aRect.Top() -= lDelta;
aRect.Bottom() -= lDelta;
}
}
@@ -818,7 +818,7 @@ void SwView::CalcVisArea( const Size &rOutPixel )
}
/*--------------------------------------------------------------------
- Beschreibung: Bedienelemente neu anordnen
+ Beschreibung: Bedienelemente neu anordnen
--------------------------------------------------------------------*/
void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ )
{
@@ -911,7 +911,7 @@ void ViewResizePixel( const Window &rRef,
if(!aSize.Height())
aSize.Height() = pHLineal->GetSizePixel().Height();
pHLineal->SetPosSizePixel( rOfst, aSize );
-// #46802 VCL ruft an unsichtbaren Fenstern kein Resize
+// #46802 VCL ruft an unsichtbaren Fenstern kein Resize
// fuer das Lineal ist das aber keine gute Idee
if(!pHLineal->IsVisible())
pHLineal->Resize();
@@ -958,7 +958,7 @@ void ViewResizePixel( const Window &rRef,
if(!bHidePageButtons)
aSize.Height() -= nSubSize;
else
- aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird
+ aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird
if ( nHBSzHeight )
aSize.Height() -= nHBSzHeight;
@@ -981,7 +981,7 @@ void ViewResizePixel( const Window &rRef,
aScrollFillPos.X() = aPos.X();
rScrollBarBox.SetPosSizePixel( aScrollFillPos,
- Size( nHBSzHeight, nVBSzWidth) );
+ Size( nHBSzHeight, nVBSzWidth) );
}
}
}
@@ -1052,7 +1052,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
const Fraction aFrac( nZoom, 100 );
pVRuler->SetZoom( aFrac );
pHRuler->SetZoom( aFrac );
- InvalidateRulerPos(); //Inhalt invalidieren.
+ InvalidateRulerPos(); //Inhalt invalidieren.
}
//CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down
//nicht mehr zum aktuell sichtbaren Bereich passen
@@ -1080,7 +1080,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
// FME 22.08.2003 #i16909# - return, if no size (caused by minimize window).
if ( bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) )
return;
- bInOuterResizePixel = TRUE;
+ bInOuterResizePixel = TRUE;
// feststellen, ob Scrollbars angezeigt werden duerfen
BOOL bBrowse = pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
@@ -1151,7 +1151,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
ShowAtResize();
if( pHRuler->IsVisible() || pVRuler->IsVisible() )
- InvalidateRulerPos(); //Inhalt invalidieren.
+ InvalidateRulerPos(); //Inhalt invalidieren.
//CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down
//nicht mehr zum aktuell sichtbaren Bereich passen
@@ -1187,7 +1187,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
//Nicht endlosschleifen. Moeglichst dann stoppen wenn die
//(Auto-)Scrollbars sichtbar sind.
- if ( bRepeat &&
+ if ( bRepeat &&
( nCnt > 10 || ( nCnt > 3 && bHAuto && bAuto ) )
)
{
@@ -1304,7 +1304,7 @@ BOOL SwView::UpdateScrollbars()
void SwView::Move()
{
if ( GetWrtShell().IsInSelect() )
- GetWrtShell().EndSelect(); //#32427#
+ GetWrtShell().EndSelect(); //#32427#
SfxViewShell::Move();
}
@@ -1324,7 +1324,7 @@ BOOL SwView::HandleWheelCommands( const CommandEvent& rCEvt )
bOk = TRUE;
}
else
- {
+ {
if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((ULONG)0xFFFFFFFF) == pWData->GetScrollLines()))
{
if (pWData->GetDelta()<0)
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 3366fa80db6f..878cb0ff2cae 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -2,7 +2,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
@@ -93,7 +93,7 @@
using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Drucker an Sfx uebergeben
+ Beschreibung: Drucker an Sfx uebergeben
--------------------------------------------------------------------*/
SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate )
{
@@ -109,7 +109,7 @@ SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate )
}
/*--------------------------------------------------------------------
- Beschreibung: Druckerwechsel weitermelden
+ Beschreibung: Druckerwechsel weitermelden
--------------------------------------------------------------------*/
void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb )
{
@@ -168,7 +168,7 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool )
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage fuer applikationsspezifische Druckoptionen
+ Beschreibung: TabPage fuer applikationsspezifische Druckoptionen
--------------------------------------------------------------------*/
SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent,
const SfxItemSet& rSet)
@@ -177,17 +177,17 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent,
}
/*--------------------------------------------------------------------
- Beschreibung: Druckerdialog
+ Beschreibung: Druckerdialog
--------------------------------------------------------------------*/
PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh )
{
PrintDialog *pDlg = new PrintDialog( pParent, false );
-// pDlg->ChangeFirstPage( 1 );
+// pDlg->ChangeFirstPage( 1 );
if ( !nPg )
nPg = 1;
-// pDlg->ChangeLastPage( nPg );
-// pDlg->ChangeMaxPage( 9999 );
+// pDlg->ChangeLastPage( nPg );
+// pDlg->ChangeMaxPage( 9999 );
pDlg->EnableRange( PRINTDIALOG_FROMTO );
if (pSh && (pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected()))
@@ -202,13 +202,13 @@ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh )
PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent )
{
// AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden,
- // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie
- // bisher (auch beim SWG 2.0) physikalische beachtet werden.
+ // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie
+ // bisher (auch beim SWG 2.0) physikalische beachtet werden.
return ::CreatePrintDialog( pParent, GetWrtShell().GetPhyPageNum(), &GetWrtShell() );
}
/*--------------------------------------------------------------------
- Beschreibung: Print-Dispatcher
+ Beschreibung: Print-Dispatcher
--------------------------------------------------------------------*/
void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
{
@@ -277,7 +277,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
short nBtn = SvxPrtQryBox(&GetEditWin()).Execute();
if( RET_CANCEL == nBtn )
return;;
-
+
if( RET_OK == nBtn )
bPrintSelection = true;
}
@@ -301,7 +301,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq)
}
/*--------------------------------------------------------------------
- Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und
+ Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und
SwPagePreview
--------------------------------------------------------------------*/
SfxTabPage* CreatePrintOptionsPage( Window *pParent,
@@ -343,10 +343,10 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb )
// Applikationseigene Druckoptionen in SfxPrinter schiessen
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData);
SfxItemSet aSet( pSh->GetAttrPool(),
- FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
- SID_HTML_MODE, SID_HTML_MODE,
- SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
- SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
+ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
+ SID_HTML_MODE, SID_HTML_MODE,
+ SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
+ SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0 );
utl::MiscCfg aMisc;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 2342a75c8aa7..dc114248040f 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -54,7 +54,7 @@
#include <workctrl.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <uitool.hxx>
#include <cmdid.h>
#include <docsh.hxx>
@@ -72,12 +72,12 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::i18n;
-#define SRCH_ATTR_OFF 0
+#define SRCH_ATTR_OFF 0
#define SRCH_ATTR_ON 1
#define SRCH_ATTR_SET 2
/*--------------------------------------------------------------------
- Beschreibung: Search Parameter
+ Beschreibung: Search Parameter
--------------------------------------------------------------------*/
struct SwSearchOptions
@@ -243,7 +243,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
// 1) Selektion ersetzen (nicht. wenn nur Attribute ersetzt
// werden sollen)
//JP 27.04.95: warum ?
-// was ist, wenn man das gefundene nur attributieren will??
+// was ist, wenn man das gefundene nur attributieren will??
USHORT nCmd = SVX_SEARCHCMD_FIND;
if( pSrchItem->GetReplaceString().Len() ||
@@ -307,7 +307,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
bExtra = FALSE;
ULONG nFound;
- { //Scope for SwWait-Object
+ { //Scope for SwWait-Object
SwWait aWait( *GetDocShell(), TRUE );
pWrtShell->StartAllAction();
nFound = FUNC_Search( aOpts );
@@ -352,44 +352,44 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
{
static const USHORT aNormalAttr[] =
{
-/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP,
-/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE,
-/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE,
-/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK,
-/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND,
-/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE,
-/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF,
+/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP,
+/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE,
+/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE,
+/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK,
+/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND,
+/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE,
+/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF,
// insert position for CJK/CTL attributes!
-/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE,
-/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER,
-/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN,
-/*20 */ RES_LR_SPACE, RES_UL_SPACE,
-/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
-/*24 */ 0
+/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE,
+/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER,
+/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN,
+/*20 */ RES_LR_SPACE, RES_UL_SPACE,
+/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
+/*24 */ 0
};
static const USHORT aCJKAttr[] =
{
- RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT,
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT,
RES_CHRATR_EMPHASIS_MARK, RES_CHRATR_TWO_LINES,
RES_PARATR_SCRIPTSPACE, RES_PARATR_FORBIDDEN_RULES
};
static const USHORT aCTLAttr[] =
{
- RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT
+ RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT
};
SvUShorts aArr( 0, 16 );
- aArr.Insert( aNormalAttr,
+ aArr.Insert( aNormalAttr,
SAL_N_ELEMENTS( aNormalAttr ),
0 );
if( SW_MOD()->GetCTLOptions().IsCTLFontEnabled() )
- aArr.Insert( aCTLAttr,
+ aArr.Insert( aCTLAttr,
SAL_N_ELEMENTS( aCTLAttr ),
14 );
SvtCJKOptions aCJKOpt;
if( aCJKOpt.IsAnyEnabled() )
- aArr.Insert( aCJKAttr,
+ aArr.Insert( aCJKAttr,
SAL_N_ELEMENTS( aCJKAttr ),
14 );
@@ -668,8 +668,8 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
/* -- Seitenumbruch mit Seitenvorlage */
::SfxToSwPageDescAttr( *pWrtShell, *pReplSet );
- if( !pReplSet->Count() ) // schade, die Attribute
- DELETEZ( pReplSet ); // kennen wir nicht
+ if( !pReplSet->Count() ) // schade, die Attribute
+ DELETEZ( pReplSet ); // kennen wir nicht
}
//
@@ -771,16 +771,16 @@ void SwView::StateSearch(SfxItemSet &rSet)
}
break;
-/* case SID_SEARCH_REPLACESET:
+/* case SID_SEARCH_REPLACESET:
case SID_SEARCH_SEARCHSET:
{
static USHORT __READONLY_DATA aSearchAttrRange[] =
{
- RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE,
- RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE,
+ RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE,
+ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE,
RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE,
- RES_LR_SPACE, RES_UL_SPACE,
- SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
+ RES_LR_SPACE, RES_UL_SPACE,
+ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
0
};
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index fdaf59ec4742..e693d8d4cfe4 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -2,7 +2,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
@@ -82,7 +82,7 @@ void SwView::GetState(SfxItemSet &rSet)
switch(nWhich)
{
case FN_EDIT_LINK_DLG:
- if( !pWrtShell->GetLinkManager().GetLinks().Count() )
+ if( !pWrtShell->GetLinkManager().GetLinks().Count() )
rSet.DisableItem(nWhich);
else if( pWrtShell->IsSelFrmMode() &&
pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT))
@@ -126,7 +126,7 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case SID_PRINTDOC:
case SID_PRINTDOCDIRECT:
- GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet );
+ GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet );
break;
case SID_ATTR_PAGE:
case SID_ATTR_PAGE_SIZE:
@@ -158,7 +158,7 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_UNDO:
{
//JP 21.07.98: Bug 53429 - die muss noch nicht vorhanden sein
- // also lasse sie mal anlegen:
+ // also lasse sie mal anlegen:
if( !pShell )
SelectShell();
@@ -293,7 +293,7 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_THESAURUS:
{
SwWrtShell &rSh = GetWrtShell();
- if (2 <= rSh.GetCrsrCnt()) // multi selection?
+ if (2 <= rSh.GetCrsrCnt()) // multi selection?
rSet.DisableItem(nWhich);
else
{
@@ -331,7 +331,7 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_DOCUMENT_COMPARE:
case SID_DOCUMENT_MERGE:
if( GetDocShell()->IsA( SwGlobalDocShell::StaticType() ) ||
-// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )||
+// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )||
(SID_DOCUMENT_MERGE == nWhich && pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength()))
rSet.DisableItem(nWhich);
break;
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 4bb32d3667a9..2ac3c40a47f5 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -2,7 +2,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
@@ -60,8 +60,8 @@
#include "cmdid.h"
#include "viewopt.hxx"
#include "tabcol.hxx"
-#include "frmfmt.hxx" // FrameFormat
-#include "pagedesc.hxx" // Aktuelles Seitenformat
+#include "frmfmt.hxx" // FrameFormat
+#include "pagedesc.hxx" // Aktuelles Seitenformat
#include "wview.hxx"
#include "fmtcol.hxx"
#include "section.hxx"
@@ -77,11 +77,11 @@ using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Debug-Methode
+ Beschreibung: Debug-Methode
--------------------------------------------------------------------*/
/*--------------------------------------------------------------------
- Beschreibung: Columns eintueten
+ Beschreibung: Columns eintueten
--------------------------------------------------------------------*/
void lcl_FillSvxColumn(const SwFmtCol& rCol,
USHORT nTotalWidth,
@@ -122,7 +122,7 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol,
}
/*--------------------------------------------------------------------
- Beschreibung: ColumnItem in ColumnInfo ueberfuehren
+ Beschreibung: ColumnItem in ColumnInfo ueberfuehren
--------------------------------------------------------------------*/
void lcl_ConvertToCols(const SvxColumnItem& rColItem,
USHORT nTotalWidth,
@@ -134,7 +134,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
if(rCols.GetNumCols() != rColItem.Count())
return;
- USHORT nLeft = 0;
+ USHORT nLeft = 0;
SwTwips nSumAll= 0; // Summiere alle Spalten und Raender auf
SwColumns& rArr = rCols.GetColumns();
@@ -147,7 +147,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
USHORT nEnd = static_cast< USHORT >(rColItem[i].nEnd);
if(nStart < nEnd)
nStart = nEnd;
- const USHORT nDiff = nStart - nEnd;
+ const USHORT nDiff = nStart - nEnd;
const USHORT nRight = nDiff / 2;
USHORT nWidth = static_cast< USHORT >(rColItem[i].nEnd - rColItem[i].nStart);
@@ -172,7 +172,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem,
}
/*--------------------------------------------------------------------
- Beschreibung: Tabs loeschen
+ Beschreibung: Tabs loeschen
--------------------------------------------------------------------*/
void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
{
@@ -191,7 +191,7 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
}
/*--------------------------------------------------------------------
- Beschreibung: Seitenrand umdrehen
+ Beschreibung: Seitenrand umdrehen
--------------------------------------------------------------------*/
void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
{
@@ -207,7 +207,7 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
}
/*--------------------------------------------------------------------
- Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die
+ Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die
Spaltentrenner an der gleichen absoluten Position bleiben
--------------------------------------------------------------------*/
void lcl_Scale(long& nVal, long nScale)
@@ -256,21 +256,21 @@ void ResizeFrameCols(SwFmtCol& rCol,
}
/*--------------------------------------------------------------------
- Beschreibung: Hier werden alle Aenderungen der Tableiste
+ Beschreibung: Hier werden alle Aenderungen der Tableiste
wieder in das Modell geschossen
--------------------------------------------------------------------*/
void SwView::ExecTabWin( SfxRequest& rReq )
{
- SwWrtShell &rSh = GetWrtShell();
- const USHORT nFrmType = rSh.IsObjSelected() ?
+ SwWrtShell &rSh = GetWrtShell();
+ const USHORT nFrmType = rSh.IsObjSelected() ?
FRMTYPE_DRAWOBJ :
rSh.GetFrmType(0,TRUE);
- const BOOL bFrmSelection = rSh.IsFrmSelected();
+ const BOOL bFrmSelection = rSh.IsFrmSelected();
const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
- const USHORT nSlot = rReq.GetSlot();
- const USHORT nDescId = rSh.GetCurPageDesc();
+ const USHORT nSlot = rReq.GetSlot();
+ const USHORT nDescId = rSh.GetCurPageDesc();
const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId );
const BOOL bVerticalWriting = rSh.IsInVerticalText();
@@ -290,7 +290,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
rSh.StartAllAction();
BOOL bSect = 0 != (nFrmType & FRMTYPE_COLSECT);
- switch ( nSlot )
+ switch ( nSlot )
{
case SID_ATTR_LONG_LRSPACE:
{
@@ -415,7 +415,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet);
}
else
- { // Seitenraender einstellen
+ { // Seitenraender einstellen
aLR.SetLeft((USHORT)aLongLR.GetLeft());
aLR.SetRight((USHORT)aLongLR.GetRight());
SwapPageMargin( rDesc, aLR );
@@ -505,7 +505,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet);
}
else
- { SwPageDesc aDesc( rDesc );
+ { SwPageDesc aDesc( rDesc );
if ( nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER ))
{
@@ -569,7 +569,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
::MakeDefTabs( nDef, aTabStops );
SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
- if( pColl && pColl->IsAutoUpdateFmt() )
+ if( pColl && pColl->IsAutoUpdateFmt() )
{
SfxItemSet aTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP);
aTmp.Put(aTabStops);
@@ -665,7 +665,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
USHORT nDef = ::GetTabDist(rDefTabs);
::MakeDefTabs( nDef, aTabStops );
- if( pColl && pColl->IsAutoUpdateFmt())
+ if( pColl && pColl->IsAutoUpdateFmt())
{
SfxItemSet aSetTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP);
aSetTmp.Put(aTabStops);
@@ -887,20 +887,20 @@ void SwView::ExecTabWin( SfxRequest& rReq )
}
/*--------------------------------------------------------------------
- Beschreibung: Hier wird der Status der Tableiste ermittelt
+ Beschreibung: Hier wird der Status der Tableiste ermittelt
sprich alle relevanten Attribute an der CursorPos
werden der Tableiste uebermittelt
--------------------------------------------------------------------*/
void SwView::StateTabWin(SfxItemSet& rSet)
{
- SwWrtShell &rSh = GetWrtShell();
+ SwWrtShell &rSh = GetWrtShell();
const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &aTabColFromDocPos : 0;
- const USHORT nFrmType = rSh.IsObjSelected()
+ const USHORT nFrmType = rSh.IsObjSelected()
? FRMTYPE_DRAWOBJ
: rSh.GetFrmType( pPt, TRUE );
- const BOOL bFrmSelection = rSh.IsFrmSelected();
+ const BOOL bFrmSelection = rSh.IsFrmSelected();
const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE);
// PageOffset/Begrenzer
@@ -931,7 +931,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SwapPageMargin( rDesc, aPageLRSpace );
SfxItemSet aCoreSet( GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
- RES_LR_SPACE, RES_UL_SPACE, 0 );
+ RES_LR_SPACE, RES_UL_SPACE, 0 );
// --> OD 2008-01-17 #newlistlevelattrs#
// get also the list level indent values merged as LR-SPACE item, if needed.
rSh.GetCurAttr( aCoreSet, true );
@@ -1280,7 +1280,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
else if ( bHasTable )
{
SwTabCols aTabCols;
- USHORT nNum;
+ USHORT nNum;
if ( 0 != ( bSetTabColFromDoc = IsTabColFromDoc() ) )
{
rSh.GetMouseTabCols( aTabCols, aTabColFromDocPos );
@@ -1448,7 +1448,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.DisableItem(nWhich);
}
else
- { // Spalten auf der Seite
+ { // Spalten auf der Seite
const SwFrmFmt& rMaster = rDesc.GetMaster();
SwFmtCol aCol(rMaster.GetCol());
if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP)
@@ -1568,7 +1568,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
{
// PAGES01
SvxPagePosSizeItem aPagePosSize(
- Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight);
+ Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight);
rSet.Put(aPagePosSize);
break;
@@ -1700,10 +1700,10 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
}
else
- { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen
+ { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen
BOOL bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? TRUE : FALSE;
BOOL bFrame = (nFrmType & FRMTYPE_FLY_ANY) ? TRUE : FALSE;
- BOOL bColSct = (nFrmType & ( bSectOutTbl
+ BOOL bColSct = (nFrmType & ( bSectOutTbl
? FRMTYPE_COLSECTOUTTAB
: FRMTYPE_COLSECT )
) ? TRUE : FALSE;
@@ -1765,7 +1765,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if( bFrame | bColSct )
{
aRectangle.Left() = aRect.Left() - rPageRect.Left() + nStart;
- aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart;
+ aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart;
}
else if(!bBrowse)
{
@@ -1804,9 +1804,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
BYTE nProtect = pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT );
SvxProtectItem aProt(SID_RULER_PROTECT);
- aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0);
- aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0);
- aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0);
+ aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0);
+ aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0);
+ aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0);
rSet.Put(aProt);
}
else
diff --git a/sw/source/ui/uno/RefreshListenerContainer.cxx b/sw/source/ui/uno/RefreshListenerContainer.cxx
index ddfcec93a54d..fe595b76ed63 100644
--- a/sw/source/ui/uno/RefreshListenerContainer.cxx
+++ b/sw/source/ui/uno/RefreshListenerContainer.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index b0b59aa3c044..4b1740ec9105 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -2,7 +2,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
@@ -135,25 +135,25 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
static PropertyInfo aWriterSettingsInfoMap[] =
{
{ RTL_CONSTASCII_STRINGPARAM("ForbiddenCharacters"), HANDLE_FORBIDDEN_CHARS, CPPUTYPE_REFFORBCHARS, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("LinkUpdateMode"), HANDLE_LINK_UPDATE_MODE, CPPUTYPE_INT16, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("FieldAutoUpdate"), HANDLE_FIELD_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ChartAutoUpdate"), HANDLE_CHART_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacing"), HANDLE_ADD_PARA_TABLE_SPACING, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacingAtStart"), HANDLE_ADD_PARA_TABLE_SPACING_AT_START, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("AlignTabStopPosition"), HANDLE_ALIGN_TAB_STOP_POSITION, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("PrinterName"), HANDLE_PRINTER_NAME, CPPUTYPE_OUSTRING, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("PrinterSetup"), HANDLE_PRINTER_SETUP, CPPUTYPE_SEQINT8, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("IsKernAsianPunctuation"), HANDLE_IS_KERN_ASIAN_PUNCTUATION, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("CharacterCompressionType"), HANDLE_CHARACTER_COMPRESSION_TYPE, CPPUTYPE_INT16, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ApplyUserData"), HANDLE_APPLY_USER_DATA, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("LinkUpdateMode"), HANDLE_LINK_UPDATE_MODE, CPPUTYPE_INT16, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("FieldAutoUpdate"), HANDLE_FIELD_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ChartAutoUpdate"), HANDLE_CHART_AUTO_UPDATE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacing"), HANDLE_ADD_PARA_TABLE_SPACING, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("AddParaTableSpacingAtStart"), HANDLE_ADD_PARA_TABLE_SPACING_AT_START, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("AlignTabStopPosition"), HANDLE_ALIGN_TAB_STOP_POSITION, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("PrinterName"), HANDLE_PRINTER_NAME, CPPUTYPE_OUSTRING, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("PrinterSetup"), HANDLE_PRINTER_SETUP, CPPUTYPE_SEQINT8, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("IsKernAsianPunctuation"), HANDLE_IS_KERN_ASIAN_PUNCTUATION, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("CharacterCompressionType"), HANDLE_CHARACTER_COMPRESSION_TYPE, CPPUTYPE_INT16, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ApplyUserData"), HANDLE_APPLY_USER_DATA, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("UpdateFromTemplate"), HANDLE_UPDATE_FROM_TEMPLATE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout"), HANDLE_PRINTER_INDEPENDENT_LAYOUT, CPPUTYPE_INT16, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout"), HANDLE_PRINTER_INDEPENDENT_LAYOUT, CPPUTYPE_INT16, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("IsLabelDocument"), HANDLE_IS_LABEL_DOC, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("AddExternalLeading"), HANDLE_IS_ADD_EXTERNAL_LEADING, CPPUTYPE_BOOLEAN, 0, 0},
@@ -165,7 +165,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM("AddParaSpacingToTableCells"), HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("UseFormerObjectPositioning"), HANDLE_USE_FORMER_OBJECT_POSITIONING, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("UseFormerTextWrapping"), HANDLE_USE_FORMER_TEXT_WRAPPING, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("RedlineProtectionKey"), HANDLE_CHANGES_PASSWORD, CPPUTYPE_SEQINT8, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("RedlineProtectionKey"), HANDLE_CHANGES_PASSWORD, CPPUTYPE_SEQINT8, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("ConsiderTextWrapOnObjPos"), HANDLE_CONSIDER_WRAP_ON_OBJPOS, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("IgnoreFirstLineIndentInNumbering"), HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("DoNotJustifyLinesWithManualBreak"), HANDLE_DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, CPPUTYPE_BOOLEAN, 0, 0},
@@ -187,28 +187,28 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
/*
* As OS said, we don't have a view when we need to set this, so I have to
* find another solution before adding them to this property set - MTG
- { RTL_CONSTASCII_STRINGPARAM("IsGridVisible"), HANDLE_IS_GRID_VISIBLE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("IsSnapToGrid"), HANDLE_IS_SNAP_TO_GRID, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("IsSynchroniseAxes"), HANDLE_IS_SYNCHRONISE_AXES, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("HorizontalGridResolution"), HANDLE_HORIZONTAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("HorizontalGridSubdivision"), HANDLE_HORIZONTAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("VerticalGridResolution"), HANDLE_VERTICAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("VerticalGridSubdivision"), HANDLE_VERTICAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("IsGridVisible"), HANDLE_IS_GRID_VISIBLE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("IsSnapToGrid"), HANDLE_IS_SNAP_TO_GRID, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("IsSynchroniseAxes"), HANDLE_IS_SYNCHRONISE_AXES, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("HorizontalGridResolution"), HANDLE_HORIZONTAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("HorizontalGridSubdivision"), HANDLE_HORIZONTAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("VerticalGridResolution"), HANDLE_VERTICAL_GRID_RESOLUTION, CPPUTYPE_INT32, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("VerticalGridSubdivision"), HANDLE_VERTICAL_GRID_SUBDIVISION, CPPUTYPE_INT16, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowParagraphEnd"), HANDLE_SHOW_PARAGRAPH_END, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowOptionalHyphens"), HANDLE_SHOW_OPTIONAL_HYPHENS, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowSpaces"), HANDLE_SHOW_SPACES, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowTabs"), HANDLE_SHOW_TABS, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowBreaks"), HANDLE_SHOW_BREAKS, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowHiddenText"), HANDLE_SHOW_HIDDEN_TEXT, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowHiddenParagraphs"), HANDLE_SHOW_HIDDEN_PARAGRAPHS, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowParagraphEnd"), HANDLE_SHOW_PARAGRAPH_END, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowOptionalHyphens"), HANDLE_SHOW_OPTIONAL_HYPHENS, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowSpaces"), HANDLE_SHOW_SPACES, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowTabs"), HANDLE_SHOW_TABS, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowBreaks"), HANDLE_SHOW_BREAKS, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowHiddenText"), HANDLE_SHOW_HIDDEN_TEXT, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowHiddenParagraphs"), HANDLE_SHOW_HIDDEN_PARAGRAPHS, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowTextLimitGuide"), HANDLE_SHOW_TEXT_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowSimpleHandles"), HANDLE_SHOW_SIMPLE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowTextLimitGuide"), HANDLE_SHOW_TEXT_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowSimpleHandles"), HANDLE_SHOW_SIMPLE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
+ { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
*/
{ NULL, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
};
@@ -413,7 +413,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
static sal_uInt16 __READONLY_DATA nRange[] =
{
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
- SID_HTML_MODE, SID_HTML_MODE,
+ SID_HTML_MODE, SID_HTML_MODE,
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
0
@@ -681,7 +681,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
{
uno::Sequence< beans::PropertyValue > aInfo;
if ( !( rValue >>= aInfo ) )
- throw lang::IllegalArgumentException(
+ throw lang::IllegalArgumentException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ),
uno::Reference< uno::XInterface >(),
2 );
diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx
index e79aa94db2c0..48ca75ba97d2 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.hxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.hxx
@@ -2,7 +2,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
@@ -53,10 +53,10 @@ class SwXDocumentSettings :
public cppu::OWeakObject
{
protected:
- com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel;
- SwXTextDocument* mpModel;
- SwDocShell* mpDocSh;
- SwDoc* mpDoc;
+ com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel;
+ SwXTextDocument* mpModel;
+ SwDocShell* mpDocSh;
+ SwDoc* mpDoc;
/** the printer should be set only once; since there are several
* printer-related properties, remember the last printer and set it in
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index a498e80a2e5e..03e5e753d60c 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
index 26f7da7579e0..63950a5e0816 100644
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
+++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx
@@ -2,7 +2,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
@@ -60,15 +60,15 @@ static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo()
{
static PropertyInfo aPrintPreviewSettingsMap_Impl[] =
{
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ), HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ), HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ), HANDLE_PRINTSET_PREVIEW_TOP_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ), HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ), HANDLE_PRINTSET_PREVIEW_NUM_ROWS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ), HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
- { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ), HANDLE_PRINTSET_PREVIEW_LANDSCAPE, CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLeftMargin" ), HANDLE_PRINTSET_PREVIEW_LEFT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintRightMargin" ), HANDLE_PRINTSET_PREVIEW_RIGHT_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintTopMargin" ), HANDLE_PRINTSET_PREVIEW_TOP_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintBottomMargin" ),HANDLE_PRINTSET_PREVIEW_BOTTOM_MARGIN, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintHorizontalSpacing" ),HANDLE_PRINTSET_PREVIEW_HORIZONTAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintVerticalSpacing" ), HANDLE_PRINTSET_PREVIEW_VERTICAL_SPACING, CPPUTYPE_INT32, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumRows" ), HANDLE_PRINTSET_PREVIEW_NUM_ROWS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintNumColumns" ), HANDLE_PRINTSET_PREVIEW_NUM_COLUMNS, CPPUTYPE_INT8, PropertyAttribute::MAYBEVOID, 0 },
+ { RTL_CONSTASCII_STRINGPARAM ( "PreviewPrintLandscape" ), HANDLE_PRINTSET_PREVIEW_LANDSCAPE, CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0 },
{ 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
};
return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl );
@@ -89,7 +89,7 @@ SwXPrintPreviewSettings::~SwXPrintPreviewSettings()
Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType )
throw(RuntimeException)
{
- return ::cppu::queryInterface ( rType ,
+ return ::cppu::queryInterface ( rType ,
// OWeakObject interfaces
dynamic_cast< XInterface* >( dynamic_cast< OWeakObject* >(this) ) ,
dynamic_cast< XWeak* >( this ) ,
@@ -120,15 +120,15 @@ void SwXPrintPreviewSettings::_preSetValues ()
mpPreViewData = new SwPagePreViewPrtData;
if ( pConstPrtData )
{
- mpPreViewData->SetLeftSpace ( pConstPrtData->GetLeftSpace() );
- mpPreViewData->SetRightSpace ( pConstPrtData->GetRightSpace() );
- mpPreViewData->SetTopSpace ( pConstPrtData->GetTopSpace() );
- mpPreViewData->SetBottomSpace ( pConstPrtData->GetBottomSpace() );
- mpPreViewData->SetHorzSpace ( pConstPrtData->GetHorzSpace() );
- mpPreViewData->SetVertSpace ( pConstPrtData->GetVertSpace() );
- mpPreViewData->SetRow ( pConstPrtData->GetRow() );
- mpPreViewData->SetCol ( pConstPrtData->GetCol() );
- mpPreViewData->SetLandscape ( pConstPrtData->GetLandscape() );
+ mpPreViewData->SetLeftSpace ( pConstPrtData->GetLeftSpace() );
+ mpPreViewData->SetRightSpace ( pConstPrtData->GetRightSpace() );
+ mpPreViewData->SetTopSpace ( pConstPrtData->GetTopSpace() );
+ mpPreViewData->SetBottomSpace ( pConstPrtData->GetBottomSpace() );
+ mpPreViewData->SetHorzSpace ( pConstPrtData->GetHorzSpace() );
+ mpPreViewData->SetVertSpace ( pConstPrtData->GetVertSpace() );
+ mpPreViewData->SetRow ( pConstPrtData->GetRow() );
+ mpPreViewData->SetCol ( pConstPrtData->GetCol() );
+ mpPreViewData->SetLandscape ( pConstPrtData->GetLandscape() );
}
}
}
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
index 867f4fb30f0c..518f250a5f3f 100644
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
+++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
@@ -2,7 +2,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
@@ -45,8 +45,8 @@ class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet,
{
friend class SwXDocumentSettings;
protected:
- sal_Bool mbPreviewDataChanged;
- SwDoc* mpDoc;
+ sal_Bool mbPreviewDataChanged;
+ SwDoc* mpDoc;
SwPagePreViewPrtData *mpPreViewData;
const SwPagePreViewPrtData *mpConstPreViewData;
diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx
index 3a0bf4be279a..e6c55d11e2f4 100644
--- a/sw/source/ui/uno/detreg.cxx
+++ b/sw/source/ui/uno/detreg.cxx
@@ -2,7 +2,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
@@ -45,8 +45,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
}
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey )
+ void* /*pServiceManager*/,
+ void* pRegistryKey )
{
Reference< ::registry::XRegistryKey >
xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
@@ -76,9 +76,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
- if (
- ( pImplementationName != NULL ) &&
- ( pServiceManager != NULL )
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
)
{
// Define variables which are used in following macros.
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 53359a88176b..254d2e61b32e 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -2,7 +2,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
@@ -56,7 +56,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags;
-#define A2OU(x) OUString::createFromAscii(x)
+#define A2OU(x) OUString::createFromAscii(x)
SwLinguServiceEventListener::SwLinguServiceEventListener()
{
@@ -105,17 +105,17 @@ void SwLinguServiceEventListener::processDictionaryListEvent(
sal_Int16 nEvt = rDicListEvent.nCondensedEvent;
sal_Int16 nSpellWrongFlags =
- DictionaryListEventFlags::ADD_POS_ENTRY |
- DictionaryListEventFlags::DEL_NEG_ENTRY |
- DictionaryListEventFlags::ACTIVATE_POS_DIC |
+ DictionaryListEventFlags::ADD_POS_ENTRY |
+ DictionaryListEventFlags::DEL_NEG_ENTRY |
+ DictionaryListEventFlags::ACTIVATE_POS_DIC |
DictionaryListEventFlags::DEACTIVATE_NEG_DIC;
- sal_Bool bIsSpellWrong = 0 != (nEvt & nSpellWrongFlags);
+ sal_Bool bIsSpellWrong = 0 != (nEvt & nSpellWrongFlags);
sal_Int16 nSpellAllFlags =
- DictionaryListEventFlags::ADD_NEG_ENTRY |
- DictionaryListEventFlags::DEL_POS_ENTRY |
- DictionaryListEventFlags::ACTIVATE_NEG_DIC |
+ DictionaryListEventFlags::ADD_NEG_ENTRY |
+ DictionaryListEventFlags::DEL_POS_ENTRY |
+ DictionaryListEventFlags::ACTIVATE_NEG_DIC |
DictionaryListEventFlags::DEACTIVATE_POS_DIC;
- sal_Bool bIsSpellAll = 0 != (nEvt & nSpellAllFlags);
+ sal_Bool bIsSpellAll = 0 != (nEvt & nSpellAllFlags);
if (bIsSpellWrong || bIsSpellAll)
SW_MOD()->CheckSpellChanges( sal_False, bIsSpellWrong, bIsSpellAll, sal_False );
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 5df50b64a30d..1956fe8b75c9 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index c7b155c5a019..ab62a5d422db 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index c58279ad6192..5d6d3234530a 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -2,7 +2,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
@@ -79,8 +79,8 @@ class SfxFilter;
class SwFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
{
- static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
- static ULONG GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
+ static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
+ static ULONG GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
public:
SwFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
virtual ~SwFilterDetect();
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 8885ca9d82ea..c05d258f6374 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -2,7 +2,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
@@ -140,7 +140,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
SolarMutexGuard aGuard;
uno::Reference< text::XAutoTextGroup > xGroup;
- if ( pGlossaries && hasByName( GroupName ) ) // group name already known?
+ if ( pGlossaries && hasByName( GroupName ) ) // group name already known?
// TRUE = create group if not already available
xGroup = pGlossaries->GetAutoTextGroup( GroupName, TRUE );
@@ -196,7 +196,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName(
for(sal_Int32 nPos = 0; nPos < aGroupName.getLength(); nPos++)
{
sal_Unicode cChar = aGroupName[nPos];
- if( ((cChar >= 'A') && (cChar <= 'Z')) ||
+ if( ((cChar >= 'A') && (cChar <= 'Z')) ||
((cChar >= 'a') && (cChar <= 'z')) ||
((cChar >= '0') && (cChar <= '9')) ||
(cChar == '_') ||
@@ -275,7 +275,7 @@ sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const uno::Sequence< sal_Int8
}
SwXAutoTextGroup::SwXAutoTextGroup(const OUString& rName,
- SwGlossaries* pGlos) :
+ SwGlossaries* pGlos) :
pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_AUTO_TEXT_GROUP)),
pGlossaries(pGlos),
sName(rName),
@@ -814,7 +814,7 @@ void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc )
void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
{
if ( &_rBC == &xDocSh )
- { // it's our document
+ { // it's our document
if ( _rHint.ISA( SfxSimpleHint ) )
{
if ( SFX_HINT_DEINITIALIZING == static_cast< const SfxSimpleHint& >( _rHint ).GetId() )
@@ -1036,8 +1036,8 @@ uno::Reference< container::XNameReplace > SwXAutoTextEntry::getEvents()
const struct SvEventDescription aAutotextEvents[] =
{
- { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
- { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
+ { SW_EVENT_START_INS_GLOSSARY, "OnInsertStart" },
+ { SW_EVENT_END_INS_GLOSSARY, "OnInsertDone" },
{ 0, NULL }
};
diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx
index e6d25ae50a7b..32bb7e7c37f8 100644
--- a/sw/source/ui/uno/unodefaults.cxx
+++ b/sw/source/ui/uno/unodefaults.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx
index 2f61e566231a..48ffa96f74f2 100644
--- a/sw/source/ui/uno/unodefaults.hxx
+++ b/sw/source/ui/uno/unodefaults.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 9bee47d7481c..7f4037680ec2 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -2,7 +2,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
@@ -45,10 +45,10 @@
using namespace ::com::sun::star;
using namespace rtl;
-const char* cURLStart = ".uno:DataSourceBrowser/";
-const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter";
-const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields
-const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text
+const char* cURLStart = ".uno:DataSourceBrowser/";
+const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter";
+const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields
+const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns";//data into text
const char* cURLDocumentDataSource = ".uno:DataSourceBrowser/DocumentDataSource";//current data source of the document
const sal_Char* cInternalDBChangeNotification = ".uno::Writer/DataSourceChanged";
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx
index 30b8c0d79e87..400c2c5be2bc 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/ui/uno/unodoc.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index d009b72b4400..320aab5c033d 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -2,7 +2,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
@@ -62,55 +62,55 @@ extern uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstanc
// xml import
extern uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLImport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLImportContent_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
// xml export (OOo)
extern uno::Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
// xml export (OASIS)
extern uno::Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportContent_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
//API objects
extern uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw();
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 44597ea0cab9..7a11f86a6e23 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -2,7 +2,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
@@ -111,9 +111,9 @@ osl::Mutex & GetMailMergeMutex()
enum CloseResult
{
- eSuccess, // successfully closed
- eVetoed, // vetoed, ownership transfered to the vetoing instance
- eFailed // failed for some unknown reason
+ eSuccess, // successfully closed
+ eVetoed, // vetoed, ownership transfered to the vetoing instance
+ eFailed // failed for some unknown reason
};
static CloseResult CloseModelAndDocSh(
Reference< frame::XModel > &rxModel,
@@ -211,11 +211,11 @@ namespace
class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >
{
protected:
- ::osl::Mutex m_aMutex;
- Reference< util::XCloseable > m_xDocument;
- Timer m_aDeleteTimer;
- String m_sTemporaryFile;
- sal_Int32 m_nPendingDeleteAttempts;
+ ::osl::Mutex m_aMutex;
+ Reference< util::XCloseable > m_xDocument;
+ Timer m_aDeleteTimer;
+ String m_sTemporaryFile;
+ sal_Int32 m_nPendingDeleteAttempts;
public:
DelayedFileDeletion( const Reference< XModel >& _rxModel,
@@ -236,8 +236,8 @@ namespace
DECL_LINK( OnTryDeleteFile, void* );
private:
- DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented
- DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented
+ DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented
+ DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented
};
DBG_NAME( DelayedFileDeletion )
@@ -294,7 +294,7 @@ namespace
m_aDeleteTimer.Start();
}
else
- bSuccess = sal_True; // can't do anything here ...
+ bSuccess = sal_True; // can't do anything here ...
}
catch( const Exception& )
{
@@ -307,7 +307,7 @@ namespace
{
SWUnoHelper::UCB_DeleteFile( m_sTemporaryFile );
aGuard.clear();
- release(); // this should be our last reference, we should be dead after this
+ release(); // this should be our last reference, we should be dead after this
}
return 0L;
}
@@ -325,9 +325,9 @@ namespace
OSL_ENSURE(false, "DelayedFileDeletion::implTakeOwnership: could not revoke the listener!" );
}
- m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds
+ m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds
m_aDeleteTimer.SetTimeoutHdl( LINK( this, DelayedFileDeletion, OnTryDeleteFile ) );
- m_nPendingDeleteAttempts = 3; // try 3 times at most
+ m_nPendingDeleteAttempts = 3; // try 3 times at most
m_aDeleteTimer.Start( );
}
@@ -401,7 +401,7 @@ static BOOL DeleteTmpFile_Impl(
}
}
else
- bRes = TRUE; // file will be deleted delayed
+ bRes = TRUE; // file will be deleted delayed
}
return bRes;
}
@@ -442,7 +442,7 @@ SwXMailMerge::~SwXMailMerge()
{
if (aTmpFileName.Len())
DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName );
- else // there was no temporary file in use
+ else // there was no temporary file in use
{
//! we still need to close the model and doc shell manually
//! because there is no automatism that will do that later.
@@ -740,7 +740,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
}
}
- else // default empty document without URL
+ else // default empty document without URL
{
if (!aCurOutputURL.getLength())
throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) );
@@ -832,7 +832,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
pMgr->SetMailMergeEvtSrc( pOldSrc );
if ( xCurModel.get() != xModel.get() )
- { // in case it was a temporary model -> close it, and delete the file
+ { // in case it was a temporary model -> close it, and delete the file
DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName );
aTmpFileName.Erase();
}
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index d2658ffe93d7..70f8b9978f07 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -2,7 +2,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
@@ -144,36 +144,36 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"), HANDLE_VIEWSET_RASTER_SUBDIVISION_X, CPPUTYPE_INT32, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionY"), HANDLE_VIEWSET_RASTER_SUBDIVISION_Y, CPPUTYPE_INT32, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ShowAnnotations" ), HANDLE_VIEWSET_ANNOTATIONS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"), HANDLE_VIEWSET_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"), HANDLE_VIEWSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowFieldCommands"), HANDLE_VIEWSET_FIELD_COMMANDS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowFootnoteBackground"),HANDLE_VIEWSET_FOOTNOTE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowGraphics"), HANDLE_VIEWSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenText"), HANDLE_VIEWSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriRuler"), HANDLE_VIEWSET_HRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriScrollBar"), HANDLE_VIEWSET_HSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowNonprintingCharacters"),HANDLE_VIEWSET_NONPRINTING_CHARACTERS, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowOnlineLayout"), HANDLE_VIEWSET_ONLINE_LAYOUT , CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowParaBreaks"), HANDLE_VIEWSET_PARA_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowProtectedSpaces"), HANDLE_VIEWSET_PROTECTED_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"), HANDLE_VIEWSET_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"), HANDLE_VIEWSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowFieldCommands"), HANDLE_VIEWSET_FIELD_COMMANDS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowFootnoteBackground"),HANDLE_VIEWSET_FOOTNOTE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowGraphics"), HANDLE_VIEWSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenCharacters"), HANDLE_VIEWSET_HIDDEN_CHARACTERS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenParagraphs"), HANDLE_VIEWSET_HIDDEN_PARAGRAPHS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowHiddenText"), HANDLE_VIEWSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriRuler"), HANDLE_VIEWSET_HRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowHoriScrollBar"), HANDLE_VIEWSET_HSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowIndexMarkBackground"),HANDLE_VIEWSET_INDEX_MARK_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowNonprintingCharacters"),HANDLE_VIEWSET_NONPRINTING_CHARACTERS, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowOnlineLayout"), HANDLE_VIEWSET_ONLINE_LAYOUT , CPPUTYPE_BOOLEAN, PropertyAttribute::MAYBEVOID, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowParaBreaks"), HANDLE_VIEWSET_PARA_BREAKS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowProtectedSpaces"), HANDLE_VIEWSET_PROTECTED_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ShowRulers"), HANDLE_VIEWSET_SHOW_RULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowSoftHyphens"), HANDLE_VIEWSET_SOFT_HYPHENS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowSpaces"), HANDLE_VIEWSET_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowTableBoundaries"), HANDLE_VIEWSET_TABLE_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowTables"), HANDLE_VIEWSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowTabstops"), HANDLE_VIEWSET_TABSTOPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowTextBoundaries"), HANDLE_VIEWSET_TEXT_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowTextFieldBackground"),HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ShowVertRuler"), HANDLE_VIEWSET_VRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowSoftHyphens"), HANDLE_VIEWSET_SOFT_HYPHENS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowSpaces"), HANDLE_VIEWSET_SPACES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowTableBoundaries"), HANDLE_VIEWSET_TABLE_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowTables"), HANDLE_VIEWSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowTabstops"), HANDLE_VIEWSET_TABSTOPS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowTextBoundaries"), HANDLE_VIEWSET_TEXT_BOUNDARIES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowTextFieldBackground"),HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND, CPPUTYPE_BOOLEAN,PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ShowVertRuler"), HANDLE_VIEWSET_VRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ShowVertScrollBar"), HANDLE_VIEWSET_VSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "SmoothScrolling"), HANDLE_VIEWSET_SMOOTH_SCROLLING , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "SolidMarkHandles"), HANDLE_VIEWSET_SOLID_MARK_HANDLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "SmoothScrolling"), HANDLE_VIEWSET_SMOOTH_SCROLLING , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "SolidMarkHandles"), HANDLE_VIEWSET_SOLID_MARK_HANDLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "VerticalRulerMetric"), HANDLE_VIEWSET_VERT_RULER_METRIC , CPPUTYPE_INT32, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0},
{ 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
};
return new ChainablePropertySetInfo ( aViewSettingsMap_Impl );
@@ -183,23 +183,23 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
{
static PropertyInfo aPrintSettingsMap_Impl[] =
{
- { RTL_CONSTASCII_STRINGPARAM ( "PrintAnnotationMode" ), HANDLE_PRINTSET_ANNOTATION_MODE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintBlackFonts" ), HANDLE_PRINTSET_BLACK_FONTS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintControls" ), HANDLE_PRINTSET_CONTROLS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintDrawings" ), HANDLE_PRINTSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintGraphics" ), HANDLE_PRINTSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintAnnotationMode" ), HANDLE_PRINTSET_ANNOTATION_MODE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintBlackFonts" ), HANDLE_PRINTSET_BLACK_FONTS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintControls" ), HANDLE_PRINTSET_CONTROLS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintDrawings" ), HANDLE_PRINTSET_DRAWINGS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintGraphics" ), HANDLE_PRINTSET_GRAPHICS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "PrintHiddenText"), HANDLE_PRINTSET_HIDDEN_TEXT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintLeftPages" ), HANDLE_PRINTSET_LEFT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintPageBackground" ), HANDLE_PRINTSET_PAGE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintProspect" ), HANDLE_PRINTSET_PROSPECT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintLeftPages" ), HANDLE_PRINTSET_LEFT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintPageBackground" ), HANDLE_PRINTSET_PAGE_BACKGROUND , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintProspect" ), HANDLE_PRINTSET_PROSPECT , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "PrintProspectRTL" ), HANDLE_PRINTSET_PROSPECT_RTL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintReversed" ), HANDLE_PRINTSET_REVERSED , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintRightPages" ), HANDLE_PRINTSET_RIGHT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintFaxName" ), HANDLE_PRINTSET_FAX_NAME , CPPUTYPE_OUSTRING, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintTables" ), HANDLE_PRINTSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintReversed" ), HANDLE_PRINTSET_REVERSED , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintRightPages" ), HANDLE_PRINTSET_RIGHT_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintFaxName" ), HANDLE_PRINTSET_FAX_NAME , CPPUTYPE_OUSTRING, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintPaperFromSetup" ), HANDLE_PRINTSET_PAPER_FROM_SETUP , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintTables" ), HANDLE_PRINTSET_TABLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "PrintTextPlaceholder"), HANDLE_PRINTSET_PLACEHOLDER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+ { RTL_CONSTASCII_STRINGPARAM ( "PrintSingleJobs" ), HANDLE_PRINTSET_SINGLE_JOBS , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "PrintEmptyPages" ), HANDLE_PRINTSET_EMPTY_PAGES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
};
@@ -589,7 +589,7 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( Run
return aRet;
}
-SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
+SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
: ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
, pView(pVw)
, mpViewOption ( NULL )
@@ -644,30 +644,30 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_HRULER : mpViewOption->SetViewHRuler(bVal); break;
case HANDLE_VIEWSET_VRULER : mpViewOption->SetViewVRuler(bVal);break;
case HANDLE_VIEWSET_VRULER_RIGHT : mpViewOption->SetVRulerRight(bVal);break;
- case HANDLE_VIEWSET_HSCROLL : mpViewOption->SetViewHScrollBar(bVal);break;
- case HANDLE_VIEWSET_VSCROLL : mpViewOption->SetViewVScrollBar(bVal);break;
+ case HANDLE_VIEWSET_HSCROLL : mpViewOption->SetViewHScrollBar(bVal);break;
+ case HANDLE_VIEWSET_VSCROLL : mpViewOption->SetViewVScrollBar(bVal);break;
case HANDLE_VIEWSET_GRAPHICS : mpViewOption->SetGraphic(bVal);break;
- case HANDLE_VIEWSET_TABLES : mpViewOption->SetTable(bVal); break;
- case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break;
- case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break;
- case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break;
+ case HANDLE_VIEWSET_TABLES : mpViewOption->SetTable(bVal); break;
+ case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break;
+ case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break;
+ case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break;
case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( bVal ); break;
case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
- case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break;
- case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break;
- case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break;
- case HANDLE_VIEWSET_PROTECTED_SPACES : mpViewOption->SetHardBlank(bVal); break;
- case HANDLE_VIEWSET_TABSTOPS : mpViewOption->SetTab(bVal); break;
+ case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break;
+ case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break;
+ case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break;
+ case HANDLE_VIEWSET_PROTECTED_SPACES : mpViewOption->SetHardBlank(bVal); break;
+ case HANDLE_VIEWSET_TABSTOPS : mpViewOption->SetTab(bVal); break;
case HANDLE_VIEWSET_BREAKS : mpViewOption->SetLineBreak(bVal); break;
case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(bVal); break;
case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(bVal); break;
- case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break;
+ case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break;
case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, TRUE); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break;
- case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
- case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break;
+ case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
+ case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break;
case HANDLE_VIEWSET_PREVENT_TIPS : mpViewOption->SetPreventTips(bVal); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(bVal); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : mpViewOption->SetSnap(bVal); break;
@@ -868,29 +868,29 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
case HANDLE_VIEWSET_VRULER : bBoolVal = mpConstViewOption->IsViewVRuler(TRUE);break;
case HANDLE_VIEWSET_VRULER_RIGHT : bBoolVal = mpConstViewOption->IsVRulerRight();break;
case HANDLE_VIEWSET_HSCROLL: bBoolVal = mpConstViewOption->IsViewHScrollBar();break;
- case HANDLE_VIEWSET_VSCROLL: bBoolVal = mpConstViewOption->IsViewVScrollBar();break;
- case HANDLE_VIEWSET_GRAPHICS : bBoolVal = mpConstViewOption->IsGraphic();break;
- case HANDLE_VIEWSET_TABLES : bBoolVal = mpConstViewOption->IsTable(); break;
- case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break;
- case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFldName(); break;
- case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break;
+ case HANDLE_VIEWSET_VSCROLL: bBoolVal = mpConstViewOption->IsViewVScrollBar();break;
+ case HANDLE_VIEWSET_GRAPHICS : bBoolVal = mpConstViewOption->IsGraphic();break;
+ case HANDLE_VIEWSET_TABLES : bBoolVal = mpConstViewOption->IsTable(); break;
+ case HANDLE_VIEWSET_DRAWINGS : bBoolVal = mpConstViewOption->IsDraw(); break;
+ case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal = mpConstViewOption->IsFldName(); break;
+ case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal = mpConstViewOption->IsPostIts(); break;
case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break;
case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal = mpConstViewOption->IsViewMetaChars(); break;
case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break;
case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal = SwViewOption::IsFieldShadings(); break;
- case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal = mpConstViewOption->IsParagraph(sal_True); break;
- case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal = mpConstViewOption->IsSoftHyph(); break;
- case HANDLE_VIEWSET_SPACES : bBoolVal = mpConstViewOption->IsBlank(sal_True); break;
- case HANDLE_VIEWSET_PROTECTED_SPACES : bBoolVal = mpConstViewOption->IsHardBlank(); break;
- case HANDLE_VIEWSET_TABSTOPS : bBoolVal = mpConstViewOption->IsTab(sal_True); break;
+ case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal = mpConstViewOption->IsParagraph(sal_True); break;
+ case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal = mpConstViewOption->IsSoftHyph(); break;
+ case HANDLE_VIEWSET_SPACES : bBoolVal = mpConstViewOption->IsBlank(sal_True); break;
+ case HANDLE_VIEWSET_PROTECTED_SPACES : bBoolVal = mpConstViewOption->IsHardBlank(); break;
+ case HANDLE_VIEWSET_TABSTOPS : bBoolVal = mpConstViewOption->IsTab(sal_True); break;
case HANDLE_VIEWSET_BREAKS : bBoolVal = mpConstViewOption->IsLineBreak(sal_True); break;
case HANDLE_VIEWSET_HIDDEN_TEXT : bBoolVal = mpConstViewOption->IsShowHiddenField(); break;
case HANDLE_VIEWSET_HIDDEN_CHARACTERS : bBoolVal = mpConstViewOption->IsShowHiddenChar(sal_True); break;
- case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break;
+ case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal = mpConstViewOption->IsShowHiddenPara(); break;
case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break;
- case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break;
- case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal = mpConstViewOption->IsSolidMarkHdl(); break;
+ case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break;
+ case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal = mpConstViewOption->IsSolidMarkHdl(); break;
case HANDLE_VIEWSET_PREVENT_TIPS : bBoolVal = mpConstViewOption->IsPreventTips(); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : bBoolVal = mpConstViewOption->IsGridVisible(); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : bBoolVal = mpConstViewOption->IsSnap(); break;
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx
index 91a3d07098e9..12f4736eb10b 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/ui/uno/unomodule.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx
index 84a2b54d6704..405f712da49e 100644
--- a/sw/source/ui/uno/unomodule.hxx
+++ b/sw/source/ui/uno/unomodule.hxx
@@ -2,7 +2,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
@@ -57,16 +57,16 @@ namespace com
}
}
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define XDISPATCH ::com::sun::star::frame::XDispatch
+#define REFERENCE ::com::sun::star::uno::Reference
+#define SEQUENCE ::com::sun::star::uno::Sequence
+#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
+#define REFERENCE ::com::sun::star::uno::Reference
+#define SEQUENCE ::com::sun::star::uno::Sequence
+#define XDISPATCH ::com::sun::star::frame::XDispatch
#define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch
-#define OUSTRING ::rtl::OUString
-#define UNOURL ::com::sun::star::util::URL
-#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
+#define OUSTRING ::rtl::OUString
+#define UNOURL ::com::sun::star::util::URL
+#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
class SwUnoModule : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XServiceInfo >
{
@@ -87,9 +87,9 @@ public:
// XDispatchProvider
virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
- virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
- const OUSTRING & sTargetFrameName,
- sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
+ virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
+ const OUSTRING & sTargetFrameName,
+ sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 1609e78f2cdd..3a9574872941 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -690,7 +690,7 @@ Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor(
return xRet;
}
-SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr)
+SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xCrsr)
{
getText();
XText *const pText = xBodyText.get();
@@ -712,7 +712,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
throw RuntimeException();
Reference< XTextCursor > xCrsr;
- SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr);
+ SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr);
const SwXTextSearch* pSearch = reinterpret_cast<const SwXTextSearch*>(
xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId()));
@@ -788,7 +788,7 @@ Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(vo
/* -----------------26.02.99 16:08-------------------
* wird fuer findAll/First/Next verwendet
* --------------------------------------------------*/
-SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc,
+SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc,
Reference< XTextCursor > & xCrsr, sal_Bool bAll,
sal_Int32& nResult,
Reference< XInterface > xLastResult)
@@ -797,7 +797,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
if(!IsValid() || !xDescTunnel.is() || !xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId()))
return 0;
- SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr);
+ SwUnoCrsr* pUnoCrsr = CreateCursorForSearch(xCrsr);
const SwXTextSearch* pSearch = reinterpret_cast<const SwXTextSearch*>(
xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId()));
@@ -847,11 +847,11 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
/*
* folgende Kombinationen sind erlaubt:
- * - suche einen im Body: -> FND_IN_BODY
- * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL
+ * - suche einen im Body: -> FND_IN_BODY
+ * - suche alle im Body: -> FND_IN_BODYONLY | FND_IN_SELALL
* - suche in Selectionen: einen / alle -> FND_IN_SEL [ | FND_IN_SELALL ]
* - suche im nicht Body: einen / alle -> FND_IN_OTHER [ | FND_IN_SELALL ]
- * - suche ueberall alle: -> FND_IN_SELALL
+ * - suche ueberall alle: -> FND_IN_SELALL
*/
int eRanges(FND_IN_BODY);
if(bParentInExtra)
@@ -872,7 +872,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
- RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
+ RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
0);
pSearch->FillSearchItemSet(aSearch);
BOOL bCancel;
@@ -1418,7 +1418,7 @@ void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell)
bObjectValid = TRUE;
}
-void SwXTextDocument::InitNewDoc()
+void SwXTextDocument::InitNewDoc()
{
// zunaechst alle Collections invalidieren, dann Referenzen loeschen und Null setzen
if(pxXTextTables)
@@ -1701,7 +1701,7 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic
//! For inserting OLE objects the proper way is to use
//! "com.sun.star.text.TextEmbeddedObject"!
if (rServiceName.lastIndexOf( C2U(".OLE2Shape") ) == rServiceName.getLength() - 10)
- throw ServiceNotRegisteredException(); // declare service to be not registered with this factory
+ throw ServiceNotRegisteredException(); // declare service to be not registered with this factory
// --> OD 2006-02-22 #b6382898#
// the XML import is allowed to create instances of com.sun.star.drawing.OLE2Shape.
@@ -3143,7 +3143,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
//get languages from "drawobject"
SwWrtShell *pWrtSh = pDocShell->GetWrtShell();
- SdrView *pSdrView = pWrtSh->GetDrawView();
+ SdrView *pSdrView = pWrtSh->GetDrawView();
if( pSdrView )
{
@@ -3220,12 +3220,12 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) :
pxDoc(&rxDoc)
{
- sTables = String(SW_RES(STR_CONTENT_TYPE_TABLE));
+ sTables = String(SW_RES(STR_CONTENT_TYPE_TABLE));
sFrames = String(SW_RES(STR_CONTENT_TYPE_FRAME));
- sGraphics = String(SW_RES(STR_CONTENT_TYPE_GRAPHIC));
- sOLEs = String(SW_RES(STR_CONTENT_TYPE_OLE));
- sSections = String(SW_RES(STR_CONTENT_TYPE_REGION));
- sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE));
+ sGraphics = String(SW_RES(STR_CONTENT_TYPE_GRAPHIC));
+ sOLEs = String(SW_RES(STR_CONTENT_TYPE_OLE));
+ sSections = String(SW_RES(STR_CONTENT_TYPE_REGION));
+ sOutlines = String(SW_RES(STR_CONTENT_TYPE_OUTLINE));
sBookmarks = String(SW_RES(STR_CONTENT_TYPE_BOOKMARK));
}
@@ -3266,7 +3266,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0));
}
-/* else if(sToCompare == )
+/* else if(sToCompare == )
{
sSuffix += UniString::CreateFromAscii(pMarkToText);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
@@ -3319,7 +3319,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getElementNames(void)
pNames[0] = sTables;
pNames[1] = sFrames ;
pNames[2] = sGraphics;
- pNames[3] = sOLEs ;
+ pNames[3] = sOLEs ;
pNames[4] = sSections;
pNames[5] = sOutlines;
pNames[6] = sBookmarks;
@@ -3330,13 +3330,13 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName)
throw( RuntimeException )
{
String sToCompare(rName);
- if( sToCompare == sTables ||
+ if( sToCompare == sTables ||
sToCompare == sFrames ||
sToCompare == sGraphics||
- sToCompare == sOLEs ||
+ sToCompare == sOLEs ||
sToCompare == sSections ||
sToCompare == sOutlines ||
- sToCompare == sBookmarks )
+ sToCompare == sBookmarks )
return sal_True;
return sal_False;
}
@@ -3579,8 +3579,8 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix)
nImgId = CONTENT_TYPE_FRAME;
else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToGraphic))
nImgId = CONTENT_TYPE_GRAPHIC;
-// else if(== sLinkSuffix)
-// nImgId = CONTENT_TYPE_BOOKMARK;
+// else if(== sLinkSuffix)
+// nImgId = CONTENT_TYPE_BOOKMARK;
else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToRegion))
nImgId = CONTENT_TYPE_REGION;
else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToOLE))
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index d4765157b456..a4c276c8382f 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -2,7 +2,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
@@ -167,7 +167,7 @@ void SwXTextView::Invalidate()
Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeException)
{
-// uno::Sequence< uno::Type > aViewTypes = SwXTextViewBaseClass::getTypes();
+// uno::Sequence< uno::Type > aViewTypes = SwXTextViewBaseClass::getTypes();
uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes();
long nIndex = aBaseTypes.getLength();
@@ -175,12 +175,12 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeExcep
aBaseTypes.getLength() + 8 );
uno::Type* pBaseTypes = aBaseTypes.getArray();
- pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XSelectionSupplier >*)0);
- pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XServiceInfo >*)0);
+ pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XSelectionSupplier >*)0);
+ pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XServiceInfo >*)0);
pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XFormLayerAccess >*)0);
pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XTextViewCursorSupplier>*)0);
- pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XViewSettingsSupplier >*)0);
- pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XRubySelection >*)0);
+ pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XViewSettingsSupplier >*)0);
+ pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XRubySelection >*)0);
pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<XPropertySet >*)0);
pBaseTypes[nIndex++] = ::getCppuType((uno::Reference<datatransfer::XTransferableSupplier >*)0);
return aBaseTypes;
@@ -213,17 +213,17 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType )
throw (RuntimeException)
{
uno::Any aRet;
- if(aType == ::getCppuType((uno::Reference<view::XSelectionSupplier >*)0))
+ if(aType == ::getCppuType((uno::Reference<view::XSelectionSupplier >*)0))
{
uno::Reference<view::XSelectionSupplier> xRet = this;
aRet.setValue(&xRet, aType);
}
- else if(aType == ::getCppuType((uno::Reference<lang::XServiceInfo >*)0))
+ else if(aType == ::getCppuType((uno::Reference<lang::XServiceInfo >*)0))
{
uno::Reference<lang::XServiceInfo> xRet = this;
aRet.setValue(&xRet, aType);
}
- else if(aType == ::getCppuType((uno::Reference<view::XControlAccess >*)0))
+ else if(aType == ::getCppuType((uno::Reference<view::XControlAccess >*)0))
{
uno::Reference<view::XControlAccess> xRet = this;
aRet.setValue(&xRet, aType);
@@ -238,7 +238,7 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType )
uno::Reference<text::XTextViewCursorSupplier> xRet = this;
aRet.setValue(&xRet, aType);
}
- else if(aType == ::getCppuType((uno::Reference<view::XViewSettingsSupplier >*)0))
+ else if(aType == ::getCppuType((uno::Reference<view::XViewSettingsSupplier >*)0))
{
uno::Reference<view::XViewSettingsSupplier> xRet = this;
aRet.setValue(&xRet, aType);
@@ -273,8 +273,8 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
SwDoc* pDoc = GetView()->GetDocShell()->GetDoc();
uno::Reference< lang::XUnoTunnel > xIfcTunnel(xInterface, uno::UNO_QUERY);
uno::Reference< text::XTextCursor > xCrsr(xInterface, uno::UNO_QUERY);
- uno::Reference< container::XIndexAccess > xPosN(xInterface, uno::UNO_QUERY);
- uno::Reference< text::XTextRange > xPos(xInterface, uno::UNO_QUERY);
+ uno::Reference< container::XIndexAccess > xPosN(xInterface, uno::UNO_QUERY);
+ uno::Reference< text::XTextRange > xPos(xInterface, uno::UNO_QUERY);
SwXFrame* pFrame = xIfcTunnel.is() ? reinterpret_cast<SwXFrame*>(
xIfcTunnel->getSomething(SwXFrame::getUnoTunnelId())) : 0;
@@ -434,14 +434,14 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
SvxShape* pSvxShape = 0;
if(pSwXShape)
{
- uno::Reference< uno::XAggregation > xAgg = pSwXShape->GetAggregationInterface();
+ uno::Reference< uno::XAggregation > xAgg = pSwXShape->GetAggregationInterface();
if(xAgg.is())
{
pSvxShape = reinterpret_cast<SvxShape*>(xIfcTunnel->getSomething(SvxShape::getUnoTunnelId()));
}
}
- if ( pSvxShape || xShapeColl.is() ) // Drawing drawing::Layer
+ if ( pSvxShape || xShapeColl.is() ) // Drawing drawing::Layer
{
SdrView* pDrawView = rSh.GetDrawView();
if (pDrawView)
@@ -449,7 +449,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
pDrawView->SdrEndTextEdit();
pDrawView->UnmarkAll();
- if (pSvxShape) // einzelnes Shape
+ if (pSvxShape) // einzelnes Shape
{
SdrObject *pObj = pSvxShape->GetSdrObject();
if (pObj)
@@ -463,7 +463,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
}
}
}
- else // Shape Collection
+ else // Shape Collection
{
sal_Bool bSelected = sal_False;
SdrPageView* pPV = NULL;
@@ -485,7 +485,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
SdrObject *pObj = pShape->GetSdrObject();
if (pObj)
{
- if (!pPV) // erstes Objekt
+ if (!pPV) // erstes Objekt
{
// lcl_ShowObject( *m_pViewSh, *pDrawView, pObj );
pPV = pDrawView->GetSdrPageView();
@@ -554,7 +554,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException )
SwXFrame* pxFrame = (SwXFrame*)SwClientIter((SwFrmFmt&)*pFmt).
First(TYPE(SwXFrame));
- if(pxFrame) //das einzige gemeinsame interface fuer alle Frames
+ if(pxFrame) //das einzige gemeinsame interface fuer alle Frames
{
aRef = uno::Reference< uno::XInterface >((cppu::OWeakObject*)pxFrame, uno::UNO_QUERY);
}
@@ -591,7 +591,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException )
SwXTextDocument* pTextDoc = reinterpret_cast<SwXTextDocument*>(xModelTunnel->
getSomething(SwXTextDocument::getUnoTunnelId()));
- SwFmDrawPage* pSvxDrawPage = pTextDoc->GetDrawPage()->GetSvxPage();
+ SwFmDrawPage* pSvxDrawPage = pTextDoc->GetDrawPage()->GetSvxPage();
uno::Reference< drawing::XShapes > xShCol = new SvxShapeCollection();
const SdrMarkList& rMarkList = rSh.GetDrawView()->GetMarkedObjectList();
@@ -1946,25 +1946,25 @@ sal_Int64 SAL_CALL SwXTextViewCursor::getSomething(
}
IMPLEMENT_FORWARD_XINTERFACE2(SwXTextViewCursor,SwXTextViewCursor_Base,OTextCursorHelper)
-const SwDoc* SwXTextViewCursor::GetDoc() const
+const SwDoc* SwXTextViewCursor::GetDoc() const
{
SwWrtShell& rSh = m_pView->GetWrtShell();
- return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0;
+ return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0;
}
-SwDoc* SwXTextViewCursor::GetDoc()
+SwDoc* SwXTextViewCursor::GetDoc()
{
SwWrtShell& rSh = m_pView->GetWrtShell();
- return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0;
+ return rSh.GetCrsr() ? rSh.GetCrsr()->GetDoc() : 0;
}
-const SwPaM* SwXTextViewCursor::GetPaM() const
+const SwPaM* SwXTextViewCursor::GetPaM() const
{
SwWrtShell& rSh = m_pView->GetWrtShell();
return rSh.GetCrsr();
}
-SwPaM* SwXTextViewCursor::GetPaM()
+SwPaM* SwXTextViewCursor::GetPaM()
{
SwWrtShell& rSh = m_pView->GetWrtShell();
return rSh.GetCrsr();
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 2de34301fe59..11af0bf1da9d 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -108,11 +108,11 @@ static sal_Char __READONLY_DATA sKomma[] = ", ";
SfxItemPresentation SwFmtCharFmt::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
- String& rText,
+ SfxMapUnit eCoreUnit,
+ SfxMapUnit ePresUnit,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -149,9 +149,9 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -177,9 +177,9 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -218,7 +218,7 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres,
}
/*************************************************************************
-|* class SwFmtDrop
+|* class SwFmtDrop
*************************************************************************/
@@ -227,9 +227,9 @@ SfxItemPresentation SwFmtDrop::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
rText.Erase();
switch ( ePres )
@@ -262,7 +262,7 @@ SfxItemPresentation SwFmtDrop::GetPresentation
}
/*************************************************************************
-|* class SwRegisterItem
+|* class SwRegisterItem
*************************************************************************/
@@ -271,9 +271,9 @@ SfxItemPresentation SwRegisterItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ XubString& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -293,7 +293,7 @@ SfxItemPresentation SwRegisterItem::GetPresentation
}
/*************************************************************************
-|* class SwNumRuleItem
+|* class SwNumRuleItem
*************************************************************************/
@@ -302,9 +302,9 @@ SfxItemPresentation SwNumRuleItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- XubString& rText,
+ XubString& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -358,18 +358,18 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation
/******************************************************************************
- * Frame-Attribute:
+ * Frame-Attribute:
******************************************************************************/
SfxItemPresentation SwFmtFrmSize::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
- String& rText,
+ SfxMapUnit eCoreUnit,
+ SfxMapUnit ePresUnit,
+ String& rText,
const IntlWrapper* pIntl
-) const
+) const
{
switch ( ePres )
{
@@ -428,9 +428,9 @@ SfxItemPresentation SwFmtHeader::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -458,9 +458,9 @@ SfxItemPresentation SwFmtFooter::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -485,9 +485,9 @@ SfxItemPresentation SwFmtSurround::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -537,17 +537,17 @@ SfxItemPresentation SwFmtSurround::GetPresentation
//VertOrientation, wie und woran orientiert --
-// sich der FlyFrm in der Vertikalen -----------
+// sich der FlyFrm in der Vertikalen -----------
SfxItemPresentation SwFmtVertOrient::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
- String& rText,
+ SfxMapUnit eCoreUnit,
+ SfxMapUnit ePresUnit,
+ String& rText,
const IntlWrapper* pIntl
-) const
+) const
{
switch ( ePres )
{
@@ -598,17 +598,17 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation
}
//HoriOrientation, wie und woran orientiert --
-// sich der FlyFrm in der Hoizontalen ----------
+// sich der FlyFrm in der Hoizontalen ----------
SfxItemPresentation SwFmtHoriOrient::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
- String& rText,
+ SfxMapUnit eCoreUnit,
+ SfxMapUnit ePresUnit,
+ String& rText,
const IntlWrapper* pIntl
-) const
+) const
{
switch ( ePres )
{
@@ -666,9 +666,9 @@ SfxItemPresentation SwFmtAnchor::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -707,9 +707,9 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -737,11 +737,11 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation
SfxItemPresentation SwFmtCol::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
+ SfxMapUnit eCoreUnit,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* pIntl
-) const
+) const
{
switch ( ePres )
{
@@ -784,9 +784,9 @@ SfxItemPresentation SwFmtURL::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
rText.Erase();
switch ( ePres )
@@ -828,9 +828,9 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
rText.Erase();
switch ( ePres )
@@ -856,9 +856,9 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -895,9 +895,9 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -911,7 +911,7 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
switch( GetValue() )
{
case FTNEND_ATPGORDOCEND:
-// rText = SW_RESSTR( STR_LAYOUT_FTN );
+// rText = SW_RESSTR( STR_LAYOUT_FTN );
break;
case FTNEND_ATTXTEND:
@@ -919,11 +919,11 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
case FTNEND_ATTXTEND_OWNNUMSEQ:
{
-// String sPrefix;
-// String sSuffix;
-// SvxNumberType aFmt;
-// USHORT nOffset;
-// rText +=
+// String sPrefix;
+// String sSuffix;
+// SvxNumberType aFmt;
+// USHORT nOffset;
+// rText +=
}
break;
}
@@ -942,9 +942,9 @@ SfxItemPresentation SwFmtChain::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -979,9 +979,9 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -1013,9 +1013,9 @@ SfxItemPresentation SwTextGridItem::GetPresentation
SfxItemPresentation ePres,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
- String& rText,
+ String& rText,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
switch ( ePres )
{
@@ -1060,7 +1060,7 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation
SfxMapUnit /*ePresUnit*/,
String& /*rText*/,
const IntlWrapper* /*pIntl*/
-) const
+) const
{
// rText.Erase();
// switch ( ePres )
@@ -1098,7 +1098,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation(
case RES_MIRROR_GRAPH_VERT: nId = STR_VERT_MIRROR; break;
case RES_MIRROR_GRAPH_HOR: nId = STR_HORI_MIRROR; break;
case RES_MIRROR_GRAPH_BOTH: nId = STR_BOTH_MIRROR; break;
- default: nId = 0; break;
+ default: nId = 0; break;
}
if ( nId )
{
@@ -1199,10 +1199,10 @@ SfxItemPresentation SwChannelGrf::GetPresentation(
USHORT nId;
switch ( Which() )
{
- case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break;
- case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break;
- case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break;
- default: nId = 0; break;
+ case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break;
+ case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break;
+ case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break;
+ default: nId = 0; break;
}
if( nId )
rText = SW_RESSTR( nId );
@@ -1306,10 +1306,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation(
switch ( GetValue() )
{
- case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break;
+ case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break;
case GRAPHICDRAWMODE_MONO: nId = STR_DRAWMODE_BLACKWHITE; break;
- case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break;
- default: nId = STR_DRAWMODE_STD; break;
+ case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break;
+ default: nId = STR_DRAWMODE_STD; break;
}
(rText = SW_RESSTR( STR_DRAWMODE ) ) += SW_RESSTR( nId );
}
diff --git a/sw/source/ui/utlui/attrdesc.hrc b/sw/source/ui/utlui/attrdesc.hrc
index 1f2c5d34fa37..972f13c278d7 100644
--- a/sw/source/ui/utlui/attrdesc.hrc
+++ b/sw/source/ui/utlui/attrdesc.hrc
@@ -30,81 +30,81 @@
#include "rcid.hrc"
-#define STR_DROP_OVER (RC_ATTR_BEGIN + 1)
-#define STR_DROP_LINES (RC_ATTR_BEGIN + 2)
-#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3)
-#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4)
-#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5)
-#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6)
-#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7)
-#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8)
-#define STR_CHARFMT (RC_ATTR_BEGIN + 9)
-#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10)
-#define STR_FOOTER (RC_ATTR_BEGIN + 11)
-#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12)
-#define STR_HEADER (RC_ATTR_BEGIN + 13)
-#define STR_NO_HEADER (RC_ATTR_BEGIN + 14)
-#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15)
-#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16)
-#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17)
-#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18)
-#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19)
-#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20)
-#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21)
-#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22)
-#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23)
-#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24)
-#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25)
+#define STR_DROP_OVER (RC_ATTR_BEGIN + 1)
+#define STR_DROP_LINES (RC_ATTR_BEGIN + 2)
+#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3)
+#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4)
+#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5)
+#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6)
+#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7)
+#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8)
+#define STR_CHARFMT (RC_ATTR_BEGIN + 9)
+#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10)
+#define STR_FOOTER (RC_ATTR_BEGIN + 11)
+#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12)
+#define STR_HEADER (RC_ATTR_BEGIN + 13)
+#define STR_NO_HEADER (RC_ATTR_BEGIN + 14)
+#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15)
+#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16)
+#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17)
+#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18)
+#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19)
+#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20)
+#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21)
+#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22)
+#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23)
+#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24)
+#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25)
#define STR_FLY_AT_PARA (RC_ATTR_BEGIN + 26)
#define STR_FLY_AS_CHAR (RC_ATTR_BEGIN + 27)
#define STR_FLY_AT_PAGE (RC_ATTR_BEGIN + 28)
-#define STR_POS_X (RC_ATTR_BEGIN + 29)
-#define STR_POS_Y (RC_ATTR_BEGIN + 30)
-#define STR_VERT_TOP (RC_ATTR_BEGIN + 31)
-#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32)
-#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33)
-#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34)
-#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35)
-#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36)
-#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37)
-#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38)
-#define STR_HORI_FULL (RC_ATTR_BEGIN + 39)
-#define STR_COLUMNS (RC_ATTR_BEGIN + 40)
-#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41)
-#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42)
-#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43)
-#define STR_LINE_TOP (RC_ATTR_BEGIN + 44)
-#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45)
-#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46)
-#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47)
-#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48)
-#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49)
-#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50)
-#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51)
-#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52)
-#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53)
-#define STR_CONNECT1 (RC_ATTR_BEGIN + 54)
-#define STR_CONNECT2 (RC_ATTR_BEGIN + 55)
-#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56)
-#define STR_LINECOUNT (RC_ATTR_BEGIN + 57)
-#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58)
-#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59)
+#define STR_POS_X (RC_ATTR_BEGIN + 29)
+#define STR_POS_Y (RC_ATTR_BEGIN + 30)
+#define STR_VERT_TOP (RC_ATTR_BEGIN + 31)
+#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32)
+#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33)
+#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34)
+#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35)
+#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36)
+#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37)
+#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38)
+#define STR_HORI_FULL (RC_ATTR_BEGIN + 39)
+#define STR_COLUMNS (RC_ATTR_BEGIN + 40)
+#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41)
+#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42)
+#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43)
+#define STR_LINE_TOP (RC_ATTR_BEGIN + 44)
+#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45)
+#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46)
+#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47)
+#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48)
+#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49)
+#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50)
+#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51)
+#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52)
+#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53)
+#define STR_CONNECT1 (RC_ATTR_BEGIN + 54)
+#define STR_CONNECT2 (RC_ATTR_BEGIN + 55)
+#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56)
+#define STR_LINECOUNT (RC_ATTR_BEGIN + 57)
+#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58)
+#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59)
-#define STR_LUMINANCE (RC_ATTR_BEGIN + 60)
-#define STR_CHANNELR (RC_ATTR_BEGIN + 61)
-#define STR_CHANNELG (RC_ATTR_BEGIN + 62)
-#define STR_CHANNELB (RC_ATTR_BEGIN + 63)
-#define STR_CONTRAST (RC_ATTR_BEGIN + 64)
-#define STR_GAMMA (RC_ATTR_BEGIN + 65)
-#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66)
-#define STR_INVERT (RC_ATTR_BEGIN + 67)
-#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68)
-#define STR_DRAWMODE (RC_ATTR_BEGIN + 69)
-#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70)
-#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71)
+#define STR_LUMINANCE (RC_ATTR_BEGIN + 60)
+#define STR_CHANNELR (RC_ATTR_BEGIN + 61)
+#define STR_CHANNELG (RC_ATTR_BEGIN + 62)
+#define STR_CHANNELB (RC_ATTR_BEGIN + 63)
+#define STR_CONTRAST (RC_ATTR_BEGIN + 64)
+#define STR_GAMMA (RC_ATTR_BEGIN + 65)
+#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66)
+#define STR_INVERT (RC_ATTR_BEGIN + 67)
+#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68)
+#define STR_DRAWMODE (RC_ATTR_BEGIN + 69)
+#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70)
+#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71)
#define STR_DRAWMODE_BLACKWHITE (RC_ATTR_BEGIN + 72)
#define STR_DRAWMODE_WATERMARK (RC_ATTR_BEGIN + 73)
-#define STR_ROTATION (RC_ATTR_BEGIN + 74)
+#define STR_ROTATION (RC_ATTR_BEGIN + 74)
#define STR_GRID_NONE (RC_ATTR_BEGIN + 75)
#define STR_GRID_LINES_ONLY (RC_ATTR_BEGIN + 76)
#define STR_GRID_LINES_CHARS (RC_ATTR_BEGIN + 77)
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx
index c6241e2f5383..481d2d6678f1 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/ui/utlui/bookctrl.cxx
@@ -2,7 +2,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
@@ -58,10 +58,10 @@ class BookmarkPopup_Impl : public PopupMenu
public:
BookmarkPopup_Impl();
- USHORT GetCurId() const { return nCurId; }
+ USHORT GetCurId() const { return nCurId; }
private:
- USHORT nCurId;
+ USHORT nCurId;
virtual void Select();
};
diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx
index 0a9e81d45141..80ce1bc14ad8 100644
--- a/sw/source/ui/utlui/condedit.cxx
+++ b/sw/source/ui/utlui/condedit.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 1beea561d3fd..0099a982c2a7 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -98,8 +98,8 @@
#include <unomid.h>
-#define CTYPE_CNT 0
-#define CTYPE_CTT 1
+#define CTYPE_CNT 0
+#define CTYPE_CTT 1
using namespace ::std;
using namespace ::com::sun::star;
@@ -108,7 +108,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-#define NAVI_BOOKMARK_DELIM (sal_Unicode)1
+#define NAVI_BOOKMARK_DELIM (sal_Unicode)1
typedef SwContent* SwContentPtr;
SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0,4)
@@ -166,7 +166,7 @@ SwContent::SwContent(const SwContentType* pCnt, const String& rName, long nYPos)
{
}
-sal_uInt8 SwTypeNumber::GetTypeId()
+sal_uInt8 SwTypeNumber::GetTypeId()
{
return nTypeId;
}
@@ -202,7 +202,7 @@ SwTOXBaseContent::~SwTOXBaseContent()
}
/***************************************************************************
- Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell
+ Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell
***************************************************************************/
SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLevel) :
@@ -223,7 +223,7 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe
}
/***************************************************************************
- Beschreibung: Initialisierung
+ Beschreibung: Initialisierung
***************************************************************************/
void SwContentType::Init(sal_Bool* pbInvalidateWindow)
@@ -233,7 +233,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
nMemberCount = 0;
switch(nContentType)
{
- case CONTENT_TYPE_OUTLINE :
+ case CONTENT_TYPE_OUTLINE :
{
sTypeToken = C2S(pMarkToOutline);
sal_uInt16 nOutlineCount = nMemberCount =
@@ -250,7 +250,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
}
break;
- case CONTENT_TYPE_TABLE :
+ case CONTENT_TYPE_TABLE :
sTypeToken = C2S(pMarkToTable);
nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True);
bEdit = sal_True;
@@ -289,7 +289,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
break;
case CONTENT_TYPE_REGION :
{
- SwContentArr* pOldMember = 0;
+ SwContentArr* pOldMember = 0;
sal_uInt16 nOldRegionCount = 0;
sal_Bool bInvalidate = sal_False;
if(!pMember)
@@ -326,7 +326,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
if( !pFmt->GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->Insert(pCnt);//, pMember->Count());
@@ -424,8 +424,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
}
}
/*
- // this code can be used once we want redline comments in the margin
- else // redcomment
+ // this code can be used once we want redline comments in the margin
+ else // redcomment
{
SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster());
if ( pRedline->GetComment().Len() )
@@ -475,7 +475,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
// ... dann koennen die Daten auch nicht mehr gueltig sein
// abgesehen von denen, die schon korrigiert wurden, dann ist
// nOldMemberCount doch nicht so old
- if( nOldMemberCount != nMemberCount )
+ if( nOldMemberCount != nMemberCount )
bDataValid = sal_False;
}
@@ -485,7 +485,7 @@ SwContentType::~SwContentType()
}
/***************************************************************************
- Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen
+ Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen
***************************************************************************/
const SwContent* SwContentType::GetMember(sal_uInt16 nIndex)
@@ -501,7 +501,7 @@ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex)
}
-void SwContentType::Invalidate()
+void SwContentType::Invalidate()
{
bDataValid = sal_False;
}
@@ -510,9 +510,9 @@ void SwContentType::Invalidate()
Beschreibung: Liste der Inhalte fuellen
***************************************************************************/
-void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
+void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
{
- SwContentArr* pOldMember = 0;
+ SwContentArr* pOldMember = 0;
int nOldMemberCount = -1;
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
if(pMember && pbLevelOrVisibiblityChanged)
@@ -528,7 +528,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
pMember->DeleteAndDestroy(0, pMember->Count());
switch(nContentType)
{
- case CONTENT_TYPE_OUTLINE :
+ case CONTENT_TYPE_OUTLINE :
{
sal_uInt16 nOutlineCount = nMemberCount =
static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount());
@@ -561,12 +561,12 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
}
break;
- case CONTENT_TYPE_TABLE :
+ case CONTENT_TYPE_TABLE :
{
OSL_ENSURE(nMemberCount == pWrtShell->GetTblFrmFmtCount(sal_True),
"MemberCount differs");
Point aNullPt;
- nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True);
+ nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True);
for(sal_uInt16 i = 0; i < nMemberCount; i++)
{
const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, sal_True);
@@ -575,7 +575,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
SwContent* pCnt = new SwContent(this, sTblName,
rTblFmt.FindLayoutRect(sal_False, &aNullPt).Top() );
if( !rTblFmt.GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->Insert(pCnt);//, i);
@@ -595,7 +595,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
eType = FLYCNTTYPE_OLE;
else if(nContentType == CONTENT_TYPE_GRAPHIC)
eType = FLYCNTTYPE_GRF;
- OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType),
+ OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType),
"MemberCount differs");
Point aNullPt;
nMemberCount = pWrtShell->GetFlyCount(eType);
@@ -621,7 +621,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
pFrmFmt->FindLayoutRect(sal_False, &aNullPt).Top() );
}
if( !pFrmFmt->GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->Insert(pCnt);//, i);
if(nOldMemberCount > (int)i &&
@@ -673,7 +673,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
nLevel,
pFmt->FindLayoutRect( sal_False, &aNullPt ).Top());
if( !pFmt->GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->Insert(pCnt);//, pMember->Count());
@@ -735,7 +735,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
this, sTOXNm, nTox, *pBase);
if( !pBase->GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
pMember->Insert( pCnt );//, nTox );
@@ -776,8 +776,8 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
nMemberCount++;
}
}
- /* this code can be used once we want redline comments in the margin
- else // redcomment
+ /* this code can be used once we want redline comments in the margin
+ else // redcomment
{
SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster());
if ( pRedline->GetComment().Len() )
@@ -901,8 +901,8 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) :
SetDragDropMode(SV_DRAGDROP_APP_COPY);
for( i = 0; i < CONTENT_TYPE_MAX; i++)
{
- aActiveContentArr[i] = 0;
- aHiddenContentArr[i] = 0;
+ aActiveContentArr[i] = 0;
+ aHiddenContentArr[i] = 0;
}
for( i = 0; i < CONTEXT_COUNT; i++ )
{
@@ -971,7 +971,7 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt )
}
/***************************************************************************
- Beschreibung: Drop wird im Navigator ausgefuehrt
+ Beschreibung: Drop wird im Navigator ausgefuehrt
***************************************************************************/
void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent)
{
@@ -1019,7 +1019,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
/***************************************************************************
- Beschreibung: Handler fuer Dragging und ContextMenu
+ Beschreibung: Handler fuer Dragging und ContextMenu
***************************************************************************/
PopupMenu* SwContentTree::CreateContextMenu( void )
{
@@ -1193,17 +1193,17 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
}
/***************************************************************************
- Beschreibung: Einrueckung fuer outlines (und sections)
+ Beschreibung: Einrueckung fuer outlines (und sections)
***************************************************************************/
-long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
+long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
{
sal_uInt16 nLevel = 0;
if(lcl_IsContent(pEntry))
{
nLevel++;
SwContent* pCnt = (SwContent *) pEntry->GetUserData();
- const SwContentType* pParent;
- if(pCnt && 0 != (pParent = pCnt->GetParent()))
+ const SwContentType* pParent;
+ if(pCnt && 0 != (pParent = pCnt->GetParent()))
{
if(pParent->GetType() == CONTENT_TYPE_OUTLINE)
nLevel = nLevel + ((SwOutlineContent*)pCnt)->GetOutlineLevel();
@@ -1216,7 +1216,7 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
}
/***************************************************************************
- Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt
+ Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt
***************************************************************************/
void SwContentTree::RequestingChilds( SvLBoxEntry* pParent )
{
@@ -1292,7 +1292,7 @@ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent )
}
/***************************************************************************
- Beschreibung: Expand - Zustand fuer Inhaltstypen merken
+ Beschreibung: Expand - Zustand fuer Inhaltstypen merken
***************************************************************************/
sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent )
{
@@ -1350,7 +1350,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent )
}
/***************************************************************************
- Beschreibung: Collapse - Zustand fuer Inhaltstypen merken
+ Beschreibung: Collapse - Zustand fuer Inhaltstypen merken
***************************************************************************/
sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent )
{
@@ -1383,13 +1383,13 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent )
bRet = SvTreeListBox::Collapse(pParent);
}
else
-// bRet = sal_False;
+// bRet = sal_False;
bRet = SvTreeListBox::Collapse(pParent);
return bRet;
}
/***************************************************************************
- Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt
+ Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt
***************************************************************************/
IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG )
{
@@ -1410,7 +1410,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG )
SwContent* pCnt = (SwContent*)pEntry->GetUserData();
OSL_ENSURE( pCnt, "no UserData");
GotoContent(pCnt);
- if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME)
+ if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME)
pActiveShell->EnterStdMode();
}
}
@@ -1418,7 +1418,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG )
}
/***************************************************************************
- Beschreibung: Anzeigen der Datei
+ Beschreibung: Anzeigen der Datei
***************************************************************************/
void SwContentTree::Display( sal_Bool bActive )
{
@@ -1431,7 +1431,7 @@ void SwContentTree::Display( sal_Bool bActive )
// erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder
// zu selektieren -> die UserDaten sind hier nicht mehr gueltig!
SvLBoxEntry* pOldSelEntry = FirstSelected();
- String sEntryName; // Name des Eintrags
+ String sEntryName; // Name des Eintrags
sal_uInt16 nEntryRelPos = 0; // rel. Pos zu seinem Parent
sal_uInt32 nOldEntryCount = GetEntryCount();
sal_Int32 nOldScrollPos = 0;
@@ -1619,7 +1619,7 @@ void SwContentTree::Display( sal_Bool bActive )
}
/***************************************************************************
- Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden
+ Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden
***************************************************************************/
void SwContentTree::Clear()
{
@@ -1710,7 +1710,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
// nur, wenn primaer ein Link eingefuegt werden soll
bRet = sal_True;
}
- else if( nActType == CONTENT_TYPE_REGION ||
+ else if( nActType == CONTENT_TYPE_REGION ||
nActType == CONTENT_TYPE_BOOKMARK )
{
// fuer Bereich und Textmarken ist ein Link auch ohne
@@ -1769,7 +1769,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
}
/***************************************************************************
- Beschreibung: Umschalten der Anzeige auf Root
+ Beschreibung: Umschalten der Anzeige auf Root
***************************************************************************/
sal_Bool SwContentTree::ToggleToRoot()
{
@@ -1801,7 +1801,7 @@ sal_Bool SwContentTree::ToggleToRoot()
}
/***************************************************************************
- Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen
+ Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen
***************************************************************************/
sal_Bool SwContentTree::HasContentChanged()
{
@@ -2018,9 +2018,9 @@ sal_Bool SwContentTree::HasContentChanged()
}
/***************************************************************************
- Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte
- * aktive Eintrag festgestellt werden. Dann werden die
- * UserData geloescht
+ Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte
+ * aktive Eintrag festgestellt werden. Dann werden die
+ * UserData geloescht
***************************************************************************/
void SwContentTree::FindActiveTypeAndRemoveUserData()
{
@@ -2035,8 +2035,8 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
if(pEntry->GetUserData() && lcl_IsContentType(pEntry))
nLastSelType = ((SwContentType*)pEntry->GetUserData())->GetType();
}
-// else
-// nLastSelType = USHRT_MAX;
+// else
+// nLastSelType = USHRT_MAX;
pEntry = First();
while(pEntry)
{
@@ -2046,7 +2046,7 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
}
/***************************************************************************
- Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde,
+ Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde,
wird die neue Shell gesetzt
***************************************************************************/
void SwContentTree::SetHiddenShell(SwWrtShell* pSh)
@@ -2064,7 +2064,7 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh)
GetParentWindow()->UpdateListBox();
}
/***************************************************************************
- Beschreibung: Dokumentwechsel - neue Shell setzen
+ Beschreibung: Dokumentwechsel - neue Shell setzen
***************************************************************************/
void SwContentTree::SetActiveShell(SwWrtShell* pSh)
{
@@ -2101,13 +2101,13 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
}
/***************************************************************************
- Beschreibung: Eine offene View als aktiv festlegen
+ Beschreibung: Eine offene View als aktiv festlegen
***************************************************************************/
void SwContentTree::SetConstantShell(SwWrtShell* pSh)
{
pActiveShell = pSh;
- bIsActive = sal_False;
- bIsConstant = sal_True;
+ bIsActive = sal_False;
+ bIsConstant = sal_True;
FindActiveTypeAndRemoveUserData();
for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++)
{
@@ -2117,7 +2117,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
}
/***************************************************************************
- Beschreibung: Kommandos des Navigators ausfuehren
+ Beschreibung: Kommandos des Navigators ausfuehren
***************************************************************************/
void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
{
@@ -2140,7 +2140,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
{
if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE ||
((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType()
- == CONTENT_TYPE_OUTLINE)
+ == CONTENT_TYPE_OUTLINE)
{
nActPos = ((SwOutlineContent*)pFirstEntry->GetUserData())->GetPos();
}
@@ -2276,23 +2276,23 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
}
}
-void SwContentTree::ShowTree()
+void SwContentTree::ShowTree()
{
aUpdTimer.Start();
SvTreeListBox::Show();
}
/***************************************************************************
- Beschreibung: zusammengefaltet wird nicht geidlet
+ Beschreibung: zusammengefaltet wird nicht geidlet
***************************************************************************/
-void SwContentTree::HideTree()
+void SwContentTree::HideTree()
{
aUpdTimer.Stop();
SvTreeListBox::Hide();
}
/***************************************************************************
- Beschreibung: Kein Idle mit Focus oder waehrend des Dragging
+ Beschreibung: Kein Idle mit Focus oder waehrend des Dragging
***************************************************************************/
IMPL_LINK( SwContentTree, TimerUpdate, Timer*, EMPTYARG)
{
@@ -2351,7 +2351,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
}
/***************************************************************************
- Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t
+ Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t
Childs verschoben
***************************************************************************/
sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
@@ -2365,7 +2365,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
nTargetPos = USHRT_MAX;
else
nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos();
- if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt
+ if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt
nTargetPos != USHRT_MAX)
{
SvLBoxEntry* pNext = Next(pTarget);
@@ -2390,7 +2390,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
}
/***************************************************************************
- Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e
+ Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e
Childs verschoben
***************************************************************************/
sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
@@ -2405,7 +2405,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
else
nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos();
- if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt
+ if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt
nTargetPos != USHRT_MAX)
{
SvLBoxEntry* pNext = Next(pTarget);
@@ -2419,7 +2419,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
OSL_ENSURE( pEntry &&
lcl_IsContent(pEntry),"Source == 0 or Source has no Content" );
- GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False);
+ GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False);
//TreeListBox wird aus dem Dokument neu geladen
aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
@@ -2429,7 +2429,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
}
/***************************************************************************
- Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType
+ Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType
***************************************************************************/
sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry)
{
@@ -2437,8 +2437,8 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry)
}
/***************************************************************************
- Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt,
- * dann soll die Basisfunktion des Controls gerufen werden
+ Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt,
+ * dann soll die Basisfunktion des Controls gerufen werden
***************************************************************************/
void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -2451,7 +2451,7 @@ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
}
/***************************************************************************
- Beschreibung: sofort aktualisieren
+ Beschreibung: sofort aktualisieren
***************************************************************************/
void SwContentTree::GetFocus()
{
@@ -2749,7 +2749,7 @@ void SwContentTree::SetOutlineLevel(sal_uInt8 nSet)
}
/***************************************************************************
- Beschreibung: Moduswechsel: gedropptes Doc anzeigen
+ Beschreibung: Moduswechsel: gedropptes Doc anzeigen
***************************************************************************/
void SwContentTree::ShowHiddenShell()
{
@@ -2762,7 +2762,7 @@ void SwContentTree::ShowHiddenShell()
}
/***************************************************************************
- Beschreibung: Moduswechsel: aktive Sicht anzeigen
+ Beschreibung: Moduswechsel: aktive Sicht anzeigen
***************************************************************************/
void SwContentTree::ShowActualView()
{
@@ -2826,7 +2826,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode)
uno::Reference< container::XNameAccess > xNameAccess, xSecond, xThird;
switch(nType)
{
- case CONTENT_TYPE_TABLE :
+ case CONTENT_TYPE_TABLE :
if(nMode == EDIT_UNPROTECT_TABLE)
{
pActiveShell->GetView().GetDocShell()->
@@ -2950,7 +2950,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode)
pActiveShell->DelRight();
}
/*
- // this code can be used once we want redline comments in the margin
+ // this code can be used once we want redline comments in the margin
else
{
SwMarginWin* pComment = pActiveShell->GetView().GetPostItMgr()->GetPostIt(((SwPostItContent*)pCnt)->GetRedline());
@@ -3055,12 +3055,12 @@ void SwContentTree::GotoContent(SwContent* pCnt)
sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
switch(nJumpType)
{
- case CONTENT_TYPE_OUTLINE :
+ case CONTENT_TYPE_OUTLINE :
{
pActiveShell->GotoOutline(((SwOutlineContent*)pCnt)->GetPos());
}
break;
- case CONTENT_TYPE_TABLE :
+ case CONTENT_TYPE_TABLE :
{
pActiveShell->GotoTable(pCnt->GetName());
}
@@ -3196,10 +3196,10 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
if( bRet )
{
xub_StrLen nPos = 0;
- aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
- aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
+ aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
+ aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
nDefDrag= (USHORT)sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32();
- nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32();
+ nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32();
}
return bRet;
}
@@ -3208,7 +3208,7 @@ class SwContentLBoxString : public SvLBoxString
{
public:
SwContentLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
- const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
+ const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index cf6e2b542b25..90ab5f9dfc28 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -2,7 +2,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
@@ -84,12 +84,12 @@ using ::rtl::OUString;
#define CTX_INSERT_NEW_FILE 12
#define CTX_INSERT_TEXT 13
-#define CTX_UPDATE_SEL 20
+#define CTX_UPDATE_SEL 20
#define CTX_UPDATE_INDEX 21
#define CTX_UPDATE_LINK 22
#define CTX_UPDATE_ALL 23
-#define CTX_UPDATE 1
+#define CTX_UPDATE 1
#define CTX_INSERT 2
#define CTX_EDIT 3
#define CTX_DELETE 4
@@ -98,12 +98,12 @@ using ::rtl::OUString;
#define GLOBAL_UPDATE_TIMEOUT 2000
// Flags fuer PopupMenu-enable/disable
-#define ENABLE_INSERT_IDX 0x0001
+#define ENABLE_INSERT_IDX 0x0001
#define ENABLE_INSERT_FILE 0x0002
#define ENABLE_INSERT_TEXT 0x0004
#define ENABLE_EDIT 0x0008
#define ENABLE_DELETE 0x0010
-#define ENABLE_UPDATE 0x0020
+#define ENABLE_UPDATE 0x0020
#define ENABLE_UPDATE_SEL 0x0040
#define ENABLE_EDIT_LINK 0x0080
@@ -113,30 +113,30 @@ using ::rtl::OUString;
const SfxObjectShell* SwGlobalTree::pShowShell = 0;
static const USHORT __FAR_DATA aHelpForMenu[] =
{
- 0, //
- HID_GLBLTREE_UPDATE, //CTX_UPDATE
- HID_GLBLTREE_INSERT, //CTX_INSERT
- HID_GLBLTREE_EDIT, //CTX_EDIT
- HID_GLBLTREE_DEL, //CTX_DELETE
+ 0, //
+ HID_GLBLTREE_UPDATE, //CTX_UPDATE
+ HID_GLBLTREE_INSERT, //CTX_INSERT
+ HID_GLBLTREE_EDIT, //CTX_EDIT
+ HID_GLBLTREE_DEL, //CTX_DELETE
HID_GLBLTREE_EDIT_LINK, //CTX_EDIT_LINK
- 0, //
- 0, //
- 0, //
- 0, //
- HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX
- HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE
- HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE
- HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT
- 0, //
- 0, //
- 0, //
- 0, //
- 0, //
- 0, //
- HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL
- HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX
- HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK
- HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL
+ 0, //
+ 0, //
+ 0, //
+ 0, //
+ HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX
+ HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE
+ HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE
+ HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT
+ 0, //
+ 0, //
+ 0, //
+ 0, //
+ 0, //
+ 0, //
+ HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL
+ HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX
+ HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK
+ HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL
};
class SwGlobalFrameListener_Impl : public SfxListener
@@ -149,9 +149,9 @@ public:
StartListening(rFrame);
}
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- BOOL IsValid() const {return bValid;}
+ BOOL IsValid() const {return bValid;}
};
void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
@@ -269,7 +269,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
INetURLObject aTemp(sFileName);
GraphicDescriptor aDesc(aTemp);
- if( !aDesc.Detect() ) // keine Grafiken annehmen
+ if( !aDesc.Detect() ) // keine Grafiken annehmen
{
nRet = rEvt.mnAction;
InsertRegion(pCnt, &sFileName);
@@ -419,7 +419,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox)
pMenu->EnableItem(CTX_INSERT_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE));
pMenu->EnableItem(CTX_INSERT_NEW_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE));
pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
- pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+ pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
delete pMenu;
pBox->EndSelection();
pBox->Invalidate();
@@ -434,14 +434,14 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox)
}
pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL));
pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
- pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+ pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
delete pMenu;
pBox->EndSelection();
pBox->Invalidate();
}
}
-USHORT SwGlobalTree::GetEnableFlags() const
+USHORT SwGlobalTree::GetEnableFlags() const
{
SvLBoxEntry* pEntry = FirstSelected();
USHORT nSelCount = (USHORT)GetSelectionCount();
@@ -454,7 +454,7 @@ USHORT SwGlobalTree::GetEnableFlags() const
if(nSelCount == 1)
{
nRet |= ENABLE_EDIT;
- if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN &&
+ if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN &&
(!pPrevEntry || ((SwGlblDocContent*)pPrevEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN))
nRet |= ENABLE_INSERT_TEXT;
if( GLBLDOC_SECTION == ((SwGlblDocContent*)pEntry->GetUserData())->GetType() )
@@ -471,7 +471,7 @@ USHORT SwGlobalTree::GetEnableFlags() const
return nRet;
}
-void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
+void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
{
BOOL bParent = TRUE;
Update(TRUE);
@@ -519,7 +519,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
SvTreeListBox::RequestHelp(rHEvt);
}
-void SwGlobalTree::SelectHdl()
+void SwGlobalTree::SelectHdl()
{
USHORT nSelCount = (USHORT)GetSelectionCount();
@@ -538,7 +538,7 @@ void SwGlobalTree::SelectHdl()
}
-void SwGlobalTree::DeselectHdl()
+void SwGlobalTree::DeselectHdl()
{
SelectHdl();
}
@@ -566,7 +566,7 @@ BOOL SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget,
USHORT nSource = (USHORT) _pModel->GetAbsPos(pSource);
USHORT nDest = pTarget ? (USHORT) _pModel->GetAbsPos(pTarget) : pSwGlblDocContents->Count();
- if( pActiveShell->MoveGlobalDocContent(
+ if( pActiveShell->MoveGlobalDocContent(
*pSwGlblDocContents, nSource, nSource + 1, nDest ) &&
Update( FALSE ))
Display();
@@ -600,8 +600,8 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction )
}
/***************************************************************************
- Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt,
- * dann soll die Basisfunktion des Controls gerufen werden
+ Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt,
+ * dann soll die Basisfunktion des Controls gerufen werden
***************************************************************************/
void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -643,7 +643,7 @@ void SwGlobalTree::Clear()
SvTreeListBox::Clear();
}
-void SwGlobalTree::Display(BOOL bOnlyUpdateUserData)
+void SwGlobalTree::Display(BOOL bOnlyUpdateUserData)
{
if(!bIsImageListInitialized)
{
@@ -666,7 +666,7 @@ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData)
{
SetUpdateMode( FALSE );
SvLBoxEntry* pOldSelEntry = FirstSelected();
- String sEntryName; // Name des Eintrags
+ String sEntryName; // Name des Eintrags
USHORT nSelPos = USHRT_MAX;
if(pOldSelEntry)
{
@@ -751,7 +751,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF
}
}
-void SwGlobalTree::EditContent(const SwGlblDocContent* pCont )
+void SwGlobalTree::EditContent(const SwGlblDocContent* pCont )
{
USHORT nSlot = 0;
switch( pCont->GetType() )
@@ -889,8 +889,8 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
}
break;
case CTX_INSERT_ANY_INDEX:
-// case CTX_INSERT_CNTIDX:
-// case CTX_INSERT_USRIDX:
+// case CTX_INSERT_CNTIDX:
+// case CTX_INSERT_USRIDX:
{
if(pContCopy)
{
@@ -1056,19 +1056,19 @@ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont)
}
-void SwGlobalTree::ShowTree()
+void SwGlobalTree::ShowTree()
{
aUpdateTimer.Start();
SvTreeListBox::Show();
}
-void SwGlobalTree::HideTree()
+void SwGlobalTree::HideTree()
{
aUpdateTimer.Stop();
SvTreeListBox::Hide();
}
-void SwGlobalTree::ExecCommand(USHORT nCmd)
+void SwGlobalTree::ExecCommand(USHORT nCmd)
{
SvLBoxEntry* pEntry = FirstSelected();
OSL_ENSURE(pEntry, "gleich knallt's");
@@ -1102,7 +1102,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd)
}
break;
}
- if( bMove && pActiveShell->MoveGlobalDocContent(
+ if( bMove && pActiveShell->MoveGlobalDocContent(
*pSwGlblDocContents, nSource, nSource + 1, nDest ) &&
Update( FALSE ))
Display();
@@ -1110,7 +1110,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd)
}
}
-BOOL SwGlobalTree::Update(BOOL bHard)
+BOOL SwGlobalTree::Update(BOOL bHard)
{
SwView* pActView = GetParentWindow()->GetCreateView();
BOOL bRet = FALSE;
@@ -1225,7 +1225,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
}
}
-IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG )
+IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG )
{
SvLBoxEntry* pEntry = GetCurEntry();
SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData();
@@ -1264,7 +1264,7 @@ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData();
const SwSection* pSect;
if(pCont->GetType() == GLBLDOC_SECTION &&
- !(pSect = pCont->GetSection())->IsConnectFlag() )
+ !(pSect = pCont->GetSection())->IsConnectFlag() )
{
Font aOldFont( rDev.GetFont());
Font aFont(aOldFont);
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index c401cd2e05c2..afe8794333b8 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -2,7 +2,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
@@ -74,10 +74,10 @@ SV_IMPL_PTRARR( TripleStrings, TripleStringPtr )
class SwGlossDecideDlg : public ModalDialog
{
- OKButton aOk;
- CancelButton aCancel;
- HelpButton aHelp;
- ListBox aListLB;
+ OKButton aOk;
+ CancelButton aCancel;
+ HelpButton aHelp;
+ ListBox aListLB;
FixedLine aFL;
DECL_LINK(DoubleClickHdl, ListBox*);
@@ -85,7 +85,7 @@ class SwGlossDecideDlg : public ModalDialog
public:
SwGlossDecideDlg(Window* pParent);
- ListBox& GetListBox() {return aListLB;}
+ ListBox& GetListBox() {return aListLB;}
};
/*-----------------21.01.97 13.25-------------------
@@ -94,10 +94,10 @@ class SwGlossDecideDlg : public ModalDialog
SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) :
ModalDialog(pParent, SW_RES(DLG_GLOSSARY_DECIDE_DLG)),
- aOk(this, SW_RES(PB_OK)),
- aCancel(this, SW_RES(PB_CANCEL)),
- aHelp(this, SW_RES(PB_HELP)),
- aListLB(this, SW_RES(LB_LIST)),
+ aOk(this, SW_RES(PB_OK)),
+ aCancel(this, SW_RES(PB_CANCEL)),
+ aHelp(this, SW_RES(PB_HELP)),
+ aListLB(this, SW_RES(LB_LIST)),
aFL(this, SW_RES(FL_GLOSS))
{
FreeResource();
@@ -223,7 +223,7 @@ BOOL SwGlossaryList::GetShortName(const String& rLongName,
********************************************************************/
-USHORT SwGlossaryList::GetGroupCount()
+USHORT SwGlossaryList::GetGroupCount()
{
if(!bFilled)
Update();
@@ -257,7 +257,7 @@ String SwGlossaryList::GetGroupName(USHORT nPos, BOOL bNoPath, String* pTitle)
********************************************************************/
-USHORT SwGlossaryList::GetBlockCount(USHORT nGroup)
+USHORT SwGlossaryList::GetBlockCount(USHORT nGroup)
{
OSL_ENSURE(aGroupArr.Count() > nGroup, "group not available");
if(nGroup < aGroupArr.Count())
@@ -273,7 +273,7 @@ USHORT SwGlossaryList::GetBlockCount(USHORT nGroup)
********************************************************************/
-String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName)
+String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName)
{
OSL_ENSURE(aGroupArr.Count() > nGroup, "group not available");
if(nGroup < aGroupArr.Count())
@@ -421,7 +421,7 @@ void SwGlossaryList::Timeout()
********************************************************************/
-AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName)
+AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName)
{
for(USHORT i = 0; i < aGroupArr.Count(); i++)
{
@@ -439,7 +439,7 @@ AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName)
void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries)
{
- SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName);
+ SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName);
pGroup->nCount = pBlock ? pBlock->GetCount() : 0;
pGroup->sLongNames = pGroup->sShortNames = aEmptyStr;
if(pBlock)
@@ -492,7 +492,7 @@ BOOL SwGlossaryList::HasLongName(const String& rBegin, SvStringsISortDtor* pLong
/********************************************************************
********************************************************************/
-void SwGlossaryList::ClearGroups()
+void SwGlossaryList::ClearGroups()
{
USHORT nCount = aGroupArr.Count();
for( USHORT i = 0; i < nCount; ++i )
diff --git a/sw/source/ui/utlui/gloslst.hrc b/sw/source/ui/utlui/gloslst.hrc
index 6c89f1c5ac9c..0d3fe2b0f586 100644
--- a/sw/source/ui/utlui/gloslst.hrc
+++ b/sw/source/ui/utlui/gloslst.hrc
@@ -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
diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src
index 78f96e85e741..1ccf855ffe0b 100644
--- a/sw/source/ui/utlui/gloslst.src
+++ b/sw/source/ui/utlui/gloslst.src
@@ -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
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index dea456662b8e..9c755b8515eb 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -2,7 +2,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
@@ -49,13 +49,13 @@
#include <unomid.h>
/*--------------------------------------------------------------------
- Beschreibung: globale Pointer
+ Beschreibung: globale Pointer
--------------------------------------------------------------------*/
-SwGlossaries* pGlossaries = 0;
+SwGlossaries* pGlossaries = 0;
// Liefert alle benoetigten Pfade. Wird durch UI initialisiert
-SwGlossaryList* pGlossaryList = 0;
+SwGlossaryList* pGlossaryList = 0;
String* pOldGrfCat = 0;
String* pOldTabCat = 0;
@@ -90,11 +90,11 @@ void SetCurrGlosGroup(String* pStr)
SvStringsDtor* pDBNameList = 0;
-SvStringsDtor* pAuthFieldNameList = 0;
-SvStringsDtor* pAuthFieldTypeList = 0;
+SvStringsDtor* pAuthFieldNameList = 0;
+SvStringsDtor* pAuthFieldTypeList = 0;
/*--------------------------------------------------------------------
- Beschreibung: UI beenden
+ Beschreibung: UI beenden
--------------------------------------------------------------------*/
void _FinitUI()
@@ -122,7 +122,7 @@ void _FinitUI()
}
/*--------------------------------------------------------------------
- Beschreibung: Initialisierung
+ Beschreibung: Initialisierung
--------------------------------------------------------------------*/
@@ -162,20 +162,20 @@ ShellResource::ShellResource()
sDurationFormat( SW_RES( STR_DURATION_FORMAT )),
aTOXIndexName( SW_RES(STR_TOI)),
- aTOXUserName( SW_RES(STR_TOU)),
- aTOXContentName( SW_RES(STR_TOC)),
- aTOXIllustrationsName( SW_RES(STR_TOX_ILL)),
- aTOXObjectsName( SW_RES(STR_TOX_OBJ)),
- aTOXTablesName( SW_RES(STR_TOX_TBL)),
- aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)),
+ aTOXUserName( SW_RES(STR_TOU)),
+ aTOXContentName( SW_RES(STR_TOC)),
+ aTOXIllustrationsName( SW_RES(STR_TOX_ILL)),
+ aTOXObjectsName( SW_RES(STR_TOX_OBJ)),
+ aTOXTablesName( SW_RES(STR_TOX_TBL)),
+ aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)),
aHyperlinkClick( SW_RES( STR_HYPERLINK_CLICK)),
pAutoFmtNameLst(0),
- sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)),
- sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)),
+ sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)),
+ sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)),
sPageDescName( SW_RES(STR_PAGEDESC_NAME))
{
const USHORT nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
-
+
KeyCode aCode( KEY_SPACE );
KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
String aModStr( aModifiedCode.GetName() );
@@ -265,7 +265,7 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst )
FreeResource();
}
-const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType)
+const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType)
{
if(!pAuthFieldNameList)
{
@@ -279,7 +279,7 @@ const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType)
return *pAuthFieldNameList->GetObject( static_cast< USHORT >(eType) );
}
-const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
+const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
{
if(!pAuthFieldTypeList)
{
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc
index 367091fbd443..34d7e788c7b2 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/ui/utlui/initui.hrc
@@ -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
@@ -28,37 +28,37 @@
#ifndef _INITUI_HRC
#define _INITUI_HRC
-#define BMP_FRAME_ANCHOR 1
-#define BMP_FRAME_DRAG_ANCHOR 2
+#define BMP_FRAME_ANCHOR 1
+#define BMP_FRAME_DRAG_ANCHOR 2
// lokale Resourcen fuer die Shells:
-#define STR_POSTIT_PAGE 1
-#define STR_POSTIT_AUTHOR 2
-#define STR_CALC_SYNTAX 3
-#define STR_CALC_ZERODIV 4
-#define STR_CALC_BRACK 5
-#define STR_CALC_POW 6
-#define STR_CALC_VARNFND 7
-#define STR_CALC_OVERFLOW 8
-#define STR_CALC_WRONGTIME 9
-#define STR_CALC_DEFAULT 10
-#define STR_CALC_ERROR 11
-#define STR_GETREFFLD_UP 12
-#define STR_GETREFFLD_DOWN 13
-#define STR_ALLPAGE_HEADFOOT 14
-#define STR_TEMPLATE_NONE 15
-#define STR_POSTIT_LINE 16
-#define STR_FIELD_FIXED 17
-#define STR_TOI 18
+#define STR_POSTIT_PAGE 1
+#define STR_POSTIT_AUTHOR 2
+#define STR_CALC_SYNTAX 3
+#define STR_CALC_ZERODIV 4
+#define STR_CALC_BRACK 5
+#define STR_CALC_POW 6
+#define STR_CALC_VARNFND 7
+#define STR_CALC_OVERFLOW 8
+#define STR_CALC_WRONGTIME 9
+#define STR_CALC_DEFAULT 10
+#define STR_CALC_ERROR 11
+#define STR_GETREFFLD_UP 12
+#define STR_GETREFFLD_DOWN 13
+#define STR_ALLPAGE_HEADFOOT 14
+#define STR_TEMPLATE_NONE 15
+#define STR_POSTIT_LINE 16
+#define STR_FIELD_FIXED 17
+#define STR_TOI 18
#define STR_TOU 19
#define STR_TOC 20
#define STR_TOX_ILL 21
#define STR_TOX_OBJ 22
#define STR_TOX_TBL 23
#define STR_TOX_AUTH 24
-#define STR_PAGEDESC_NAME 25
-#define STR_PAGEDESC_FIRSTNAME 26
-#define STR_PAGEDESC_FOLLOWNAME 27
+#define STR_PAGEDESC_NAME 25
+#define STR_PAGEDESC_FIRSTNAME 26
+#define STR_PAGEDESC_FOLLOWNAME 27
#define STR_HYPERLINK_CLICK 28
#define STR_GETREFFLD_REFITEMNOTFOUND 29
#define STR_DURATION_FORMAT 30
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src
index 3b08e771a309..619b208f3793 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/ui/utlui/initui.src
@@ -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
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index cbc89fb4bbf3..cac1ddd19503 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -2,7 +2,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
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <swtypes.hxx> // fuer Pathfinder
+#include <swtypes.hxx> // fuer Pathfinder
#include <navicfg.hxx>
#include <swcont.hxx>
#include <osl/diagnose.h>
@@ -47,7 +47,7 @@ Sequence<OUString> SwNavigationConfig::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "RootType", //0
+ "RootType", //0
"SelectedPosition", //1
"OutlineLevel", //2
"InsertMode", //3
@@ -77,7 +77,7 @@ SwNavigationConfig::SwNavigationConfig() :
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
-// EnableNotification(aNames);
+// EnableNotification(aNames);
const Any* pValues = aValues.getConstArray();
OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
@@ -88,12 +88,12 @@ SwNavigationConfig::SwNavigationConfig() :
{
switch(nProp)
{
- case 0: pValues[nProp] >>= nRootType; break;
+ case 0: pValues[nProp] >>= nRootType; break;
case 1: pValues[nProp] >>= nSelectedPos; break;
case 2: pValues[nProp] >>= nOutlineLevel; break;
case 3: pValues[nProp] >>= nRegionMode; break;
- case 4: pValues[nProp] >>= nActiveBlock; break;
- case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break;
+ case 4: pValues[nProp] >>= nActiveBlock; break;
+ case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break;
case 6: bIsGlobalActive = *(sal_Bool*)pValues[nProp].getValue(); break;
}
}
@@ -116,13 +116,13 @@ void SwNavigationConfig::Commit()
{
switch(nProp)
{
- case 0: pValues[nProp] <<= nRootType; break;
+ case 0: pValues[nProp] <<= nRootType; break;
case 1: pValues[nProp] <<= nSelectedPos; break;
case 2: pValues[nProp] <<= nOutlineLevel; break;
case 3: pValues[nProp] <<= nRegionMode; break;
- case 4: pValues[nProp] <<= nActiveBlock; break;
- case 5: pValues[nProp].setValue(&bIsSmall, rType); break;
- case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break;
+ case 4: pValues[nProp] <<= nActiveBlock; break;
+ case 5: pValues[nProp].setValue(&bIsSmall, rType); break;
+ case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break;
}
}
PutProperties(aNames, aValues);
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 629f1d7807d5..20ef70a3dc4d 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/dockwin.hxx>
#include <vcl/toolbox.hxx>
-#include <swtypes.hxx> // fuer Pathfinder
+#include <swtypes.hxx> // fuer Pathfinder
#include <errhdl.hxx>
#include <swmodule.hxx>
#include <view.hxx>
@@ -80,7 +80,7 @@
// Version fuer Konfiguration
-#define NAVI_VERSION0 0
+#define NAVI_VERSION0 0
#define NAVI_VERSION1 1
#define NAVI_VERSION2 2 // bIsGlobalActive
@@ -104,7 +104,7 @@ void SwNavigationPI::CleanEntry( String& rEntry )
*pStr = 0x20;
}
/*------------------------------------------------------------------------
- Beschreibung: Ausfuehrung der Drag-Operation
+ Beschreibung: Ausfuehrung der Drag-Operation
mit und ohne Childs
------------------------------------------------------------------------*/
@@ -142,7 +142,7 @@ void SwNavigationPI::MoveOutline(USHORT nSource, USHORT nTarget,
/*------------------------------------------------------------------------
- Beschreibung: Nach Goto einen Status Rahmenselektion aufheben
+ Beschreibung: Nach Goto einen Status Rahmenselektion aufheben
------------------------------------------------------------------------*/
@@ -156,7 +156,7 @@ void lcl_UnSelectFrm(SwWrtShell *pSh)
}
/*------------------------------------------------------------------------
- Beschreibung: Select der Documentanzeige
+ Beschreibung: Select der Documentanzeige
------------------------------------------------------------------------*/
@@ -185,7 +185,7 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox )
}
/*------------------------------------------------------------------------
- Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente
+ Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente
Der PI wird auf volle Groesse gesetzt
------------------------------------------------------------------------*/
@@ -237,7 +237,7 @@ void SwNavigationPI::UsePage(SwWrtShell *pSh)
}
/*------------------------------------------------------------------------
- Beschreibung: SelectHandler der Toolboxen
+ Beschreibung: SelectHandler der Toolboxen
------------------------------------------------------------------------*/
@@ -380,7 +380,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
return TRUE;
}
/*------------------------------------------------------------------------
- Beschreibung: ClickHandler der Toolboxen
+ Beschreibung: ClickHandler der Toolboxen
------------------------------------------------------------------------*/
@@ -448,7 +448,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 );
pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
pBox->SetItemDown( nCurrItemId, TRUE );
- pMenu->Execute( pBox,
+ pMenu->Execute( pBox,
pBox->GetItemRect(FN_OUTLINE_LEVEL),
POPUPMENU_EXECUTE_DOWN );
pBox->SetItemDown( nCurrItemId, FALSE );
@@ -520,7 +520,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt )
}
/*------------------------------------------------------------------------
- Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn
+ Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn
nicht Gliederungssicht angeschaltet ist.
------------------------------------------------------------------------*/
@@ -540,7 +540,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit )
}
/*------------------------------------------------------------------------
- Beschreibung: Falls die Seite eingestellt werden kann, wird hier
+ Beschreibung: Falls die Seite eingestellt werden kann, wird hier
das Maximum gesetzt.
------------------------------------------------------------------------*/
@@ -571,7 +571,7 @@ BOOL SwNavigationPI::Close()
}
/*------------------------------------------------------------------------
- Beschreibung: Setzen einer automatischen Marke
+ Beschreibung: Setzen einer automatischen Marke
------------------------------------------------------------------------*/
@@ -596,7 +596,7 @@ void SwNavigationPI::MakeMark()
// this assumes that IDocumentMarkAccess generates Names in ascending order
if(vNavMarkNames.size() == MAX_MARKS)
pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx]));
-
+
rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
SwView::SetActMark( nAutoMarkIdx );
@@ -795,8 +795,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
bPageCtrlsVisible = TRUE;
-// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT);
-// USHORT nWidth = 2 * (USHORT)aFirstRect.Left();
+// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT);
+// USHORT nWidth = 2 * (USHORT)aFirstRect.Left();
//doppelte Separatoren sind nicht erlaubt, also muss
//die passende Groesse anders ermittelt werden
Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE);
@@ -843,7 +843,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
if(
(
aTmpParentSize.Width() < aMinSize.Width() ||
- aTmpParentSize.Height() < aMinSize.Height()
+ aTmpParentSize.Height() < aMinSize.Height()
)
&&
((SfxDockingWindow*)pParent)->GetFloatingWindow() &&
@@ -856,14 +856,14 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aContentTree.SetSpaceBetweenEntries(3);
aContentTree.SetSelectionMode( SINGLE_SELECTION );
- aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |
+ aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |
SV_DRAGDROP_CTRL_COPY |
SV_DRAGDROP_ENABLE_TOP );
aContentTree.EnableAsyncDrag(TRUE);
aContentTree.ShowTree();
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, TRUE);
-// TreeListBox fuer Globaldokument
+// TreeListBox fuer Globaldokument
aGlobalTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION );
aGlobalTree.SetWindowBits( WB_HASBUTTONS|WB_HASBUTTONSATROOT|
@@ -871,7 +871,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
Size aGlblSize(aGlobalToolBox.CalcWindowSizePixel());
aGlobalToolBox.SetSizePixel(aGlblSize);
-// Handler
+// Handler
Link aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
aContentToolBox.SetSelectHdl( aLk );
@@ -1089,7 +1089,7 @@ SfxChildAlignment eRetAlign;
}
/*--------------------------------------------------------------------
- Beschreibung: Benachrichtigung bei geaenderter DocInfo
+ Beschreibung: Benachrichtigung bei geaenderter DocInfo
--------------------------------------------------------------------*/
void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
@@ -1316,7 +1316,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
INetURLObject aTemp( sFileName );
GraphicDescriptor aDesc( aTemp );
- if( !aDesc.Detect() ) // keine Grafiken annehmen
+ if( !aDesc.Detect() ) // keine Grafiken annehmen
{
if( STRING_NOTFOUND == sFileName.Search('#')
&& (!sContentFileName.Len() || sContentFileName != sFileName ))
@@ -1371,7 +1371,7 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
--------------------------------------------------*/
-BOOL SwNavigationPI::ToggleTree()
+BOOL SwNavigationPI::ToggleTree()
{
BOOL bRet = TRUE;
BOOL bGlobalDoc = IsGlobalDoc();
@@ -1407,7 +1407,7 @@ BOOL SwNavigationPI::ToggleTree()
/*-----------------13.06.97 09:42-------------------
--------------------------------------------------*/
-BOOL SwNavigationPI::IsGlobalDoc() const
+BOOL SwNavigationPI::IsGlobalDoc() const
{
BOOL bRet = FALSE;
SwView *pView = GetCreateView();
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index 8254e2dc92a9..e8a6dc2e39a6 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.hrc
@@ -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
@@ -24,38 +24,38 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define TB_1 1
-#define TB_2 2
-#define TB_3 3
-#define TB_4 4
-#define BT_UP 5
-#define BT_DOWN 6
+#define TB_1 1
+#define TB_2 2
+#define TB_3 3
+#define TB_4 4
+#define BT_UP 5
+#define BT_DOWN 6
#define IL_CONTENT 7
#define ILH_CONTENT 8
-#define FT_PAGE 10
-#define ED_PAGE 11
-#define LB_SELECT 22
-#define TL_SELECT 23
-#define TB_PAGE_TEXT 41
+#define FT_PAGE 10
+#define ED_PAGE 11
+#define LB_SELECT 22
+#define TL_SELECT 23
+#define TB_PAGE_TEXT 41
#define TB_PAGE_COUNT 42
-#define TB_CONTENT 50
-#define TL_CONTENT 51
-#define LB_DOCS 53
-#define NF_PAGE 54
+#define TB_CONTENT 50
+#define TL_CONTENT 51
+#define LB_DOCS 53
+#define NF_PAGE 54
#define TL_GLOBAL 55
#define TB_GLOBAL 56
//-------------------------------------------------------------------
// Strings fuer Kontextmenue des ContentTree
-#define ST_CONTEXT_FIRST 60
-#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST
+#define ST_CONTEXT_FIRST 60
+#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST
#define ST_DRAGMODE (ST_CONTEXT_FIRST + 1)
#define ST_HYPERLINK (ST_CONTEXT_FIRST + 2)
#define ST_LINK_REGION (ST_CONTEXT_FIRST + 3)
#define ST_COPY_REGION (ST_CONTEXT_FIRST + 4)
#define ST_DISPLAY (ST_CONTEXT_FIRST + 5)
#define ST_ACTIVE_VIEW (ST_CONTEXT_FIRST + 6)
-#define ST_STATUS_FIRST 67
+#define ST_STATUS_FIRST 67
#define ST_HIDDEN (ST_STATUS_FIRST )
#define ST_ACTIVE (ST_STATUS_FIRST + 1)
#define ST_INACTIVE (ST_STATUS_FIRST + 2)
@@ -63,8 +63,8 @@
#define ST_EDIT_ENTRY ST_MISC
#define ST_DELETE_ENTRY (ST_MISC + 1)
-#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1)
-#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST )
+#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1)
+#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST )
#define ST_EDIT_CONTENT (ST_GLOBAL_CONTEXT_FIRST + 1)
#define ST_INSERT (ST_GLOBAL_CONTEXT_FIRST + 2)
#define ST_INDEX (ST_GLOBAL_CONTEXT_FIRST + 3)
@@ -76,7 +76,7 @@
#define ST_UPDATE_INDEX (ST_GLOBAL_CONTEXT_FIRST + 9)
#define ST_UPDATE_LINK (ST_GLOBAL_CONTEXT_FIRST +10)
#define ST_UPDATE_ALL (ST_GLOBAL_CONTEXT_FIRST +11)
-#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12)
+#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12)
#define ST_EDIT_LINK (ST_GLOBAL_CONTEXT_FIRST +13)
#define ST_REMOVE_INDEX (ST_GLOBAL_CONTEXT_FIRST +30)
@@ -85,7 +85,7 @@
#define ST_READONLY_IDX (ST_GLOBAL_CONTEXT_FIRST +33)
#define ST_INVISIBLE (ST_GLOBAL_CONTEXT_FIRST +34)
-#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35)
-#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36)
-#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37)
+#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35)
+#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36)
+#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37)
diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src
index 0c45e3203df0..fd83ec90675f 100644
--- a/sw/source/ui/utlui/navipi.src
+++ b/sw/source/ui/utlui/navipi.src
@@ -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
@@ -36,13 +36,13 @@ Window DLG_NAVIGATION_PI
OutputSize = TRUE ;
DialogControl = TRUE ;
SVLook = TRUE ;
- // Size = MAP_PIXEL( 235, 195 );
- // ZoomInOutputSize = MAP_PIXEL(235, 56);
+ // Size = MAP_PIXEL( 235, 195 );
+ // ZoomInOutputSize = MAP_PIXEL(235, 56);
Size = MAP_PIXEL ( 282 , 59 ) ;
// Closeable = TRUE ;
// Zoomable = TRUE ;
// Moveable = TRUE ;
- // ZoomIn = FALSE;
+ // ZoomIn = FALSE;
Hide = TRUE ;
// HideWhenDeactivate = TRUE ;
// Sizeable = TRUE ;
@@ -120,7 +120,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_UP ;
- // ItemBitmap = Bitmap { File = "navup.bmp"; };
+ // ItemBitmap = Bitmap { File = "navup.bmp"; };
HelpID = HID_NAVI_TBX2 ;
/* ### ACHTUNG: Neuer Text in Resource? Rckwrts : Rckwrts */
Text [ en-US ] = "Back" ;
@@ -128,7 +128,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_DOWN ;
- // ItemBitmap = Bitmap { File = "navdn.bmp"; };
+ // ItemBitmap = Bitmap { File = "navdn.bmp"; };
HelpID = HID_NAVI_TBX3 ;
/* ### ACHTUNG: Neuer Text in Resource? Vorwrts : Vorwrts */
Text [ en-US ] = "Forward" ;
@@ -148,7 +148,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_ITEM_UP ;
- // ItemBitmap = Bitmap { File = "navchup.bmp"; };
+ // ItemBitmap = Bitmap { File = "navchup.bmp"; };
HelpID = HID_NAVI_TBX5 ;
Text [ en-US ] = "Promote Chapter" ;
//HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up"
@@ -156,7 +156,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_ITEM_DOWN ;
- // ItemBitmap = Bitmap { File = "navchdn.bmp"; };
+ // ItemBitmap = Bitmap { File = "navchdn.bmp"; };
HelpID = HID_NAVI_TBX6 ;
Text [ en-US ] = "Demote Chapter" ;
};
@@ -184,7 +184,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_SELECT_SET_AUTO_BOOKMARK ;
HelpID = HID_NAVI_TBX9 ;
- // ItemBitmap = Bitmap { File = "navstmp.bmp"; };
+ // ItemBitmap = Bitmap { File = "navstmp.bmp"; };
Text [ en-US ] = "Set Reminder" ;
};
ToolBoxItem
@@ -194,14 +194,14 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_SELECT_HEADER ;
- // ItemBitmap = Bitmap { File = "navhead.bmp"; };
+ // ItemBitmap = Bitmap { File = "navhead.bmp"; };
HelpID = HID_NAVI_TBX10 ;
Text [ en-US ] = "Header" ;
};
ToolBoxItem
{
Identifier = FN_SELECT_FOOTER ;
- // ItemBitmap = Bitmap { File = "navfoot.bmp"; };
+ // ItemBitmap = Bitmap { File = "navfoot.bmp"; };
HelpID = HID_NAVI_TBX11 ;
/* ### ACHTUNG: Neuer Text in Resource? Fuzeile : Fuzeile */
Text [ en-US ] = "Footer" ;
@@ -210,7 +210,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_SELECT_FOOTNOTE ;
- // ItemBitmap = Bitmap { File = "navnote.bmp"; };
+ // ItemBitmap = Bitmap { File = "navnote.bmp"; };
HelpID = HID_NAVI_TBX12 ;
Text [ en-US ] = "Anchor<->Text" ;
/* ### ACHTUNG: Neuer Text in Resource? Springen zwischen Funotenankern und dem Funotentext : Springen zwischen Funotenankern und dem Funotentext */
@@ -235,13 +235,13 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_ITEM_LEFT ;
HelpID = HID_NAVI_TBX14 ;
- // ItemBitmap = Bitmap { File = "navchlf.bmp"; };
+ // ItemBitmap = Bitmap { File = "navchlf.bmp"; };
Text [ en-US ] = "Promote Level" ;
};
ToolBoxItem
{
Identifier = FN_ITEM_RIGHT ;
- // ItemBitmap = Bitmap { File = "navchrg.bmp"; };
+ // ItemBitmap = Bitmap { File = "navchrg.bmp"; };
HelpID = HID_NAVI_TBX15 ;
Text [ en-US ] = "Demote Level" ;
};
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 13aecfd2bbc4..cfdc2d7c4c17 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -2,7 +2,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
@@ -74,12 +74,12 @@ using namespace ::com::sun::star::lang;
NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId,
short nFormatType, ULONG nDefFmt,
BOOL bUsrFmts ) :
- ListBox ( pWin, rResId ),
- nCurrFormatType (-1),
- nStdEntry (0),
- bOneArea (FALSE),
- nDefFormat (nDefFmt),
- pVw (0),
+ ListBox ( pWin, rResId ),
+ nCurrFormatType (-1),
+ nStdEntry (0),
+ bOneArea (FALSE),
+ nDefFormat (nDefFmt),
+ pVw (0),
pOwnFormatter (0),
bShowLanguageControl(FALSE),
bUseAutomaticLanguage(TRUE)
@@ -90,12 +90,12 @@ NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId,
NumFormatListBox::NumFormatListBox( Window* pWin, SwView* pView,
const ResId& rResId, short nFormatType,
ULONG nDefFmt, BOOL bUsrFmts ) :
- ListBox ( pWin, rResId ),
- nCurrFormatType (-1),
- nStdEntry (0),
- bOneArea (FALSE),
- nDefFormat (nDefFmt),
- pVw (pView),
+ ListBox ( pWin, rResId ),
+ nCurrFormatType (-1),
+ nStdEntry (0),
+ bOneArea (FALSE),
+ nDefFormat (nDefFmt),
+ pVw (pView),
pOwnFormatter (0),
bShowLanguageControl(FALSE),
bUseAutomaticLanguage(TRUE)
@@ -140,7 +140,7 @@ SwView* NumFormatListBox::GetView()
void NumFormatListBox::SetFormatType(const short nFormatType)
{
if (nCurrFormatType == -1 ||
- (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime
+ (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime
{
SvNumberFormatter* pFormatter;
@@ -156,7 +156,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType)
pFormatter = rSh.GetNumberFormatter();
}
- Clear(); // Alle Eintraege in der Listbox entfernen
+ Clear(); // Alle Eintraege in der Listbox entfernen
NfIndexTableOffset eOffsetStart = NF_NUMBER_START;
NfIndexTableOffset eOffsetEnd = NF_NUMBER_START;
@@ -254,8 +254,8 @@ void NumFormatListBox::SetFormatType(const short nFormatType)
pFormatter->GetOutputString( sTxt, nFormat, sValue, &pCol);
}
- if (nFormat != nSysNumFmt &&
- nFormat != nSysShortDateFmt &&
+ if (nFormat != nSysNumFmt &&
+ nFormat != nSysShortDateFmt &&
nFormat != nSysLongDateFmt)
{
nPos = InsertEntry( sValue );
@@ -413,7 +413,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet,
+ SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet,
GetView()->GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_SWNUMFMTDLG );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
@@ -471,7 +471,7 @@ double NumFormatListBox::GetDefValue(const short nFormatType) const
case NUMBERFORMAT_TIME:
fDefValue = SVX_NUMVAL_TIME;
break;
-/* {
+/* {
String sValue("31.8.1997 16:57:34");
ULONG nFormat = pFormatter->GetStandardFormat(nFormatType, LANGUAGE_GERMAN);
pFormatter->IsNumberFormat( sValue, nFormat, fDefValue );
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
index de3f74fb857d..e7bd9dd7d580 100644
--- a/sw/source/ui/utlui/poolfmt.src
+++ b/sw/source/ui/utlui/poolfmt.src
@@ -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
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 406827818ad5..18a6ef611acd 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -2,7 +2,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
@@ -34,10 +34,10 @@
// STATIC DATA -----------------------------------------------------------
PercentField::PercentField( Window* pWin, const ResId& rResId ) :
- MetricField ( pWin, rResId ),
+ MetricField ( pWin, rResId ),
nOldMax (0),
- nOldMin (0),
+ nOldMin (0),
nLastPercent(-1),
nLastValue (-1),
eOldUnit (FUNIT_NONE),
@@ -101,7 +101,7 @@ void PercentField::ShowPercent(BOOL bPercent)
}
else
MetricFormatter::SetValue(nLastPercent);
-// SetValue(100, FUNIT_CUSTOM);
+// SetValue(100, FUNIT_CUSTOM);
}
else
{
@@ -215,7 +215,7 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
{
if (eInUnit == FUNIT_NONE)
eInUnit = eOldUnit;
-// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP));
+// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP));
}
}
@@ -281,7 +281,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
// Umrechnen in Metrik
sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100;
- if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
return NormalizePercent(nTwipValue);
else
return ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit);
@@ -293,7 +293,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
sal_Int64 nAktWidth;
nValue = DenormalizePercent(nValue);
- if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
nAktWidth = nValue;
else
nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/ui/utlui/shdwcrsr.cxx
index d55216dbb44c..36f81c1a2174 100644
--- a/sw/source/ui/utlui/shdwcrsr.cxx
+++ b/sw/source/ui/utlui/shdwcrsr.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index a4f833645ac1..fed0cb21d72f 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx
index db113e1697a7..69c6fbfa0ccb 100644
--- a/sw/source/ui/utlui/textcontrolcombo.cxx
+++ b/sw/source/ui/utlui/textcontrolcombo.cxx
@@ -2,7 +2,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
@@ -35,10 +35,10 @@
TextControlCombo::TextControlCombo( Window* _pParent, const ResId& _rResId,
Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter )
- :Window ( _pParent, _rResId )
- ,mrCtrl ( _rCtrl )
- ,mrFTbefore ( _rFTbefore )
- ,mrFTafter ( _rFTafter )
+ :Window ( _pParent, _rResId )
+ ,mrCtrl ( _rCtrl )
+ ,mrFTbefore ( _rFTbefore )
+ ,mrFTafter ( _rFTafter )
{
}
@@ -48,35 +48,35 @@ TextControlCombo::~TextControlCombo()
void TextControlCombo::Arrange( FixedText& _rFTcomplete, BOOL /*bShow*/ )
{
- Point aBasePos( GetPosPixel() );
- Size aMetricVals( GetSizePixel() );
+ Point aBasePos( GetPosPixel() );
+ Size aMetricVals( GetSizePixel() );
- long nTextHeight = _rFTcomplete.GetSizePixel().Height();
- long nCtrlHeight = mrCtrl.GetSizePixel().Height();
+ long nTextHeight = _rFTcomplete.GetSizePixel().Height();
+ long nCtrlHeight = mrCtrl.GetSizePixel().Height();
// calc y positions / center vertical
- long nYFT = aBasePos.Y();
- long nYCtrl = nYFT;
+ long nYFT = aBasePos.Y();
+ long nYCtrl = nYFT;
if( nCtrlHeight > nTextHeight )
nYFT += aMetricVals.Height();
else
nYCtrl += aMetricVals.Height();
// separate text parts
- const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) );
- String aTxtBefore( _rFTcomplete.GetText() );
- String aTxtAfter;
- xub_StrLen nReplPos = aTxtBefore.Search( aReplStr );
+ const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) );
+ String aTxtBefore( _rFTcomplete.GetText() );
+ String aTxtAfter;
+ xub_StrLen nReplPos = aTxtBefore.Search( aReplStr );
if( nReplPos != STRING_NOTFOUND )
{
- xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len();
+ xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len();
aTxtAfter = String( aTxtBefore, nStrStartAfter, aTxtBefore.Len() - nStrStartAfter );
aTxtBefore.Erase( nReplPos );
}
// arrange and fill Fixed Texts
- long nX = aBasePos.X();
- long nWidth = GetTextWidth( aTxtBefore );
+ long nX = aBasePos.X();
+ long nWidth = GetTextWidth( aTxtBefore );
mrFTbefore.SetText( aTxtBefore );
mrFTbefore.SetPosSizePixel( nX, nYFT, nWidth, nTextHeight );
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx
index a5d71cedd89a..062875aee09b 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/ui/utlui/tmplctrl.cxx
@@ -2,7 +2,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
@@ -54,10 +54,10 @@ class TemplatePopup_Impl : public PopupMenu
public:
TemplatePopup_Impl();
- USHORT GetCurId() const { return nCurId; }
+ USHORT GetCurId() const { return nCurId; }
private:
- USHORT nCurId;
+ USHORT nCurId;
virtual void Select();
};
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index 65018fa90856..a7199d0426b8 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -2,7 +2,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
@@ -93,11 +93,11 @@ int SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const
SfxItemPresentation SwPageFtnInfoItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
- String& rText,
+ SfxMapUnit eCoreUnit,
+ SfxMapUnit ePresUnit,
+ String& rText,
const IntlWrapper* pIntl
-) const
+) const
{
switch ( ePres )
{
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 1c893ad9661e..cc7631040999 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -2,7 +2,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
@@ -111,7 +111,7 @@ void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit)
}
/*--------------------------------------------------------------------
- Beschreibung: Boxinfo-Attribut setzen
+ Beschreibung: Boxinfo-Attribut setzen
--------------------------------------------------------------------*/
@@ -124,7 +124,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh)
aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo;
// Tabellenvariante, wenn mehrere Tabellenzellen selektiert
- rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
+ rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1);
// Abstandsfeld immer anzeigen
aBoxInfo.SetDist ((BOOL) TRUE);
@@ -139,7 +139,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh)
}
/*--------------------------------------------------------------------
- Beschreibung: Header Footer fuellen
+ Beschreibung: Header Footer fuellen
--------------------------------------------------------------------*/
@@ -161,7 +161,7 @@ void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: PageDesc <-> in Sets wandeln und zurueck
+ Beschreibung: PageDesc <-> in Sets wandeln und zurueck
--------------------------------------------------------------------*/
@@ -225,7 +225,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
}
else
- { // Header ausschalten
+ { // Header ausschalten
//
if(rMaster.GetHeader().IsActive())
{
@@ -261,7 +261,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue());
}
else
- { // Footer ausschalten
+ { // Footer ausschalten
//
if(rMaster.GetFooter().IsActive())
{
@@ -312,7 +312,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
}
}
-void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
+void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
{
const SwFrmFmt& rMaster = rPageDesc.GetMaster();
@@ -371,10 +371,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
// HeaderInfo, Raender, Hintergrund, Umrandung
//
SfxItemSet aHeaderSet( *rSet.GetPool(),
- SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
- RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+ SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED,
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ RES_FRMATR_BEGIN, RES_FRMATR_END-1,
0);
// dynamische oder feste Hoehe
@@ -417,10 +417,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
// FooterInfo, Raender, Hintergrund, Umrandung
//
SfxItemSet aFooterSet( *rSet.GetPool(),
- SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
- RES_FRMATR_BEGIN, RES_FRMATR_END-1,
+ SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED,
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ RES_FRMATR_BEGIN, RES_FRMATR_END-1,
0);
// dynamische oder feste Hoehe
@@ -472,7 +472,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
/*--------------------------------------------------------------------
- Beschreibung: DefaultTabs setzen
+ Beschreibung: DefaultTabs setzen
--------------------------------------------------------------------*/
@@ -487,7 +487,7 @@ void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs)
}
/*--------------------------------------------------------------------
- Beschreibung: Abstand zwischen zwei Tabs
+ Beschreibung: Abstand zwischen zwei Tabs
--------------------------------------------------------------------*/
@@ -518,7 +518,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, FALSE, &pItem ))
{
const String& rDescName = ((SvxPageModelItem*)pItem)->GetValue();
- if( rDescName.Len() ) // kein Name -> PageDesc ausschalten!
+ if( rDescName.Len() ) // kein Name -> PageDesc ausschalten!
{
// nur loeschen, wenn PageDesc eingschaltet wird!
rSet.ClearItem( RES_BREAK );
@@ -584,21 +584,21 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Metric ermitteln
+ Beschreibung: Metric ermitteln
--------------------------------------------------------------------*/
-FieldUnit GetDfltMetric(BOOL bWeb)
+FieldUnit GetDfltMetric(BOOL bWeb)
{
return SW_MOD()->GetUsrPref(bWeb)->GetMetric();
}
/*--------------------------------------------------------------------
- Beschreibung: Metric ermitteln
+ Beschreibung: Metric ermitteln
--------------------------------------------------------------------*/
-void SetDfltMetric( FieldUnit eMetric, BOOL bWeb )
+void SetDfltMetric( FieldUnit eMetric, BOOL bWeb )
{
SW_MOD()->ApplyUserMetric(eMetric, bWeb);
}
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index e0d9a5ee7a10..a61579e16a73 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -2,7 +2,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
@@ -97,7 +97,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
// the controller is asynchronously set
aLoadedTimer.SetTimeoutHdl(LINK(this, SwOneExampleFrame, TimeoutHdl));
-// aLoadedTimer.SetTimeout(500);
+// aLoadedTimer.SetTimeout(500);
aLoadedTimer.SetTimeout(200);
rWin.Enable(sal_False);
@@ -122,7 +122,7 @@ SwOneExampleFrame::~SwOneExampleFrame()
DisposeControl();
}
-void SwOneExampleFrame::CreateControl()
+void SwOneExampleFrame::CreateControl()
{
if(_xControl.is())
return ;
@@ -176,7 +176,7 @@ void SwOneExampleFrame::CreateControl()
}
}
-void SwOneExampleFrame::DisposeControl()
+void SwOneExampleFrame::DisposeControl()
{
_xCursor = 0;
if(_xControl.is())
@@ -228,20 +228,20 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
if( !bIsInitialized )
{
- xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet);
+ xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS )), aTrueSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS )), aTrueSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT )), aFalseSet);
- xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet);
+ xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES )), aFalseSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES )), aTrueSet);
xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS )), aFalseSet);
- xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet);
+ xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet);
if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT))
{
@@ -387,8 +387,8 @@ static const sal_Int16 nZoomValues[] =
100
};
-#define ITEM_UP 100
-#define ITEM_DOWN 200
+#define ITEM_UP 100
+#define ITEM_DOWN 200
#define ITEM_ZOOM 300
void SwOneExampleFrame::CreatePopup(const Point& rPt)
@@ -457,7 +457,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu )
};
SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, WinBits nBits,
- SwOneExampleFrame* pFrame) :
+ SwOneExampleFrame* pFrame) :
Window(pParent, nBits),
pExampleFrame(pFrame)
{
diff --git a/sw/source/ui/utlui/unotools.hrc b/sw/source/ui/utlui/unotools.hrc
index d68577036830..2213012bfc6a 100644
--- a/sw/source/ui/utlui/unotools.hrc
+++ b/sw/source/ui/utlui/unotools.hrc
@@ -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
@@ -34,8 +34,8 @@
#define PB_HELP 5
#define PB_CANCEL 6
-#define ST_MENU_ZOOM 1
-#define ST_MENU_UP 2
+#define ST_MENU_ZOOM 1
+#define ST_MENU_UP 2
#define ST_MENU_DOWN 3
#endif
diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src
index ac805c9da947..aa4be8804cfb 100644
--- a/sw/source/ui/utlui/unotools.src
+++ b/sw/source/ui/utlui/unotools.src
@@ -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
@@ -88,9 +88,9 @@ Resource RES_FRMEX_MENU
{
ItemList [ en-US ] =
{
- < "~Zoom" ; ST_MENU_ZOOM; > ;
- < "~Upwards" ; ST_MENU_UP; > ;
- < "Do~wnwards" ; ST_MENU_DOWN; > ;
+ < "~Zoom" ; ST_MENU_ZOOM; > ;
+ < "~Upwards" ; ST_MENU_UP; > ;
+ < "Do~wnwards" ; ST_MENU_DOWN; > ;
};
};
};
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index dfa3e07f9053..a48e36487c03 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -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
@@ -94,11 +94,11 @@ Resource RID_SHELLRES_AUTOFMTSTRS
{
Text [ en-US ] = "Set \"Text body\" Style";
};
- String STR_AUTOFMTREDL_SET_TMPL_INDENT +1
+ String STR_AUTOFMTREDL_SET_TMPL_INDENT +1
{
Text [ en-US ] = "Set \"Text body indent\" Style";
};
- String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1
+ String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1
{
Text [ en-US ] = "Set \"Hanging indent\" Style";
};
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 1b9700a5fe2d..16ada1f26afa 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx
index 024f516e889c..a828c9d6cd9b 100644
--- a/sw/source/ui/utlui/zoomctrl.cxx
+++ b/sw/source/ui/utlui/zoomctrl.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 2075abf4a1f8..c3794606de29 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -2,7 +2,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
@@ -65,24 +65,24 @@ extern sdecl::ServiceDecl const serviceDecl;
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment(
+ void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
OSL_TRACE("In component_getImplementationEnv");
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- sal_Bool SAL_CALL component_writeInfo(
+ sal_Bool SAL_CALL component_writeInfo(
lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
{
OSL_TRACE("In component_writeInfo");
// Component registration
- return component_writeInfoHelper( pServiceManager, pRegistryKey,
- globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
+ return component_writeInfoHelper( pServiceManager, pRegistryKey,
+ globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
}
- void * SAL_CALL component_getFactory(
+ void * SAL_CALL component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 3e0873c00646..71a372ee1234 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -2,7 +2,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
@@ -84,14 +84,14 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt
}
}
-rtl::OUString&
+rtl::OUString&
SwVbaAddin::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaAddin::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index 9f4e8c5f797f..ae92cddcb249 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 2e206cca07c0..e454ad1cb667 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -2,7 +2,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
@@ -88,14 +88,14 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString&
+rtl::OUString&
SwVbaAddins::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaAddins::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx
index 2d5b651f76fe..65642aada236 100644
--- a/sw/source/ui/vba/vbaaddins.hxx
+++ b/sw/source/ui/vba/vbaaddins.hxx
@@ -2,7 +2,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
@@ -45,10 +45,10 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaAddins_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-};
+};
#endif /* SW_VBA_ADDINS_HXX */
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index c1da3cc3eb61..140da0b69711 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@ using ::rtl::OUString;
#define FILE_PATH_SEPERATOR "/"
#else // windows
#define FILE_PATH_SEPERATOR "\\"
-#endif
+#endif
#define EXCELVERSION "11.0"
@@ -95,7 +95,7 @@ SwVbaApplication::getActiveDocument() throw (uno::RuntimeException)
return new SwVbaDocument( this, mxContext, getCurrentDocument() );
}
-uno::Reference< word::XWindow > SAL_CALL
+uno::Reference< word::XWindow > SAL_CALL
SwVbaApplication::getActiveWindow() throw (uno::RuntimeException)
{
// #FIXME sofar can't determine Parent
@@ -189,20 +189,20 @@ float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw
return VbaApplicationBase::CentimetersToPoints( _Centimeters );
}
-uno::Reference< frame::XModel >
+uno::Reference< frame::XModel >
SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
{
return getCurrentWordDoc( mxContext );
}
-rtl::OUString&
+rtl::OUString&
SwVbaApplication::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaApplication::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index bece42209ba8..a5777142afce 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -2,7 +2,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
@@ -85,14 +85,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
return uno::Reference< word::XRange >( pWhere );
}
-rtl::OUString&
+rtl::OUString&
SwVbaAutoTextEntry::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaAutoTextEntry::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -130,14 +130,14 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaAutoTextEntries::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaAutoTextEntries::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx
index c5c22da79b56..c37a62f8ca76 100644
--- a/sw/source/ui/vba/vbaautotextentry.hxx
+++ b/sw/source/ui/vba/vbaautotextentry.hxx
@@ -2,7 +2,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,10 +73,10 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaAutoTextEntries_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-};
+};
#endif /* SW_VBA_AUTOTEXTENTRY_HXX */
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index d254659ac260..e580f946ef06 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -2,7 +2,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
@@ -92,14 +92,14 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaBookmark::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaBookmark::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index 42aee48ca0bb..4c17749a5f36 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ private:
void checkVality() throw ( css::uno::RuntimeException );
public:
- SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
virtual ~SwVbaBookmark();
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index d199728b0209..ea1022bc92e3 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -2,7 +2,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
@@ -45,8 +45,8 @@ class BookmarksEnumeration : public EnumerationHelperImpl
public:
BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
rtl::OUString aName = xNamed->getName();
return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) );
@@ -70,7 +70,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return mxIndexAccess->getElementType(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); }
- // XNameAcess
+ // XNameAcess
virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
@@ -114,7 +114,7 @@ public:
}
};
-SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel )
+SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel )
{
mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
@@ -179,51 +179,51 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw
rtl::OUString aName = rName;
if( m_xNameAccess->hasByName( aName ) )
removeBookmarkByName( aName );
-
+
addBookmarkByName( mxModel, aName, xTextRange );
return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException)
{
return word::WdBookmarkSortBy::wdSortByName;
}
-void SAL_CALL
+void SAL_CALL
SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException)
{
// not support in Writer
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException)
{
return sal_True;
}
-void SAL_CALL
+void SAL_CALL
SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException)
{
// not support in Writer
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
{
sal_Bool bExist = m_xNameAccess->hasByName( rName );
return bExist;
}
-rtl::OUString&
+rtl::OUString&
SwVbaBookmarks::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaBookmarks::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx
index 0060bb67c357..606f57b0438c 100644
--- a/sw/source/ui/vba/vbabookmarks.hxx
+++ b/sw/source/ui/vba/vbabookmarks.hxx
@@ -2,7 +2,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
@@ -59,7 +59,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaBookmarks_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
@@ -71,7 +71,7 @@ public:
virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
-};
+};
#endif /* SW_VBA_BOOKMARKS_HXX */
diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx
index 536960aeee84..17f4fe5f6d25 100644
--- a/sw/source/ui/vba/vbaborders.hxx
+++ b/sw/source/ui/vba/vbaborders.hxx
@@ -2,7 +2,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
@@ -50,9 +50,9 @@ public:
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
- // SwVbaCollectionBaseImpl
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-
+ // SwVbaCollectionBaseImpl
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+
virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException);
virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index 14f9a40da019..adcc464e9e3c 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ static const WordDialogTable aWordDialogTable[] =
{ 0, 0 }
};
-rtl::OUString
+rtl::OUString
SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
{
for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ )
@@ -59,14 +59,14 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
return rtl::OUString();
}
-rtl::OUString&
+rtl::OUString&
SwVbaDialog::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaDialog::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx
index 763fc192cb04..f4f8d1b5bd10 100644
--- a/sw/source/ui/vba/vbadialog.hxx
+++ b/sw/source/ui/vba/vbadialog.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx
index 3bebd662e0cf..7db0dafdd558 100644
--- a/sw/source/ui/vba/vbadialogs.cxx
+++ b/sw/source/ui/vba/vbadialogs.cxx
@@ -2,7 +2,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
@@ -41,14 +41,14 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
return uno::Any( aDialog );
}
-rtl::OUString&
+rtl::OUString&
SwVbaDialogs::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaDialogs::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx
index 7895bbb385ea..ff6a0748de65 100644
--- a/sw/source/ui/vba/vbadialogs.hxx
+++ b/sw/source/ui/vba/vbadialogs.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVba
class SwVbaDialogs : public SwVbaDialogs_BASE
{
public:
- SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {}
+ SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {}
virtual ~SwVbaDialogs() {}
// XCollection
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 30d41900019b..d76d3218adb6 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@ SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& xParent,
SwVbaDocument::SwVbaDocument( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaDocument_BASE( aArgs, xContext )
{
Initialize();
-}
+}
SwVbaDocument::~SwVbaDocument()
{
@@ -80,10 +80,10 @@ SwVbaDocument::~SwVbaDocument()
void SwVbaDocument::Initialize()
{
- mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );
+ mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );
}
-uno::Reference< word::XRange > SAL_CALL
+uno::Reference< word::XRange > SAL_CALL
SwVbaDocument::getContent() throw ( uno::RuntimeException )
{
uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
@@ -91,12 +91,12 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException )
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
}
-uno::Reference< word::XRange > SAL_CALL
+uno::Reference< word::XRange > SAL_CALL
SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno::RuntimeException )
{
if( !rStart.hasValue() && !rEnd.hasValue() )
return getContent();
-
+
sal_Int32 nStart = 0;
sal_Int32 nEnd = 0;
rStart >>= nStart;
@@ -130,7 +130,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno
catch( uno::Exception )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
+ }
}
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
}
@@ -153,7 +153,7 @@ SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::Run
return uno::makeAny( xCol );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException )
{
uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW );
@@ -161,11 +161,11 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException
uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) );
if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID )
return uno::makeAny( xBookmarksVba );
-
+
return uno::Any( xBookmarksVba->Item( rIndex, uno::Any() ) );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException )
{
uno::Reference< document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW );
@@ -175,7 +175,7 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException
uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) );
if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID )
return uno::makeAny( xVariables );
-
+
return uno::Any( xVariables->Item( rIndex, uno::Any() ) );
}
@@ -261,13 +261,13 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaDocument::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
return sImplName;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
{
uno::Reference< word::XTemplate > xTemplate;
@@ -280,7 +280,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
return uno::makeAny( xTemplate );
}
-void SAL_CALL
+void SAL_CALL
SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
{
rtl::OUString sTemplate;
@@ -304,12 +304,12 @@ SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) thr
xDocProps->setTemplateURL( aURL );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
{
uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) );
-
+
if ( aIndex.hasValue() )
return xColl->Item( aIndex, uno::Any() );
return uno::makeAny( xColl );
@@ -454,44 +454,44 @@ SwVbaDocument::getControlShape( const ::rtl::OUString& sName )
return uno::Any();
}
-uno::Reference< beans::XIntrospectionAccess > SAL_CALL
+uno::Reference< beans::XIntrospectionAccess > SAL_CALL
SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException)
{
return uno::Reference< beans::XIntrospectionAccess >();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf",
rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
+
throw uno::RuntimeException(); // unsupported operation
}
-void SAL_CALL
+void SAL_CALL
SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
throw uno::RuntimeException(); // unsupported operation
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
-
+
uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) );
return uno::makeAny( xControl );
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
{
return sal_False;
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
{
uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
@@ -500,7 +500,7 @@ SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeEx
return sal_False;
}
-uno::Reference< container::XNameAccess >
+uno::Reference< container::XNameAccess >
SwVbaDocument::getFormControls()
{
uno::Reference< container::XNameAccess > xFormControls;
@@ -509,7 +509,7 @@ SwVbaDocument::getFormControls()
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
uno::Reference< form::XFormsSupplier > xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
- // get the www-standard container ( maybe we should access the
+ // get the www-standard container ( maybe we should access the
// 'www-standard' by name rather than index, this seems an
// implementation detail
xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
@@ -520,7 +520,7 @@ SwVbaDocument::getFormControls()
return xFormControls;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaDocument::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index 12907e02be83..a8ff27a506d2 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 428d5f3ca98c..805d64b32f4d 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgume
switch ( aType.getTypeClass() )
{
- case uno::TypeClass_BOOLEAN:
+ case uno::TypeClass_BOOLEAN:
msoType = office::MsoDocProperties::msoPropertyTypeBoolean;
break;
case uno::TypeClass_FLOAT:
@@ -75,7 +75,7 @@ protected:
uno::Reference< frame::XModel > m_xModel;
uno::Reference< beans::XPropertySet > mxProps;
public:
- PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel )
+ PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel )
{
uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
mxProps.set( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
@@ -90,7 +90,7 @@ public:
class BuiltinPropertyGetSetHelper : public PropertGetSetHelper
{
public:
- BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel )
+ BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel )
{
}
virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
@@ -115,7 +115,7 @@ public:
CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel )
{
uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( mxProps, uno::UNO_QUERY_THROW );
- uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
+ uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
mxProps.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
}
};
@@ -132,7 +132,7 @@ public:
virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
{
uno::Sequence< beans::NamedValue > stats;
- try
+ try
{
// Characters, ParagraphCount & WordCount are available from
// the model ( and addtionally these also update the statics object )
@@ -159,7 +159,7 @@ public:
{
mxModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphCount") ) ) >>= stats;
mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
-
+
sal_Int32 nLen = stats.getLength();
bool bFound = false;
for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index )
@@ -168,8 +168,8 @@ public:
{
aReturn = stats[ index ].Value;
bFound = true;
- }
- }
+ }
+ }
if ( !bFound )
throw uno::RuntimeException(); // bad Property
}
@@ -181,7 +181,7 @@ public:
uno::Sequence< beans::NamedValue > stats;
mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
-
+
sal_Int32 nLen = stats.getLength();
for ( sal_Int32 index = 0; index < nLen; ++index )
{
@@ -190,8 +190,8 @@ public:
stats[ index ].Value = aValue;
mxProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ), uno::makeAny( stats ) );
break;
- }
- }
+ }
+ }
}
};
@@ -201,7 +201,7 @@ public:
rtl::OUString msMSODesc;
rtl::OUString msOOOPropName;
boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
-
+
static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
{
DocPropInfo aItem;
@@ -215,24 +215,24 @@ public:
{
return createDocPropInfo( rtl::OUString::createFromAscii( sDesc ), rtl::OUString::createFromAscii( sPropName ), rHelper );
}
- uno::Any getValue()
+ uno::Any getValue()
{
if ( mpPropGetSetHelper.get() )
- return mpPropGetSetHelper->getPropertyValue( msOOOPropName );
+ return mpPropGetSetHelper->getPropertyValue( msOOOPropName );
return uno::Any();
}
- void setValue( const uno::Any& rValue )
+ void setValue( const uno::Any& rValue )
{
if ( mpPropGetSetHelper.get() )
- mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue );
+ mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue );
}
- uno::Reference< beans::XPropertySet > getUnoProperties()
- {
-
+ uno::Reference< beans::XPropertySet > getUnoProperties()
+ {
+
uno::Reference< beans::XPropertySet > xProps;
if ( mpPropGetSetHelper.get() )
- return mpPropGetSetHelper->getUnoProperties();
- return xProps;
+ return mpPropGetSetHelper->getUnoProperties();
+ return xProps;
}
};
@@ -261,7 +261,7 @@ public:
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", aStandardHelper );
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", aStandardHelper );
- m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct
+ m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", aUsingStatsHelper ); // special handling required ?
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", aUsingStatsHelper ); // special handling require ?
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", aUsingStatsHelper ); // special handling required ?
@@ -359,22 +359,22 @@ SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent
// #FIXME we need to store the link source somewhere
}
-void SAL_CALL
+void SAL_CALL
SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
- // setName on existing property ?
- // #FIXME
+ // setName on existing property ?
+ // #FIXME
// do we need to delete existing property and create a new one?
}
-void SAL_CALL
+void SAL_CALL
SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// setType, do we need to do a conversion?
// #FIXME the underlying value needs to be changed to the new type
}
-void SAL_CALL
+void SAL_CALL
SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUnoProperties(), uno::UNO_QUERY_THROW );
@@ -383,16 +383,16 @@ SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno:
SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaDocumentProperty_BASE( xParent, xContext ), mPropInfo( rInfo )
{
-}
+}
-void SAL_CALL
+void SAL_CALL
SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-
-::rtl::OUString SAL_CALL
+
+::rtl::OUString SAL_CALL
SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return mPropInfo.msMSODesc;
@@ -405,33 +405,33 @@ SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::Bas
throw uno::RuntimeException();
}
-::sal_Int8 SAL_CALL
+::sal_Int8 SAL_CALL
SwVbaBuiltInDocumentProperty::getType( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return lcl_toMSOPropType( getValue().getValueType() );
}
-void SAL_CALL
+void SAL_CALL
SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
SwVbaBuiltInDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return sal_False; // built-in always false
}
-void SAL_CALL
+void SAL_CALL
SwVbaBuiltInDocumentProperty::setLinkToContent( ::sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aRet = mPropInfo.getValue();
@@ -440,34 +440,34 @@ SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, u
return aRet;
}
-void SAL_CALL
+void SAL_CALL
SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException)
{
mPropInfo.setValue( Value );
}
-rtl::OUString SAL_CALL
+rtl::OUString SAL_CALL
SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-void SAL_CALL
+void SAL_CALL
SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-rtl::OUString&
+rtl::OUString&
SwVbaBuiltInDocumentProperty::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") );
- return sImplName;
+ return sImplName;
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<rtl::OUString>
SwVbaBuiltInDocumentProperty::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -491,7 +491,7 @@ class DocPropEnumeration : public DocPropEnumeration_BASE
DocProps mDocProps;
DocProps::iterator mIt;
public:
-
+
DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {}
virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
{
@@ -515,10 +515,10 @@ protected:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< frame::XModel > m_xModel;
uno::Reference< document::XDocumentInfo > m_xOOOBuiltIns;
-
+
DocProps mDocProps;
DocPropsByName mNamedDocProps;
-
+
public:
BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
{
@@ -527,7 +527,7 @@ protected:
{
mDocProps[ index ] = new SwVbaBuiltInDocumentProperty( xParent, xContext, builtIns.getDocPropInfoMap()[ index ] );
mNamedDocProps[ mDocProps[ index ]->getName() ] = mDocProps[ index ];
- }
+ }
}
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
@@ -548,7 +548,7 @@ protected:
throw container::NoSuchElementException();
DocPropsByName::iterator it = mNamedDocProps.find( aName );
return uno::Any( it->second );
-
+
}
virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
@@ -557,7 +557,7 @@ protected:
DocPropsByName::iterator it_end = mNamedDocProps.end();
for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName )
*pName = it->first;
- return aNames;
+ return aNames;
}
virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
@@ -568,9 +568,9 @@ protected:
return sal_True;
}
// XElementAccess
- virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
+ virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
- return XDocumentProperty::static_type(0);
+ return XDocumentProperty::static_type(0);
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
{
@@ -584,9 +584,9 @@ protected:
SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel )
{
-}
+}
-uno::Reference< XDocumentProperty > SAL_CALL
+uno::Reference< XDocumentProperty > SAL_CALL
SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
throw uno::RuntimeException(
@@ -594,21 +594,21 @@ SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool
}
// XEnumerationAccess
-uno::Type SAL_CALL
+uno::Type SAL_CALL
SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
{
- return XDocumentProperty::static_type(0);
+ return XDocumentProperty::static_type(0);
}
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException)
{
uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
return xEnumAccess->createEnumeration();
}
-// ScVbaCollectionBaseImpl
-uno::Any
+// ScVbaCollectionBaseImpl
+uno::Any
SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource )
{
// pass through
@@ -616,14 +616,14 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString&
SwVbaBuiltinDocumentProperties::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") );
- return sImplName;
+ return sImplName;
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<rtl::OUString>
SwVbaBuiltinDocumentProperties::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -647,11 +647,11 @@ public:
{
// suck in the document( custom ) properties
uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
- uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
- uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
- mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
+ uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
+ uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
+ mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
mpPropGetSetHelper.reset( new CustomPropertyGetSetHelper( m_xModel ) );
- };
+ };
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
{
@@ -696,9 +696,9 @@ public:
}
// XElementAccess
- virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
+ virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
- return XDocumentProperty::static_type(0);
+ return XDocumentProperty::static_type(0);
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
@@ -737,7 +737,7 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen
m_xNameAccess.set( m_xIndexAccess, uno::UNO_QUERY_THROW );
}
-uno::Reference< XDocumentProperty > SAL_CALL
+uno::Reference< XDocumentProperty > SAL_CALL
SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
{
CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
@@ -757,11 +757,11 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString&
SwVbaCustomDocumentProperties::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") );
- return sImplName;
+ return sImplName;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx
index 7a3697771eaa..7b49d5c05db4 100644
--- a/sw/source/ui/vba/vbadocumentproperties.hxx
+++ b/sw/source/ui/vba/vbadocumentproperties.hxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@ public:
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
- // ScVbaCollectionBaseImpl
+ // ScVbaCollectionBaseImpl
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index de3c9bb1d060..6540a3f1d448 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -2,7 +2,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
@@ -68,7 +68,7 @@ getDocument( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe
uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
if( !xModel.is() )
return uno::Any();
-
+
SwVbaDocument *pWb = new SwVbaDocument( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
return uno::Any( uno::Reference< word::XDocument > (pWb) );
}
@@ -79,8 +79,8 @@ class DocumentEnumImpl : public EnumerationHelperImpl
public:
DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
return getDocument( m_xContext, xDoc, m_aApplication );
}
@@ -99,7 +99,7 @@ uno::Reference< container::XEnumeration >
SwVbaDocuments::createEnumeration() throw (uno::RuntimeException)
{
// #FIXME its possible the DocumentEnumImpl here doens't reflect
- // the state of this object ( although it should ) would be
+ // the state of this object ( although it should ) would be
// safer to create an enumeration based on this objects state
// rather than one effectively based of the desktop component
uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
@@ -178,14 +178,14 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ReadOnly,
return VbaDocumentsBase::Open( Filename, ReadOnly, rProps );
}
-rtl::OUString&
+rtl::OUString&
SwVbaDocuments::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments") );
return sImplName;
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<rtl::OUString>
SwVbaDocuments::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index 848406aa13ae..665b07de75f1 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -2,7 +2,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
@@ -49,7 +49,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaDocuments_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 717e302eeba1..fc8ec9d01993 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -2,7 +2,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
@@ -122,7 +122,7 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt
{
mxTVC->gotoStart(sal_False);
xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY );
- }
+ }
else
{
mxTVC->gotoEnd( sal_False );
@@ -321,7 +321,7 @@ void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::Run
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException)
{
sal_Bool result = sal_False;
@@ -401,21 +401,21 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
return result;
}
-void SAL_CALL
+void SAL_CALL
SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException)
{
uno::Sequence< beans::PropertyValue > aSearchAttribs;
mxPropertyReplace->setSearchAttributes( aSearchAttribs );
}
-rtl::OUString&
+rtl::OUString&
SwVbaFind::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFind") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaFind::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index dcecd0060fd9..0c5bf65bc41d 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 76803fa216e2..91fa3d605659 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -25,8 +25,8 @@ static MapPair UnderLineTable[] = {
{ word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE },
{ word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED },
{ word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH },
- { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH },
- { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT },
+ { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH },
+ { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT },
{ word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT },
{ word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE },
{ word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED },
@@ -65,7 +65,7 @@ public:
static UnderLineMapper& instance()
{
static UnderLineMapper theMapper;
- return theMapper;
+ return theMapper;
}
sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException )
@@ -88,7 +88,7 @@ SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const u
{
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getUnderline() throw (uno::RuntimeException)
{
sal_Int32 nOOVal = 0;
@@ -96,7 +96,7 @@ SwVbaFont::getUnderline() throw (uno::RuntimeException)
return uno::makeAny( UnderLineMapper::instance().getMSOFromOOO( nOOVal ) );
}
-void SAL_CALL
+void SAL_CALL
SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException)
{
sal_Int32 nMSOVal = 0;
@@ -121,7 +121,7 @@ SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
sal_Int32 nIndex = 0;
_colorindex >>= nIndex;
return setColor( OORGBToXLRGB(mxPalette->getByIndex( nIndex )) );
-}
+}
uno::Any SAL_CALL
SwVbaFont::getColorIndex() throw ( uno::RuntimeException )
@@ -142,8 +142,8 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException )
}
}
return uno::makeAny( nIndex );
-}
-uno::Any SAL_CALL
+}
+uno::Any SAL_CALL
SwVbaFont::getSubscript() throw ( uno::RuntimeException )
{
sal_Bool bRes = sal_False;
@@ -153,7 +153,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException )
return aLongAnyFalse;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getSuperscript() throw ( uno::RuntimeException )
{
sal_Bool bRes = sal_False;
@@ -163,7 +163,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException )
return aLongAnyFalse;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getBold() throw (uno::RuntimeException)
{
sal_Bool bRes = sal_False;
@@ -173,7 +173,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException)
return aLongAnyFalse;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getItalic() throw (uno::RuntimeException)
{
sal_Bool bRes = sal_False;
@@ -183,7 +183,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException)
return aLongAnyFalse;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException)
{
sal_Bool bRes = sal_False;
@@ -193,7 +193,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException)
return aLongAnyFalse;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaFont::getShadow() throw (uno::RuntimeException)
{
sal_Bool bRes = sal_False;
diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx
index 2e42936c345e..fead5bf58b41 100644
--- a/sw/source/ui/vba/vbafont.hxx
+++ b/sw/source/ui/vba/vbafont.hxx
@@ -27,7 +27,7 @@ public:
virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 19ba048b1426..d7d975549e65 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -2,7 +2,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
@@ -54,7 +54,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere
aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
aInitArgs[ 1 ].Name = sDocCtxName;
aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
-
+
init( aInitArgs );
}
@@ -69,32 +69,32 @@ SwVbaGlobals::~SwVbaGlobals()
uno::Reference<word::XApplication >
SwVbaGlobals::getApplication() throw (uno::RuntimeException)
{
- OSL_TRACE("In SwVbaGlobals::getApplication");
+ OSL_TRACE("In SwVbaGlobals::getApplication");
if ( !mxApplication.is() )
mxApplication.set( new SwVbaApplication( mxContext) );
-
- return mxApplication;
+
+ return mxApplication;
}
uno::Reference<word::XSystem > SAL_CALL
SwVbaGlobals::getSystem() throw (uno::RuntimeException)
{
- return getApplication()->getSystem();
+ return getApplication()->getSystem();
}
-uno::Reference< word::XDocument > SAL_CALL
+uno::Reference< word::XDocument > SAL_CALL
SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException)
{
- return getApplication()->getActiveDocument();
+ return getApplication()->getActiveDocument();
}
-uno::Reference< word::XWindow > SAL_CALL
+uno::Reference< word::XWindow > SAL_CALL
SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
{
return getApplication()->getActiveWindow();
}
-rtl::OUString SAL_CALL
+rtl::OUString SAL_CALL
SwVbaGlobals::getName() throw (uno::RuntimeException)
{
return getApplication()->getName();
@@ -173,7 +173,7 @@ SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
if ( !bInit )
{
- rtl::OUString names[] = {
+ rtl::OUString names[] = {
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ),
// #FIXME #TODO make Application a proper service
// ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ),
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index 91c18e8958d9..5d93f3cd8bf9 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index d4c095ad1228..e26741fc710e 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx
index e46f62961541..ac58721da394 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -2,7 +2,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
@@ -63,7 +63,7 @@ double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css
// FIXME: handle multipul page style
// it is very strange that the curros position is incorrect when open Word file.
// e.g. if current cursor in the top left of the text body of the first page without header,
- // the top value of current position should be 0, but is 201 when open a Word file.
+ // the top value of current position should be 0, but is 201 when open a Word file.
nCurrentPos = nCurrentPos + nTopMargin - ( DEFAULT_PAGE_DISTANCE + TWIP_TO_MM100( nPageHeight ) ) * ( nCurrentPage - 1 );
return Millimeter::getInPoints( nCurrentPos );
}
diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx
index 7212c5504e3b..581bb95fdd68 100644
--- a/sw/source/ui/vba/vbainformationhelper.hxx
+++ b/sw/source/ui/vba/vbainformationhelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 47a81de0da0f..f2dca6b947b7 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -2,7 +2,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
@@ -47,7 +47,7 @@ SwVbaOptions::~SwVbaOptions()
{
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
{
switch( _path )
@@ -91,7 +91,7 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
}
default:
{
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
+ DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
break;
}
}
@@ -265,14 +265,14 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof
}
-rtl::OUString&
+rtl::OUString&
SwVbaOptions::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaOptions::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx
index 7ef21fd3b406..169f1beebbfe 100644
--- a/sw/source/ui/vba/vbaoptions.hxx
+++ b/sw/source/ui/vba/vbaoptions.hxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE;
-class SwVbaOptions : public SwVbaOptions_BASE,
+class SwVbaOptions : public SwVbaOptions_BASE,
public PropListener
{
private:
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 7a1519bb2578..ad8f13349224 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
+SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< frame::XModel >& xModel,
const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException):
@@ -47,7 +47,7 @@ SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
mxPageProps.set( xProps, uno::UNO_QUERY_THROW );
mnOrientPortrait = word::WdOrientation::wdOrientPortrait;
mnOrientLandscape = word::WdOrientation::wdOrientLandscape;
-}
+}
double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException)
{
@@ -94,7 +94,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isHeaderOn;
if( !isHeaderOn )
mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")), uno::makeAny( sal_True ) );
-
+
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TopMargin"))) >>= aktTopMargin;
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance"))) >>= aktSpacing;
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))) >>= aktHeaderHeight;
@@ -128,7 +128,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isFooterOn;
if( !isFooterOn )
mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")), uno::makeAny( sal_True ) );
-
+
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BottomMargin"))) >>= aktBottomMargin;
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance"))) >>= aktSpacing;
mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))) >>= aktFooterHeight;
@@ -244,7 +244,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
wdSectionStart = word::WdSectionStart::wdSectionOddPage;
else
wdSectionStart = word::WdSectionStart::wdSectionNewPage;
- return wdSectionStart;
+ return wdSectionStart;
}
void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException)
@@ -253,14 +253,14 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t
// #FIXME:
}
-rtl::OUString&
+rtl::OUString&
SwVbaPageSetup::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaPageSetup::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx
index 243ffca33e28..1437b4d92bbc 100644
--- a/sw/source/ui/vba/vbapagesetup.hxx
+++ b/sw/source/ui/vba/vbapagesetup.hxx
@@ -2,7 +2,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
@@ -37,16 +37,16 @@
typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE;
-class SwVbaPageSetup : public SwVbaPageSetup_BASE
+class SwVbaPageSetup : public SwVbaPageSetup_BASE
{
private:
rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
public:
- SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent,
+ SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
- const css::uno::Reference< css::frame::XModel >& xModel,
- const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException);
+ const css::uno::Reference< css::frame::XModel >& xModel,
+ const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException);
virtual ~SwVbaPageSetup(){}
// Attributes
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 3639d0e63638..8943b73b4a6a 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -14,7 +14,7 @@ static const sal_Int32 ColorTable[] =
{
WdColor::wdColorAutomatic, // 0
WdColor::wdColorBlack, // 1
-WdColor::wdColorBlue, // 2
+WdColor::wdColorBlue, // 2
WdColor::wdColorTurquoise, // 3
WdColor::wdColorBrightGreen, // 4
WdColor::wdColorPink, // 5
@@ -72,7 +72,7 @@ uno::Reference< container::XIndexAccess >
VbaPalette::getPalette() const
{
- return mxPalette;
+ return mxPalette;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx
index 8d6d63f2dd3a..5d7b6fe6529e 100644
--- a/sw/source/ui/vba/vbapalette.hxx
+++ b/sw/source/ui/vba/vbapalette.hxx
@@ -8,7 +8,7 @@ class VbaPalette
css::uno::Reference< css::container::XIndexAccess > mxPalette;
public:
VbaPalette();
- // if no palette available e.g. because the document doesn't have a
+ // if no palette available e.g. because the document doesn't have a
// palette defined then a default palette will be returned.
css::uno::Reference< css::container::XIndexAccess > getPalette() const;
};
diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx
index 2db1d8a27850..a76596c3fd62 100644
--- a/sw/source/ui/vba/vbapane.cxx
+++ b/sw/source/ui/vba/vbapane.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@ SwVbaPane::~SwVbaPane()
uno::Any SAL_CALL
SwVbaPane::View() throw ( css::uno::RuntimeException )
{
- return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) );
+ return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) );
}
void SAL_CALL
@@ -56,14 +56,14 @@ SwVbaPane::Close( ) throw ( css::uno::RuntimeException )
dispatchRequests( mxModel,url );
}
-rtl::OUString&
+rtl::OUString&
SwVbaPane::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaPane::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx
index e496272bbed6..bbb341dc8651 100644
--- a/sw/source/ui/vba/vbapane.hxx
+++ b/sw/source/ui/vba/vbapane.hxx
@@ -2,7 +2,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
@@ -40,7 +40,7 @@ private:
css::uno::Reference< css::frame::XModel > mxModel;
public:
- SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
virtual ~SwVbaPane();
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index a69eb236a219..076a26f7cbf7 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -2,7 +2,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
@@ -53,7 +53,7 @@ public:
{
if( Index != 1 )
throw container::NoSuchElementException();
- return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) );
+ return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) );
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
@@ -105,14 +105,14 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString&
+rtl::OUString&
SwVbaPanes::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaPanes::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx
index 82fa5391bb25..5a7fd67eb453 100644
--- a/sw/source/ui/vba/vbapanes.hxx
+++ b/sw/source/ui/vba/vbapanes.hxx
@@ -2,7 +2,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
@@ -50,10 +50,10 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaPanes_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-};
+};
#endif /* SW_VBA_PANES_HXX */
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index df6fec751ab9..74afa8da6210 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -2,7 +2,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
@@ -43,7 +43,7 @@ SwVbaParagraph::~SwVbaParagraph()
{
}
-uno::Reference< word::XRange > SAL_CALL
+uno::Reference< word::XRange > SAL_CALL
SwVbaParagraph::getRange( ) throw ( uno::RuntimeException )
{
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) );
@@ -63,14 +63,14 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException
xRange->setStyle( style );
}
-rtl::OUString&
+rtl::OUString&
SwVbaParagraph::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaParagraph::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -90,7 +90,7 @@ class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
{
private:
uno::Reference< text::XTextDocument > mxTextDocument;
-
+
uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException)
{
uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW );
@@ -118,7 +118,7 @@ public:
}
}
return nCount;
- }
+ }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
if( Index < getCount() )
@@ -133,7 +133,7 @@ public:
if( Index == nCount )
return uno::makeAny( xServiceInfo );
nCount++;
- }
+ }
}
}
throw lang::IndexOutOfBoundsException();
@@ -142,7 +142,7 @@ public:
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException)
{
return getEnumeration();
- }
+ }
};
SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
@@ -169,14 +169,14 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaParagraphs::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaParagraphs::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx
index c7b185690cfc..a475ceb6bfef 100644
--- a/sw/source/ui/vba/vbaparagraph.hxx
+++ b/sw/source/ui/vba/vbaparagraph.hxx
@@ -2,7 +2,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
@@ -76,10 +76,10 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaParagraphs_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-};
+};
#endif /* SW_VBA_PARAGRAPH_HXX */
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index 1fcd264b129a..8a2391f4c4d9 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -2,7 +2,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
@@ -93,7 +93,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
if( _keeptogether >>= bKeep )
{
mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaKeepTogether") ), uno::makeAny( bKeep ) );
- }
+ }
else
{
DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -113,7 +113,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
if( _keepwithnext >>= bKeep )
{
mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaSplit") ), uno::makeAny( bKeep ) );
- }
+ }
else
{
DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -133,7 +133,7 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation
if( _hyphenation >>= bHypn )
{
mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaIsHyphenation") ), uno::makeAny( bHypn ) );
- }
+ }
else
{
DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -181,7 +181,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb
if( _nolinenumber >>= noLineNum )
{
mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaLineNumberCount") ), uno::makeAny( noLineNum ) );
- }
+ }
else
{
DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -240,7 +240,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
aBreakType = style::BreakType_PAGE_AFTER;
}
mxParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( aBreakType ) );
- }
+ }
else
{
DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -344,7 +344,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sa
style::LineSpacing aLineSpacing;
if( mode != style::LineSpacingMode::MINIMUM && mode != style::LineSpacingMode::FIX )
{
- // special behaviour of word: if the space is set to these values, the rule and
+ // special behaviour of word: if the space is set to these values, the rule and
// the height are changed accordingly
if( _lineSpace == CHARACTER_INDENT_FACTOR )
{
@@ -557,14 +557,14 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment )
return wdAlignment;
}
-rtl::OUString&
+rtl::OUString&
SwVbaParagraphFormat::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaParagraphFormat::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index c827cd40bffa..232046ff0dce 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -2,7 +2,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
@@ -54,7 +54,7 @@ private:
public:
SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps );
virtual ~SwVbaParagraphFormat();
-
+
// Attributes
virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 6bd26ed5e816..6c43174b4c20 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -2,7 +2,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
@@ -58,7 +58,7 @@ public:
SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
virtual ~SwVbaRange();
css::uno::Reference< css::text::XTextDocument > getDocument() { return mxTextDocument; }
-
+
virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException);
#ifdef TOMORROW
void setXTextRange( const css::uno::Reference< css::text::XTextRange >& xRange ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 8e4d1f348e02..3723d0cb71fc 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -2,7 +2,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
@@ -35,7 +35,7 @@ using namespace ::com::sun::star;
/**
* get a range in a xText by creating
- * a cursor that iterates over the text. If the iterating cursor is
+ * a cursor that iterates over the text. If the iterating cursor is
* equal to the desired position, the range equivalent is returned.
* Some special cases are tables that are inside of the text, because the
* position has to be adjusted.
@@ -58,7 +58,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
if( _position == nPos )
{
xRange = xCursor->getStart();
- }
+ }
else
{
bCanGo = xCursor->goRight( 1, sal_False );
@@ -75,7 +75,7 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa
sal_Int32 nlastIndex = 0;
sal_Int32 nIndex = 0;
uno::Reference< text::XTextRange > xRange = rTextRange;
-
+
while(( nIndex = rStr.indexOf('\n', nlastIndex)) >= 0 )
{
xRange = xRange->getEnd();
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 29758fd5a55b..283a97f53803 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx
index 2cc874f17ed6..fd8d4ecb9f62 100644
--- a/sw/source/ui/vba/vbareplacement.cxx
+++ b/sw/source/ui/vba/vbareplacement.cxx
@@ -2,7 +2,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
@@ -57,14 +57,14 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException)
mxPropertyReplace->setReplaceAttributes( aPropValues );
}
-rtl::OUString&
+rtl::OUString&
SwVbaReplacement::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaReplacement::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx
index 020265cf2c41..52778bd92da2 100644
--- a/sw/source/ui/vba/vbareplacement.hxx
+++ b/sw/source/ui/vba/vbareplacement.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 6ca39e55dbfd..70d9c8df783c 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -2,7 +2,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
@@ -74,14 +74,14 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaSection::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSection") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaSection::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx
index 648d03cfbe00..89819155c89a 100644
--- a/sw/source/ui/vba/vbasection.hxx
+++ b/sw/source/ui/vba/vbasection.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index ab1a4cd04787..60a2edd1d5c4 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -2,7 +2,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
@@ -106,11 +106,11 @@ public:
}
virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- if ( Index < 0 || Index >= getCount() )
+ if ( Index < 0 || Index >= getCount() )
throw css::lang::IndexOutOfBoundsException();
uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW );
- return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) );
+ return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) );
}
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
{
@@ -133,8 +133,8 @@ class SectionsEnumWrapper : public EnumerationHelperImpl
public:
SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) );
}
@@ -180,14 +180,14 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString&
+rtl::OUString&
SwVbaSections::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSections") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaSections::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx
index 6aa6fd83dced..051b2dc912e3 100644
--- a/sw/source/ui/vba/vbasections.hxx
+++ b/sw/source/ui/vba/vbasections.hxx
@@ -2,7 +2,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
@@ -54,10 +54,10 @@ public:
virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException);
// SwVbaSections_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-};
+};
#endif /* SW_VBA_SECTIONS_HXX */
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index c1a089a48a9d..edda22be4b65 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -2,7 +2,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
@@ -61,7 +61,7 @@ private:
public:
SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
virtual ~SwVbaSelection();
-
+
// Attribute
virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index fe701565f146..5ff6697df199 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -2,7 +2,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
@@ -45,13 +45,13 @@ SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const
mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW );
}
-void SAL_CALL
+void SAL_CALL
SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
{
mxStyle->setName(Name);
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
SwVbaStyle::getName() throw (uno::RuntimeException)
{
return mxStyle->getName();
@@ -86,7 +86,7 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R
uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW );
if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.ParagraphStyle") ) ) )
nType = word::WdStyleType::wdStyleTypeParagraph;
- else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) )
+ else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) )
nType = word::WdStyleType::wdStyleTypeCharacter;
else
nType = word::WdStyleType::wdStyleTypeList;
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 4052a6bd8162..0af922d17400 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 7d17e98e2ffa..5c7b16664533 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -2,7 +2,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
@@ -198,7 +198,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; }
- // XNameAcess
+ // XNameAcess
virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
@@ -250,15 +250,15 @@ public:
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
- {
+ {
uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW );
return xIndexAccess->getCount();
- }
+ }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
if ( Index < 0 || Index >= getCount() )
throw lang::IndexOutOfBoundsException();
-
+
uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW );
return xIndexAccess->getByIndex( Index );
}
@@ -293,20 +293,20 @@ SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, con
mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
}
-uno::Any
+uno::Any
SwVbaStyles::createCollectionObject(const uno::Any& aObject)
{
uno::Reference< beans::XPropertySet > xStyleProp( aObject, uno::UNO_QUERY_THROW );
return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProp ) ) );
}
-uno::Type SAL_CALL
+uno::Type SAL_CALL
SwVbaStyles::getElementType() throw (uno::RuntimeException)
{
return word::XStyle::static_type(0);
}
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
SwVbaStyles::createEnumeration() throw (uno::RuntimeException)
{
return new StylesEnumWrapper( this );
diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx
index 209d58a1caa9..a3c2fd1bf088 100644
--- a/sw/source/ui/vba/vbastyles.hxx
+++ b/sw/source/ui/vba/vbastyles.hxx
@@ -2,7 +2,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
@@ -42,13 +42,13 @@ public:
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx
index 043f35f56440..82db6a5f7107 100644
--- a/sw/source/ui/vba/vbasystem.hxx
+++ b/sw/source/ui/vba/vbasystem.hxx
@@ -2,7 +2,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
@@ -41,7 +41,7 @@ private:
rtl::OUString maFileName;
ByteString maGroupName;
ByteString maKey;
-public:
+public:
PrivateProfileStringListener(){};
virtual ~PrivateProfileStringListener();
void Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index b60e9249b34e..6809e4b0e492 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -21,16 +21,16 @@ SwVbaTable::SwVbaTable( const uno::Reference< ooo::vba::XHelperInterface >& rPa
mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW );
}
-uno::Reference< word::XRange > SAL_CALL
+uno::Reference< word::XRange > SAL_CALL
SwVbaTable::Range( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() );
}
-void SAL_CALL
+void SAL_CALL
SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
uno::Reference< frame::XController > xController = xModel->getCurrentController();
uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( xController, uno::UNO_QUERY_THROW );
@@ -42,20 +42,20 @@ SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException
// go to the end of the table and span the view
uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor();
xCursor->gotoEnd(sal_True);
-
+
}
-void SAL_CALL
+void SAL_CALL
SwVbaTable::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() );
xRows->removeByIndex( 0, xRows->getCount() );
}
-uno::Reference< word::XRange > SAL_CALL
+uno::Reference< word::XRange > SAL_CALL
SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*NestedTables*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
- // #FIXME the helper api uses the dreaded dispatch mechanism, holding off
+ // #FIXME the helper api uses the dreaded dispatch mechanism, holding off
// implementation while I look for alternative solution
throw uno::RuntimeException();
}
@@ -99,14 +99,14 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException)
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString&
SwVbaTable::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTable") );
- return sImplName;
+ return sImplName;
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<rtl::OUString>
SwVbaTable::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx
index 4c149d0f5823..235e1f1303c6 100644
--- a/sw/source/ui/vba/vbatable.hxx
+++ b/sw/source/ui/vba/vbatable.hxx
@@ -27,7 +27,7 @@ public:
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 2fa13bc98673..05e0a8addf53 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -278,8 +278,8 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32
SwTabCols aCols( aOldCols );
if ( aCols.Count() > 0 )
{
- // if(aCols.Count() != GetColCount( aCols ))
- // bCurRowOnly = TRUE;
+ // if(aCols.Count() != GetColCount( aCols ))
+ // bCurRowOnly = TRUE;
nWidth = GetColWidth( aCols, nCol);
int nDiff = (int)(nNewWidth - nWidth);
diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx
index e2f002f5c5fc..00e1a9037d22 100644
--- a/sw/source/ui/vba/vbatables.hxx
+++ b/sw/source/ui/vba/vbatables.hxx
@@ -18,12 +18,12 @@ public:
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
- // ScVbaCollectionBaseImpl
+ // ScVbaCollectionBaseImpl
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 6ac677ed5146..3f4298f128e0 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -2,7 +2,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
@@ -44,7 +44,7 @@ String lcl_CheckGroupName( const String& rGroupName )
for( xub_StrLen i = 0; i < rGroupName.Len(); i++ )
{
sal_Unicode cChar = rGroupName.GetChar(i);
- if( (cChar >= 'A' && cChar <= 'Z') ||
+ if( (cChar >= 'A' && cChar <= 'Z') ||
(cChar >= 'a' && cChar <= 'z') ||
(cChar >= '0' && cChar <= '9') ||
cChar == '_' || cChar == 0x20 )
diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx
index 138841855560..2bfe75d2d326 100644
--- a/sw/source/ui/vba/vbatemplate.hxx
+++ b/sw/source/ui/vba/vbatemplate.hxx
@@ -2,7 +2,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
@@ -39,7 +39,7 @@ private:
css::uno::Reference< css::frame::XModel > mxModel;
rtl::OUString msFullUrl;
public:
- SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& );
virtual ~SwVbaTemplate();
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 4004fa6aba35..e10d873bdb06 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -2,7 +2,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
@@ -85,14 +85,14 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException )
return 0;
}
-rtl::OUString&
+rtl::OUString&
SwVbaVariable::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaVariable::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index bee3654f3b4e..f701c66a3a15 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -2,7 +2,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
@@ -42,7 +42,7 @@ private:
rtl::OUString maName;
public:
- SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
virtual ~SwVbaVariable();
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index 1886707fd365..c6a4ef2edc2e 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -2,7 +2,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
@@ -83,14 +83,14 @@ SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw
return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) );
}
-rtl::OUString&
+rtl::OUString&
SwVbaVariables::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
SwVbaVariables::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx
index 9897709bc9a4..5b562b776ff5 100644
--- a/sw/source/ui/vba/vbavariables.hxx
+++ b/sw/source/ui/vba/vbavariables.hxx
@@ -2,7 +2,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
@@ -51,13 +51,13 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaVariables_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
// XVariables
virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
-};
+};
#endif /* SW_VBA_VARIABLES_HXX */
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 044884af3e71..45b5a9f88052 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -2,7 +2,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
@@ -72,7 +72,7 @@ SwVbaView::~SwVbaView()
{
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
SwVbaView::getSeekView() throw (css::uno::RuntimeException)
{
// FIXME: if the view cursor is in table, field, section and frame
@@ -123,7 +123,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
return word::WdSeekView::wdSeekMainDocument;
}
-void SAL_CALL
+void SAL_CALL
SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException)
{
// FIXME: save the current cursor position, if the cursor is in the main
@@ -189,19 +189,19 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
}
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException)
{
return word::WdSpecialPane::wdPaneNone;
}
-void SAL_CALL
+void SAL_CALL
SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException)
{
// not support in Writer
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
{
sal_Bool bShowTableGridLine = sal_False;
@@ -209,13 +209,13 @@ SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
return bShowTableGridLine;
}
-void SAL_CALL
+void SAL_CALL
SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException)
{
mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) );
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
SwVbaView::getType() throw (css::uno::RuntimeException)
{
// FIXME: handle wdPrintPreview type
@@ -224,7 +224,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException)
return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
}
-void SAL_CALL
+void SAL_CALL
SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
{
// FIXME: handle wdPrintPreview type
@@ -243,12 +243,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
}
case word::WdViewType::wdPrintPreview:
{
- PrintPreviewHelper( uno::Any(),word::getView( mxModel ) );
+ PrintPreviewHelper( uno::Any(),word::getView( mxModel ) );
break;
}
default:
DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
-
+
}
}
@@ -260,7 +260,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
rtl::OUString aPropIsShared;
rtl::OUString aPropBodyDistance;
rtl::OUString aPropText;
-
+
switch( nType )
{
case word::WdSeekView::wdSeekCurrentPageFooter:
@@ -288,7 +288,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
}
uno::Reference< text::XPageCursor > xPageCursor( mxViewCursor, uno::UNO_QUERY_THROW );
-
+
if( nType == word::WdSeekView::wdSeekFirstPageFooter
|| nType == word::WdSeekView::wdSeekFirstPageHeader )
{
@@ -331,12 +331,12 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
}
break;
- }
+ }
default:
{
break;
}
- }
+ }
xStyle = word::getCurrentPageStyle( mxModel );
uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
@@ -382,14 +382,14 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
return xTextRange;
}
-rtl::OUString&
+rtl::OUString&
SwVbaView::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaView::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index bfe77313489b..8131a8fad6c0 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -2,7 +2,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
@@ -48,7 +48,7 @@ private:
css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
public:
- SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
virtual ~SwVbaView();
diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx
index 65cdc50b6516..6490b4809450 100644
--- a/sw/source/ui/vba/vbawindow.hxx
+++ b/sw/source/ui/vba/vbawindow.hxx
@@ -2,7 +2,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
@@ -37,8 +37,8 @@
typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE;
class SwVbaWindow : public WindowImpl_BASE
-{
-public:
+{
+public:
SwVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index 5320e0a2af32..a6c2e7c43a3b 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -2,7 +2,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
@@ -112,7 +112,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
m_xPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SurroundContour") )) >>= bContour;
if( bContour )
nType = word::WdWrapType::wdWrapTight;
- else
+ else
nType = word::WdWrapType::wdWrapSquare;
break;
}
@@ -221,14 +221,14 @@ void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (u
setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright );
}
-rtl::OUString&
+rtl::OUString&
SwVbaWrapFormat::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
SwVbaWrapFormat::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx
index ed00df65a8c1..024498c8e824 100644
--- a/sw/source/ui/vba/vbawrapformat.hxx
+++ b/sw/source/ui/vba/vbawrapformat.hxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/vba/wordvbahelper.hxx b/sw/source/ui/vba/wordvbahelper.hxx
index fd91822649a1..becdce534a1b 100644
--- a/sw/source/ui/vba/wordvbahelper.hxx
+++ b/sw/source/ui/vba/wordvbahelper.hxx
@@ -2,7 +2,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
@@ -38,9 +38,9 @@
class SwDocShell;
class SwView;
-namespace ooo
+namespace ooo
{
- namespace vba
+ namespace vba
{
namespace word
{
diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx
index 00b761accd1c..71a43056834b 100644
--- a/sw/source/ui/web/wdocsh.cxx
+++ b/sw/source/ui/web/wdocsh.cxx
@@ -2,7 +2,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
@@ -102,8 +102,8 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
}
else if (nVersion == SOFFICE_FILEFORMAT_8)
{
- *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 );
- *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_8;
+ *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 );
+ *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_8;
*pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE);
}
*pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME);
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 3d24d885dfa8..08b670796217 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -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
diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx
index dbcdb9a297f8..ebf9eb5d02d8 100644
--- a/sw/source/ui/web/wformsh.cxx
+++ b/sw/source/ui/web/wformsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx
index dc9b6e04c490..05392035a1aa 100644
--- a/sw/source/ui/web/wfrmsh.cxx
+++ b/sw/source/ui/web/wfrmsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx
index 7b8917ab017e..c4ac8a06bdc3 100644
--- a/sw/source/ui/web/wgrfsh.cxx
+++ b/sw/source/ui/web/wgrfsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx
index 230990d41d80..910ccf9cecfa 100644
--- a/sw/source/ui/web/wlistsh.cxx
+++ b/sw/source/ui/web/wlistsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx
index dc3def10ee27..425fe62ca785 100644
--- a/sw/source/ui/web/wolesh.cxx
+++ b/sw/source/ui/web/wolesh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx
index 3cf3f60fe0ba..da01197ad689 100644
--- a/sw/source/ui/web/wtabsh.cxx
+++ b/sw/source/ui/web/wtabsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index ad9dd701e575..80d2f1231d7e 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index e5a0b4e972d5..c7f3a4edf3f6 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -2,7 +2,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
@@ -104,7 +104,7 @@ SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
{
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
- SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
+ SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
SW_RES(RID_WEBTOOLS_TOOLBOX) );
}
@@ -161,13 +161,13 @@ void SwWebView::SelectShell()
else
{
- // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
+ // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
SfxDispatcher &rDispatcher = *GetViewFrame()->GetDispatcher();
SwToolbarConfigItem *pBarCfg = SW_MOD()->GetWebToolbarConfig();
if( GetCurShell() )
{
- rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
+ rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
//Zur alten Selektion merken welche Toolbar sichtbar war
sal_Int32 nId = rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT );
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 6b1957169e35..600fb86c3da7 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -2,7 +2,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
@@ -97,7 +97,7 @@ BOOL SwWrtShell::TryRemoveIndent()
}
/*------------------------------------------------------------------------
- Beschreibung: Zeile loeschen
+ Beschreibung: Zeile loeschen
------------------------------------------------------------------------*/
@@ -113,8 +113,8 @@ long SwWrtShell::DelLine()
SetMark();
SwCrsrShell::RightMargin();
//Warum soll hier noch ein Zeichen in der naechsten Zeile geloescht werden?
-// if(!IsEndOfPara())
-// SwCrsrShell::Right();
+// if(!IsEndOfPara())
+// SwCrsrShell::Right();
long nRet = Delete();
Pop(FALSE);
if( nRet )
@@ -269,7 +269,7 @@ long SwWrtShell::DelRight()
case nsSelectionType::SEL_TXT:
case nsSelectionType::SEL_TBL:
case nsSelectionType::SEL_NUM:
- // wenn eine Selektion existiert, diese loeschen.
+ // wenn eine Selektion existiert, diese loeschen.
if( IsSelection() )
{
if( !IsBlockMode() || HasSelection() )
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 3507850ab20e..6b8ed8f9f4f5 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -2,7 +2,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
@@ -36,16 +36,16 @@
#include <viewopt.hxx>
#include <crsskip.hxx>
-/* Immer:
- - Zuruecksetzen des Cursorstacks
- - Timer nachtriggern
- - gfs. GCAttr
+/* Immer:
+ - Zuruecksetzen des Cursorstacks
+ - Timer nachtriggern
+ - gfs. GCAttr
bei Selektion
- - SttSelect()
+ - SttSelect()
sonst
- - EndSelect()
+ - EndSelect()
*/
const long nReadOnlyScrollOfst = 10;
@@ -250,10 +250,10 @@ BOOL SwWrtShell::GoStart( BOOL bKeepArea, BOOL *pMoveTable,
else if( bBoxSelection && pMoveTable )
{
// JP 09.01.96: wir haben eine Boxselektion (oder leere Zelle)
- // und wollen selektieren (pMoveTable wird im
- // SelAll gesetzt). Dann darf die Tabelle nicht
- // verlassen werden; sonst ist keine Selektion der
- // gesamten Tabelle moeglich!
+ // und wollen selektieren (pMoveTable wird im
+ // SelAll gesetzt). Dann darf die Tabelle nicht
+ // verlassen werden; sonst ist keine Selektion der
+ // gesamten Tabelle moeglich!
*pMoveTable = TRUE;
return TRUE;
}
@@ -403,9 +403,9 @@ BOOL SwWrtShell::EndPara( BOOL bSelect )
/*------------------------------------------------------------------------
- Beschreibung: Spaltenweises Springen
- Parameter: mit oder ohne SSelection
- Return: Erfolg oder Misserfolg
+ Beschreibung: Spaltenweises Springen
+ Parameter: mit oder ohne SSelection
+ Return: Erfolg oder Misserfolg
------------------------------------------------------------------------*/
@@ -522,7 +522,7 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect)
if( bIsFrmSel )
{
-// CallChgLnk();
+// CallChgLnk();
// bei Frames immer nur die obere Ecke nehmen, damit dieser
// wieder selektiert werden kann
aOldRect.SSize( 5, 5 );
@@ -636,7 +636,7 @@ BOOL SwWrtShell::PageCrsr(SwTwips lOffset, BOOL bSelect)
// da sie immer zu einer Anzeige des Cursors fuehrt, also auch,
// wenn nach dem Blaettern in einen Bereich ohne gueltige Position
// geblaettert wurde.
- // ViewShell::StartAction();
+ // ViewShell::StartAction();
PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP;
// Richtungswechsel und Stack vorhanden
if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( TRUE, bSelect ))
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 8730900e6bfa..415e9a987974 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -2,7 +2,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
@@ -46,7 +46,7 @@
#include <mdiexp.hxx>
#include <fmtcol.hxx>
#include <frmfmt.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <swevent.hxx>
#include <swdtflvr.hxx>
#include <crsskip.hxx>
@@ -115,7 +115,7 @@ void SwWrtShell::SelSentence(const Point *pPt, BOOL )
if(pPt)
aStart = *pPt;
bSelLn = TRUE;
- bSelWrd = FALSE; // SelWord abschalten, sonst geht kein SelLine weiter
+ bSelWrd = FALSE; // SelWord abschalten, sonst geht kein SelLine weiter
}
void SwWrtShell::SelPara(const Point *pPt, BOOL )
@@ -196,7 +196,7 @@ long SwWrtShell::SelAll()
}
/*------------------------------------------------------------------------
- Beschreibung: Textsuche
+ Beschreibung: Textsuche
------------------------------------------------------------------------*/
@@ -217,7 +217,7 @@ ULONG SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, BOOL bSearchIn
return nRet;
}
/*------------------------------------------------------------------------
- Beschreibung: Suche nach Vorlagen
+ Beschreibung: Suche nach Vorlagen
------------------------------------------------------------------------*/
@@ -353,7 +353,7 @@ long SwWrtShell::ResetSelect(const Point *,BOOL)
}
else
{
- /* ACT_KONTEXT() macht eine Action auf -
+ /* ACT_KONTEXT() macht eine Action auf -
um im Basicablauf keine Probleme mit der
Shellumschaltung zu bekommen, darf
GetChgLnk().Call() erst nach
@@ -460,28 +460,28 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, BOOL )
// check the direction of the selection with the new point
BOOL bRet = FALSE, bMoveCrsr = TRUE, bToTop = FALSE;
- SwCrsrShell::SelectWord( &aStart ); // select the startword
- SwCrsrShell::Push(); // save the cursor
- SwCrsrShell::SetCrsr( *pPt ); // and check the direction
+ SwCrsrShell::SelectWord( &aStart ); // select the startword
+ SwCrsrShell::Push(); // save the cursor
+ SwCrsrShell::SetCrsr( *pPt ); // and check the direction
switch( SwCrsrShell::CompareCursor( StackMkCurrPt ))
{
- case -1: bToTop = FALSE; break;
- case 1: bToTop = TRUE; break;
- default: bMoveCrsr = FALSE; break;
+ case -1: bToTop = FALSE; break;
+ case 1: bToTop = TRUE; break;
+ default: bMoveCrsr = FALSE; break;
}
- SwCrsrShell::Pop( FALSE ); // retore the saved cursor
+ SwCrsrShell::Pop( FALSE ); // retore the saved cursor
if( bMoveCrsr )
{
// select to Top but cursor select to Bottom? or
- // select to Bottom but cursor select to Top? --> swap the cursor
+ // select to Bottom but cursor select to Top? --> swap the cursor
if( bToTop )
SwapPam();
- SwCrsrShell::Push(); // save cur cursor
- if( SwCrsrShell::SelectWord( pPt )) // select the current word
+ SwCrsrShell::Push(); // save cur cursor
+ if( SwCrsrShell::SelectWord( pPt )) // select the current word
{
if( bToTop )
SwapPam();
@@ -620,7 +620,7 @@ long SwWrtShell::SttLeaveSelect(const Point *, BOOL )
if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) {
return 0;
}
-// if( IsSelTblCells() ) aSelTblLink.Call(this);
+// if( IsSelTblCells() ) aSelTblLink.Call(this);
ClearMark();
return 1;
}
@@ -747,8 +747,8 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos)
HideCrsr();
// gleicher Aufruf von BeginDrag an der SwFEShell
- fnDrag = &SwWrtShell::BeginFrmDrag;
- fnEndDrag = &SwWrtShell::UpdateLayoutFrm;
+ fnDrag = &SwWrtShell::BeginFrmDrag;
+ fnEndDrag = &SwWrtShell::UpdateLayoutFrm;
SwBaseShell::SetFrmMode( FLY_DRAG_START, this );
Invalidate();
}
@@ -757,8 +757,8 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos)
void SwWrtShell::LeaveSelFrmMode()
{
- fnDrag = &SwWrtShell::BeginDrag;
- fnEndDrag = &SwWrtShell::EndDrag;
+ fnDrag = &SwWrtShell::BeginDrag;
+ fnEndDrag = &SwWrtShell::EndDrag;
bLayoutMode = FALSE;
bStartDrag = FALSE;
Edit();
@@ -766,7 +766,7 @@ void SwWrtShell::LeaveSelFrmMode()
Invalidate();
}
/*------------------------------------------------------------------------
- Beschreibung: Rahmengebundenes Macro ausfuehren
+ Beschreibung: Rahmengebundenes Macro ausfuehren
------------------------------------------------------------------------*/
@@ -936,10 +936,10 @@ BOOL SwWrtShell::SelectTableCell()
return FALSE;
}
/*------------------------------------------------------------------------
- Beschreibung: Prueft, ob eine Wortselektion vorliegt.
+ Beschreibung: Prueft, ob eine Wortselektion vorliegt.
Gemaess den Regeln fuer intelligentes Cut / Paste
werden umgebende Spaces rausgeschnitten.
- Return: Liefert Art der Wortselektion zurueck.
+ Return: Liefert Art der Wortselektion zurueck.
------------------------------------------------------------------------*/
diff --git a/sw/source/ui/wrtsh/wrtsh.hrc b/sw/source/ui/wrtsh/wrtsh.hrc
index a82a4c3c1b48..deccbdbbf7a2 100644
--- a/sw/source/ui/wrtsh/wrtsh.hrc
+++ b/sw/source/ui/wrtsh/wrtsh.hrc
@@ -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
diff --git a/sw/source/ui/wrtsh/wrtsh.src b/sw/source/ui/wrtsh/wrtsh.src
index 21547d107758..377f9aef8fcf 100644
--- a/sw/source/ui/wrtsh/wrtsh.src
+++ b/sw/source/ui/wrtsh/wrtsh.src
@@ -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
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index d1592fa4302a..d045affeb2bc 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#if STLPORT_VERSION>=321
-#include <math.h> // prevent conflict between exception and std::exception
+#include <math.h> // prevent conflict between exception and std::exception
#endif
#include <hintids.hxx>
#include <svx/svdview.hxx>
@@ -182,7 +182,7 @@ BOOL SwWrtShell::IsEndWrd()
/*------------------------------------------------------------------------
- Beschreibung: Abfrage, ob Einfuegen moeglich ist; gfs. Beep
+ Beschreibung: Abfrage, ob Einfuegen moeglich ist; gfs. Beep
------------------------------------------------------------------------*/
@@ -197,7 +197,7 @@ BOOL SwWrtShell::_CanInsert()
return TRUE;
}
/*------------------------------------------------------------------------
- Beschreibung: String einfuegen
+ Beschreibung: String einfuegen
------------------------------------------------------------------------*/
void SwWrtShell::InsertByWord( const String & rStr)
@@ -310,7 +310,7 @@ void SwWrtShell::Insert( const String &rPath, const String &rFilter,
EnterSelFrmMode();
BOOL bSetGrfSize = TRUE;
- BOOL bOwnMgr = FALSE;
+ BOOL bOwnMgr = FALSE;
if ( !pFrmMgr )
{
@@ -520,7 +520,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
}
/*------------------------------------------------------------------------
- Beschreibung: Object in die Core einfuegen.
+ Beschreibung: Object in die Core einfuegen.
Vom ClipBoard oder Insert
------------------------------------------------------------------------*/
@@ -825,7 +825,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
//ist resized), the Object should be resized too.
//If this request comes from the Object itself, the Frame
//in the Writer core should be resized.
- if ( pFlyPrtRect ) //Request from core?
+ if ( pFlyPrtRect ) //Request from core?
{
xObj->SetVisArea( OutputDevice::LogicToLogic(
pFlyPrtRect->SVRect(), MAP_TWIP, xObj->GetMapUnit() ));
@@ -895,7 +895,7 @@ void SwWrtShell::ConnectObj( svt::EmbeddedObjectRef& xObj, const SwRect &rPrt,
}
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen harter Seitenumbruch;
+ Beschreibung: Einfuegen harter Seitenumbruch;
Selektionen werden ueberschrieben
------------------------------------------------------------------------*/
@@ -932,7 +932,7 @@ void SwWrtShell::InsertPageBreak(const String *pPageDesc, USHORT nPgNum )
}
}
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen harter Zeilenumbruch;
+ Beschreibung: Einfuegen harter Zeilenumbruch;
Selektionen werden ueberschrieben
------------------------------------------------------------------------*/
@@ -954,7 +954,7 @@ void SwWrtShell::InsertLineBreak()
}
}
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen harter Spaltenumbruch;
+ Beschreibung: Einfuegen harter Spaltenumbruch;
Selektionen werden ueberschrieben
------------------------------------------------------------------------*/
@@ -980,8 +980,8 @@ void SwWrtShell::InsertColumnBreak()
}
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen Fussnote
- Parameter: rStr -- optionales Fussnotenzeichen
+ Beschreibung: Einfuegen Fussnote
+ Parameter: rStr -- optionales Fussnotenzeichen
------------------------------------------------------------------------*/
@@ -1013,7 +1013,7 @@ void SwWrtShell::InsertFootnote(const String &rStr, BOOL bEndNote, BOOL bEdit )
}
}
/*------------------------------------------------------------------------
- Beschreibung: SplitNode; hier auch, da
+ Beschreibung: SplitNode; hier auch, da
- selektierter Inhalt geloescht wird;
- der Cursorstack gfs. zurueckgesetzt wird.
------------------------------------------------------------------------*/
@@ -1041,8 +1041,8 @@ void SwWrtShell::SplitNode( BOOL bAutoFmt, BOOL bCheckTableStart )
}
/*------------------------------------------------------------------------
- Beschreibung: Numerierung anschalten
- Parameter: Optionale Angabe eines Namens fuer die benannte Liste;
+ Beschreibung: Numerierung anschalten
+ Parameter: Optionale Angabe eines Namens fuer die benannte Liste;
dieser bezeichnet eine Position, wenn er in eine
Zahl konvertierbar ist und kleiner ist als nMaxRules.
-------------------------------------------------------------------------*/
@@ -1451,7 +1451,7 @@ void SwWrtShell::NumOrBulletOff()
// <- #i29560#
/*------------------------------------------------------------------------
- Beschreibung: Default-Bulletliste erfragen
+ Beschreibung: Default-Bulletliste erfragen
------------------------------------------------------------------------*/
void SwWrtShell::BulletOn()
@@ -1473,7 +1473,7 @@ SelectionType SwWrtShell::GetSelectionType() const
if ( BasicActionPend() )
return IsSelFrmMode() ? nsSelectionType::SEL_FRM : nsSelectionType::SEL_TXT;
-// if ( IsTableMode() )
+// if ( IsTableMode() )
// return nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS;
SwView &_rView = ((SwView&)GetView());
@@ -1489,7 +1489,7 @@ SelectionType SwWrtShell::GetSelectionType() const
nCnt = nsSelectionType::SEL_DRW_TXT;
else
{
- if (GetView().IsFormMode()) // Nur Forms selektiert
+ if (GetView().IsFormMode()) // Nur Forms selektiert
nCnt = nsSelectionType::SEL_DRW_FORM;
else
nCnt = nsSelectionType::SEL_DRW; // Irgendein Draw-Objekt
@@ -1556,8 +1556,8 @@ SelectionType SwWrtShell::GetSelectionType() const
}
/*------------------------------------------------------------------------
- Beschreibung: Finden der TextCollection mit dem Name rCollname
- Return: Pointer auf die Collection oder 0, wenn keine
+ Beschreibung: Finden der TextCollection mit dem Name rCollname
+ Return: Pointer auf die Collection oder 0, wenn keine
TextCollection mit diesem Namen existiert oder
diese eine Defaultvorlage ist.
------------------------------------------------------------------------*/
@@ -1575,8 +1575,8 @@ SwTxtFmtColl *SwWrtShell::GetParaStyle(const String &rCollName, GetStyle eCreate
return pColl;
}
/*------------------------------------------------------------------------
- Beschreibung: Finden der Zeichenvorlage mit dem Name rCollname
- Return: Pointer auf die Collection oder 0, wenn keine
+ Beschreibung: Finden der Zeichenvorlage mit dem Name rCollname
+ Return: Pointer auf die Collection oder 0, wenn keine
Zeichenvorlage mit diesem Namen existiert oder
diese eine Defaultvorlage oder automatische Vorlage ist.
------------------------------------------------------------------------*/
@@ -1596,8 +1596,8 @@ SwCharFmt *SwWrtShell::GetCharStyle(const String &rFmtName, GetStyle eCreate )
}
/*------------------------------------------------------------------------
- Beschreibung: Finden des Tabellenformates mit dem Name rFmtname
- Return: Pointer auf das Format oder 0, wenn kein
+ Beschreibung: Finden des Tabellenformates mit dem Name rFmtname
+ Return: Pointer auf das Format oder 0, wenn kein
Rahmenformat mit diesem Namen existiert oder
dieses eine Defaultformat oder automatisches Format ist.
------------------------------------------------------------------------*/
@@ -1616,7 +1616,7 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const String &rFmtName)
/*------------------------------------------------------------------------
- Beschreibung: Anwenden der Vorlagen
+ Beschreibung: Anwenden der Vorlagen
------------------------------------------------------------------------*/
@@ -1632,7 +1632,7 @@ void SwWrtShell::SetPageStyle(const String &rCollName)
}
/*------------------------------------------------------------------------
- Beschreibung: Zugriff Vorlagen
+ Beschreibung: Zugriff Vorlagen
------------------------------------------------------------------------*/
@@ -1643,7 +1643,7 @@ String SwWrtShell::GetCurPageStyle( const BOOL bCalcFrm ) const
}
/*------------------------------------------------------------------------
- Beschreibung: Aktuelle Vorlage anhand der geltenden Attribute aendern
+ Beschreibung: Aktuelle Vorlage anhand der geltenden Attribute aendern
------------------------------------------------------------------------*/
@@ -1665,16 +1665,16 @@ void SwWrtShell::QuickUpdateStyle()
void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet)
{
SfxItemSet aCoreSet( GetAttrPool(),
- RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
- RES_PARATR_BEGIN, RES_PARATR_END - 1,
- RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
- SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS,
- SID_ATTR_TABSTOP_DEFAULTS, SID_ATTR_TABSTOP_DEFAULTS,
- SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
- SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
- SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM,
- 0 );
+ RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
+ RES_PARATR_BEGIN, RES_PARATR_END - 1,
+ RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
+ SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS,
+ SID_ATTR_TABSTOP_DEFAULTS, SID_ATTR_TABSTOP_DEFAULTS,
+ SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET,
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
+ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
+ SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM,
+ 0 );
GetCurAttr( aCoreSet );
BOOL bReset = FALSE;
SfxItemIter aParaIter( aCoreSet );
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index eca6344941e3..02acea8c480a 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -2,7 +2,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
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <hintids.hxx> // define ITEMIDs
+#include <hintids.hxx> // define ITEMIDs
#include <svl/macitem.hxx>
#include <sfx2/frame.hxx>
#include <vcl/msgbox.hxx>
@@ -42,7 +42,7 @@
#include <sfx2/linkmgr.hxx>
#include <fmtinfmt.hxx>
#include <frmatr.hxx>
-#include <swtypes.hxx> // SET_CURR_SHELL
+#include <swtypes.hxx> // SET_CURR_SHELL
#include <wrtsh.hxx>
#include <docsh.hxx>
#include <fldbas.hxx> // Felder
@@ -52,7 +52,7 @@
#include <reffld.hxx>
#include <swundo.hxx>
#include <doc.hxx>
-#include <viewopt.hxx> // SwViewOptions
+#include <viewopt.hxx> // SwViewOptions
#include <frmfmt.hxx> // fuer UpdateTable
#include <swtable.hxx> // fuer UpdateTable
#include <mdiexp.hxx>
@@ -155,8 +155,8 @@ BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
Window* pParentWin, ByteString* pWindowState )
{
//JP 14.08.96: Bug 30332 - nach Umbau der modularietaet im SFX, muss jetzt
-// das TopWindow der Application benutzt werden.
-// SwFldInputDlg* pDlg = new SwFldInputDlg( GetWin(), *this, pFld );
+// das TopWindow der Application benutzt werden.
+// SwFldInputDlg* pDlg = new SwFldInputDlg( GetWin(), *this, pFld );
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -262,18 +262,18 @@ void SwWrtShell::ClickToField( const SwField& rFld )
nSlotId = FN_INSERT_FRAME;
break;
- case JE_FMT_GRAPHIC: nSlotId = SID_INSERT_GRAPHIC; break;
- case JE_FMT_OLE: nSlotId = SID_INSERT_OBJECT; break;
+ case JE_FMT_GRAPHIC: nSlotId = SID_INSERT_GRAPHIC; break;
+ case JE_FMT_OLE: nSlotId = SID_INSERT_OBJECT; break;
-// case JE_FMT_TEXT:
+// case JE_FMT_TEXT:
}
- Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE ); // Feld selektieren
+ Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE ); // Feld selektieren
if( nSlotId )
{
StartUndo( UNDO_START );
- //#97295# immediately select the right shell
+ //#97295# immediately select the right shell
GetView().StopShellTimer();
GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId,
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
@@ -422,7 +422,7 @@ void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter,
SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE );
//#39076# Silent kann lt. SFX entfernt werden.
-// SfxBoolItem aSilent( SID_SILENT, TRUE );
+// SfxBoolItem aSilent( SID_SILENT, TRUE );
SfxBoolItem aBrowse( SID_BROWSE, TRUE );
if( nFilter & URLLOAD_NEWVIEW )
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 148add9bf0de..9c3658fbbd09 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -2,7 +2,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
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx
index 2bf6f80c8122..f16a1a66c30a 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/ui/wrtsh/wrtsh4.cxx
@@ -2,7 +2,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
@@ -66,7 +66,7 @@ BOOL SwWrtShell::_SttWrd()
}
/*
* Das Ende eines Wortes ist das Folgen von Trennzeichen auf
- * nicht-Trennzeichen. Unter dem Ende eines Wortes wird
+ * nicht-Trennzeichen. Unter dem Ende eines Wortes wird
* ebenfalls die Folge von Worttrennzeichen auf Interpunktions-
* zeichen verstanden. Das Absatzende ist ebenfalls Wortende.
*/
@@ -94,9 +94,9 @@ BOOL SwWrtShell::_EndWrd()
BOOL SwWrtShell::_NxtWrd()
{
BOOL bRet = FALSE;
- while( IsEndPara() ) // wenn schon am Ende, dann naechsten ???
+ while( IsEndPara() ) // wenn schon am Ende, dann naechsten ???
{
- if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS)) // Document - Ende ??
+ if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS)) // Document - Ende ??
{
Pop( FALSE );
return bRet;
@@ -126,9 +126,9 @@ BOOL SwWrtShell::_PrvWrd()
{
BOOL bRet = FALSE;
while( IsSttPara() )
- { // wenn schon am Anfang, dann naechsten ???
+ { // wenn schon am Anfang, dann naechsten ???
if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
- { // Document - Anfang ??
+ { // Document - Anfang ??
Pop( FALSE );
return bRet;
}
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index a7ae5c1b10e9..ef70e42d6690 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -2,7 +2,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
@@ -36,7 +36,7 @@
#include <sfx2/app.hxx>
#include <svl/slstitm.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // fuer Undo-Ids
#include <swdtflvr.hxx>
#include <wrtsh.hrc>
@@ -105,7 +105,7 @@ void SwWrtShell::Do( DoType eDoType, USHORT nCnt )
SwTransferable::CreateSelection( *this );
// Bug 32918: nach loeschen der Numerierung bleibt die Obj. Leiste stehen
- // Warum wird hier nicht immer ein CallChgLink gerufen?
+ // Warum wird hier nicht immer ein CallChgLink gerufen?
CallChgLnk();
}
diff --git a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sglobal/toolbar/basicshapes.xml b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/sglobal/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml b/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/arrowshapes.xml b/sw/uiconfig/sweb/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/sweb/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/basicshapes.xml b/sw/uiconfig/sweb/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/sweb/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/flowchartshapes.xml b/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/sweb/toolbar/symbolshapes.xml b/sw/uiconfig/sweb/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/sweb/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/sweb/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 4e90101c0625..cc8b013959c5 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -448,7 +448,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swform/toolbar/arrowshapes.xml b/sw/uiconfig/swform/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/swform/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swform/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/toolbar/basicshapes.xml b/sw/uiconfig/swform/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/swform/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swform/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/toolbar/flowchartshapes.xml b/sw/uiconfig/swform/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/swform/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swform/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swform/toolbar/symbolshapes.xml b/sw/uiconfig/swform/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/swform/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swform/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 4e90101c0625..cc8b013959c5 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -448,7 +448,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swreport/toolbar/arrowshapes.xml b/sw/uiconfig/swreport/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/swreport/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/basicshapes.xml b/sw/uiconfig/swreport/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/swreport/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/flowchartshapes.xml b/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/symbolshapes.xml b/sw/uiconfig/swreport/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/swreport/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swreport/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/arrowshapes.xml b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/swriter/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/basicshapes.xml b/sw/uiconfig/swriter/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/swriter/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/flowchartshapes.xml b/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/symbolshapes.xml b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/swriter/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swriter/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 14e758ef99e0..32df4479b188 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -449,7 +449,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swxform/toolbar/arrowshapes.xml b/sw/uiconfig/swxform/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sw/uiconfig/swxform/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/basicshapes.xml b/sw/uiconfig/swxform/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sw/uiconfig/swxform/toolbar/basicshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/flowchartshapes.xml b/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/symbolshapes.xml b/sw/uiconfig/swxform/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sw/uiconfig/swxform/toolbar/symbolshapes.xml
+++ b/sw/uiconfig/swxform/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sw/util/hidother.hrc b/sw/util/hidother.hrc
index 7b3a04e0de4f..edca3375196a 100644
--- a/sw/util/hidother.hrc
+++ b/sw/util/hidother.hrc
@@ -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
@@ -25,7 +25,7 @@
*
************************************************************************/
#define _SFX_SHELL_HXX
-#define SFX_INTERFACE_SW_START 250
+#define SFX_INTERFACE_SW_START 250
#include <../inc/shellid.hxx>
diff --git a/sw/util/hidother.src b/sw/util/hidother.src
index df1cc8d99622..c5173f8a3e7d 100644
--- a/sw/util/hidother.src
+++ b/sw/util/hidother.src
@@ -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
@@ -24,46 +24,46 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "../inc/helpid.h" // HID_FUNC_XXX
+#include "../inc/helpid.h" // HID_FUNC_XXX
#include "hidother.hrc"
-// Help-IDs fuer Dokument-Fenster
-hidspecial HID_EDIT_WIN { HelpID = HID_EDIT_WIN; };
+// Help-IDs fuer Dokument-Fenster
+hidspecial HID_EDIT_WIN { HelpID = HID_EDIT_WIN; };
// drei fuer den Formedtdialog
-hidspecial HID_FORMEDT_CONTENT { HelpID = HID_FORMEDT_CONTENT; };
-hidspecial HID_FORMEDT_USER { HelpID = HID_FORMEDT_USER; };
-hidspecial HID_FORMEDT_INDEX { HelpID = HID_FORMEDT_INDEX; };
+hidspecial HID_FORMEDT_CONTENT { HelpID = HID_FORMEDT_CONTENT; };
+hidspecial HID_FORMEDT_USER { HelpID = HID_FORMEDT_USER; };
+hidspecial HID_FORMEDT_INDEX { HelpID = HID_FORMEDT_INDEX; };
// Wizards
-hidspecial HID_FAX_PAGE1 { HelpId = HID_FAX_PAGE1; };
-hidspecial HID_FAX_PAGE2 { HelpId = HID_FAX_PAGE2; };
-hidspecial HID_FAX_PAGE3 { HelpId = HID_FAX_PAGE3; };
-hidspecial HID_FAX_PAGE4 { HelpId = HID_FAX_PAGE4; };
-hidspecial HID_FAX_PAGE5 { HelpId = HID_FAX_PAGE5; };
-hidspecial HID_FAX_PAGE6 { HelpId = HID_FAX_PAGE6; };
-hidspecial HID_FAX_PAGE7 { HelpId = HID_FAX_PAGE7; };
-hidspecial HID_FAX_PAGE8 { HelpId = HID_FAX_PAGE8; };
-hidspecial HID_LETTER_PAGE1 { HelpId = HID_LETTER_PAGE1; };
-hidspecial HID_LETTER_PAGE2 { HelpId = HID_LETTER_PAGE2; };
-hidspecial HID_LETTER_PAGE3 { HelpId = HID_LETTER_PAGE3; };
-hidspecial HID_LETTER_PAGE4 { HelpId = HID_LETTER_PAGE4; };
-hidspecial HID_LETTER_PAGE5 { HelpId = HID_LETTER_PAGE5; };
-hidspecial HID_LETTER_PAGE6 { HelpId = HID_LETTER_PAGE6; };
-hidspecial HID_LETTER_PAGE7 { HelpId = HID_LETTER_PAGE7; };
-hidspecial HID_LETTER_PAGE8 { HelpId = HID_LETTER_PAGE8; };
-hidspecial HID_LETTER_PAGE9 { HelpId = HID_LETTER_PAGE9; };
-hidspecial HID_AGENDA_PAGE1 { HelpId = HID_AGENDA_PAGE1; };
-hidspecial HID_AGENDA_PAGE2 { HelpId = HID_AGENDA_PAGE2; };
-hidspecial HID_AGENDA_PAGE3 { HelpId = HID_AGENDA_PAGE3; };
-hidspecial HID_AGENDA_PAGE4 { HelpId = HID_AGENDA_PAGE4; };
-hidspecial HID_AGENDA_PAGE5 { HelpId = HID_AGENDA_PAGE5; };
-hidspecial HID_AGENDA_PAGE6 { HelpId = HID_AGENDA_PAGE6; };
-hidspecial HID_MEMO_PAGE1 { HelpId = HID_MEMO_PAGE1; };
-hidspecial HID_MEMO_PAGE2 { HelpId = HID_MEMO_PAGE2; };
-hidspecial HID_MEMO_PAGE3 { HelpId = HID_MEMO_PAGE3; };
-hidspecial HID_MEMO_PAGE4 { HelpId = HID_MEMO_PAGE4; };
-hidspecial HID_MEMO_PAGE5 { HelpId = HID_MEMO_PAGE5; };
+hidspecial HID_FAX_PAGE1 { HelpId = HID_FAX_PAGE1; };
+hidspecial HID_FAX_PAGE2 { HelpId = HID_FAX_PAGE2; };
+hidspecial HID_FAX_PAGE3 { HelpId = HID_FAX_PAGE3; };
+hidspecial HID_FAX_PAGE4 { HelpId = HID_FAX_PAGE4; };
+hidspecial HID_FAX_PAGE5 { HelpId = HID_FAX_PAGE5; };
+hidspecial HID_FAX_PAGE6 { HelpId = HID_FAX_PAGE6; };
+hidspecial HID_FAX_PAGE7 { HelpId = HID_FAX_PAGE7; };
+hidspecial HID_FAX_PAGE8 { HelpId = HID_FAX_PAGE8; };
+hidspecial HID_LETTER_PAGE1 { HelpId = HID_LETTER_PAGE1; };
+hidspecial HID_LETTER_PAGE2 { HelpId = HID_LETTER_PAGE2; };
+hidspecial HID_LETTER_PAGE3 { HelpId = HID_LETTER_PAGE3; };
+hidspecial HID_LETTER_PAGE4 { HelpId = HID_LETTER_PAGE4; };
+hidspecial HID_LETTER_PAGE5 { HelpId = HID_LETTER_PAGE5; };
+hidspecial HID_LETTER_PAGE6 { HelpId = HID_LETTER_PAGE6; };
+hidspecial HID_LETTER_PAGE7 { HelpId = HID_LETTER_PAGE7; };
+hidspecial HID_LETTER_PAGE8 { HelpId = HID_LETTER_PAGE8; };
+hidspecial HID_LETTER_PAGE9 { HelpId = HID_LETTER_PAGE9; };
+hidspecial HID_AGENDA_PAGE1 { HelpId = HID_AGENDA_PAGE1; };
+hidspecial HID_AGENDA_PAGE2 { HelpId = HID_AGENDA_PAGE2; };
+hidspecial HID_AGENDA_PAGE3 { HelpId = HID_AGENDA_PAGE3; };
+hidspecial HID_AGENDA_PAGE4 { HelpId = HID_AGENDA_PAGE4; };
+hidspecial HID_AGENDA_PAGE5 { HelpId = HID_AGENDA_PAGE5; };
+hidspecial HID_AGENDA_PAGE6 { HelpId = HID_AGENDA_PAGE6; };
+hidspecial HID_MEMO_PAGE1 { HelpId = HID_MEMO_PAGE1; };
+hidspecial HID_MEMO_PAGE2 { HelpId = HID_MEMO_PAGE2; };
+hidspecial HID_MEMO_PAGE3 { HelpId = HID_MEMO_PAGE3; };
+hidspecial HID_MEMO_PAGE4 { HelpId = HID_MEMO_PAGE4; };
+hidspecial HID_MEMO_PAGE5 { HelpId = HID_MEMO_PAGE5; };
// Numerierungsdialog
hidspecial HID_VS_SINGLENUM { HelpId = HID_VS_SINGLENUM;};
@@ -72,33 +72,33 @@ hidspecial HID_VS_BULLET { HelpId = HID_VS_BULLET ;};
hidspecial HID_VS_NUMBMP { HelpId = HID_VS_NUMBMP ;};
//Wegen Helferlein jetzt auch die ShellIds hier
-hidspecial SW_TEXTSHELL { HelpId = SW_TEXTSHELL ;};
-hidspecial SW_LISTSHELL { HelpId = SW_LISTSHELL ;};
-hidspecial SW_TABSHELL { HelpId = SW_TABSHELL ;};
-hidspecial SW_FRAMESHELL { HelpId = SW_FRAMESHELL ;};
-hidspecial SW_GRFSHELL { HelpId = SW_GRFSHELL ;};
-hidspecial SW_OLESHELL { HelpId = SW_OLESHELL ;};
-hidspecial SW_DRAWSHELL { HelpId = SW_DRAWSHELL ;};
-hidspecial SW_DRWTXTSHELL { HelpId = SW_DRWTXTSHELL ;};
-hidspecial SW_PAGEPREVIEW { HelpId = SW_PAGEPREVIEW ;};
-hidspecial SW_SRC_VIEWSHELL { HelpId = SW_SRC_VIEWSHELL ;};
-hidspecial SW_BEZIERSHELL { HelpId = SW_BEZIERSHELL ;};
-hidspecial SW_DRAWFORMSHELL { HelpId = SW_DRAWFORMSHELL ;};
-hidspecial SW_WEBTEXTSHELL { HelpId = SW_WEBTEXTSHELL ;};
-hidspecial SW_WEBFRAMESHELL { HelpId = SW_WEBFRAMESHELL ;};
-hidspecial SW_MEDIASHELL { HelpId = SW_MEDIASHELL ;};
+hidspecial SW_TEXTSHELL { HelpId = SW_TEXTSHELL ;};
+hidspecial SW_LISTSHELL { HelpId = SW_LISTSHELL ;};
+hidspecial SW_TABSHELL { HelpId = SW_TABSHELL ;};
+hidspecial SW_FRAMESHELL { HelpId = SW_FRAMESHELL ;};
+hidspecial SW_GRFSHELL { HelpId = SW_GRFSHELL ;};
+hidspecial SW_OLESHELL { HelpId = SW_OLESHELL ;};
+hidspecial SW_DRAWSHELL { HelpId = SW_DRAWSHELL ;};
+hidspecial SW_DRWTXTSHELL { HelpId = SW_DRWTXTSHELL ;};
+hidspecial SW_PAGEPREVIEW { HelpId = SW_PAGEPREVIEW ;};
+hidspecial SW_SRC_VIEWSHELL { HelpId = SW_SRC_VIEWSHELL ;};
+hidspecial SW_BEZIERSHELL { HelpId = SW_BEZIERSHELL ;};
+hidspecial SW_DRAWFORMSHELL { HelpId = SW_DRAWFORMSHELL ;};
+hidspecial SW_WEBTEXTSHELL { HelpId = SW_WEBTEXTSHELL ;};
+hidspecial SW_WEBFRAMESHELL { HelpId = SW_WEBFRAMESHELL ;};
+hidspecial SW_MEDIASHELL { HelpId = SW_MEDIASHELL ;};
// Navigator
-hidspecial HID_NAVIGATOR_TOOLBOX { HelpId = HID_NAVIGATOR_TOOLBOX;};
-hidspecial HID_NAVI_TBX16 { HelpId = HID_NAVI_TBX16;};
+hidspecial HID_NAVIGATOR_TOOLBOX { HelpId = HID_NAVIGATOR_TOOLBOX;};
+hidspecial HID_NAVI_TBX16 { HelpId = HID_NAVI_TBX16;};
hidspecial HID_NAVIGATOR_GLOBAL_TOOLBOX { HelpId = HID_NAVIGATOR_GLOBAL_TOOLBOX;};
-hidspecial HID_NAVIGATOR_LISTBOX { HelpId = HID_NAVIGATOR_LISTBOX;};
-hidspecial HID_NAVIGATOR_GLOB_TREELIST { HelpId = HID_NAVIGATOR_GLOB_TREELIST;};
-hidspecial HID_NAVIGATOR_TREELIST { HelpId = HID_NAVIGATOR_TREELIST;};
-hidspecial HID_NAVI_DRAG_HYP { HelpId = HID_NAVI_DRAG_HYP ;};
-hidspecial HID_NAVI_DRAG_LINK { HelpId = HID_NAVI_DRAG_LINK ;};
-hidspecial HID_NAVI_DRAG_COPY { HelpId = HID_NAVI_DRAG_COPY ;};
-hidspecial HID_NAVI_OUTLINES { HelpId = HID_NAVI_OUTLINES ;};
+hidspecial HID_NAVIGATOR_LISTBOX { HelpId = HID_NAVIGATOR_LISTBOX;};
+hidspecial HID_NAVIGATOR_GLOB_TREELIST { HelpId = HID_NAVIGATOR_GLOB_TREELIST;};
+hidspecial HID_NAVIGATOR_TREELIST { HelpId = HID_NAVIGATOR_TREELIST;};
+hidspecial HID_NAVI_DRAG_HYP { HelpId = HID_NAVI_DRAG_HYP ;};
+hidspecial HID_NAVI_DRAG_LINK { HelpId = HID_NAVI_DRAG_LINK ;};
+hidspecial HID_NAVI_DRAG_COPY { HelpId = HID_NAVI_DRAG_COPY ;};
+hidspecial HID_NAVI_OUTLINES { HelpId = HID_NAVI_OUTLINES ;};
hidspecial HID_NAVI_TBX1 { HelpId = HID_NAVI_TBX1 ;};
hidspecial HID_NAVI_TBX2 { HelpId = HID_NAVI_TBX2 ;};
hidspecial HID_NAVI_TBX3 { HelpId = HID_NAVI_TBX3 ;};
@@ -114,11 +114,11 @@ hidspecial HID_NAVI_TBX12 { HelpId = HID_NAVI_TBX12 ;};
hidspecial HID_NAVI_TBX13 { HelpId = HID_NAVI_TBX13 ;};
hidspecial HID_NAVI_TBX14 { HelpId = HID_NAVI_TBX14 ;};
hidspecial HID_NAVI_TBX15 { HelpId = HID_NAVI_TBX15 ;};
-hidspecial HID_GLBLTREE_UPDATE { HelpId = HID_GLBLTREE_UPDATE ;};
+hidspecial HID_GLBLTREE_UPDATE { HelpId = HID_GLBLTREE_UPDATE ;};
hidspecial HID_GLBLTREE_INSERT { HelpId = HID_GLBLTREE_INSERT ;};
-hidspecial HID_GLBLTREE_EDIT { HelpId = HID_GLBLTREE_EDIT ;};
-hidspecial HID_GLBLTREE_DEL { HelpId = HID_GLBLTREE_DEL ;};
-hidspecial HID_GLBLTREE_INS_IDX { HelpId = HID_GLBLTREE_INS_IDX ;};
+hidspecial HID_GLBLTREE_EDIT { HelpId = HID_GLBLTREE_EDIT ;};
+hidspecial HID_GLBLTREE_DEL { HelpId = HID_GLBLTREE_DEL ;};
+hidspecial HID_GLBLTREE_INS_IDX { HelpId = HID_GLBLTREE_INS_IDX ;};
hidspecial HID_GLBLTREE_INS_CNTIDX { HelpId = HID_GLBLTREE_INS_CNTIDX ;};
hidspecial HID_GLBLTREE_INS_USRIDX { HelpId = HID_GLBLTREE_INS_USRIDX ;};
hidspecial HID_GLBLTREE_INS_FILE { HelpId = HID_GLBLTREE_INS_FILE ;};
@@ -127,16 +127,16 @@ hidspecial HID_GLBLTREE_INS_TEXT { HelpId = HID_GLBLTREE_INS_TEXT ;};
hidspecial HID_GLBLTREE_UPD_SEL { HelpId = HID_GLBLTREE_UPD_SEL ;};
hidspecial HID_GLBLTREE_UPD_IDX { HelpId = HID_GLBLTREE_UPD_IDX ;};
hidspecial HID_GLBLTREE_UPD_LINK { HelpId = HID_GLBLTREE_UPD_LINK ;};
-hidspecial HID_GLBLTREEUPD_ALL { HelpId = HID_GLBLTREEUPD_ALL ;};
+hidspecial HID_GLBLTREEUPD_ALL { HelpId = HID_GLBLTREEUPD_ALL ;};
hidspecial HID_GLBLTREE_EDIT_LINK { HelpId = HID_GLBLTREE_EDIT_LINK ;};
// Ruler einfuegen
-hidspecial HID_VS_RULER { HelpId = HID_VS_RULER;};
+hidspecial HID_VS_RULER { HelpId = HID_VS_RULER;};
// Briefumschlaege/Etiketten
-hidspecial HID_ENVELOP_PRINT { HelpId = HID_ENVELOP_PRINT;};
-hidspecial HID_ENVELOP_INSERT { HelpId = HID_ENVELOP_INSERT;};
-hidspecial HID_LABEL_INSERT { HelpId = HID_LABEL_INSERT;};
+hidspecial HID_ENVELOP_PRINT { HelpId = HID_ENVELOP_PRINT;};
+hidspecial HID_ENVELOP_INSERT { HelpId = HID_ENVELOP_INSERT;};
+hidspecial HID_LABEL_INSERT { HelpId = HID_LABEL_INSERT;};
// Vorlage laden
hidspecial HID_LTEMPL_TEXT { HelpId = HID_LTEMPL_TEXT ; };
@@ -146,17 +146,17 @@ hidspecial HID_LTEMPL_OVERRIDE { HelpId = HID_LTEMPL_OVERRIDE ; };
hidspecial HID_LTEMPL_NUMBERING { HelpId = HID_LTEMPL_NUMBERING ;};
// Numerierung/Optionen-Button
-hidspecial HID_NUM_FORMAT_BTN { HelpId = HID_NUM_FORMAT_BTN; };
+hidspecial HID_NUM_FORMAT_BTN { HelpId = HID_NUM_FORMAT_BTN; };
// AutoText Bereiche
-hidspecial HID_GLOS_GROUP_TREE { HelpId = HID_GLOS_GROUP_TREE; };
-hidspecial HID_MD_GLOS_CATEGORY { HelpId = HID_MD_GLOS_CATEGORY; };
+hidspecial HID_GLOS_GROUP_TREE { HelpId = HID_GLOS_GROUP_TREE; };
+hidspecial HID_MD_GLOS_CATEGORY { HelpId = HID_MD_GLOS_CATEGORY; };
// AutoFormat
-hidspecial HID_AUTOFORMAT_CLB { HelpId = HID_AUTOFORMAT_CLB; };
+hidspecial HID_AUTOFORMAT_CLB { HelpId = HID_AUTOFORMAT_CLB; };
//OnlineSpelling
-hidspecial HID_LINGU_REPLACE { HelpId = HID_LINGU_REPLACE; };
+hidspecial HID_LINGU_REPLACE { HelpId = HID_LINGU_REPLACE; };
// Navigationsbutton im Scrollbar
@@ -177,116 +177,116 @@ hidspecial HID_EDIT_FORMULA { HelpId = HID_EDIT_FORMULA; };
hidspecial HID_COND_COLL_TABLIST { HelpId = HID_COND_COLL_TABLIST; };
// Seitenvorschau
-hidspecial HID_PAGEPREVIEW { HelpId = HID_PAGEPREVIEW ;};
+hidspecial HID_PAGEPREVIEW { HelpId = HID_PAGEPREVIEW ;};
// Feldbefehl-Dlg
-hidspecial HID_DB_SELECTION_TLB { HelpId = HID_DB_SELECTION_TLB ;};
-hidspecial HID_FIELD_DINF_TYPE { HelpId = HID_FIELD_DINF_TYPE ;};
-hidspecial HID_FIELD_INSERT { HelpId = HID_FIELD_INSERT ;};
-hidspecial HID_FIELD_CLOSE { HelpId = HID_FIELD_CLOSE ;};
-hidspecial HID_FLDEDT_ADDRESS { HelpId = HID_FLDEDT_ADDRESS ;};
-hidspecial HID_EDIT_FLD_DB { HelpId = HID_EDIT_FLD_DB ;};
-hidspecial HID_EDIT_FLD_DOKINF { HelpId = HID_EDIT_FLD_DOKINF ;};
-hidspecial HID_EDIT_FLD_VAR { HelpId = HID_EDIT_FLD_VAR ;};
-hidspecial HID_EDIT_FLD_DOK { HelpId = HID_EDIT_FLD_DOK ;};
-hidspecial HID_EDIT_FLD_FUNC { HelpId = HID_EDIT_FLD_FUNC;};
-hidspecial HID_EDIT_FLD_REF { HelpId = HID_EDIT_FLD_REF ;};
+hidspecial HID_DB_SELECTION_TLB { HelpId = HID_DB_SELECTION_TLB ;};
+hidspecial HID_FIELD_DINF_TYPE { HelpId = HID_FIELD_DINF_TYPE ;};
+hidspecial HID_FIELD_INSERT { HelpId = HID_FIELD_INSERT ;};
+hidspecial HID_FIELD_CLOSE { HelpId = HID_FIELD_CLOSE ;};
+hidspecial HID_FLDEDT_ADDRESS { HelpId = HID_FLDEDT_ADDRESS ;};
+hidspecial HID_EDIT_FLD_DB { HelpId = HID_EDIT_FLD_DB ;};
+hidspecial HID_EDIT_FLD_DOKINF { HelpId = HID_EDIT_FLD_DOKINF ;};
+hidspecial HID_EDIT_FLD_VAR { HelpId = HID_EDIT_FLD_VAR ;};
+hidspecial HID_EDIT_FLD_DOK { HelpId = HID_EDIT_FLD_DOK ;};
+hidspecial HID_EDIT_FLD_FUNC { HelpId = HID_EDIT_FLD_FUNC;};
+hidspecial HID_EDIT_FLD_REF { HelpId = HID_EDIT_FLD_REF ;};
// HTML-Source-Editwin
-hidspecial HID_SOURCE_EDITWIN { HelpId = HID_SOURCE_EDITWIN ;};
+hidspecial HID_SOURCE_EDITWIN { HelpId = HID_SOURCE_EDITWIN ;};
// Redlining
-hidspecial HID_REDLINE_CTRL { HelpId = HID_REDLINE_CTRL ;};
+hidspecial HID_REDLINE_CTRL { HelpId = HID_REDLINE_CTRL ;};
// File-Dialoge
-hidspecial HID_FILEDLG_CHARDLG { HelpId = HID_FILEDLG_CHARDLG ;};
-hidspecial HID_FILEDLG_LOADTEMPLATE { HelpId = HID_FILEDLG_LOADTEMPLATE ;};
-hidspecial HID_FILEDLG_MAILMRGE1 { HelpId = HID_FILEDLG_MAILMRGE1 ;};
-hidspecial HID_FILEDLG_MAILMRGE2 { HelpId = HID_FILEDLG_MAILMRGE2 ;};
-hidspecial HID_FILEDLG_FRMPAGE { HelpId = HID_FILEDLG_FRMPAGE ;};
-hidspecial HID_FILEDLG_SRCVIEW { HelpId = HID_FILEDLG_SRCVIEW ;};
-hidspecial HID_FILEDLG_WIZDOKU { HelpId = HID_FILEDLG_WIZDOKU ;};
-hidspecial HID_SELECT_TEMPLATE { HelpId = HID_SELECT_TEMPLATE ;};
+hidspecial HID_FILEDLG_CHARDLG { HelpId = HID_FILEDLG_CHARDLG ;};
+hidspecial HID_FILEDLG_LOADTEMPLATE { HelpId = HID_FILEDLG_LOADTEMPLATE ;};
+hidspecial HID_FILEDLG_MAILMRGE1 { HelpId = HID_FILEDLG_MAILMRGE1 ;};
+hidspecial HID_FILEDLG_MAILMRGE2 { HelpId = HID_FILEDLG_MAILMRGE2 ;};
+hidspecial HID_FILEDLG_FRMPAGE { HelpId = HID_FILEDLG_FRMPAGE ;};
+hidspecial HID_FILEDLG_SRCVIEW { HelpId = HID_FILEDLG_SRCVIEW ;};
+hidspecial HID_FILEDLG_WIZDOKU { HelpId = HID_FILEDLG_WIZDOKU ;};
+hidspecial HID_SELECT_TEMPLATE { HelpId = HID_SELECT_TEMPLATE ;};
//Kapitelnumerierung - Form
-hidspecial HID_OUTLINE_FORM { HelpId = HID_OUTLINE_FORM ;};
+hidspecial HID_OUTLINE_FORM { HelpId = HID_OUTLINE_FORM ;};
//Numerierungsdialog - Numerierung entfernen
-hidspecial HID_NUM_RESET { HelpId = HID_NUM_RESET ;};
+hidspecial HID_NUM_RESET { HelpId = HID_NUM_RESET ;};
//AutoFormat QueryBox Aenderungen akzeptieren/verwerfen/bearbeiten
-hidspecial HID_AUTOFORMAT_REJECT { HelpId = HID_AUTOFORMAT_REJECT ;};
+hidspecial HID_AUTOFORMAT_REJECT { HelpId = HID_AUTOFORMAT_REJECT ;};
hidspecial HID_AUTOFORMAT_ACCEPT { HelpId = HID_AUTOFORMAT_ACCEPT ;};
hidspecial HID_AUTOFORMAT_EDIT_CHG { HelpId = HID_AUTOFORMAT_EDIT_CHG ;};
-hidspecial HID_NAVI_VS { HelpId = HID_NAVI_VS;};
+hidspecial HID_NAVI_VS { HelpId = HID_NAVI_VS;};
//index dialog
-hidspecial HID_ADD_STYLES_TLB { HelpId = HID_ADD_STYLES_TLB;};
-hidspecial HID_OLE_CHECKLB { HelpId = HID_OLE_CHECKLB;};
+hidspecial HID_ADD_STYLES_TLB { HelpId = HID_ADD_STYLES_TLB;};
+hidspecial HID_OLE_CHECKLB { HelpId = HID_OLE_CHECKLB;};
//ScrollBar buttons
-hidspecial HID_SCRL_PAGEUP { HelpId = HID_SCRL_PAGEUP ;};
+hidspecial HID_SCRL_PAGEUP { HelpId = HID_SCRL_PAGEUP ;};
hidspecial HID_SCRL_PAGEDOWN { HelpId = HID_SCRL_PAGEDOWN;};
//index dialog
-hidspecial HID_TOX_ENTRY_BUTTON { HelpId = HID_TOX_ENTRY_BUTTON;};
-hidspecial HID_TOX_ENTRY_EDIT { HelpId = HID_TOX_ENTRY_EDIT ;};
-hidspecial HID_TOKEN_WINDOW { HelpId = HID_TOKEN_WINDOW ;};
+hidspecial HID_TOX_ENTRY_BUTTON { HelpId = HID_TOX_ENTRY_BUTTON;};
+hidspecial HID_TOX_ENTRY_EDIT { HelpId = HID_TOX_ENTRY_EDIT ;};
+hidspecial HID_TOKEN_WINDOW { HelpId = HID_TOKEN_WINDOW ;};
hidspecial HID_INSERT_IDX_MRK_OK { HelpId = HID_INSERT_IDX_MRK_OK ;};
hidspecial HID_INSERT_IDX_MRK_CLOSE { HelpId = HID_INSERT_IDX_MRK_CLOSE ;};
hidspecial HID_INSERT_AUTH_MRK_OK { HelpId = HID_INSERT_AUTH_MRK_OK ;};
hidspecial HID_INSERT_AUTH_MRK_CLOSE{ HelpId = HID_INSERT_AUTH_MRK_CLOSE ;};
-hidspecial HID_INSERT_IDX_MRK_DELETE { HelpId = HID_INSERT_IDX_MRK_DELETE ;};
-hidspecial HID_INSERT_IDX_MRK_NEW { HelpId = HID_INSERT_IDX_MRK_NEW ;};
-hidspecial HID_INSERT_IDX_MRK_PREV { HelpId = HID_INSERT_IDX_MRK_PREV ;};
+hidspecial HID_INSERT_IDX_MRK_DELETE { HelpId = HID_INSERT_IDX_MRK_DELETE ;};
+hidspecial HID_INSERT_IDX_MRK_NEW { HelpId = HID_INSERT_IDX_MRK_NEW ;};
+hidspecial HID_INSERT_IDX_MRK_PREV { HelpId = HID_INSERT_IDX_MRK_PREV ;};
hidspecial HID_INSERT_IDX_MRK_PREV_SAME { HelpId = HID_INSERT_IDX_MRK_PREV_SAME ;};
-hidspecial HID_INSERT_IDX_MRK_NEXT { HelpId = HID_INSERT_IDX_MRK_NEXT ;};
+hidspecial HID_INSERT_IDX_MRK_NEXT { HelpId = HID_INSERT_IDX_MRK_NEXT ;};
hidspecial HID_INSERT_IDX_MRK_NEXT_SAME { HelpId = HID_INSERT_IDX_MRK_NEXT_SAME ;};
-hidspecial HID_INSERT_IDX_MRK_TYPE { HelpId = HID_INSERT_IDX_MRK_TYPE ;};
-hidspecial HID_INSERT_IDX_MRK_ENTRY { HelpId = HID_INSERT_IDX_MRK_ENTRY ;};
-hidspecial HID_INSERT_IDX_MRK_PRIM_KEY { HelpId = HID_INSERT_IDX_MRK_PRIM_KEY ;};
-hidspecial HID_INSERT_IDX_MRK_SEC_KEY { HelpId = HID_INSERT_IDX_MRK_SEC_KEY ;};
-hidspecial HID_INSERT_IDX_MRK_LEVEL { HelpId = HID_INSERT_IDX_MRK_LEVEL ;};
+hidspecial HID_INSERT_IDX_MRK_TYPE { HelpId = HID_INSERT_IDX_MRK_TYPE ;};
+hidspecial HID_INSERT_IDX_MRK_ENTRY { HelpId = HID_INSERT_IDX_MRK_ENTRY ;};
+hidspecial HID_INSERT_IDX_MRK_PRIM_KEY { HelpId = HID_INSERT_IDX_MRK_PRIM_KEY ;};
+hidspecial HID_INSERT_IDX_MRK_SEC_KEY { HelpId = HID_INSERT_IDX_MRK_SEC_KEY ;};
+hidspecial HID_INSERT_IDX_MRK_LEVEL { HelpId = HID_INSERT_IDX_MRK_LEVEL ;};
hidspecial HID_INSERT_IDX_MRK_MAIN_ENTRY { HelpId = HID_INSERT_IDX_MRK_MAIN_ENTRY;};
hidspecial HID_INSERT_IDX_MRK_APPLY_ALL { HelpId = HID_INSERT_IDX_MRK_APPLY_ALL ;};
hidspecial HID_INSERT_IDX_MRK_PHONETIC_READING { HelpId = HID_INSERT_IDX_MRK_PHONETIC_READING ;};
-hidspecial HID_INSERT_AUTH_MRK_ENTRY { HelpId = HID_INSERT_AUTH_MRK_ENTRY ;};
+hidspecial HID_INSERT_AUTH_MRK_ENTRY { HelpId = HID_INSERT_AUTH_MRK_ENTRY ;};
hidspecial HID_INSERT_AUTH_MRK_CREATE_ENTRY { HelpId = HID_INSERT_AUTH_MRK_CREATE_ENTRY ;};
-hidspecial HID_INSERT_AUTH_MRK_EDIT_ENTRY { HelpId = HID_INSERT_AUTH_MRK_EDIT_ENTRY ;};
-
-hidspecial HID_AUTH_FIELD_IDENTIFIER { HelpId = HID_AUTH_FIELD_IDENTIFIER ;};
-hidspecial HID_AUTH_FIELD_AUTHORITY_TYPE { HelpId = HID_AUTH_FIELD_AUTHORITY_TYPE ;};
-hidspecial HID_AUTH_FIELD_ADDRESS { HelpId = HID_AUTH_FIELD_ADDRESS ;};
-hidspecial HID_AUTH_FIELD_ANNOTE { HelpId = HID_AUTH_FIELD_ANNOTE ;};
-hidspecial HID_AUTH_FIELD_AUTHOR { HelpId = HID_AUTH_FIELD_AUTHOR ;};
-hidspecial HID_AUTH_FIELD_BOOKTITLE { HelpId = HID_AUTH_FIELD_BOOKTITLE ;};
-hidspecial HID_AUTH_FIELD_CHAPTER { HelpId = HID_AUTH_FIELD_CHAPTER ;};
-hidspecial HID_AUTH_FIELD_EDITION { HelpId = HID_AUTH_FIELD_EDITION ;};
-hidspecial HID_AUTH_FIELD_EDITOR { HelpId = HID_AUTH_FIELD_EDITOR ;};
-hidspecial HID_AUTH_FIELD_HOWPUBLISHED { HelpId = HID_AUTH_FIELD_HOWPUBLISHED ;};
-hidspecial HID_AUTH_FIELD_INSTITUTION { HelpId = HID_AUTH_FIELD_INSTITUTION ;};
-hidspecial HID_AUTH_FIELD_JOURNAL { HelpId = HID_AUTH_FIELD_JOURNAL ;};
-hidspecial HID_AUTH_FIELD_MONTH { HelpId = HID_AUTH_FIELD_MONTH ;};
-hidspecial HID_AUTH_FIELD_NOTE { HelpId = HID_AUTH_FIELD_NOTE ;};
-hidspecial HID_AUTH_FIELD_NUMBER { HelpId = HID_AUTH_FIELD_NUMBER ;};
-hidspecial HID_AUTH_FIELD_ORGANIZATIONS { HelpId = HID_AUTH_FIELD_ORGANIZATIONS ;};
-hidspecial HID_AUTH_FIELD_PAGES { HelpId = HID_AUTH_FIELD_PAGES ;};
-hidspecial HID_AUTH_FIELD_PUBLISHER { HelpId = HID_AUTH_FIELD_PUBLISHER ;};
-hidspecial HID_AUTH_FIELD_SCHOOL { HelpId = HID_AUTH_FIELD_SCHOOL ;};
-hidspecial HID_AUTH_FIELD_SERIES { HelpId = HID_AUTH_FIELD_SERIES ;};
-hidspecial HID_AUTH_FIELD_TITLE { HelpId = HID_AUTH_FIELD_TITLE ;};
-hidspecial HID_AUTH_FIELD_REPORT_TYPE { HelpId = HID_AUTH_FIELD_REPORT_TYPE ;};
-hidspecial HID_AUTH_FIELD_VOLUME { HelpId = HID_AUTH_FIELD_VOLUME ;};
-hidspecial HID_AUTH_FIELD_YEAR { HelpId = HID_AUTH_FIELD_YEAR ;};
-hidspecial HID_AUTH_FIELD_URL { HelpId = HID_AUTH_FIELD_URL ;};
-hidspecial HID_AUTH_FIELD_CUSTOM1 { HelpId = HID_AUTH_FIELD_CUSTOM1 ;};
-hidspecial HID_AUTH_FIELD_CUSTOM2 { HelpId = HID_AUTH_FIELD_CUSTOM2 ;};
-hidspecial HID_AUTH_FIELD_CUSTOM3 { HelpId = HID_AUTH_FIELD_CUSTOM3 ;};
-hidspecial HID_AUTH_FIELD_CUSTOM4 { HelpId = HID_AUTH_FIELD_CUSTOM4 ;};
-hidspecial HID_AUTH_FIELD_CUSTOM5 { HelpId = HID_AUTH_FIELD_CUSTOM5 ;};
-hidspecial HID_AUTH_FIELD_ISBN { HelpId = HID_AUTH_FIELD_ISBN ;};
+hidspecial HID_INSERT_AUTH_MRK_EDIT_ENTRY { HelpId = HID_INSERT_AUTH_MRK_EDIT_ENTRY ;};
+
+hidspecial HID_AUTH_FIELD_IDENTIFIER { HelpId = HID_AUTH_FIELD_IDENTIFIER ;};
+hidspecial HID_AUTH_FIELD_AUTHORITY_TYPE { HelpId = HID_AUTH_FIELD_AUTHORITY_TYPE ;};
+hidspecial HID_AUTH_FIELD_ADDRESS { HelpId = HID_AUTH_FIELD_ADDRESS ;};
+hidspecial HID_AUTH_FIELD_ANNOTE { HelpId = HID_AUTH_FIELD_ANNOTE ;};
+hidspecial HID_AUTH_FIELD_AUTHOR { HelpId = HID_AUTH_FIELD_AUTHOR ;};
+hidspecial HID_AUTH_FIELD_BOOKTITLE { HelpId = HID_AUTH_FIELD_BOOKTITLE ;};
+hidspecial HID_AUTH_FIELD_CHAPTER { HelpId = HID_AUTH_FIELD_CHAPTER ;};
+hidspecial HID_AUTH_FIELD_EDITION { HelpId = HID_AUTH_FIELD_EDITION ;};
+hidspecial HID_AUTH_FIELD_EDITOR { HelpId = HID_AUTH_FIELD_EDITOR ;};
+hidspecial HID_AUTH_FIELD_HOWPUBLISHED { HelpId = HID_AUTH_FIELD_HOWPUBLISHED ;};
+hidspecial HID_AUTH_FIELD_INSTITUTION { HelpId = HID_AUTH_FIELD_INSTITUTION ;};
+hidspecial HID_AUTH_FIELD_JOURNAL { HelpId = HID_AUTH_FIELD_JOURNAL ;};
+hidspecial HID_AUTH_FIELD_MONTH { HelpId = HID_AUTH_FIELD_MONTH ;};
+hidspecial HID_AUTH_FIELD_NOTE { HelpId = HID_AUTH_FIELD_NOTE ;};
+hidspecial HID_AUTH_FIELD_NUMBER { HelpId = HID_AUTH_FIELD_NUMBER ;};
+hidspecial HID_AUTH_FIELD_ORGANIZATIONS { HelpId = HID_AUTH_FIELD_ORGANIZATIONS ;};
+hidspecial HID_AUTH_FIELD_PAGES { HelpId = HID_AUTH_FIELD_PAGES ;};
+hidspecial HID_AUTH_FIELD_PUBLISHER { HelpId = HID_AUTH_FIELD_PUBLISHER ;};
+hidspecial HID_AUTH_FIELD_SCHOOL { HelpId = HID_AUTH_FIELD_SCHOOL ;};
+hidspecial HID_AUTH_FIELD_SERIES { HelpId = HID_AUTH_FIELD_SERIES ;};
+hidspecial HID_AUTH_FIELD_TITLE { HelpId = HID_AUTH_FIELD_TITLE ;};
+hidspecial HID_AUTH_FIELD_REPORT_TYPE { HelpId = HID_AUTH_FIELD_REPORT_TYPE ;};
+hidspecial HID_AUTH_FIELD_VOLUME { HelpId = HID_AUTH_FIELD_VOLUME ;};
+hidspecial HID_AUTH_FIELD_YEAR { HelpId = HID_AUTH_FIELD_YEAR ;};
+hidspecial HID_AUTH_FIELD_URL { HelpId = HID_AUTH_FIELD_URL ;};
+hidspecial HID_AUTH_FIELD_CUSTOM1 { HelpId = HID_AUTH_FIELD_CUSTOM1 ;};
+hidspecial HID_AUTH_FIELD_CUSTOM2 { HelpId = HID_AUTH_FIELD_CUSTOM2 ;};
+hidspecial HID_AUTH_FIELD_CUSTOM3 { HelpId = HID_AUTH_FIELD_CUSTOM3 ;};
+hidspecial HID_AUTH_FIELD_CUSTOM4 { HelpId = HID_AUTH_FIELD_CUSTOM4 ;};
+hidspecial HID_AUTH_FIELD_CUSTOM5 { HelpId = HID_AUTH_FIELD_CUSTOM5 ;};
+hidspecial HID_AUTH_FIELD_ISBN { HelpId = HID_AUTH_FIELD_ISBN ;};
hidspecial HID_AUTH_MARK_DLG_FROM_COMP_RB { HelpId = HID_AUTH_MARK_DLG_FROM_COMP_RB ;};
hidspecial HID_AUTH_MARK_DLG_FROM_DOC_RB { HelpId = HID_AUTH_MARK_DLG_FROM_DOC_RB ;};
@@ -329,22 +329,22 @@ hidspecial HID_INSERT_FILE { HelpID = HID_INSERT
hidspecial HID_NID_TBL { HelpId = HID_NID_TBL; };
hidspecial HID_NID_FRM { HelpId = HID_NID_FRM; };
hidspecial HID_NID_GRF { HelpId = HID_NID_GRF; };
-hidspecial HID_NID_OLE { HelpId = HID_NID_OLE; };
-hidspecial HID_NID_PGE { HelpId = HID_NID_PGE ; };
-hidspecial HID_NID_OUTL { HelpId = HID_NID_OUTL; };
-hidspecial HID_NID_MARK { HelpId = HID_NID_MARK; };
-hidspecial HID_NID_DRW { HelpId = HID_NID_DRW ; };
+hidspecial HID_NID_OLE { HelpId = HID_NID_OLE; };
+hidspecial HID_NID_PGE { HelpId = HID_NID_PGE ; };
+hidspecial HID_NID_OUTL { HelpId = HID_NID_OUTL; };
+hidspecial HID_NID_MARK { HelpId = HID_NID_MARK; };
+hidspecial HID_NID_DRW { HelpId = HID_NID_DRW ; };
hidspecial HID_NID_CTRL { HelpId = HID_NID_CTRL; };
-hidspecial HID_NID_PREV { HelpId = HID_NID_PREV; };
-hidspecial HID_NID_REG { HelpId = HID_NID_REG ; };
-hidspecial HID_NID_BKM { HelpId = HID_NID_BKM ; };
-hidspecial HID_NID_SEL { HelpId = HID_NID_SEL ; };
-hidspecial HID_NID_FTN { HelpId = HID_NID_FTN ; };
-hidspecial HID_NID_POSTIT { HelpId = HID_NID_POSTIT ; };
-hidspecial HID_NID_SRCH_REP { HelpId = HID_NID_SRCH_REP; };
-hidspecial HID_NID_INDEX_ENTRY { HelpId = HID_NID_INDEX_ENTRY ; };
-hidspecial HID_NID_TABLE_FORMULA { HelpId = HID_NID_TABLE_FORMULA ; };
-hidspecial HID_NID_TABLE_FORMULA_ERROR { HelpID = HID_NID_TABLE_FORMULA_ERROR ; };
+hidspecial HID_NID_PREV { HelpId = HID_NID_PREV; };
+hidspecial HID_NID_REG { HelpId = HID_NID_REG ; };
+hidspecial HID_NID_BKM { HelpId = HID_NID_BKM ; };
+hidspecial HID_NID_SEL { HelpId = HID_NID_SEL ; };
+hidspecial HID_NID_FTN { HelpId = HID_NID_FTN ; };
+hidspecial HID_NID_POSTIT { HelpId = HID_NID_POSTIT ; };
+hidspecial HID_NID_SRCH_REP { HelpId = HID_NID_SRCH_REP; };
+hidspecial HID_NID_INDEX_ENTRY { HelpId = HID_NID_INDEX_ENTRY ; };
+hidspecial HID_NID_TABLE_FORMULA { HelpId = HID_NID_TABLE_FORMULA ; };
+hidspecial HID_NID_TABLE_FORMULA_ERROR { HelpID = HID_NID_TABLE_FORMULA_ERROR ; };
hidspecial HID_NID_NEXT { HelpID = HID_NID_NEXT ; };
hidspecial HID_MM_SELECTDBTABLEDDIALOG_LISTBOX { HelpID = HID_MM_SELECTDBTABLEDDIALOG_LISTBOX; };
hidspecial HID_MM_ADDRESSLIST_HB { HelpID = HID_MM_ADDRESSLIST_HB ; };
diff --git a/sw/xml/writer.xml b/sw/xml/writer.xml
index c06350f66b10..c10485296010 100644
--- a/sw/xml/writer.xml
+++ b/sw/xml/writer.xml
@@ -852,22 +852,22 @@
- <!-- XML-based filter: Writer import components
- (full, styles, content, meta, settings)
+ <!-- XML-based filter: Writer import components
+ (full, styles, content, meta, settings)
-->
-
+
<component-description>
<author>xmloff development team</author>
<name>com.sun.star.comp.Writer.XMLImporter</name>
<description>
This component imports a single XML document stream into a
- writer document. For
+ writer document. For
</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -885,7 +885,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -903,7 +903,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -921,7 +921,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -939,7 +939,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -948,8 +948,8 @@
</component-description>
- <!-- XML-based filter: Writer export components
- (full, styles, content, meta, settings)
+ <!-- XML-based filter: Writer export components
+ (full, styles, content, meta, settings)
-->
<component-description>
@@ -963,7 +963,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -981,7 +981,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -999,7 +999,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -1017,7 +1017,7 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
@@ -1035,14 +1035,14 @@
<language>c++</language>
<status value="beta"/>
<supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
- <reference-docu xlink:href="http://xml.openoffice.org/"
+ <reference-docu xlink:href="http://xml.openoffice.org/"
xlink:title="general OpenOffice.org xml information" />
<reference-docu xlink:title="XML File Format Specification"
xlink:href="http://xml.openoffice.org/xml_specification.pdf" />
<reference-docu xlink:href="http://xml.openoffice.org/filter/"
xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
</component-description>
-
+
<!-- UNO Accessibility API (UAA) -->
@@ -1057,7 +1057,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleTextDocumentView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1072,7 +1072,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleTextDocumentPageView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1087,7 +1087,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessiblePageView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1102,7 +1102,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleHeaderFooterView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1117,7 +1117,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleHeaderFooterView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1132,7 +1132,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleFootnoteView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1147,7 +1147,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleEndnoteView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1162,7 +1162,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleParagraphView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1177,7 +1177,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.table.AccessibleTableView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1192,7 +1192,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.table.AccessibleCellView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1207,7 +1207,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleTextFrameView</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1222,7 +1222,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleTextGraphicObject</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>
@@ -1237,7 +1237,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.text.AccessibleTextEmbeddedObject</supported-service>
- <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
+ <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html"
xlink:title="OpenOffice.org Accessibility project" />
</component-description>