summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
commit49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch)
treed432fa8e42251e69e95f7d56cca7fc1b03f18f2c
parent315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:06 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 16:35:37 2011 +0200 Remove extra bracket to fix build build breakage added by the previous commit sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri May 20 11:00:26 2011 +0300 Add sanity check before dereference, bnc#694119 Signed-off-by: Petr Mladek <pmladek@suse.cz> sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d53f1f6ee9f02d3d77c76910023986f7f346fc30 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Mar 18 13:19:59 2011 +0100 Fix fdo#33947 crash in Impress after printing Fixes lifetime issue with DrawViewShell - solved by not handing one in to the print preview DocumentRenderer Signed-off-by: Thorsten Behrens <tbehrens@novell.com> sd/source/ui/view/DocumentRenderer.cxx | 2 +- sd/source/ui/view/drawview.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Notes
Notes: split repo tag: impress_libreoffice-3.3.3.1 split repo tag: impress_libreoffice-3.3.4.1
-rw-r--r--animations/inc/animations/animationnodehelper.hxx36
-rw-r--r--animations/source/animcore/animcore.cxx36
-rw-r--r--animations/source/animcore/animcore.xml22
-rw-r--r--animations/source/animcore/factreg.cxx4
-rw-r--r--animations/source/animcore/factreg.hxx4
-rw-r--r--animations/source/animcore/targetpropertiescreator.cxx80
-rw-r--r--sd/inc/CustomAnimationCloner.hxx2
-rw-r--r--sd/inc/CustomAnimationEffect.hxx164
-rw-r--r--sd/inc/CustomAnimationPreset.hxx8
-rw-r--r--sd/inc/EffectMigration.hxx2
-rw-r--r--sd/inc/FactoryIds.hxx2
-rw-r--r--sd/inc/Outliner.hxx32
-rw-r--r--sd/inc/OutlinerIterator.hxx28
-rw-r--r--sd/inc/SdShapeTypes.hxx6
-rw-r--r--sd/inc/TransitionPreset.hxx4
-rw-r--r--sd/inc/anmdef.hxx4
-rw-r--r--sd/inc/anminfo.hxx52
-rwxr-xr-xsd/inc/app.hrc436
-rw-r--r--sd/inc/app.hxx2
-rw-r--r--sd/inc/cusshow.hxx2
-rw-r--r--sd/inc/diadef.h2
-rw-r--r--sd/inc/drawdoc.hxx108
-rw-r--r--sd/inc/eetext.hxx4
-rw-r--r--sd/inc/fadedef.h4
-rwxr-xr-xsd/inc/glob.hrc58
-rw-r--r--sd/inc/glob.hxx30
-rw-r--r--sd/inc/helper/simplereferencecomponent.hxx2
-rw-r--r--sd/inc/helpids.h194
-rw-r--r--sd/inc/imapinfo.hxx10
-rw-r--r--sd/inc/misc.hxx2
-rw-r--r--sd/inc/misc/scopelock.hxx6
-rw-r--r--sd/inc/movedef.hxx4
-rw-r--r--sd/inc/pch/precompiled_sd.cxx2
-rw-r--r--sd/inc/pch/precompiled_sd.hxx2
-rw-r--r--sd/inc/pglink.hxx4
-rw-r--r--sd/inc/pres.hxx34
-rw-r--r--sd/inc/prlayout.hxx2
-rw-r--r--sd/inc/resltn.hxx2
-rw-r--r--sd/inc/sd_primitivetypes2d.hxx10
-rw-r--r--sd/inc/sdabstdlg.hxx102
-rw-r--r--sd/inc/sdattr.hrc344
-rw-r--r--sd/inc/sdattr.hxx30
-rw-r--r--sd/inc/sdcgmfilter.hxx2
-rw-r--r--sd/inc/sddll.hxx6
-rw-r--r--sd/inc/sddllapi.h2
-rw-r--r--sd/inc/sdenumdef.hxx2
-rw-r--r--sd/inc/sderror.hxx14
-rw-r--r--sd/inc/sdfilter.hxx28
-rw-r--r--sd/inc/sdgrffilter.hxx6
-rw-r--r--sd/inc/sdhtmlfilter.hxx10
-rw-r--r--sd/inc/sdiocmpt.hxx20
-rw-r--r--sd/inc/sdmod.hxx52
-rw-r--r--sd/inc/sdobjfac.hxx2
-rw-r--r--sd/inc/sdpage.hxx174
-rw-r--r--sd/inc/sdpptwrp.hxx6
-rw-r--r--sd/inc/sdresid.hxx2
-rw-r--r--sd/inc/sduiks.hrc48
-rw-r--r--sd/inc/sdundo.hxx8
-rw-r--r--sd/inc/sdxmlwrp.hxx18
-rw-r--r--sd/inc/shapelist.hxx6
-rw-r--r--sd/inc/stlfamily.hxx12
-rw-r--r--sd/inc/stlpool.hxx34
-rw-r--r--sd/inc/stlsheet.hxx26
-rw-r--r--sd/inc/strmname.h2
-rw-r--r--sd/inc/textapi.hxx12
-rw-r--r--sd/inc/undo/undofactory.hxx4
-rw-r--r--sd/inc/undo/undomanager.hxx18
-rw-r--r--sd/inc/undo/undoobjects.hxx16
-rw-r--r--sd/inc/undoanim.hxx6
-rw-r--r--sd/sdi/SlideSorterController.sdi2
-rw-r--r--sd/sdi/ToolPanelViewShell.sdi32
-rwxr-xr-xsd/sdi/ViewShellBase.sdi2
-rw-r--r--sd/sdi/_docsh.sdi2
-rwxr-xr-xsd/sdi/_drvwsh.sdi22
-rw-r--r--sd/sdi/docshell.sdi2
-rwxr-xr-xsd/sdi/drtxtob.sdi20
-rw-r--r--sd/sdi/drviewsh.sdi6
-rw-r--r--sd/sdi/grdocsh.sdi2
-rw-r--r--sd/sdi/grviewsh.sdi4
-rwxr-xr-xsd/sdi/outlnvsh.sdi4
-rw-r--r--sd/sdi/sdgslots.sdi2
-rw-r--r--sd/sdi/sdnew.sdi30
-rw-r--r--sd/sdi/sdslots.hrc2
-rwxr-xr-xsd/sdi/sdslots.sdi4
-rw-r--r--sd/sdi/tables.sdi6
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx2
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx94
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx12
-rw-r--r--sd/source/core/EffectMigration.cxx210
-rw-r--r--sd/source/core/PageListWatcher.cxx12
-rw-r--r--sd/source/core/PageListWatcher.hxx12
-rw-r--r--sd/source/core/TransitionPreset.cxx2
-rw-r--r--sd/source/core/anminfo.cxx84
-rw-r--r--sd/source/core/annotations/Annotation.cxx44
-rw-r--r--sd/source/core/annotations/AnnotationEnumeration.cxx2
-rw-r--r--sd/source/core/cusshow.cxx2
-rw-r--r--sd/source/core/drawdoc.cxx24
-rw-r--r--sd/source/core/drawdoc2.cxx72
-rw-r--r--sd/source/core/drawdoc3.cxx96
-rw-r--r--sd/source/core/drawdoc4.cxx84
-rw-r--r--sd/source/core/drawdoc_animations.cxx2
-rwxr-xr-xsd/source/core/glob.src6
-rw-r--r--sd/source/core/pglink.cxx4
-rw-r--r--sd/source/core/sdattr.cxx10
-rw-r--r--sd/source/core/sdiocmpt.cxx60
-rw-r--r--sd/source/core/sdobjfac.cxx2
-rw-r--r--sd/source/core/sdpage.cxx174
-rw-r--r--sd/source/core/sdpage2.cxx54
-rw-r--r--sd/source/core/sdpage_animations.cxx2
-rw-r--r--sd/source/core/shapelist.cxx2
-rw-r--r--sd/source/core/stlfamily.cxx22
-rw-r--r--sd/source/core/stlpool.cxx116
-rw-r--r--sd/source/core/stlsheet.cxx120
-rw-r--r--sd/source/core/text/textapi.cxx50
-rw-r--r--sd/source/core/typemap.cxx50
-rw-r--r--sd/source/core/undo/undofactory.cxx2
-rw-r--r--sd/source/core/undo/undomanager.cxx2
-rw-r--r--sd/source/core/undo/undoobjects.cxx20
-rw-r--r--sd/source/core/undoanim.cxx8
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx36
-rw-r--r--sd/source/filter/eppt/epptdef.hxx110
-rw-r--r--sd/source/filter/eppt/epptso.cxx6
-rw-r--r--sd/source/filter/eppt/escherex.cxx30
-rw-r--r--sd/source/filter/eppt/escherex.hxx20
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx2
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx6
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx6
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.hxx30
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx2
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx32
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx6
-rw-r--r--sd/source/filter/html/buttonset.cxx2
-rw-r--r--sd/source/filter/html/buttonset.hxx4
-rw-r--r--sd/source/filter/html/htmlattr.cxx2
-rw-r--r--sd/source/filter/html/htmlattr.hxx8
-rw-r--r--sd/source/filter/html/htmlex.cxx82
-rw-r--r--sd/source/filter/html/htmlex.hxx108
-rw-r--r--sd/source/filter/html/pubdlg.cxx164
-rw-r--r--sd/source/filter/html/pubdlg.src4
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx2
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx68
-rw-r--r--sd/source/filter/ppt/ppt97animations.hxx32
-rw-r--r--sd/source/filter/ppt/pptanimations.hxx670
-rw-r--r--sd/source/filter/ppt/pptatom.cpp6
-rw-r--r--sd/source/filter/ppt/pptatom.hxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx348
-rw-r--r--sd/source/filter/ppt/pptin.hxx38
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx136
-rw-r--r--sd/source/filter/ppt/pptinanimations.hxx14
-rw-r--r--sd/source/filter/ppt/propread.cxx108
-rw-r--r--sd/source/filter/ppt/propread.hxx184
-rw-r--r--sd/source/filter/sdfilter.cxx60
-rw-r--r--sd/source/filter/sdpptwrp.cxx14
-rw-r--r--sd/source/filter/xml/sdtransform.cxx12
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx40
-rw-r--r--sd/source/helper/simplereferencecomponent.cxx8
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx120
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx42
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx32
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx18
-rw-r--r--sd/source/ui/accessibility/AccessiblePageShape.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx16
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationShape.cxx12
-rw-r--r--sd/source/ui/accessibility/AccessibleScrollPanel.cxx8
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx50
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx82
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx60
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx4
-rw-r--r--sd/source/ui/accessibility/SdShapeTypes.cxx46
-rw-r--r--sd/source/ui/accessibility/accessibility.hrc32
-rw-r--r--sd/source/ui/accessibility/accessibility.src2
-rw-r--r--sd/source/ui/animations/CustomAnimation.hrc200
-rw-r--r--sd/source/ui/animations/CustomAnimation.src20
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx34
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.hrc12
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.src8
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx90
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.hrc102
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.hxx18
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.src84
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx70
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx24
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx88
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hrc56
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx48
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.src40
-rw-r--r--sd/source/ui/animations/DialogListBox.cxx14
-rw-r--r--sd/source/ui/animations/STLPropertySet.cxx2
-rw-r--r--sd/source/ui/animations/STLPropertySet.hxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx14
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hrc2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.src2
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx118
-rw-r--r--sd/source/ui/animations/motionpathtag.hxx8
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx254
-rw-r--r--sd/source/ui/annotations/annotationmanagerimpl.hxx36
-rw-r--r--sd/source/ui/annotations/annotations.hrc52
-rw-r--r--sd/source/ui/annotations/annotations.src6
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx98
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx14
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx46
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx90
-rw-r--r--sd/source/ui/app/_app.hrc2
-rw-r--r--sd/source/ui/app/accel_tmpl.src4
-rw-r--r--sd/source/ui/app/accelids_tmpl.src2
-rw-r--r--sd/source/ui/app/app.src2
-rw-r--r--sd/source/ui/app/menu_tmpl.src4
-rwxr-xr-xsd/source/ui/app/menuids2_tmpl.src40
-rw-r--r--sd/source/ui/app/menuids3_tmpl.src2
-rw-r--r--sd/source/ui/app/menuids4_tmpl.src4
-rw-r--r--sd/source/ui/app/menuids_tmpl.src4
-rw-r--r--sd/source/ui/app/menuportal_tmpl.src10
-rw-r--r--sd/source/ui/app/optsitem.cxx250
-rw-r--r--sd/source/ui/app/popup.src6
-rw-r--r--sd/source/ui/app/popup2_tmpl.src16
-rwxr-xr-xsd/source/ui/app/res_bmp.src8
-rw-r--r--sd/source/ui/app/sddll.cxx2
-rw-r--r--sd/source/ui/app/sddll1.cxx2
-rw-r--r--sd/source/ui/app/sddll2.cxx8
-rw-r--r--sd/source/ui/app/sdmod.cxx12
-rw-r--r--sd/source/ui/app/sdmod1.cxx8
-rw-r--r--sd/source/ui/app/sdmod2.cxx22
-rw-r--r--sd/source/ui/app/sdpopup.cxx52
-rw-r--r--sd/source/ui/app/sdresid.cxx2
-rw-r--r--sd/source/ui/app/sdstring.src2
-rw-r--r--sd/source/ui/app/sdxfer.cxx80
-rwxr-xr-xsd/source/ui/app/strings.src4
-rw-r--r--sd/source/ui/app/tbx_ww.src2
-rw-r--r--sd/source/ui/app/tbxids_tmpl.src2
-rw-r--r--sd/source/ui/app/tbxww.cxx20
-rw-r--r--sd/source/ui/app/tmplctrl.cxx10
-rw-r--r--sd/source/ui/app/toolbox.src2
-rw-r--r--sd/source/ui/app/toolbox2_tmpl.src2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx14
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.hxx4
-rw-r--r--sd/source/ui/dlg/AnimationChildWindow.cxx4
-rw-r--r--sd/source/ui/dlg/LayerDialog.src2
-rw-r--r--sd/source/ui/dlg/LayerDialogChildWindow.cxx10
-rw-r--r--sd/source/ui/dlg/LayerDialogContent.cxx2
-rw-r--r--sd/source/ui/dlg/LayerTabBar.cxx26
-rw-r--r--sd/source/ui/dlg/NavigatorChildWindow.cxx4
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx26
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx2
-rwxr-xr-xsd/source/ui/dlg/PaneDockingWindow.src8
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx2
-rw-r--r--sd/source/ui/dlg/SpellDialogChildWindow.cxx10
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx32
-rw-r--r--sd/source/ui/dlg/animobjs.cxx102
-rw-r--r--sd/source/ui/dlg/animobjs.src2
-rw-r--r--sd/source/ui/dlg/assclass.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx28
-rw-r--r--sd/source/ui/dlg/brkdlg.src2
-rw-r--r--sd/source/ui/dlg/celltempl.cxx2
-rw-r--r--sd/source/ui/dlg/celltempl.src2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx18
-rw-r--r--sd/source/ui/dlg/copydlg.src2
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx52
-rw-r--r--sd/source/ui/dlg/custsdlg.src2
-rw-r--r--sd/source/ui/dlg/diactrl.cxx14
-rw-r--r--sd/source/ui/dlg/dlg_char.src4
-rw-r--r--sd/source/ui/dlg/dlgass.cxx198
-rw-r--r--sd/source/ui/dlg/dlgass.src4
-rw-r--r--sd/source/ui/dlg/dlgassim.cxx8
-rw-r--r--sd/source/ui/dlg/dlgassim.hxx8
-rw-r--r--sd/source/ui/dlg/dlgchar.cxx6
-rw-r--r--sd/source/ui/dlg/dlgctrls.cxx6
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx62
-rw-r--r--sd/source/ui/dlg/dlgfield.src2
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx14
-rw-r--r--sd/source/ui/dlg/dlgolbul.src2
-rw-r--r--sd/source/ui/dlg/dlgpage.cxx6
-rw-r--r--sd/source/ui/dlg/dlgpage.src2
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx18
-rw-r--r--sd/source/ui/dlg/dlgsnap.src2
-rw-r--r--sd/source/ui/dlg/docprev.cxx18
-rw-r--r--sd/source/ui/dlg/filedlg.cxx24
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx20
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx70
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.src96
-rw-r--r--sd/source/ui/dlg/ins_paste.cxx2
-rw-r--r--sd/source/ui/dlg/ins_paste.src2
-rw-r--r--sd/source/ui/dlg/inspagob.cxx26
-rw-r--r--sd/source/ui/dlg/inspagob.src2
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.src4
-rw-r--r--sd/source/ui/dlg/masterlayoutdlg.cxx14
-rw-r--r--sd/source/ui/dlg/masterlayoutdlg.src12
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx38
-rw-r--r--sd/source/ui/dlg/morphdlg.src2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx46
-rw-r--r--sd/source/ui/dlg/navigatr.src16
-rw-r--r--sd/source/ui/dlg/paragr.cxx14
-rw-r--r--sd/source/ui/dlg/paragr.src4
-rw-r--r--sd/source/ui/dlg/present.cxx32
-rw-r--r--sd/source/ui/dlg/present.src12
-rw-r--r--sd/source/ui/dlg/prltempl.cxx18
-rw-r--r--sd/source/ui/dlg/prltempl.src8
-rw-r--r--sd/source/ui/dlg/prntopts.cxx12
-rw-r--r--sd/source/ui/dlg/prntopts.src2
-rw-r--r--sd/source/ui/dlg/sdabstdlg.cxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx38
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx170
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx22
-rw-r--r--sd/source/ui/dlg/sdpreslt.src2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx104
-rw-r--r--sd/source/ui/dlg/sduiexp.cxx2
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx18
-rw-r--r--sd/source/ui/dlg/tabtempl.src4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx72
-rw-r--r--sd/source/ui/dlg/tpaction.src8
-rw-r--r--sd/source/ui/dlg/tpoption.cxx42
-rw-r--r--sd/source/ui/dlg/tpoption.src2
-rw-r--r--sd/source/ui/dlg/unchss.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx86
-rw-r--r--sd/source/ui/dlg/vectdlg.src2
-rw-r--r--sd/source/ui/docshell/docshel2.cxx42
-rw-r--r--sd/source/ui/docshell/docshel3.cxx10
-rw-r--r--sd/source/ui/docshell/docshel4.cxx36
-rw-r--r--sd/source/ui/docshell/docshell.cxx20
-rw-r--r--sd/source/ui/docshell/grdocsh.cxx2
-rw-r--r--sd/source/ui/docshell/sdclient.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueue.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueue.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx4
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx22
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationClassifier.cxx12
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationClassifier.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx24
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx8
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx14
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx10
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx10
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx10
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx6
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx10
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.hxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx10
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.cxx4
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.hxx6
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx12
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.hxx14
-rw-r--r--sd/source/ui/framework/factories/BasicToolBarFactory.cxx8
-rw-r--r--sd/source/ui/framework/factories/BasicToolBarFactory.hxx16
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx26
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.hxx14
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx14
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.hxx4
-rw-r--r--sd/source/ui/framework/factories/FrameWindowPane.cxx2
-rw-r--r--sd/source/ui/framework/factories/FrameWindowPane.hxx2
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx14
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.hxx4
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx12
-rw-r--r--sd/source/ui/framework/factories/PresentationFactory.cxx14
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx14
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.hxx10
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx12
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.cxx8
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.hxx8
-rw-r--r--sd/source/ui/framework/module/DrawModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ImpressModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx6
-rw-r--r--sd/source/ui/framework/module/PresentationModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ReadOnlyModeObserver.cxx8
-rw-r--r--sd/source/ui/framework/module/ReadOnlyModeObserver.hxx10
-rw-r--r--sd/source/ui/framework/module/ResourceManager.cxx2
-rw-r--r--sd/source/ui/framework/module/ResourceManager.hxx10
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.cxx6
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.hxx8
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.cxx6
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.hxx6
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.cxx4
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.hxx8
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.cxx10
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.hxx2
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.cxx10
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.hxx8
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx30
-rw-r--r--sd/source/ui/func/bulmaper.cxx4
-rw-r--r--sd/source/ui/func/fuarea.cxx4
-rw-r--r--sd/source/ui/func/fubullet.cxx26
-rw-r--r--sd/source/ui/func/fuchar.cxx2
-rw-r--r--sd/source/ui/func/fucon3d.cxx28
-rw-r--r--sd/source/ui/func/fuconarc.cxx30
-rw-r--r--sd/source/ui/func/fuconbez.cxx20
-rw-r--r--sd/source/ui/func/fuconcs.cxx14
-rw-r--r--sd/source/ui/func/fuconnct.cxx8
-rw-r--r--sd/source/ui/func/fuconrec.cxx64
-rw-r--r--sd/source/ui/func/fuconstr.cxx16
-rw-r--r--sd/source/ui/func/fuconuno.cxx14
-rw-r--r--sd/source/ui/func/fucopy.cxx48
-rw-r--r--sd/source/ui/func/fucushow.cxx14
-rw-r--r--sd/source/ui/func/fudraw.cxx18
-rw-r--r--sd/source/ui/func/fudspord.cxx4
-rw-r--r--sd/source/ui/func/fuediglu.cxx6
-rw-r--r--sd/source/ui/func/fuexpand.cxx8
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx14
-rw-r--r--sd/source/ui/func/fuhhconv.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx20
-rw-r--r--sd/source/ui/func/fuinsfil.cxx48
-rw-r--r--sd/source/ui/func/fuline.cxx10
-rw-r--r--sd/source/ui/func/fulinend.cxx2
-rw-r--r--sd/source/ui/func/fulink.cxx2
-rw-r--r--sd/source/ui/func/fumeasur.cxx8
-rw-r--r--sd/source/ui/func/fumorph.cxx80
-rw-r--r--sd/source/ui/func/fuoaprms.cxx30
-rw-r--r--sd/source/ui/func/fuolbull.cxx2
-rw-r--r--sd/source/ui/func/fuoltext.cxx2
-rw-r--r--sd/source/ui/func/fuoutl.cxx12
-rw-r--r--sd/source/ui/func/fupage.cxx20
-rw-r--r--sd/source/ui/func/fuparagr.cxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx88
-rw-r--r--sd/source/ui/func/fuprlout.cxx18
-rw-r--r--sd/source/ui/func/fuprobjs.cxx10
-rw-r--r--sd/source/ui/func/fuscale.cxx10
-rw-r--r--sd/source/ui/func/fusearch.cxx2
-rw-r--r--sd/source/ui/func/fusel.cxx2
-rw-r--r--sd/source/ui/func/fusldlg.cxx28
-rw-r--r--sd/source/ui/func/fusnapln.cxx18
-rw-r--r--sd/source/ui/func/fusumry.cxx8
-rw-r--r--sd/source/ui/func/futempl.cxx10
-rw-r--r--sd/source/ui/func/futext.cxx24
-rw-r--r--sd/source/ui/func/futhes.cxx2
-rw-r--r--sd/source/ui/func/futransf.cxx2
-rw-r--r--sd/source/ui/func/futxtatt.cxx8
-rw-r--r--sd/source/ui/func/fuvect.cxx16
-rw-r--r--sd/source/ui/func/fuzoom.cxx6
-rw-r--r--sd/source/ui/func/sdundo.cxx2
-rw-r--r--sd/source/ui/func/sdundogr.cxx6
-rw-r--r--sd/source/ui/func/smarttag.cxx12
-rw-r--r--sd/source/ui/func/undoback.cxx8
-rw-r--r--sd/source/ui/func/undoheaderfooter.cxx6
-rw-r--r--sd/source/ui/func/undolayer.cxx10
-rw-r--r--sd/source/ui/func/undopage.cxx2
-rw-r--r--sd/source/ui/func/unmovss.cxx4
-rw-r--r--sd/source/ui/func/unoaprms.cxx16
-rw-r--r--sd/source/ui/func/unprlout.cxx2
-rw-r--r--sd/source/ui/inc/3dchld.hxx4
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx88
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx22
-rw-r--r--sd/source/ui/inc/AccessibleOutlineEditSource.hxx52
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx30
-rw-r--r--sd/source/ui/inc/AccessiblePageShape.hxx36
-rw-r--r--sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx14
-rw-r--r--sd/source/ui/inc/AccessiblePresentationOLEShape.hxx14
-rw-r--r--sd/source/ui/inc/AccessiblePresentationShape.hxx16
-rw-r--r--sd/source/ui/inc/AccessibleScrollPanel.hxx8
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx40
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx80
-rw-r--r--sd/source/ui/inc/AccessibleSlideView.hxx46
-rw-r--r--sd/source/ui/inc/AccessibleTreeNode.hxx72
-rw-r--r--sd/source/ui/inc/AccessibleViewForwarder.hxx18
-rw-r--r--sd/source/ui/inc/AnimationChildWindow.hxx8
-rw-r--r--sd/source/ui/inc/BezierObjectBar.hxx4
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx36
-rw-r--r--sd/source/ui/inc/Client.hxx18
-rw-r--r--sd/source/ui/inc/ClientView.hxx6
-rw-r--r--sd/source/ui/inc/CustomAnimation.hxx4
-rw-r--r--sd/source/ui/inc/DialogListBox.hxx40
-rw-r--r--sd/source/ui/inc/DocumentRenderer.hxx6
-rw-r--r--sd/source/ui/inc/DrawController.hxx24
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx68
-rw-r--r--sd/source/ui/inc/DrawSubController.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx198
-rw-r--r--sd/source/ui/inc/EventMultiplexer.hxx22
-rw-r--r--sd/source/ui/inc/FormShellManager.hxx4
-rw-r--r--sd/source/ui/inc/FrameView.hxx64
-rw-r--r--sd/source/ui/inc/GraphicDocShell.hxx2
-rw-r--r--sd/source/ui/inc/GraphicObjectBar.hxx16
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx4
-rw-r--r--sd/source/ui/inc/GraphicViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/ImpressViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/LayerDialog.hrc4
-rw-r--r--sd/source/ui/inc/LayerDialogChildWindow.hxx6
-rw-r--r--sd/source/ui/inc/LayerDialogContent.hxx8
-rw-r--r--sd/source/ui/inc/LayerTabBar.hxx34
-rw-r--r--sd/source/ui/inc/MasterPageObserver.hxx10
-rw-r--r--sd/source/ui/inc/MediaObjectBar.hxx10
-rw-r--r--sd/source/ui/inc/MutexOwner.hxx4
-rw-r--r--sd/source/ui/inc/NavigatorChildWindow.hxx8
-rw-r--r--sd/source/ui/inc/NotesChildWindow.hrc2
-rw-r--r--sd/source/ui/inc/NotesChildWindow.hxx4
-rw-r--r--sd/source/ui/inc/OutlineBulletDlg.hxx16
-rw-r--r--sd/source/ui/inc/OutlineView.hxx80
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx14
-rw-r--r--sd/source/ui/inc/OutlineViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/OutlinerIteratorImpl.hxx28
-rw-r--r--sd/source/ui/inc/PaneChildWindows.hxx10
-rwxr-xr-xsd/source/ui/inc/PaneDockingWindow.hrc2
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx2
-rw-r--r--sd/source/ui/inc/PaneShells.hxx10
-rw-r--r--sd/source/ui/inc/PresentationViewShell.hxx8
-rw-r--r--sd/source/ui/inc/PresentationViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/PreviewRenderer.hxx8
-rw-r--r--sd/source/ui/inc/Ruler.hxx18
-rw-r--r--sd/source/ui/inc/SdUnoDrawView.hxx24
-rw-r--r--sd/source/ui/inc/SdUnoOutlineView.hxx22
-rw-r--r--sd/source/ui/inc/SdUnoSlideView.hxx16
-rw-r--r--sd/source/ui/inc/ShellFactory.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx10
-rw-r--r--sd/source/ui/inc/SlideSorterChildWindow.hrc2
-rw-r--r--sd/source/ui/inc/SlideSorterChildWindow.hxx10
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx22
-rw-r--r--sd/source/ui/inc/SlideSorterViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/SlideView.hxx48
-rw-r--r--sd/source/ui/inc/SlideViewShell.hxx26
-rw-r--r--sd/source/ui/inc/SpellDialogChildWindow.hxx6
-rw-r--r--sd/source/ui/inc/TabControl.hxx60
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx4
-rw-r--r--sd/source/ui/inc/TextLogger.hxx2
-rw-r--r--sd/source/ui/inc/TextObjectBar.hxx6
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx4
-rw-r--r--sd/source/ui/inc/UpdateLockManager.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx94
-rw-r--r--sd/source/ui/inc/ViewClipboard.hxx2
-rw-r--r--sd/source/ui/inc/ViewShell.hxx92
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx6
-rw-r--r--sd/source/ui/inc/ViewShellHint.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx6
-rw-r--r--sd/source/ui/inc/ViewShellManager.hxx12
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx16
-rw-r--r--sd/source/ui/inc/ViewTabControl.hxx60
-rw-r--r--sd/source/ui/inc/Window.hxx54
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx2
-rw-r--r--sd/source/ui/inc/animobjs.hrc2
-rw-r--r--sd/source/ui/inc/animobjs.hxx104
-rw-r--r--sd/source/ui/inc/annotationmanager.hxx6
-rw-r--r--sd/source/ui/inc/assclass.hxx2
-rw-r--r--sd/source/ui/inc/bmcache.hxx16
-rw-r--r--sd/source/ui/inc/brkdlg.hrc10
-rw-r--r--sd/source/ui/inc/bulmaper.hxx2
-rw-r--r--sd/source/ui/inc/celltempl.hrc4
-rw-r--r--sd/source/ui/inc/celltempl.hxx14
-rw-r--r--sd/source/ui/inc/cfgids.hxx56
-rw-r--r--sd/source/ui/inc/copydlg.hrc2
-rw-r--r--sd/source/ui/inc/copydlg.hxx72
-rw-r--r--sd/source/ui/inc/custsdlg.hrc6
-rw-r--r--sd/source/ui/inc/custsdlg.hxx78
-rw-r--r--sd/source/ui/inc/diactrl.hxx12
-rw-r--r--sd/source/ui/inc/dialogs.hrc12
-rw-r--r--sd/source/ui/inc/dlg_char.hrc4
-rw-r--r--sd/source/ui/inc/dlg_char.hxx6
-rw-r--r--sd/source/ui/inc/dlgass.hrc94
-rw-r--r--sd/source/ui/inc/dlgass.hxx2
-rw-r--r--sd/source/ui/inc/dlgctrls.hxx10
-rw-r--r--sd/source/ui/inc/dlgfield.hrc2
-rw-r--r--sd/source/ui/inc/dlgfield.hxx36
-rw-r--r--sd/source/ui/inc/dlgolbul.hrc4
-rw-r--r--sd/source/ui/inc/dlgpage.hrc4
-rw-r--r--sd/source/ui/inc/dlgpage.hxx12
-rw-r--r--sd/source/ui/inc/dlgsnap.hrc2
-rw-r--r--sd/source/ui/inc/dlgsnap.hxx38
-rw-r--r--sd/source/ui/inc/docprev.hxx24
-rw-r--r--sd/source/ui/inc/drawview.hxx16
-rw-r--r--sd/source/ui/inc/enumdlg.hrc2
-rw-r--r--sd/source/ui/inc/filedlg.hxx14
-rw-r--r--sd/source/ui/inc/fontwork.hrc2
-rw-r--r--sd/source/ui/inc/framework/Configuration.hxx16
-rw-r--r--sd/source/ui/inc/framework/ConfigurationController.hxx24
-rw-r--r--sd/source/ui/inc/framework/DrawModule.hxx2
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx16
-rw-r--r--sd/source/ui/inc/framework/ImpressModule.hxx2
-rw-r--r--sd/source/ui/inc/framework/ModuleController.hxx16
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx14
-rw-r--r--sd/source/ui/inc/framework/PresentationFactory.hxx10
-rw-r--r--sd/source/ui/inc/framework/PresentationModule.hxx2
-rw-r--r--sd/source/ui/inc/framework/ResourceId.hxx6
-rw-r--r--sd/source/ui/inc/framework/ViewShellWrapper.hxx12
-rw-r--r--sd/source/ui/inc/fuarea.hxx8
-rw-r--r--sd/source/ui/inc/fubullet.hxx6
-rw-r--r--sd/source/ui/inc/fuchar.hxx10
-rw-r--r--sd/source/ui/inc/fucon3d.hxx10
-rw-r--r--sd/source/ui/inc/fuconarc.hxx12
-rw-r--r--sd/source/ui/inc/fuconbez.hxx16
-rw-r--r--sd/source/ui/inc/fuconcs.hxx8
-rw-r--r--sd/source/ui/inc/fuconnct.hxx10
-rw-r--r--sd/source/ui/inc/fuconrec.hxx12
-rw-r--r--sd/source/ui/inc/fuconstr.hxx18
-rw-r--r--sd/source/ui/inc/fuconuno.hxx14
-rw-r--r--sd/source/ui/inc/fucopy.hxx10
-rw-r--r--sd/source/ui/inc/fucushow.hxx10
-rw-r--r--sd/source/ui/inc/fudraw.hxx20
-rw-r--r--sd/source/ui/inc/fudspord.hxx24
-rw-r--r--sd/source/ui/inc/fuediglu.hxx16
-rw-r--r--sd/source/ui/inc/fuexpand.hxx10
-rw-r--r--sd/source/ui/inc/fuformatpaintbrush.hxx8
-rw-r--r--sd/source/ui/inc/fugrid.hxx10
-rw-r--r--sd/source/ui/inc/fuhhconv.hxx14
-rw-r--r--sd/source/ui/inc/fuinsert.hxx30
-rw-r--r--sd/source/ui/inc/fuinsfil.hxx14
-rw-r--r--sd/source/ui/inc/fuline.hxx10
-rw-r--r--sd/source/ui/inc/fulinend.hxx10
-rw-r--r--sd/source/ui/inc/fulink.hxx10
-rw-r--r--sd/source/ui/inc/fumeasur.hxx10
-rw-r--r--sd/source/ui/inc/fumorph.hxx18
-rw-r--r--sd/source/ui/inc/fuoaprms.hxx6
-rw-r--r--sd/source/ui/inc/fuolbull.hxx10
-rw-r--r--sd/source/ui/inc/fuoltext.hxx14
-rw-r--r--sd/source/ui/inc/fuoutl.hxx10
-rw-r--r--sd/source/ui/inc/fupage.hxx32
-rw-r--r--sd/source/ui/inc/fuparagr.hxx10
-rw-r--r--sd/source/ui/inc/fupoor.hxx58
-rw-r--r--sd/source/ui/inc/fuprlout.hxx10
-rw-r--r--sd/source/ui/inc/fuprobjs.hxx10
-rw-r--r--sd/source/ui/inc/fuscale.hxx10
-rw-r--r--sd/source/ui/inc/fusearch.hxx8
-rw-r--r--sd/source/ui/inc/fusel.hxx20
-rw-r--r--sd/source/ui/inc/fusldlg.hxx10
-rw-r--r--sd/source/ui/inc/fuslhide.hxx10
-rw-r--r--sd/source/ui/inc/fuslid.hxx12
-rw-r--r--sd/source/ui/inc/fuslsel.hxx40
-rw-r--r--sd/source/ui/inc/fusnapln.hxx10
-rw-r--r--sd/source/ui/inc/fusumry.hxx10
-rw-r--r--sd/source/ui/inc/futempl.hxx10
-rw-r--r--sd/source/ui/inc/futext.hxx20
-rw-r--r--sd/source/ui/inc/futhes.hxx10
-rw-r--r--sd/source/ui/inc/futransf.hxx10
-rw-r--r--sd/source/ui/inc/futxtatt.hxx10
-rw-r--r--sd/source/ui/inc/fuvect.hxx10
-rw-r--r--sd/source/ui/inc/fuzoom.hxx28
-rw-r--r--sd/source/ui/inc/gluectrl.hxx10
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hrc58
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx20
-rw-r--r--sd/source/ui/inc/ins_paste.hrc14
-rw-r--r--sd/source/ui/inc/ins_paste.hxx10
-rw-r--r--sd/source/ui/inc/inspagob.hrc2
-rw-r--r--sd/source/ui/inc/inspagob.hxx28
-rw-r--r--sd/source/ui/inc/layeroptionsdlg.hrc2
-rw-r--r--sd/source/ui/inc/layeroptionsdlg.hxx32
-rw-r--r--sd/source/ui/inc/masterlayoutdlg.hrc18
-rw-r--r--sd/source/ui/inc/masterlayoutdlg.hxx28
-rw-r--r--sd/source/ui/inc/morphdlg.hrc20
-rw-r--r--sd/source/ui/inc/morphdlg.hxx36
-rw-r--r--sd/source/ui/inc/navigatr.hrc2
-rw-r--r--sd/source/ui/inc/navigatr.hxx104
-rw-r--r--sd/source/ui/inc/optdlg.hrc10
-rw-r--r--sd/source/ui/inc/optdlg.hxx8
-rw-r--r--sd/source/ui/inc/optsitem.hxx612
-rw-r--r--sd/source/ui/inc/packgdlg.hrc30
-rw-r--r--sd/source/ui/inc/paragr.hrc4
-rw-r--r--sd/source/ui/inc/paragr.hxx4
-rw-r--r--sd/source/ui/inc/pgjump.hxx2
-rw-r--r--sd/source/ui/inc/present.hrc10
-rw-r--r--sd/source/ui/inc/present.hxx70
-rw-r--r--sd/source/ui/inc/preview.hrc2
-rw-r--r--sd/source/ui/inc/prltempl.hrc8
-rw-r--r--sd/source/ui/inc/prltempl.hxx38
-rw-r--r--sd/source/ui/inc/prntopts.hrc10
-rw-r--r--sd/source/ui/inc/prntopts.hxx34
-rw-r--r--sd/source/ui/inc/pubdlg.hrc182
-rw-r--r--sd/source/ui/inc/pubdlg.hxx198
-rwxr-xr-xsd/source/ui/inc/res_bmp.hrc492
-rw-r--r--sd/source/ui/inc/sdpopup.hxx12
-rw-r--r--sd/source/ui/inc/sdpreslt.hrc2
-rw-r--r--sd/source/ui/inc/sdpreslt.hxx30
-rw-r--r--sd/source/ui/inc/sdstring.hrc6
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx116
-rw-r--r--sd/source/ui/inc/sdundogr.hxx12
-rw-r--r--sd/source/ui/inc/sdxfer.hxx86
-rw-r--r--sd/source/ui/inc/slideshow.hxx36
-rw-r--r--sd/source/ui/inc/smarttag.hxx16
-rw-r--r--sd/source/ui/inc/sprite.hxx48
-rwxr-xr-xsd/source/ui/inc/strings.hrc698
-rw-r--r--sd/source/ui/inc/tabtempl.hrc6
-rw-r--r--sd/source/ui/inc/tabtempl.hxx36
-rw-r--r--sd/source/ui/inc/taskpane/ControlContainer.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ILayoutableWindow.hxx10
-rw-r--r--sd/source/ui/inc/taskpane/PanelId.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx6
-rw-r--r--sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx12
-rw-r--r--sd/source/ui/inc/taskpane/SubToolPanel.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx10
-rw-r--r--sd/source/ui/inc/taskpane/TitleBar.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TitledControl.hxx10
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx8
-rw-r--r--sd/source/ui/inc/tbx_ww.hrc2
-rw-r--r--sd/source/ui/inc/tbx_ww.hxx20
-rw-r--r--sd/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sd/source/ui/inc/tools/AsynchronousCall.hxx8
-rw-r--r--sd/source/ui/inc/tools/AsynchronousTask.hxx4
-rw-r--r--sd/source/ui/inc/tools/ConfigurationAccess.hxx6
-rw-r--r--sd/source/ui/inc/tools/IconCache.hxx4
-rw-r--r--sd/source/ui/inc/tools/IdleDetection.hxx4
-rw-r--r--sd/source/ui/inc/tools/PropertySet.hxx10
-rw-r--r--sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx4
-rw-r--r--sd/source/ui/inc/tools/SlotStateListener.hxx10
-rw-r--r--sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx6
-rw-r--r--sd/source/ui/inc/tpaction.hrc2
-rw-r--r--sd/source/ui/inc/tpaction.hxx60
-rw-r--r--sd/source/ui/inc/tpoption.hrc2
-rw-r--r--sd/source/ui/inc/tpoption.hxx38
-rw-r--r--sd/source/ui/inc/unchss.hxx2
-rw-r--r--sd/source/ui/inc/undoback.hxx12
-rw-r--r--sd/source/ui/inc/undoheaderfooter.hxx8
-rw-r--r--sd/source/ui/inc/undolayer.hxx6
-rw-r--r--sd/source/ui/inc/undopage.hxx92
-rw-r--r--sd/source/ui/inc/unmodpg.hxx18
-rw-r--r--sd/source/ui/inc/unmovss.hxx8
-rw-r--r--sd/source/ui/inc/unoaprms.hxx24
-rw-r--r--sd/source/ui/inc/unokywds.hxx164
-rw-r--r--sd/source/ui/inc/unomodel.hxx20
-rw-r--r--sd/source/ui/inc/unoprnms.hxx124
-rw-r--r--sd/source/ui/inc/unosrch.hxx8
-rw-r--r--sd/source/ui/inc/unprlout.hxx2
-rw-r--r--sd/source/ui/inc/unslsel.hxx6
-rw-r--r--sd/source/ui/inc/vectdlg.hrc40
-rw-r--r--sd/source/ui/inc/vectdlg.hxx78
-rw-r--r--sd/source/ui/inc/view/viewoverlaymanager.hxx6
-rw-r--r--sd/source/ui/inc/zoomlist.hxx16
-rw-r--r--sd/source/ui/notes/EditWindow.cxx18
-rw-r--r--sd/source/ui/notes/EditWindow.hxx52
-rw-r--r--sd/source/ui/notes/NotesChildWindow.cxx10
-rwxr-xr-xsd/source/ui/notes/NotesChildWindow.src2
-rw-r--r--sd/source/ui/notes/NotesDockingWindow.cxx2
-rw-r--r--sd/source/ui/notes/NotesDockingWindow.hxx2
-rw-r--r--sd/source/ui/notes/TextLogger.cxx6
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.cxx2
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx10
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx34
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx64
-rw-r--r--sd/source/ui/presenter/PresenterCanvasFactory.cxx8
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx12
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx8
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx12
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.hxx8
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx4
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx8
-rw-r--r--sd/source/ui/presenter/SlideRenderer.hxx10
-rw-r--r--sd/source/ui/slideshow/PaneHider.cxx2
-rw-r--r--sd/source/ui/slideshow/PaneHider.hxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx6
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx68
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx78
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx54
-rw-r--r--sd/source/ui/slideshow/slideshow.hrc52
-rw-r--r--sd/source/ui/slideshow/slideshow.src12
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx218
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx72
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.cxx42
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx60
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx22
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx10
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCache.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx20
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx60
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx82
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCommand.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsFocusManager.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx20
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx12
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsProperties.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx46
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx26
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsTransferable.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsTransferable.hxx12
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx16
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx18
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx16
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx26
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx6
-rw-r--r--sd/source/ui/slidesorter/model/SlideSorterModel.cxx10
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx4
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx14
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx4
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx18
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx14
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx16
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.hxx34
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx44
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx48
-rw-r--r--sd/source/ui/slidesorter/view/SlsFontProvider.cxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx100
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObject.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx10
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx114
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewOverlay.cxx20
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx20
-rw-r--r--sd/source/ui/table/TableDesignPane.hrc20
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx12
-rw-r--r--sd/source/ui/table/TableDesignPane.src30
-rw-r--r--sd/source/ui/table/tablefunction.cxx4
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx10
-rw-r--r--sd/source/ui/table/tableobjectbar.hxx8
-rw-r--r--sd/source/ui/toolpanel/ConstrainedIterator.cxx10
-rw-r--r--sd/source/ui/toolpanel/ConstrainedIterator.hxx8
-rw-r--r--sd/source/ui/toolpanel/ControlContainer.cxx10
-rw-r--r--sd/source/ui/toolpanel/ControlContainerDescriptor.hxx6
-rw-r--r--sd/source/ui/toolpanel/ControlList.hxx2
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx42
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.hxx4
-rw-r--r--sd/source/ui/toolpanel/MethodGuard.hxx2
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx42
-rw-r--r--sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx10
-rw-r--r--sd/source/ui/toolpanel/SubToolPanel.cxx12
-rw-r--r--sd/source/ui/toolpanel/TaskPaneControlFactory.cxx2
-rw-r--r--sd/source/ui/toolpanel/TaskPaneFocusManager.cxx10
-rw-r--r--sd/source/ui/toolpanel/TaskPaneFocusManager.hxx6
-rw-r--r--sd/source/ui/toolpanel/TaskPaneShellManager.cxx2
-rw-r--r--sd/source/ui/toolpanel/TaskPaneShellManager.hxx6
-rw-r--r--sd/source/ui/toolpanel/TaskPaneTreeNode.cxx4
-rw-r--r--sd/source/ui/toolpanel/TestMenu.cxx18
-rw-r--r--sd/source/ui/toolpanel/TestMenu.hxx2
-rw-r--r--sd/source/ui/toolpanel/TestPanel.cxx8
-rw-r--r--sd/source/ui/toolpanel/TestPanel.hxx2
-rw-r--r--sd/source/ui/toolpanel/TitleBar.cxx18
-rw-r--r--sd/source/ui/toolpanel/TitledControl.cxx24
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx4
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.hxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelDescriptor.hxx6
-rw-r--r--sd/source/ui/toolpanel/ToolPanelFactory.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.cxx8
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.hxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx6
-rw-r--r--sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.cxx28
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx24
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.hxx16
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx8
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx18
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx10
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx12
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx26
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx30
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageObserver.cxx26
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx12
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx22
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx8
-rw-r--r--sd/source/ui/toolpanel/controls/PreviewValueSet.cxx12
-rw-r--r--sd/source/ui/toolpanel/controls/PreviewValueSet.hxx6
-rw-r--r--sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx6
-rw-r--r--sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx6
-rw-r--r--sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx2
-rw-r--r--sd/source/ui/toolpanel/controls/TableDesignPanel.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/TableDesignPanel.hxx4
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx2
-rw-r--r--sd/source/ui/tools/ConfigurationAccess.cxx14
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx38
-rw-r--r--sd/source/ui/tools/IconCache.cxx6
-rw-r--r--sd/source/ui/tools/IdleDetection.cxx4
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx42
-rw-r--r--sd/source/ui/tools/PropertySet.cxx4
-rw-r--r--sd/source/ui/tools/SdGlobalResourceContainer.cxx16
-rw-r--r--sd/source/ui/tools/SlotStateListener.cxx4
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx4
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx66
-rw-r--r--sd/source/ui/unoidl/SdUnoDrawView.cxx26
-rw-r--r--sd/source/ui/unoidl/SdUnoOutlineView.cxx18
-rw-r--r--sd/source/ui/unoidl/SdUnoSlideView.cxx10
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx94
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.hxx2
-rw-r--r--sd/source/ui/unoidl/detreg.cxx12
-rw-r--r--sd/source/ui/unoidl/facreg.cxx8
-rw-r--r--sd/source/ui/unoidl/randomnode.cxx16
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx2
-rw-r--r--sd/source/ui/unoidl/sddetect.hxx2
-rw-r--r--sd/source/ui/unoidl/unocpres.cxx14
-rw-r--r--sd/source/ui/unoidl/unocpres.hxx10
-rw-r--r--sd/source/ui/unoidl/unodoc.cxx4
-rw-r--r--sd/source/ui/unoidl/unohelp.hxx2
-rw-r--r--sd/source/ui/unoidl/unokywds.cxx2
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx84
-rw-r--r--sd/source/ui/unoidl/unolayer.hxx20
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx104
-rw-r--r--sd/source/ui/unoidl/unomodule.cxx2
-rw-r--r--sd/source/ui/unoidl/unomodule.hxx24
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx206
-rw-r--r--sd/source/ui/unoidl/unoobj.hxx6
-rw-r--r--sd/source/ui/unoidl/unopage.cxx302
-rw-r--r--sd/source/ui/unoidl/unopage.hxx8
-rw-r--r--sd/source/ui/unoidl/unopback.cxx30
-rw-r--r--sd/source/ui/unoidl/unopback.hxx8
-rw-r--r--sd/source/ui/unoidl/unopool.cxx10
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx22
-rw-r--r--sd/source/ui/unoidl/unowcntr.cxx4
-rw-r--r--sd/source/ui/unoidl/unowcntr.hxx10
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx164
-rw-r--r--sd/source/ui/view/DocumentRenderer.hrc2
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.src24
-rw-r--r--sd/source/ui/view/FormShellManager.cxx6
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx14
-rw-r--r--sd/source/ui/view/GraphicViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/ImpressViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx26
-rw-r--r--sd/source/ui/view/OutlineViewShellBase.cxx6
-rw-r--r--sd/source/ui/view/Outliner.cxx4
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx68
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/SlideSorterViewShellBase.cxx6
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
-rw-r--r--sd/source/ui/view/UpdateLockManager.cxx12
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx24
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx32
-rw-r--r--sd/source/ui/view/ViewShellHint.cxx2
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx16
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx52
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx26
-rw-r--r--sd/source/ui/view/WindowUpdater.cxx4
-rw-r--r--sd/source/ui/view/bmcache.cxx6
-rw-r--r--sd/source/ui/view/clview.cxx2
-rw-r--r--sd/source/ui/view/drawview.cxx12
-rw-r--r--sd/source/ui/view/drbezob.cxx12
-rw-r--r--sd/source/ui/view/drtxtob.cxx16
-rw-r--r--sd/source/ui/view/drtxtob1.cxx8
-rw-r--r--sd/source/ui/view/drviews1.cxx16
-rw-r--r--sd/source/ui/view/drviews2.cxx14
-rw-r--r--sd/source/ui/view/drviews3.cxx18
-rw-r--r--sd/source/ui/view/drviews4.cxx46
-rw-r--r--sd/source/ui/view/drviews5.cxx18
-rw-r--r--sd/source/ui/view/drviews6.cxx34
-rw-r--r--sd/source/ui/view/drviews7.cxx26
-rw-r--r--sd/source/ui/view/drviews8.cxx10
-rw-r--r--sd/source/ui/view/drviews9.cxx50
-rw-r--r--sd/source/ui/view/drviewsa.cxx24
-rw-r--r--sd/source/ui/view/drviewsb.cxx28
-rw-r--r--sd/source/ui/view/drviewsc.cxx32
-rw-r--r--sd/source/ui/view/drviewsd.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx14
-rw-r--r--sd/source/ui/view/drviewsf.cxx16
-rw-r--r--sd/source/ui/view/drviewsg.cxx16
-rw-r--r--sd/source/ui/view/drviewsh.cxx8
-rw-r--r--sd/source/ui/view/drviewsi.cxx8
-rw-r--r--sd/source/ui/view/drviewsj.cxx36
-rw-r--r--sd/source/ui/view/drvwshrg.cxx4
-rw-r--r--sd/source/ui/view/frmview.cxx76
-rw-r--r--sd/source/ui/view/grviewsh.cxx4
-rw-r--r--sd/source/ui/view/outlnvs2.cxx12
-rw-r--r--sd/source/ui/view/outlnvsh.cxx96
-rw-r--r--sd/source/ui/view/outlview.cxx70
-rw-r--r--sd/source/ui/view/presvish.cxx2
-rw-r--r--sd/source/ui/view/sdruler.cxx8
-rw-r--r--sd/source/ui/view/sdview.cxx80
-rw-r--r--sd/source/ui/view/sdview2.cxx126
-rw-r--r--sd/source/ui/view/sdview3.cxx124
-rw-r--r--sd/source/ui/view/sdview4.cxx38
-rw-r--r--sd/source/ui/view/sdview5.cxx8
-rw-r--r--sd/source/ui/view/sdwindow.cxx38
-rw-r--r--sd/source/ui/view/tabcontr.cxx16
-rw-r--r--sd/source/ui/view/unmodpg.cxx24
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx30
-rw-r--r--sd/source/ui/view/viewshe2.cxx8
-rw-r--r--sd/source/ui/view/viewshe3.cxx14
-rw-r--r--sd/source/ui/view/viewshel.cxx18
-rw-r--r--sd/source/ui/view/zoomlist.cxx4
-rw-r--r--sd/uiconfig/sdraw/toolbar/arrowshapes.xml22
-rw-r--r--sd/uiconfig/sdraw/toolbar/basicshapes.xml14
-rw-r--r--sd/uiconfig/sdraw/toolbar/flowchartshapes.xml24
-rw-r--r--sd/uiconfig/sdraw/toolbar/symbolshapes.xml6
-rw-r--r--sd/uiconfig/sdraw/toolbar/toolbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/arrowshapes.xml22
-rw-r--r--sd/uiconfig/simpress/toolbar/basicshapes.xml14
-rw-r--r--sd/uiconfig/simpress/toolbar/flowchartshapes.xml26
-rw-r--r--sd/uiconfig/simpress/toolbar/symbolshapes.xml6
-rw-r--r--sd/util/hidother.hrc8
-rw-r--r--sd/util/hidother.src114
-rw-r--r--sd/workben/custompanel/ctp_panel.cxx4
-rw-r--r--sd/workben/custompanel/ctp_panel.hxx2
-rw-r--r--sd/xml/AccessibleDrawDocumentView.xml2
-rw-r--r--sd/xml/DrawingView.xml2
-rw-r--r--sd/xml/effects.xml4
-rw-r--r--sd/xml/transitions.xml12
-rw-r--r--slideshow/inc/pch/precompiled_slideshow.cxx2
-rw-r--r--slideshow/inc/pch/precompiled_slideshow.hxx2
-rw-r--r--slideshow/qa/debug/nodetree.sh20
-rw-r--r--slideshow/qa/debug/timings.pl2
-rwxr-xr-xslideshow/qa/tools/mkeffects.pl192
-rw-r--r--slideshow/qa/tools/mktransitions.pl164
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx2
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx4
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx152
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx134
-rw-r--r--slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx170
-rw-r--r--slideshow/source/engine/activities/accumulation.hxx26
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx296
-rw-r--r--slideshow/source/engine/activities/activitybase.cxx54
-rw-r--r--slideshow/source/engine/activities/activitybase.hxx48
-rw-r--r--slideshow/source/engine/activities/activityparameters.hxx40
-rw-r--r--slideshow/source/engine/activities/continuousactivitybase.cxx8
-rw-r--r--slideshow/source/engine/activities/continuousactivitybase.hxx10
-rw-r--r--slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx12
-rw-r--r--slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx18
-rw-r--r--slideshow/source/engine/activities/discreteactivitybase.cxx44
-rw-r--r--slideshow/source/engine/activities/discreteactivitybase.hxx22
-rw-r--r--slideshow/source/engine/activities/interpolation.hxx94
-rw-r--r--slideshow/source/engine/activities/simplecontinuousactivitybase.cxx22
-rw-r--r--slideshow/source/engine/activities/simplecontinuousactivitybase.hxx18
-rw-r--r--slideshow/source/engine/activitiesqueue.cxx20
-rw-r--r--slideshow/source/engine/animatedsprite.cxx24
-rw-r--r--slideshow/source/engine/animationfactory.cxx420
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.cxx34
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.hxx18
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx98
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.hxx28
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.cxx28
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.hxx12
-rw-r--r--slideshow/source/engine/animationnodes/animationcommandnode.cxx14
-rw-r--r--slideshow/source/engine/animationnodes/animationcommandnode.hxx12
-rw-r--r--slideshow/source/engine/animationnodes/animationnodefactory.cxx192
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.hxx16
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.cxx80
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.hxx8
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx40
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.hxx14
-rw-r--r--slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx14
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.cxx22
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.hxx24
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx224
-rw-r--r--slideshow/source/engine/animationnodes/basenode.hxx72
-rw-r--r--slideshow/source/engine/animationnodes/generateevent.cxx30
-rw-r--r--slideshow/source/engine/animationnodes/generateevent.hxx10
-rw-r--r--slideshow/source/engine/animationnodes/nodetools.cxx24
-rw-r--r--slideshow/source/engine/animationnodes/nodetools.hxx18
-rw-r--r--slideshow/source/engine/animationnodes/paralleltimecontainer.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/paralleltimecontainer.hxx12
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.cxx28
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.hxx8
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx18
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx20
-rw-r--r--slideshow/source/engine/animationnodes/setactivity.hxx28
-rw-r--r--slideshow/source/engine/attributemap.cxx12
-rw-r--r--slideshow/source/engine/color.cxx70
-rw-r--r--slideshow/source/engine/debug.cxx16
-rw-r--r--slideshow/source/engine/delayevent.cxx2
-rw-r--r--slideshow/source/engine/effectrewinder.cxx16
-rw-r--r--slideshow/source/engine/effectrewinder.hxx12
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx170
-rw-r--r--slideshow/source/engine/eventqueue.cxx46
-rw-r--r--slideshow/source/engine/expressionnodefactory.cxx80
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx58
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.hxx22
-rw-r--r--slideshow/source/engine/screenupdater.cxx26
-rw-r--r--slideshow/source/engine/shapeattributelayer.cxx206
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx66
-rw-r--r--slideshow/source/engine/shapes/appletshape.hxx4
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx60
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.hxx10
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx300
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.hxx2
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx208
-rw-r--r--slideshow/source/engine/shapes/drawshape.hxx54
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx116
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.hxx88
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx44
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.hxx20
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx68
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.hxx24
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx38
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.hxx10
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx68
-rw-r--r--slideshow/source/engine/shapes/mediashape.hxx4
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx158
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx78
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.hxx18
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx46
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.hxx24
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx168
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.hxx42
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx154
-rw-r--r--slideshow/source/engine/shapes/viewshape.hxx140
-rw-r--r--slideshow/source/engine/shapesubset.cxx24
-rw-r--r--slideshow/source/engine/slide/layer.cxx62
-rw-r--r--slideshow/source/engine/slide/layer.hxx4
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx88
-rw-r--r--slideshow/source/engine/slide/layermanager.hxx30
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.cxx60
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.hxx28
-rw-r--r--slideshow/source/engine/slide/slideanimations.cxx8
-rw-r--r--slideshow/source/engine/slide/slideanimations.hxx10
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx204
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx136
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.hxx8
-rw-r--r--slideshow/source/engine/slidebitmap.cxx26
-rw-r--r--slideshow/source/engine/slideshowcontext.cxx10
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx532
-rw-r--r--slideshow/source/engine/slideview.cxx146
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx264
-rw-r--r--slideshow/source/engine/soundplayer.cxx24
-rw-r--r--slideshow/source/engine/sp_debug.cxx2
-rw-r--r--slideshow/source/engine/tools.cxx212
-rw-r--r--slideshow/source/engine/transitions/barndoorwipe.cxx8
-rw-r--r--slideshow/source/engine/transitions/barndoorwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/barwipepolypolygon.cxx2
-rw-r--r--slideshow/source/engine/transitions/barwipepolypolygon.hxx2
-rw-r--r--slideshow/source/engine/transitions/boxwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/boxwipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/checkerboardwipe.cxx6
-rw-r--r--slideshow/source/engine/transitions/checkerboardwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/clippingfunctor.cxx50
-rw-r--r--slideshow/source/engine/transitions/clippingfunctor.hxx16
-rw-r--r--slideshow/source/engine/transitions/clockwipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/clockwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/combtransition.cxx48
-rw-r--r--slideshow/source/engine/transitions/combtransition.hxx12
-rw-r--r--slideshow/source/engine/transitions/doublediamondwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/doublediamondwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/ellipsewipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/ellipsewipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/fanwipe.cxx12
-rw-r--r--slideshow/source/engine/transitions/fanwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/figurewipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/figurewipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/fourboxwipe.cxx12
-rw-r--r--slideshow/source/engine/transitions/fourboxwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/iriswipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/iriswipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/parametricpolypolygon.hxx2
-rw-r--r--slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx12
-rw-r--r--slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx2
-rw-r--r--slideshow/source/engine/transitions/pinwheelwipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/pinwheelwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/randomwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/randomwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx108
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.cxx90
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.hxx48
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx168
-rw-r--r--slideshow/source/engine/transitions/snakewipe.cxx30
-rw-r--r--slideshow/source/engine/transitions/snakewipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/spiralwipe.cxx12
-rw-r--r--slideshow/source/engine/transitions/spiralwipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/sweepwipe.cxx18
-rw-r--r--slideshow/source/engine/transitions/sweepwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/transitionfactorytab.cxx76
-rw-r--r--slideshow/source/engine/transitions/transitiontools.cxx4
-rw-r--r--slideshow/source/engine/transitions/transitiontools.hxx2
-rw-r--r--slideshow/source/engine/transitions/veewipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/veewipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/waterfallwipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/waterfallwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/zigzagwipe.cxx2
-rw-r--r--slideshow/source/engine/transitions/zigzagwipe.hxx2
-rw-r--r--slideshow/source/engine/unoviewcontainer.cxx30
-rw-r--r--slideshow/source/engine/usereventqueue.cxx220
-rw-r--r--slideshow/source/engine/waitsymbol.cxx28
-rw-r--r--slideshow/source/engine/waitsymbol.hxx4
-rw-r--r--slideshow/source/engine/wakeupevent.cxx18
-rw-r--r--slideshow/source/inc/activitiesfactory.hxx138
-rw-r--r--slideshow/source/inc/activitiesqueue.hxx18
-rw-r--r--slideshow/source/inc/activity.hxx8
-rw-r--r--slideshow/source/inc/animatableshape.hxx2
-rw-r--r--slideshow/source/inc/animatedsprite.hxx24
-rw-r--r--slideshow/source/inc/animation.hxx4
-rw-r--r--slideshow/source/inc/animationactivity.hxx6
-rw-r--r--slideshow/source/inc/animationeventhandler.hxx2
-rw-r--r--slideshow/source/inc/animationfactory.hxx62
-rw-r--r--slideshow/source/inc/animationfunction.hxx4
-rw-r--r--slideshow/source/inc/animationnode.hxx52
-rw-r--r--slideshow/source/inc/animationnodefactory.hxx10
-rw-r--r--slideshow/source/inc/attributableshape.hxx16
-rw-r--r--slideshow/source/inc/attributemap.hxx4
-rw-r--r--slideshow/source/inc/boolanimation.hxx4
-rw-r--r--slideshow/source/inc/coloranimation.hxx2
-rw-r--r--slideshow/source/inc/cursormanager.hxx4
-rw-r--r--slideshow/source/inc/debug.hxx2
-rw-r--r--slideshow/source/inc/delayevent.hxx24
-rw-r--r--slideshow/source/inc/disposable.hxx2
-rw-r--r--slideshow/source/inc/doctreenode.hxx32
-rw-r--r--slideshow/source/inc/doctreenodesupplier.hxx18
-rw-r--r--slideshow/source/inc/enumanimation.hxx4
-rw-r--r--slideshow/source/inc/event.hxx16
-rw-r--r--slideshow/source/inc/eventhandler.hxx2
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx220
-rw-r--r--slideshow/source/inc/eventqueue.hxx18
-rw-r--r--slideshow/source/inc/expressionnode.hxx4
-rw-r--r--slideshow/source/inc/expressionnodefactory.hxx32
-rw-r--r--slideshow/source/inc/externalmediashape.hxx4
-rw-r--r--slideshow/source/inc/framerate.hxx2
-rw-r--r--slideshow/source/inc/hslcolor.hxx20
-rw-r--r--slideshow/source/inc/hslcoloranimation.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkarea.hxx8
-rw-r--r--slideshow/source/inc/hyperlinkhandler.hxx2
-rw-r--r--slideshow/source/inc/interruptabledelayevent.hxx18
-rw-r--r--slideshow/source/inc/intrinsicanimationeventhandler.hxx2
-rw-r--r--slideshow/source/inc/listenercontainer.hxx32
-rw-r--r--slideshow/source/inc/listenercontainerimpl.hxx58
-rw-r--r--slideshow/source/inc/mouseeventhandler.hxx2
-rw-r--r--slideshow/source/inc/numberanimation.hxx4
-rw-r--r--slideshow/source/inc/pairanimation.hxx2
-rw-r--r--slideshow/source/inc/pauseeventhandler.hxx2
-rw-r--r--slideshow/source/inc/rgbcolor.hxx26
-rw-r--r--slideshow/source/inc/screenupdater.hxx10
-rw-r--r--slideshow/source/inc/shape.hxx22
-rw-r--r--slideshow/source/inc/shapeattributelayer.hxx150
-rw-r--r--slideshow/source/inc/shapeattributelayerholder.hxx8
-rw-r--r--slideshow/source/inc/shapecursoreventhandler.hxx2
-rw-r--r--slideshow/source/inc/shapeimporter.hxx56
-rw-r--r--slideshow/source/inc/shapelistenereventhandler.hxx2
-rw-r--r--slideshow/source/inc/shapemanager.hxx4
-rw-r--r--slideshow/source/inc/shapemaps.hxx6
-rw-r--r--slideshow/source/inc/shapesubset.hxx20
-rw-r--r--slideshow/source/inc/slide.hxx38
-rw-r--r--slideshow/source/inc/slidebitmap.hxx18
-rw-r--r--slideshow/source/inc/slideshowcontext.hxx26
-rw-r--r--slideshow/source/inc/slideshowexceptions.hxx4
-rw-r--r--slideshow/source/inc/slideview.hxx2
-rw-r--r--slideshow/source/inc/smilfunctionparser.hxx92
-rw-r--r--slideshow/source/inc/soundplayer.hxx10
-rw-r--r--slideshow/source/inc/state.hxx6
-rw-r--r--slideshow/source/inc/stringanimation.hxx2
-rw-r--r--slideshow/source/inc/subsettableshapemanager.hxx12
-rw-r--r--slideshow/source/inc/tools.hxx142
-rw-r--r--slideshow/source/inc/transitionfactory.hxx28
-rw-r--r--slideshow/source/inc/transitioninfo.hxx52
-rw-r--r--slideshow/source/inc/unoview.hxx10
-rw-r--r--slideshow/source/inc/unoviewcontainer.hxx18
-rw-r--r--slideshow/source/inc/usereventqueue.hxx82
-rw-r--r--slideshow/source/inc/userpainteventhandler.hxx4
-rw-r--r--slideshow/source/inc/view.hxx10
-rw-r--r--slideshow/source/inc/vieweventhandler.hxx2
-rw-r--r--slideshow/source/inc/viewlayer.hxx16
-rw-r--r--slideshow/source/inc/viewrepainthandler.hxx2
-rw-r--r--slideshow/source/inc/viewupdate.hxx2
-rw-r--r--slideshow/source/inc/wakeupevent.hxx18
-rw-r--r--slideshow/test/demoshow.cxx70
-rw-r--r--slideshow/test/export.map2
-rw-r--r--slideshow/test/slidetest.cxx78
-rw-r--r--slideshow/test/tests.hxx2
-rw-r--r--slideshow/test/testshape.cxx4
-rw-r--r--slideshow/test/testview.cxx4
-rw-r--r--slideshow/test/views.cxx2
1301 files changed, 18575 insertions, 18575 deletions
diff --git a/animations/inc/animations/animationnodehelper.hxx b/animations/inc/animations/animationnodehelper.hxx
index 969e3326105d..c6826d6e38e8 100644
--- a/animations/inc/animations/animationnodehelper.hxx
+++ b/animations/inc/animations/animationnodehelper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace anim
/** Apply given functor to every animation node child.
- @param xNode
+ @param xNode
Parent node
@param rFunctor
@@ -58,23 +58,23 @@ namespace anim
@return true, if the functor was successfully applied to
all children, false otherwise.
*/
- template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
- Functor& rFunctor )
+ template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
+ Functor& rFunctor )
{
try
{
// get an XEnumerationAccess to the children
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
- xEnumerationAccess( xNode,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+ xEnumerationAccess( xNode,
::com::sun::star::uno::UNO_QUERY_THROW );
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
- xEnumeration( xEnumerationAccess->createEnumeration(),
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+ xEnumeration( xEnumerationAccess->createEnumeration(),
::com::sun::star::uno::UNO_QUERY_THROW );
-
+
while( xEnumeration->hasMoreElements() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
- xChildNode( xEnumeration->nextElement(),
+ ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+ xChildNode( xEnumeration->nextElement(),
::com::sun::star::uno::UNO_QUERY_THROW );
rFunctor( xChildNode );
@@ -99,22 +99,22 @@ namespace anim
try
{
// get an XEnumerationAccess to the children
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
- xEnumerationAccess( xNode,
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+ xEnumerationAccess( xNode,
::com::sun::star::uno::UNO_QUERY );
if( xEnumerationAccess.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
- xEnumeration( xEnumerationAccess->createEnumeration(),
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+ xEnumeration( xEnumerationAccess->createEnumeration(),
::com::sun::star::uno::UNO_QUERY );
-
+
if( xEnumeration.is() )
{
while( xEnumeration->hasMoreElements() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
- xChildNode( xEnumeration->nextElement(),
+ ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+ xChildNode( xEnumeration->nextElement(),
::com::sun::star::uno::UNO_QUERY_THROW );
create_deep_vector( xChildNode, rVector );
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 655bc6289fa8..fe90f9109fae 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +110,7 @@ typedef ::std::list< Reference< XAnimationNode > > ChildList_t;
// ====================================================================
-class AnimationNodeBase : public XAnimateMotion,
+class AnimationNodeBase : public XAnimateMotion,
public XAnimateColor,
public XTransitionFilter,
public XAnimateSet,
@@ -294,7 +294,7 @@ public:
void fireChangeListener();
private:
- OInterfaceContainerHelper maChangeListener;
+ OInterfaceContainerHelper maChangeListener;
static void initTypeProvider( sal_Int16 nNodeType ) throw();
@@ -312,11 +312,11 @@ private:
Sequence< NamedValue > maUserData;
// parent interface for XChild interface implementation
- Reference<XInterface> mxParent;
- AnimationNode* mpParent;
+ Reference<XInterface> mxParent;
+ AnimationNode* mpParent;
// attributes for XAnimate
- Any maTarget;
+ Any maTarget;
OUString maAttributeName, maFormula;
Sequence< Any > maValues;
Sequence< double > maKeyTimes;
@@ -351,10 +351,10 @@ private:
// XIterateContainer
sal_Int16 mnIterateType;
- double mfIterateInterval;
+ double mfIterateInterval;
/** sorted list of child nodes for XTimeContainer*/
- ChildList_t maChilds;
+ ChildList_t maChilds;
};
// ====================================================================
@@ -371,13 +371,13 @@ public:
private:
/** sorted list of child nodes */
- ChildList_t maChilds;
+ ChildList_t maChilds;
/** current iteration position */
- ChildList_t::iterator maIter;
+ ChildList_t::iterator maIter;
/** our first, last and only protection from mutli-threads! */
- Mutex maMutex;
+ Mutex maMutex;
};
TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds )
@@ -398,7 +398,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce
return maIter != maChilds.end();
}
-Any SAL_CALL TimeContainerEnumeration::nextElement()
+Any SAL_CALL TimeContainerEnumeration::nextElement()
throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
@@ -415,7 +415,7 @@ Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NUL
Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
AnimationNode::AnimationNode( sal_Int16 nNodeType )
-: maChangeListener(maMutex),
+: maChangeListener(maMutex),
mnNodeType( nNodeType ),
mnFill( AnimationFill::DEFAULT ),
mnFillDefault( AnimationFill::INHERIT ),
@@ -446,7 +446,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
}
AnimationNode::AnimationNode( const AnimationNode& rNode )
-: AnimationNodeBase(),
+: AnimationNodeBase(),
maChangeListener(maMutex),
mnNodeType( rNode.mnNodeType ),
@@ -493,7 +493,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode )
// attributes for XAnimateTransform
mnTransformType( rNode.mnTransformType ),
-
+
// attributes for XTransitionFilter
mnTransition( rNode.mnTransition ),
mnSubtype( rNode.mnSubtype ),
@@ -647,7 +647,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
mpId[nNodeType] = new Sequence< sal_Int8 >( 16 );
rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]->getArray(), 0, sal_True );
- static sal_Int32 type_numbers[] =
+ static sal_Int32 type_numbers[] =
{
7, // CUSTOM
9, // PAR
@@ -1162,7 +1162,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
mpParent = 0;
Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY );
if( xTunnel.is() )
- mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
+ mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
fireChangeListener();
}
@@ -1827,7 +1827,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
throw (RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
-
+
return new TimeContainerEnumeration( maChilds);
}
diff --git a/animations/source/animcore/animcore.xml b/animations/source/animcore/animcore.xml
index f6d105ea0794..22c3ddda649b 100644
--- a/animations/source/animcore/animcore.xml
+++ b/animations/source/animcore/animcore.xml
@@ -6,23 +6,23 @@
<component-description>
<author> Christian Lippka </author>
<name> todo </name>
- <description>
+ <description>
This component provides ...
</description>
- <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
- <language> c++ </language>
- <status value="draft"/>
- <supported-service> </supported-service>
+ <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+ <language> c++ </language>
+ <status value="draft"/>
+ <supported-service> </supported-service>
<service-dependency> ... </service-dependency>
<type> ... </type>
</component-description>
- <project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> sal </project-build-dependency>
+ <project-build-dependency> cppuhelper </project-build-dependency>
+ <project-build-dependency> cppu </project-build-dependency>
+ <project-build-dependency> sal </project-build-dependency>
- <runtime-module-dependency> cppuhelper </runtime-module-dependency>
- <runtime-module-dependency> cppu2 </runtime-module-dependency>
- <runtime-module-dependency> sal2 </runtime-module-dependency>
+ <runtime-module-dependency> cppuhelper </runtime-module-dependency>
+ <runtime-module-dependency> cppu2 </runtime-module-dependency>
+ <runtime-module-dependency> sal2 </runtime-module-dependency>
</module-description>
diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx
index 63c2cacf516b..6bebe98f82a1 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
-
+
//==================================================================================================
void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
index c877d1b53c95..c9e0b1ad217f 100644
--- a/animations/source/animcore/factreg.hxx
+++ b/animations/source/animcore/factreg.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
namespace animcore {
extern rtl_StandardModuleCount g_moduleCount;
-
+
#define DECL_NODE_FACTORY(N)\
extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\
extern ::rtl::OUString getImplementationName_##N();\
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 9386ce316e38..3aaa8b89ea37 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace animcore
{
return TargetPropertiesCreator::createInstance( rSMgr );
}
-
+
::rtl::OUString getImplementationName_TargetPropertiesCreator()
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
@@ -123,7 +123,7 @@ namespace animcore
{
// Vector containing all properties for a given shape
typedef ::std::vector< beans::NamedValue > VectorOfNamedValues;
-
+
/** The hash map key
This key contains both XShape reference and a paragraph
@@ -133,14 +133,14 @@ namespace animcore
struct ShapeHashKey
{
/// Shape target
- uno::Reference< drawing::XShape > mxRef;
+ uno::Reference< drawing::XShape > mxRef;
/** Paragraph index.
If this is a pure shape target, mnParagraphIndex is
set to -1.
*/
- sal_Int16 mnParagraphIndex;
+ sal_Int16 mnParagraphIndex;
/// Comparison needed for hash_map
bool operator==( const ShapeHashKey& rRHS ) const
@@ -165,7 +165,7 @@ namespace animcore
// x = (x & 0x00F000F0) << 4) | (x >> 4) & 0x00F000F0 | x & 0xF00FF00F;
// x = (x & 0x0C0C0C0C) << 2) | (x >> 2) & 0x0C0C0C0C | x & 0xC3C3C3C3;
// x = (x & 0x22222222) << 1) | (x >> 1) & 0x22222222 | x & 0x99999999;
- //
+ //
// Costs about 17 cycles on a RISC machine with infinite
// instruction level parallelism (~42 basic
// instructions). Thus I truly doubt this pays off...
@@ -183,9 +183,9 @@ namespace animcore
{
}
- NodeFunctor( XShapeHash& rShapeHash,
- const uno::Reference< drawing::XShape >& rTargetShape,
- sal_Int16 nParagraphIndex ) :
+ NodeFunctor( XShapeHash& rShapeHash,
+ const uno::Reference< drawing::XShape >& rTargetShape,
+ sal_Int16 nParagraphIndex ) :
mrShapeHash( rShapeHash ),
mxTargetShape( rTargetShape ),
mnParagraphIndex( nParagraphIndex )
@@ -202,7 +202,7 @@ namespace animcore
}
uno::Reference< drawing::XShape > xTargetShape( mxTargetShape );
- sal_Int16 nParagraphIndex( mnParagraphIndex );
+ sal_Int16 nParagraphIndex( mnParagraphIndex );
switch( xNode->getType() )
{
@@ -222,12 +222,12 @@ namespace animcore
"animcore: NodeFunctor::operator(): no target on ITERATE node" );
return;
}
-
+
xTargetShape.set( xIterNode->getTarget(),
uno::UNO_QUERY );
if( !xTargetShape.is() )
- {
+ {
::com::sun::star::presentation::ParagraphTarget aTarget;
// no shape provided. Maybe a ParagraphTarget?
@@ -238,7 +238,7 @@ namespace animcore
"target information" );
return;
}
-
+
xTargetShape = aTarget.Shape;
nParagraphIndex = aTarget.Paragraph;
@@ -258,10 +258,10 @@ namespace animcore
NodeFunctor aFunctor( mrShapeHash,
xTargetShape,
nParagraphIndex );
- if( !::anim::for_each_childNode( xNode,
+ if( !::anim::for_each_childNode( xNode,
aFunctor ) )
{
- OSL_ENSURE( false,
+ OSL_ENSURE( false,
"AnimCore: NodeFunctor::operator(): child node iteration failed, "
"or extraneous container nodes encountered" );
}
@@ -289,9 +289,9 @@ namespace animcore
case animations::AnimationNodeType::SET:
{
// evaluate set node content
- uno::Reference< animations::XAnimate > xAnimateNode( xNode,
+ uno::Reference< animations::XAnimate > xAnimateNode( xNode,
uno::UNO_QUERY );
-
+
if( !xAnimateNode.is() )
break; // invalid node
@@ -318,26 +318,26 @@ namespace animcore
// not a pure shape target - maybe a
// ParagraphTarget?
presentation::ParagraphTarget aUnoTarget;
-
+
if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
{
OSL_ENSURE( false,
"AnimCore: NodeFunctor::operator(): unknown target type encountered" );
break;
}
-
+
aTarget.mxRef = aUnoTarget.Shape;
aTarget.mnParagraphIndex = aUnoTarget.Paragraph;
}
}
-
+
if( !aTarget.mxRef.is() )
{
OSL_ENSURE( false,
"AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
break; // invalid target XShape
}
-
+
// check whether we already have an entry for
// this target (we only take the first set
// effect for every shape)
@@ -362,7 +362,7 @@ namespace animcore
::rtl::OUString aString;
if( (aAny >>= aString) )
{
- // we also take the strings "true" and "false",
+ // we also take the strings "true" and "false",
// as well as "on" and "off" here
if( aString.equalsIgnoreAsciiCaseAscii("true") ||
aString.equalsIgnoreAsciiCaseAscii("on") )
@@ -383,10 +383,10 @@ namespace animcore
// first relevant effect. Thus, target
// must be initially _hidden_, for the
// effect to have visible impact.
- mrShapeHash.insert(
- XShapeHash::value_type(
+ mrShapeHash.insert(
+ XShapeHash::value_type(
aTarget,
- VectorOfNamedValues(
+ VectorOfNamedValues(
1,
beans::NamedValue(
xAnimateNode->getAttributeName(),
@@ -399,9 +399,9 @@ namespace animcore
}
private:
- XShapeHash& mrShapeHash;
- uno::Reference< drawing::XShape > mxTargetShape;
- sal_Int16 mnParagraphIndex;
+ XShapeHash& mrShapeHash;
+ uno::Reference< drawing::XShape > mxTargetShape;
+ sal_Int16 mnParagraphIndex;
};
}
@@ -423,17 +423,17 @@ namespace animcore
// XTargetPropertiesCreator
uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties
- (
- const uno::Reference< animations::XAnimationNode >& xRootNode
+ (
+ const uno::Reference< animations::XAnimationNode >& xRootNode
) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
// scan all nodes for visibility changes, and record first
// 'visibility=true' for each shape
- XShapeHash aShapeHash( 101,
+ XShapeHash aShapeHash( 101,
&refhasher );
-
+
NodeFunctor aFunctor( aShapeHash );
// TODO(F1): Maybe limit functor application to main sequence
@@ -450,25 +450,25 @@ namespace animcore
uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() );
- ::std::size_t nCurrIndex(0);
- XShapeHash::const_iterator aCurr( aShapeHash.begin() );
- const XShapeHash::const_iterator aEnd ( aShapeHash.end() );
+ ::std::size_t nCurrIndex(0);
+ XShapeHash::const_iterator aCurr( aShapeHash.begin() );
+ const XShapeHash::const_iterator aEnd ( aShapeHash.end() );
while( aCurr != aEnd )
{
animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] );
- if( aCurr->first.mnParagraphIndex == -1 )
- {
+ if( aCurr->first.mnParagraphIndex == -1 )
+ {
rCurrProps.Target = uno::makeAny( aCurr->first.mxRef );
}
else
{
- rCurrProps.Target = uno::makeAny(
+ rCurrProps.Target = uno::makeAny(
presentation::ParagraphTarget(
aCurr->first.mxRef,
aCurr->first.mnParagraphIndex ) );
}
-
+
rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
++aCurr;
@@ -492,7 +492,7 @@ namespace animcore
{
uno::Sequence< ::rtl::OUString > aRet(1);
aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
-
+
return aRet;
}
diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index 71d895e22270..7369efaed324 100644
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 6acd804369cf..b886877269f0 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,88 +82,88 @@ public:
CustomAnimationEffectPtr clone() const;
// attributes
- const rtl::OUString& getPresetId() const { return maPresetId; }
- const rtl::OUString& getPresetSubType() const { return maPresetSubType; }
- const rtl::OUString& getProperty() const { return maProperty; }
-
- sal_Int16 getPresetClass() const { return mnPresetClass; }
- void setPresetClass( sal_Int16 nPresetClass );
+ const rtl::OUString& getPresetId() const { return maPresetId; }
+ const rtl::OUString& getPresetSubType() const { return maPresetSubType; }
+ const rtl::OUString& getProperty() const { return maProperty; }
- sal_Int16 getNodeType() const { return mnNodeType; }
- SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType );
+ sal_Int16 getPresetClass() const { return mnPresetClass; }
+ void setPresetClass( sal_Int16 nPresetClass );
- ::com::sun::star::uno::Any getRepeatCount() const;
- void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
+ sal_Int16 getNodeType() const { return mnNodeType; }
+ SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType );
- ::com::sun::star::uno::Any getEnd() const;
- void setEnd( const ::com::sun::star::uno::Any& rEnd );
+ ::com::sun::star::uno::Any getRepeatCount() const;
+ void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount );
- sal_Int16 getFill() const;
- void setFill( sal_Int16 nFill );
+ ::com::sun::star::uno::Any getEnd() const;
+ void setEnd( const ::com::sun::star::uno::Any& rEnd );
- double getBegin() const { return mfBegin; }
- SD_DLLPUBLIC void setBegin( double fBegin );
+ sal_Int16 getFill() const;
+ void setFill( sal_Int16 nFill );
+
+ double getBegin() const { return mfBegin; }
+ SD_DLLPUBLIC void setBegin( double fBegin );
- double getDuration() const { return mfDuration; }
- SD_DLLPUBLIC void setDuration( double fDuration );
+ double getDuration() const { return mfDuration; }
+ SD_DLLPUBLIC void setDuration( double fDuration );
+
+ double getAbsoluteDuration() const { return mfAbsoluteDuration; }
- double getAbsoluteDuration() const { return mfAbsoluteDuration; }
+ const String& getName() const { return maName; }
+ void setName( const String& rName ) { maName = rName; }
- const String& getName() const { return maName; }
- void setName( const String& rName ) { maName = rName; }
+ sal_Int16 getIterateType() const { return mnIterateType; }
+ SD_DLLPUBLIC void setIterateType( sal_Int16 nIterateType );
- sal_Int16 getIterateType() const { return mnIterateType; }
- SD_DLLPUBLIC void setIterateType( sal_Int16 nIterateType );
+ double getIterateInterval() const { return mfIterateInterval; }
+ SD_DLLPUBLIC void setIterateInterval( double fIterateInterval );
- double getIterateInterval() const { return mfIterateInterval; }
- SD_DLLPUBLIC void setIterateInterval( double fIterateInterval );
+ ::com::sun::star::uno::Any getTarget() const { return maTarget; }
+ SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget );
- ::com::sun::star::uno::Any getTarget() const { return maTarget; }
- SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget );
+ sal_Bool hasAfterEffect() const { return mbHasAfterEffect; }
+ void setHasAfterEffect( sal_Bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
- sal_Bool hasAfterEffect() const { return mbHasAfterEffect; }
- void setHasAfterEffect( sal_Bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
+ ::com::sun::star::uno::Any getDimColor() const { return maDimColor; }
+ void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; }
- ::com::sun::star::uno::Any getDimColor() const { return maDimColor; }
- void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; }
+ bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
+ void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
- bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
- void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; }
+ sal_Int32 getParaDepth() const { return mnParaDepth; }
- sal_Int32 getParaDepth() const { return mnParaDepth; }
+ sal_Bool hasText() const { return mbHasText; }
- sal_Bool hasText() const { return mbHasText; }
+ sal_Int16 getCommand() const { return mnCommand; }
- sal_Int16 getCommand() const { return mnCommand; }
+ double getAcceleration() const { return mfAcceleration; }
+ void setAcceleration( double fAcceleration );
- double getAcceleration() const { return mfAcceleration; }
- void setAcceleration( double fAcceleration );
+ double getDecelerate() const { return mfDecelerate; }
+ void setDecelerate( double fDecelerate );
- double getDecelerate() const { return mfDecelerate; }
- void setDecelerate( double fDecelerate );
+ sal_Bool getAutoReverse() const { return mbAutoReverse; }
+ void setAutoReverse( sal_Bool bAutoReverse );
- sal_Bool getAutoReverse() const { return mbAutoReverse; }
- void setAutoReverse( sal_Bool bAutoReverse );
+ ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue );
+ bool setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
- ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue );
- bool setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+ ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
+ bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
- ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue );
- bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue );
+ ::com::sun::star::uno::Any getColor( sal_Int32 nIndex );
+ void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
- ::com::sun::star::uno::Any getColor( sal_Int32 nIndex );
- void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor );
+ ::com::sun::star::uno::Any getRotation();
+ void setRotation( const ::com::sun::star::uno::Any& rRotation );
- ::com::sun::star::uno::Any getRotation();
- void setRotation( const ::com::sun::star::uno::Any& rRotation );
+ sal_Int32 getGroupId() const { return mnGroupId; }
+ void setGroupId( sal_Int32 nGroupId );
- sal_Int32 getGroupId() const { return mnGroupId; }
- void setGroupId( sal_Int32 nGroupId );
+ sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
+ SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem );
- sal_Int16 getTargetSubItem() const { return mnTargetSubItem; }
- SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem );
-
- ::rtl::OUString getPath() const;
+ ::rtl::OUString getPath() const;
void setPath( const ::rtl::OUString& rPath );
bool checkForText();
@@ -176,7 +176,7 @@ public:
void removeAudio();
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; }
- EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
+ EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; }
// helper
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception);
@@ -194,36 +194,36 @@ protected:
void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; }
private:
- sal_Int16 mnNodeType;
- rtl::OUString maPresetId;
- rtl::OUString maPresetSubType;
- rtl::OUString maProperty;
- sal_Int16 mnPresetClass;
- double mfBegin;
- double mfDuration; // this is the maximum duration of the subeffects
- double mfAbsoluteDuration; // this is the maximum duration of the subeffects including possible iterations
- sal_Int32 mnGroupId;
- sal_Int16 mnIterateType;
- double mfIterateInterval;
- sal_Int32 mnParaDepth;
- sal_Bool mbHasText;
- double mfAcceleration;
- double mfDecelerate;
- sal_Bool mbAutoReverse;
- sal_Int16 mnTargetSubItem;
- sal_Int16 mnCommand;
+ sal_Int16 mnNodeType;
+ rtl::OUString maPresetId;
+ rtl::OUString maPresetSubType;
+ rtl::OUString maProperty;
+ sal_Int16 mnPresetClass;
+ double mfBegin;
+ double mfDuration; // this is the maximum duration of the subeffects
+ double mfAbsoluteDuration; // this is the maximum duration of the subeffects including possible iterations
+ sal_Int32 mnGroupId;
+ sal_Int16 mnIterateType;
+ double mfIterateInterval;
+ sal_Int32 mnParaDepth;
+ sal_Bool mbHasText;
+ double mfAcceleration;
+ double mfDecelerate;
+ sal_Bool mbAutoReverse;
+ sal_Int16 mnTargetSubItem;
+ sal_Int16 mnCommand;
EffectSequenceHelper* mpEffectSequence;
- String maName;
+ String maName;
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio;
::com::sun::star::uno::Any maTarget;
- sal_Bool mbHasAfterEffect;
+ sal_Bool mbHasAfterEffect;
::com::sun::star::uno::Any maDimColor;
- bool mbAfterEffectOnNextEffect;
+ bool mbAfterEffectOnNextEffect;
};
struct stl_CustomAnimationEffect_search_node_predict
@@ -267,7 +267,7 @@ public:
private:
EffectSequence maEffects;
::com::sun::star::uno::Reference< com::sun::star::drawing::XShape > maTarget;
-
+
sal_Int32 mnTextGrouping;
sal_Bool mbAnimateForm;
sal_Bool mbTextReverse;
@@ -333,7 +333,7 @@ public:
// text group methods
CustomAnimationTextGroupPtr findGroup( sal_Int32 nGroupId );
- SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse );
+ SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse );
void setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping );
void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm );
void setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto );
@@ -384,7 +384,7 @@ public:
private:
virtual void implRebuild();
- MainSequence* mpMainSequence;
+ MainSequence* mpMainSequence;
};
typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 83e0427183ae..9c1d57b9aad1 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +107,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const;
SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const rtl::OUString& rPresetId ) const;
-// const AnimationEffect* getEffect( const rtl::OUString& rPresetId ) const;
-// const AnimationEffect* getEffect( const rtl::OUString& rPresetId, const rtl::OUString& rPresetSubType ) const;
+// const AnimationEffect* getEffect( const rtl::OUString& rPresetId ) const;
+// const AnimationEffect* getEffect( const rtl::OUString& rPresetId, const rtl::OUString& rPresetSubType ) const;
const rtl::OUString& getUINameForPresetId( const rtl::OUString& rPresetId ) const;
const rtl::OUString& getUINameForProperty( const rtl::OUString& rProperty ) const;
@@ -141,7 +141,7 @@ private:
PresetCategoryList maMotionPathsPresets;
PresetCategoryList maMiscPresets;
- static CustomAnimationPresets* mpCustomAnimationPresets;
+ static CustomAnimationPresets* mpCustomAnimationPresets;
};
typedef boost::shared_ptr< CustomAnimationPresets > CustomAnimationPresetsPtr;
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 03fd55303422..f5eb7fe4f8a2 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx
index d9bd8e38077c..ff56c4ca8b1a 100644
--- a/sd/inc/FactoryIds.hxx
+++ b/sd/inc/FactoryIds.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 97fda4af09e3..2a798412fc3f 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SD_OUTLINER_HXX
+#ifndef SD_OUTLINER_HXX
#define SD_OUTLINER_HXX
#include <svx/svdobj.hxx>
@@ -93,7 +93,7 @@ class Window;
<p>Some related pieces of information:
The search dialog (<type>SvxSearchDialog</type>) can be controlled in
more than one way:
- <ul><li>A set of option flags returned by the slot call
+ <ul><li>A set of option flags returned by the slot call
SID_SEARCH_OPTIONS handled by the
<member>SdDrawDocument::GetState()</member> method.</li>
<li>The contents of the search item of type
@@ -104,7 +104,7 @@ class Window;
queried. This is only sufficient for searching the outline view.
</p>
*/
-class Outliner
+class Outliner
: public SdrOutliner
{
public:
@@ -131,7 +131,7 @@ public:
checking.
*/
void PrepareSpelling (void);
-
+
/** Initialize a spell check but do not start it yet. This method
is a better candiate for the name PrepareSpelling.
*/
@@ -162,9 +162,9 @@ public:
/** callback for textconversion */
sal_Bool ConvertNextDocument (void);
- /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
+ /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
- void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage,
+ void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage,
const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive );
/** This is called internaly when text conversion is started.
@@ -180,9 +180,9 @@ public:
enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID };
- int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
- void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
- void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
+ int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
+ void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
+ void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
private:
class Implementation;
@@ -224,7 +224,7 @@ private:
/// The number of pages in the current view.
USHORT mnPageCount;
-
+
/// Number of objects on the current page / in the current selection.
INT32 mnObjectCount;
@@ -327,7 +327,7 @@ private:
/** This flag remebers a selection change between a call to the
selection change listener callback and the next
- <member>DetectChange()</member> method call.
+ <member>DetectChange()</member> method call.
*/
bool mbSelectionHasChanged;
@@ -335,7 +335,7 @@ private:
to a programatical change of the selection.
*/
bool mbExpectingSelectionChangeEvent;
-
+
/** This flag is set to true when the whole document has been
processed once 'officially', i.e. a message box has been shown
that tells the user so.
@@ -367,7 +367,7 @@ private:
/** Do search and replace for whole document.
*/
bool SearchAndReplaceAll (void);
-
+
/** Do search and replace for next match.
@return
The return value specifies whether the search ended (</TRUE>) or
@@ -451,7 +451,7 @@ private:
void PrepareSearchAndReplace (void);
/** Prepare to do a text conversion on the current text
- object. This includes putting it into edit mode.
+ object. This includes putting it into edit mode.
*/
void PrepareConversion (void);
@@ -464,7 +464,7 @@ private:
/** Switch to the page or master page specified by the
<member>mnPage</member> index. Master page mode is specified by
- <member>meEditMode</member>.
+ <member>meEditMode</member>.
@param eEditMode
The new edit mode.
@param nPageIndex
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index e66325fdbf15..c86ef0f24641 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SdDrawDocument;
-namespace sd {
+namespace sd {
class ViewShell;
class Outliner;
@@ -75,16 +75,16 @@ enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT};
/** This iterator can be used to iterate over all <type>SdrObject</type>
objects of one of three set denoted by the <type>IteratorType</type>:
<ul><li>All objects of the current mark list (selection)
- (type==SELECTION).</li>
+ (type==SELECTION).</li>
<li>All objects in the current view (type==SINGLE_VIEW).</li>
<li>All objects in all views (type=DOCUMENT).</li></ul>
-
+
<p>Note that the iterator does not change pages or views. It is the
task of the user of the iterator to take the information provided by the
<type>IteratorPosition</type> as returned by the
<member>operator*()</member> method and set view, visible page, and
selection/edit mode markers to reflect this position.</p>
-
+
<p>A simple forward iteration from the first to the last object would
instantiate the iterator with
<code>Iterator(pDocument,pViewShell,true,BEGIN)</code> for some document
@@ -111,7 +111,7 @@ public:
explicit Iterator (IteratorImplBase* pObject);
~Iterator (void);
-
+
/** Assign the iterator from the given one. The implementation object
of this iterator will be a copy of the given iterator.
@param rIterator
@@ -257,9 +257,9 @@ private:
*/
Iterator CreateSelectionIterator (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
- SdDrawDocument* pDocument,
+ SdDrawDocument* pDocument,
const ::boost::shared_ptr<ViewShell>& rpViewShell,
- bool bDirectionIsForward=true,
+ bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
/** Create an iterator that iterates over all <type>SdrObjects</type>
@@ -274,9 +274,9 @@ private:
This specifies at which object the iterator points initially.
*/
Iterator CreateDocumentIterator (
- SdDrawDocument* pDocument,
+ SdDrawDocument* pDocument,
const ::boost::shared_ptr<ViewShell>& rpViewShell,
- bool bDirectionIsForward=true,
+ bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
/** Return the index of a page that contains an object that a new
@@ -297,10 +297,10 @@ private:
This specifies at which object the iterator points initially.
*/
sal_Int32 GetPageIndex (
- SdDrawDocument* pDocument,
+ SdDrawDocument* pDocument,
const ::boost::shared_ptr<ViewShell>& rpViewShell,
- PageKind ePageKind,
- EditMode eEditMode,
+ PageKind ePageKind,
+ EditMode eEditMode,
bool bDirectionIsForward,
IteratorLocation aLocation);
@@ -348,7 +348,7 @@ public:
values in both position objects.
*/
bool operator== (const IteratorPosition& aPosition) const;
-
+
/// Pointer to the actual <type>SdrObject</type> object.
SdrObjectWeakRef mxObject;
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index 5bdabcf09cb5..a00a028f8471 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ enum SdShapeTypes
type of the given shape.
*/
AccessibleShape*
- CreateSdAccessibleShape (const ::com::sun::star::uno::Reference<
+ CreateSdAccessibleShape (const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& rxShape
);
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 51d909ebe57f..8be992ec8e26 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <list>
#include <hash_map>
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star {
namespace animations { class XAnimationNode; }
namespace uno { template<class X> class Reference; }
} } }
diff --git a/sd/inc/anmdef.hxx b/sd/inc/anmdef.hxx
index 1e7b8fb8d396..161349a2179b 100644
--- a/sd/inc/anmdef.hxx
+++ b/sd/inc/anmdef.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,6 +38,6 @@
// muss angepasst werden!
#define CLICK_ACTION_COUNT 14
-#endif // _SD_ANIMATIONDEF_HXX
+#endif // _SD_ANIMATIONDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 6efe1c95e778..bd8798d535ba 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +49,31 @@ class SdDrawDocument;
class SdAnimationInfo : public SdrObjUserData
{
public:
- PresObjKind mePresObjKind;
+ PresObjKind mePresObjKind;
/* deprecated animation infos */
- ::com::sun::star::presentation::AnimationEffect meEffect; // Animationseffekt
- ::com::sun::star::presentation::AnimationEffect meTextEffect; // Animationseffekt fuer Textinhalt
- ::com::sun::star::presentation::AnimationSpeed meSpeed; // Geschwindigkeit der Animation
- BOOL mbActive; // eingeschaltet ?
- BOOL mbDimPrevious; // Objekt abblenden
- BOOL mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den
- BOOL mbDimHide; // verstecken statt abblenden
- Color maBlueScreen; // identifiziert "Hintergrundpixel"
- Color maDimColor; // zum Abblenden des Objekts
- String maSoundFile; // Pfad zum Soundfile in MSDOS-Notation
- BOOL mbSoundOn; // Sound ein/aus
- BOOL mbPlayFull; // Sound ganz abspielen
- SdrPathObj* mpPathObj; // das Pfadobjekt
- ::com::sun::star::presentation::ClickAction meClickAction; // Aktion bei Mausklick
- ::com::sun::star::presentation::AnimationEffect meSecondEffect; // fuer Objekt ausblenden
- ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; // fuer Objekt ausblenden
- String maSecondSoundFile; // fuer Objekt ausblenden
- BOOL mbSecondSoundOn; // fuer Objekt ausblenden
- BOOL mbSecondPlayFull;// fuer Objekt ausblenden
-// String maBookmark; // Sprung zu Objekt/Seite
- USHORT mnVerb; // fuer OLE-Objekt
- ULONG mnPresOrder;
+ ::com::sun::star::presentation::AnimationEffect meEffect; // Animationseffekt
+ ::com::sun::star::presentation::AnimationEffect meTextEffect; // Animationseffekt fuer Textinhalt
+ ::com::sun::star::presentation::AnimationSpeed meSpeed; // Geschwindigkeit der Animation
+ BOOL mbActive; // eingeschaltet ?
+ BOOL mbDimPrevious; // Objekt abblenden
+ BOOL mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den
+ BOOL mbDimHide; // verstecken statt abblenden
+ Color maBlueScreen; // identifiziert "Hintergrundpixel"
+ Color maDimColor; // zum Abblenden des Objekts
+ String maSoundFile; // Pfad zum Soundfile in MSDOS-Notation
+ BOOL mbSoundOn; // Sound ein/aus
+ BOOL mbPlayFull; // Sound ganz abspielen
+ SdrPathObj* mpPathObj; // das Pfadobjekt
+ ::com::sun::star::presentation::ClickAction meClickAction; // Aktion bei Mausklick
+ ::com::sun::star::presentation::AnimationEffect meSecondEffect; // fuer Objekt ausblenden
+ ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; // fuer Objekt ausblenden
+ String maSecondSoundFile; // fuer Objekt ausblenden
+ BOOL mbSecondSoundOn; // fuer Objekt ausblenden
+ BOOL mbSecondPlayFull;// fuer Objekt ausblenden
+// String maBookmark; // Sprung zu Objekt/Seite
+ USHORT mnVerb; // fuer OLE-Objekt
+ ULONG mnPresOrder;
SdrObject& mrObject;
SD_DLLPUBLIC void SetBookmark( const String& rBookmark );
@@ -81,9 +81,9 @@ public:
public:
SdAnimationInfo(SdrObject& rObject);
SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
- virtual ~SdAnimationInfo();
+ virtual ~SdAnimationInfo();
- virtual SdrObjUserData* Clone(SdrObject* pObject) const;
+ virtual SdrObjUserData* Clone(SdrObject* pObject) const;
};
#endif // _SD_ANMINFO_HXX
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index eb622351dc1b..7609c06c9d90 100755
--- a/sd/inc/app.hrc
+++ b/sd/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
@@ -62,7 +62,7 @@
#define SID_MOREBACK (SID_SD_START+32)
// #i68101#
-#define SID_OBJECT_TITLE_DESCRIPTION (SID_SD_START+33)
+#define SID_OBJECT_TITLE_DESCRIPTION (SID_SD_START+33)
#define SID_VERTICAL (SID_SD_START+34)
#define SID_HORIZONTAL (SID_SD_START+35)
@@ -118,8 +118,8 @@
#define SID_CONNECT (SID_SD_START+93)
#define SID_BREAK (SID_SD_START+94)
#define SID_OBJECT_CHOOSE_MODE (SID_SD_START+95)
-#define SID_ENTER_GROUP (SID_SD_START+96)
-#define SID_LEAVE_GROUP (SID_SD_START+97)
+#define SID_ENTER_GROUP (SID_SD_START+96)
+#define SID_LEAVE_GROUP (SID_SD_START+97)
#define SID_SIZE_PAGE_WIDTH (SID_SD_START+98)
#define SID_SIZE_OPTIMAL (SID_SD_START+99)
#define SID_OBJECT_TRANSPARENCE (SID_SD_START+100)
@@ -137,7 +137,7 @@
#define SID_ANIMATOR_STATE (SID_SD_START+112)
#define SID_PRESENTATIONOBJECT (SID_SD_START+113)
#define SID_SIZE_VISAREA (SID_SD_START+114)
-#define SID_CLEAR_UNDO_STACK (SID_SD_START+115)
+#define SID_CLEAR_UNDO_STACK (SID_SD_START+115)
#define SID_BEHIND_OBJ (SID_SD_START+116)
#define SID_REVERSE_ORDER (SID_SD_START+117)
#define SID_SDOPTIONS (SID_SD_START+118)
@@ -171,16 +171,16 @@
#define SID_CONNECTOR_LINES_CIRCLES (SID_SD_START+145)
// Options-Leisten Slot-IDs
-#define SID_HANDLES_DRAFT (SID_SD_START+150)
-#define SID_SOLID_CREATE (SID_SD_START+151)
-#define SID_HELPLINES_USE (SID_SD_START+152)
-#define SID_HELPLINES_MOVE (SID_SD_START+153)
-#define SID_GRID_USE (SID_SD_START+154)
-#define SID_SNAP_BORDER (SID_SD_START+155)
-#define SID_SNAP_FRAME (SID_SD_START+156)
-#define SID_SNAP_POINTS (SID_SD_START+157)
-#define SID_QUICKEDIT (SID_SD_START+158)
-#define SID_PICK_THROUGH (SID_SD_START+159)
+#define SID_HANDLES_DRAFT (SID_SD_START+150)
+#define SID_SOLID_CREATE (SID_SD_START+151)
+#define SID_HELPLINES_USE (SID_SD_START+152)
+#define SID_HELPLINES_MOVE (SID_SD_START+153)
+#define SID_GRID_USE (SID_SD_START+154)
+#define SID_SNAP_BORDER (SID_SD_START+155)
+#define SID_SNAP_FRAME (SID_SD_START+156)
+#define SID_SNAP_POINTS (SID_SD_START+157)
+#define SID_QUICKEDIT (SID_SD_START+158)
+#define SID_PICK_THROUGH (SID_SD_START+159)
#define SID_COLORRESOLUTION (SID_SD_START+160)
#define SID_CONVERT_TO_1BIT_THRESHOLD (SID_SD_START+161)
#define SID_CONVERT_TO_1BIT_MATRIX (SID_SD_START+162)
@@ -189,171 +189,171 @@
#define SID_CONVERT_TO_8BIT_GRAYS (SID_SD_START+165)
#define SID_CONVERT_TO_8BIT_COLORS (SID_SD_START+166)
#define SID_CONVERT_TO_24BIT (SID_SD_START+167)
-#define SID_BIG_HANDLES (SID_SD_START+168)
+#define SID_BIG_HANDLES (SID_SD_START+168)
#define SID_DOUBLECLICK_TEXTEDIT (SID_SD_START+169)
#define SID_CLICK_CHANGE_ROTATION (SID_SD_START+170)
-#define SID_DRAWTBX_ARROWS (SID_SD_START+171)
-#define SID_LINE_ARROW_START (SID_SD_START+172)
-#define SID_LINE_ARROW_END (SID_SD_START+173)
-#define SID_LINE_ARROWS (SID_SD_START+174)
-#define SID_LINE_ARROW_CIRCLE (SID_SD_START+175)
-#define SID_LINE_CIRCLE_ARROW (SID_SD_START+176)
-#define SID_LINE_ARROW_SQUARE (SID_SD_START+177)
-#define SID_LINE_SQUARE_ARROW (SID_SD_START+178)
+#define SID_DRAWTBX_ARROWS (SID_SD_START+171)
+#define SID_LINE_ARROW_START (SID_SD_START+172)
+#define SID_LINE_ARROW_END (SID_SD_START+173)
+#define SID_LINE_ARROWS (SID_SD_START+174)
+#define SID_LINE_ARROW_CIRCLE (SID_SD_START+175)
+#define SID_LINE_CIRCLE_ARROW (SID_SD_START+176)
+#define SID_LINE_ARROW_SQUARE (SID_SD_START+177)
+#define SID_LINE_SQUARE_ARROW (SID_SD_START+178)
// und noch weitere...
-#define ID_VAL_ENDINTENS (SID_SD_START+197)
-#define ID_VAL_STARTINTENS (SID_SD_START+198)
-#define ID_VAL_BORDER (SID_SD_START+199)
-#define ID_VAL_MOUSESTART_X (SID_SD_START+200)
-#define ID_VAL_MOUSESTART_Y (SID_SD_START+201)
-#define ID_VAL_LENGTH_X (SID_SD_START+202)
-#define ID_VAL_LENGTH_Y (SID_SD_START+203)
-#define ID_VAL_MOUSEEND_X (SID_SD_START+204)
-#define ID_VAL_MOUSEEND_Y (SID_SD_START+205)
-#define ID_VAL_AXIS_X (SID_SD_START+206)
-#define ID_VAL_AXIS_Y (SID_SD_START+207)
-#define ID_VAL_ANGLESTART (SID_SD_START+208)
-#define ID_VAL_ANGLEEND (SID_SD_START+209)
-#define ID_VAL_CENTER_X (SID_SD_START+210)
-#define ID_VAL_CENTER_Y (SID_SD_START+211)
-#define ID_VAL_WHATPAGE (SID_SD_START+212)
-#define ID_VAL_WHATLAYER (SID_SD_START+213)
-#define ID_VAL_ANGLE (SID_SD_START+214)
-#define ID_VAL_MIRRORVERT (SID_SD_START+215)
-#define ID_VAL_ISACTIVE (SID_SD_START+216)
-#define ID_VAL_WHATKIND (SID_SD_START+217)
-#define ID_VAL_PAGEWIDTH (SID_SD_START+218)
-#define ID_VAL_PAGEMARGIN (SID_SD_START+219)
-#define ID_VAL_PAGETOP (SID_SD_START+220)
-#define ID_VAL_PAGEBOTTOM (SID_SD_START+221)
-#define ID_VAL_PAGELEFT (SID_SD_START+222)
-#define ID_VAL_PAGERIGHT (SID_SD_START+223)
-#define ID_VAL_SCALEOBJECTS (SID_SD_START+224)
-#define ID_VAL_PAGENAME (SID_SD_START+225)
-#define ID_VAL_WHATLAYOUT (SID_SD_START+226)
-#define ID_VAL_ISPAGEBACK (SID_SD_START+227)
-#define ID_VAL_ISPAGEOBJ (SID_SD_START+228)
-#define ID_VAL_LAYERNAME (SID_SD_START+229)
-#define ID_VAL_ISVISIBLE (SID_SD_START+230)
-#define ID_VAL_ISLOCKED (SID_SD_START+231)
-#define ID_VAL_ISPRINTABLE (SID_SD_START+232)
-#define ID_VAL_PAGEHEIGHT (SID_SD_START+233)
-#define ID_VAL_ZOOM (SID_SD_START+234)
-#define ID_VAL_ANCHOR_X (SID_SD_START+235)
-#define ID_VAL_ANCHOR_Y (SID_SD_START+236)
-#define ID_VAL_RED (SID_SD_START+237)
-#define ID_VAL_GREEN (SID_SD_START+238)
-#define ID_VAL_BLUE (SID_SD_START+239)
-#define ID_VAL_STYLE (SID_SD_START+240)
-#define ID_VAL_DOTS (SID_SD_START+241)
-#define ID_VAL_DOTLEN (SID_SD_START+242)
-#define ID_VAL_DASHES (SID_SD_START+243)
-#define ID_VAL_DASHLEN (SID_SD_START+244)
-#define ID_VAL_DISTANCE (SID_SD_START+245)
-#define ID_VAL_INDEX (SID_SD_START+246)
-#define ID_VAL_WIDTH (SID_SD_START+247)
-#define ID_VAL_HEIGHT (SID_SD_START+248)
-#define ID_VAL_PANEL_INDEX (SID_SD_START+249)
+#define ID_VAL_ENDINTENS (SID_SD_START+197)
+#define ID_VAL_STARTINTENS (SID_SD_START+198)
+#define ID_VAL_BORDER (SID_SD_START+199)
+#define ID_VAL_MOUSESTART_X (SID_SD_START+200)
+#define ID_VAL_MOUSESTART_Y (SID_SD_START+201)
+#define ID_VAL_LENGTH_X (SID_SD_START+202)
+#define ID_VAL_LENGTH_Y (SID_SD_START+203)
+#define ID_VAL_MOUSEEND_X (SID_SD_START+204)
+#define ID_VAL_MOUSEEND_Y (SID_SD_START+205)
+#define ID_VAL_AXIS_X (SID_SD_START+206)
+#define ID_VAL_AXIS_Y (SID_SD_START+207)
+#define ID_VAL_ANGLESTART (SID_SD_START+208)
+#define ID_VAL_ANGLEEND (SID_SD_START+209)
+#define ID_VAL_CENTER_X (SID_SD_START+210)
+#define ID_VAL_CENTER_Y (SID_SD_START+211)
+#define ID_VAL_WHATPAGE (SID_SD_START+212)
+#define ID_VAL_WHATLAYER (SID_SD_START+213)
+#define ID_VAL_ANGLE (SID_SD_START+214)
+#define ID_VAL_MIRRORVERT (SID_SD_START+215)
+#define ID_VAL_ISACTIVE (SID_SD_START+216)
+#define ID_VAL_WHATKIND (SID_SD_START+217)
+#define ID_VAL_PAGEWIDTH (SID_SD_START+218)
+#define ID_VAL_PAGEMARGIN (SID_SD_START+219)
+#define ID_VAL_PAGETOP (SID_SD_START+220)
+#define ID_VAL_PAGEBOTTOM (SID_SD_START+221)
+#define ID_VAL_PAGELEFT (SID_SD_START+222)
+#define ID_VAL_PAGERIGHT (SID_SD_START+223)
+#define ID_VAL_SCALEOBJECTS (SID_SD_START+224)
+#define ID_VAL_PAGENAME (SID_SD_START+225)
+#define ID_VAL_WHATLAYOUT (SID_SD_START+226)
+#define ID_VAL_ISPAGEBACK (SID_SD_START+227)
+#define ID_VAL_ISPAGEOBJ (SID_SD_START+228)
+#define ID_VAL_LAYERNAME (SID_SD_START+229)
+#define ID_VAL_ISVISIBLE (SID_SD_START+230)
+#define ID_VAL_ISLOCKED (SID_SD_START+231)
+#define ID_VAL_ISPRINTABLE (SID_SD_START+232)
+#define ID_VAL_PAGEHEIGHT (SID_SD_START+233)
+#define ID_VAL_ZOOM (SID_SD_START+234)
+#define ID_VAL_ANCHOR_X (SID_SD_START+235)
+#define ID_VAL_ANCHOR_Y (SID_SD_START+236)
+#define ID_VAL_RED (SID_SD_START+237)
+#define ID_VAL_GREEN (SID_SD_START+238)
+#define ID_VAL_BLUE (SID_SD_START+239)
+#define ID_VAL_STYLE (SID_SD_START+240)
+#define ID_VAL_DOTS (SID_SD_START+241)
+#define ID_VAL_DOTLEN (SID_SD_START+242)
+#define ID_VAL_DASHES (SID_SD_START+243)
+#define ID_VAL_DASHLEN (SID_SD_START+244)
+#define ID_VAL_DISTANCE (SID_SD_START+245)
+#define ID_VAL_INDEX (SID_SD_START+246)
+#define ID_VAL_WIDTH (SID_SD_START+247)
+#define ID_VAL_HEIGHT (SID_SD_START+248)
+#define ID_VAL_PANEL_INDEX (SID_SD_START+249)
// nur zum austesten, um nicht jedesmal APP:HRC ff. durchbuilden zu muessen
-#define ID_VAL_DUMMY0 (SID_SD_START+230)
-#define ID_VAL_DUMMY1 (SID_SD_START+231)
-#define ID_VAL_DUMMY2 (SID_SD_START+232)
-#define ID_VAL_DUMMY3 (SID_SD_START+233)
-#define ID_VAL_DUMMY4 (SID_SD_START+234)
-#define ID_VAL_DUMMY5 (SID_SD_START+235)
-#define ID_VAL_DUMMY6 (SID_SD_START+236)
-#define ID_VAL_DUMMY7 (SID_SD_START+237)
-#define ID_VAL_DUMMY8 (SID_SD_START+238)
-#define ID_VAL_DUMMY9 (SID_SD_START+239)
+#define ID_VAL_DUMMY0 (SID_SD_START+230)
+#define ID_VAL_DUMMY1 (SID_SD_START+231)
+#define ID_VAL_DUMMY2 (SID_SD_START+232)
+#define ID_VAL_DUMMY3 (SID_SD_START+233)
+#define ID_VAL_DUMMY4 (SID_SD_START+234)
+#define ID_VAL_DUMMY5 (SID_SD_START+235)
+#define ID_VAL_DUMMY6 (SID_SD_START+236)
+#define ID_VAL_DUMMY7 (SID_SD_START+237)
+#define ID_VAL_DUMMY8 (SID_SD_START+238)
+#define ID_VAL_DUMMY9 (SID_SD_START+239)
-#define SID_MOVETO (SID_SD_START+250)
-#define SID_LINETO (SID_SD_START+251)
-#define SID_BEZIERTO (SID_SD_START+252)
-#define SID_PAGESIZE (SID_SD_START+253)
-#define SID_PAGEMARGIN (SID_SD_START+254)
-#define SID_ZOOMING (SID_SD_START+255)
-#define SID_SELECTAT (SID_SD_START+256)
-#define SID_COLORVIEW (SID_SD_START+257)
+#define SID_MOVETO (SID_SD_START+250)
+#define SID_LINETO (SID_SD_START+251)
+#define SID_BEZIERTO (SID_SD_START+252)
+#define SID_PAGESIZE (SID_SD_START+253)
+#define SID_PAGEMARGIN (SID_SD_START+254)
+#define SID_ZOOMING (SID_SD_START+255)
+#define SID_SELECTAT (SID_SD_START+256)
+#define SID_COLORVIEW (SID_SD_START+257)
-#define SID_GETRED (SID_SD_START+259)
-#define SID_GETBLUE (SID_SD_START+260)
-#define SID_GETGREEN (SID_SD_START+261)
-#define SID_SETFILLSTYLE (SID_SD_START+262)
-#define SID_SETFILLCOLOR (SID_SD_START+263)
-#define SID_GRADIENT (SID_SD_START+264)
-#define SID_SETLINESTYLE (SID_SD_START+265)
-#define SID_SETLINEWIDTH (SID_SD_START+266)
-#define SID_DASH (SID_SD_START+267)
-#define SID_RENAMEPAGE (SID_SD_START+268)
-#define SID_RENAMELAYER (SID_SD_START+269)
-#define SID_HATCH (SID_SD_START+270)
-#define SID_GETFILLSTYLE (SID_SD_START+271)
-#define SID_GETLINESTYLE (SID_SD_START+272)
-#define SID_GETLINEWIDTH (SID_SD_START+273)
-#define SID_SETLINECOLOR (SID_SD_START+274)
-#define SID_SETHATCHCOLOR (SID_SD_START+275)
-#define SID_SETGRADSTARTCOLOR (SID_SD_START+276)
-#define SID_SETGRADENDCOLOR (SID_SD_START+277)
-#define SID_SELECTGRADIENT (SID_SD_START+278)
-#define SID_SELECTHATCH (SID_SD_START+279)
-#define SID_UNSELECT (SID_SD_START+280)
-#define SID_TEXTATTR_DLG (SID_SD_START+281)
-#define SID_ORIGINAL_SIZE (SID_SD_START+282)
-#define SID_PAGES_PER_ROW (SID_SD_START+284)
-#define SID_TEXT_FITTOSIZE (SID_SD_START+285)
-#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286)
-#define SID_NAVIGATOR_PAGENAME (SID_SD_START+287)
-#define SID_NAVIGATOR_STATE (SID_SD_START+288)
-#define SID_NAVIGATOR_INIT (SID_SD_START+289)
-#define SID_NAVIGATOR_PEN (SID_SD_START+291)
-#define SID_NAVIGATOR_PAGE (SID_SD_START+292)
-#define SID_NAVIGATOR_OBJECT (SID_SD_START+293)
-#define SID_ANIMATOR_INIT (SID_SD_START+294)
-#define SID_DRAWTBX_3D_OBJECTS (SID_SD_START+295)
-#define SID_3D_CUBE (SID_SD_START+296)
-#define SID_3D_SPHERE (SID_SD_START+297)
-#define SID_3D_CYLINDER (SID_SD_START+298)
-#define SID_3D_CONE (SID_SD_START+299)
-#define SID_3D_PYRAMID (SID_SD_START+300)
-#define SID_GLUE_EDITMODE (SID_SD_START+301)
-#define SID_GLUE_INSERT_POINT (SID_SD_START+302)
-#define SID_GLUE_PERCENT (SID_SD_START+303)
-#define SID_GLUE_ESCDIR (SID_SD_START+304)
-#define SID_GLUE_HORZALIGN_CENTER (SID_SD_START+305)
-#define SID_GLUE_HORZALIGN_LEFT (SID_SD_START+306)
-#define SID_GLUE_HORZALIGN_RIGHT (SID_SD_START+307)
-#define SID_GLUE_VERTALIGN_CENTER (SID_SD_START+308)
-#define SID_GLUE_VERTALIGN_TOP (SID_SD_START+309)
-#define SID_GLUE_VERTALIGN_BOTTOM (SID_SD_START+310)
-#define SID_3D_SHELL (SID_SD_START+311)
-#define SID_3D_TORUS (SID_SD_START+312)
-#define SID_3D_HALF_SPHERE (SID_SD_START+313)
-#define SID_GLUE_ESCDIR_LEFT (SID_SD_START+314)
-#define SID_GLUE_ESCDIR_RIGHT (SID_SD_START+315)
-#define SID_GLUE_ESCDIR_TOP (SID_SD_START+316)
-#define SID_GLUE_ESCDIR_BOTTOM (SID_SD_START+317)
-#define SID_DRAWTBX_INSERT (SID_SD_START+318)
-#define SID_POLYGON_MORPHING (SID_SD_START+319)
-#define SID_MEASURE_DLG (SID_SD_START+320)
-#define SID_EXPORT (SID_SD_START+321)
-#define SID_GRID_VISIBLE (SID_SD_START+322)
-#define SID_GRID_FRONT (SID_SD_START+323)
-#define SID_HELPLINES_VISIBLE (SID_SD_START+324)
-#define SID_HELPLINES_FRONT (SID_SD_START+325)
-#define SID_BEFORE_OBJ (SID_SD_START+326)
-#define SID_PREVIEW_WIN (SID_SD_START+327)
-#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+328)
-#define SID_PREVIEW_STATE (SID_SD_START+329)
+#define SID_GETRED (SID_SD_START+259)
+#define SID_GETBLUE (SID_SD_START+260)
+#define SID_GETGREEN (SID_SD_START+261)
+#define SID_SETFILLSTYLE (SID_SD_START+262)
+#define SID_SETFILLCOLOR (SID_SD_START+263)
+#define SID_GRADIENT (SID_SD_START+264)
+#define SID_SETLINESTYLE (SID_SD_START+265)
+#define SID_SETLINEWIDTH (SID_SD_START+266)
+#define SID_DASH (SID_SD_START+267)
+#define SID_RENAMEPAGE (SID_SD_START+268)
+#define SID_RENAMELAYER (SID_SD_START+269)
+#define SID_HATCH (SID_SD_START+270)
+#define SID_GETFILLSTYLE (SID_SD_START+271)
+#define SID_GETLINESTYLE (SID_SD_START+272)
+#define SID_GETLINEWIDTH (SID_SD_START+273)
+#define SID_SETLINECOLOR (SID_SD_START+274)
+#define SID_SETHATCHCOLOR (SID_SD_START+275)
+#define SID_SETGRADSTARTCOLOR (SID_SD_START+276)
+#define SID_SETGRADENDCOLOR (SID_SD_START+277)
+#define SID_SELECTGRADIENT (SID_SD_START+278)
+#define SID_SELECTHATCH (SID_SD_START+279)
+#define SID_UNSELECT (SID_SD_START+280)
+#define SID_TEXTATTR_DLG (SID_SD_START+281)
+#define SID_ORIGINAL_SIZE (SID_SD_START+282)
+#define SID_PAGES_PER_ROW (SID_SD_START+284)
+#define SID_TEXT_FITTOSIZE (SID_SD_START+285)
+#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286)
+#define SID_NAVIGATOR_PAGENAME (SID_SD_START+287)
+#define SID_NAVIGATOR_STATE (SID_SD_START+288)
+#define SID_NAVIGATOR_INIT (SID_SD_START+289)
+#define SID_NAVIGATOR_PEN (SID_SD_START+291)
+#define SID_NAVIGATOR_PAGE (SID_SD_START+292)
+#define SID_NAVIGATOR_OBJECT (SID_SD_START+293)
+#define SID_ANIMATOR_INIT (SID_SD_START+294)
+#define SID_DRAWTBX_3D_OBJECTS (SID_SD_START+295)
+#define SID_3D_CUBE (SID_SD_START+296)
+#define SID_3D_SPHERE (SID_SD_START+297)
+#define SID_3D_CYLINDER (SID_SD_START+298)
+#define SID_3D_CONE (SID_SD_START+299)
+#define SID_3D_PYRAMID (SID_SD_START+300)
+#define SID_GLUE_EDITMODE (SID_SD_START+301)
+#define SID_GLUE_INSERT_POINT (SID_SD_START+302)
+#define SID_GLUE_PERCENT (SID_SD_START+303)
+#define SID_GLUE_ESCDIR (SID_SD_START+304)
+#define SID_GLUE_HORZALIGN_CENTER (SID_SD_START+305)
+#define SID_GLUE_HORZALIGN_LEFT (SID_SD_START+306)
+#define SID_GLUE_HORZALIGN_RIGHT (SID_SD_START+307)
+#define SID_GLUE_VERTALIGN_CENTER (SID_SD_START+308)
+#define SID_GLUE_VERTALIGN_TOP (SID_SD_START+309)
+#define SID_GLUE_VERTALIGN_BOTTOM (SID_SD_START+310)
+#define SID_3D_SHELL (SID_SD_START+311)
+#define SID_3D_TORUS (SID_SD_START+312)
+#define SID_3D_HALF_SPHERE (SID_SD_START+313)
+#define SID_GLUE_ESCDIR_LEFT (SID_SD_START+314)
+#define SID_GLUE_ESCDIR_RIGHT (SID_SD_START+315)
+#define SID_GLUE_ESCDIR_TOP (SID_SD_START+316)
+#define SID_GLUE_ESCDIR_BOTTOM (SID_SD_START+317)
+#define SID_DRAWTBX_INSERT (SID_SD_START+318)
+#define SID_POLYGON_MORPHING (SID_SD_START+319)
+#define SID_MEASURE_DLG (SID_SD_START+320)
+#define SID_EXPORT (SID_SD_START+321)
+#define SID_GRID_VISIBLE (SID_SD_START+322)
+#define SID_GRID_FRONT (SID_SD_START+323)
+#define SID_HELPLINES_VISIBLE (SID_SD_START+324)
+#define SID_HELPLINES_FRONT (SID_SD_START+325)
+#define SID_BEFORE_OBJ (SID_SD_START+326)
+#define SID_PREVIEW_WIN (SID_SD_START+327)
+#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+328)
+#define SID_PREVIEW_STATE (SID_SD_START+329)
#define SID_CUSTOM_ANIMATION_SCHEMES_PANEL (SID_SD_START+333)
-#define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334)
+#define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334)
// free
-#define SID_CONNECTION_DLG (SID_SD_START+338)
-#define SID_PRESENTATION_DLG (SID_SD_START+339)
-#define SID_HYPHENATION (SID_SD_START+340)
-#define SID_CONNECTION_NEW_ROUTING (SID_SD_START+341)
+#define SID_CONNECTION_DLG (SID_SD_START+338)
+#define SID_PRESENTATION_DLG (SID_SD_START+339)
+#define SID_HYPHENATION (SID_SD_START+340)
+#define SID_CONNECTION_NEW_ROUTING (SID_SD_START+341)
#define SID_DUPLICATE_PAGE (SID_SD_START+342)
#define SID_EXPAND_PAGE (SID_SD_START+343)
#define SID_SUMMARY_PAGE (SID_SD_START+344)
@@ -365,76 +365,76 @@
#define SID_NOTES_MASTERPAGE (SID_SD_START+350)
#define SID_TITLE_MASTERPAGE (SID_SD_START+351)
#define SID_INSERTPAGE_QUICK (SID_SD_START+352)
-#define SID_SAVEGRAPHIC (SID_SD_START+353)
+#define SID_SAVEGRAPHIC (SID_SD_START+353)
// free
-#define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357)
-#define SID_INSERT_FLD_DATE_FIX (SID_SD_START+358)
-#define SID_INSERT_FLD_TIME_VAR (SID_SD_START+359)
-#define SID_INSERT_FLD_TIME_FIX (SID_SD_START+360)
-#define SID_INSERT_FLD_PAGE (SID_SD_START+361)
-#define SID_MODIFY_FIELD (SID_SD_START+362)
-#define SID_INSERT_FLD_FILE (SID_SD_START+363)
-#define SID_INSERT_FLD_AUTHOR (SID_SD_START+364)
-#define SID_CUSTOMSHOW_DLG (SID_SD_START+365)
+#define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357)
+#define SID_INSERT_FLD_DATE_FIX (SID_SD_START+358)
+#define SID_INSERT_FLD_TIME_VAR (SID_SD_START+359)
+#define SID_INSERT_FLD_TIME_FIX (SID_SD_START+360)
+#define SID_INSERT_FLD_PAGE (SID_SD_START+361)
+#define SID_MODIFY_FIELD (SID_SD_START+362)
+#define SID_INSERT_FLD_FILE (SID_SD_START+363)
+#define SID_INSERT_FLD_AUTHOR (SID_SD_START+364)
+#define SID_CUSTOMSHOW_DLG (SID_SD_START+365)
-#define SID_OUTPUT_QUALITY_COLOR (SID_SD_START+366)
-#define SID_OUTPUT_QUALITY_GRAYSCALE (SID_SD_START+367)
-#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368)
-#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369)
-#define SID_PREVIEW_QUALITY_GRAYSCALE (SID_SD_START+370)
-#define SID_PREVIEW_QUALITY_BLACKWHITE (SID_SD_START+371)
-#define SID_VECTORIZE (SID_SD_START+372)
+#define SID_OUTPUT_QUALITY_COLOR (SID_SD_START+366)
+#define SID_OUTPUT_QUALITY_GRAYSCALE (SID_SD_START+367)
+#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368)
+#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369)
+#define SID_PREVIEW_QUALITY_GRAYSCALE (SID_SD_START+370)
+#define SID_PREVIEW_QUALITY_BLACKWHITE (SID_SD_START+371)
+#define SID_VECTORIZE (SID_SD_START+372)
-#define SID_INSERT_FLD_PAGES (SID_SD_START+373)
+#define SID_INSERT_FLD_PAGES (SID_SD_START+373)
-#define SID_CONVERT_TO_BITMAP (SID_SD_START+378)
-#define SID_CONVERT_TO_METAFILE (SID_SD_START+379)
+#define SID_CONVERT_TO_BITMAP (SID_SD_START+378)
+#define SID_CONVERT_TO_METAFILE (SID_SD_START+379)
-#define SID_PACKNGO (SID_SD_START+380)
+#define SID_PACKNGO (SID_SD_START+380)
-#define SID_CONVERT_TO_CONTOUR (SID_SD_START+381)
+#define SID_CONVERT_TO_CONTOUR (SID_SD_START+381)
-#define SID_EDIT_HYPERLINK (SID_SD_START+382)
+#define SID_EDIT_HYPERLINK (SID_SD_START+382)
-#define SID_GRAFFILTER_SOBEL (SID_SD_START+390)
-#define SID_GRAFFILTER_MOSAIC (SID_SD_START+391)
-#define SID_GRAFFILTER_EMBOSS (SID_SD_START+392)
-#define SID_GRAFFILTER_POSTER (SID_SD_START+393)
-#define SID_GRAFFILTER_POPART (SID_SD_START+394)
-#define SID_GRAFFILTER_SEPIA (SID_SD_START+395)
-#define SID_GRAFFILTER_SOLARIZE (SID_SD_START+396)
+#define SID_GRAFFILTER_SOBEL (SID_SD_START+390)
+#define SID_GRAFFILTER_MOSAIC (SID_SD_START+391)
+#define SID_GRAFFILTER_EMBOSS (SID_SD_START+392)
+#define SID_GRAFFILTER_POSTER (SID_SD_START+393)
+#define SID_GRAFFILTER_POPART (SID_SD_START+394)
+#define SID_GRAFFILTER_SEPIA (SID_SD_START+395)
+#define SID_GRAFFILTER_SOLARIZE (SID_SD_START+396)
-#define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400)
-#define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401)
+#define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400)
+#define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401)
#define SID_RENAMEPAGE_QUICK (SID_SD_START+405)
#define SID_SWITCH_SHELL (SID_SD_START+406)
-#define SID_HEADER_AND_FOOTER (SID_SD_START+407)
-#define SID_MASTER_LAYOUTS (SID_SD_START+408)
+#define SID_HEADER_AND_FOOTER (SID_SD_START+407)
+#define SID_MASTER_LAYOUTS (SID_SD_START+408)
/*
-#define SID_MASTER_LAYOUTS_NOTES (SID_SD_START+409)
-#define SID_MASTER_LAYOUTS_HANDOUTS (SID_SD_START+410)
+#define SID_MASTER_LAYOUTS_NOTES (SID_SD_START+409)
+#define SID_MASTER_LAYOUTS_HANDOUTS (SID_SD_START+410)
*/
-#define SID_INSERT_PAGE_NUMBER (SID_SD_START+411)
-#define SID_INSERT_DATE_TIME (SID_SD_START+412)
+#define SID_INSERT_PAGE_NUMBER (SID_SD_START+411)
+#define SID_INSERT_DATE_TIME (SID_SD_START+412)
-#define SID_SDMODE_FLAG (SID_SD_START+413)
-#define SD_DRAW_MODE 1
-#define SD_IMPRESS_MODE 2
+#define SID_SDMODE_FLAG (SID_SD_START+413)
+#define SD_DRAW_MODE 1
+#define SD_IMPRESS_MODE 2
#define SID_LEFT_PANE_IMPRESS (SID_SD_START+414)
#define SID_LEFT_PANE_DRAW (SID_SD_START+415)
// FREE
#define SID_NOTES_WINDOW (SID_SD_START+417)
#define SID_SWITCH_SHELL_PANE (SID_SD_START+418)
-#define SID_LAYER_DIALOG_WIN (SID_SD_START+419)
-#define SID_NORMAL_MULTI_PANE_GUI (SID_SD_START+420)
-#define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421)
+#define SID_LAYER_DIALOG_WIN (SID_SD_START+419)
+#define SID_NORMAL_MULTI_PANE_GUI (SID_SD_START+420)
+#define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421)
-#define SID_SELECT_BACKGROUND (SID_SD_START+422)
-#define SID_OBJECT_CROP (SID_SD_START+423)
+#define SID_SELECT_BACKGROUND (SID_SD_START+422)
+#define SID_OBJECT_CROP (SID_SD_START+423)
// Slots for the tool pane popup
#define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425)
@@ -451,13 +451,13 @@
#define SID_DISPLAY_MASTER_BACKGROUND (SID_SD_START+436)
#define SID_DISPLAY_MASTER_OBJECTS (SID_SD_START+437)
#define SID_INSERTPAGE_LAYOUT_MENU (SID_SD_START+438)
-#define SID_TP_EDIT_MASTER (SID_SD_START+439)
+#define SID_TP_EDIT_MASTER (SID_SD_START+439)
#define SID_OUTLINE_TEXT_AUTOFIT (SID_SD_START+440)
// Add companion for the SID_HIDE_SLIDE (that is defined in svx)
#define SID_SHOW_SLIDE (SID_SD_START+441)
-#define SID_ADD_MOTION_PATH (SID_SD_START+442)
-#define SID_TABLE_TOOLBOX (SID_SD_START+443)
+#define SID_ADD_MOTION_PATH (SID_SD_START+442)
+#define SID_TABLE_TOOLBOX (SID_SD_START+443)
#endif
diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx
index e44485a9c2c5..68a6fe0f2255 100644
--- a/sd/inc/app.hxx
+++ b/sd/inc/app.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 1f981e9a770e..d7a2ec3f7895 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h
index df5296f6e4ce..922c75628302 100644
--- a/sd/inc/diadef.h
+++ b/sd/inc/diadef.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/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 4a765346be27..7dc116515951 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/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
@@ -162,11 +162,11 @@ namespace sd
class SdDrawDocument : public FmFormModel
{
private:
- ::sd::Outliner* mpOutliner; // local outliner for outline mode
- ::sd::Outliner* mpInternalOutliner; // internal outliner for creation of text objects
- Timer* mpWorkStartupTimer;
+ ::sd::Outliner* mpOutliner; // local outliner for outline mode
+ ::sd::Outliner* mpInternalOutliner; // internal outliner for creation of text objects
+ Timer* mpWorkStartupTimer;
Timer* mpOnlineSpellingTimer;
- sd::ShapeList* mpOnlineSpellingList;
+ sd::ShapeList* mpOnlineSpellingList;
SvxSearchItem* mpOnlineSearchItem;
List* mpFrameViewList;
List* mpCustomShowList;
@@ -174,26 +174,26 @@ private:
SdTransferable * mpCreatingTransferable;
BOOL mbHasOnlineSpellErrors;
BOOL mbInitialOnlineSpellingEnabled;
- String maBookmarkFile;
- ::sd::DrawDocShellRef mxBookmarkDocShRef;
+ String maBookmarkFile;
+ ::sd::DrawDocShellRef mxBookmarkDocShRef;
sd::PresentationSettings maPresentationSettings;
::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation;
- BOOL mbNewOrLoadCompleted;
+ BOOL mbNewOrLoadCompleted;
- BOOL mbOnlineSpell;
+ BOOL mbOnlineSpell;
BOOL mbSummationOfParagraphs;
- bool mbStartWithPresentation; // is set to true when starting with command line parameter -start
- LanguageType meLanguage;
- LanguageType meLanguageCJK;
- LanguageType meLanguageCTL;
- SvxNumType mePageNumType;
+ bool mbStartWithPresentation; // is set to true when starting with command line parameter -start
+ LanguageType meLanguage;
+ LanguageType meLanguageCJK;
+ LanguageType meLanguageCTL;
+ SvxNumType mePageNumType;
::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel()
- BOOL mbAllocDocSh; // => AllocModel()
+ BOOL mbAllocDocSh; // => AllocModel()
DocumentType meDocType;
- CharClass* mpCharClass;
+ CharClass* mpCharClass;
::com::sun::star::lang::Locale* mpLocale;
// #109538#
@@ -210,7 +210,7 @@ private:
DECL_LINK(OnlineSpellEventHdl, EditStatus*);
std::vector< rtl::OUString > maAnnotationAuthors;
-
+
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
@@ -232,46 +232,46 @@ public:
virtual void SetChanged(sal_Bool bFlag = sal_True);
virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const;
- SfxItemPool& GetPool() { return( *pItemPool ); }
+ SfxItemPool& GetPool() { return( *pItemPool ); }
::sd::Outliner* GetOutliner(BOOL bCreateOutliner=TRUE);
SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(BOOL bCreateOutliner=TRUE);
-
+
::sd::DrawDocShell* GetDocSh() const { return mpDocSh; }
- LanguageType GetLanguage( const USHORT nId ) const;
- void SetLanguage( const LanguageType eLang, const USHORT nId );
+ LanguageType GetLanguage( const USHORT nId ) const;
+ void SetLanguage( const LanguageType eLang, const USHORT nId );
SvxNumType GetPageNumType() const;
- void SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
+ void SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
SD_DLLPUBLIC String CreatePageNumValue(USHORT nNum) const;
DocumentType GetDocumentType() const { return meDocType; }
- void SetAllocDocSh(BOOL bAlloc);
-
- void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
+ void SetAllocDocSh(BOOL bAlloc);
+ void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
+
/** if the document does not contain at least one handout, one slide and one notes page with
at least one master each this methods creates them.
If a reference document is given, the sizes and border settings of that document are used
for newly created slides.
*/
- SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
+ SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
SD_DLLPUBLIC BOOL CreateMissingNotesAndHandoutPages();
- void MovePage(USHORT nPgNum, USHORT nNewPos);
- void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
- void DeletePage(USHORT nPgNum);
+ void MovePage(USHORT nPgNum, USHORT nNewPos);
+ void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
+ void DeletePage(USHORT nPgNum);
SdrPage* RemovePage(USHORT nPgNum);
virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
- void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE );
- SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName,
+ void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE );
+ SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName,
SdDrawDocument* pSourceDoc, BOOL bMaster, BOOL bCheckMasters);
-
+
SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile);
SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium);
BOOL InsertBookmark(List* pBookmarkList, List* pExchangeList, BOOL bLink,
@@ -335,11 +335,11 @@ public:
BOOL InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL,
BOOL bLink, ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos);
- void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList,
+ void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList,
USHORT nBMSdPageCount,
InsertBookmarkAsPage_PageFunctorBase& rPageIterator );
- SD_DLLPUBLIC void CloseBookmarkDoc();
-
+ SD_DLLPUBLIC void CloseBookmarkDoc();
+
SdrObject* GetObj(const String& rObjName) const;
/** Return the first page that has the given name. Regular pages and
@@ -357,23 +357,23 @@ public:
*/
USHORT GetPageByName(const String& rPgName, BOOL& rbIsMasterPage ) const;
SD_DLLPUBLIC SdPage*GetSdPage(USHORT nPgNum, PageKind ePgKind) const;
- SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const;
-
- void SetSelected(SdPage* pPage, BOOL bSelect);
- BOOL MovePages(USHORT nTargetPage);
+ SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const;
+ void SetSelected(SdPage* pPage, BOOL bSelect);
+ BOOL MovePages(USHORT nTargetPage);
+
SD_DLLPUBLIC SdPage*GetMasterSdPage(USHORT nPgNum, PageKind ePgKind);
- SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const;
-
- USHORT GetMasterPageUserCount(SdrPage* pMaster) const;
-
+ SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const;
+
+ USHORT GetMasterPageUserCount(SdrPage* pMaster) const;
+
const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; }
sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; }
-
+
const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
void SetSummationOfParagraphs( BOOL bOn = TRUE ) { mbSummationOfParagraphs = bOn; }
- BOOL IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
+ BOOL IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
/** Set the mode that controls whether (and later how) the formatting of the document
depends on the current printer metrics.
@@ -411,20 +411,20 @@ public:
List* GetFrameViewList() const { return mpFrameViewList; }
SD_DLLPUBLIC List* GetCustomShowList(BOOL bCreate = FALSE);
-
+
void NbcSetChanged(sal_Bool bFlag = sal_True);
void SetTextDefaults() const;
void CreateLayoutTemplates();
void RenameLayoutTemplate(const String& rOldLayoutName, const String& rNewName);
-
- void CreateDefaultCellStyles();
+
+ void CreateDefaultCellStyles();
SD_DLLPUBLIC void StopWorkStartupDelay();
-
+
void NewOrLoadCompleted(DocCreationMode eMode);
- void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
+ void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
BOOL IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
::sd::FrameView* GetFrameView(ULONG nPos) {
@@ -434,16 +434,16 @@ public:
/** deprecated*/
SdAnimationInfo* GetAnimationInfo(SdrObject* pObject) const;
- SD_DLLPUBLIC static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
+ SD_DLLPUBLIC static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd );
- CharClass* GetCharClass() const { return mpCharClass; }
+ CharClass* GetCharClass() const { return mpCharClass; }
void RestoreLayerNames();
- void UpdateAllLinks();
+ void UpdateAllLinks();
void CheckMasterPages();
@@ -452,7 +452,7 @@ public:
USHORT nDestPos=0xFFFF,
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false);
-
+
SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx
index 59e7b3e35a83..c49cac4d8e52 100644
--- a/sd/inc/eetext.hxx
+++ b/sd/inc/eetext.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <editeng/outliner.hxx>
-#endif // EETEXT_HXX
+#endif // EETEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h
index 732c68baa6bd..25d7c91ae489 100644
--- a/sd/inc/fadedef.h
+++ b/sd/inc/fadedef.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
@@ -41,6 +41,6 @@ enum FadeSpeed
// muss angepasst werden!
#define FADE_SPEED_COUNT 3
-#endif // _SD_FADEDEF_H
+#endif // _SD_FADEDEF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 73189f135e62..eebb52f02c89 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.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
@@ -98,13 +98,13 @@
#define STR_POOLSHEET_HEADLINE1 RID_GLOB_START+66
#define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67
#define STR_POOLSHEET_MEASURE RID_GLOB_START+68
-#define STR_POOLSHEET_ARROW RID_GLOB_START+69
+#define STR_POOLSHEET_ARROW RID_GLOB_START+69
//
-#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70
-#define STR_POOLSHEET_HEADER RID_GLOB_START+71
-#define STR_POOLSHEET_TOTAL RID_GLOB_START+72
-#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73
-#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74
+#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70
+#define STR_POOLSHEET_HEADER RID_GLOB_START+71
+#define STR_POOLSHEET_TOTAL RID_GLOB_START+72
+#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73
+#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74
//
#define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80
#define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81
@@ -116,23 +116,23 @@
#define STR_EMPTY_STYLESHEET_NAME RID_GLOB_START+91
#define STR_LAYER_MEASURELINES RID_GLOB_START+92
#define STR_LAYOUT_DEFAULT_TITLE_NAME RID_GLOB_START+93
-#define STR_GRAFOBJECTBARSHELL RID_GLOB_START+94
-#define STR_POWERPOINT_IMPORT RID_GLOB_START+95
-#define STR_STAROFFICE_XML_DRAW RID_GLOB_START+96
-#define STR_STAROFFICE_XML_IMPRESS RID_GLOB_START+97
-#define STR_PRESVIEWSHELL RID_GLOB_START+98
-#define STR_LOAD_DOC RID_GLOB_START+99
-#define STR_SAVE_DOC RID_GLOB_START+100
-#define STR_PREVIEWVIEWSHELL RID_GLOB_START+101
-#define RID_SD_ERRHDL RID_GLOB_START+102
+#define STR_GRAFOBJECTBARSHELL RID_GLOB_START+94
+#define STR_POWERPOINT_IMPORT RID_GLOB_START+95
+#define STR_STAROFFICE_XML_DRAW RID_GLOB_START+96
+#define STR_STAROFFICE_XML_IMPRESS RID_GLOB_START+97
+#define STR_PRESVIEWSHELL RID_GLOB_START+98
+#define STR_LOAD_DOC RID_GLOB_START+99
+#define STR_SAVE_DOC RID_GLOB_START+100
+#define STR_PREVIEWVIEWSHELL RID_GLOB_START+101
+#define RID_SD_ERRHDL RID_GLOB_START+102
#define STR_VIEWSHELLBASE RID_GLOB_START+103
-#define STR_3DOBJECTBARSHELL RID_GLOB_START+104
-#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105
+#define STR_3DOBJECTBARSHELL RID_GLOB_START+104
+#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105
#define STR_SLIDESORTERVIEWSHELL RID_GLOB_START+106
#define STR_TASKPANEVIEWSHELL RID_GLOB_START+107
#define STR_MASTERPAGESSELECTOR RID_GLOB_START+108
#define STR_TASKPANELAYOUTMENU RID_GLOB_START+109
-#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110
+#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110
#define STR_PAGE_NAME RID_GLOB_START+111
#define STR_SLIDE_NAME RID_GLOB_START+112
#define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113
@@ -140,17 +140,17 @@
#define STR_RIGHT_PANE_SHELL RID_GLOB_START+115
#define STR_TOOL_PANEL_SHELL RID_GLOB_START+116
-#define RID_CUSTOMANIMATION_START RID_GLOB_START+120
-#define RID_CUSTOMANIMATION_END RID_GLOB_START+199
-#define RID_ANNOTATIONS_START RID_GLOB_START+200
-#define RID_ANNOTATIONS_END RID_GLOB_START+220
-#define STR_UNDO_ANIMATION RID_GLOB_START+221
-#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222
-#define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223
+#define RID_CUSTOMANIMATION_START RID_GLOB_START+120
+#define RID_CUSTOMANIMATION_END RID_GLOB_START+199
+#define RID_ANNOTATIONS_START RID_GLOB_START+200
+#define RID_ANNOTATIONS_END RID_GLOB_START+220
+#define STR_UNDO_ANIMATION RID_GLOB_START+221
+#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222
+#define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223
-#define DLG_TABLEDESIGNPANE RID_GLOB_START+224
-#define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225
-#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226
+#define DLG_TABLEDESIGNPANE RID_GLOB_START+224
+#define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225
+#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226
#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 77adcd8503eb..8264dca6382c 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------
-#define DIA_SLOW 0
-#define DIA_MEDIUM 1
-#define DIA_FAST 2
+#define DIA_SLOW 0
+#define DIA_MEDIUM 1
+#define DIA_FAST 2
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1
@@ -51,21 +51,21 @@
#define SD_IF_SDGRAPHICDOCSHELL SFX_INTERFACE_SD_START + 10
#define SD_IF_SDGRAPHICVIEWSHELL SFX_INTERFACE_SD_START + 11
#define SD_IF_SDGRAPHICSTDOBJECTBAR SFX_INTERFACE_SD_START + 12
-#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13
+#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13
#define SD_IF_SDPRESVIEWSHELL SFX_INTERFACE_SD_START + 14
#define SD_IF_SDPREVIEWVIEWSHELL SFX_INTERFACE_SD_START + 15
#define SD_IF_SDVIEWSHELLBASE SFX_INTERFACE_SD_START + 16
-#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17
-#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18
+#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17
+#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18
#define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19
#define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 20
#define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21
#define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22
-#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23
+#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23
#define SD_IF_SDLEFTIMPRESSPANESHELL SFX_INTERFACE_SD_START + 24
#define SD_IF_SDLEFTDRAWPANESHELL SFX_INTERFACE_SD_START + 25
#define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26
-#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27
+#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27
#define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28
#define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29
#define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30
@@ -78,19 +78,19 @@ const UINT32 SdUDInventor=UINT32('S')*0x00000001+
// Object-Ids fuer StarDraw UserData
#define SD_ANIMATIONINFO_ID 1
-#define SD_IMAPINFO_ID 2
+#define SD_IMAPINFO_ID 2
// FamilyId der Praesentationsvorlagen
-#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA
-#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO
-#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME
-#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY
+#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA
+#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO
+#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME
+#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY
// Trennzeichen zwischen Layoutname und Vorlagenname der Praesentationsvorlagen
#define SD_LT_SEPARATOR "~LT~"
// Optionsstream-Identifier
-#define SD_OPTION_MORPHING "Morph"
+#define SD_OPTION_MORPHING "Morph"
#define SD_OPTION_VECTORIZE "Vectorize"
//------------------------------------------------------------------
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 45194d8b8153..eee7cefde688 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 9a0bad271409..41d2c341d6c0 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.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
@@ -59,65 +59,65 @@
#define HID_SD_OPTIONS_CONTENTS (HID_SD_START + 21)
#define HID_SD_OPTIONS_MISC (HID_SD_START + 22)
-#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23)
-#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24)
-#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25)
-#define HID_SD_NAVIGATOR (HID_SD_START + 26)
+#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23)
+#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24)
+#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25)
+#define HID_SD_NAVIGATOR (HID_SD_START + 26)
-#define HID_SD_CTL_EFFECTS (HID_SD_START + 27)
-#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28)
+#define HID_SD_CTL_EFFECTS (HID_SD_START + 27)
+#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28)
-#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29)
+#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29)
-#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30)
-#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31)
+#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30)
+#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31)
-#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33)
+#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33)
#define HID_SD_NAVIGATOR_TBI_FIRST (HID_SD_START + 34)
#define HID_SD_NAVIGATOR_TBI_PREV (HID_SD_START + 35)
#define HID_SD_NAVIGATOR_TBI_NEXT (HID_SD_START + 36)
#define HID_SD_NAVIGATOR_TBI_LAST (HID_SD_START + 37)
-#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38)
+#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38)
#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39)
// Toolboxen
-#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40)
-#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41)
-#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42)
-#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43)
-#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44)
-#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45)
-#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46)
-#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47)
-#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48)
-#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49)
-#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50)
-#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51)
+#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40)
+#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41)
+#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42)
+#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43)
+#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44)
+#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45)
+#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46)
+#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47)
+#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48)
+#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49)
+#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50)
+#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51)
// FloatingWindows
-#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52)
-#define HID_SD_FW_ZOOM (HID_SD_START + 53)
-#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54)
-#define HID_SD_FW_TEXT (HID_SD_START + 55)
-#define HID_SD_FW_RECTANGLES (HID_SD_START + 56)
-#define HID_SD_FW_ELLIPSES (HID_SD_START + 57)
-#define HID_SD_FW_LINES (HID_SD_START + 58)
-#define HID_SD_FW_ARROWS (HID_SD_START + 59)
-#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60)
-#define HID_SD_FW_CONNECTORS (HID_SD_START + 61)
-#define HID_SD_FW_INSERT (HID_SD_START + 62)
-#define HID_SD_FW_POSITION (HID_SD_START + 63)
-
-#define HID_SD_BTN_PREVIEW (HID_SD_START + 64)
-
-#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65)
-#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66)
-#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67)
-
-#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68)
+#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52)
+#define HID_SD_FW_ZOOM (HID_SD_START + 53)
+#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54)
+#define HID_SD_FW_TEXT (HID_SD_START + 55)
+#define HID_SD_FW_RECTANGLES (HID_SD_START + 56)
+#define HID_SD_FW_ELLIPSES (HID_SD_START + 57)
+#define HID_SD_FW_LINES (HID_SD_START + 58)
+#define HID_SD_FW_ARROWS (HID_SD_START + 59)
+#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60)
+#define HID_SD_FW_CONNECTORS (HID_SD_START + 61)
+#define HID_SD_FW_INSERT (HID_SD_START + 62)
+#define HID_SD_FW_POSITION (HID_SD_START + 63)
+
+#define HID_SD_BTN_PREVIEW (HID_SD_START + 64)
+
+#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65)
+#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66)
+#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67)
+
+#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68)
// HelpIDs fuer Vorlagen
-#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
+#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71)
#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72)
#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73)
@@ -148,8 +148,8 @@
#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97)
#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98)
-#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99)
-#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100)
+#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99)
+#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100)
#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
@@ -165,23 +165,23 @@
#define HID_SD_HTMLEXPORT_PAGE5 (HID_SD_START + 109)
#define HID_SD_HTMLEXPORT_PAGE6 (HID_SD_START + 110)
-#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111)
-#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112)
-#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113)
-#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114)
+#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111)
+#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112)
+#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113)
+#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114)
-#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115)
+#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115)
-#define HID_FM_CTL_SELECTION (HID_SD_START + 116)
+#define HID_FM_CTL_SELECTION (HID_SD_START + 116)
-#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117)
-#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118)
-#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119)
-#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120)
+#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117)
+#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118)
+#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119)
+#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120)
-#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121)
+#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121)
-#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122)
+#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122)
#define HID_SD_TABBAR_PAGES (HID_SD_START + 123)
#define HID_SD_TABBAR_LAYERS (HID_SD_START + 124)
@@ -189,19 +189,19 @@
#define HID_SD_UNDODELETEWARNING_DLG (HID_SD_START + 125)
#define HID_SD_UNDODELETEWARNING_CBX (HID_SD_START + 126)
-#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127)
+#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127)
-#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128)
-#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129)
-#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130)
+#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128)
+#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129)
+#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130)
-#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131)
-#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132)
+#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131)
+#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132)
-#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133)
-#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134)
+#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133)
+#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134)
-#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135)
+#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135)
#define HID_SD_TASK_PANE (HID_SD_START + 136)
#define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137)
@@ -250,34 +250,34 @@
#define HID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
-#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178)
-#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179)
-#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180)
-#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181)
-#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182)
-
-#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183)
-#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184)
-#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185)
-#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186)
-#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187)
-#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188)
-#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189)
-#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190)
-
-#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191)
-
-#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192)
-#define HID_SD_RULER_VERTICAL (HID_SD_START + 193)
-
-#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
-#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
-#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
-#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
-#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
-#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
-
-#define HID_SD_TABLE_DESIGN (HID_SD_START + 200)
-#define HID_SD_ANNOTATIONS (HID_SD_START + 201)
+#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178)
+#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179)
+#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180)
+#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181)
+#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182)
+
+#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183)
+#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184)
+#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185)
+#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186)
+#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187)
+#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188)
+#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189)
+#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190)
+
+#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191)
+
+#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192)
+#define HID_SD_RULER_VERTICAL (HID_SD_START + 193)
+
+#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
+#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
+#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
+#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
+#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
+#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
+
+#define HID_SD_TABLE_DESIGN (HID_SD_START + 200)
+#define HID_SD_ANNOTATIONS (HID_SD_START + 201)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index c50740cd04e2..65473c4bfa3d 100644
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SdIMapInfo : public SdrObjUserData, public SfxListener
{
- ImageMap aImageMap;
+ ImageMap aImageMap;
public:
SdIMapInfo() :
@@ -59,15 +59,15 @@ public:
SfxListener(),
aImageMap( rIMapInfo.aImageMap ) {};
- virtual ~SdIMapInfo() {};
+ virtual ~SdIMapInfo() {};
virtual SdrObjUserData* Clone( SdrObject* ) const { return new SdIMapInfo( *this ); }
- void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; }
+ void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; }
const ImageMap& GetImageMap() const { return aImageMap; }
};
-#endif // _SD_IMAPINFO_HXX
+#endif // _SD_IMAPINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx
index 476a79dd1ef6..ff6a9d722dad 100644
--- a/sd/inc/misc.hxx
+++ b/sd/inc/misc.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx
index a0bef3a1004f..81ef0dea7ec9 100644
--- a/sd/inc/misc/scopelock.hxx
+++ b/sd/inc/misc/scopelock.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
void lock() { mnLock++; }
void unlock() { mnLock--; }
- sal_Int32 mnLock;
+ sal_Int32 mnLock;
};
class ScopeLockGuard
@@ -56,6 +56,6 @@ private:
} // namespace sd
-#endif // _SD_UNDOMANAGER_HXX
+#endif // _SD_UNDOMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/movedef.hxx b/sd/inc/movedef.hxx
index b9ee484363f7..2cdb6549cb14 100644
--- a/sd/inc/movedef.hxx
+++ b/sd/inc/movedef.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 MoveSpeed
// muss angepasst werden!
#define MOVE_SPEED_COUNT 3
-#endif // _SD_MOVEDEF_HXX
+#endif // _SD_MOVEDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/pch/precompiled_sd.cxx b/sd/inc/pch/precompiled_sd.cxx
index 4251e9bbd7c5..43c69b04a8f4 100644
--- a/sd/inc/pch/precompiled_sd.cxx
+++ b/sd/inc/pch/precompiled_sd.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 700f1ba965c3..0c897bb2d813 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -2,7 +2,7 @@
/************************************************************************cherex
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 359bd302622d..9f22e3ad085e 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class SdPageLink;
#endif
-#endif // _PGLINK_HXX
+#endif // _PGLINK_HXX
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index fc181482a881..0b1371601714 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ enum PresObjKind
PRESOBJ_SLIDENUMBER,
PRESOBJ_CALC,
PRESOBJ_MEDIA,
-
+
PRESOBJ_MAX
};
@@ -57,22 +57,22 @@ enum AutoLayout
{
// new layouts with enum/text/chart/org/clip merged to content
AUTOLAYOUT__START = 0,
- AUTOLAYOUT_TITLE = 0, // Title Slide
- AUTOLAYOUT_TITLE_CONTENT = 1, // Title, Content
- AUTOLAYOUT_TITLE_2CONTENT = 3, // Title and 2 Content
- AUTOLAYOUT_TITLE_ONLY = 19, // Title Only
- AUTOLAYOUT_NONE = 20, // Blank Slide
- AUTOLAYOUT_ONLY_TEXT = 32, // Centered Text
- AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, // Title, Content and 2 Content
- AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, // Title, 2 Content and Content
+ AUTOLAYOUT_TITLE = 0, // Title Slide
+ AUTOLAYOUT_TITLE_CONTENT = 1, // Title, Content
+ AUTOLAYOUT_TITLE_2CONTENT = 3, // Title and 2 Content
+ AUTOLAYOUT_TITLE_ONLY = 19, // Title Only
+ AUTOLAYOUT_NONE = 20, // Blank Slide
+ AUTOLAYOUT_ONLY_TEXT = 32, // Centered Text
+ AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, // Title, Content and 2 Content
+ AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, // Title, 2 Content and Content
AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,// Title, 2 Content over Content
- AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, // Title, Content over Content
- AUTOLAYOUT_TITLE_4CONTENT = 18, // Title, 4 Content
- AUTOLAYOUT_TITLE_6CONTENT = 34, // Title, 6 Content
+ AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, // Title, Content over Content
+ AUTOLAYOUT_TITLE_4CONTENT = 18, // Title, 4 Content
+ AUTOLAYOUT_TITLE_6CONTENT = 34, // Title, 6 Content
AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT = 27, // Vertical Title, Vertical Content over Vertical Content
- AUTOLAYOUT_VTITLE_VCONTENT = 28, // Vertical Title, Vertical Content over Vertical Content
- AUTOLAYOUT_TITLE_VCONTENT = 29, // Title, Vertical Content
- AUTOLAYOUT_TITLE_2VTEXT = 30, // Title, 2 Vertical Content
+ AUTOLAYOUT_VTITLE_VCONTENT = 28, // Vertical Title, Vertical Content over Vertical Content
+ AUTOLAYOUT_TITLE_VCONTENT = 29, // Title, Vertical Content
+ AUTOLAYOUT_TITLE_2VTEXT = 30, // Title, 2 Vertical Content
// deprecated
AUTOLAYOUT_ENUM = 1,
@@ -138,6 +138,6 @@ enum NavigatorDragType
};
#define NAVIGATOR_DRAGTYPE_COUNT 4
-#endif // _PRESENTATION_HXX
+#endif // _PRESENTATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx
index be02ec67e3c3..cd2f712978a7 100644
--- a/sd/inc/prlayout.hxx
+++ b/sd/inc/prlayout.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx
index 27645db0ca48..dcca7feffe36 100644
--- a/sd/inc/resltn.hxx
+++ b/sd/inc/resltn.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx
index bf2667e7de7a..519b9e78bcf0 100644
--- a/sd/inc/sd_primitivetypes2d.hxx
+++ b/sd/inc/sd_primitivetypes2d.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//////////////////////////////////////////////////////////////////////////////
-#define PRIMITIVE2D_ID_SDPAGEOBJECTFOCUSPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 0)
-#define PRIMITIVE2D_ID_SDPAGEOBJECTSELECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 1)
-#define PRIMITIVE2D_ID_SDPAGEOBJECTPAGEBITMAPPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 2)
-#define PRIMITIVE2D_ID_SDPAGEOBJECTBORDERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 3)
+#define PRIMITIVE2D_ID_SDPAGEOBJECTFOCUSPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 0)
+#define PRIMITIVE2D_ID_SDPAGEOBJECTSELECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 1)
+#define PRIMITIVE2D_ID_SDPAGEOBJECTPAGEBITMAPPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 2)
+#define PRIMITIVE2D_ID_SDPAGEOBJECTBORDERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 3)
#define PRIMITIVE2D_ID_SDPAGEOBJECTFADENAMENUMBERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 4)
#define PRIMITIVE2D_ID_SDMOUSEOVEREFFECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 5)
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 936f0d11dc30..8d75a56001c8 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +75,14 @@ class ViewShell;
class AbstractCopyDlg : public VclAbstractDialog //add for CopyDlg
{
public:
- virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
+ virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
};
class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg
{
public:
- virtual BOOL IsModified() const = 0;
- virtual BOOL IsCustomShow() const = 0;
+ virtual BOOL IsModified() const = 0;
+ virtual BOOL IsCustomShow() const = 0;
};
class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg
@@ -101,8 +101,8 @@ public:
class AbstractSdModifyFieldDlg : public VclAbstractDialog //add for SdModifyFieldDlg
{
public:
- virtual SvxFieldData* GetField() = 0;
- virtual SfxItemSet GetItemSet() = 0;
+ virtual SvxFieldData* GetField() = 0;
+ virtual SfxItemSet GetItemSet() = 0;
};
class AbstractSdSnapLineDlg : public VclAbstractDialog //add for SdSnapLineDlg
@@ -119,7 +119,7 @@ public:
class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLayerDlg
{
public:
- virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
+ virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
//from class ::Window
virtual void SetHelpId( ULONG nHelpId ) = 0;
};
@@ -127,43 +127,43 @@ public:
class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg
{
public:
- virtual BOOL IsInsertBefore() const = 0;
+ virtual BOOL IsInsertBefore() const = 0;
};
class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInsertPagesObjsDlg
{
public:
- virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
- virtual List* GetList( USHORT nType ) = 0;
- virtual BOOL IsLink() = 0;
- virtual BOOL IsRemoveUnnessesaryMasterPages() const = 0;
+ virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
+ virtual List* GetList( USHORT nType ) = 0;
+ virtual BOOL IsLink() = 0;
+ virtual BOOL IsRemoveUnnessesaryMasterPages() const = 0;
};
class AbstractMorphDlg : public VclAbstractDialog //add for MorphDlg
{
public:
- virtual void SaveSettings() const = 0;
- virtual USHORT GetFadeSteps() const = 0;
- virtual BOOL IsAttributeFade() const = 0;
- virtual BOOL IsOrientationFade() const = 0;
+ virtual void SaveSettings() const = 0;
+ virtual USHORT GetFadeSteps() const = 0;
+ virtual BOOL IsAttributeFade() const = 0;
+ virtual BOOL IsOrientationFade() const = 0;
};
class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg
{
public:
- virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
+ virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
};
class AbstractSdPresLayoutDlg : public VclAbstractDialog //add for SdPresLayoutDlg
{
public:
- virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
+ virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
};
class AbstractSdVectorizeDlg : public VclAbstractDialog //add for SdVectorizeDlg
{
public:
- virtual const GDIMetaFile& GetGDIMetaFile() const = 0;
+ virtual const GDIMetaFile& GetGDIMetaFile() const = 0;
};
class AbstractSdPublishingDlg : public VclAbstractDialog //add for SdPublishingDlg
@@ -181,46 +181,46 @@ public:
};
//---------------------------------------------------------
-class SdAbstractDialogFactory
+class SdAbstractDialogFactory
{
public:
- static SdAbstractDialogFactory* Create();
-
- virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0;
- virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0;
- virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ) = 0;
- virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) = 0;
- virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0;
- virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
- virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0;
- virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0;
+ static SdAbstractDialogFactory* Create();
+
+ virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0;
+ virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0;
+ virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ) = 0;
+ virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) = 0;
+ virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0;
+ virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
+ virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0;
+ virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0;
virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const String& rFileName ) = 0;
- virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0;
- virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0;
- virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0;
- virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0;
- virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
- virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
- virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
- virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
- virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0;
-
- virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent,
+ virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0;
+ virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0;
+ virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0;
+ virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
+ virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
+ virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
+ virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
+ virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0;
+
+ virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent,
SdDrawDocument* pDoc,
SdPage* ) = 0; // add for MasterLayoutDialog
- virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
- ::Window* pParent,
- SdDrawDocument* pDoc,
+ virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
+ ::Window* pParent,
+ SdDrawDocument* pDoc,
SdPage* pCurrentPage ) = 0; // add for HeaderFooterDialog
- virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0;
- virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0;
- virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0;
- virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0;
+ virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0;
+ virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0;
+ virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0;
+ virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0;
};
#endif
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 29ef8f128248..e3791ab03c56 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.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 @@
#endif
// Anfang Page-Attribute
-#define ATTR_PAGE_START SID_SD_START + 1234
-#define ATTR_PAGE_NAME ATTR_PAGE_START
-#define ATTR_PAGE_BACKGROUND ATTR_PAGE_START + 1
-#define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2
-#define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3
-#define ATTR_PAGE_END ATTR_PAGE_LAYOUT
+#define ATTR_PAGE_START SID_SD_START + 1234
+#define ATTR_PAGE_NAME ATTR_PAGE_START
+#define ATTR_PAGE_BACKGROUND ATTR_PAGE_START + 1
+#define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2
+#define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3
+#define ATTR_PAGE_END ATTR_PAGE_LAYOUT
// Layer-Attribute
-#define ATTR_LAYER_START ATTR_PAGE_END + 1
-#define ATTR_LAYER_NAME ATTR_LAYER_START
-#define ATTR_LAYER_VISIBLE ATTR_LAYER_START + 1
-#define ATTR_LAYER_PRINTABLE ATTR_LAYER_START + 2
-#define ATTR_LAYER_LOCKED ATTR_LAYER_START + 3
-#define ATTR_LAYER_THISPAGE ATTR_LAYER_START + 4
-#define ATTR_LAYER_TITLE ATTR_LAYER_START + 5
-#define ATTR_LAYER_DESC ATTR_LAYER_START + 6
-#define ATTR_LAYER_END ATTR_LAYER_DESC
+#define ATTR_LAYER_START ATTR_PAGE_END + 1
+#define ATTR_LAYER_NAME ATTR_LAYER_START
+#define ATTR_LAYER_VISIBLE ATTR_LAYER_START + 1
+#define ATTR_LAYER_PRINTABLE ATTR_LAYER_START + 2
+#define ATTR_LAYER_LOCKED ATTR_LAYER_START + 3
+#define ATTR_LAYER_THISPAGE ATTR_LAYER_START + 4
+#define ATTR_LAYER_TITLE ATTR_LAYER_START + 5
+#define ATTR_LAYER_DESC ATTR_LAYER_START + 6
+#define ATTR_LAYER_END ATTR_LAYER_DESC
// Anfang Dia-Attribute
-#define ATTR_DIA_START ATTR_LAYER_END + 1
-#define ATTR_DIA_EFFECT ATTR_DIA_START
-#define ATTR_DIA_SPEED ATTR_DIA_START + 1
-#define ATTR_DIA_AUTO ATTR_DIA_START + 2
-#define ATTR_DIA_TIME ATTR_DIA_START + 3
-#define ATTR_DIA_SOUND ATTR_DIA_START + 4
-#define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5
-#define ATTR_DIA_END ATTR_DIA_SOUNDFILE
+#define ATTR_DIA_START ATTR_LAYER_END + 1
+#define ATTR_DIA_EFFECT ATTR_DIA_START
+#define ATTR_DIA_SPEED ATTR_DIA_START + 1
+#define ATTR_DIA_AUTO ATTR_DIA_START + 2
+#define ATTR_DIA_TIME ATTR_DIA_START + 3
+#define ATTR_DIA_SOUND ATTR_DIA_START + 4
+#define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5
+#define ATTR_DIA_END ATTR_DIA_SOUNDFILE
// Praesentations-Attribute
#define ATTR_PRESENT_START ATTR_DIA_END + 1
@@ -76,170 +76,170 @@
#define ATTR_PRESENT_FULLSCREEN ATTR_PRESENT_START + 10
#define ATTR_PRESENT_START_ACTUAL_PAGE ATTR_PRESENT_START + 11
#define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12
-#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13
-#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14
-#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15
+#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13
+#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14
+#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15
#define ATTR_PRESENT_END ATTR_PRESENT_DISPLAY
// Transformations-Attribute
-#define ATTR_TRANSF_START ATTR_PRESENT_END + 1
-#define ATTR_TRANSF_POS_X ATTR_TRANSF_START
-#define ATTR_TRANSF_POS_Y ATTR_TRANSF_START + 1
-#define ATTR_TRANSF_WIDTH ATTR_TRANSF_START + 2
-#define ATTR_TRANSF_HEIGHT ATTR_TRANSF_START + 3
-#define ATTR_TRANSF_SIZE_POINT ATTR_TRANSF_START + 4
-#define ATTR_TRANSF_ROT_X ATTR_TRANSF_START + 5
-#define ATTR_TRANSF_ROT_Y ATTR_TRANSF_START + 6
-#define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7
-#define ATTR_TRANSF_END ATTR_TRANSF_ANGLE
+#define ATTR_TRANSF_START ATTR_PRESENT_END + 1
+#define ATTR_TRANSF_POS_X ATTR_TRANSF_START
+#define ATTR_TRANSF_POS_Y ATTR_TRANSF_START + 1
+#define ATTR_TRANSF_WIDTH ATTR_TRANSF_START + 2
+#define ATTR_TRANSF_HEIGHT ATTR_TRANSF_START + 3
+#define ATTR_TRANSF_SIZE_POINT ATTR_TRANSF_START + 4
+#define ATTR_TRANSF_ROT_X ATTR_TRANSF_START + 5
+#define ATTR_TRANSF_ROT_Y ATTR_TRANSF_START + 6
+#define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7
+#define ATTR_TRANSF_END ATTR_TRANSF_ANGLE
// Raster-Attribute
-#define ATTR_GRID_START ATTR_TRANSF_END + 1
-#define ATTR_GRID_USE ATTR_GRID_START
-#define ATTR_GRID_DRAW_X ATTR_GRID_START + 1
-#define ATTR_GRID_DRAW_Y ATTR_GRID_START + 2
-#define ATTR_GRID_DIVISION_X ATTR_GRID_START + 3
-#define ATTR_GRID_DIVISION_Y ATTR_GRID_START + 4
-#define ATTR_GRID_SNAP_X ATTR_GRID_START + 5
-#define ATTR_GRID_SNAP_Y ATTR_GRID_START + 6
-#define ATTR_GRID_ORIGIN_X ATTR_GRID_START + 7
-#define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8
-#define ATTR_GRID_END ATTR_GRID_ORIGIN_Y
+#define ATTR_GRID_START ATTR_TRANSF_END + 1
+#define ATTR_GRID_USE ATTR_GRID_START
+#define ATTR_GRID_DRAW_X ATTR_GRID_START + 1
+#define ATTR_GRID_DRAW_Y ATTR_GRID_START + 2
+#define ATTR_GRID_DIVISION_X ATTR_GRID_START + 3
+#define ATTR_GRID_DIVISION_Y ATTR_GRID_START + 4
+#define ATTR_GRID_SNAP_X ATTR_GRID_START + 5
+#define ATTR_GRID_SNAP_Y ATTR_GRID_START + 6
+#define ATTR_GRID_ORIGIN_X ATTR_GRID_START + 7
+#define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8
+#define ATTR_GRID_END ATTR_GRID_ORIGIN_Y
// Bildschirm-Attribute
-#define ATTR_DISPLAY_START ATTR_GRID_END + 1
-#define ATTR_DISPLAY_FUNCTIONBAR ATTR_DISPLAY_START
-#define ATTR_DISPLAY_OBJECTBAR ATTR_DISPLAY_START + 1
-#define ATTR_DISPLAY_STATUSBAR ATTR_DISPLAY_START + 2
-#define ATTR_DISPLAY_TOOLBAR ATTR_DISPLAY_START + 3
-#define ATTR_DISPLAY_GRID ATTR_DISPLAY_START + 4
-#define ATTR_DISPLAY_RULER ATTR_DISPLAY_START + 5
-#define ATTR_DISPLAY_HELPLINES ATTR_DISPLAY_START + 6
-#define ATTR_DISPLAY_STRANGE_GRAPHIC ATTR_DISPLAY_START + 7
-#define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8
-#define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES
-
-#define ATTR_TBX_DUMMY ATTR_DISPLAY_END + 1
+#define ATTR_DISPLAY_START ATTR_GRID_END + 1
+#define ATTR_DISPLAY_FUNCTIONBAR ATTR_DISPLAY_START
+#define ATTR_DISPLAY_OBJECTBAR ATTR_DISPLAY_START + 1
+#define ATTR_DISPLAY_STATUSBAR ATTR_DISPLAY_START + 2
+#define ATTR_DISPLAY_TOOLBAR ATTR_DISPLAY_START + 3
+#define ATTR_DISPLAY_GRID ATTR_DISPLAY_START + 4
+#define ATTR_DISPLAY_RULER ATTR_DISPLAY_START + 5
+#define ATTR_DISPLAY_HELPLINES ATTR_DISPLAY_START + 6
+#define ATTR_DISPLAY_STRANGE_GRAPHIC ATTR_DISPLAY_START + 7
+#define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8
+#define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES
+
+#define ATTR_TBX_DUMMY ATTR_DISPLAY_END + 1
// Animations-Attribute
-#define ATTR_ANIMATION_START ATTR_TBX_DUMMY + 1
-#define ATTR_ANIMATION_ACTIVE ATTR_ANIMATION_START
-#define ATTR_ANIMATION_EFFECT ATTR_ANIMATION_START + 1
-#define ATTR_ANIMATION_SPEED ATTR_ANIMATION_START + 2
-#define ATTR_ANIMATION_INVISIBLE ATTR_ANIMATION_START + 3
-#define ATTR_ANIMATION_FADEOUT ATTR_ANIMATION_START + 4
-#define ATTR_ANIMATION_COLOR ATTR_ANIMATION_START + 5
-#define ATTR_ANIMATION_SOUNDON ATTR_ANIMATION_START + 6
-#define ATTR_ANIMATION_SOUNDFILE ATTR_ANIMATION_START + 7
-#define ATTR_ANIMATION_PLAYFULL ATTR_ANIMATION_START + 8
-#define ATTR_ANIMATION_TRANSPCOLOR ATTR_ANIMATION_START + 9
+#define ATTR_ANIMATION_START ATTR_TBX_DUMMY + 1
+#define ATTR_ANIMATION_ACTIVE ATTR_ANIMATION_START
+#define ATTR_ANIMATION_EFFECT ATTR_ANIMATION_START + 1
+#define ATTR_ANIMATION_SPEED ATTR_ANIMATION_START + 2
+#define ATTR_ANIMATION_INVISIBLE ATTR_ANIMATION_START + 3
+#define ATTR_ANIMATION_FADEOUT ATTR_ANIMATION_START + 4
+#define ATTR_ANIMATION_COLOR ATTR_ANIMATION_START + 5
+#define ATTR_ANIMATION_SOUNDON ATTR_ANIMATION_START + 6
+#define ATTR_ANIMATION_SOUNDFILE ATTR_ANIMATION_START + 7
+#define ATTR_ANIMATION_PLAYFULL ATTR_ANIMATION_START + 8
+#define ATTR_ANIMATION_TRANSPCOLOR ATTR_ANIMATION_START + 9
#define ATTR_ANIMATION_TEXTEFFECT ATTR_ANIMATION_START + 10
#define ATTR_ANIMATION_END ATTR_ANIMATION_TEXTEFFECT
-#define ATTR_ACTION_START ATTR_ANIMATION_END + 1
-#define ATTR_ACTION ATTR_ACTION_START
-#define ATTR_ACTION_EFFECT ATTR_ACTION_START + 1
-#define ATTR_ACTION_EFFECTSPEED ATTR_ACTION_START + 2
-#define ATTR_ACTION_FILENAME ATTR_ACTION_START + 3
-#define ATTR_ACTION_SOUNDON ATTR_ACTION_START + 4
-#define ATTR_ACTION_PLAYFULL ATTR_ACTION_START + 5
-#define ATTR_ACTION_END ATTR_ACTION_PLAYFULL
-
-#define ATTR_PRINTOPTIONS_START ATTR_ACTION_END + 1
-#define ATTR_PRINTOPTIONS_PRINT ATTR_PRINTOPTIONS_START
-#define ATTR_PRINTOPTIONS_PAGESIZE ATTR_PRINTOPTIONS_START + 1
-#define ATTR_PRINTOPTIONS_FADEOUT ATTR_PRINTOPTIONS_START + 2
-#define ATTR_PRINTOPTIONS_DATE ATTR_PRINTOPTIONS_START + 3
-#define ATTR_PRINTOPTIONS_TIME ATTR_PRINTOPTIONS_START + 4
-#define ATTR_PRINTOPTIONS_PAGENAME ATTR_PRINTOPTIONS_START + 5
-#define ATTR_PRINTOPTIONS_END ATTR_PRINTOPTIONS_PAGENAME
-
-#define ATTR_COPY_START ATTR_PRINTOPTIONS_END + 1
-#define ATTR_COPY_NUMBER ATTR_COPY_START
-#define ATTR_COPY_MOVE_X ATTR_COPY_START + 1
-#define ATTR_COPY_MOVE_Y ATTR_COPY_START + 2
-#define ATTR_COPY_ANGLE ATTR_COPY_START + 3
-#define ATTR_COPY_WIDTH ATTR_COPY_START + 4
-#define ATTR_COPY_HEIGHT ATTR_COPY_START + 5
-#define ATTR_COPY_START_COLOR ATTR_COPY_START + 6
-#define ATTR_COPY_END_COLOR ATTR_COPY_START + 7
-#define ATTR_COPY_END ATTR_COPY_END_COLOR
-
-#define ATTR_SNAPLINE_START ATTR_COPY_END + 1
-#define ATTR_SNAPLINE_KIND ATTR_SNAPLINE_START
-#define ATTR_SNAPLINE_X ATTR_SNAPLINE_START + 1
-#define ATTR_SNAPLINE_Y ATTR_SNAPLINE_START + 2
-#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y
-
-#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1
-#define ATTR_OPTIONS ATTR_OPTIONS_START
-#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
-#define ATTR_OPTIONS_CONTENTS ATTR_OPTIONS_START + 2
-#define ATTR_OPTIONS_MISC ATTR_OPTIONS_START + 3
-#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 4
-#define ATTR_OPTIONS_PRINT ATTR_OPTIONS_START + 5
-#define ATTR_OPTIONS_END ATTR_OPTIONS_PRINT
-
-#define ATTR_OPTIONS_SCALE_START ATTR_OPTIONS_END + 1
-#define ATTR_OPTIONS_SCALE_X ATTR_OPTIONS_SCALE_START
-#define ATTR_OPTIONS_SCALE_Y ATTR_OPTIONS_SCALE_START + 1
-#define ATTR_OPTIONS_SCALE_WIDTH ATTR_OPTIONS_SCALE_START + 2
-#define ATTR_OPTIONS_SCALE_HEIGHT ATTR_OPTIONS_SCALE_START + 3
-#define ATTR_OPTIONS_SCALE_END ATTR_OPTIONS_SCALE_HEIGHT
-
-#define ATTR_PUBLISH_START ATTR_OPTIONS_SCALE_END + 1
-#define ATTR_PUBLISH_LOCATION ATTR_PUBLISH_START
-#define ATTR_PUBLISH_WITHCONTENTSPAGE ATTR_PUBLISH_START + 1
-#define ATTR_PUBLISH_RESOLUTION ATTR_PUBLISH_START + 2
-#define ATTR_PUBLISH_MODE ATTR_PUBLISH_START + 3
-#define ATTR_PUBLISH_FORMAT ATTR_PUBLISH_START + 4
-#define ATTR_PUBLISH_COMPRESSION ATTR_PUBLISH_START + 5
-#define ATTR_PUBLISH_WITHNOTES ATTR_PUBLISH_START + 6
-#define ATTR_PUBLISH_AUTHOR ATTR_PUBLISH_START + 9
-#define ATTR_PUBLISH_EMAIL ATTR_PUBLISH_START + 10
-#define ATTR_PUBLISH_WWW ATTR_PUBLISH_START + 11
-#define ATTR_PUBLISH_INFO ATTR_PUBLISH_START + 12
-#define ATTR_PUBLISH_WITHDOWNLOAD ATTR_PUBLISH_START + 13
-#define ATTR_PUBLISH_WITHSTAROFFICE ATTR_PUBLISH_START + 14
-#define ATTR_PUBLISH_BUTTONS ATTR_PUBLISH_START + 15
-#define ATTR_PUBLISH_USERATTR ATTR_PUBLISH_START + 16
-#define ATTR_PUBLISH_BACKCOLOR ATTR_PUBLISH_START + 17
-#define ATTR_PUBLISH_TEXTCOLOR ATTR_PUBLISH_START + 18
-#define ATTR_PUBLISH_LINKCOLOR ATTR_PUBLISH_START + 19
-#define ATTR_PUBLISH_VLINKCOLOR ATTR_PUBLISH_START + 20
-#define ATTR_PUBLISH_ALINKCOLOR ATTR_PUBLISH_START + 21
-#define ATTR_PUBLISH_USEATTRIBS ATTR_PUBLISH_START + 22
-#define ATTR_PUBLISH_USECOLOR ATTR_PUBLISH_START + 23
-#define ATTR_PUBLISH_WEBSHOW ATTR_PUBLISH_START + 24
-#define ATTR_PUBLISH_SCRIPT ATTR_PUBLISH_START + 25
-#define ATTR_PUBLISH_URLPATH ATTR_PUBLISH_START + 26
-#define ATTR_PUBLISH_CGIPATH ATTR_PUBLISH_START + 27
-#define ATTR_PUBLISH_INDEX ATTR_PUBLISH_START + 28
-#define ATTR_PUBLISH_SLIDECHG ATTR_PUBLISH_START + 29
-#define ATTR_PUBLISH_SLIDEDURATION ATTR_PUBLISH_START + 30
-#define ATTR_PUBLISH_ENDLESS ATTR_PUBLISH_START + 31
-#define ATTR_PUBLISH_SLIDESOUND ATTR_PUBLISH_START + 32
-#define ATTR_PUBLISH_END ATTR_PUBLISH_SLIDESOUND
-
-#define ATTR_PRESLAYOUT_START ATTR_PUBLISH_END + 1
-#define ATTR_PRESLAYOUT_NAME ATTR_PRESLAYOUT_START
-#define ATTR_PRESLAYOUT_LOAD ATTR_PRESLAYOUT_START + 1
-#define ATTR_PRESLAYOUT_MASTER_PAGE ATTR_PRESLAYOUT_START + 2
-#define ATTR_PRESLAYOUT_CHECK_MASTERS ATTR_PRESLAYOUT_START + 3
-#define ATTR_PRESLAYOUT_END ATTR_PRESLAYOUT_CHECK_MASTERS
+#define ATTR_ACTION_START ATTR_ANIMATION_END + 1
+#define ATTR_ACTION ATTR_ACTION_START
+#define ATTR_ACTION_EFFECT ATTR_ACTION_START + 1
+#define ATTR_ACTION_EFFECTSPEED ATTR_ACTION_START + 2
+#define ATTR_ACTION_FILENAME ATTR_ACTION_START + 3
+#define ATTR_ACTION_SOUNDON ATTR_ACTION_START + 4
+#define ATTR_ACTION_PLAYFULL ATTR_ACTION_START + 5
+#define ATTR_ACTION_END ATTR_ACTION_PLAYFULL
+
+#define ATTR_PRINTOPTIONS_START ATTR_ACTION_END + 1
+#define ATTR_PRINTOPTIONS_PRINT ATTR_PRINTOPTIONS_START
+#define ATTR_PRINTOPTIONS_PAGESIZE ATTR_PRINTOPTIONS_START + 1
+#define ATTR_PRINTOPTIONS_FADEOUT ATTR_PRINTOPTIONS_START + 2
+#define ATTR_PRINTOPTIONS_DATE ATTR_PRINTOPTIONS_START + 3
+#define ATTR_PRINTOPTIONS_TIME ATTR_PRINTOPTIONS_START + 4
+#define ATTR_PRINTOPTIONS_PAGENAME ATTR_PRINTOPTIONS_START + 5
+#define ATTR_PRINTOPTIONS_END ATTR_PRINTOPTIONS_PAGENAME
+
+#define ATTR_COPY_START ATTR_PRINTOPTIONS_END + 1
+#define ATTR_COPY_NUMBER ATTR_COPY_START
+#define ATTR_COPY_MOVE_X ATTR_COPY_START + 1
+#define ATTR_COPY_MOVE_Y ATTR_COPY_START + 2
+#define ATTR_COPY_ANGLE ATTR_COPY_START + 3
+#define ATTR_COPY_WIDTH ATTR_COPY_START + 4
+#define ATTR_COPY_HEIGHT ATTR_COPY_START + 5
+#define ATTR_COPY_START_COLOR ATTR_COPY_START + 6
+#define ATTR_COPY_END_COLOR ATTR_COPY_START + 7
+#define ATTR_COPY_END ATTR_COPY_END_COLOR
+
+#define ATTR_SNAPLINE_START ATTR_COPY_END + 1
+#define ATTR_SNAPLINE_KIND ATTR_SNAPLINE_START
+#define ATTR_SNAPLINE_X ATTR_SNAPLINE_START + 1
+#define ATTR_SNAPLINE_Y ATTR_SNAPLINE_START + 2
+#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y
+
+#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1
+#define ATTR_OPTIONS ATTR_OPTIONS_START
+#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1
+#define ATTR_OPTIONS_CONTENTS ATTR_OPTIONS_START + 2
+#define ATTR_OPTIONS_MISC ATTR_OPTIONS_START + 3
+#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 4
+#define ATTR_OPTIONS_PRINT ATTR_OPTIONS_START + 5
+#define ATTR_OPTIONS_END ATTR_OPTIONS_PRINT
+
+#define ATTR_OPTIONS_SCALE_START ATTR_OPTIONS_END + 1
+#define ATTR_OPTIONS_SCALE_X ATTR_OPTIONS_SCALE_START
+#define ATTR_OPTIONS_SCALE_Y ATTR_OPTIONS_SCALE_START + 1
+#define ATTR_OPTIONS_SCALE_WIDTH ATTR_OPTIONS_SCALE_START + 2
+#define ATTR_OPTIONS_SCALE_HEIGHT ATTR_OPTIONS_SCALE_START + 3
+#define ATTR_OPTIONS_SCALE_END ATTR_OPTIONS_SCALE_HEIGHT
+
+#define ATTR_PUBLISH_START ATTR_OPTIONS_SCALE_END + 1
+#define ATTR_PUBLISH_LOCATION ATTR_PUBLISH_START
+#define ATTR_PUBLISH_WITHCONTENTSPAGE ATTR_PUBLISH_START + 1
+#define ATTR_PUBLISH_RESOLUTION ATTR_PUBLISH_START + 2
+#define ATTR_PUBLISH_MODE ATTR_PUBLISH_START + 3
+#define ATTR_PUBLISH_FORMAT ATTR_PUBLISH_START + 4
+#define ATTR_PUBLISH_COMPRESSION ATTR_PUBLISH_START + 5
+#define ATTR_PUBLISH_WITHNOTES ATTR_PUBLISH_START + 6
+#define ATTR_PUBLISH_AUTHOR ATTR_PUBLISH_START + 9
+#define ATTR_PUBLISH_EMAIL ATTR_PUBLISH_START + 10
+#define ATTR_PUBLISH_WWW ATTR_PUBLISH_START + 11
+#define ATTR_PUBLISH_INFO ATTR_PUBLISH_START + 12
+#define ATTR_PUBLISH_WITHDOWNLOAD ATTR_PUBLISH_START + 13
+#define ATTR_PUBLISH_WITHSTAROFFICE ATTR_PUBLISH_START + 14
+#define ATTR_PUBLISH_BUTTONS ATTR_PUBLISH_START + 15
+#define ATTR_PUBLISH_USERATTR ATTR_PUBLISH_START + 16
+#define ATTR_PUBLISH_BACKCOLOR ATTR_PUBLISH_START + 17
+#define ATTR_PUBLISH_TEXTCOLOR ATTR_PUBLISH_START + 18
+#define ATTR_PUBLISH_LINKCOLOR ATTR_PUBLISH_START + 19
+#define ATTR_PUBLISH_VLINKCOLOR ATTR_PUBLISH_START + 20
+#define ATTR_PUBLISH_ALINKCOLOR ATTR_PUBLISH_START + 21
+#define ATTR_PUBLISH_USEATTRIBS ATTR_PUBLISH_START + 22
+#define ATTR_PUBLISH_USECOLOR ATTR_PUBLISH_START + 23
+#define ATTR_PUBLISH_WEBSHOW ATTR_PUBLISH_START + 24
+#define ATTR_PUBLISH_SCRIPT ATTR_PUBLISH_START + 25
+#define ATTR_PUBLISH_URLPATH ATTR_PUBLISH_START + 26
+#define ATTR_PUBLISH_CGIPATH ATTR_PUBLISH_START + 27
+#define ATTR_PUBLISH_INDEX ATTR_PUBLISH_START + 28
+#define ATTR_PUBLISH_SLIDECHG ATTR_PUBLISH_START + 29
+#define ATTR_PUBLISH_SLIDEDURATION ATTR_PUBLISH_START + 30
+#define ATTR_PUBLISH_ENDLESS ATTR_PUBLISH_START + 31
+#define ATTR_PUBLISH_SLIDESOUND ATTR_PUBLISH_START + 32
+#define ATTR_PUBLISH_END ATTR_PUBLISH_SLIDESOUND
+
+#define ATTR_PRESLAYOUT_START ATTR_PUBLISH_END + 1
+#define ATTR_PRESLAYOUT_NAME ATTR_PRESLAYOUT_START
+#define ATTR_PRESLAYOUT_LOAD ATTR_PRESLAYOUT_START + 1
+#define ATTR_PRESLAYOUT_MASTER_PAGE ATTR_PRESLAYOUT_START + 2
+#define ATTR_PRESLAYOUT_CHECK_MASTERS ATTR_PRESLAYOUT_START + 3
+#define ATTR_PRESLAYOUT_END ATTR_PRESLAYOUT_CHECK_MASTERS
// Pack & Go Attribute
#define ATTR_PACKNGO_START ATTR_PRESLAYOUT_END + 1
-#define ATTR_PACKNGO_UNLINK ATTR_PACKNGO_START
-#define ATTR_PACKNGO_COMPRESS ATTR_PACKNGO_START + 1
-#define ATTR_PACKNGO_SPANNING ATTR_PACKNGO_START + 2
-#define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3
-#define ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE
+#define ATTR_PACKNGO_UNLINK ATTR_PACKNGO_START
+#define ATTR_PACKNGO_COMPRESS ATTR_PACKNGO_START + 1
+#define ATTR_PACKNGO_SPANNING ATTR_PACKNGO_START + 2
+#define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3
+#define ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE
// paragraph numbering attributes
-#define ATTR_PARANUMBERING_START ATTR_PACKNGO_MEDIUMSIZE + 1
-#define ATTR_NUMBER_NEWSTART ATTR_PARANUMBERING_START
-#define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1
-#define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT
+#define ATTR_PARANUMBERING_START ATTR_PACKNGO_MEDIUMSIZE + 1
+#define ATTR_NUMBER_NEWSTART ATTR_PARANUMBERING_START
+#define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1
+#define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT
#endif // _SDATTR_HRC
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 7f055caf633a..4f1ad34d5a20 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
-// Layer-Attribute
+// Layer-Attribute
//==================================================================
class SdAttrLayerName : public SfxStringItem
@@ -119,10 +119,10 @@ public:
DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE );
DiaEffectItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- USHORT GetValueCount() const { return FADE_EFFECT_COUNT; }
- ::com::sun::star::presentation::FadeEffect GetValue() const
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ USHORT GetValueCount() const { return FADE_EFFECT_COUNT; }
+ ::com::sun::star::presentation::FadeEffect GetValue() const
{ return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); }
};
@@ -135,10 +135,10 @@ public:
DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM );
DiaSpeedItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- USHORT GetValueCount() const { return FADE_SPEED_COUNT; }
- FadeSpeed GetValue() const
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ USHORT GetValueCount() const { return FADE_SPEED_COUNT; }
+ FadeSpeed GetValue() const
{ return (FadeSpeed) SfxEnumItem::GetValue(); }
};
@@ -151,10 +151,10 @@ public:
DiaAutoItem( PresChange = PRESCHANGE_MANUAL );
DiaAutoItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- USHORT GetValueCount() const { return PRESCHANGE_COUNT; }
- PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); }
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ USHORT GetValueCount() const { return PRESCHANGE_COUNT; }
+ PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); }
};
//------------------------------------------------------------------
@@ -166,7 +166,7 @@ public:
DiaTimeItem( UINT32 nValue = 0L );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const;
};
#endif // _SDATTR_HXX
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index b960249751e2..c7591710ee69 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index b59114de95c3..5511dc209b2e 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +62,8 @@ public:
~SdDLL();
// static-init/exit-code must be linked to the application
- static void LibInit(); // called from SfxApplication-subclass::Init()
- static void LibExit(); // called from SfxApplication-subclass::Exit()
+ static void LibInit(); // called from SfxApplication-subclass::Init()
+ static void LibExit(); // called from SfxApplication-subclass::Exit()
// DLL-init/exit-code must be linked to the DLL only
static void Init(); // called directly after loading the DLL
diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index c07c4792e6f1..c9e7040405e1 100644
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.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/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index 38563d720fb4..30ba42fdb2f5 100644
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index 1eb815eef6e1..3957f53f24a2 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +31,13 @@
#include <tools/errcode.hxx>
-#define ERROR_SD_BASE (ERRCODE_AREA_SD)
-#define ERROR_SD_READ_BASE (ERROR_SD_BASE | ERRCODE_CLASS_READ)
-#define ERROR_SD_WRITE_BASE (ERROR_SD_BASE | ERRCODE_CLASS_WRITE)
+#define ERROR_SD_BASE (ERRCODE_AREA_SD)
+#define ERROR_SD_READ_BASE (ERROR_SD_BASE | ERRCODE_CLASS_READ)
+#define ERROR_SD_WRITE_BASE (ERROR_SD_BASE | ERRCODE_CLASS_WRITE)
-#define WARN_SD_BASE (ERRCODE_AREA_SD | ERRCODE_WARNING_MASK)
-#define WARN_SD_READ_BASE (WARN_SD_BASE | ERRCODE_CLASS_READ )
-#define WARN_SD_WRITE_BASE (WARN_SD_BASE | ERRCODE_CLASS_WRITE )
+#define WARN_SD_BASE (ERRCODE_AREA_SD | ERRCODE_WARNING_MASK)
+#define WARN_SD_READ_BASE (WARN_SD_BASE | ERRCODE_CLASS_READ )
+#define WARN_SD_WRITE_BASE (WARN_SD_BASE | ERRCODE_CLASS_WRITE )
// Import errors
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index 7e649ba99085..9c06ba80d6c2 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +53,27 @@ public:
SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress );
virtual ~SdFilter();
- sal_Bool IsProgress() const { return mbShowProgress; }
- sal_Bool IsDraw() const { return mbIsDraw; }
- sal_Bool IsImpress() const { return !mbIsDraw; }
+ sal_Bool IsProgress() const { return mbShowProgress; }
+ sal_Bool IsDraw() const { return mbIsDraw; }
+ sal_Bool IsImpress() const { return !mbIsDraw; }
virtual sal_Bool Export() = 0;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator;
- SfxMedium& mrMedium;
- ::sd::DrawDocShell& mrDocShell;
- SdDrawDocument& mrDocument;
- sal_Bool mbIsDraw : 1;
- sal_Bool mbShowProgress : 1;
+ SfxMedium& mrMedium;
+ ::sd::DrawDocShell& mrDocShell;
+ SdDrawDocument& mrDocument;
+ sal_Bool mbIsDraw : 1;
+ sal_Bool mbShowProgress : 1;
- ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const;
- void CreateStatusIndicator();
+ ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const;
+ void CreateStatusIndicator();
private:
- ::rtl::OUString ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const;
+ ::rtl::OUString ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const;
};
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 83d4eae50800..70cbdc374f2e 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
sal_Bool Import();
sal_Bool Export();
- static void SaveGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape );
- static void HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError = ERRCODE_NONE );
+ static void SaveGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape );
+ static void HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError = ERRCODE_NONE );
};
#endif // _SD_SDGRFFILTER_HXX
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 28f8df649a10..64ae3a9c0226 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +35,17 @@
// - SdHTMLFilter -
// ----------------
-class SdHTMLFilter
+class SdHTMLFilter
: public SdFilter
{
public:
SdHTMLFilter (
- SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell,
+ SfxMedium& rMedium,
+ ::sd::DrawDocShell& rDocShell,
sal_Bool bShowProgress);
virtual ~SdHTMLFilter (void);
- virtual sal_Bool Export();
+ virtual sal_Bool Export();
private:
DECL_LINK( IOProgressHdl, USHORT* );
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 36fd3eb8e39b..7e71ea57c6aa 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +34,14 @@
//////////////////////////////////////////////////////////////////////////////
class SvStream;
-class old_SdrDownCompat
+class old_SdrDownCompat
{
protected:
- SvStream& rStream;
- UINT32 nSubRecSiz;
- UINT32 nSubRecPos;
- UINT16 nMode;
- BOOL bOpen;
+ SvStream& rStream;
+ UINT32 nSubRecSiz;
+ UINT32 nSubRecPos;
+ UINT16 nMode;
+ BOOL bOpen;
protected:
void Read();
@@ -65,14 +65,14 @@ private:
public:
// nNewMode: STREAM_READ oder STREAM_WRITE
- // nVer: nur beim Schreiben angeben
+ // nVer: nur beim Schreiben angeben
SdIOCompat(SvStream& rNewStream, USHORT nNewMode,
UINT16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
~SdIOCompat();
- UINT16 GetVersion() const { return nVersion; }
+ UINT16 GetVersion() const { return nVersion; }
};
-#endif // _SD_SDIOCMPT_HXX
+#endif // _SD_SDIOCMPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 29aad772d6c3..4fe78517555b 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,25 +106,25 @@ public:
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
SdModule(SfxObjectFactory* pDrawObjFact, SfxObjectFactory* pGraphicObjFact);
- virtual ~SdModule();
+ virtual ~SdModule();
- SdTransferable* pTransferClip;
- SdTransferable* pTransferDrag;
- SdTransferable* pTransferSelection;
+ SdTransferable* pTransferClip;
+ SdTransferable* pTransferDrag;
+ SdTransferable* pTransferSelection;
- void Execute(SfxRequest& rReq);
- void GetState(SfxItemSet&);
+ void Execute(SfxRequest& rReq);
+ void GetState(SfxItemSet&);
- virtual void FillStatusBar(StatusBar& rBar);
+ virtual void FillStatusBar(StatusBar& rBar);
- SdOptions* GetSdOptions(DocumentType eDocType);
- SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode );
+ SdOptions* GetSdOptions(DocumentType eDocType);
+ SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode );
- BOOL GetWaterCan() const { return bWaterCan; }
- void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; }
+ BOOL GetWaterCan() const { return bWaterCan; }
+ void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; }
- SvxSearchItem* GetSearchItem() { return (pSearchItem); }
- void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; }
+ SvxSearchItem* GetSearchItem() { return (pSearchItem); }
+ void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; }
/** Return the virtual device that can be used for printer independent
layout.
@@ -140,30 +140,30 @@ public:
*/
OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell);
- SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter();
+ SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter();
//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 );
protected:
- SdOptions* pImpressOptions;
- SdOptions* pDrawOptions;
- SvxSearchItem* pSearchItem;
+ SdOptions* pImpressOptions;
+ SdOptions* pDrawOptions;
+ SvxSearchItem* pSearchItem;
SvNumberFormatter* pNumberFormatter;
- SvStorageRef xOptionStorage;
- BOOL bAutoSave;
- BOOL bWaterCan;
- SfxErrorHandler* mpErrorHdl;
+ SvStorageRef xOptionStorage;
+ BOOL bAutoSave;
+ BOOL bWaterCan;
+ SfxErrorHandler* mpErrorHdl;
/** This device is used for printer independent layout. It is virtual
in the sense that it does not represent a printer. The pointer may
be NULL when the virtual device could not be created.
*/
OutputDevice* mpVirtualRefDevice;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
private:
SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index 7c31d3a542bb..962badaa099e 100644
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index bd330616969c..937d966e41f3 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace sd {
bool mbDateTimeVisible;
bool mbDateTimeIsFixed;
String maDateTimeText;
- int meDateTimeFormat;
+ int meDateTimeFormat;
HeaderFooterSettings();
@@ -122,31 +122,31 @@ friend class sd::UndoGeoObject;
friend class sd::UndoAttrObject;
protected:
- PageKind mePageKind; // Seitentyp
- AutoLayout meAutoLayout; // AutoLayout
- sd::ShapeList maPresentationShapeList; // Praesentationsobjekte
+ PageKind mePageKind; // Seitentyp
+ AutoLayout meAutoLayout; // AutoLayout
+ sd::ShapeList maPresentationShapeList; // Praesentationsobjekte
sd::ScopeLock maLockAutoLayoutArrangement;
- BOOL mbSelected; // Selektionskennung
- PresChange mePresChange; // manuell/automatisch/halbautomatisch
- UINT32 mnTime; // Anzeigedauer in Sekunden
- BOOL mbSoundOn; // mit/ohne Sound (TRUE/FALSE)
- BOOL mbExcluded; // wird in der Show nicht/doch
+ BOOL mbSelected; // Selektionskennung
+ PresChange mePresChange; // manuell/automatisch/halbautomatisch
+ UINT32 mnTime; // Anzeigedauer in Sekunden
+ BOOL mbSoundOn; // mit/ohne Sound (TRUE/FALSE)
+ BOOL mbExcluded; // wird in der Show nicht/doch
// angezeigt (TRUE/FALSE)
- String maLayoutName; // Name des Layouts
+ String maLayoutName; // Name des Layouts
String maSoundFile; // Pfad zum Soundfile (MSDOS-Notation)
- bool mbLoopSound;
- bool mbStopSound;
+ bool mbLoopSound;
+ bool mbStopSound;
String maCreatedPageName; // von GetPageName erzeugter Seitenname
String maFileName; // Filename
- String maBookmarkName; // Bookmarkname
- BOOL mbScaleObjects; // Objekte sollen skaliert werden
- BOOL mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen
+ String maBookmarkName; // Bookmarkname
+ BOOL mbScaleObjects; // Objekte sollen skaliert werden
+ BOOL mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen
rtl_TextEncoding meCharSet; // Text-Encoding
USHORT mnPaperBin; // PaperBin
Orientation meOrientation; // Print-Orientation
- SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten)
+ SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten)
- sd::AnnotationVector maAnnotations;
+ sd::AnnotationVector maAnnotations;
/** holds the smil animation sequences for this page */
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
@@ -156,11 +156,11 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
- SfxItemSet* mpItems;
+ SfxItemSet* mpItems;
SfxItemSet* getOrCreateItems();
- sd::HeaderFooterSettings maHeaderFooterSettings;
+ sd::HeaderFooterSettings maHeaderFooterSettings;
// new transition settings
sal_Int16 mnTransitionType;
@@ -178,40 +178,40 @@ public:
virtual SdrPage* Clone() const;
virtual SdrPage* Clone(SdrModel* pNewModel) const;
- virtual void SetSize(const Size& aSize);
- virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr);
- virtual void SetLftBorder(INT32 nBorder);
- virtual void SetRgtBorder(INT32 nBorder);
- virtual void SetUppBorder(INT32 nBorder);
- virtual void SetLwrBorder(INT32 nBorder);
- virtual void SetModel(SdrModel* pNewModel);
+ virtual void SetSize(const Size& aSize);
+ virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr);
+ virtual void SetLftBorder(INT32 nBorder);
+ virtual void SetRgtBorder(INT32 nBorder);
+ virtual void SetUppBorder(INT32 nBorder);
+ virtual void SetLwrBorder(INT32 nBorder);
+ virtual void SetModel(SdrModel* pNewModel);
virtual bool IsReadOnly() const;
- sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; }
+ sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; }
void EnsureMasterPageDefaultBackground();
SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE);
- SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
- SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false );
+ SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
+ SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false );
PresObjKind GetPresObjKind(SdrObject* pObj) const;
String GetPresObjText(PresObjKind eObjKind) const;
SfxStyleSheet* GetStyleSheetForMasterPageBackground() const;
- SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const;
- bool RestoreDefaultText( SdrObject* pObj );
+ SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const;
+ bool RestoreDefaultText( SdrObject* pObj );
/** returns true if the given SdrObject is inside the presentation object list */
- bool IsPresObj(const SdrObject* pObj);
+ bool IsPresObj(const SdrObject* pObj);
/** removes the given SdrObject from the presentation object list */
- void RemovePresObj(const SdrObject* pObj);
+ void RemovePresObj(const SdrObject* pObj);
/** inserts the given SdrObject into the presentation object list */
- void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
+ void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
- void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE);
- AutoLayout GetAutoLayout() const { return meAutoLayout; }
+ void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE);
+ AutoLayout GetAutoLayout() const { return meAutoLayout; }
void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE);
- SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit );
+ SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit );
virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND,
const SdrInsertReason* pReason=NULL);
@@ -225,86 +225,86 @@ public:
virtual void SetLinkData(const String& rLinkName, const String& rLinkData);
- void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr );
+ void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr );
- void SetPageKind(PageKind ePgType) { mePageKind = ePgType; }
- PageKind GetPageKind() const { return mePageKind; }
+ void SetPageKind(PageKind ePgType) { mePageKind = ePgType; }
+ PageKind GetPageKind() const { return mePageKind; }
- void SetSelected(BOOL bSel) { mbSelected = bSel; }
- BOOL IsSelected() const { return mbSelected; }
+ void SetSelected(BOOL bSel) { mbSelected = bSel; }
+ BOOL IsSelected() const { return mbSelected; }
- void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
- ::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
+ void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
+ ::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
- void SetPresChange(PresChange eChange) { mePresChange = eChange; }
- PresChange GetPresChange() const { return mePresChange; }
+ void SetPresChange(PresChange eChange) { mePresChange = eChange; }
+ PresChange GetPresChange() const { return mePresChange; }
- void SetTime(UINT32 nNewTime) { mnTime = nNewTime; }
- UINT32 GetTime() const { return mnTime; }
+ void SetTime(UINT32 nNewTime) { mnTime = nNewTime; }
+ UINT32 GetTime() const { return mnTime; }
- void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; }
- BOOL IsSoundOn() const { return mbSoundOn; }
+ void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; }
+ BOOL IsSoundOn() const { return mbSoundOn; }
- void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; }
- BOOL IsExcluded() const { return mbExcluded; }
+ void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; }
+ BOOL IsExcluded() const { return mbExcluded; }
- void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; }
- BOOL IsScaleObjects() const { return mbScaleObjects; }
+ void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; }
+ BOOL IsScaleObjects() const { return mbScaleObjects; }
- void SetSoundFile(const String& rStr) { maSoundFile = rStr; }
- String GetSoundFile() const { return maSoundFile; }
+ void SetSoundFile(const String& rStr) { maSoundFile = rStr; }
+ String GetSoundFile() const { return maSoundFile; }
- void SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; }
- bool IsLoopSound() const { return mbLoopSound; }
+ void SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; }
+ bool IsLoopSound() const { return mbLoopSound; }
- void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; }
- bool IsStopSound() const { return mbStopSound; }
+ void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; }
+ bool IsStopSound() const { return mbStopSound; }
- sal_Int16 getTransitionType() const;
- void setTransitionType( sal_Int16 nTransitionType );
+ sal_Int16 getTransitionType() const;
+ void setTransitionType( sal_Int16 nTransitionType );
- sal_Int16 getTransitionSubtype() const;
- void setTransitionSubtype( sal_Int16 nTransitionSubtype );
+ sal_Int16 getTransitionSubtype() const;
+ void setTransitionSubtype( sal_Int16 nTransitionSubtype );
- sal_Bool getTransitionDirection() const;
- void setTransitionDirection( sal_Bool bTransitionbDirection );
+ sal_Bool getTransitionDirection() const;
+ void setTransitionDirection( sal_Bool bTransitionbDirection );
- sal_Int32 getTransitionFadeColor() const;
- void setTransitionFadeColor( sal_Int32 nTransitionFadeColor );
+ sal_Int32 getTransitionFadeColor() const;
+ void setTransitionFadeColor( sal_Int32 nTransitionFadeColor );
- double getTransitionDuration() const;
- void setTransitionDuration( double fTranstionDuration );
+ double getTransitionDuration() const;
+ void setTransitionDuration( double fTranstionDuration );
// Virtuelle Methoden von SdrObjUserCall
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType,
const Rectangle& rOldBoundRect);
- void SetLayoutName(String aName);
- virtual String GetLayoutName() const { return maLayoutName; }
+ void SetLayoutName(String aName);
+ virtual String GetLayoutName() const { return maLayoutName; }
- void SetFileName(const String& aName) { maFileName = aName; }
- virtual String GetFileName() const { return maFileName; }
- void SetBookmarkName(const String& aName) { maBookmarkName = aName; }
- virtual String GetBookmarkName() const { return maBookmarkName; }
- SdPageLink* GetLink() { return mpPageLink; }
+ void SetFileName(const String& aName) { maFileName = aName; }
+ virtual String GetFileName() const { return maFileName; }
+ void SetBookmarkName(const String& aName) { maBookmarkName = aName; }
+ virtual String GetBookmarkName() const { return maBookmarkName; }
+ SdPageLink* GetLink() { return mpPageLink; }
- void ConnectLink();
- void DisconnectLink();
+ void ConnectLink();
+ void DisconnectLink();
void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
BOOL bScaleAllObj);
const String& GetName() const;
- String GetRealName() const { return FmFormPage::GetName(); };
+ String GetRealName() const { return FmFormPage::GetName(); };
void SetPresentationLayout(const String& rLayoutName,
BOOL bReplaceStyleSheets = TRUE,
BOOL bSetMasterPage = TRUE,
BOOL bReverseOrder = FALSE);
- void EndListenOutlineText();
+ void EndListenOutlineText();
- void SetBackgroundFullSize( BOOL bIn );
- BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; }
+ void SetBackgroundFullSize( BOOL bIn );
+ BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; }
rtl_TextEncoding GetCharSet() { return(meCharSet); }
@@ -352,8 +352,8 @@ public:
like printing.
*/
virtual bool checkVisibility(
- const sdr::contact::ViewObjectContact& rOriginal,
- const sdr::contact::DisplayInfo& rDisplayInfo,
+ const sdr::contact::ViewObjectContact& rOriginal,
+ const sdr::contact::DisplayInfo& rDisplayInfo,
bool bEdit );
/** callback from the sd::View when a new paragraph for one object on this page is created */
@@ -407,6 +407,6 @@ private:
void onRemoveObject( SdrObject* pObject );
};
-#endif // _SDPAGE_HXX
+#endif // _SDPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index b2f9925651cd..9b7f87c691ae 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
sal_Bool Export();
// these methods are necassary for the export to PowerPoint
- void PreSaveBasic(); // restaures the original basic storage
+ void PreSaveBasic(); // restaures the original basic storage
private:
- SvMemoryStream* pBas;
+ SvMemoryStream* pBas;
};
#endif // _SD_PPTWRP_HXX
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 617957b6b9e2..f75cfaaa5541 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc
index 6904cc2999d1..218b4ee8c76f 100644
--- a/sd/inc/sduiks.hrc
+++ b/sd/inc/sduiks.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,29 +29,29 @@
#include <usr/uiks.hrc>
-#define SD_UIK_SHAPE_FACTORY UIK_DRAWING(00)
-#define SD_UIK_POLYGON_FACTORY UIK_DRAWING(01)
-#define SD_UIK_3D_SHAPE_FACTORY UIK_DRAWING(02)
-#define SD_UIK_TEXT_FACTORY UIK_DRAWING(03)
-#define SD_UIK_SNAP_FACTORY UIK_DRAWING(04)
+#define SD_UIK_SHAPE_FACTORY UIK_DRAWING(00)
+#define SD_UIK_POLYGON_FACTORY UIK_DRAWING(01)
+#define SD_UIK_3D_SHAPE_FACTORY UIK_DRAWING(02)
+#define SD_UIK_TEXT_FACTORY UIK_DRAWING(03)
+#define SD_UIK_SNAP_FACTORY UIK_DRAWING(04)
-#define SD_UIK_DRAW_PAGES UIK_DRAWING(10)
-#define SD_UIK_DRAW_PAGE_MANIPULATOR UIK_DRAWING(11)
+#define SD_UIK_DRAW_PAGES UIK_DRAWING(10)
+#define SD_UIK_DRAW_PAGE_MANIPULATOR UIK_DRAWING(11)
-#define SD_UIK_SHAPE UIK_DRAWING(20)
-#define SD_UIK_CONNECTOR UIK_DRAWING(21)
-#define SD_UIK_CONNECTABLE UIK_DRAWING(22)
-#define SD_UIK_SHAPE_3D UIK_DRAWING(23)
+#define SD_UIK_SHAPE UIK_DRAWING(20)
+#define SD_UIK_CONNECTOR UIK_DRAWING(21)
+#define SD_UIK_CONNECTABLE UIK_DRAWING(22)
+#define SD_UIK_SHAPE_3D UIK_DRAWING(23)
#define SD_UIK_SHAPE_GROUP UIK_DRAWING(24)
#define SD_UIK_SHAPE_MIRRORER UIK_DRAWING(25)
-#define SD_UIK_SHAPE_ALIGNER UIK_DRAWING(26)
-#define SD_UIK_SHAPE_ARRANGER UIK_DRAWING(27)
-#define SD_UIK_SHAPE_CONVERTER UIK_DRAWING(28)
-#define SD_UIK_ANIMATOR UIK_DRAWING(29)
+#define SD_UIK_SHAPE_ALIGNER UIK_DRAWING(26)
+#define SD_UIK_SHAPE_ARRANGER UIK_DRAWING(27)
+#define SD_UIK_SHAPE_CONVERTER UIK_DRAWING(28)
+#define SD_UIK_ANIMATOR UIK_DRAWING(29)
-#define SD_UIK_DRAW_PAGE UIK_DRAWING(30)
-#define SD_UIK_SHAPES UIK_DRAWING(31)
-#define SD_UIK_GROUP UIK_DRAWING(32)
+#define SD_UIK_DRAW_PAGE UIK_DRAWING(30)
+#define SD_UIK_SHAPES UIK_DRAWING(31)
+#define SD_UIK_GROUP UIK_DRAWING(32)
#define SD_UIK_COMBINE UIK_DRAWING(33)
#define SD_UIK_CONNECT UIK_DRAWING(34)
#define SD_UIK_CONNECT UIK_DRAWING(35)
@@ -59,12 +59,12 @@
#define SD_UIK_PRESENTATION UIK_DRAWING(40)
#define SD_UIK_PRESENTATION_NAVIGATION UIK_DRAWING(41)
#define SD_UIK_CUSTOM_PRESENTATION UIK_DRAWING(42)
-#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(43)
-#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(44)
+#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(43)
+#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(44)
-#define SD_UIK_ZOOM UIK_DRAWING(50)
-#define SD_UIK_DRAW_VIEW UIK_DRAWING(51)
-#define SD_UIK_OUTLINE_VIEW UIK_DRAWING(52)
+#define SD_UIK_ZOOM UIK_DRAWING(50)
+#define SD_UIK_DRAW_VIEW UIK_DRAWING(51)
+#define SD_UIK_OUTLINE_VIEW UIK_DRAWING(52)
#define SD_UIK_SLIDE_VIEW UIK_DRAWING(53)
#define SD_UIK_SLIDE_VIEW UIK_DRAWING(53)
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index bbf39e2076b0..daa0b534d032 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
TYPEINFO();
SdUndoAction(SdDrawDocument* pSdDrawDocument)
: mpDoc(pSdDrawDocument) {}
- virtual ~SdUndoAction() {}
+ virtual ~SdUndoAction() {}
- void SetComment(String& rStr) { maComment = rStr; }
+ void SetComment(String& rStr) { maComment = rStr; }
virtual String GetComment() const { return maComment; }
virtual SdUndoAction* Clone() const { return NULL; }
@@ -51,6 +51,6 @@ protected:
String maComment;
};
-#endif // _SD_SDUNDO_HXX
+#endif // _SD_SDUNDO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 46f534c509b2..0ca8aa1a07e9 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +37,18 @@
enum SdXMLFilterMode
{
- SDXMLMODE_Normal, // standard load and save of the complete document
- SDXMLMODE_Preview, // only for import, only the first draw page and its master page is loaded
- SDXMLMODE_Organizer // only for import, only the styles are loaded
+ SDXMLMODE_Normal, // standard load and save of the complete document
+ SDXMLMODE_Preview, // only for import, only the first draw page and its master page is loaded
+ SDXMLMODE_Organizer // only for import, only the styles are loaded
};
class SdXMLFilter : public SdFilter
{
public:
- SdXMLFilter(
- SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell,
- sal_Bool bShowProgress,
+ SdXMLFilter(
+ SfxMedium& rMedium,
+ ::sd::DrawDocShell& rDocShell,
+ sal_Bool bShowProgress,
SdXMLFilterMode eFilterMode = SDXMLMODE_Normal,
ULONG nStoreVer = SOFFICE_FILEFORMAT_8 );
virtual ~SdXMLFilter (void);
@@ -61,6 +61,6 @@ private:
ULONG mnStoreVer;
};
-#endif // _SDXMLWRP_HXX
+#endif // _SDXMLWRP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index f2b97694bb5e..4896d062e122 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace sd
bool hasMore() const;
const std::list< SdrObject* >& getList() const { return maShapeList; }
-
+
private:
virtual void ObjectInDestruction(const SdrObject& rObject);
@@ -86,6 +86,6 @@ namespace sd
};
}
-#endif // _SHAPELIST_HXX
+#endif // _SHAPELIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index 9f1d21b2713a..5d97f16a350b 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
// XNameContainer
- virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-
+ virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+
// XNameReplace
virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
@@ -119,11 +119,11 @@ private:
SfxStyleFamily mnFamily;
rtl::Reference< SfxStyleSheetPool > mxPool;
- SdStyleFamilyImpl* mpImpl;
+ SdStyleFamilyImpl* mpImpl;
};
typedef rtl::Reference< SdStyleFamily > SdStyleFamilyRef;
-#endif // _SD_STLFAMILY_HXX
+#endif // _SD_STLFAMILY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 93197a03c730..212892c5ffd7 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +65,8 @@ class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
public:
SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument);
- void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; }
- SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; }
+ void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; }
+ SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; }
SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName);
@@ -76,27 +76,27 @@ public:
/** creates all layout style sheets for the givin layout name if they
don't exist yet.
- @param rLayoutName Must be the name of a master page
- @param bCheck If set to true, the debug version will assert if a style
+ @param rLayoutName Must be the name of a master page
+ @param bCheck If set to true, the debug version will assert if a style
had to be created. This is used to assert errors in documents
when styles are missing.
*/
SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False );
List* CreateLayoutSheetNames(const String& rLayoutName) const;
- void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
+ void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
void CopyCellSheets(SdStyleSheetPool& rSourcePool);
void CopyTableStyles(SdStyleSheetPool& rSourcePool);
void CreatePseudosIfNecessary();
- void UpdateStdNames();
- static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont );
+ void UpdateStdNames();
+ static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont );
Font GetBulletFont() const;
- SdDrawDocument* GetDoc() const { return mpDoc; }
+ SdDrawDocument* GetDoc() const { return mpDoc; }
- static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet );
+ static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet );
public:
@@ -140,15 +140,15 @@ protected:
void RemoveStyleFamily( const SdPage* pPage );
private:
- SfxStyleSheetBase* mpActualStyleSheet;
- SdDrawDocument* mpDoc;
- SdStyleFamilyRef mxGraphicFamily;
- SdStyleFamilyRef mxCellFamily;
- SdStyleFamilyMap maStyleFamilyMap;
+ SfxStyleSheetBase* mpActualStyleSheet;
+ SdDrawDocument* mpDoc;
+ SdStyleFamilyRef mxGraphicFamily;
+ SdStyleFamilyRef mxCellFamily;
+ SdStyleFamilyMap maStyleFamilyMap;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily;
- rtl::OUString msTableFamilyName;
+ rtl::OUString msTableFamilyName;
};
-#endif // _SD_STLPOOL_HXX
+#endif // _SD_STLPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 633510d7633e..d7d7c6ed8cc5 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ModifyListenerForewarder;
-typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet,
+typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet,
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertyState,
@@ -63,14 +63,14 @@ public:
SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, USHORT nMask );
SdStyleSheet( const SdStyleSheet& );
- virtual BOOL SetParent (const String& rParentName);
+ virtual BOOL SetParent (const String& rParentName);
virtual SfxItemSet& GetItemSet();
- virtual BOOL IsUsed() const;
- virtual BOOL HasFollowSupport() const;
- virtual BOOL HasParentSupport() const;
- virtual BOOL HasClearParentSupport() const;
- virtual BOOL SetName( const UniString& );
- virtual void SetHelpId( const String& r, ULONG nId );
+ virtual BOOL IsUsed() const;
+ virtual BOOL HasFollowSupport() const;
+ virtual BOOL HasParentSupport() const;
+ virtual BOOL HasClearParentSupport() const;
+ virtual BOOL SetName( const UniString& );
+ virtual void SetHelpId( const String& r, ULONG nId );
void AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems = TRUE);
@@ -135,13 +135,13 @@ protected:
virtual void Store(SvStream& rOut);
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
- virtual ~SdStyleSheet();
+ virtual ~SdStyleSheet();
void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException);
virtual void disposing();
- rtl::OUString msApiName;
+ rtl::OUString msApiName;
rtl::Reference< SfxStyleSheetBasePool > mxPool;
/** boradcast helper for events */
@@ -150,13 +150,13 @@ protected:
boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
private:
- SdStyleSheet& operator=( const SdStyleSheet& ); // not implemented
+ SdStyleSheet& operator=( const SdStyleSheet& ); // not implemented
};
typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef;
typedef std::vector< SdStyleSheetRef > SdStyleSheetVector;
-#endif // _SD_STLSHEET_HXX
+#endif // _SD_STLSHEET_HXX
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 04de56085f19..8d8c929cb538 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.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/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index e3691ff3f837..5fa582174706 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/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
@@ -49,13 +49,13 @@ class TextApiObject : public SvxUnoText
public:
static rtl::Reference< TextApiObject > create( SdDrawDocument* pDoc );
- virtual ~TextApiObject() throw();
-
+ virtual ~TextApiObject() throw();
+
virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
+
OutlinerParaObject* CreateText();
- void SetText( OutlinerParaObject& rText );
- String GetText();
+ void SetText( OutlinerParaObject& rText );
+ String GetText();
static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& );
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index 6ac774ce8f50..cd1e7d6bec80 100644
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,6 +48,6 @@ public:
}
-#endif // _SD_UNDOMANAGER_HXX
+#endif // _SD_UNDOMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 9702fff68ac5..75ad9e4045ce 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +41,15 @@ public:
UndoManager( USHORT nMaxUndoActionCount = 20 );
virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0);
- virtual void LeaveListAction();
+ virtual void LeaveListAction();
- virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
+ virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
- bool isInListAction() const { return mnListLevel != 0; }
- bool isInUndo() const { return maIsInUndoLock.isLocked(); }
+ bool isInListAction() const { return mnListLevel != 0; }
+ bool isInUndo() const { return maIsInUndoLock.isLocked(); }
- virtual BOOL Undo( USHORT nCount=1 );
- virtual BOOL Redo( USHORT nCount=1 );
+ virtual BOOL Undo( USHORT nCount=1 );
+ virtual BOOL Redo( USHORT nCount=1 );
/** Set or reset the undo manager linked with the called undo manager.
*/
@@ -59,7 +59,7 @@ private:
using SfxUndoManager::Undo;
using SfxUndoManager::Redo;
- int mnListLevel;
+ int mnListLevel;
ScopeLock maIsInUndoLock;
/** Used when the outline view is visible as a last resort to
@@ -79,6 +79,6 @@ private:
}
-#endif // _SD_UNDOMANAGER_HXX
+#endif // _SD_UNDOMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 6b53e4b2f3ed..c0975ed1e3aa 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ protected:
virtual void Redo();
private:
- SfxUndoAction* mpUndoUsercall;
- SfxUndoAction* mpUndoAnimation;
- SfxUndoAction* mpUndoPresObj;
+ SfxUndoAction* mpUndoUsercall;
+ SfxUndoAction* mpUndoAnimation;
+ SfxUndoAction* mpUndoPresObj;
};
///////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ public:
private:
SfxUndoAction* mpUndoAnimation;
- bool mbNewEmptyPresObj;
+ bool mbNewEmptyPresObj;
SdrObjectWeakRef mxSdrObject;
};
@@ -129,8 +129,8 @@ public:
virtual void Redo();
protected:
- SdrObjUserCall* mpOldUserCall;
- SdrObjUserCall* mpNewUserCall;
+ SdrObjUserCall* mpOldUserCall;
+ SdrObjUserCall* mpNewUserCall;
SdrObjectWeakRef mxSdrObject;
};
@@ -200,6 +200,6 @@ protected:
} // namespace sd
-#endif // _SD_UNDOOBJECTS_HXX
+#endif // _SD_UNDOOBJECTS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 9af802794671..0e626c5d4b2c 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
virtual String GetComment() const;
private:
- UndoAnimationImpl* mpImpl;
+ UndoAnimationImpl* mpImpl;
};
struct UndoAnimationPathImpl;
@@ -87,7 +87,7 @@ public:
virtual String GetComment() const;
private:
- UndoTransitionImpl* mpImpl;
+ UndoTransitionImpl* mpImpl;
};
}
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index a261f7a7d14a..38115b852bb9 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.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/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
index a72342c52da5..c954a6312089 100644
--- a/sd/sdi/ToolPanelViewShell.sdi
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER 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,26 +177,26 @@ SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
[
- /* 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;
Readonly = TRUE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 3602e711db1b..82eaced38258 100755
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.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/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index c63d20c0f5f6..cb534cf5cdc8 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/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/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index b8200ec93d5e..c57424bac1a0 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.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
@@ -715,7 +715,7 @@ interface DrawView
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
-
+
SID_OBJECT_CROP // ole : no, status : play rec
[
ExecMethod = FuPermanent ;
@@ -2207,13 +2207,13 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
-
+
SID_FORMATPAINTBRUSH //
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
-
+
SID_HEADER_AND_FOOTER // ole : no, status : ?
[
ExecMethod = ExecCtrl ;
@@ -2231,13 +2231,13 @@ interface DrawView
ExecMethod = ExecCtrl ;
StateMethod = GetMenuState ;
]
-
+
SID_MASTER_LAYOUTS
[
ExecMethod = ExecCtrl ;
StateMethod = GetMenuState ;
]
-
+
SID_OPT_LOCALE_CHANGED // ole : no, status : ?
[
ExecMethod = ExecCtrl ;
@@ -2288,7 +2288,7 @@ interface DrawView
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_EXTRUSION_DIRECTION_FLOATER
[
ExecMethod = FuTemporary ;
@@ -2388,17 +2388,17 @@ interface DrawView
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAW_FONTWORK
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAW_FONTWORK_VERTICAL
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAWTBX_CS_BASIC
[
ExecMethod = FuPermanent ;
@@ -2433,7 +2433,7 @@ interface DrawView
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_AVMEDIA_PLAYER // ole : yes, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index b69a5bc9c041..7817dee02fc6 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.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/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index f4133f0f4643..a2d48deece88 100755
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
@@ -74,63 +74,63 @@ shell TextObjectBar
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_CENTER // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_RIGHT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_BLOCK // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LEFT_TO_RIGHT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_RIGHT_TO_LEFT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_10 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_15 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_20 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_SET_SUPER_SCRIPT // ole : ?, status : ?
@@ -208,5 +208,5 @@ shell TextObjectBar
StateMethod = GetAttrState ;
]
-
+
}
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 600bbdf19a06..c2465d5cc720 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.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
@@ -211,12 +211,12 @@ interface ImpressEditView : DrawView
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
SID_DELETEALLBYAUTHOR_POSTIT
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
}
shell DrawViewShell
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index d033c02b2824..865d6d83465e 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.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/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi
index 7fd5b74cb7c0..cce326b1a97b 100644
--- a/sd/sdi/grviewsh.sdi
+++ b/sd/sdi/grviewsh.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
@@ -81,7 +81,7 @@ shell GraphicViewShell
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
SID_DELETEALLBYAUTHOR_POSTIT
[
ExecMethod = ExecuteAnnotation;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 9639f1adc9dc..e4f3b2a6482f 100755
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.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
@@ -80,7 +80,7 @@ interface OutlineView
[
ExecMethod = FuTemporary ;
StateMethod = GetStatusBarState ;
- ]
+ ]
SID_ZOOM_OUT // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index e52bd8ea59e8..54634565d554 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.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/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi
index 2c94a4d59786..9b5e9e32c94c 100644
--- a/sd/sdi/sdnew.sdi
+++ b/sd/sdi/sdnew.sdi
@@ -56,22 +56,22 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
Asynchron;
- Readonly = FALSE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ Readonly = FALSE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc
index 472f794be479..5001e9fce283 100644
--- a/sd/sdi/sdslots.hrc
+++ b/sd/sdi/sdslots.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/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index fbfc8da1903b..10c07bbffc78 100755
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.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
@@ -103,6 +103,6 @@ ModulePrefix( "Sd" )
include "SlideSorterController.sdi"
include "ViewShellBase.sdi"
include "mediaob.sdi"
- include "tables.sdi"
+ include "tables.sdi"
include "ToolPanelViewShell.sdi"
}
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index 8126df09b75a..9dc9f5951410 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.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
@@ -31,7 +31,7 @@ shell TableObjectBar
[
ExecMethod = Execute ;
StateMethod = GetState ;
- ]
+ ]
SID_FRAME_LINESTYLE
[
ExecMethod = Execute;
@@ -42,7 +42,7 @@ shell TableObjectBar
ExecMethod = Execute;
StateMethod = GetAttrState;
]
- SID_ATTR_BORDER
+ SID_ATTR_BORDER
[
ExecMethod = Execute;
StateMethod = GetAttrState;
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 4b7cf5dee74c..b1a7e9bf45b3 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 0c51d6739187..2ee456775ad8 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::com::sun::star::util::XChangesNotifier;
using ::com::sun::star::util::XChangesListener;
namespace sd
-{
+{
class MainSequenceChangeGuard
{
public:
@@ -141,7 +141,7 @@ private:
};
CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
-: mnNodeType(-1),
+: mnNodeType(-1),
mnPresetClass(-1),
mfBegin(-1.0),
mfDuration(-1.0),
@@ -358,7 +358,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
}
else
{
- sal_Int32 nDone;
+ sal_Int32 nDone;
for( nPos = 0; nPos < nEndPos; nPos++ )
{
nPos = xBI->nextCharacters(aText, nPos, aLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone);
@@ -644,7 +644,7 @@ bool CustomAnimationEffect::calculateIterateDuration()
}
}
- // if we also animate the form first, we have to add the
+ // if we also animate the form first, we have to add the
// sub effect duration to the whole effect duration
if( mnTargetSubItem == ShapeAnimationSubType::AS_WHOLE )
fDuration += fSubEffectDuration;
@@ -697,7 +697,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
Reference< XCommand > xCommand( aElem, UNO_QUERY );
if( xCommand.is() )
xCommand->setTarget( rTarget );
- }
+ }
}
}
}
@@ -757,7 +757,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
double fScale = fDuration / mfDuration;
mfDuration = fDuration;
mfAbsoluteDuration = mfDuration;
-
+
// calculate effect duration and get target shape
Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY );
if( xEnumerationAccess.is() )
@@ -912,7 +912,7 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const
// --------------------------------------------------------------------
-Any CustomAnimationEffect::getRepeatCount() const
+Any CustomAnimationEffect::getRepeatCount() const
{
if( mxNode.is() )
{
@@ -927,7 +927,7 @@ Any CustomAnimationEffect::getRepeatCount() const
// --------------------------------------------------------------------
-Any CustomAnimationEffect::getEnd() const
+Any CustomAnimationEffect::getEnd() const
{
if( mxNode.is() )
{
@@ -982,9 +982,9 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() );
- const char* pServiceName = maDimColor.hasValue() ?
+ const char* pServiceName = maDimColor.hasValue() ?
"com.sun.star.animations.AnimateColor" : "com.sun.star.animations.AnimateSet";
-
+
Reference< XAnimate > xAnimate( xMsf->createInstance(OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW );
Any aTo;
@@ -1005,7 +1005,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
if( !mbAfterEffectOnNextEffect ) // sameClick
{
Event aEvent;
-
+
aEvent.Source <<= getNode();
aEvent.Trigger = EventTrigger::END_EVENT;
aEvent.Repeat = 0;
@@ -1042,7 +1042,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() );
const char * pServiceName =
nIterateType ? "com.sun.star.animations.IterateContainer" : "com.sun.star.animations.ParallelTimeContainer";
- Reference< XTimeContainer > xNewContainer(
+ Reference< XTimeContainer > xNewContainer(
xMsf->createInstance( OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW );
Reference< XTimeContainer > xOldContainer( mxNode, UNO_QUERY_THROW );
@@ -1140,7 +1140,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
// --------------------------------------------------------------------
-::rtl::OUString CustomAnimationEffect::getPath() const
+::rtl::OUString CustomAnimationEffect::getPath() const
{
::rtl::OUString aPath;
@@ -1227,7 +1227,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt
{
Sequence<Any> aValues( xAnimate->getValues() );
if( aValues.hasElements() )
- aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ];
+ aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ];
}
break;
}
@@ -1274,7 +1274,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
case VALUE_FROM:
if( xAnimate->getFrom() != rValue )
{
- xAnimate->setFrom( rValue );
+ xAnimate->setFrom( rValue );
bChanged = true;
}
break;
@@ -1283,9 +1283,9 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
{
xAnimate->setTo( rValue );
bChanged = true;
- }
+ }
break;
- case VALUE_BY:
+ case VALUE_BY:
if( xAnimate->getTo() != rValue )
{
xAnimate->setBy( rValue );
@@ -1303,7 +1303,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
if( aValues[ nIndex ] != rValue )
{
- aValues[ nIndex ] = rValue;
+ aValues[ nIndex ] = rValue;
xAnimate->setValues( aValues );
bChanged = true;
}
@@ -1424,7 +1424,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
xAnimate->setTo(rColor);
}
break;
-
+
}
}
}
@@ -1468,7 +1468,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType,
{
Sequence<Any> aValues( xTransform->getValues() );
if( aValues.hasElements() )
- aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ];
+ aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ];
}
break;
}
@@ -1512,7 +1512,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
case VALUE_FROM:
if( xTransform->getFrom() != rValue )
{
- xTransform->setFrom( rValue );
+ xTransform->setFrom( rValue );
bChanged = true;
}
break;
@@ -1835,7 +1835,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
}
p++;
}
-
+
if( bFilter )
{
aUserData = ::comphelper::containerToSequence< NamedValue, std::vector< NamedValue > >( aNewUserData );
@@ -1846,9 +1846,9 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
Any aTarget( rTarget );
sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE;
- if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) )
+ if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) )
{
- nSubItem = ShapeAnimationSubType::ONLY_TEXT;
+ nSubItem = ShapeAnimationSubType::ONLY_TEXT;
}
else if( pPreset->isTextOnly() )
{
@@ -1858,7 +1858,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
{
// thats bad, we target a shape here but the effect is only for text
// so change subitem
- nSubItem = ShapeAnimationSubType::ONLY_TEXT;
+ nSubItem = ShapeAnimationSubType::ONLY_TEXT;
}
}
@@ -1869,7 +1869,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
pEffect->setTargetSubItem( nSubItem );
if( fDuration != -1.0 )
pEffect->setDuration( fDuration );
-
+
maEffects.push_back(pEffect);
rebuild();
@@ -1901,8 +1901,8 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE;
- if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) )
- nSubItem = ShapeAnimationSubType::ONLY_TEXT;
+ if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) )
+ nSubItem = ShapeAnimationSubType::ONLY_TEXT;
Reference< XAnimationNode > xEffectNode( xEffectContainer, UNO_QUERY_THROW );
pEffect.reset( new CustomAnimationEffect( xEffectNode ) );
@@ -1918,7 +1918,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
pEffect->updatePathFromSdrPathObj( rPathObj );
if( fDuration != -1.0 )
pEffect->setDuration( fDuration );
-
+
maEffects.push_back(pEffect);
rebuild();
@@ -2037,7 +2037,7 @@ void EffectSequenceHelper::implRebuild()
Any aBegin( makeAny( aEvent ) );
if( bFirst )
{
- // if the first node is not a click action, this click container
+ // if the first node is not a click action, this click container
// must not have INDEFINITE begin but start at 0s
bFirst = false;
if( pEffect->getNodeType() != EffectNodeType::ON_CLICK )
@@ -2188,8 +2188,8 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
Reference< XTimeContainer > xClickContainer( xContainer->getParent(), UNO_QUERY_THROW );
Reference< XTimeContainer > xSequenceContainer( xClickContainer->getParent(), UNO_QUERY_THROW );
- Reference< XTimeContainer > xNextContainer;
-
+ Reference< XTimeContainer > xNextContainer;
+
// first try if we have an after effect container
if( !implFindNextContainer( xClickContainer, xContainer, xNextContainer ) )
{
@@ -2214,7 +2214,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
{
Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW );
xNode->setBegin( makeAny( (double)0.0 ) );
-// xNode->setFill( AnimationFill::HOLD );
+// xNode->setFill( AnimationFill::HOLD );
xNextClickContainer->appendChild( xNode );
}
}
@@ -2245,7 +2245,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
{
Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW );
xNode->setBegin( makeAny( (double)0.0 ) );
-// xNode->setFill( AnimationFill::HOLD );
+// xNode->setFill( AnimationFill::HOLD );
xNewClickContainer->appendChild( xNode );
}
}
@@ -2456,7 +2456,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa
// ------------------------------------------------------------------